207 |
|
#endif |
208 |
|
|
209 |
|
#ifdef ALLBSD |
210 |
< |
kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
210 |
> |
mib[0] = CTL_KERN; |
211 |
> |
mib[1] = KERN_PROC; |
212 |
> |
mib[2] = KERN_PROC_ALL; |
213 |
|
|
214 |
< |
if(kvmd == NULL) return NULL; |
214 |
> |
if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
215 |
> |
return NULL; |
216 |
> |
} |
217 |
|
|
218 |
< |
kp_stats = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &procs); |
218 |
> |
procs = size / sizeof(struct kinfo_proc); |
219 |
|
|
220 |
< |
if (kp_stats == NULL || procs < 0) { |
220 |
> |
kp_stats = malloc(size); |
221 |
> |
if(kp_stats == NULL) { |
222 |
|
return NULL; |
223 |
|
} |
224 |
|
|
225 |
+ |
if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) { |
226 |
+ |
free(kp_stats); |
227 |
+ |
return NULL; |
228 |
+ |
} |
229 |
+ |
|
230 |
+ |
#if defined(NETBSD) || defined(OPENBSD) |
231 |
+ |
kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL); |
232 |
+ |
#else |
233 |
+ |
kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); |
234 |
+ |
#endif |
235 |
+ |
|
236 |
|
for (i = 0; i < procs; i++) { |
237 |
|
/* replace with something more sensible */ |
238 |
< |
proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t)); |
238 |
> |
proc_state = realloc(proc_state, |
239 |
> |
(1+proc_state_size)*sizeof(proc_state_t)); |
240 |
|
if(proc_state == NULL ) { |
241 |
|
return NULL; |
242 |
|
} |
243 |
|
proc_state_ptr = proc_state+proc_state_size; |
227 |
– |
|
228 |
– |
proc_state_ptr->process_name = strdup(kp_stats[i].ki_comm); |
244 |
|
|
245 |
+ |
#ifdef FREEBSD5 |
246 |
+ |
proc_state_ptr->process_name = |
247 |
+ |
strdup(kp_stats[i].ki_comm); |
248 |
+ |
#elif defined(DFBSD) |
249 |
+ |
proc_state_ptr->process_name = |
250 |
+ |
strdup(kp_stats[i].kp_thread.td_comm); |
251 |
+ |
#else |
252 |
+ |
proc_state_ptr->process_name = |
253 |
+ |
strdup(kp_stats[i].kp_proc.p_comm); |
254 |
+ |
#endif |
255 |
+ |
|
256 |
|
args = kvm_getargv(kvmd, &(kp_stats[i]), 0); |
257 |
|
if(args != NULL) { |
258 |
|
alloc = 1; |
277 |
|
proc_state_ptr->proctitle = proctitle; |
278 |
|
} |
279 |
|
else { |
280 |
< |
proc_state_ptr->proctitle = malloc(strlen(kp_stats[i].ki_comm)+4); |
280 |
> |
/* Should probably be returning NULL here */ |
281 |
> |
proc_state_ptr->proctitle = |
282 |
> |
malloc(strlen(proc_state_ptr->process_name)+4); |
283 |
|
if(proc_state_ptr->proctitle == NULL) { |
284 |
|
return NULL; |
285 |
|
} |
286 |
< |
sprintf(proc_state_ptr->proctitle, " (%s)", kp_stats[i].ki_comm); |
286 |
> |
sprintf(proc_state_ptr->proctitle, " (%s)", |
287 |
> |
proc_state_ptr->process_name); |
288 |
|
} |
289 |
|
|
290 |
+ |
#ifdef FREEBSD5 |
291 |
|
proc_state_ptr->pid = kp_stats[i].ki_pid; |
292 |
|
proc_state_ptr->parent = kp_stats[i].ki_ppid; |
293 |
|
proc_state_ptr->pgid = kp_stats[i].ki_pgid; |
294 |
+ |
#else |
295 |
+ |
proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid; |
296 |
+ |
proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid; |
297 |
+ |
proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid; |
298 |
+ |
#endif |
299 |
|
|
300 |
+ |
#ifdef FREEBSD5 |
301 |
|
proc_state_ptr->uid = kp_stats[i].ki_ruid; |
302 |
|
proc_state_ptr->euid = kp_stats[i].ki_uid; |
303 |
|
proc_state_ptr->gid = kp_stats[i].ki_rgid; |
304 |
|
proc_state_ptr->egid = kp_stats[i].ki_svgid; |
305 |
+ |
#elif defined(DFBSD) |
306 |
+ |
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid; |
307 |
+ |
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid; |
308 |
+ |
proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid; |
309 |
+ |
proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid; |
310 |
+ |
#else |
311 |
+ |
proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid; |
312 |
+ |
proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid; |
313 |
+ |
proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid; |
314 |
+ |
proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid; |
315 |
+ |
#endif |
316 |
|
|
317 |
+ |
#ifdef FREEBSD5 |
318 |
|
proc_state_ptr->proc_size = kp_stats[i].ki_size; |
319 |
|
/* This is in pages */ |
320 |
< |
proc_state_ptr->proc_resident = kp_stats[i].ki_rssize * getpagesize(); |
320 |
> |
proc_state_ptr->proc_resident = |
321 |
> |
kp_stats[i].ki_rssize * getpagesize(); |
322 |
|
/* This is in microseconds */ |
323 |
|
proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000; |
324 |
< |
proc_state_ptr->cpu_percent = ((double) kp_stats[i].ki_pctcpu / FSCALE) * 100.0; |
324 |
> |
proc_state_ptr->cpu_percent = |
325 |
> |
((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0; |
326 |
|
proc_state_ptr->nice = kp_stats[i].ki_nice; |
327 |
+ |
#else |
328 |
+ |
proc_state_ptr->proc_size = |
329 |
+ |
kp_stats[i].kp_eproc.e_vm.vm_map.size; |
330 |
+ |
/* This is in pages */ |
331 |
+ |
proc_state_ptr->proc_resident = |
332 |
+ |
kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize(); |
333 |
+ |
#if defined(NETBSD) || defined(OPENBSD) |
334 |
+ |
proc_state_ptr->time_spent = |
335 |
+ |
kp_stats[i].kp_proc.p_rtime.tv_sec; |
336 |
+ |
#elif defined(DFBSD) |
337 |
+ |
proc_state_ptr->time_spent = |
338 |
+ |
( kp_stats[i].kp_thread.td_uticks + |
339 |
+ |
kp_stats[i].kp_thread.td_sticks + |
340 |
+ |
kp_stats[i].kp_thread.td_iticks ) / 1000000; |
341 |
+ |
#else |
342 |
+ |
/* This is in microseconds */ |
343 |
+ |
proc_state_ptr->time_spent = |
344 |
+ |
kp_stats[i].kp_proc.p_runtime / 1000000; |
345 |
+ |
#endif |
346 |
+ |
proc_state_ptr->cpu_percent = |
347 |
+ |
((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0; |
348 |
+ |
proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice; |
349 |
+ |
#endif |
350 |
|
|
351 |
+ |
#ifdef FREEBSD5 |
352 |
|
switch (kp_stats[i].ki_stat) { |
353 |
+ |
#else |
354 |
+ |
switch (kp_stats[i].kp_proc.p_stat) { |
355 |
+ |
#endif |
356 |
|
case SIDL: |
357 |
|
case SRUN: |
358 |
|
#ifdef SONPROC |
378 |
|
#endif |
379 |
|
proc_state_ptr->state = ZOMBIE; |
380 |
|
break; |
381 |
+ |
default: |
382 |
+ |
proc_state_ptr->state = UNKNOWN; |
383 |
+ |
break; |
384 |
|
} |
385 |
|
proc_state_size++; |
386 |
|
} |
397 |
|
proc_state_t *ps; |
398 |
|
int ps_size, x; |
399 |
|
|
400 |
< |
process_stat.sleeping=0; |
401 |
< |
process_stat.running=0; |
402 |
< |
process_stat.zombie=0; |
403 |
< |
process_stat.stopped=0; |
404 |
< |
process_stat.total=0; |
400 |
> |
process_stat.sleeping = 0; |
401 |
> |
process_stat.running = 0; |
402 |
> |
process_stat.zombie = 0; |
403 |
> |
process_stat.stopped = 0; |
404 |
> |
process_stat.total = 0; |
405 |
|
|
406 |
|
ps_size = get_proc_snapshot(&ps); |
407 |
|
|
408 |
+ |
if(ps_size == NULL) { |
409 |
+ |
return NULL; |
410 |
+ |
} |
411 |
+ |
|
412 |
|
for(x = 0; x < ps_size; x++) { |
413 |
|
switch (ps->state) { |
414 |
+ |
/* currently no mapping for UNKNOWN in process_stat_t */ |
415 |
|
case RUNNING: |
416 |
|
process_stat.running++; |
417 |
|
break; |