207 |
|
#endif |
208 |
|
|
209 |
|
#ifdef ALLBSD |
210 |
+ |
|
211 |
+ |
#if defined(NETBSD) || defined(OPENBSD) |
212 |
+ |
kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); |
213 |
+ |
#else |
214 |
|
kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
215 |
+ |
#endif |
216 |
|
|
217 |
|
if(kvmd == NULL) return NULL; |
218 |
|
|
224 |
|
|
225 |
|
for (i = 0; i < procs; i++) { |
226 |
|
/* replace with something more sensible */ |
227 |
< |
proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t)); |
227 |
> |
proc_state = realloc(proc_state, |
228 |
> |
(1+proc_state_size)*sizeof(proc_state_t)); |
229 |
|
if(proc_state == NULL ) { |
230 |
|
return NULL; |
231 |
|
} |
232 |
|
proc_state_ptr = proc_state+proc_state_size; |
227 |
– |
|
228 |
– |
proc_state_ptr->process_name = strdup(kp_stats[i].ki_comm); |
233 |
|
|
234 |
+ |
#ifdef FREEBSD5 |
235 |
+ |
proc_state_ptr->process_name = |
236 |
+ |
strdup(kp_stats[i].ki_comm); |
237 |
+ |
#elif defined(DFBSD) |
238 |
+ |
proc_state_ptr->process_name = |
239 |
+ |
strdup(kp_stats[i].kp_thread.td_comm); |
240 |
+ |
#else |
241 |
+ |
proc_state_ptr->process_name = |
242 |
+ |
strdup(kp_stats[i].kp_proc.p_comm); |
243 |
+ |
#endif |
244 |
+ |
|
245 |
|
args = kvm_getargv(kvmd, &(kp_stats[i]), 0); |
246 |
|
if(args != NULL) { |
247 |
|
alloc = 1; |
266 |
|
proc_state_ptr->proctitle = proctitle; |
267 |
|
} |
268 |
|
else { |
269 |
< |
proc_state_ptr->proctitle = malloc(strlen(kp_stats[i].ki_comm)+4); |
269 |
> |
proc_state_ptr->proctitle = |
270 |
> |
malloc(strlen(proc_state_ptr->process_name)+4); |
271 |
|
if(proc_state_ptr->proctitle == NULL) { |
272 |
|
return NULL; |
273 |
|
} |
274 |
< |
sprintf(proc_state_ptr->proctitle, " (%s)", kp_stats[i].ki_comm); |
274 |
> |
sprintf(proc_state_ptr->proctitle, " (%s)", |
275 |
> |
proc_state_ptr->process_name); |
276 |
|
} |
277 |
|
|
278 |
+ |
#ifdef FREEBSD5 |
279 |
|
proc_state_ptr->pid = kp_stats[i].ki_pid; |
280 |
|
proc_state_ptr->parent = kp_stats[i].ki_ppid; |
281 |
|
proc_state_ptr->pgid = kp_stats[i].ki_pgid; |
282 |
+ |
#else |
283 |
+ |
proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid; |
284 |
+ |
proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid; |
285 |
+ |
proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid; |
286 |
+ |
#endif |
287 |
|
|
288 |
+ |
#ifdef FREEBSD5 |
289 |
|
proc_state_ptr->uid = kp_stats[i].ki_ruid; |
290 |
|
proc_state_ptr->euid = kp_stats[i].ki_uid; |
291 |
|
proc_state_ptr->gid = kp_stats[i].ki_rgid; |
292 |
|
proc_state_ptr->egid = kp_stats[i].ki_svgid; |
293 |
+ |
#elif defined(DFBSD) |
294 |
+ |
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid; |
295 |
+ |
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid; |
296 |
+ |
proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid; |
297 |
+ |
proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid; |
298 |
+ |
#else |
299 |
+ |
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid; |
300 |
+ |
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid; |
301 |
+ |
proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid; |
302 |
+ |
proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid; |
303 |
+ |
#endif |
304 |
|
|
305 |
+ |
#ifdef FREEBSD5 |
306 |
|
proc_state_ptr->proc_size = kp_stats[i].ki_size; |
307 |
|
/* This is in pages */ |
308 |
< |
proc_state_ptr->proc_resident = kp_stats[i].ki_rssize * getpagesize(); |
308 |
> |
proc_state_ptr->proc_resident = |
309 |
> |
kp_stats[i].ki_rssize * getpagesize(); |
310 |
|
/* This is in microseconds */ |
311 |
|
proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000; |
312 |
< |
proc_state_ptr->cpu_percent = ((double) kp_stats[i].ki_pctcpu / FSCALE) * 100.0; |
312 |
> |
proc_state_ptr->cpu_percent = |
313 |
> |
((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0; |
314 |
|
proc_state_ptr->nice = kp_stats[i].ki_nice; |
315 |
+ |
#else |
316 |
+ |
proc_state_ptr->proc_size = |
317 |
+ |
kp_stats[i].kp_eproc.e_vm.vm_map.size; |
318 |
+ |
/* This is in pages */ |
319 |
+ |
proc_state_ptr->proc_resident = |
320 |
+ |
kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize(); |
321 |
+ |
/* This is in microseconds */ |
322 |
+ |
#if defined(NETBSD) || defined(OPENBSD) |
323 |
+ |
proc_state_ptr->time_spent = |
324 |
+ |
kp_stats[i].kp_proc.p_rtime.tv_sec; |
325 |
+ |
#elif defined(DFBSD) |
326 |
+ |
proc_state_ptr->time_spent = |
327 |
+ |
( kp_stats[i].kp_thread.td_uticks + |
328 |
+ |
kp_stats[i].kp_thread.td_sticks + |
329 |
+ |
kp_stats[i].kp_thread.td_iticks ) / 1000000; |
330 |
+ |
#else |
331 |
+ |
proc_state_ptr->time_spent = |
332 |
+ |
kp_stats[i].kp_proc.p_runtime / 1000000; |
333 |
+ |
#endif |
334 |
+ |
proc_state_ptr->cpu_percent = |
335 |
+ |
((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0; |
336 |
+ |
proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice; |
337 |
+ |
#endif |
338 |
|
|
339 |
+ |
#ifdef FREEBSD5 |
340 |
|
switch (kp_stats[i].ki_stat) { |
341 |
+ |
#else |
342 |
+ |
switch (kp_stats[i].kp_proc.p_stat) { |
343 |
+ |
#endif |
344 |
|
case SIDL: |
345 |
|
case SRUN: |
346 |
|
#ifdef SONPROC |
366 |
|
#endif |
367 |
|
proc_state_ptr->state = ZOMBIE; |
368 |
|
break; |
369 |
+ |
default: |
370 |
+ |
proc_state_ptr->state = UNKNOWN; |
371 |
+ |
break; |
372 |
|
} |
373 |
|
proc_state_size++; |
374 |
|
} |
385 |
|
proc_state_t *ps; |
386 |
|
int ps_size, x; |
387 |
|
|
388 |
< |
process_stat.sleeping=0; |
389 |
< |
process_stat.running=0; |
390 |
< |
process_stat.zombie=0; |
391 |
< |
process_stat.stopped=0; |
392 |
< |
process_stat.total=0; |
388 |
> |
process_stat.sleeping = 0; |
389 |
> |
process_stat.running = 0; |
390 |
> |
process_stat.zombie = 0; |
391 |
> |
process_stat.stopped = 0; |
392 |
> |
process_stat.total = 0; |
393 |
|
|
394 |
|
ps_size = get_proc_snapshot(&ps); |
395 |
|
|
396 |
+ |
if(ps_size == NULL) { |
397 |
+ |
return NULL; |
398 |
+ |
} |
399 |
+ |
|
400 |
|
for(x = 0; x < ps_size; x++) { |
401 |
|
switch (ps->state) { |
402 |
+ |
/* currently no mapping for UNKNOWN in process_stat_t */ |
403 |
|
case RUNNING: |
404 |
|
process_stat.running++; |
405 |
|
break; |