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.40 by ats, Sun Apr 4 21:44:00 2004 UTC vs.
Revision 1.64 by pajs, Wed Apr 7 15:46:34 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[4];
92		size_t size;
93		struct kinfo_proc *kp_stats;
94	<	int procs, i, alloc;
94	>	int procs, i;
95		char *proctitle;
96	<	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
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;
80	–	int argc;
81	–	int j = 0;
82	–	#else
83	–	static kvm_t *kvmd;
84	–	char **args;
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 97 | 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;
102	<	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	>	fclose(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 143 | Line 178 | int get_proc_snapshot(proc_state_t **ps){
178		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
179		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
180		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
181	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
182	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
181	>	proc_state_ptr->nice = (int)process_info.pr_lwp.pr_nice - 20;
182	>	if (sg_update_string(&proc_state_ptr->process_name,
183	>	process_info.pr_fname) < 0) {
184	>	return NULL;
185	>	}
186	>	if (sg_update_string(&proc_state_ptr->proctitle,
187	>	process_info.pr_psargs) < 0) {
188	>	return NULL;
189	>	}
190
191	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
192	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
193	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
194	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
195	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
191	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
192	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
193	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
194	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
195	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
196		#endif
197		#ifdef LINUX
198	<	x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*u %*u %*u %*u %*u %lu %lu %*d %*d %*d %d %*d %*d %*u %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), &(proc_state_ptr->proc_size), &(proc_state_ptr->proc_resident));
199	<	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
200	<	if(s == 'S') proc_state_ptr->state = SLEEPING;
201	<	if(s == 'R') proc_state_ptr->state = RUNNING;
202	<	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
203	<	if(s == 'T') proc_state_ptr->state = STOPPED;
204	<	if(s == 'D') proc_state_ptr->state = STOPPED;
198	>	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));
199	>	/* +3 becuase man page says "Resident  Set Size: number of pages the process has in real memory, minus 3 for administrative purposes." */
200	>	proc_state_ptr->proc_resident = (proc_state_ptr->proc_resident + 3) * getpagesize();
201	>	if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
202	>	if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
203	>	if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
204	>	if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
205	>	if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
206
207		/* pa_name[0] should = '(' */
208		ptr = strchr(&ps_name[1], ')');
209		if(ptr !=NULL) *ptr='\0';
167	–	proc_state_ptr->process_name = strdup(&ps_name[1]);
210
211	<	/* Need to do cpu */
212	<
211	>	if (sg_update_string(&proc_state_ptr->process_name,
212	>	&ps_name[1]) < 0) {
213	>	return NULL;
214	>	}
215
216	+	/* cpu */
217	+	proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
218	+
219	+	fclose(f);
220	+
221	+	/* uid / gid */
222	+	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
223	+	if ((f=fopen(filename, "r")) == NULL) {
224	+	/* Open failed.. Process since vanished, or the path was too long.
225	+	* Ah well, move onwards to the next one */
226	+	continue;
227	+	}
228	+
229	+	if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
230	+	fclose(f);
231	+	continue;
232	+	}
233	+	sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
234	+
235	+	if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
236	+	fclose(f);
237	+	continue;
238	+	}
239	+	sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
240	+
241	+	fclose(f);
242	+
243		/* proctitle */
244		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
245
246	<	if((fn=open(filename, O_RDONLY)) == -1){
247	<	/* Open failed.. Process since vanished, or the path was too long.
248	<	* Ah well, move onwards to the next one */
249	<	continue;
179	<	}
180	<	#define         PSARG_START_SIZE 128
181	<	if(psargs == NULL){
182	<	psargs = malloc(PSARG_START_SIZE);
183	<	psarg_size = PSARG_START_SIZE;
246	>	if((fn=open(filename, O_RDONLY)) == -1){
247	>	/* Open failed.. Process since vanished, or the path was too long.
248	>	* Ah well, move onwards to the next one */
249	>	continue;
250		}
251	<	ptr = psargs;
252	<	t_read = 0;
253	<	toread = psarg_size;
254	<	while((size = read(fn, ptr, toread)) == toread){
255	<	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
256	<	ptr = psargs+psarg_size;
257	<	t_read = psarg_size;
258	<	psarg_size+=PSARG_START_SIZE;
259	<	toread = PSARG_START_SIZE;
251	>
252	>	#define READ_BLOCK_SIZE 128
253	>	len = 0;
254	>	do {
255	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
256	>	return NULL;
257	>	}
258	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
259	>	if (rc > 0) {
260	>	len += rc;
261	>	}
262	>	} while (rc == READ_BLOCK_SIZE);
263	>	close(fn);
264	>
265	>	if (rc == -1) {
266	>	/* Read failed; move on. */
267	>	continue;
268		}
195	–	if(size != -1) t_read+=size;
269
270	+	/* Turn \0s into spaces within the command line. */
271		ptr = psargs;
272	<	for(x=0; x<t_read; x++){
272	>	for(x = 0; x < len; x++) {
273		if (*ptr == '\0') *ptr = ' ';
274		ptr++;
275		}
202	–	/*  for safety sake */
203	–	psargs[t_read] = '\0';
276
277	<	proc_state_ptr->proctitle = strdup(psargs);
277	>	if (len == 0) {
278	>	/* We want psargs to be NULL. */
279	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
280	>	return NULL;
281	>	}
282	>	} else {
283	>	/* Not empty, so append a \0. */
284	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
285	>	return NULL;
286	>	}
287	>	psargs[len] = '\0';
288	>	}
289
290	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
291	+	return NULL;
292	+	}
293		#endif
294
295		proc_state_size++;
296	<
297	<	fclose(f);
212	<	}
213	<	closedir(proc_dir);
296	>	}
297	>	closedir(proc_dir);
298		#endif
299
300		#ifdef ALLBSD
#	Line 224 | Line 308 | int get_proc_snapshot(proc_state_t **ps){
308
309		procs = size / sizeof(struct kinfo_proc);
310
311	<	kp_stats = malloc(size);
311	>	kp_stats = sg_malloc(size);
312		if(kp_stats == NULL) {
313		return NULL;
314		}
315	+	memset(kp_stats, 0, size);
316
317		if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
318		free(kp_stats);
#	Line 235 | Line 320 | int get_proc_snapshot(proc_state_t **ps){
320		}
321
322		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
323	<	kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
323	>	kvmd = sg_get_kvm2();
324		#endif
325
326		for (i = 0; i < procs; i++) {
327	<	/* replace with something more sensible */
328	<	proc_state = realloc(proc_state,
329	<	(1+proc_state_size)*sizeof(proc_state_t));
330	<	if(proc_state == NULL ) {
327	>	const char *name;
328	>
329	>	#ifdef FREEBSD5
330	>	if (kp_stats[i].ki_stat == 0) {
331	>	#else
332	>	if (kp_stats[i].kp_proc.p_stat == 0) {
333	>	#endif
334	>	/* FreeBSD 5 deliberately overallocates the array that
335	>	* the sysctl returns, so we'll get a few junk
336	>	* processes on the end that we have to ignore. (Search
337	>	* for "overestimate by 5 procs" in
338	>	* src/sys/kern/kern_proc.c for more details.) */
339	>	continue;
340	>	}
341	>
342	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
343		return NULL;
344		}
345		proc_state_ptr = proc_state+proc_state_size;
346
347		#ifdef FREEBSD5
348	<	proc_state_ptr->process_name =
252	<	strdup(kp_stats[i].ki_comm);
348	>	name = kp_stats[i].ki_comm;
349		#elif defined(DFBSD)
350	<	proc_state_ptr->process_name =
255	<	strdup(kp_stats[i].kp_thread.td_comm);
350	>	name = kp_stats[i].kp_thread.td_comm;
351		#else
352	<	proc_state_ptr->process_name =
258	<	strdup(kp_stats[i].kp_proc.p_comm);
352	>	name = kp_stats[i].kp_proc.p_comm;
353		#endif
354	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
355	+	return NULL;
356	+	}
357
358		#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
359		size = sizeof(buflen);
#	Line 266 | Line 363 | int get_proc_snapshot(proc_state_t **ps){
363		return NULL;
364		}
365		#else
366	+	/* FIXME - this value can be too large on some of
367	+	the BSD's, which causes sysctl not to return
368	+	anything. Maybe we need something smaller? */
369		mib[1] = KERN_ARGMAX;
370
371		if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
#	Line 273 | Line 373 | int get_proc_snapshot(proc_state_t **ps){
373		}
374		#endif
375
376	<	proctitle = malloc(buflen);
376	>	proctitle = sg_malloc(buflen);
377		if(proctitle == NULL) {
378		return NULL;
379		}
#	Line 289 | Line 389 | int get_proc_snapshot(proc_state_t **ps){
389		mib[3] = KERN_PROC_ARGV;
390		#endif
391
392	+	free(proc_state_ptr->proctitle);
393		if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
394		free(proctitle);
395		proc_state_ptr->proctitle = NULL;
396		}
397		else if(size > 0) {
398	<	proc_state_ptr->proctitle = malloc(size);
398	>	proc_state_ptr->proctitle = sg_malloc(size+1);
399		if(proc_state_ptr->proctitle == NULL) {
400		return NULL;
401		}
402		p = proctitle;
403	<	proc_state_ptr->proctitle[0] = NULL;
403	>	proc_state_ptr->proctitle[0] = '\0';
404		do {
405	<	strncat(proc_state_ptr->proctitle, p, strlen(p));
406	<	strncat(proc_state_ptr->proctitle, " ", 1);
405	>	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
406	>	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
407		p += strlen(p) + 1;
408		} while (p < proctitle + size);
409		free(proctitle);
410	<	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = NULL;
410	>	/* remove trailing space */
411	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
412		}
413		else {
414		free(proctitle);
415		proc_state_ptr->proctitle = NULL;
416		}
417		#else
418	+	free(proc_state_ptr->proctitle);
419		if(kvmd != NULL) {
420		args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
421		if(args != NULL) {
422	<	alloc = 1;
423	<	proctitle = malloc(alloc);
422	>	argsp = args;
423	>	while(*argsp != NULL) {
424	>	argslen += strlen(*argsp) + 1;
425	>	argsp++;
426	>	}
427	>	proctitle = sg_malloc(argslen + 1);
428	>	proctitle[0] = '\0';
429		if(proctitle == NULL) {
430		return NULL;
431		}
432		while(*args != NULL) {
433	<	if(strlen(proctitle) + strlen(*args) >= alloc) {
434	<	alloc = (alloc + strlen(*args)) << 1;
327	<	proctitle = realloc(proctitle, alloc);
328	<	if(proctitle == NULL) {
329	<	return NULL;
330	<	}
331	<	}
332	<	strncat(proctitle, *args, strlen(*args));
333	<	strncat(proctitle, " ", 1);
433	>	sg_strlcat(proctitle, *args, argslen + 1);
434	>	sg_strlcat(proctitle, " ", argslen + 1);
435		args++;
436		}
437		/* remove trailing space */
438	<	proctitle[strlen(proctitle)-1] = NULL;
438	>	proctitle[strlen(proctitle)-1] = '\0';
439		proc_state_ptr->proctitle = proctitle;
440		}
441		else {
#	Line 407 | Line 508 | int get_proc_snapshot(proc_state_t **ps){
508		proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
509		#endif
510
511	+	#ifdef NETBSD2
512	+	{
513	+	size_t size;
514	+	int mib[5];
515	+
516	+	mib[0] = CTL_KERN;
517	+	mib[1] = KERN_LWP;
518	+	mib[2] = kp_stats[i].kp_proc.p_pid;
519	+	mib[3] = sizeof(struct kinfo_lwp);
520	+	mib[4] = 0;
521	+
522	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
523	+	return NULL;
524	+	}
525	+
526	+	lwps = size / sizeof(struct kinfo_lwp);
527	+	mib[4] = lwps;
528	+
529	+	kl_stats = sg_malloc(size);
530	+	if(kl_stats == NULL) {
531	+	return NULL;
532	+	}
533	+
534	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
535	+	return NULL;
536	+	}
537	+	}
538	+
539	+	switch(kp_stats[i].kp_proc.p_stat) {
540	+	case SIDL:
541	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
542	+	break;
543	+	case SACTIVE:
544	+	{
545	+	int i;
546	+
547	+	for(i = 0; i < lwps; i++) {
548	+	switch(kl_stats[i].l_stat) {
549	+	case LSONPROC:
550	+	case LSRUN:
551	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
552	+	goto end;
553	+	case LSSLEEP:
554	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
555	+	goto end;
556	+	case LSSTOP:
557	+	case LSSUSPENDED:
558	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
559	+	goto end;
560	+	}
561	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
562	+	}
563	+	end: ;
564	+	}
565	+	break;
566	+	case SSTOP:
567	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
568	+	break;
569	+	case SZOMB:
570	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
571	+	break;
572	+	default:
573	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
574	+	break;
575	+	}
576	+	#else
577		#ifdef FREEBSD5
578		switch (kp_stats[i].ki_stat) {
579		#else
#	Line 417 | Line 584 | int get_proc_snapshot(proc_state_t **ps){
584		#ifdef SONPROC
585		case SONPROC: /* NetBSD */
586		#endif
587	<	proc_state_ptr->state = RUNNING;
587	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
588		break;
589		case SSLEEP:
590		#ifdef SWAIT
#	Line 426 | Line 593 | int get_proc_snapshot(proc_state_t **ps){
593		#ifdef SLOCK
594		case SLOCK: /* FreeBSD 5 */
595		#endif
596	<	proc_state_ptr->state = SLEEPING;
596	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
597		break;
598		case SSTOP:
599	<	proc_state_ptr->state = STOPPED;
599	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
600		break;
601		case SZOMB:
602		#ifdef SDEAD
603		case SDEAD: /* OpenBSD & NetBSD */
604		#endif
605	<	proc_state_ptr->state = ZOMBIE;
605	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
606		break;
607		default:
608	<	proc_state_ptr->state = UNKNOWN;
608	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
609		break;
610		}
611	+	#endif
612		proc_state_size++;
613		}
614
615		free(kp_stats);
616		#endif
617
618	<	*ps = proc_state;
619	<	return proc_state_size;
618	>	#ifdef CYGWIN
619	>	return NULL;
620	>	#endif
621	>
622	>	*entries = proc_state_size;
623	>	return proc_state;
624		}
625
626	<	process_stat_t *get_process_stats() {
627	<	static process_stat_t process_stat;
628	<	proc_state_t *ps;
626	>	sg_process_count *sg_get_process_count() {
627	>	static sg_process_count process_stat;
628	>	sg_process_stats *ps;
629		int ps_size, x;
630
631		process_stat.sleeping = 0;
#	Line 462 | Line 634 | process_stat_t *get_process_stats() {
634		process_stat.stopped = 0;
635		process_stat.total = 0;
636
637	<	ps_size = get_proc_snapshot(&ps);
638	<
467	<	if(ps_size == 0) {
637	>	ps = sg_get_process_stats(&ps_size);
638	>	if (ps == NULL) {
639		return NULL;
640		}
641
642		for(x = 0; x < ps_size; x++) {
643		switch (ps->state) {
644	<	case RUNNING:
644	>	case SG_PROCESS_STATE_RUNNING:
645		process_stat.running++;
646		break;
647	<	case SLEEPING:
647	>	case SG_PROCESS_STATE_SLEEPING:
648		process_stat.sleeping++;
649		break;
650	<	case STOPPED:
650	>	case SG_PROCESS_STATE_STOPPED:
651		process_stat.stopped++;
652		break;
653	<	case ZOMBIE:
653	>	case SG_PROCESS_STATE_ZOMBIE:
654		process_stat.zombie++;
655		break;
656		default:
657	<	/* currently no mapping for UNKNOWN in process_stat_t */
657	>	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
658	>	* sg_process_count */
659		break;
660		}
661		ps++;

Diff Legend

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