| 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> |
| 63 |
|
#include <paths.h> |
| 64 |
|
#include <fcntl.h> |
| 65 |
|
#include <limits.h> |
| 66 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 67 |
|
#include <kvm.h> |
| 68 |
+ |
#include <tools.h> |
| 69 |
|
#endif |
| 70 |
+ |
#include <unistd.h> |
| 71 |
+ |
#endif |
| 72 |
|
|
| 73 |
< |
int get_proc_snapshot(proc_state_t **ps){ |
| 74 |
< |
proc_state_t *proc_state = NULL; |
| 75 |
< |
proc_state_t *proc_state_ptr; |
| 73 |
> |
static void proc_state_init(sg_process_stats *s) { |
| 74 |
> |
s->process_name = NULL; |
| 75 |
> |
s->proctitle = NULL; |
| 76 |
> |
} |
| 77 |
> |
|
| 78 |
> |
static void proc_state_destroy(sg_process_stats *s) { |
| 79 |
> |
free(s->process_name); |
| 80 |
> |
free(s->proctitle); |
| 81 |
> |
} |
| 82 |
> |
|
| 83 |
> |
sg_process_stats *sg_get_process_stats(int *entries){ |
| 84 |
> |
VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64, |
| 85 |
> |
proc_state_init, proc_state_destroy); |
| 86 |
|
int proc_state_size = 0; |
| 87 |
+ |
sg_process_stats *proc_state_ptr; |
| 88 |
|
#ifdef ALLBSD |
| 89 |
< |
int mib[3]; |
| 89 |
> |
int mib[4]; |
| 90 |
|
size_t size; |
| 91 |
|
struct kinfo_proc *kp_stats; |
| 92 |
< |
int procs, i, alloc; |
| 76 |
< |
static kvm_t *kvmd; |
| 77 |
< |
char **args; |
| 92 |
> |
int procs, i; |
| 93 |
|
char *proctitle; |
| 94 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 95 |
+ |
kvm_t *kvmd; |
| 96 |
+ |
char **args, **argsp; |
| 97 |
+ |
int argslen = 0; |
| 98 |
+ |
#else |
| 99 |
+ |
long buflen; |
| 100 |
+ |
char *p; |
| 101 |
|
#endif |
| 102 |
+ |
#endif |
| 103 |
|
#if defined(SOLARIS) || defined(LINUX) |
| 104 |
|
DIR *proc_dir; |
| 105 |
|
struct dirent *dir_entry; |
| 113 |
|
/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */ |
| 114 |
|
char ps_name[4096]; |
| 115 |
|
char *ptr; |
| 116 |
< |
static char *psargs = NULL; |
| 94 |
< |
static int psarg_size = 0; |
| 116 |
> |
VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL); |
| 117 |
|
unsigned long stime, utime; |
| 118 |
|
int x; |
| 119 |
|
int fn; |
| 120 |
< |
int toread; |
| 121 |
< |
ssize_t size; |
| 100 |
< |
int t_read; |
| 120 |
> |
int len; |
| 121 |
> |
int rc; |
| 122 |
|
#endif |
| 123 |
|
|
| 124 |
|
if((proc_dir=opendir(PROC_LOCATION))==NULL){ |
| 125 |
< |
return -1; |
| 125 |
> |
return NULL; |
| 126 |
|
} |
| 127 |
|
|
| 128 |
|
while((dir_entry=readdir(proc_dir))!=NULL){ |
| 143 |
|
fread(&process_info, sizeof(psinfo_t), 1, f); |
| 144 |
|
#endif |
| 145 |
|
|
| 146 |
< |
proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t)); |
| 146 |
> |
if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) { |
| 147 |
> |
return NULL; |
| 148 |
> |
} |
| 149 |
|
proc_state_ptr = proc_state+proc_state_size; |
| 150 |
+ |
|
| 151 |
|
#ifdef SOLARIS |
| 152 |
|
proc_state_ptr->pid = process_info.pr_pid; |
| 153 |
|
proc_state_ptr->parent = process_info.pr_ppid; |
| 163 |
|
proc_state_ptr->process_name = strdup(process_info.pr_fname); |
| 164 |
|
proc_state_ptr->proctitle = strdup(process_info.pr_psargs); |
| 165 |
|
|
| 166 |
< |
if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING; |
| 167 |
< |
if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING; |
| 168 |
< |
if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE; |
| 169 |
< |
if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED; |
| 170 |
< |
if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING; |
| 166 |
> |
if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
| 167 |
> |
if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
| 168 |
> |
if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
| 169 |
> |
if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
| 170 |
> |
if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
| 171 |
|
#endif |
| 172 |
|
#ifdef LINUX |
| 173 |
< |
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)); |
| 173 |
> |
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)); |
| 174 |
|
proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize(); |
| 175 |
< |
if(s == 'S') proc_state_ptr->state = SLEEPING; |
| 176 |
< |
if(s == 'R') proc_state_ptr->state = RUNNING; |
| 177 |
< |
if(s == 'Z') proc_state_ptr->state = ZOMBIE; |
| 178 |
< |
if(s == 'T') proc_state_ptr->state = STOPPED; |
| 179 |
< |
if(s == 'D') proc_state_ptr->state = STOPPED; |
| 175 |
> |
if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
| 176 |
> |
if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
| 177 |
> |
if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
| 178 |
> |
if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
| 179 |
> |
if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
| 180 |
|
|
| 181 |
|
/* pa_name[0] should = '(' */ |
| 182 |
|
ptr = strchr(&ps_name[1], ')'); |
| 183 |
|
if(ptr !=NULL) *ptr='\0'; |
| 160 |
– |
proc_state_ptr->process_name = strdup(&ps_name[1]); |
| 184 |
|
|
| 185 |
+ |
if (sg_update_string(&proc_state_ptr->process_name, |
| 186 |
+ |
&ps_name[1]) < 0) { |
| 187 |
+ |
return NULL; |
| 188 |
+ |
} |
| 189 |
+ |
|
| 190 |
|
/* Need to do cpu */ |
| 191 |
|
|
| 192 |
|
|
| 193 |
+ |
fclose(f); |
| 194 |
+ |
|
| 195 |
|
/* proctitle */ |
| 196 |
|
snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name); |
| 197 |
|
|
| 200 |
|
* Ah well, move onwards to the next one */ |
| 201 |
|
continue; |
| 202 |
|
} |
| 203 |
< |
#define PSARG_START_SIZE 128 |
| 204 |
< |
if(psargs == NULL){ |
| 205 |
< |
psargs = malloc(PSARG_START_SIZE); |
| 206 |
< |
psarg_size = PSARG_START_SIZE; |
| 203 |
> |
|
| 204 |
> |
#define READ_BLOCK_SIZE 128 |
| 205 |
> |
len = 0; |
| 206 |
> |
do { |
| 207 |
> |
if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) { |
| 208 |
> |
return NULL; |
| 209 |
> |
} |
| 210 |
> |
rc = read(fn, psargs + len, READ_BLOCK_SIZE); |
| 211 |
> |
if (rc > 0) { |
| 212 |
> |
len += rc; |
| 213 |
> |
} |
| 214 |
> |
} while (rc == READ_BLOCK_SIZE); |
| 215 |
> |
close(fn); |
| 216 |
> |
|
| 217 |
> |
if (rc == -1) { |
| 218 |
> |
/* Read failed; move on. */ |
| 219 |
> |
continue; |
| 220 |
|
} |
| 178 |
– |
ptr = psargs; |
| 179 |
– |
t_read = 0; |
| 180 |
– |
toread = psarg_size; |
| 181 |
– |
while((size = read(fn, ptr, toread)) == toread){ |
| 182 |
– |
psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE)); |
| 183 |
– |
ptr = psargs+psarg_size; |
| 184 |
– |
t_read = psarg_size; |
| 185 |
– |
psarg_size+=PSARG_START_SIZE; |
| 186 |
– |
toread = PSARG_START_SIZE; |
| 187 |
– |
} |
| 188 |
– |
if(size != -1) t_read+=size; |
| 221 |
|
|
| 222 |
+ |
/* Turn \0s into spaces within the command line. */ |
| 223 |
|
ptr = psargs; |
| 224 |
< |
for(x=0; x<t_read; x++){ |
| 224 |
> |
for(x = 0; x < len; x++) { |
| 225 |
|
if (*ptr == '\0') *ptr = ' '; |
| 226 |
|
ptr++; |
| 227 |
|
} |
| 195 |
– |
/* for safety sake */ |
| 196 |
– |
psargs[t_read] = '\0'; |
| 228 |
|
|
| 229 |
< |
proc_state_ptr->proctitle = strdup(psargs); |
| 229 |
> |
if (len == 0) { |
| 230 |
> |
/* We want psargs to be NULL. */ |
| 231 |
> |
if (VECTOR_RESIZE(psargs, 0) < 0) { |
| 232 |
> |
return NULL; |
| 233 |
> |
} |
| 234 |
> |
} else { |
| 235 |
> |
/* Not empty, so append a \0. */ |
| 236 |
> |
if (VECTOR_RESIZE(psargs, len + 1) < 0) { |
| 237 |
> |
return NULL; |
| 238 |
> |
} |
| 239 |
> |
psargs[len] = '\0'; |
| 240 |
> |
} |
| 241 |
|
|
| 242 |
+ |
if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) { |
| 243 |
+ |
return NULL; |
| 244 |
+ |
} |
| 245 |
|
#endif |
| 246 |
|
|
| 247 |
|
proc_state_size++; |
| 203 |
– |
|
| 204 |
– |
fclose(f); |
| 248 |
|
} |
| 249 |
|
closedir(proc_dir); |
| 250 |
|
#endif |
| 251 |
|
|
| 252 |
|
#ifdef ALLBSD |
| 253 |
+ |
mib[0] = CTL_KERN; |
| 254 |
+ |
mib[1] = KERN_PROC; |
| 255 |
+ |
mib[2] = KERN_PROC_ALL; |
| 256 |
|
|
| 257 |
< |
#if defined(NETBSD) || defined(OPENBSD) |
| 258 |
< |
kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); |
| 259 |
< |
#else |
| 214 |
< |
kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
| 215 |
< |
#endif |
| 257 |
> |
if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
| 258 |
> |
return NULL; |
| 259 |
> |
} |
| 260 |
|
|
| 261 |
< |
if(kvmd == NULL) return NULL; |
| 261 |
> |
procs = size / sizeof(struct kinfo_proc); |
| 262 |
|
|
| 263 |
< |
kp_stats = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &procs); |
| 263 |
> |
kp_stats = malloc(size); |
| 264 |
> |
if(kp_stats == NULL) { |
| 265 |
> |
return NULL; |
| 266 |
> |
} |
| 267 |
> |
memset(kp_stats, 0, size); |
| 268 |
|
|
| 269 |
< |
if (kp_stats == NULL || procs < 0) { |
| 269 |
> |
if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) { |
| 270 |
> |
free(kp_stats); |
| 271 |
|
return NULL; |
| 272 |
|
} |
| 273 |
|
|
| 274 |
+ |
#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD) |
| 275 |
+ |
kvmd = sg_get_kvm2(); |
| 276 |
+ |
#endif |
| 277 |
+ |
|
| 278 |
|
for (i = 0; i < procs; i++) { |
| 279 |
< |
/* replace with something more sensible */ |
| 280 |
< |
proc_state = realloc(proc_state, |
| 281 |
< |
(1+proc_state_size)*sizeof(proc_state_t)); |
| 282 |
< |
if(proc_state == NULL ) { |
| 279 |
> |
const char *name; |
| 280 |
> |
|
| 281 |
> |
if (kp_stats[i].ki_stat == 0) { |
| 282 |
> |
/* FreeBSD 5 deliberately overallocates the array that |
| 283 |
> |
* the sysctl returns, so we'll get a few junk |
| 284 |
> |
* processes on the end that we have to ignore. (Search |
| 285 |
> |
* for "overestimate by 5 procs" in |
| 286 |
> |
* src/sys/kern/kern_proc.c for more details.) */ |
| 287 |
> |
continue; |
| 288 |
> |
} |
| 289 |
> |
|
| 290 |
> |
if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) { |
| 291 |
|
return NULL; |
| 292 |
|
} |
| 293 |
|
proc_state_ptr = proc_state+proc_state_size; |
| 294 |
|
|
| 295 |
|
#ifdef FREEBSD5 |
| 296 |
< |
proc_state_ptr->process_name = |
| 297 |
< |
strdup(kp_stats[i].ki_comm); |
| 296 |
> |
name = kp_stats[i].ki_comm; |
| 297 |
> |
#elif defined(DFBSD) |
| 298 |
> |
name = kp_stats[i].kp_thread.td_comm; |
| 299 |
|
#else |
| 300 |
< |
proc_state_ptr->process_name = |
| 239 |
< |
strdup(kp_stats[i].kp_proc.p_comm); |
| 300 |
> |
name = kp_stats[i].kp_proc.p_comm; |
| 301 |
|
#endif |
| 302 |
+ |
if (sg_update_string(&proc_state_ptr->process_name, name) < 0) { |
| 303 |
+ |
return NULL; |
| 304 |
+ |
} |
| 305 |
|
|
| 306 |
< |
args = kvm_getargv(kvmd, &(kp_stats[i]), 0); |
| 307 |
< |
if(args != NULL) { |
| 308 |
< |
alloc = 1; |
| 309 |
< |
proctitle = malloc(alloc); |
| 310 |
< |
if(proctitle == NULL) { |
| 306 |
> |
#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD) |
| 307 |
> |
size = sizeof(buflen); |
| 308 |
> |
|
| 309 |
> |
#ifdef FREEBSD5 |
| 310 |
> |
if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) { |
| 311 |
> |
return NULL; |
| 312 |
> |
} |
| 313 |
> |
#else |
| 314 |
> |
mib[1] = KERN_ARGMAX; |
| 315 |
> |
|
| 316 |
> |
if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) { |
| 317 |
> |
return NULL; |
| 318 |
> |
} |
| 319 |
> |
#endif |
| 320 |
> |
|
| 321 |
> |
proctitle = malloc(buflen); |
| 322 |
> |
if(proctitle == NULL) { |
| 323 |
> |
return NULL; |
| 324 |
> |
} |
| 325 |
> |
|
| 326 |
> |
size = buflen; |
| 327 |
> |
|
| 328 |
> |
#ifdef FREEBSD5 |
| 329 |
> |
mib[2] = KERN_PROC_ARGS; |
| 330 |
> |
mib[3] = kp_stats[i].ki_pid; |
| 331 |
> |
#else |
| 332 |
> |
mib[1] = KERN_PROC_ARGS; |
| 333 |
> |
mib[2] = kp_stats[i].kp_proc.p_pid; |
| 334 |
> |
mib[3] = KERN_PROC_ARGV; |
| 335 |
> |
#endif |
| 336 |
> |
|
| 337 |
> |
free(proc_state_ptr->proctitle); |
| 338 |
> |
if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) { |
| 339 |
> |
free(proctitle); |
| 340 |
> |
proc_state_ptr->proctitle = NULL; |
| 341 |
> |
} |
| 342 |
> |
else if(size > 0) { |
| 343 |
> |
proc_state_ptr->proctitle = malloc(size+1); |
| 344 |
> |
if(proc_state_ptr->proctitle == NULL) { |
| 345 |
|
return NULL; |
| 346 |
|
} |
| 347 |
< |
while(*args != NULL) { |
| 348 |
< |
if(strlen(proctitle) + strlen(*args) >= alloc) { |
| 349 |
< |
alloc = (alloc + strlen(*args)) << 1; |
| 350 |
< |
proctitle = realloc(proctitle, alloc); |
| 351 |
< |
if(proctitle == NULL) { |
| 352 |
< |
return NULL; |
| 353 |
< |
} |
| 354 |
< |
} |
| 257 |
< |
strncat(proctitle, *args, strlen(*args)); |
| 258 |
< |
strncat(proctitle, " ", 1); |
| 259 |
< |
args++; |
| 260 |
< |
} |
| 347 |
> |
p = proctitle; |
| 348 |
> |
proc_state_ptr->proctitle[0] = '\0'; |
| 349 |
> |
do { |
| 350 |
> |
sg_strlcat(proc_state_ptr->proctitle, p, size+1); |
| 351 |
> |
sg_strlcat(proc_state_ptr->proctitle, " ", size+1); |
| 352 |
> |
p += strlen(p) + 1; |
| 353 |
> |
} while (p < proctitle + size); |
| 354 |
> |
free(proctitle); |
| 355 |
|
/* remove trailing space */ |
| 356 |
< |
proctitle[strlen(proctitle)-1] = NULL; |
| 263 |
< |
proc_state_ptr->proctitle = proctitle; |
| 356 |
> |
proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0'; |
| 357 |
|
} |
| 358 |
|
else { |
| 359 |
< |
proc_state_ptr->proctitle = |
| 360 |
< |
malloc(strlen(proc_state_ptr->process_name)+4); |
| 361 |
< |
if(proc_state_ptr->proctitle == NULL) { |
| 362 |
< |
return NULL; |
| 359 |
> |
free(proctitle); |
| 360 |
> |
proc_state_ptr->proctitle = NULL; |
| 361 |
> |
} |
| 362 |
> |
#else |
| 363 |
> |
free(proc_state_ptr->proctitle); |
| 364 |
> |
if(kvmd != NULL) { |
| 365 |
> |
args = kvm_getargv(kvmd, &(kp_stats[i]), 0); |
| 366 |
> |
if(args != NULL) { |
| 367 |
> |
argsp = args; |
| 368 |
> |
while(*argsp != NULL) { |
| 369 |
> |
argslen += strlen(*argsp) + 1; |
| 370 |
> |
argsp++; |
| 371 |
> |
} |
| 372 |
> |
proctitle = malloc(argslen + 1); |
| 373 |
> |
proctitle[0] = '\0'; |
| 374 |
> |
if(proctitle == NULL) { |
| 375 |
> |
return NULL; |
| 376 |
> |
} |
| 377 |
> |
while(*args != NULL) { |
| 378 |
> |
sg_strlcat(proctitle, *args, argslen + 1); |
| 379 |
> |
sg_strlcat(proctitle, " ", argslen + 1); |
| 380 |
> |
args++; |
| 381 |
> |
} |
| 382 |
> |
/* remove trailing space */ |
| 383 |
> |
proctitle[strlen(proctitle)-1] = '\0'; |
| 384 |
> |
proc_state_ptr->proctitle = proctitle; |
| 385 |
|
} |
| 386 |
< |
sprintf(proc_state_ptr->proctitle, " (%s)", |
| 387 |
< |
proc_state_ptr->process_name); |
| 386 |
> |
else { |
| 387 |
> |
proc_state_ptr->proctitle = NULL; |
| 388 |
> |
} |
| 389 |
|
} |
| 390 |
+ |
else { |
| 391 |
+ |
proc_state_ptr->proctitle = NULL; |
| 392 |
+ |
} |
| 393 |
+ |
#endif |
| 394 |
|
|
| 395 |
|
#ifdef FREEBSD5 |
| 396 |
|
proc_state_ptr->pid = kp_stats[i].ki_pid; |
| 407 |
|
proc_state_ptr->euid = kp_stats[i].ki_uid; |
| 408 |
|
proc_state_ptr->gid = kp_stats[i].ki_rgid; |
| 409 |
|
proc_state_ptr->egid = kp_stats[i].ki_svgid; |
| 410 |
+ |
#elif defined(DFBSD) |
| 411 |
+ |
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid; |
| 412 |
+ |
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid; |
| 413 |
+ |
proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid; |
| 414 |
+ |
proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid; |
| 415 |
|
#else |
| 416 |
|
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid; |
| 417 |
|
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid; |
| 435 |
|
/* This is in pages */ |
| 436 |
|
proc_state_ptr->proc_resident = |
| 437 |
|
kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize(); |
| 313 |
– |
/* This is in microseconds */ |
| 438 |
|
#if defined(NETBSD) || defined(OPENBSD) |
| 439 |
|
proc_state_ptr->time_spent = |
| 440 |
|
kp_stats[i].kp_proc.p_rtime.tv_sec; |
| 441 |
+ |
#elif defined(DFBSD) |
| 442 |
+ |
proc_state_ptr->time_spent = |
| 443 |
+ |
( kp_stats[i].kp_thread.td_uticks + |
| 444 |
+ |
kp_stats[i].kp_thread.td_sticks + |
| 445 |
+ |
kp_stats[i].kp_thread.td_iticks ) / 1000000; |
| 446 |
|
#else |
| 447 |
+ |
/* This is in microseconds */ |
| 448 |
|
proc_state_ptr->time_spent = |
| 449 |
|
kp_stats[i].kp_proc.p_runtime / 1000000; |
| 450 |
|
#endif |
| 463 |
|
#ifdef SONPROC |
| 464 |
|
case SONPROC: /* NetBSD */ |
| 465 |
|
#endif |
| 466 |
< |
proc_state_ptr->state = RUNNING; |
| 466 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_RUNNING; |
| 467 |
|
break; |
| 468 |
|
case SSLEEP: |
| 469 |
|
#ifdef SWAIT |
| 472 |
|
#ifdef SLOCK |
| 473 |
|
case SLOCK: /* FreeBSD 5 */ |
| 474 |
|
#endif |
| 475 |
< |
proc_state_ptr->state = SLEEPING; |
| 475 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING; |
| 476 |
|
break; |
| 477 |
|
case SSTOP: |
| 478 |
< |
proc_state_ptr->state = STOPPED; |
| 478 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_STOPPED; |
| 479 |
|
break; |
| 480 |
|
case SZOMB: |
| 481 |
|
#ifdef SDEAD |
| 482 |
|
case SDEAD: /* OpenBSD & NetBSD */ |
| 483 |
|
#endif |
| 484 |
< |
proc_state_ptr->state = ZOMBIE; |
| 484 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE; |
| 485 |
|
break; |
| 486 |
|
default: |
| 487 |
< |
proc_state_ptr->state = UNKNOWN; |
| 487 |
> |
proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN; |
| 488 |
|
break; |
| 489 |
|
} |
| 490 |
|
proc_state_size++; |
| 493 |
|
free(kp_stats); |
| 494 |
|
#endif |
| 495 |
|
|
| 496 |
< |
*ps = proc_state; |
| 497 |
< |
return proc_state_size; |
| 496 |
> |
#ifdef CYGWIN |
| 497 |
> |
return NULL; |
| 498 |
> |
#endif |
| 499 |
> |
|
| 500 |
> |
*entries = proc_state_size; |
| 501 |
> |
return proc_state; |
| 502 |
|
} |
| 503 |
|
|
| 504 |
< |
process_stat_t *get_process_stats() { |
| 505 |
< |
static process_stat_t process_stat; |
| 506 |
< |
proc_state_t *ps; |
| 504 |
> |
sg_process_count *sg_get_process_count() { |
| 505 |
> |
static sg_process_count process_stat; |
| 506 |
> |
sg_process_stats *ps; |
| 507 |
|
int ps_size, x; |
| 508 |
|
|
| 509 |
|
process_stat.sleeping = 0; |
| 512 |
|
process_stat.stopped = 0; |
| 513 |
|
process_stat.total = 0; |
| 514 |
|
|
| 515 |
< |
ps_size = get_proc_snapshot(&ps); |
| 516 |
< |
|
| 383 |
< |
if(ps_size == NULL) { |
| 515 |
> |
ps = sg_get_process_stats(&ps_size); |
| 516 |
> |
if (ps == NULL) { |
| 517 |
|
return NULL; |
| 518 |
|
} |
| 519 |
|
|
| 520 |
|
for(x = 0; x < ps_size; x++) { |
| 521 |
|
switch (ps->state) { |
| 522 |
< |
/* currently no mapping for UNKNOWN in process_stat_t */ |
| 390 |
< |
case RUNNING: |
| 522 |
> |
case SG_PROCESS_STATE_RUNNING: |
| 523 |
|
process_stat.running++; |
| 524 |
|
break; |
| 525 |
< |
case SLEEPING: |
| 525 |
> |
case SG_PROCESS_STATE_SLEEPING: |
| 526 |
|
process_stat.sleeping++; |
| 527 |
|
break; |
| 528 |
< |
case STOPPED: |
| 528 |
> |
case SG_PROCESS_STATE_STOPPED: |
| 529 |
|
process_stat.stopped++; |
| 530 |
|
break; |
| 531 |
< |
case ZOMBIE: |
| 531 |
> |
case SG_PROCESS_STATE_ZOMBIE: |
| 532 |
|
process_stat.zombie++; |
| 533 |
+ |
break; |
| 534 |
+ |
default: |
| 535 |
+ |
/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in |
| 536 |
+ |
* sg_process_count */ |
| 537 |
|
break; |
| 538 |
|
} |
| 539 |
|
ps++; |