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

Diff Legend

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