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

Diff Legend

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