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.44 by tdb, Sun Apr 4 23:24:42 2004 UTC vs.
Revision 1.67 by pajs, Thu Apr 8 12:40:30 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 63 | Line 65
65		#include <limits.h>
66		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
67		#include <kvm.h>
66	–	#include <tools.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;
95	<	char *proctitle, *proctitletmp;
95	>	char *proctitle;
96		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
97		kvm_t *kvmd;
98	<	char **args;
99	<	int alloc;
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;
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 100 | 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;
105	<	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	>	sg_set_error(SG_ERROR_OPEN, "/proc/uptime");
134	>	return NULL;
135	>	}
136	>	if((fscanf(f,"%lu %*d",&uptime)) != 1){
137	>	sg_set_error(SG_ERROR_PARSE, NULL);
138	>	return NULL;
139	>	}
140	>	fclose(f);
141	>	#endif
142
143	<	while((dir_entry=readdir(proc_dir))!=NULL){
144	<	if(atoi(dir_entry->d_name) == 0) continue;
143	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
144	>	sg_set_error(SG_ERROR_OPENDIR, PROC_LOCATION);
145	>	return NULL;
146	>	}
147
148	+	while((dir_entry=readdir(proc_dir))!=NULL){
149	+	if(atoi(dir_entry->d_name) == 0) continue;
150	+
151		#ifdef SOLARIS
152	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
152	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
153		#endif
154		#ifdef LINUX
155		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
156		#endif
157	<	if((f=fopen(filename, "r"))==NULL){
158	<	/* Open failed.. Process since vanished, or the path was too long.
159	<	* Ah well, move onwards to the next one */
160	<	continue;
161	<	}
157	>	if((f=fopen(filename, "r"))==NULL){
158	>	/* Open failed.. Process since vanished, or the path was too long.
159	>	* Ah well, move onwards to the next one */
160	>	continue;
161	>	}
162		#ifdef SOLARIS
163	<	fread(&process_info, sizeof(psinfo_t), 1, f);
163	>	fread(&process_info, sizeof(psinfo_t), 1, f);
164	>	fclose(f);
165		#endif
166
167	<	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
167	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
168	>	return NULL;
169	>	}
170		proc_state_ptr = proc_state+proc_state_size;
171	+
172		#ifdef SOLARIS
173		proc_state_ptr->pid = process_info.pr_pid;
174		proc_state_ptr->parent = process_info.pr_ppid;
#	Line 146 | Line 181 | int get_proc_snapshot(proc_state_t **ps){
181		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
182		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
183		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
184	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
185	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
184	>	proc_state_ptr->nice = (int)process_info.pr_lwp.pr_nice - 20;
185	>	if (sg_update_string(&proc_state_ptr->process_name,
186	>	process_info.pr_fname) < 0) {
187	>	return NULL;
188	>	}
189	>	if (sg_update_string(&proc_state_ptr->proctitle,
190	>	process_info.pr_psargs) < 0) {
191	>	return NULL;
192	>	}
193
194	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
195	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
196	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
197	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
198	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
194	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
195	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
196	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
197	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
198	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
199		#endif
200		#ifdef LINUX
201	<	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));
202	<	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
203	<	if(s == 'S') proc_state_ptr->state = SLEEPING;
204	<	if(s == 'R') proc_state_ptr->state = RUNNING;
205	<	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
206	<	if(s == 'T') proc_state_ptr->state = STOPPED;
207	<	if(s == 'D') proc_state_ptr->state = STOPPED;
201	>	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));
202	>	/* +3 becuase man page says "Resident  Set Size: number of pages the process has in real memory, minus 3 for administrative purposes." */
203	>	proc_state_ptr->proc_resident = (proc_state_ptr->proc_resident + 3) * getpagesize();
204	>	if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
205	>	if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
206	>	if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
207	>	if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
208	>	if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
209
210		/* pa_name[0] should = '(' */
211		ptr = strchr(&ps_name[1], ')');
212		if(ptr !=NULL) *ptr='\0';
170	–	proc_state_ptr->process_name = strdup(&ps_name[1]);
213
214	<	/* Need to do cpu */
215	<
214	>	if (sg_update_string(&proc_state_ptr->process_name,
215	>	&ps_name[1]) < 0) {
216	>	return NULL;
217	>	}
218
219	+	/* cpu */
220	+	proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
221	+
222	+	fclose(f);
223	+
224	+	/* uid / gid */
225	+	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
226	+	if ((f=fopen(filename, "r")) == NULL) {
227	+	/* Open failed.. Process since vanished, or the path was too long.
228	+	* Ah well, move onwards to the next one */
229	+	continue;
230	+	}
231	+
232	+	if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
233	+	fclose(f);
234	+	continue;
235	+	}
236	+	sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
237	+
238	+	if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
239	+	fclose(f);
240	+	continue;
241	+	}
242	+	sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
243	+
244	+	fclose(f);
245	+
246		/* proctitle */
247		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
248
249	<	if((fn=open(filename, O_RDONLY)) == -1){
250	<	/* Open failed.. Process since vanished, or the path was too long.
251	<	* Ah well, move onwards to the next one */
252	<	continue;
182	<	}
183	<	#define         PSARG_START_SIZE 128
184	<	if(psargs == NULL){
185	<	psargs = malloc(PSARG_START_SIZE);
186	<	psarg_size = PSARG_START_SIZE;
249	>	if((fn=open(filename, O_RDONLY)) == -1){
250	>	/* Open failed.. Process since vanished, or the path was too long.
251	>	* Ah well, move onwards to the next one */
252	>	continue;
253		}
254	<	ptr = psargs;
255	<	t_read = 0;
256	<	toread = psarg_size;
257	<	while((size = read(fn, ptr, toread)) == toread){
258	<	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
259	<	ptr = psargs+psarg_size;
260	<	t_read = psarg_size;
261	<	psarg_size+=PSARG_START_SIZE;
262	<	toread = PSARG_START_SIZE;
254	>
255	>	#define READ_BLOCK_SIZE 128
256	>	len = 0;
257	>	do {
258	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
259	>	return NULL;
260	>	}
261	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
262	>	if (rc > 0) {
263	>	len += rc;
264	>	}
265	>	} while (rc == READ_BLOCK_SIZE);
266	>	close(fn);
267	>
268	>	if (rc == -1) {
269	>	/* Read failed; move on. */
270	>	continue;
271		}
198	–	if(size != -1) t_read+=size;
272
273	+	/* Turn \0s into spaces within the command line. */
274		ptr = psargs;
275	<	for(x=0; x<t_read; x++){
275	>	for(x = 0; x < len; x++) {
276		if (*ptr == '\0') *ptr = ' ';
277		ptr++;
278		}
205	–	/*  for safety sake */
206	–	psargs[t_read] = '\0';
279
280	<	proc_state_ptr->proctitle = strdup(psargs);
280	>	if (len == 0) {
281	>	/* We want psargs to be NULL. */
282	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
283	>	return NULL;
284	>	}
285	>	} else {
286	>	/* Not empty, so append a \0. */
287	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
288	>	return NULL;
289	>	}
290	>	psargs[len] = '\0';
291	>	}
292
293	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
294	+	return NULL;
295	+	}
296		#endif
297
298		proc_state_size++;
299	<
300	<	fclose(f);
215	<	}
216	<	closedir(proc_dir);
299	>	}
300	>	closedir(proc_dir);
301		#endif
302
303		#ifdef ALLBSD
#	Line 222 | Line 306 | int get_proc_snapshot(proc_state_t **ps){
306		mib[2] = KERN_PROC_ALL;
307
308		if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
309	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
310		return NULL;
311		}
312
313		procs = size / sizeof(struct kinfo_proc);
314
315	<	kp_stats = malloc(size);
315	>	kp_stats = sg_malloc(size);
316		if(kp_stats == NULL) {
317		return NULL;
318		}
319	+	memset(kp_stats, 0, size);
320
321		if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
322	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
323		free(kp_stats);
324		return NULL;
325		}
326
327		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
328	<	kvmd = get_kvm2();
328	>	kvmd = sg_get_kvm2();
329		#endif
330
331		for (i = 0; i < procs; i++) {
332	<	/* replace with something more sensible */
333	<	proc_state = realloc(proc_state,
334	<	(1+proc_state_size)*sizeof(proc_state_t));
335	<	if(proc_state == NULL ) {
332	>	const char *name;
333	>
334	>	#ifdef FREEBSD5
335	>	if (kp_stats[i].ki_stat == 0) {
336	>	#else
337	>	if (kp_stats[i].kp_proc.p_stat == 0) {
338	>	#endif
339	>	/* FreeBSD 5 deliberately overallocates the array that
340	>	* the sysctl returns, so we'll get a few junk
341	>	* processes on the end that we have to ignore. (Search
342	>	* for "overestimate by 5 procs" in
343	>	* src/sys/kern/kern_proc.c for more details.) */
344	>	continue;
345	>	}
346	>
347	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
348		return NULL;
349		}
350		proc_state_ptr = proc_state+proc_state_size;
351
352		#ifdef FREEBSD5
353	<	proc_state_ptr->process_name =
255	<	strdup(kp_stats[i].ki_comm);
353	>	name = kp_stats[i].ki_comm;
354		#elif defined(DFBSD)
355	<	proc_state_ptr->process_name =
258	<	strdup(kp_stats[i].kp_thread.td_comm);
355	>	name = kp_stats[i].kp_thread.td_comm;
356		#else
357	<	proc_state_ptr->process_name =
261	<	strdup(kp_stats[i].kp_proc.p_comm);
357	>	name = kp_stats[i].kp_proc.p_comm;
358		#endif
359	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
360	+	return NULL;
361	+	}
362
363		#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
364		size = sizeof(buflen);
365
366		#ifdef FREEBSD5
367		if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
368	+	sg_set_error(SG_ERROR_SYSCTLBYNAME, "kern.ps_arg_cache_limit");
369		return NULL;
370		}
371		#else
372	+	/* FIXME - this value can be too large on some of
373	+	the BSD's, which causes sysctl not to return
374	+	anything. Maybe we need something smaller? */
375		mib[1] = KERN_ARGMAX;
376
377		if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
378	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_ARGMAX");
379		return NULL;
380		}
381		#endif
382
383	<	proctitle = malloc(buflen);
383	>	proctitle = sg_malloc(buflen);
384		if(proctitle == NULL) {
385		return NULL;
386		}
#	Line 292 | Line 396 | int get_proc_snapshot(proc_state_t **ps){
396		mib[3] = KERN_PROC_ARGV;
397		#endif
398
399	+	free(proc_state_ptr->proctitle);
400		if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
401		free(proctitle);
402		proc_state_ptr->proctitle = NULL;
403		}
404		else if(size > 0) {
405	<	proc_state_ptr->proctitle = malloc(size+1);
405	>	proc_state_ptr->proctitle = sg_malloc(size+1);
406		if(proc_state_ptr->proctitle == NULL) {
407		return NULL;
408		}
409		p = proctitle;
410	<	proc_state_ptr->proctitle[0] = NULL;
410	>	proc_state_ptr->proctitle[0] = '\0';
411		do {
412	<	strlcat(proc_state_ptr->proctitle, p, size+1);
413	<	strlcat(proc_state_ptr->proctitle, " ", size+1);
412	>	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
413	>	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
414		p += strlen(p) + 1;
415		} while (p < proctitle + size);
416		free(proctitle);
417	<	/* remove trailing space */
418	<	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = \0;
417	>	/* remove trailing space */
418	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
419		}
420		else {
421		free(proctitle);
422		proc_state_ptr->proctitle = NULL;
423		}
424		#else
425	+	free(proc_state_ptr->proctitle);
426		if(kvmd != NULL) {
427		args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
428		if(args != NULL) {
429	<	alloc = 1;
430	<	proctitle = malloc(alloc);
429	>	argsp = args;
430	>	while(*argsp != NULL) {
431	>	argslen += strlen(*argsp) + 1;
432	>	argsp++;
433	>	}
434	>	proctitle = sg_malloc(argslen + 1);
435	>	proctitle[0] = '\0';
436		if(proctitle == NULL) {
437		return NULL;
438		}
439		while(*args != NULL) {
440	<	if(strlen(proctitle) + strlen(*args) >= alloc) {
441	<	alloc = (alloc + strlen(*args)) * 2;
331	<	proctitletmp = realloc(proctitle, alloc);
332	<	if(proctitletmp == NULL) {
333	<	return NULL;
334	<	}
335	<	proctitle = proctitletmp;
336	<	}
337	<	strlcat(proctitle, *args, alloc);
338	<	strlcat(proctitle, " ", alloc);
440	>	sg_strlcat(proctitle, *args, argslen + 1);
441	>	sg_strlcat(proctitle, " ", argslen + 1);
442		args++;
443		}
444		/* remove trailing space */
445	<	proctitle[strlen(proctitle)-1] = \0;
445	>	proctitle[strlen(proctitle)-1] = '\0';
446		proc_state_ptr->proctitle = proctitle;
447		}
448		else {
#	Line 412 | Line 515 | int get_proc_snapshot(proc_state_t **ps){
515		proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
516		#endif
517
518	+	#ifdef NETBSD2
519	+	{
520	+	size_t size;
521	+	int mib[5];
522	+
523	+	mib[0] = CTL_KERN;
524	+	mib[1] = KERN_LWP;
525	+	mib[2] = kp_stats[i].kp_proc.p_pid;
526	+	mib[3] = sizeof(struct kinfo_lwp);
527	+	mib[4] = 0;
528	+
529	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
530	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.0");
531	+	return NULL;
532	+	}
533	+
534	+	lwps = size / sizeof(struct kinfo_lwp);
535	+	mib[4] = lwps;
536	+
537	+	kl_stats = sg_malloc(size);
538	+	if(kl_stats == NULL) {
539	+	return NULL;
540	+	}
541	+
542	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
543	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.buffersize");
544	+	return NULL;
545	+	}
546	+	}
547	+
548	+	switch(kp_stats[i].kp_proc.p_stat) {
549	+	case SIDL:
550	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
551	+	break;
552	+	case SACTIVE:
553	+	{
554	+	int i;
555	+
556	+	for(i = 0; i < lwps; i++) {
557	+	switch(kl_stats[i].l_stat) {
558	+	case LSONPROC:
559	+	case LSRUN:
560	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
561	+	goto end;
562	+	case LSSLEEP:
563	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
564	+	goto end;
565	+	case LSSTOP:
566	+	case LSSUSPENDED:
567	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
568	+	goto end;
569	+	}
570	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
571	+	}
572	+	end: ;
573	+	}
574	+	break;
575	+	case SSTOP:
576	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
577	+	break;
578	+	case SZOMB:
579	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
580	+	break;
581	+	default:
582	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
583	+	break;
584	+	}
585	+	#else
586		#ifdef FREEBSD5
587		switch (kp_stats[i].ki_stat) {
588		#else
#	Line 422 | Line 593 | int get_proc_snapshot(proc_state_t **ps){
593		#ifdef SONPROC
594		case SONPROC: /* NetBSD */
595		#endif
596	<	proc_state_ptr->state = RUNNING;
596	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
597		break;
598		case SSLEEP:
599		#ifdef SWAIT
#	Line 431 | Line 602 | int get_proc_snapshot(proc_state_t **ps){
602		#ifdef SLOCK
603		case SLOCK: /* FreeBSD 5 */
604		#endif
605	<	proc_state_ptr->state = SLEEPING;
605	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
606		break;
607		case SSTOP:
608	<	proc_state_ptr->state = STOPPED;
608	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
609		break;
610		case SZOMB:
611		#ifdef SDEAD
612		case SDEAD: /* OpenBSD & NetBSD */
613		#endif
614	<	proc_state_ptr->state = ZOMBIE;
614	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
615		break;
616		default:
617	<	proc_state_ptr->state = UNKNOWN;
617	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
618		break;
619		}
620	+	#endif
621		proc_state_size++;
622		}
623
624		free(kp_stats);
625		#endif
626
627	<	*ps = proc_state;
628	<	return proc_state_size;
627	>	#ifdef CYGWIN
628	>	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
629	>	return NULL;
630	>	#endif
631	>
632	>	*entries = proc_state_size;
633	>	return proc_state;
634		}
635
636	<	process_stat_t *get_process_stats() {
637	<	static process_stat_t process_stat;
638	<	proc_state_t *ps;
636	>	sg_process_count *sg_get_process_count() {
637	>	static sg_process_count process_stat;
638	>	sg_process_stats *ps;
639		int ps_size, x;
640
641		process_stat.sleeping = 0;
#	Line 467 | Line 644 | process_stat_t *get_process_stats() {
644		process_stat.stopped = 0;
645		process_stat.total = 0;
646
647	<	ps_size = get_proc_snapshot(&ps);
648	<
472	<	if(ps_size == 0) {
647	>	ps = sg_get_process_stats(&ps_size);
648	>	if (ps == NULL) {
649		return NULL;
650		}
651
652		for(x = 0; x < ps_size; x++) {
653		switch (ps->state) {
654	<	case RUNNING:
654	>	case SG_PROCESS_STATE_RUNNING:
655		process_stat.running++;
656		break;
657	<	case SLEEPING:
657	>	case SG_PROCESS_STATE_SLEEPING:
658		process_stat.sleeping++;
659		break;
660	<	case STOPPED:
660	>	case SG_PROCESS_STATE_STOPPED:
661		process_stat.stopped++;
662		break;
663	<	case ZOMBIE:
663	>	case SG_PROCESS_STATE_ZOMBIE:
664		process_stat.zombie++;
665		break;
666		default:
667	<	/* currently no mapping for UNKNOWN in process_stat_t */
667	>	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
668	>	* sg_process_count */
669		break;
670		}
671		ps++;
#	Line 497 | Line 674 | process_stat_t *get_process_stats() {
674		process_stat.total = ps_size;
675
676		return &process_stat;
677	+	}
678	+
679	+	int sg_process_compare_pid(const void *va, const void *vb) {
680	+	const sg_process_stats *a = (sg_process_stats *)va;
681	+	const sg_process_stats *b = (sg_process_stats *)vb;
682	+
683	+	if (a->pid < b->pid) {
684	+	return -1;
685	+	} else if (a->pid == b->pid) {
686	+	return 0;
687	+	} else {
688	+	return 1;
689	+	}
690	+	}
691	+
692	+	int sg_process_compare_uid(const void *va, const void *vb) {
693	+	const sg_process_stats *a = (sg_process_stats *)va;
694	+	const sg_process_stats *b = (sg_process_stats *)vb;
695	+
696	+	if (a->uid < b->uid) {
697	+	return -1;
698	+	} else if (a->uid == b->uid) {
699	+	return 0;
700	+	} else {
701	+	return 1;
702	+	}
703	+	}
704	+
705	+	int sg_process_compare_gid(const void *va, const void *vb) {
706	+	const sg_process_stats *a = (sg_process_stats *)va;
707	+	const sg_process_stats *b = (sg_process_stats *)vb;
708	+
709	+	if (a->gid < b->gid) {
710	+	return -1;
711	+	} else if (a->gid == b->gid) {
712	+	return 0;
713	+	} else {
714	+	return 1;
715	+	}
716	+	}
717	+
718	+	int sg_process_compare_size(const void *va, const void *vb) {
719	+	const sg_process_stats *a = (sg_process_stats *)va;
720	+	const sg_process_stats *b = (sg_process_stats *)vb;
721	+
722	+	if (a->proc_size < b->proc_size) {
723	+	return -1;
724	+	} else if (a->proc_size == b->proc_size) {
725	+	return 0;
726	+	} else {
727	+	return 1;
728	+	}
729	+	}
730	+
731	+	int sg_process_compare_res(const void *va, const void *vb) {
732	+	const sg_process_stats *a = (sg_process_stats *)va;
733	+	const sg_process_stats *b = (sg_process_stats *)vb;
734	+
735	+	if (a->proc_resident < b->proc_resident) {
736	+	return -1;
737	+	} else if (a->proc_resident == b->proc_resident) {
738	+	return 0;
739	+	} else {
740	+	return 1;
741	+	}
742	+	}
743	+
744	+	int sg_process_compare_cpu(const void *va, const void *vb) {
745	+	const sg_process_stats *a = (sg_process_stats *)va;
746	+	const sg_process_stats *b = (sg_process_stats *)vb;
747	+
748	+	if (a->cpu_percent < b->cpu_percent) {
749	+	return -1;
750	+	} else if (a->cpu_percent == b->cpu_percent) {
751	+	return 0;
752	+	} else {
753	+	return 1;
754	+	}
755	+	}
756	+
757	+	int sg_process_compare_time(const void *va, const void *vb) {
758	+	const sg_process_stats *a = (sg_process_stats *)va;
759	+	const sg_process_stats *b = (sg_process_stats *)vb;
760	+
761	+	if (a->time_spent < b->time_spent) {
762	+	return -1;
763	+	} else if (a->time_spent == b->time_spent) {
764	+	return 0;
765	+	} else {
766	+	return 1;
767	+	}
768	+	}
769	+
770	+	void sg_process_sort(sg_process_stats *ps, int num_ps, sg_sort_method sm){
771	+	int (*sortby_ptr)(const void *a, const void *b);
772	+
773	+	switch(sm){
774	+	case SG_PS_PID:
775	+	sortby_ptr = sg_process_compare_pid;
776	+	break;
777	+	case SG_PS_UID:
778	+	sortby_ptr = sg_process_compare_uid;
779	+	break;
780	+	case SG_PS_GID:
781	+	sortby_ptr = sg_process_compare_gid;
782	+	break;
783	+	case SG_PS_SIZE:
784	+	sortby_ptr = sg_process_compare_size;
785	+	break;
786	+	case SG_PS_RES:
787	+	sortby_ptr = sg_process_compare_res;
788	+	break;
789	+	case SG_PS_CPU:
790	+	sortby_ptr = sg_process_compare_cpu;
791	+	break;
792	+	case SG_PS_TIME:
793	+	sortby_ptr = sg_process_compare_time;
794	+	break;
795	+	}
796	+
797	+	qsort(ps, num_ps, sizeof(*ps), sortby_ptr);
798	+
799	+	return;
800		}

Diff Legend

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