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.10 by pajs, Thu Oct 9 16:48:33 2003 UTC vs.
Revision 1.12 by ats, Sun Oct 19 00:25:30 2003 UTC

# Line 45 | Line 45
45   #endif
46   #ifdef FREEBSD
47   #include <kvm.h>
48 – #include <fcntl.h>
48   #include <sys/param.h>
49   #include <sys/sysctl.h>
50   #include <sys/user.h>
# Line 69 | Line 68 | process_stat_t *get_process_stats(){
68   #endif
69   #ifdef FREEBSD
70          struct kinfo_proc *kp_stats;    
71 <        kvm_t *kvmd = NULL;
71 >        kvm_t *kvmd;
72          int procs;
73   #endif
74  
# Line 135 | Line 134 | process_stat_t *get_process_stats(){
134          closedir(proc_dir);
135   #endif
136   #ifdef FREEBSD
137 <        if((kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL)) == NULL){
137 >        if((kvmd = get_kvm()) == NULL){
138                  return NULL;
139          }
140  
# Line 144 | Line 143 | process_stat_t *get_process_stats(){
143          while(procs--){
144   #ifdef FREEBSD5
145                  if (kp_stats[procs].ki_stat == SSLEEP) process_stat.sleeping++;
146 +                if (kp_stats[procs].ki_stat == SWAIT) process_stat.sleeping++;
147 +                if (kp_stats[procs].ki_stat == SLOCK) process_stat.sleeping++;
148                  if (kp_stats[procs].ki_stat == SRUN) process_stat.running++;
149                  if (kp_stats[procs].ki_stat == SIDL) process_stat.running++;
150                  if (kp_stats[procs].ki_stat == SZOMB) process_stat.zombie++;
151                  if (kp_stats[procs].ki_stat == SSTOP) process_stat.stopped++;
152 +                
153   #else
154                  if (kp_stats[procs].kp_proc.p_stat == SSLEEP) process_stat.sleeping++;  
155                  if (kp_stats[procs].kp_proc.p_stat == SRUN) process_stat.running++;
156                  if (kp_stats[procs].kp_proc.p_stat == SIDL) process_stat.running++;
157                  if (kp_stats[procs].kp_proc.p_stat == SZOMB) process_stat.zombie++;
158                  if (kp_stats[procs].kp_proc.p_stat == SSTOP) process_stat.stopped++;
157 –                process_stat.total++;
159   #endif
160          }
160 –
161 –        kvm_close(kvmd);
161   #endif
162  
164 – #ifndef FREEBSD5
163          process_stat.total=process_stat.sleeping+process_stat.running+process_stat.zombie+process_stat.stopped;
166 – #endif
164  
165          return &process_stat;
166   }

Diff Legend

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