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.9 by pajs, Thu Oct 9 15:12:43 2003 UTC vs.
Revision 1.14 by tdb, Mon Nov 10 21:07:04 2003 UTC

# Line 31 | Line 31
31   #include <string.h>
32   #endif
33  
34 + #include "tools.h"
35   #ifdef SOLARIS
36   #include <procfs.h>
37   #include <limits.h>
# Line 38 | Line 39
39   #define MAX_FILE_LENGTH PATH_MAX
40   #endif
41   #ifdef LINUX
42 < #include "tools.h"
42 > #ifdef CYGWIN
43 > #include <limits.h>
44 > #else
45   #include <linux/limits.h>
46 + #endif
47   #define PROC_LOCATION "/proc"
48   #define MAX_FILE_LENGTH PATH_MAX
49   #endif
50 < #ifdef FREEBSD
50 > #ifdef ALLBSD
51   #include <kvm.h>
48 – #include <fcntl.h>
52   #include <sys/param.h>
53   #include <sys/sysctl.h>
54 + #endif
55 + #ifdef FREEBSD
56   #include <sys/user.h>
57   #endif
58  
# Line 67 | Line 72 | process_stat_t *get_process_stats(){
72   #ifdef SOLARIS
73          psinfo_t process_info;
74   #endif
75 < #ifdef FREEBSD
75 > #ifdef ALLBSD
76          struct kinfo_proc *kp_stats;    
77 <        kvm_t *kvmd = NULL;
77 >        kvm_t *kvmd;
78          int procs;
79   #endif
80  
# Line 134 | Line 139 | process_stat_t *get_process_stats(){
139          }
140          closedir(proc_dir);
141   #endif
142 < #ifdef FREEBSD
143 <        if((kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL)) == NULL){
142 > #ifdef ALLBSD
143 >        if((kvmd = get_kvm()) == NULL){
144                  return NULL;
145          }
146  
# Line 144 | Line 149 | process_stat_t *get_process_stats(){
149          while(procs--){
150   #ifdef FREEBSD5
151                  if (kp_stats[procs].ki_stat == SSLEEP) process_stat.sleeping++;
152 +                if (kp_stats[procs].ki_stat == SWAIT) process_stat.sleeping++;
153 +                if (kp_stats[procs].ki_stat == SLOCK) process_stat.sleeping++;
154                  if (kp_stats[procs].ki_stat == SRUN) process_stat.running++;
155                  if (kp_stats[procs].ki_stat == SIDL) process_stat.running++;
156                  if (kp_stats[procs].ki_stat == SZOMB) process_stat.zombie++;
157                  if (kp_stats[procs].ki_stat == SSTOP) process_stat.stopped++;
158 +                
159   #else
160                  if (kp_stats[procs].kp_proc.p_stat == SSLEEP) process_stat.sleeping++;  
161                  if (kp_stats[procs].kp_proc.p_stat == SRUN) process_stat.running++;
# Line 156 | Line 164 | process_stat_t *get_process_stats(){
164                  if (kp_stats[procs].kp_proc.p_stat == SSTOP) process_stat.stopped++;
165   #endif
166          }
159 –
160 –        kvm_close(kvmd);
167   #endif
168  
169          process_stat.total=process_stat.sleeping+process_stat.running+process_stat.zombie+process_stat.stopped;
170 +
171          return &process_stat;
172   }

Diff Legend

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