ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/process_stats.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/process_stats.c (file contents):
Revision 1.37 by tdb, Sun Apr 4 21:34:48 2004 UTC vs.
Revision 1.43 by tdb, Sun Apr 4 22:48:50 2004 UTC

# Line 61 | Line 61
61   #include <paths.h>
62   #include <fcntl.h>
63   #include <limits.h>
64 + #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
65   #include <kvm.h>
66 + #include <tools.h>
67   #endif
68 + #include <unistd.h>
69 + #endif
70  
71   int get_proc_snapshot(proc_state_t **ps){
72          proc_state_t *proc_state = NULL;
# Line 72 | Line 76 | int get_proc_snapshot(proc_state_t **ps){
76          int mib[4];
77          size_t size;
78          struct kinfo_proc *kp_stats;
79 <        int procs, i, alloc;
79 >        int procs, i;
80          char *proctitle;
81 < #if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
81 > #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
82 >        kvm_t *kvmd;
83 >        char **args;
84 >        int alloc;
85 > #else
86          long buflen;
87          char *p;
80 –        int argc;
81 –        int j = 0;
82 – #else
83 –        static kvm_t *kvmd;
84 –        char **args;
88   #endif
89   #endif
90   #if defined(SOLARIS) || defined(LINUX)
# Line 153 | Line 156 | int get_proc_snapshot(proc_state_t **ps){
156                  if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
157   #endif
158   #ifdef LINUX
159 <                x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*lu %*lu %*lu %*lu %*lu %lu %lu %*ld %*ld %*ld %d %*ld %*ld %*lu %llu %llu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*d %*d\n", &(proc_state_ptr->pid), ps_name, &s, &(proc_state_ptr->parent), &(proc_state_ptr->pgid), &utime, &stime, &(proc_state_ptr->nice), &(proc_state_ptr->proc_size), &(proc_state_ptr->proc_resident));
159 >                x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*u %*u %*u %*u %*u %lu %lu %*d %*d %*d %d %*d %*d %*u %llu %llu %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %*d\n", &(proc_state_ptr->pid), ps_name, &s, &(proc_state_ptr->parent), &(proc_state_ptr->pgid), &utime, &stime, &(proc_state_ptr->nice), &(proc_state_ptr->proc_size), &(proc_state_ptr->proc_resident));
160                  proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
161                  if(s == 'S') proc_state_ptr->state = SLEEPING;
162                  if(s == 'R') proc_state_ptr->state = RUNNING;
# Line 235 | Line 238 | int get_proc_snapshot(proc_state_t **ps){
238          }
239  
240   #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
241 <        kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
241 >        kvmd = get_kvm2();
242   #endif
243  
244          for (i = 0; i < procs; i++) {
# Line 464 | Line 467 | process_stat_t *get_process_stats() {
467  
468          ps_size = get_proc_snapshot(&ps);
469  
470 <        if(ps_size == NULL) {
470 >        if(ps_size == 0) {
471                  return NULL;
472          }
473  
474          for(x = 0; x < ps_size; x++) {
475                  switch (ps->state) {
473 –                /* currently no mapping for UNKNOWN in process_stat_t */
476                  case RUNNING:
477                          process_stat.running++;
478                          break;
# Line 482 | Line 484 | process_stat_t *get_process_stats() {
484                          break;
485                  case ZOMBIE:
486                          process_stat.zombie++;
487 +                        break;
488 +                default:
489 +                        /* currently no mapping for UNKNOWN in process_stat_t */
490                          break;
491                  }
492                  ps++;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines