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; |
76 |
|
int mib[4]; |
77 |
|
size_t size; |
78 |
|
struct kinfo_proc *kp_stats; |
79 |
< |
int procs, i, alloc; |
80 |
< |
char *proctitle; |
81 |
< |
#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD) |
79 |
> |
int procs, i; |
80 |
> |
char *proctitle, *proctitletmp; |
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) |
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; |
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++) { |
297 |
|
proc_state_ptr->proctitle = NULL; |
298 |
|
} |
299 |
|
else if(size > 0) { |
300 |
< |
proc_state_ptr->proctitle = malloc(size); |
300 |
> |
proc_state_ptr->proctitle = malloc(size+1); |
301 |
|
if(proc_state_ptr->proctitle == NULL) { |
302 |
|
return NULL; |
303 |
|
} |
304 |
|
p = proctitle; |
305 |
|
proc_state_ptr->proctitle[0] = NULL; |
306 |
|
do { |
307 |
< |
strncat(proc_state_ptr->proctitle, p, strlen(p)); |
308 |
< |
strncat(proc_state_ptr->proctitle, " ", 1); |
307 |
> |
strlcat(proc_state_ptr->proctitle, p, size+1); |
308 |
> |
strlcat(proc_state_ptr->proctitle, " ", size+1); |
309 |
|
p += strlen(p) + 1; |
310 |
|
} while (p < proctitle + size); |
311 |
|
free(proctitle); |
312 |
< |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = NULL; |
312 |
> |
/* remove trailing space */ |
313 |
> |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = \0; |
314 |
|
} |
315 |
|
else { |
316 |
|
free(proctitle); |
327 |
|
} |
328 |
|
while(*args != NULL) { |
329 |
|
if(strlen(proctitle) + strlen(*args) >= alloc) { |
330 |
< |
alloc = (alloc + strlen(*args)) << 1; |
331 |
< |
proctitle = realloc(proctitle, alloc); |
332 |
< |
if(proctitle == NULL) { |
330 |
> |
alloc = (alloc + strlen(*args)) * 2; |
331 |
> |
proctitletmp = realloc(proctitle, alloc); |
332 |
> |
if(proctitletmp == NULL) { |
333 |
|
return NULL; |
334 |
|
} |
335 |
+ |
proctitle = proctitletmp; |
336 |
|
} |
337 |
< |
strncat(proctitle, *args, strlen(*args)); |
338 |
< |
strncat(proctitle, " ", 1); |
337 |
> |
strlcat(proctitle, *args, alloc); |
338 |
> |
strlcat(proctitle, " ", alloc); |
339 |
|
args++; |
340 |
|
} |
341 |
|
/* remove trailing space */ |
342 |
< |
proctitle[strlen(proctitle)-1] = NULL; |
342 |
> |
proctitle[strlen(proctitle)-1] = \0; |
343 |
|
proc_state_ptr->proctitle = proctitle; |
344 |
|
} |
345 |
|
else { |
469 |
|
|
470 |
|
ps_size = get_proc_snapshot(&ps); |
471 |
|
|
472 |
< |
if(ps_size == NULL) { |
472 |
> |
if(ps_size == 0) { |
473 |
|
return NULL; |
474 |
|
} |
475 |
|
|
476 |
|
for(x = 0; x < ps_size; x++) { |
477 |
|
switch (ps->state) { |
473 |
– |
/* currently no mapping for UNKNOWN in process_stat_t */ |
478 |
|
case RUNNING: |
479 |
|
process_stat.running++; |
480 |
|
break; |
486 |
|
break; |
487 |
|
case ZOMBIE: |
488 |
|
process_stat.zombie++; |
489 |
+ |
break; |
490 |
+ |
default: |
491 |
+ |
/* currently no mapping for UNKNOWN in process_stat_t */ |
492 |
|
break; |
493 |
|
} |
494 |
|
ps++; |