ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/process_stats.c

Comparing projects/libstatgrab/src/libstatgrab/process_stats.c (file contents):
Revision 1.34 by tdb, Sun Apr 4 11:46:08 2004 UTC vs.
Revision 1.63 by tdb, Wed Apr 7 14:53:40 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* i-scream central monitoring system
2	>	* i-scream libstatgrab
3		* http://www.i-scream.org
4		* Copyright (C) 2000-2004 i-scream
5		*
#	Line 26 | Line 26
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>
#	Line 61 | Line 63
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		#endif
69	+	#include <unistd.h>
70	+	#ifdef NETBSD2
71	+	#include <sys/lwp.h>
72	+	#endif
73	+	#endif
74
75	<	int get_proc_snapshot(proc_state_t **ps){
76	<	proc_state_t *proc_state = NULL;
77	<	proc_state_t *proc_state_ptr;
75	>	static void proc_state_init(sg_process_stats *s) {
76	>	s->process_name = NULL;
77	>	s->proctitle = NULL;
78	>	}
79	>
80	>	static void proc_state_destroy(sg_process_stats *s) {
81	>	free(s->process_name);
82	>	free(s->proctitle);
83	>	}
84	>
85	>	sg_process_stats *sg_get_process_stats(int *entries){
86	>	VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64,
87	>	proc_state_init, proc_state_destroy);
88		int proc_state_size = 0;
89	+	sg_process_stats *proc_state_ptr;
90		#ifdef ALLBSD
91	<	int mib[3];
91	>	int mib[4];
92		size_t size;
93		struct kinfo_proc *kp_stats;
94	<	int procs, i, alloc;
76	<	static kvm_t *kvmd;
77	<	char **args;
94	>	int procs, i;
95		char *proctitle;
96	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
97	+	kvm_t *kvmd;
98	+	char **args, **argsp;
99	+	int argslen = 0;
100	+	#else
101	+	long buflen;
102	+	char *p;
103		#endif
104	+	#ifdef NETBSD2
105	+	int lwps;
106	+	struct kinfo_lwp *kl_stats;
107	+	#endif
108	+	#endif
109		#if defined(SOLARIS) || defined(LINUX)
110	<	DIR *proc_dir;
111	<	struct dirent *dir_entry;
112	<	char filename[MAX_FILE_LENGTH];
113	<	FILE *f;
110	>	DIR *proc_dir;
111	>	struct dirent *dir_entry;
112	>	char filename[MAX_FILE_LENGTH];
113	>	FILE *f;
114		#ifdef SOLARIS
115		psinfo_t process_info;
116		#endif
#	Line 90 | Line 119 | int get_proc_snapshot(proc_state_t **ps){
119		/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */
120		char ps_name[4096];
121		char *ptr;
122	<	static char *psargs = NULL;
123	<	static int psarg_size = 0;
95	<	unsigned long stime, utime;
122	>	VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
123	>	unsigned long stime, utime, starttime;
124		int x;
125		int fn;
126	<	int toread;
127	<	ssize_t size;
128	<	int t_read;
126	>	int len;
127	>	int rc;
128	>	time_t uptime;
129		#endif
130
131	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
132	<	return -1;
133	<	}
131	>	#ifdef LINUX
132	>	if ((f=fopen("/proc/uptime", "r")) == NULL) {
133	>	return NULL;
134	>	}
135	>	if((fscanf(f,"%lu %*d",&uptime)) != 1){
136	>	return NULL;
137	>	}
138	>	fclose(f);
139	>	#endif
140
141	<	while((dir_entry=readdir(proc_dir))!=NULL){
142	<	if(atoi(dir_entry->d_name) == 0) continue;
141	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
142	>	return NULL;
143	>	}
144
145	+	while((dir_entry=readdir(proc_dir))!=NULL){
146	+	if(atoi(dir_entry->d_name) == 0) continue;
147	+
148		#ifdef SOLARIS
149	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
149	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
150		#endif
151		#ifdef LINUX
152		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
153		#endif
154	<	if((f=fopen(filename, "r"))==NULL){
155	<	/* Open failed.. Process since vanished, or the path was too long.
156	<	* Ah well, move onwards to the next one */
157	<	continue;
158	<	}
154	>	if((f=fopen(filename, "r"))==NULL){
155	>	/* Open failed.. Process since vanished, or the path was too long.
156	>	* Ah well, move onwards to the next one */
157	>	continue;
158	>	}
159		#ifdef SOLARIS
160	<	fread(&process_info, sizeof(psinfo_t), 1, f);
160	>	fread(&process_info, sizeof(psinfo_t), 1, f);
161		#endif
162
163	<	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
163	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
164	>	return NULL;
165	>	}
166		proc_state_ptr = proc_state+proc_state_size;
167	+
168		#ifdef SOLARIS
169		proc_state_ptr->pid = process_info.pr_pid;
170		proc_state_ptr->parent = process_info.pr_ppid;
#	Line 136 | Line 177 | int get_proc_snapshot(proc_state_t **ps){
177		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
178		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
179		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
180	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
181	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
180	>	if (sg_update_string(&proc_state_ptr->process_name,
181	>	process_info.pr_fname) < 0) {
182	>	return NULL;
183	>	}
184	>	if (sg_update_string(&proc_state_ptr->proctitle,
185	>	process_info.pr_psargs) < 0) {
186	>	return NULL;
187	>	}
188
189	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
190	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
191	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
192	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
193	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
189	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
190	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
191	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
192	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
193	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
194		#endif
195		#ifdef LINUX
196	<	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));
197	<	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
198	<	if(s == 'S') proc_state_ptr->state = SLEEPING;
199	<	if(s == 'R') proc_state_ptr->state = RUNNING;
200	<	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
201	<	if(s == 'T') proc_state_ptr->state = STOPPED;
202	<	if(s == 'D') proc_state_ptr->state = STOPPED;
196	>	x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*u %*u %*u %*u %*u %lu %lu %*d %*d %*d %d %*d %*d %lu %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), &starttime, &(proc_state_ptr->proc_size), &(proc_state_ptr->proc_resident));
197	>	/* +3 becuase man page says "Resident  Set Size: number of pages the process has in real memory, minus 3 for administrative purposes." */
198	>	proc_state_ptr->proc_resident = (proc_state_ptr->proc_resident + 3) * getpagesize();
199	>	if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
200	>	if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
201	>	if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
202	>	if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
203	>	if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
204
205		/* pa_name[0] should = '(' */
206		ptr = strchr(&ps_name[1], ')');
207		if(ptr !=NULL) *ptr='\0';
160	–	proc_state_ptr->process_name = strdup(&ps_name[1]);
208
209	<	/* Need to do cpu */
210	<
209	>	if (sg_update_string(&proc_state_ptr->process_name,
210	>	&ps_name[1]) < 0) {
211	>	return NULL;
212	>	}
213
214	+	/* cpu */
215	+	proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
216	+
217	+	fclose(f);
218	+
219	+	/* uid / gid */
220	+	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
221	+	if ((f=fopen(filename, "r")) == NULL) {
222	+	/* Open failed.. Process since vanished, or the path was too long.
223	+	* Ah well, move onwards to the next one */
224	+	continue;
225	+	}
226	+
227	+	if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
228	+	fclose(f);
229	+	continue;
230	+	}
231	+	sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
232	+
233	+	if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
234	+	fclose(f);
235	+	continue;
236	+	}
237	+	sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
238	+
239	+	fclose(f);
240	+
241		/* proctitle */
242		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
243
244	<	if((fn=open(filename, O_RDONLY)) == -1){
245	<	/* Open failed.. Process since vanished, or the path was too long.
246	<	* Ah well, move onwards to the next one */
247	<	continue;
172	<	}
173	<	#define         PSARG_START_SIZE 128
174	<	if(psargs == NULL){
175	<	psargs = malloc(PSARG_START_SIZE);
176	<	psarg_size = PSARG_START_SIZE;
244	>	if((fn=open(filename, O_RDONLY)) == -1){
245	>	/* Open failed.. Process since vanished, or the path was too long.
246	>	* Ah well, move onwards to the next one */
247	>	continue;
248		}
249	<	ptr = psargs;
250	<	t_read = 0;
251	<	toread = psarg_size;
252	<	while((size = read(fn, ptr, toread)) == toread){
253	<	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
254	<	ptr = psargs+psarg_size;
255	<	t_read = psarg_size;
256	<	psarg_size+=PSARG_START_SIZE;
257	<	toread = PSARG_START_SIZE;
249	>
250	>	#define READ_BLOCK_SIZE 128
251	>	len = 0;
252	>	do {
253	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
254	>	return NULL;
255	>	}
256	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
257	>	if (rc > 0) {
258	>	len += rc;
259	>	}
260	>	} while (rc == READ_BLOCK_SIZE);
261	>	close(fn);
262	>
263	>	if (rc == -1) {
264	>	/* Read failed; move on. */
265	>	continue;
266		}
188	–	if(size != -1) t_read+=size;
267
268	+	/* Turn \0s into spaces within the command line. */
269		ptr = psargs;
270	<	for(x=0; x<t_read; x++){
270	>	for(x = 0; x < len; x++) {
271		if (*ptr == '\0') *ptr = ' ';
272		ptr++;
273		}
195	–	/*  for safety sake */
196	–	psargs[t_read] = '\0';
274
275	<	proc_state_ptr->proctitle = strdup(psargs);
275	>	if (len == 0) {
276	>	/* We want psargs to be NULL. */
277	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
278	>	return NULL;
279	>	}
280	>	} else {
281	>	/* Not empty, so append a \0. */
282	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
283	>	return NULL;
284	>	}
285	>	psargs[len] = '\0';
286	>	}
287
288	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
289	+	return NULL;
290	+	}
291		#endif
292
293		proc_state_size++;
294	<
295	<	fclose(f);
205	<	}
206	<	closedir(proc_dir);
294	>	}
295	>	closedir(proc_dir);
296		#endif
297
298		#ifdef ALLBSD
299	+	mib[0] = CTL_KERN;
300	+	mib[1] = KERN_PROC;
301	+	mib[2] = KERN_PROC_ALL;
302
303	<	#if defined(NETBSD) || defined(OPENBSD)
304	<	kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
305	<	#else
214	<	kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
215	<	#endif
303	>	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
304	>	return NULL;
305	>	}
306
307	<	if(kvmd == NULL) return NULL;
307	>	procs = size / sizeof(struct kinfo_proc);
308
309	<	kp_stats = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &procs);
309	>	kp_stats = sg_malloc(size);
310	>	if(kp_stats == NULL) {
311	>	return NULL;
312	>	}
313	>	memset(kp_stats, 0, size);
314
315	<	if (kp_stats == NULL || procs < 0) {
315	>	if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
316	>	free(kp_stats);
317		return NULL;
318		}
319
320	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
321	+	kvmd = sg_get_kvm2();
322	+	#endif
323	+
324		for (i = 0; i < procs; i++) {
325	<	/* replace with something more sensible */
326	<	proc_state = realloc(proc_state,
327	<	(1+proc_state_size)*sizeof(proc_state_t));
328	<	if(proc_state == NULL ) {
325	>	const char *name;
326	>
327	>	#ifdef FREEBSD5
328	>	if (kp_stats[i].ki_stat == 0) {
329	>	#else
330	>	if (kp_stats[i].kp_proc.p_stat == 0) {
331	>	#endif
332	>	/* FreeBSD 5 deliberately overallocates the array that
333	>	* the sysctl returns, so we'll get a few junk
334	>	* processes on the end that we have to ignore. (Search
335	>	* for "overestimate by 5 procs" in
336	>	* src/sys/kern/kern_proc.c for more details.) */
337	>	continue;
338	>	}
339	>
340	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
341		return NULL;
342		}
343		proc_state_ptr = proc_state+proc_state_size;
344
345		#ifdef FREEBSD5
346	<	proc_state_ptr->process_name =
347	<	strdup(kp_stats[i].ki_comm);
346	>	name = kp_stats[i].ki_comm;
347	>	#elif defined(DFBSD)
348	>	name = kp_stats[i].kp_thread.td_comm;
349		#else
350	<	proc_state_ptr->process_name =
239	<	strdup(kp_stats[i].kp_proc.p_comm);
350	>	name = kp_stats[i].kp_proc.p_comm;
351		#endif
352	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
353	+	return NULL;
354	+	}
355
356	<	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
357	<	if(args != NULL) {
358	<	alloc = 1;
359	<	proctitle = malloc(alloc);
360	<	if(proctitle == NULL) {
356	>	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
357	>	size = sizeof(buflen);
358	>
359	>	#ifdef FREEBSD5
360	>	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
361	>	return NULL;
362	>	}
363	>	#else
364	>	/* FIXME - this value can be too large on some of
365	>	the BSD's, which causes sysctl not to return
366	>	anything. Maybe we need something smaller? */
367	>	mib[1] = KERN_ARGMAX;
368	>
369	>	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
370	>	return NULL;
371	>	}
372	>	#endif
373	>
374	>	proctitle = sg_malloc(buflen);
375	>	if(proctitle == NULL) {
376	>	return NULL;
377	>	}
378	>
379	>	size = buflen;
380	>
381	>	#ifdef FREEBSD5
382	>	mib[2] = KERN_PROC_ARGS;
383	>	mib[3] = kp_stats[i].ki_pid;
384	>	#else
385	>	mib[1] = KERN_PROC_ARGS;
386	>	mib[2] = kp_stats[i].kp_proc.p_pid;
387	>	mib[3] = KERN_PROC_ARGV;
388	>	#endif
389	>
390	>	free(proc_state_ptr->proctitle);
391	>	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
392	>	free(proctitle);
393	>	proc_state_ptr->proctitle = NULL;
394	>	}
395	>	else if(size > 0) {
396	>	proc_state_ptr->proctitle = sg_malloc(size+1);
397	>	if(proc_state_ptr->proctitle == NULL) {
398		return NULL;
399		}
400	<	while(*args != NULL) {
401	<	if(strlen(proctitle) + strlen(*args) >= alloc) {
402	<	alloc = (alloc + strlen(*args)) << 1;
403	<	proctitle = realloc(proctitle, alloc);
404	<	if(proctitle == NULL) {
405	<	return NULL;
406	<	}
407	<	}
257	<	strncat(proctitle, *args, strlen(*args));
258	<	strncat(proctitle, " ", 1);
259	<	args++;
260	<	}
400	>	p = proctitle;
401	>	proc_state_ptr->proctitle[0] = '\0';
402	>	do {
403	>	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
404	>	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
405	>	p += strlen(p) + 1;
406	>	} while (p < proctitle + size);
407	>	free(proctitle);
408		/* remove trailing space */
409	<	proctitle[strlen(proctitle)-1] = NULL;
263	<	proc_state_ptr->proctitle = proctitle;
409	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
410		}
411		else {
412	<	proc_state_ptr->proctitle =
413	<	malloc(strlen(proc_state_ptr->process_name)+4);
414	<	if(proc_state_ptr->proctitle == NULL) {
415	<	return NULL;
412	>	free(proctitle);
413	>	proc_state_ptr->proctitle = NULL;
414	>	}
415	>	#else
416	>	free(proc_state_ptr->proctitle);
417	>	if(kvmd != NULL) {
418	>	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
419	>	if(args != NULL) {
420	>	argsp = args;
421	>	while(*argsp != NULL) {
422	>	argslen += strlen(*argsp) + 1;
423	>	argsp++;
424	>	}
425	>	proctitle = sg_malloc(argslen + 1);
426	>	proctitle[0] = '\0';
427	>	if(proctitle == NULL) {
428	>	return NULL;
429	>	}
430	>	while(*args != NULL) {
431	>	sg_strlcat(proctitle, *args, argslen + 1);
432	>	sg_strlcat(proctitle, " ", argslen + 1);
433	>	args++;
434	>	}
435	>	/* remove trailing space */
436	>	proctitle[strlen(proctitle)-1] = '\0';
437	>	proc_state_ptr->proctitle = proctitle;
438		}
439	<	sprintf(proc_state_ptr->proctitle, " (%s)",
440	<	proc_state_ptr->process_name);
439	>	else {
440	>	proc_state_ptr->proctitle = NULL;
441	>	}
442		}
443	+	else {
444	+	proc_state_ptr->proctitle = NULL;
445	+	}
446	+	#endif
447
448		#ifdef FREEBSD5
449		proc_state_ptr->pid = kp_stats[i].ki_pid;
#	Line 287 | Line 460 | int get_proc_snapshot(proc_state_t **ps){
460		proc_state_ptr->euid = kp_stats[i].ki_uid;
461		proc_state_ptr->gid = kp_stats[i].ki_rgid;
462		proc_state_ptr->egid = kp_stats[i].ki_svgid;
463	+	#elif defined(DFBSD)
464	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid;
465	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid;
466	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid;
467	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid;
468		#else
469		proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid;
470		proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid;
#	Line 310 | Line 488 | int get_proc_snapshot(proc_state_t **ps){
488		/* This is in pages */
489		proc_state_ptr->proc_resident =
490		kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize();
313	–	/* This is in microseconds */
491		#if defined(NETBSD) || defined(OPENBSD)
492		proc_state_ptr->time_spent =
493		kp_stats[i].kp_proc.p_rtime.tv_sec;
494	+	#elif defined(DFBSD)
495	+	proc_state_ptr->time_spent =
496	+	( kp_stats[i].kp_thread.td_uticks +
497	+	kp_stats[i].kp_thread.td_sticks +
498	+	kp_stats[i].kp_thread.td_iticks ) / 1000000;
499		#else
500	+	/* This is in microseconds */
501		proc_state_ptr->time_spent =
502		kp_stats[i].kp_proc.p_runtime / 1000000;
503		#endif
#	Line 323 | Line 506 | int get_proc_snapshot(proc_state_t **ps){
506		proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
507		#endif
508
509	+	#ifdef NETBSD2
510	+	{
511	+	size_t size;
512	+	int mib[5];
513	+
514	+	mib[0] = CTL_KERN;
515	+	mib[1] = KERN_LWP;
516	+	mib[2] = kp_stats[i].kp_proc.p_pid;
517	+	mib[3] = sizeof(struct kinfo_lwp);
518	+	mib[4] = 0;
519	+
520	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
521	+	return NULL;
522	+	}
523	+
524	+	lwps = size / sizeof(struct kinfo_lwp);
525	+	mib[4] = lwps;
526	+
527	+	kl_stats = sg_malloc(size);
528	+	if(kl_stats == NULL) {
529	+	return NULL;
530	+	}
531	+
532	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
533	+	return NULL;
534	+	}
535	+	}
536	+
537	+	switch(kp_stats[i].kp_proc.p_stat) {
538	+	case SIDL:
539	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
540	+	break;
541	+	case SACTIVE:
542	+	{
543	+	int i;
544	+
545	+	for(i = 0; i < lwps; i++) {
546	+	switch(kl_stats[i].l_stat) {
547	+	case LSONPROC:
548	+	case LSRUN:
549	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
550	+	goto end;
551	+	case LSSLEEP:
552	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
553	+	goto end;
554	+	case LSSTOP:
555	+	case LSSUSPENDED:
556	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
557	+	goto end;
558	+	}
559	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
560	+	}
561	+	end: ;
562	+	}
563	+	break;
564	+	case SSTOP:
565	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
566	+	break;
567	+	case SZOMB:
568	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
569	+	break;
570	+	default:
571	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
572	+	break;
573	+	}
574	+	#else
575		#ifdef FREEBSD5
576		switch (kp_stats[i].ki_stat) {
577		#else
#	Line 333 | Line 582 | int get_proc_snapshot(proc_state_t **ps){
582		#ifdef SONPROC
583		case SONPROC: /* NetBSD */
584		#endif
585	<	proc_state_ptr->state = RUNNING;
585	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
586		break;
587		case SSLEEP:
588		#ifdef SWAIT
#	Line 342 | Line 591 | int get_proc_snapshot(proc_state_t **ps){
591		#ifdef SLOCK
592		case SLOCK: /* FreeBSD 5 */
593		#endif
594	<	proc_state_ptr->state = SLEEPING;
594	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
595		break;
596		case SSTOP:
597	<	proc_state_ptr->state = STOPPED;
597	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
598		break;
599		case SZOMB:
600		#ifdef SDEAD
601		case SDEAD: /* OpenBSD & NetBSD */
602		#endif
603	<	proc_state_ptr->state = ZOMBIE;
603	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
604		break;
605		default:
606	<	proc_state_ptr->state = UNKNOWN;
606	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
607		break;
608		}
609	+	#endif
610		proc_state_size++;
611		}
612
613		free(kp_stats);
614		#endif
615
616	<	*ps = proc_state;
617	<	return proc_state_size;
616	>	#ifdef CYGWIN
617	>	return NULL;
618	>	#endif
619	>
620	>	*entries = proc_state_size;
621	>	return proc_state;
622		}
623
624	<	process_stat_t *get_process_stats() {
625	<	static process_stat_t process_stat;
626	<	proc_state_t *ps;
624	>	sg_process_count *sg_get_process_count() {
625	>	static sg_process_count process_stat;
626	>	sg_process_stats *ps;
627		int ps_size, x;
628
629		process_stat.sleeping = 0;
#	Line 378 | Line 632 | process_stat_t *get_process_stats() {
632		process_stat.stopped = 0;
633		process_stat.total = 0;
634
635	<	ps_size = get_proc_snapshot(&ps);
636	<
383	<	if(ps_size == NULL) {
635	>	ps = sg_get_process_stats(&ps_size);
636	>	if (ps == NULL) {
637		return NULL;
638		}
639
640		for(x = 0; x < ps_size; x++) {
641		switch (ps->state) {
642	<	/* currently no mapping for UNKNOWN in process_stat_t */
390	<	case RUNNING:
642	>	case SG_PROCESS_STATE_RUNNING:
643		process_stat.running++;
644		break;
645	<	case SLEEPING:
645	>	case SG_PROCESS_STATE_SLEEPING:
646		process_stat.sleeping++;
647		break;
648	<	case STOPPED:
648	>	case SG_PROCESS_STATE_STOPPED:
649		process_stat.stopped++;
650		break;
651	<	case ZOMBIE:
651	>	case SG_PROCESS_STATE_ZOMBIE:
652		process_stat.zombie++;
653	+	break;
654	+	default:
655	+	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
656	+	* sg_process_count */
657		break;
658		}
659		ps++;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines