26 |
|
#endif |
27 |
|
|
28 |
|
#include "statgrab.h" |
29 |
+ |
#include "tools.h" |
30 |
+ |
#include "vector.h" |
31 |
|
#if defined(SOLARIS) || defined(LINUX) |
32 |
|
#include <stdio.h> |
33 |
|
#include <stdlib.h> |
68 |
|
#include <tools.h> |
69 |
|
#endif |
70 |
|
#include <unistd.h> |
71 |
+ |
#ifdef NETBSD2 |
72 |
+ |
#include <sys/lwp.h> |
73 |
|
#endif |
74 |
+ |
#endif |
75 |
|
|
76 |
< |
int get_proc_snapshot(proc_state_t **ps){ |
77 |
< |
proc_state_t *proc_state = NULL; |
78 |
< |
proc_state_t *proc_state_ptr; |
76 |
> |
static void proc_state_init(sg_process_stats *s) { |
77 |
> |
s->process_name = NULL; |
78 |
> |
s->proctitle = NULL; |
79 |
> |
} |
80 |
> |
|
81 |
> |
static void proc_state_destroy(sg_process_stats *s) { |
82 |
> |
free(s->process_name); |
83 |
> |
free(s->proctitle); |
84 |
> |
} |
85 |
> |
|
86 |
> |
sg_process_stats *sg_get_process_stats(int *entries){ |
87 |
> |
VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64, |
88 |
> |
proc_state_init, proc_state_destroy); |
89 |
|
int proc_state_size = 0; |
90 |
+ |
sg_process_stats *proc_state_ptr; |
91 |
|
#ifdef ALLBSD |
92 |
|
int mib[4]; |
93 |
|
size_t size; |
96 |
|
char *proctitle; |
97 |
|
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
98 |
|
kvm_t *kvmd; |
99 |
< |
char **args; |
100 |
< |
int alloc; |
85 |
< |
char *proctitletmp; |
99 |
> |
char **args, **argsp; |
100 |
> |
int argslen = 0; |
101 |
|
#else |
102 |
|
long buflen; |
103 |
|
char *p; |
104 |
|
#endif |
105 |
+ |
#ifdef NETBSD2 |
106 |
+ |
int lwps; |
107 |
+ |
struct kinfo_lwp *kl_stats; |
108 |
|
#endif |
109 |
+ |
#endif |
110 |
|
#if defined(SOLARIS) || defined(LINUX) |
111 |
|
DIR *proc_dir; |
112 |
|
struct dirent *dir_entry; |
120 |
|
/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */ |
121 |
|
char ps_name[4096]; |
122 |
|
char *ptr; |
123 |
< |
static char *psargs = NULL; |
105 |
< |
static int psarg_size = 0; |
123 |
> |
VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL); |
124 |
|
unsigned long stime, utime; |
125 |
|
int x; |
126 |
|
int fn; |
127 |
< |
int toread; |
128 |
< |
ssize_t size; |
111 |
< |
int t_read; |
127 |
> |
int len; |
128 |
> |
int rc; |
129 |
|
#endif |
130 |
|
|
131 |
|
if((proc_dir=opendir(PROC_LOCATION))==NULL){ |
132 |
< |
return -1; |
132 |
> |
return NULL; |
133 |
|
} |
134 |
|
|
135 |
|
while((dir_entry=readdir(proc_dir))!=NULL){ |
150 |
|
fread(&process_info, sizeof(psinfo_t), 1, f); |
151 |
|
#endif |
152 |
|
|
153 |
< |
proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t)); |
153 |
> |
if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) { |
154 |
> |
return NULL; |
155 |
> |
} |
156 |
|
proc_state_ptr = proc_state+proc_state_size; |
157 |
+ |
|
158 |
|
#ifdef SOLARIS |
159 |
|
proc_state_ptr->pid = process_info.pr_pid; |
160 |
|
proc_state_ptr->parent = process_info.pr_ppid; |
170 |
|
proc_state_ptr->process_name = strdup(process_info.pr_fname); |
171 |
|
proc_state_ptr->proctitle = strdup(process_info.pr_psargs); |
172 |
|
|
173 |
< |
if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING; |
174 |
< |
if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING; |
175 |
< |
if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE; |
176 |
< |
if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED; |
177 |
< |
if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING; |
173 |
> |
if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
174 |
> |
if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
175 |
> |
if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
176 |
> |
if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
177 |
> |
if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
178 |
|
#endif |
179 |
|
#ifdef LINUX |
180 |
|
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)); |
181 |
|
proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize(); |
182 |
< |
if(s == 'S') proc_state_ptr->state = SLEEPING; |
183 |
< |
if(s == 'R') proc_state_ptr->state = RUNNING; |
184 |
< |
if(s == 'Z') proc_state_ptr->state = ZOMBIE; |
185 |
< |
if(s == 'T') proc_state_ptr->state = STOPPED; |
186 |
< |
if(s == 'D') proc_state_ptr->state = STOPPED; |
182 |
> |
if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
183 |
> |
if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
184 |
> |
if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
185 |
> |
if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
186 |
> |
if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
187 |
|
|
188 |
|
/* pa_name[0] should = '(' */ |
189 |
|
ptr = strchr(&ps_name[1], ')'); |
190 |
|
if(ptr !=NULL) *ptr='\0'; |
171 |
– |
proc_state_ptr->process_name = strdup(&ps_name[1]); |
191 |
|
|
192 |
+ |
if (sg_update_string(&proc_state_ptr->process_name, |
193 |
+ |
&ps_name[1]) < 0) { |
194 |
+ |
return NULL; |
195 |
+ |
} |
196 |
+ |
|
197 |
|
/* Need to do cpu */ |
198 |
|
|
199 |
|
|
200 |
+ |
fclose(f); |
201 |
+ |
|
202 |
|
/* proctitle */ |
203 |
|
snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name); |
204 |
|
|
207 |
|
* Ah well, move onwards to the next one */ |
208 |
|
continue; |
209 |
|
} |
210 |
< |
#define PSARG_START_SIZE 128 |
211 |
< |
if(psargs == NULL){ |
212 |
< |
psargs = malloc(PSARG_START_SIZE); |
213 |
< |
psarg_size = PSARG_START_SIZE; |
210 |
> |
|
211 |
> |
#define READ_BLOCK_SIZE 128 |
212 |
> |
len = 0; |
213 |
> |
do { |
214 |
> |
if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) { |
215 |
> |
return NULL; |
216 |
> |
} |
217 |
> |
rc = read(fn, psargs + len, READ_BLOCK_SIZE); |
218 |
> |
if (rc > 0) { |
219 |
> |
len += rc; |
220 |
> |
} |
221 |
> |
} while (rc == READ_BLOCK_SIZE); |
222 |
> |
close(fn); |
223 |
> |
|
224 |
> |
if (rc == -1) { |
225 |
> |
/* Read failed; move on. */ |
226 |
> |
continue; |
227 |
|
} |
189 |
– |
ptr = psargs; |
190 |
– |
t_read = 0; |
191 |
– |
toread = psarg_size; |
192 |
– |
while((size = read(fn, ptr, toread)) == toread){ |
193 |
– |
psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE)); |
194 |
– |
ptr = psargs+psarg_size; |
195 |
– |
t_read = psarg_size; |
196 |
– |
psarg_size+=PSARG_START_SIZE; |
197 |
– |
toread = PSARG_START_SIZE; |
198 |
– |
} |
199 |
– |
if(size != -1) t_read+=size; |
228 |
|
|
229 |
+ |
/* Turn \0s into spaces within the command line. */ |
230 |
|
ptr = psargs; |
231 |
< |
for(x=0; x<t_read; x++){ |
231 |
> |
for(x = 0; x < len; x++) { |
232 |
|
if (*ptr == '\0') *ptr = ' '; |
233 |
|
ptr++; |
234 |
|
} |
206 |
– |
/* for safety sake */ |
207 |
– |
psargs[t_read] = '\0'; |
235 |
|
|
236 |
< |
proc_state_ptr->proctitle = strdup(psargs); |
236 |
> |
if (len == 0) { |
237 |
> |
/* We want psargs to be NULL. */ |
238 |
> |
if (VECTOR_RESIZE(psargs, 0) < 0) { |
239 |
> |
return NULL; |
240 |
> |
} |
241 |
> |
} else { |
242 |
> |
/* Not empty, so append a \0. */ |
243 |
> |
if (VECTOR_RESIZE(psargs, len + 1) < 0) { |
244 |
> |
return NULL; |
245 |
> |
} |
246 |
> |
psargs[len] = '\0'; |
247 |
> |
} |
248 |
|
|
249 |
+ |
if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) { |
250 |
+ |
return NULL; |
251 |
+ |
} |
252 |
|
#endif |
253 |
|
|
254 |
|
proc_state_size++; |
214 |
– |
|
215 |
– |
fclose(f); |
255 |
|
} |
256 |
|
closedir(proc_dir); |
257 |
|
#endif |
262 |
|
mib[2] = KERN_PROC_ALL; |
263 |
|
|
264 |
|
if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
265 |
< |
return -1; |
265 |
> |
return NULL; |
266 |
|
} |
267 |
|
|
268 |
|
procs = size / sizeof(struct kinfo_proc); |
269 |
|
|
270 |
|
kp_stats = malloc(size); |
271 |
|
if(kp_stats == NULL) { |
272 |
< |
return -1; |
272 |
> |
return NULL; |
273 |
|
} |
274 |
+ |
memset(kp_stats, 0, size); |
275 |
|
|
276 |
|
if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) { |
277 |
|
free(kp_stats); |
278 |
< |
return -1; |
278 |
> |
return NULL; |
279 |
|
} |
280 |
|
|
281 |
|
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
282 |
< |
kvmd = get_kvm2(); |
282 |
> |
kvmd = sg_get_kvm2(); |
283 |
|
#endif |
284 |
|
|
285 |
|
for (i = 0; i < procs; i++) { |
286 |
< |
/* replace with something more sensible */ |
287 |
< |
proc_state = realloc(proc_state, |
288 |
< |
(1+proc_state_size)*sizeof(proc_state_t)); |
289 |
< |
if(proc_state == NULL ) { |
290 |
< |
return -1; |
286 |
> |
const char *name; |
287 |
> |
|
288 |
> |
#ifdef FREEBSD5 |
289 |
> |
if (kp_stats[i].ki_stat == 0) { |
290 |
> |
#else |
291 |
> |
if (kp_stats[i].kp_proc.p_stat == 0) { |
292 |
> |
#endif |
293 |
> |
/* FreeBSD 5 deliberately overallocates the array that |
294 |
> |
* the sysctl returns, so we'll get a few junk |
295 |
> |
* processes on the end that we have to ignore. (Search |
296 |
> |
* for "overestimate by 5 procs" in |
297 |
> |
* src/sys/kern/kern_proc.c for more details.) */ |
298 |
> |
continue; |
299 |
|
} |
300 |
+ |
|
301 |
+ |
if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) { |
302 |
+ |
return NULL; |
303 |
+ |
} |
304 |
|
proc_state_ptr = proc_state+proc_state_size; |
305 |
|
|
306 |
|
#ifdef FREEBSD5 |
307 |
< |
proc_state_ptr->process_name = |
256 |
< |
strdup(kp_stats[i].ki_comm); |
307 |
> |
name = kp_stats[i].ki_comm; |
308 |
|
#elif defined(DFBSD) |
309 |
< |
proc_state_ptr->process_name = |
259 |
< |
strdup(kp_stats[i].kp_thread.td_comm); |
309 |
> |
name = kp_stats[i].kp_thread.td_comm; |
310 |
|
#else |
311 |
< |
proc_state_ptr->process_name = |
262 |
< |
strdup(kp_stats[i].kp_proc.p_comm); |
311 |
> |
name = kp_stats[i].kp_proc.p_comm; |
312 |
|
#endif |
313 |
+ |
if (sg_update_string(&proc_state_ptr->process_name, name) < 0) { |
314 |
+ |
return NULL; |
315 |
+ |
} |
316 |
|
|
317 |
|
#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD) |
318 |
|
size = sizeof(buflen); |
319 |
|
|
320 |
|
#ifdef FREEBSD5 |
321 |
|
if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) { |
322 |
< |
return -1; |
322 |
> |
return NULL; |
323 |
|
} |
324 |
|
#else |
325 |
+ |
/* FIXME - this value can be too large on some of |
326 |
+ |
the BSD's, which causes sysctl not to return |
327 |
+ |
anything. Maybe we need something smaller? */ |
328 |
|
mib[1] = KERN_ARGMAX; |
329 |
|
|
330 |
|
if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) { |
331 |
< |
return -1; |
331 |
> |
return NULL; |
332 |
|
} |
333 |
|
#endif |
334 |
|
|
335 |
|
proctitle = malloc(buflen); |
336 |
|
if(proctitle == NULL) { |
337 |
< |
return -1; |
337 |
> |
return NULL; |
338 |
|
} |
339 |
|
|
340 |
|
size = buflen; |
348 |
|
mib[3] = KERN_PROC_ARGV; |
349 |
|
#endif |
350 |
|
|
351 |
+ |
free(proc_state_ptr->proctitle); |
352 |
|
if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) { |
353 |
|
free(proctitle); |
354 |
|
proc_state_ptr->proctitle = NULL; |
356 |
|
else if(size > 0) { |
357 |
|
proc_state_ptr->proctitle = malloc(size+1); |
358 |
|
if(proc_state_ptr->proctitle == NULL) { |
359 |
< |
return -1; |
359 |
> |
return NULL; |
360 |
|
} |
361 |
|
p = proctitle; |
362 |
< |
proc_state_ptr->proctitle[0] = NULL; |
362 |
> |
proc_state_ptr->proctitle[0] = '\0'; |
363 |
|
do { |
364 |
< |
strlcat(proc_state_ptr->proctitle, p, size+1); |
365 |
< |
strlcat(proc_state_ptr->proctitle, " ", size+1); |
364 |
> |
sg_strlcat(proc_state_ptr->proctitle, p, size+1); |
365 |
> |
sg_strlcat(proc_state_ptr->proctitle, " ", size+1); |
366 |
|
p += strlen(p) + 1; |
367 |
|
} while (p < proctitle + size); |
368 |
|
free(proctitle); |
374 |
|
proc_state_ptr->proctitle = NULL; |
375 |
|
} |
376 |
|
#else |
377 |
+ |
free(proc_state_ptr->proctitle); |
378 |
|
if(kvmd != NULL) { |
379 |
|
args = kvm_getargv(kvmd, &(kp_stats[i]), 0); |
380 |
|
if(args != NULL) { |
381 |
< |
alloc = 1; |
382 |
< |
proctitle = malloc(alloc); |
381 |
> |
argsp = args; |
382 |
> |
while(*argsp != NULL) { |
383 |
> |
argslen += strlen(*argsp) + 1; |
384 |
> |
argsp++; |
385 |
> |
} |
386 |
> |
proctitle = malloc(argslen + 1); |
387 |
> |
proctitle[0] = '\0'; |
388 |
|
if(proctitle == NULL) { |
389 |
< |
return -1; |
389 |
> |
return NULL; |
390 |
|
} |
391 |
|
while(*args != NULL) { |
392 |
< |
if(strlen(proctitle) + strlen(*args) >= alloc) { |
393 |
< |
alloc = (alloc + strlen(*args)) * 2; |
332 |
< |
proctitletmp = realloc(proctitle, alloc); |
333 |
< |
if(proctitletmp == NULL) { |
334 |
< |
return -1; |
335 |
< |
} |
336 |
< |
proctitle = proctitletmp; |
337 |
< |
} |
338 |
< |
strlcat(proctitle, *args, alloc); |
339 |
< |
strlcat(proctitle, " ", alloc); |
392 |
> |
sg_strlcat(proctitle, *args, argslen + 1); |
393 |
> |
sg_strlcat(proctitle, " ", argslen + 1); |
394 |
|
args++; |
395 |
|
} |
396 |
|
/* remove trailing space */ |
467 |
|
proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice; |
468 |
|
#endif |
469 |
|
|
470 |
+ |
#ifdef NETBSD2 |
471 |
+ |
{ |
472 |
+ |
size_t size; |
473 |
+ |
int mib[5]; |
474 |
+ |
|
475 |
+ |
mib[0] = CTL_KERN; |
476 |
+ |
mib[1] = KERN_LWP; |
477 |
+ |
mib[2] = kp_stats[i].kp_proc.p_pid; |
478 |
+ |
mib[3] = sizeof(struct kinfo_lwp); |
479 |
+ |
mib[4] = 0; |
480 |
+ |
|
481 |
+ |
if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) { |
482 |
+ |
return NULL; |
483 |
+ |
} |
484 |
+ |
|
485 |
+ |
lwps = size / sizeof(struct kinfo_lwp); |
486 |
+ |
mib[4] = lwps; |
487 |
+ |
|
488 |
+ |
kl_stats = malloc(size); |
489 |
+ |
if(kl_stats == NULL) { |
490 |
+ |
return NULL; |
491 |
+ |
} |
492 |
+ |
|
493 |
+ |
if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) { |
494 |
+ |
return NULL; |
495 |
+ |
} |
496 |
+ |
} |
497 |
+ |
|
498 |
+ |
switch(kp_stats[i].kp_proc.p_stat) { |
499 |
+ |
case SIDL: |
500 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
501 |
+ |
break; |
502 |
+ |
case SACTIVE: |
503 |
+ |
{ |
504 |
+ |
int i; |
505 |
+ |
|
506 |
+ |
for(i = 0; i < lwps; i++) { |
507 |
+ |
switch(kl_stats[i].l_stat) { |
508 |
+ |
case LSONPROC: |
509 |
+ |
case LSRUN: |
510 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
511 |
+ |
goto end; |
512 |
+ |
case LSSLEEP: |
513 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
514 |
+ |
goto end; |
515 |
+ |
case LSSTOP: |
516 |
+ |
case LSSUSPENDED: |
517 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
518 |
+ |
goto end; |
519 |
+ |
} |
520 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN; |
521 |
+ |
} |
522 |
+ |
end: ; |
523 |
+ |
} |
524 |
+ |
break; |
525 |
+ |
case SSTOP: |
526 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
527 |
+ |
break; |
528 |
+ |
case SZOMB: |
529 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
530 |
+ |
break; |
531 |
+ |
default: |
532 |
+ |
proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN; |
533 |
+ |
break; |
534 |
+ |
} |
535 |
+ |
#else |
536 |
|
#ifdef FREEBSD5 |
537 |
|
switch (kp_stats[i].ki_stat) { |
538 |
|
#else |
543 |
|
#ifdef SONPROC |
544 |
|
case SONPROC: /* NetBSD */ |
545 |
|
#endif |
546 |
< |
proc_state_ptr->state = RUNNING; |
546 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
547 |
|
break; |
548 |
|
case SSLEEP: |
549 |
|
#ifdef SWAIT |
552 |
|
#ifdef SLOCK |
553 |
|
case SLOCK: /* FreeBSD 5 */ |
554 |
|
#endif |
555 |
< |
proc_state_ptr->state = SLEEPING; |
555 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
556 |
|
break; |
557 |
|
case SSTOP: |
558 |
< |
proc_state_ptr->state = STOPPED; |
558 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
559 |
|
break; |
560 |
|
case SZOMB: |
561 |
|
#ifdef SDEAD |
562 |
|
case SDEAD: /* OpenBSD & NetBSD */ |
563 |
|
#endif |
564 |
< |
proc_state_ptr->state = ZOMBIE; |
564 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
565 |
|
break; |
566 |
|
default: |
567 |
< |
proc_state_ptr->state = UNKNOWN; |
567 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN; |
568 |
|
break; |
569 |
|
} |
570 |
+ |
#endif |
571 |
|
proc_state_size++; |
572 |
|
} |
573 |
|
|
575 |
|
#endif |
576 |
|
|
577 |
|
#ifdef CYGWIN |
578 |
< |
return -1; |
578 |
> |
return NULL; |
579 |
|
#endif |
580 |
|
|
581 |
< |
*ps = proc_state; |
582 |
< |
return proc_state_size; |
581 |
> |
*entries = proc_state_size; |
582 |
> |
return proc_state; |
583 |
|
} |
584 |
|
|
585 |
< |
process_stat_t *get_process_stats() { |
586 |
< |
static process_stat_t process_stat; |
587 |
< |
proc_state_t *ps; |
585 |
> |
sg_process_count *sg_get_process_count() { |
586 |
> |
static sg_process_count process_stat; |
587 |
> |
sg_process_stats *ps; |
588 |
|
int ps_size, x; |
589 |
|
|
590 |
|
process_stat.sleeping = 0; |
593 |
|
process_stat.stopped = 0; |
594 |
|
process_stat.total = 0; |
595 |
|
|
596 |
< |
ps_size = get_proc_snapshot(&ps); |
597 |
< |
|
477 |
< |
if(ps_size < 0) { |
596 |
> |
ps = sg_get_process_stats(&ps_size); |
597 |
> |
if (ps == NULL) { |
598 |
|
return NULL; |
599 |
|
} |
600 |
|
|
601 |
|
for(x = 0; x < ps_size; x++) { |
602 |
|
switch (ps->state) { |
603 |
< |
case RUNNING: |
603 |
> |
case SG_PROCESS_STATE_RUNNING: |
604 |
|
process_stat.running++; |
605 |
|
break; |
606 |
< |
case SLEEPING: |
606 |
> |
case SG_PROCESS_STATE_SLEEPING: |
607 |
|
process_stat.sleeping++; |
608 |
|
break; |
609 |
< |
case STOPPED: |
609 |
> |
case SG_PROCESS_STATE_STOPPED: |
610 |
|
process_stat.stopped++; |
611 |
|
break; |
612 |
< |
case ZOMBIE: |
612 |
> |
case SG_PROCESS_STATE_ZOMBIE: |
613 |
|
process_stat.zombie++; |
614 |
|
break; |
615 |
|
default: |
616 |
< |
/* currently no mapping for UNKNOWN in process_stat_t */ |
616 |
> |
/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in |
617 |
> |
* sg_process_count */ |
618 |
|
break; |
619 |
|
} |
620 |
|
ps++; |