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.32 by tdb, Sun Apr 4 11:02:30 2004 UTC vs.
Revision 1.55 by tdb, Tue Apr 6 13:40:41 2004 UTC

#	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;
94	<	static int psarg_size = 0;
123	>	VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
124		unsigned long stime, utime;
125		int x;
126		int fn;
127	<	int toread;
128	<	ssize_t size;
100	<	int t_read;
127	>	int len;
128	>	int rc;
129		#endif
130
131		if((proc_dir=opendir(PROC_LOCATION))==NULL){
132	<	return -1;
132	>	return NULL;
133		}
134
135		while((dir_entry=readdir(proc_dir))!=NULL){
#	Line 122 | Line 150 | int get_proc_snapshot(proc_state_t **ps){
150		fread(&process_info, sizeof(psinfo_t), 1, f);
151		#endif
152
153	<	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
153	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
154	>	return NULL;
155	>	}
156		proc_state_ptr = proc_state+proc_state_size;
157	+
158		#ifdef SOLARIS
159		proc_state_ptr->pid = process_info.pr_pid;
160		proc_state_ptr->parent = process_info.pr_ppid;
#	Line 139 | Line 170 | int get_proc_snapshot(proc_state_t **ps){
170		proc_state_ptr->process_name = strdup(process_info.pr_fname);
171		proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
172
173	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
174	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
175	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
176	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
177	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
173	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
174	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
175	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
176	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
177	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
178		#endif
179		#ifdef LINUX
180	<	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));
180	>	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));
181		proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
182	<	if(s == 'S') proc_state_ptr->state = SLEEPING;
183	<	if(s == 'R') proc_state_ptr->state = RUNNING;
184	<	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
185	<	if(s == 'T') proc_state_ptr->state = STOPPED;
186	<	if(s == 'D') proc_state_ptr->state = STOPPED;
182	>	if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
183	>	if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
184	>	if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
185	>	if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
186	>	if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
187
188		/* pa_name[0] should = '(' */
189		ptr = strchr(&ps_name[1], ')');
190		if(ptr !=NULL) *ptr='\0';
160	–	proc_state_ptr->process_name = strdup(&ps_name[1]);
191
192	+	if (sg_update_string(&proc_state_ptr->process_name,
193	+	&ps_name[1]) < 0) {
194	+	return NULL;
195	+	}
196	+
197		/* Need to do cpu */
198
199
200	+	fclose(f);
201	+
202		/* proctitle */
203		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
204
#	Line 170 | Line 207 | int get_proc_snapshot(proc_state_t **ps){
207		* Ah well, move onwards to the next one */
208		continue;
209		}
210	<	#define         PSARG_START_SIZE 128
211	<	if(psargs == NULL){
212	<	psargs = malloc(PSARG_START_SIZE);
213	<	psarg_size = PSARG_START_SIZE;
210	>
211	>	#define READ_BLOCK_SIZE 128
212	>	len = 0;
213	>	do {
214	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
215	>	return NULL;
216	>	}
217	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
218	>	if (rc > 0) {
219	>	len += rc;
220	>	}
221	>	} while (rc == READ_BLOCK_SIZE);
222	>	close(fn);
223	>
224	>	if (rc == -1) {
225	>	/* Read failed; move on. */
226	>	continue;
227		}
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;
228
229	+	/* Turn \0s into spaces within the command line. */
230		ptr = psargs;
231	<	for(x=0; x<t_read; x++){
231	>	for(x = 0; x < len; x++) {
232		if (*ptr == '\0') *ptr = ' ';
233		ptr++;
234		}
195	–	/*  for safety sake */
196	–	psargs[t_read] = '\0';
235
236	<	proc_state_ptr->proctitle = strdup(psargs);
236	>	if (len == 0) {
237	>	/* We want psargs to be NULL. */
238	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
239	>	return NULL;
240	>	}
241	>	} else {
242	>	/* Not empty, so append a \0. */
243	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
244	>	return NULL;
245	>	}
246	>	psargs[len] = '\0';
247	>	}
248
249	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
250	+	return NULL;
251	+	}
252		#endif
253
254		proc_state_size++;
203	–
204	–	fclose(f);
255		}
256		closedir(proc_dir);
257		#endif
258
259		#ifdef ALLBSD
260	<	kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
260	>	mib[0] = CTL_KERN;
261	>	mib[1] = KERN_PROC;
262	>	mib[2] = KERN_PROC_ALL;
263
264	<	if(kvmd == NULL) return NULL;
264	>	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
265	>	return NULL;
266	>	}
267
268	<	kp_stats = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &procs);
268	>	procs = size / sizeof(struct kinfo_proc);
269
270	<	if (kp_stats == NULL || procs < 0) {
270	>	kp_stats = malloc(size);
271	>	if(kp_stats == NULL) {
272		return NULL;
273		}
274	+	memset(kp_stats, 0, size);
275
276	+	if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
277	+	free(kp_stats);
278	+	return NULL;
279	+	}
280	+
281	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
282	+	kvmd = sg_get_kvm2();
283	+	#endif
284	+
285		for (i = 0; i < procs; i++) {
286	<	/* replace with something more sensible */
287	<	proc_state = realloc(proc_state,
288	<	(1+proc_state_size)*sizeof(proc_state_t));
289	<	if(proc_state == NULL ) {
286	>	const char *name;
287	>
288	>	#ifdef FREEBSD5
289	>	if (kp_stats[i].ki_stat == 0) {
290	>	#else
291	>	if (kp_stats[i].kp_proc.p_stat == 0) {
292	>	#endif
293	>	/* FreeBSD 5 deliberately overallocates the array that
294	>	* the sysctl returns, so we'll get a few junk
295	>	* processes on the end that we have to ignore. (Search
296	>	* for "overestimate by 5 procs" in
297	>	* src/sys/kern/kern_proc.c for more details.) */
298	>	continue;
299	>	}
300	>
301	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
302		return NULL;
303		}
304		proc_state_ptr = proc_state+proc_state_size;
305
306		#ifdef FREEBSD5
307	<	proc_state_ptr->process_name =
308	<	strdup(kp_stats[i].ki_comm);
307	>	name = kp_stats[i].ki_comm;
308	>	#elif defined(DFBSD)
309	>	name = kp_stats[i].kp_thread.td_comm;
310		#else
311	<	proc_state_ptr->process_name =
234	<	strdup(kp_stats[i].kp_proc.p_comm);
311	>	name = kp_stats[i].kp_proc.p_comm;
312		#endif
313	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
314	+	return NULL;
315	+	}
316
317	<	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
318	<	if(args != NULL) {
319	<	alloc = 1;
320	<	proctitle = malloc(alloc);
321	<	if(proctitle == NULL) {
317	>	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
318	>	size = sizeof(buflen);
319	>
320	>	#ifdef FREEBSD5
321	>	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
322	>	return NULL;
323	>	}
324	>	#else
325	>	mib[1] = KERN_ARGMAX;
326	>
327	>	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
328	>	return NULL;
329	>	}
330	>	#endif
331	>
332	>	proctitle = malloc(buflen);
333	>	if(proctitle == NULL) {
334	>	return NULL;
335	>	}
336	>
337	>	size = buflen;
338	>
339	>	#ifdef FREEBSD5
340	>	mib[2] = KERN_PROC_ARGS;
341	>	mib[3] = kp_stats[i].ki_pid;
342	>	#else
343	>	mib[1] = KERN_PROC_ARGS;
344	>	mib[2] = kp_stats[i].kp_proc.p_pid;
345	>	mib[3] = KERN_PROC_ARGV;
346	>	#endif
347	>
348	>	free(proc_state_ptr->proctitle);
349	>	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
350	>	free(proctitle);
351	>	proc_state_ptr->proctitle = NULL;
352	>	}
353	>	else if(size > 0) {
354	>	proc_state_ptr->proctitle = malloc(size+1);
355	>	if(proc_state_ptr->proctitle == NULL) {
356		return NULL;
357		}
358	<	while(*args != NULL) {
359	<	if(strlen(proctitle) + strlen(*args) >= alloc) {
360	<	alloc = (alloc + strlen(*args)) << 1;
361	<	proctitle = realloc(proctitle, alloc);
362	<	if(proctitle == NULL) {
363	<	return NULL;
364	<	}
365	<	}
252	<	strncat(proctitle, *args, strlen(*args));
253	<	strncat(proctitle, " ", 1);
254	<	args++;
255	<	}
358	>	p = proctitle;
359	>	proc_state_ptr->proctitle[0] = '\0';
360	>	do {
361	>	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
362	>	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
363	>	p += strlen(p) + 1;
364	>	} while (p < proctitle + size);
365	>	free(proctitle);
366		/* remove trailing space */
367	<	proctitle[strlen(proctitle)-1] = NULL;
258	<	proc_state_ptr->proctitle = proctitle;
367	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
368		}
369		else {
370	<	proc_state_ptr->proctitle =
371	<	malloc(strlen(proc_state_ptr->process_name)+4);
372	<	if(proc_state_ptr->proctitle == NULL) {
373	<	return NULL;
370	>	free(proctitle);
371	>	proc_state_ptr->proctitle = NULL;
372	>	}
373	>	#else
374	>	free(proc_state_ptr->proctitle);
375	>	if(kvmd != NULL) {
376	>	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
377	>	if(args != NULL) {
378	>	argsp = args;
379	>	while(*argsp != NULL) {
380	>	argslen += strlen(*argsp) + 1;
381	>	argsp++;
382	>	}
383	>	proctitle = malloc(argslen + 1);
384	>	proctitle[0] = '\0';
385	>	if(proctitle == NULL) {
386	>	return NULL;
387	>	}
388	>	while(*args != NULL) {
389	>	sg_strlcat(proctitle, *args, argslen + 1);
390	>	sg_strlcat(proctitle, " ", argslen + 1);
391	>	args++;
392	>	}
393	>	/* remove trailing space */
394	>	proctitle[strlen(proctitle)-1] = '\0';
395	>	proc_state_ptr->proctitle = proctitle;
396		}
397	<	sprintf(proc_state_ptr->proctitle, " (%s)",
398	<	proc_state_ptr->process_name);
397	>	else {
398	>	proc_state_ptr->proctitle = NULL;
399	>	}
400		}
401	+	else {
402	+	proc_state_ptr->proctitle = NULL;
403	+	}
404	+	#endif
405
406		#ifdef FREEBSD5
407		proc_state_ptr->pid = kp_stats[i].ki_pid;
#	Line 282 | Line 418 | int get_proc_snapshot(proc_state_t **ps){
418		proc_state_ptr->euid = kp_stats[i].ki_uid;
419		proc_state_ptr->gid = kp_stats[i].ki_rgid;
420		proc_state_ptr->egid = kp_stats[i].ki_svgid;
421	+	#elif defined(DFBSD)
422	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid;
423	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid;
424	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid;
425	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid;
426		#else
427		proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid;
428		proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid;
#	Line 305 | Line 446 | int get_proc_snapshot(proc_state_t **ps){
446		/* This is in pages */
447		proc_state_ptr->proc_resident =
448		kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize();
449	+	#if defined(NETBSD) || defined(OPENBSD)
450	+	proc_state_ptr->time_spent =
451	+	kp_stats[i].kp_proc.p_rtime.tv_sec;
452	+	#elif defined(DFBSD)
453	+	proc_state_ptr->time_spent =
454	+	( kp_stats[i].kp_thread.td_uticks +
455	+	kp_stats[i].kp_thread.td_sticks +
456	+	kp_stats[i].kp_thread.td_iticks ) / 1000000;
457	+	#else
458		/* This is in microseconds */
459		proc_state_ptr->time_spent =
460		kp_stats[i].kp_proc.p_runtime / 1000000;
461	+	#endif
462		proc_state_ptr->cpu_percent =
463		((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0;
464		proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
465		#endif
466
467	+	#ifdef NETBSD2
468	+	{
469	+	size_t size;
470	+	int mib[5];
471	+
472	+	mib[0] = CTL_KERN;
473	+	mib[1] = KERN_LWP;
474	+	mib[2] = kp_stats[i].kp_proc.p_pid;
475	+	mib[3] = sizeof(struct kinfo_lwp);
476	+	mib[4] = 0;
477	+
478	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
479	+	return NULL;
480	+	}
481	+
482	+	lwps = size / sizeof(struct kinfo_lwp);
483	+	mib[4] = lwps;
484	+
485	+	kl_stats = malloc(size);
486	+	if(kl_stats == NULL) {
487	+	return NULL;
488	+	}
489	+
490	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
491	+	return NULL;
492	+	}
493	+	}
494	+
495	+	switch(kp_stats[i].kp_proc.p_stat) {
496	+	case SIDL:
497	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
498	+	break;
499	+	case SACTIVE:
500	+	{
501	+	int i;
502	+
503	+	for(i = 0; i < lwps; i++) {
504	+	switch(kl_stats[i].l_stat) {
505	+	case LSONPROC:
506	+	case LSRUN:
507	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
508	+	goto end;
509	+	case LSSLEEP:
510	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
511	+	goto end;
512	+	case LSSTOP:
513	+	case LSSUSPENDED:
514	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
515	+	goto end;
516	+	}
517	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
518	+	}
519	+	end: ;
520	+	}
521	+	break;
522	+	case SSTOP:
523	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
524	+	break;
525	+	case SZOMB:
526	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
527	+	break;
528	+	default:
529	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
530	+	break;
531	+	}
532	+	#else
533		#ifdef FREEBSD5
534		switch (kp_stats[i].ki_stat) {
535		#else
#	Line 323 | Line 540 | int get_proc_snapshot(proc_state_t **ps){
540		#ifdef SONPROC
541		case SONPROC: /* NetBSD */
542		#endif
543	<	proc_state_ptr->state = RUNNING;
543	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
544		break;
545		case SSLEEP:
546		#ifdef SWAIT
#	Line 332 | Line 549 | int get_proc_snapshot(proc_state_t **ps){
549		#ifdef SLOCK
550		case SLOCK: /* FreeBSD 5 */
551		#endif
552	<	proc_state_ptr->state = SLEEPING;
552	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
553		break;
554		case SSTOP:
555	<	proc_state_ptr->state = STOPPED;
555	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
556		break;
557		case SZOMB:
558		#ifdef SDEAD
559		case SDEAD: /* OpenBSD & NetBSD */
560		#endif
561	<	proc_state_ptr->state = ZOMBIE;
561	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
562		break;
563		default:
564	<	proc_state_ptr->state = UNKNOWN;
564	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
565		break;
566		}
567	+	#endif
568		proc_state_size++;
569		}
570
571		free(kp_stats);
572		#endif
573
574	<	*ps = proc_state;
575	<	return proc_state_size;
574	>	#ifdef CYGWIN
575	>	return NULL;
576	>	#endif
577	>
578	>	*entries = proc_state_size;
579	>	return proc_state;
580		}
581
582	<	process_stat_t *get_process_stats() {
583	<	static process_stat_t process_stat;
584	<	proc_state_t *ps;
582	>	sg_process_count *sg_get_process_count() {
583	>	static sg_process_count process_stat;
584	>	sg_process_stats *ps;
585		int ps_size, x;
586
587		process_stat.sleeping = 0;
#	Line 368 | Line 590 | process_stat_t *get_process_stats() {
590		process_stat.stopped = 0;
591		process_stat.total = 0;
592
593	<	ps_size = get_proc_snapshot(&ps);
594	<
373	<	if(ps_size == NULL) {
593	>	ps = sg_get_process_stats(&ps_size);
594	>	if (ps == NULL) {
595		return NULL;
596		}
597
598		for(x = 0; x < ps_size; x++) {
599		switch (ps->state) {
600	<	/* currently no mapping for UNKNOWN in process_stat_t */
380	<	case RUNNING:
600	>	case SG_PROCESS_STATE_RUNNING:
601		process_stat.running++;
602		break;
603	<	case SLEEPING:
603	>	case SG_PROCESS_STATE_SLEEPING:
604		process_stat.sleeping++;
605		break;
606	<	case STOPPED:
606	>	case SG_PROCESS_STATE_STOPPED:
607		process_stat.stopped++;
608		break;
609	<	case ZOMBIE:
609	>	case SG_PROCESS_STATE_ZOMBIE:
610		process_stat.zombie++;
611	+	break;
612	+	default:
613	+	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
614	+	* sg_process_count */
615		break;
616		}
617		ps++;

Diff Legend

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