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.27 by tdb, Fri Apr 2 21:20:23 2004 UTC vs.
Revision 1.61 by ats, Wed Apr 7 10:33:50 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 57 | Line 59
59		#else
60		#include <sys/proc.h>
61		#endif
62	+	#include <string.h>
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;
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;
#	Line 82 | 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;
87	<	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	+	#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		if((proc_dir=opendir(PROC_LOCATION))==NULL){
142	<	return -1;
142	>	return NULL;
143		}
144
145		while((dir_entry=readdir(proc_dir))!=NULL){
#	Line 114 | Line 160 | int get_proc_snapshot(proc_state_t **ps){
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 128 | 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';
152	–	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	+	printf("%s  ut: %lu st: %lu up: %lu start: %lu\n", proc_state_ptr->process_name, utime, stime, uptime , starttime);
217	+
218	+	fclose(f);
219	+
220		/* proctitle */
221		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
222
#	Line 162 | Line 225 | int get_proc_snapshot(proc_state_t **ps){
225		* Ah well, move onwards to the next one */
226		continue;
227		}
228	<	#define         PSARG_START_SIZE 128
229	<	if(psargs == NULL){
230	<	psargs = malloc(PSARG_START_SIZE);
231	<	psarg_size = PSARG_START_SIZE;
228	>
229	>	#define READ_BLOCK_SIZE 128
230	>	len = 0;
231	>	do {
232	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
233	>	return NULL;
234	>	}
235	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
236	>	if (rc > 0) {
237	>	len += rc;
238	>	}
239	>	} while (rc == READ_BLOCK_SIZE);
240	>	close(fn);
241	>
242	>	if (rc == -1) {
243	>	/* Read failed; move on. */
244	>	continue;
245		}
170	–	ptr = psargs;
171	–	t_read = 0;
172	–	toread = psarg_size;
173	–	while((size = read(fn, ptr, toread)) == toread){
174	–	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
175	–	ptr = psargs+psarg_size;
176	–	t_read = psarg_size;
177	–	psarg_size+=PSARG_START_SIZE;
178	–	toread = PSARG_START_SIZE;
179	–	}
180	–	if(size != -1) t_read+=size;
246
247	+	/* Turn \0s into spaces within the command line. */
248		ptr = psargs;
249	<	for(x=0; x<t_read; x++){
249	>	for(x = 0; x < len; x++) {
250		if (*ptr == '\0') *ptr = ' ';
251		ptr++;
252		}
187	–	/*  for safety sake */
188	–	psargs[t_read] = '\0';
253
254	<	proc_state_ptr->proctitle = strdup(psargs);
254	>	if (len == 0) {
255	>	/* We want psargs to be NULL. */
256	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
257	>	return NULL;
258	>	}
259	>	} else {
260	>	/* Not empty, so append a \0. */
261	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
262	>	return NULL;
263	>	}
264	>	psargs[len] = '\0';
265	>	}
266
267	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
268	+	return NULL;
269	+	}
270		#endif
271
272		proc_state_size++;
195	–
196	–	fclose(f);
273		}
274		closedir(proc_dir);
275		#endif
#	Line 203 | Line 279 | int get_proc_snapshot(proc_state_t **ps){
279		mib[1] = KERN_PROC;
280		mib[2] = KERN_PROC_ALL;
281
282	<	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
282	>	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
283		return NULL;
284		}
285
286		procs = size / sizeof(struct kinfo_proc);
287
288	<	kp_stats = malloc(size);
289	<	if (kp_stats == NULL) {
288	>	kp_stats = sg_malloc(size);
289	>	if(kp_stats == NULL) {
290		return NULL;
291		}
292	+	memset(kp_stats, 0, size);
293
294	<	if (sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
294	>	if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
295		free(kp_stats);
296		return NULL;
297		}
298
299	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
300	+	kvmd = sg_get_kvm2();
301	+	#endif
302	+
303		for (i = 0; i < procs; i++) {
304	<	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
304	>	const char *name;
305	>
306	>	#ifdef FREEBSD5
307	>	if (kp_stats[i].ki_stat == 0) {
308	>	#else
309	>	if (kp_stats[i].kp_proc.p_stat == 0) {
310	>	#endif
311	>	/* FreeBSD 5 deliberately overallocates the array that
312	>	* the sysctl returns, so we'll get a few junk
313	>	* processes on the end that we have to ignore. (Search
314	>	* for "overestimate by 5 procs" in
315	>	* src/sys/kern/kern_proc.c for more details.) */
316	>	continue;
317	>	}
318	>
319	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
320	>	return NULL;
321	>	}
322		proc_state_ptr = proc_state+proc_state_size;
225	–
226	–	proc_state_ptr->process_name = strdup(kp_stats[i].ki_comm);
227	–	/* Seems we don't have access to that bit of memory */
228	–	/*proc_state_ptr->proctitle = strdup(kp_stats[i].ki_args->ar_args);*/
323
324	+	#ifdef FREEBSD5
325	+	name = kp_stats[i].ki_comm;
326	+	#elif defined(DFBSD)
327	+	name = kp_stats[i].kp_thread.td_comm;
328	+	#else
329	+	name = kp_stats[i].kp_proc.p_comm;
330	+	#endif
331	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
332	+	return NULL;
333	+	}
334	+
335	+	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
336	+	size = sizeof(buflen);
337	+
338	+	#ifdef FREEBSD5
339	+	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
340	+	return NULL;
341	+	}
342	+	#else
343	+	/* FIXME - this value can be too large on some of
344	+	the BSD's, which causes sysctl not to return
345	+	anything. Maybe we need something smaller? */
346	+	mib[1] = KERN_ARGMAX;
347	+
348	+	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
349	+	return NULL;
350	+	}
351	+	#endif
352	+
353	+	proctitle = sg_malloc(buflen);
354	+	if(proctitle == NULL) {
355	+	return NULL;
356	+	}
357	+
358	+	size = buflen;
359	+
360	+	#ifdef FREEBSD5
361	+	mib[2] = KERN_PROC_ARGS;
362	+	mib[3] = kp_stats[i].ki_pid;
363	+	#else
364	+	mib[1] = KERN_PROC_ARGS;
365	+	mib[2] = kp_stats[i].kp_proc.p_pid;
366	+	mib[3] = KERN_PROC_ARGV;
367	+	#endif
368	+
369	+	free(proc_state_ptr->proctitle);
370	+	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
371	+	free(proctitle);
372	+	proc_state_ptr->proctitle = NULL;
373	+	}
374	+	else if(size > 0) {
375	+	proc_state_ptr->proctitle = sg_malloc(size+1);
376	+	if(proc_state_ptr->proctitle == NULL) {
377	+	return NULL;
378	+	}
379	+	p = proctitle;
380	+	proc_state_ptr->proctitle[0] = '\0';
381	+	do {
382	+	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
383	+	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
384	+	p += strlen(p) + 1;
385	+	} while (p < proctitle + size);
386	+	free(proctitle);
387	+	/* remove trailing space */
388	+	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
389	+	}
390	+	else {
391	+	free(proctitle);
392	+	proc_state_ptr->proctitle = NULL;
393	+	}
394	+	#else
395	+	free(proc_state_ptr->proctitle);
396	+	if(kvmd != NULL) {
397	+	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
398	+	if(args != NULL) {
399	+	argsp = args;
400	+	while(*argsp != NULL) {
401	+	argslen += strlen(*argsp) + 1;
402	+	argsp++;
403	+	}
404	+	proctitle = sg_malloc(argslen + 1);
405	+	proctitle[0] = '\0';
406	+	if(proctitle == NULL) {
407	+	return NULL;
408	+	}
409	+	while(*args != NULL) {
410	+	sg_strlcat(proctitle, *args, argslen + 1);
411	+	sg_strlcat(proctitle, " ", argslen + 1);
412	+	args++;
413	+	}
414	+	/* remove trailing space */
415	+	proctitle[strlen(proctitle)-1] = '\0';
416	+	proc_state_ptr->proctitle = proctitle;
417	+	}
418	+	else {
419	+	proc_state_ptr->proctitle = NULL;
420	+	}
421	+	}
422	+	else {
423	+	proc_state_ptr->proctitle = NULL;
424	+	}
425	+	#endif
426	+
427	+	#ifdef FREEBSD5
428		proc_state_ptr->pid = kp_stats[i].ki_pid;
429		proc_state_ptr->parent = kp_stats[i].ki_ppid;
430		proc_state_ptr->pgid = kp_stats[i].ki_pgid;
431	+	#else
432	+	proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid;
433	+	proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid;
434	+	proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid;
435	+	#endif
436
437	+	#ifdef FREEBSD5
438		proc_state_ptr->uid = kp_stats[i].ki_ruid;
439		proc_state_ptr->euid = kp_stats[i].ki_uid;
440		proc_state_ptr->gid = kp_stats[i].ki_rgid;
441		proc_state_ptr->egid = kp_stats[i].ki_svgid;
442	+	#elif defined(DFBSD)
443	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid;
444	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid;
445	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid;
446	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid;
447	+	#else
448	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid;
449	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid;
450	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid;
451	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid;
452	+	#endif
453
454	+	#ifdef FREEBSD5
455		proc_state_ptr->proc_size = kp_stats[i].ki_size;
456		/* This is in pages */
457	<	proc_state_ptr->proc_resident = kp_stats[i].ki_rssize * getpagesize();
458	<	/* This seems to be in microseconds */
457	>	proc_state_ptr->proc_resident =
458	>	kp_stats[i].ki_rssize * getpagesize();
459	>	/* This is in microseconds */
460		proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000;
461	<	proc_state_ptr->cpu_percent = kp_stats[i].ki_pctcpu;
461	>	proc_state_ptr->cpu_percent =
462	>	((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0;
463		proc_state_ptr->nice = kp_stats[i].ki_nice;
464	+	#else
465	+	proc_state_ptr->proc_size =
466	+	kp_stats[i].kp_eproc.e_vm.vm_map.size;
467	+	/* This is in pages */
468	+	proc_state_ptr->proc_resident =
469	+	kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize();
470	+	#if defined(NETBSD) || defined(OPENBSD)
471	+	proc_state_ptr->time_spent =
472	+	kp_stats[i].kp_proc.p_rtime.tv_sec;
473	+	#elif defined(DFBSD)
474	+	proc_state_ptr->time_spent =
475	+	( kp_stats[i].kp_thread.td_uticks +
476	+	kp_stats[i].kp_thread.td_sticks +
477	+	kp_stats[i].kp_thread.td_iticks ) / 1000000;
478	+	#else
479	+	/* This is in microseconds */
480	+	proc_state_ptr->time_spent =
481	+	kp_stats[i].kp_proc.p_runtime / 1000000;
482	+	#endif
483	+	proc_state_ptr->cpu_percent =
484	+	((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0;
485	+	proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
486	+	#endif
487
488	+	#ifdef NETBSD2
489	+	{
490	+	size_t size;
491	+	int mib[5];
492	+
493	+	mib[0] = CTL_KERN;
494	+	mib[1] = KERN_LWP;
495	+	mib[2] = kp_stats[i].kp_proc.p_pid;
496	+	mib[3] = sizeof(struct kinfo_lwp);
497	+	mib[4] = 0;
498	+
499	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
500	+	return NULL;
501	+	}
502	+
503	+	lwps = size / sizeof(struct kinfo_lwp);
504	+	mib[4] = lwps;
505	+
506	+	kl_stats = sg_malloc(size);
507	+	if(kl_stats == NULL) {
508	+	return NULL;
509	+	}
510	+
511	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
512	+	return NULL;
513	+	}
514	+	}
515	+
516	+	switch(kp_stats[i].kp_proc.p_stat) {
517	+	case SIDL:
518	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
519	+	break;
520	+	case SACTIVE:
521	+	{
522	+	int i;
523	+
524	+	for(i = 0; i < lwps; i++) {
525	+	switch(kl_stats[i].l_stat) {
526	+	case LSONPROC:
527	+	case LSRUN:
528	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
529	+	goto end;
530	+	case LSSLEEP:
531	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
532	+	goto end;
533	+	case LSSTOP:
534	+	case LSSUSPENDED:
535	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
536	+	goto end;
537	+	}
538	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
539	+	}
540	+	end: ;
541	+	}
542	+	break;
543	+	case SSTOP:
544	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
545	+	break;
546	+	case SZOMB:
547	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
548	+	break;
549	+	default:
550	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
551	+	break;
552	+	}
553	+	#else
554	+	#ifdef FREEBSD5
555		switch (kp_stats[i].ki_stat) {
556	+	#else
557	+	switch (kp_stats[i].kp_proc.p_stat) {
558	+	#endif
559		case SIDL:
560		case SRUN:
561		#ifdef SONPROC
562		case SONPROC: /* NetBSD */
563		#endif
564	<	proc_state_ptr->state = RUNNING;
564	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
565		break;
566		case SSLEEP:
567		#ifdef SWAIT
#	Line 259 | Line 570 | int get_proc_snapshot(proc_state_t **ps){
570		#ifdef SLOCK
571		case SLOCK: /* FreeBSD 5 */
572		#endif
573	<	proc_state_ptr->state = SLEEPING;
573	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
574		break;
575		case SSTOP:
576	<	proc_state_ptr->state = STOPPED;
576	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
577		break;
578		case SZOMB:
579		#ifdef SDEAD
580		case SDEAD: /* OpenBSD & NetBSD */
581		#endif
582	<	proc_state_ptr->state = ZOMBIE;
582	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
583		break;
584	+	default:
585	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
586	+	break;
587		}
588	+	#endif
589		proc_state_size++;
590		}
591
592		free(kp_stats);
593		#endif
594
595	<	*ps = proc_state;
596	<	return proc_state_size;
595	>	#ifdef CYGWIN
596	>	return NULL;
597	>	#endif
598	>
599	>	*entries = proc_state_size;
600	>	return proc_state;
601		}
602
603	<	process_stat_t *get_process_stats() {
604	<	static process_stat_t process_stat;
605	<	proc_state_t *ps;
603	>	sg_process_count *sg_get_process_count() {
604	>	static sg_process_count process_stat;
605	>	sg_process_stats *ps;
606		int ps_size, x;
607
608	<	process_stat.sleeping=0;
609	<	process_stat.running=0;
610	<	process_stat.zombie=0;
611	<	process_stat.stopped=0;
612	<	process_stat.total=0;
608	>	process_stat.sleeping = 0;
609	>	process_stat.running = 0;
610	>	process_stat.zombie = 0;
611	>	process_stat.stopped = 0;
612	>	process_stat.total = 0;
613
614	<	ps_size = get_proc_snapshot(&ps);
614	>	ps = sg_get_process_stats(&ps_size);
615	>	if (ps == NULL) {
616	>	return NULL;
617	>	}
618
619		for(x = 0; x < ps_size; x++) {
620		switch (ps->state) {
621	<	case RUNNING:
621	>	case SG_PROCESS_STATE_RUNNING:
622		process_stat.running++;
623		break;
624	<	case SLEEPING:
624	>	case SG_PROCESS_STATE_SLEEPING:
625		process_stat.sleeping++;
626		break;
627	<	case STOPPED:
627	>	case SG_PROCESS_STATE_STOPPED:
628		process_stat.stopped++;
629		break;
630	<	case ZOMBIE:
630	>	case SG_PROCESS_STATE_ZOMBIE:
631		process_stat.zombie++;
632	+	break;
633	+	default:
634	+	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
635	+	* sg_process_count */
636		break;
637		}
638		ps++;

Diff Legend

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