219 |
|
|
220 |
|
for (i = 0; i < procs; i++) { |
221 |
|
/* replace with something more sensible */ |
222 |
< |
proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t)); |
222 |
> |
proc_state = realloc(proc_state, |
223 |
> |
(1+proc_state_size)*sizeof(proc_state_t)); |
224 |
|
if(proc_state == NULL ) { |
225 |
|
return NULL; |
226 |
|
} |
227 |
|
proc_state_ptr = proc_state+proc_state_size; |
227 |
– |
|
228 |
– |
proc_state_ptr->process_name = strdup(kp_stats[i].ki_comm); |
228 |
|
|
229 |
+ |
#ifdef FREEBSD5 |
230 |
+ |
proc_state_ptr->process_name = |
231 |
+ |
strdup(kp_stats[i].ki_comm); |
232 |
+ |
#else |
233 |
+ |
proc_state_ptr->process_name = |
234 |
+ |
strdup(kp_stats[i].kp_proc.p_comm); |
235 |
+ |
#endif |
236 |
+ |
|
237 |
|
args = kvm_getargv(kvmd, &(kp_stats[i]), 0); |
238 |
|
if(args != NULL) { |
239 |
|
alloc = 1; |
258 |
|
proc_state_ptr->proctitle = proctitle; |
259 |
|
} |
260 |
|
else { |
261 |
< |
proc_state_ptr->proctitle = malloc(strlen(kp_stats[i].ki_comm)+4); |
261 |
> |
proc_state_ptr->proctitle = |
262 |
> |
malloc(strlen(proc_state_ptr->process_name)+4); |
263 |
|
if(proc_state_ptr->proctitle == NULL) { |
264 |
|
return NULL; |
265 |
|
} |
266 |
< |
sprintf(proc_state_ptr->proctitle, " (%s)", kp_stats[i].ki_comm); |
266 |
> |
sprintf(proc_state_ptr->proctitle, " (%s)", |
267 |
> |
proc_state_ptr->process_name); |
268 |
|
} |
269 |
|
|
270 |
+ |
#ifdef FREEBSD5 |
271 |
|
proc_state_ptr->pid = kp_stats[i].ki_pid; |
272 |
|
proc_state_ptr->parent = kp_stats[i].ki_ppid; |
273 |
|
proc_state_ptr->pgid = kp_stats[i].ki_pgid; |
274 |
+ |
#else |
275 |
+ |
proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid; |
276 |
+ |
proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid; |
277 |
+ |
proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid; |
278 |
+ |
#endif |
279 |
|
|
280 |
+ |
#ifdef FREEBSD5 |
281 |
|
proc_state_ptr->uid = kp_stats[i].ki_ruid; |
282 |
|
proc_state_ptr->euid = kp_stats[i].ki_uid; |
283 |
|
proc_state_ptr->gid = kp_stats[i].ki_rgid; |
284 |
|
proc_state_ptr->egid = kp_stats[i].ki_svgid; |
285 |
+ |
#else |
286 |
+ |
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid; |
287 |
+ |
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid; |
288 |
+ |
proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid; |
289 |
+ |
proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid; |
290 |
+ |
#endif |
291 |
|
|
292 |
+ |
#ifdef FREEBSD5 |
293 |
|
proc_state_ptr->proc_size = kp_stats[i].ki_size; |
294 |
|
/* This is in pages */ |
295 |
< |
proc_state_ptr->proc_resident = kp_stats[i].ki_rssize * getpagesize(); |
295 |
> |
proc_state_ptr->proc_resident = |
296 |
> |
kp_stats[i].ki_rssize * getpagesize(); |
297 |
|
/* This is in microseconds */ |
298 |
|
proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000; |
299 |
< |
proc_state_ptr->cpu_percent = ((double) kp_stats[i].ki_pctcpu / FSCALE) * 100.0; |
299 |
> |
proc_state_ptr->cpu_percent = |
300 |
> |
((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0; |
301 |
|
proc_state_ptr->nice = kp_stats[i].ki_nice; |
302 |
+ |
#else |
303 |
+ |
proc_state_ptr->proc_size = |
304 |
+ |
kp_stats[i].kp_eproc.e_vm.vm_map.size; |
305 |
+ |
/* This is in pages */ |
306 |
+ |
proc_state_ptr->proc_resident = |
307 |
+ |
kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize(); |
308 |
+ |
/* This is in microseconds */ |
309 |
+ |
proc_state_ptr->time_spent = |
310 |
+ |
kp_stats[i].kp_proc.p_runtime / 1000000; |
311 |
+ |
proc_state_ptr->cpu_percent = |
312 |
+ |
((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0; |
313 |
+ |
proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice; |
314 |
+ |
#endif |
315 |
|
|
316 |
+ |
#ifdef FREEBSD5 |
317 |
|
switch (kp_stats[i].ki_stat) { |
318 |
+ |
#else |
319 |
+ |
switch (kp_stats[i].kp_proc.p_stat) { |
320 |
+ |
#endif |
321 |
|
case SIDL: |
322 |
|
case SRUN: |
323 |
|
#ifdef SONPROC |
359 |
|
proc_state_t *ps; |
360 |
|
int ps_size, x; |
361 |
|
|
362 |
< |
process_stat.sleeping=0; |
363 |
< |
process_stat.running=0; |
364 |
< |
process_stat.zombie=0; |
365 |
< |
process_stat.stopped=0; |
366 |
< |
process_stat.total=0; |
362 |
> |
process_stat.sleeping = 0; |
363 |
> |
process_stat.running = 0; |
364 |
> |
process_stat.zombie = 0; |
365 |
> |
process_stat.stopped = 0; |
366 |
> |
process_stat.total = 0; |
367 |
|
|
368 |
|
ps_size = get_proc_snapshot(&ps); |
369 |
|
|
370 |
|
for(x = 0; x < ps_size; x++) { |
371 |
|
switch (ps->state) { |
372 |
+ |
/* currently no mapping for UNKNOWN in process_stat_t */ |
373 |
|
case RUNNING: |
374 |
|
process_stat.running++; |
375 |
|
break; |