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.15 by ats, Wed Nov 12 01:36:19 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
41 – #include "tools.h"
42   #include <linux/limits.h>
43   #define PROC_LOCATION "/proc"
44   #define MAX_FILE_LENGTH PATH_MAX
45   #endif
46 < #ifdef FREEBSD
46 > #ifdef ALLBSD
47   #include <kvm.h>
48 – #include <fcntl.h>
48   #include <sys/param.h>
49   #include <sys/sysctl.h>
50 + #endif
51 + #ifdef FREEBSD
52   #include <sys/user.h>
53   #endif
54  
# Line 67 | Line 68 | process_stat_t *get_process_stats(){
68   #ifdef SOLARIS
69          psinfo_t process_info;
70   #endif
71 < #ifdef FREEBSD
71 > #ifdef ALLBSD
72          struct kinfo_proc *kp_stats;    
73 <        kvm_t *kvmd = NULL;
73 >        kvm_t *kvmd;
74          int procs;
75   #endif
76  
# Line 134 | Line 135 | process_stat_t *get_process_stats(){
135          }
136          closedir(proc_dir);
137   #endif
138 < #ifdef FREEBSD
139 <        if((kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL)) == NULL){
138 > #ifdef ALLBSD
139 >        if((kvmd = get_kvm()) == NULL){
140                  return NULL;
141          }
142  
# Line 144 | Line 145 | process_stat_t *get_process_stats(){
145          while(procs--){
146   #ifdef FREEBSD5
147                  if (kp_stats[procs].ki_stat == SSLEEP) process_stat.sleeping++;
148 +                if (kp_stats[procs].ki_stat == SWAIT) process_stat.sleeping++;
149 +                if (kp_stats[procs].ki_stat == SLOCK) process_stat.sleeping++;
150                  if (kp_stats[procs].ki_stat == SRUN) process_stat.running++;
151                  if (kp_stats[procs].ki_stat == SIDL) process_stat.running++;
152                  if (kp_stats[procs].ki_stat == SZOMB) process_stat.zombie++;
153                  if (kp_stats[procs].ki_stat == SSTOP) process_stat.stopped++;
154 +                
155   #else
156                  if (kp_stats[procs].kp_proc.p_stat == SSLEEP) process_stat.sleeping++;  
157                  if (kp_stats[procs].kp_proc.p_stat == SRUN) process_stat.running++;
# Line 156 | Line 160 | process_stat_t *get_process_stats(){
160                  if (kp_stats[procs].kp_proc.p_stat == SSTOP) process_stat.stopped++;
161   #endif
162          }
163 + #endif
164  
165 <        kvm_close(kvmd);
165 > #ifdef CYGWIN
166 >        return NULL;
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