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.51 by tdb, Mon Apr 5 11:21:49 2004 UTC vs.
Revision 1.75 by ats, Fri Sep 10 15:15:00 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 51 | Line 51
51		#define MAX_FILE_LENGTH PATH_MAX
52		#endif
53		#ifdef ALLBSD
54	+	#include <errno.h>
55		#include <stdlib.h>
56		#include <sys/param.h>
57		#include <sys/sysctl.h>
#	Line 65 | Line 66
66		#include <limits.h>
67		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
68		#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	<	static void proc_state_init(proc_state_t *s) {
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(proc_state_t *s) {
81	>	static void proc_state_destroy(sg_process_stats *s) {
82		free(s->process_name);
83		free(s->proctitle);
84		}
85
86	<	int get_proc_snapshot(proc_state_t **ps){
87	<	VECTOR_DECLARE_STATIC(proc_state, proc_state_t, 64,
88	<	proc_state_init, proc_state_destroy);
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	<	proc_state_t *proc_state_ptr;
90	>	sg_process_stats *proc_state_ptr;
91		#ifdef ALLBSD
92		int mib[4];
93		size_t size;
#	Line 97 | Line 100 | int get_proc_snapshot(proc_state_t **ps){
100		int argslen = 0;
101		#else
102		long buflen;
103	<	char *p;
103	>	char *p, *proctitletmp;
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;
113	<	char filename[MAX_FILE_LENGTH];
114	<	FILE *f;
111	>	DIR *proc_dir;
112	>	struct dirent *dir_entry;
113	>	char filename[MAX_FILE_LENGTH];
114	>	FILE *f;
115		#ifdef SOLARIS
116		psinfo_t process_info;
117		#endif
#	Line 114 | Line 121 | int get_proc_snapshot(proc_state_t **ps){
121		char ps_name[4096];
122		char *ptr;
123		VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
124	<	unsigned long stime, utime;
124	>	unsigned long stime, utime, starttime;
125		int x;
126		int fn;
127		int len;
128		int rc;
129	+	time_t uptime;
130		#endif
131
132	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
133	<	return -1;
134	<	}
132	>	#ifdef LINUX
133	>	if ((f=fopen("/proc/uptime", "r")) == NULL) {
134	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/uptime");
135	>	return NULL;
136	>	}
137	>	if((fscanf(f,"%lu %*d",&uptime)) != 1){
138	>	sg_set_error(SG_ERROR_PARSE, NULL);
139	>	return NULL;
140	>	}
141	>	fclose(f);
142	>	#endif
143
144	<	while((dir_entry=readdir(proc_dir))!=NULL){
145	<	if(atoi(dir_entry->d_name) == 0) continue;
144	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
145	>	sg_set_error_with_errno(SG_ERROR_OPENDIR, PROC_LOCATION);
146	>	return NULL;
147	>	}
148
149	+	while((dir_entry=readdir(proc_dir))!=NULL){
150	+	if(atoi(dir_entry->d_name) == 0) continue;
151	+
152		#ifdef SOLARIS
153	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
153	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
154		#endif
155		#ifdef LINUX
156		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
157		#endif
158	<	if((f=fopen(filename, "r"))==NULL){
159	<	/* Open failed.. Process since vanished, or the path was too long.
160	<	* Ah well, move onwards to the next one */
161	<	continue;
162	<	}
158	>	if((f=fopen(filename, "r"))==NULL){
159	>	/* Open failed.. Process since vanished, or the path was too long.
160	>	* Ah well, move onwards to the next one */
161	>	continue;
162	>	}
163		#ifdef SOLARIS
164	<	fread(&process_info, sizeof(psinfo_t), 1, f);
164	>	fread(&process_info, sizeof(psinfo_t), 1, f);
165	>	fclose(f);
166		#endif
167
168		if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
169	<	return -1;
169	>	return NULL;
170		}
171		proc_state_ptr = proc_state+proc_state_size;
172
#	Line 160 | Line 182 | int get_proc_snapshot(proc_state_t **ps){
182		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
183		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
184		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
185	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
186	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
185	>	proc_state_ptr->nice = (int)process_info.pr_lwp.pr_nice - 20;
186	>	if (sg_update_string(&proc_state_ptr->process_name,
187	>	process_info.pr_fname) < 0) {
188	>	return NULL;
189	>	}
190	>	if (sg_update_string(&proc_state_ptr->proctitle,
191	>	process_info.pr_psargs) < 0) {
192	>	return NULL;
193	>	}
194
195	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
196	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
197	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
198	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
199	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
195	>	switch (process_info.pr_lwp.pr_state) {
196	>	case 1:
197	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
198	>	break;
199	>	case 2:
200	>	case 5:
201	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
202	>	break;
203	>	case 3:
204	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
205	>	break;
206	>	case 4:
207	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
208	>	break;
209	>	}
210		#endif
211		#ifdef LINUX
212	<	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));
213	<	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
214	<	if(s == 'S') proc_state_ptr->state = SLEEPING;
215	<	if(s == 'R') proc_state_ptr->state = RUNNING;
216	<	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
217	<	if(s == 'T') proc_state_ptr->state = STOPPED;
218	<	if(s == 'D') proc_state_ptr->state = STOPPED;
212	>	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));
213	>	/* +3 becuase man page says "Resident  Set Size: number of pages the process has in real memory, minus 3 for administrative purposes." */
214	>	proc_state_ptr->proc_resident = (proc_state_ptr->proc_resident + 3) * getpagesize();
215	>	switch (s) {
216	>	case 'S':
217	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
218	>	break;
219	>	case 'R':
220	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
221	>	break;
222	>	case 'Z':
223	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
224	>	break;
225	>	case 'T':
226	>	case 'D':
227	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
228	>	break;
229	>	}
230
231		/* pa_name[0] should = '(' */
232		ptr = strchr(&ps_name[1], ')');
233		if(ptr !=NULL) *ptr='\0';
234
235	<	if (update_string(&proc_state_ptr->process_name,
236	<	&ps_name[1]) == NULL) {
237	<	return -1;
235	>	if (sg_update_string(&proc_state_ptr->process_name,
236	>	&ps_name[1]) < 0) {
237	>	return NULL;
238		}
239
240	<	/* Need to do cpu */
241	<
240	>	/* cpu */
241	>	proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
242
243	<	fclose(f);
243	>	fclose(f);
244
245	+	/* uid / gid */
246	+	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
247	+	if ((f=fopen(filename, "r")) == NULL) {
248	+	/* Open failed.. Process since vanished, or the path was too long.
249	+	* Ah well, move onwards to the next one */
250	+	continue;
251	+	}
252	+
253	+	if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
254	+	fclose(f);
255	+	continue;
256	+	}
257	+	sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
258	+
259	+	if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
260	+	fclose(f);
261	+	continue;
262	+	}
263	+	sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
264	+
265	+	fclose(f);
266	+
267		/* proctitle */
268		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
269
270	<	if((fn=open(filename, O_RDONLY)) == -1){
271	<	/* Open failed.. Process since vanished, or the path was too long.
272	<	* Ah well, move onwards to the next one */
273	<	continue;
274	<	}
270	>	if((fn=open(filename, O_RDONLY)) == -1){
271	>	/* Open failed.. Process since vanished, or the path was too long.
272	>	* Ah well, move onwards to the next one */
273	>	continue;
274	>	}
275
276		#define READ_BLOCK_SIZE 128
277		len = 0;
278		do {
279	<	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE + 1) < 0) {
280	<	return -1;
279	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
280	>	return NULL;
281		}
282		rc = read(fn, psargs + len, READ_BLOCK_SIZE);
283		if (rc > 0) {
#	Line 225 | Line 297 | int get_proc_snapshot(proc_state_t **ps){
297		if (*ptr == '\0') *ptr = ' ';
298		ptr++;
299		}
228	–	/* for safety's sake */
229	–	psargs[len] = '\0';
300
301	<	if (update_string(&proc_state_ptr->proctitle, psargs) == NULL) {
302	<	return -1;
301	>	if (len == 0) {
302	>	/* We want psargs to be NULL. */
303	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
304	>	return NULL;
305	>	}
306	>	} else {
307	>	/* Not empty, so append a \0. */
308	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
309	>	return NULL;
310	>	}
311	>	psargs[len] = '\0';
312		}
313	+
314	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
315	+	return NULL;
316	+	}
317		#endif
318
319		proc_state_size++;
320	<	}
321	<	closedir(proc_dir);
320	>	}
321	>	closedir(proc_dir);
322		#endif
323
324		#ifdef ALLBSD
#	Line 244 | Line 327 | int get_proc_snapshot(proc_state_t **ps){
327		mib[2] = KERN_PROC_ALL;
328
329		if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
330	<	return -1;
330	>	sg_set_error_with_errno(SG_ERROR_SYSCTL,
331	>	"CTL_KERN.KERN_PROC.KERN_PROC_ALL");
332	>	return NULL;
333		}
334
335		procs = size / sizeof(struct kinfo_proc);
336
337	<	kp_stats = malloc(size);
337	>	kp_stats = sg_malloc(size);
338		if(kp_stats == NULL) {
339	<	return -1;
339	>	return NULL;
340		}
341	+	memset(kp_stats, 0, size);
342
343		if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
344	+	sg_set_error_with_errno(SG_ERROR_SYSCTL,
345	+	"CTL_KERN.KERN_PROC.KERN_PROC_ALL");
346		free(kp_stats);
347	<	return -1;
347	>	return NULL;
348		}
349
350		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
351	<	kvmd = get_kvm2();
351	>	kvmd = sg_get_kvm2();
352		#endif
353
354		for (i = 0; i < procs; i++) {
355		const char *name;
356
357	+	#ifdef FREEBSD5
358	+	if (kp_stats[i].ki_stat == 0) {
359	+	#else
360	+	if (kp_stats[i].kp_proc.p_stat == 0) {
361	+	#endif
362	+	/* FreeBSD 5 deliberately overallocates the array that
363	+	* the sysctl returns, so we'll get a few junk
364	+	* processes on the end that we have to ignore. (Search
365	+	* for "overestimate by 5 procs" in
366	+	* src/sys/kern/kern_proc.c for more details.) */
367	+	continue;
368	+	}
369	+
370		if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
371	<	return -1;
371	>	return NULL;
372		}
373		proc_state_ptr = proc_state+proc_state_size;
374
#	Line 278 | Line 379 | int get_proc_snapshot(proc_state_t **ps){
379		#else
380		name = kp_stats[i].kp_proc.p_comm;
381		#endif
382	<	if (update_string(&proc_state_ptr->process_name, name) == NULL) {
383	<	return -1;
382	>	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
383	>	return NULL;
384		}
385
386		#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
286	–	size = sizeof(buflen);
387
388		#ifdef FREEBSD5
289	–	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
290	–	return -1;
291	–	}
292	–	#else
293	–	mib[1] = KERN_ARGMAX;
294	–
295	–	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
296	–	return -1;
297	–	}
298	–	#endif
299	–
300	–	proctitle = malloc(buflen);
301	–	if(proctitle == NULL) {
302	–	return -1;
303	–	}
304	–
305	–	size = buflen;
306	–
307	–	#ifdef FREEBSD5
389		mib[2] = KERN_PROC_ARGS;
390		mib[3] = kp_stats[i].ki_pid;
391		#else
#	Line 314 | Line 395 | int get_proc_snapshot(proc_state_t **ps){
395		#endif
396
397		free(proc_state_ptr->proctitle);
398	<	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
399	<	free(proctitle);
400	<	proc_state_ptr->proctitle = NULL;
401	<	}
402	<	else if(size > 0) {
403	<	proc_state_ptr->proctitle = malloc(size+1);
398	>	proc_state_ptr->proctitle = NULL;
399	>
400	>	/* Starting size - we'll double this straight away */
401	>	#define PROCTITLE_START_SIZE 64
402	>	buflen = PROCTITLE_START_SIZE;
403	>	size = buflen;
404	>	proctitle = NULL;
405	>
406	>	do {
407	>	if(size >= buflen) {
408	>	buflen *= 2;
409	>	size = buflen;
410	>	proctitletmp = sg_realloc(proctitle, buflen);
411	>	if(proctitletmp == NULL) {
412	>	free(proctitle);
413	>	proctitle = NULL;
414	>	proc_state_ptr->proctitle = NULL;
415	>	size = 0;
416	>	break;
417	>	}
418	>	proctitle = proctitletmp;
419	>	bzero(proctitle, buflen);
420	>	}
421	>
422	>	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
423	>	free(proctitle);
424	>	proctitle = NULL;
425	>	proc_state_ptr->proctitle = NULL;
426	>	size = 0;
427	>	break;
428	>	}
429	>	} while(size >= buflen);
430	>
431	>	if(size > 0) {
432	>	proc_state_ptr->proctitle = sg_malloc(size+1);
433		if(proc_state_ptr->proctitle == NULL) {
434	<	return -1;
434	>	return NULL;
435		}
436		p = proctitle;
437	+	#ifdef OPENBSD
438	+	/* On OpenBSD, this value has the argv pointers (which
439	+	* are terminated by a NULL) at the front, so we have
440	+	* to skip over them to get to the strings. */
441	+	while (*(char ***)p != NULL) {
442	+	p += sizeof(char **);
443	+	}
444	+	p += sizeof(char **);
445	+	#endif
446		proc_state_ptr->proctitle[0] = '\0';
447		do {
448	<	strlcat(proc_state_ptr->proctitle, p, size+1);
449	<	strlcat(proc_state_ptr->proctitle, " ", size+1);
448	>	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
449	>	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
450		p += strlen(p) + 1;
451		} while (p < proctitle + size);
452		free(proctitle);
453	+	proctitle = NULL;
454		/* remove trailing space */
455		proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
456		}
457		else {
458	<	free(proctitle);
458	>	if(proctitle != NULL) {
459	>	free(proctitle);
460	>	proctitle = NULL;
461	>	}
462		proc_state_ptr->proctitle = NULL;
463		}
464		#else
465		free(proc_state_ptr->proctitle);
466	+	proc_state_ptr->proctitle = NULL;
467		if(kvmd != NULL) {
468		args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
469		if(args != NULL) {
#	Line 348 | Line 472 | int get_proc_snapshot(proc_state_t **ps){
472		argslen += strlen(*argsp) + 1;
473		argsp++;
474		}
475	<	proctitle = malloc(argslen + 1);
475	>	proctitle = sg_malloc(argslen + 1);
476		proctitle[0] = '\0';
477		if(proctitle == NULL) {
478	<	return -1;
478	>	return NULL;
479		}
480		while(*args != NULL) {
481	<	strlcat(proctitle, *args, argslen + 1);
482	<	strlcat(proctitle, " ", argslen + 1);
481	>	sg_strlcat(proctitle, *args, argslen + 1);
482	>	sg_strlcat(proctitle, " ", argslen + 1);
483		args++;
484		}
485		/* remove trailing space */
#	Line 432 | Line 556 | int get_proc_snapshot(proc_state_t **ps){
556		proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
557		#endif
558
559	+	#ifdef NETBSD2
560	+	{
561	+	size_t size;
562	+	int mib[5];
563	+
564	+	mib[0] = CTL_KERN;
565	+	mib[1] = KERN_LWP;
566	+	mib[2] = kp_stats[i].kp_proc.p_pid;
567	+	mib[3] = sizeof(struct kinfo_lwp);
568	+	mib[4] = 0;
569	+
570	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
571	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.0");
572	+	return NULL;
573	+	}
574	+
575	+	lwps = size / sizeof(struct kinfo_lwp);
576	+	mib[4] = lwps;
577	+
578	+	kl_stats = sg_malloc(size);
579	+	if(kl_stats == NULL) {
580	+	return NULL;
581	+	}
582	+
583	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
584	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.buffersize");
585	+	return NULL;
586	+	}
587	+	}
588	+
589	+	switch(kp_stats[i].kp_proc.p_stat) {
590	+	case SIDL:
591	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
592	+	break;
593	+	case SACTIVE:
594	+	{
595	+	int i;
596	+
597	+	for(i = 0; i < lwps; i++) {
598	+	switch(kl_stats[i].l_stat) {
599	+	case LSONPROC:
600	+	case LSRUN:
601	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
602	+	goto end;
603	+	case LSSLEEP:
604	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
605	+	goto end;
606	+	case LSSTOP:
607	+	case LSSUSPENDED:
608	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
609	+	goto end;
610	+	}
611	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
612	+	}
613	+	end: ;
614	+	}
615	+	break;
616	+	case SSTOP:
617	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
618	+	break;
619	+	case SZOMB:
620	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
621	+	break;
622	+	default:
623	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
624	+	break;
625	+	}
626	+
627	+	free(kl_stats);
628	+	#else
629		#ifdef FREEBSD5
630		switch (kp_stats[i].ki_stat) {
631		#else
#	Line 442 | Line 636 | int get_proc_snapshot(proc_state_t **ps){
636		#ifdef SONPROC
637		case SONPROC: /* NetBSD */
638		#endif
639	<	proc_state_ptr->state = RUNNING;
639	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
640		break;
641		case SSLEEP:
642		#ifdef SWAIT
#	Line 451 | Line 645 | int get_proc_snapshot(proc_state_t **ps){
645		#ifdef SLOCK
646		case SLOCK: /* FreeBSD 5 */
647		#endif
648	<	proc_state_ptr->state = SLEEPING;
648	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
649		break;
650		case SSTOP:
651	<	proc_state_ptr->state = STOPPED;
651	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
652		break;
653		case SZOMB:
654		#ifdef SDEAD
655		case SDEAD: /* OpenBSD & NetBSD */
656		#endif
657	<	proc_state_ptr->state = ZOMBIE;
657	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
658		break;
659		default:
660	<	proc_state_ptr->state = UNKNOWN;
660	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
661		break;
662		}
663	+	#endif
664		proc_state_size++;
665		}
666
#	Line 473 | Line 668 | int get_proc_snapshot(proc_state_t **ps){
668		#endif
669
670		#ifdef CYGWIN
671	<	return -1;
671	>	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
672	>	return NULL;
673		#endif
674
675	<	*ps = proc_state;
676	<	return proc_state_size;
675	>	*entries = proc_state_size;
676	>	return proc_state;
677		}
678
679	<	process_stat_t *get_process_stats() {
680	<	static process_stat_t process_stat;
681	<	proc_state_t *ps;
679	>	sg_process_count *sg_get_process_count() {
680	>	static sg_process_count process_stat;
681	>	sg_process_stats *ps;
682		int ps_size, x;
683
684		process_stat.sleeping = 0;
#	Line 491 | Line 687 | process_stat_t *get_process_stats() {
687		process_stat.stopped = 0;
688		process_stat.total = 0;
689
690	<	ps_size = get_proc_snapshot(&ps);
691	<
496	<	if(ps_size < 0) {
690	>	ps = sg_get_process_stats(&ps_size);
691	>	if (ps == NULL) {
692		return NULL;
693		}
694
695		for(x = 0; x < ps_size; x++) {
696		switch (ps->state) {
697	<	case RUNNING:
697	>	case SG_PROCESS_STATE_RUNNING:
698		process_stat.running++;
699		break;
700	<	case SLEEPING:
700	>	case SG_PROCESS_STATE_SLEEPING:
701		process_stat.sleeping++;
702		break;
703	<	case STOPPED:
703	>	case SG_PROCESS_STATE_STOPPED:
704		process_stat.stopped++;
705		break;
706	<	case ZOMBIE:
706	>	case SG_PROCESS_STATE_ZOMBIE:
707		process_stat.zombie++;
708		break;
709		default:
710	<	/* currently no mapping for UNKNOWN in process_stat_t */
710	>	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
711	>	* sg_process_count */
712		break;
713		}
714		ps++;
#	Line 522 | Line 718 | process_stat_t *get_process_stats() {
718
719		return &process_stat;
720		}
721	+
722	+	int sg_process_compare_name(const void *va, const void *vb) {
723	+	const sg_process_stats *a = (sg_process_stats *)va;
724	+	const sg_process_stats *b = (sg_process_stats *)vb;
725	+
726	+	return strcmp(a->process_name, b->process_name);
727	+	}
728	+
729	+	int sg_process_compare_pid(const void *va, const void *vb) {
730	+	const sg_process_stats *a = (sg_process_stats *)va;
731	+	const sg_process_stats *b = (sg_process_stats *)vb;
732	+
733	+	if (a->pid < b->pid) {
734	+	return -1;
735	+	} else if (a->pid == b->pid) {
736	+	return 0;
737	+	} else {
738	+	return 1;
739	+	}
740	+	}
741	+
742	+	int sg_process_compare_uid(const void *va, const void *vb) {
743	+	const sg_process_stats *a = (sg_process_stats *)va;
744	+	const sg_process_stats *b = (sg_process_stats *)vb;
745	+
746	+	if (a->uid < b->uid) {
747	+	return -1;
748	+	} else if (a->uid == b->uid) {
749	+	return 0;
750	+	} else {
751	+	return 1;
752	+	}
753	+	}
754	+
755	+	int sg_process_compare_gid(const void *va, const void *vb) {
756	+	const sg_process_stats *a = (sg_process_stats *)va;
757	+	const sg_process_stats *b = (sg_process_stats *)vb;
758	+
759	+	if (a->gid < b->gid) {
760	+	return -1;
761	+	} else if (a->gid == b->gid) {
762	+	return 0;
763	+	} else {
764	+	return 1;
765	+	}
766	+	}
767	+
768	+	int sg_process_compare_size(const void *va, const void *vb) {
769	+	const sg_process_stats *a = (sg_process_stats *)va;
770	+	const sg_process_stats *b = (sg_process_stats *)vb;
771	+
772	+	if (a->proc_size < b->proc_size) {
773	+	return -1;
774	+	} else if (a->proc_size == b->proc_size) {
775	+	return 0;
776	+	} else {
777	+	return 1;
778	+	}
779	+	}
780	+
781	+	int sg_process_compare_res(const void *va, const void *vb) {
782	+	const sg_process_stats *a = (sg_process_stats *)va;
783	+	const sg_process_stats *b = (sg_process_stats *)vb;
784	+
785	+	if (a->proc_resident < b->proc_resident) {
786	+	return -1;
787	+	} else if (a->proc_resident == b->proc_resident) {
788	+	return 0;
789	+	} else {
790	+	return 1;
791	+	}
792	+	}
793	+
794	+	int sg_process_compare_cpu(const void *va, const void *vb) {
795	+	const sg_process_stats *a = (sg_process_stats *)va;
796	+	const sg_process_stats *b = (sg_process_stats *)vb;
797	+
798	+	if (a->cpu_percent < b->cpu_percent) {
799	+	return -1;
800	+	} else if (a->cpu_percent == b->cpu_percent) {
801	+	return 0;
802	+	} else {
803	+	return 1;
804	+	}
805	+	}
806	+
807	+	int sg_process_compare_time(const void *va, const void *vb) {
808	+	const sg_process_stats *a = (sg_process_stats *)va;
809	+	const sg_process_stats *b = (sg_process_stats *)vb;
810	+
811	+	if (a->time_spent < b->time_spent) {
812	+	return -1;
813	+	} else if (a->time_spent == b->time_spent) {
814	+	return 0;
815	+	} else {
816	+	return 1;
817	+	}
818	+	}
819	+

Diff Legend

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