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.22 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.57 by tdb, Tue Apr 6 14:52:58 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 34 | Line 36
36		#include <string.h>
37		#endif
38
37	–	#include "tools.h"
39		#ifdef SOLARIS
40		#include <procfs.h>
41		#include <limits.h>
#	Line 43 | Line 44
44		#endif
45		#ifdef LINUX
46		#include <limits.h>
47	+	#include <unistd.h>
48	+	#include <sys/stat.h>
49	+	#include <fcntl.h>
50		#define PROC_LOCATION "/proc"
51		#define MAX_FILE_LENGTH PATH_MAX
52		#endif
#	Line 55 | 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	+	#include <tools.h>
69		#endif
70	+	#include <unistd.h>
71	+	#ifdef NETBSD2
72	+	#include <sys/lwp.h>
73	+	#endif
74	+	#endif
75
76	<	process_stat_t *get_process_stats(){
76	>	static void proc_state_init(sg_process_stats *s) {
77	>	s->process_name = NULL;
78	>	s->proctitle = NULL;
79	>	}
80
81	<	static process_stat_t process_stat;
81	>	static void proc_state_destroy(sg_process_stats *s) {
82	>	free(s->process_name);
83	>	free(s->proctitle);
84	>	}
85
86	<	#if defined(SOLARIS) || defined(LINUX)
87	<	DIR *proc_dir;
88	<	struct dirent *dir_entry;
89	<	char filename[MAX_FILE_LENGTH];
90	<	FILE *f;
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[4];
93	>	size_t size;
94	>	struct kinfo_proc *kp_stats;
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 LINUX
106	<	char *line_ptr;
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;
115		#ifdef SOLARIS
116		psinfo_t process_info;
117		#endif
118	<	#ifdef ALLBSD
119	<	int mib[3];
120	<	size_t size;
121	<	struct kinfo_proc *kp_stats;
122	<	int procs, i;
118	>	#ifdef LINUX
119	>	char s;
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	>	VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
124	>	unsigned long stime, utime;
125	>	int x;
126	>	int fn;
127	>	int len;
128	>	int rc;
129		#endif
130
131	<	process_stat.sleeping=0;
132	<	process_stat.running=0;
133	<	process_stat.zombie=0;
86	<	process_stat.stopped=0;
87	<	process_stat.total=0;
131	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
132	>	return NULL;
133	>	}
134
135	<	#if defined(SOLARIS) || defined(LINUX)
136	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
91	<	return NULL;
92	<	}
135	>	while((dir_entry=readdir(proc_dir))!=NULL){
136	>	if(atoi(dir_entry->d_name) == 0) continue;
137
94	–	while((dir_entry=readdir(proc_dir))!=NULL){
95	–	if(atoi(dir_entry->d_name) == 0) continue;
96	–
138		#ifdef SOLARIS
139	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
139	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
140		#endif
141		#ifdef LINUX
142	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
142	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
143		#endif
144	+	if((f=fopen(filename, "r"))==NULL){
145	+	/* Open failed.. Process since vanished, or the path was too long.
146	+	* Ah well, move onwards to the next one */
147	+	continue;
148	+	}
149	+	#ifdef SOLARIS
150	+	fread(&process_info, sizeof(psinfo_t), 1, f);
151	+	#endif
152
153	<	if((f=fopen(filename, "r"))==NULL){
154	<	/* Open failed.. Process since vanished, or the path was too long.
106	<	* Ah well, move onwards to the next one */
107	<	continue;
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	<	fread(&process_info, sizeof(psinfo_t), 1, f);
160	<	if(process_info.pr_lwp.pr_state==1) process_stat.sleeping++;
161	<	if(process_info.pr_lwp.pr_state==2) process_stat.running++;
162	<	if(process_info.pr_lwp.pr_state==3) process_stat.zombie++;
163	<	if(process_info.pr_lwp.pr_state==4) process_stat.stopped++;
164	<	if(process_info.pr_lwp.pr_state==6) process_stat.running++;
158	>	#ifdef SOLARIS
159	>	proc_state_ptr->pid = process_info.pr_pid;
160	>	proc_state_ptr->parent = process_info.pr_ppid;
161	>	proc_state_ptr->pgid = process_info.pr_pgid;
162	>	proc_state_ptr->uid = process_info.pr_uid;
163	>	proc_state_ptr->euid = process_info.pr_euid;
164	>	proc_state_ptr->gid = process_info.pr_gid;
165	>	proc_state_ptr->egid = process_info.pr_egid;
166	>	proc_state_ptr->proc_size = (process_info.pr_size) * 1024;
167	>	proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
168	>	proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
169	>	proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
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 = 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	<	if((line_ptr=f_read_line(f, "State:"))==NULL){
181	<	fclose(f);
182	<	continue;
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 = 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';
191	>
192	>	if (sg_update_string(&proc_state_ptr->process_name,
193	>	&ps_name[1]) < 0) {
194	>	return NULL;
195		}
196	<	if((line_ptr=strchr(line_ptr, '\t'))==NULL){
197	<	fclose(f);
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	>
205	>	if((fn=open(filename, O_RDONLY)) == -1){
206	>	/* Open failed.. Process since vanished, or the path was too long.
207	>	* Ah well, move onwards to the next one */
208	>	continue;
209	>	}
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		}
228	<	line_ptr++;
229	<	if(line_ptr=='\0'){
230	<	fclose(f);
231	<	continue;
228	>
229	>	/* Turn \0s into spaces within the command line. */
230	>	ptr = psargs;
231	>	for(x = 0; x < len; x++) {
232	>	if (*ptr == '\0') *ptr = ' ';
233	>	ptr++;
234		}
235
236	<	if(*line_ptr=='S') process_stat.sleeping++;
237	<	if(*line_ptr=='R') process_stat.running++;
238	<	if(*line_ptr=='Z') process_stat.zombie++;
239	<	if(*line_ptr=='T') process_stat.stopped++;
240	<	if(*line_ptr=='D') process_stat.stopped++;
241	<	#endif
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	<	fclose(f);
250	<	}
251	<	closedir(proc_dir);
249	>	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
250	>	return NULL;
251	>	}
252		#endif
253	+
254	+	proc_state_size++;
255	+	}
256	+	closedir(proc_dir);
257	+	#endif
258	+
259		#ifdef ALLBSD
260		mib[0] = CTL_KERN;
261		mib[1] = KERN_PROC;
262		mib[2] = KERN_PROC_ALL;
263
264	<	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
264	>	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
265		return NULL;
266		}
267	<
267	>
268		procs = size / sizeof(struct kinfo_proc);
269
270		kp_stats = malloc(size);
271	<	if (kp_stats == NULL) {
271	>	if(kp_stats == NULL) {
272		return NULL;
273		}
274	<
275	<	if (sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
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	+	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	+	name = kp_stats[i].ki_comm;
308	+	#elif defined(DFBSD)
309	+	name = kp_stats[i].kp_thread.td_comm;
310	+	#else
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	+	#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	+	/* FIXME - this value can be too large on some of
326	+	the BSD's, which causes sysctl not to return
327	+	anything. Maybe we need something smaller? */
328	+	mib[1] = KERN_ARGMAX;
329	+
330	+	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
331	+	return NULL;
332	+	}
333	+	#endif
334	+
335	+	proctitle = malloc(buflen);
336	+	if(proctitle == NULL) {
337	+	return NULL;
338	+	}
339	+
340	+	size = buflen;
341	+
342	+	#ifdef FREEBSD5
343	+	mib[2] = KERN_PROC_ARGS;
344	+	mib[3] = kp_stats[i].ki_pid;
345	+	#else
346	+	mib[1] = KERN_PROC_ARGS;
347	+	mib[2] = kp_stats[i].kp_proc.p_pid;
348	+	mib[3] = KERN_PROC_ARGV;
349	+	#endif
350	+
351	+	free(proc_state_ptr->proctitle);
352	+	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
353	+	free(proctitle);
354	+	proc_state_ptr->proctitle = NULL;
355	+	}
356	+	else if(size > 0) {
357	+	proc_state_ptr->proctitle = malloc(size+1);
358	+	if(proc_state_ptr->proctitle == NULL) {
359	+	return NULL;
360	+	}
361	+	p = proctitle;
362	+	proc_state_ptr->proctitle[0] = '\0';
363	+	do {
364	+	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
365	+	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
366	+	p += strlen(p) + 1;
367	+	} while (p < proctitle + size);
368	+	free(proctitle);
369	+	/* remove trailing space */
370	+	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
371	+	}
372	+	else {
373	+	free(proctitle);
374	+	proc_state_ptr->proctitle = NULL;
375	+	}
376	+	#else
377	+	free(proc_state_ptr->proctitle);
378	+	if(kvmd != NULL) {
379	+	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
380	+	if(args != NULL) {
381	+	argsp = args;
382	+	while(*argsp != NULL) {
383	+	argslen += strlen(*argsp) + 1;
384	+	argsp++;
385	+	}
386	+	proctitle = malloc(argslen + 1);
387	+	proctitle[0] = '\0';
388	+	if(proctitle == NULL) {
389	+	return NULL;
390	+	}
391	+	while(*args != NULL) {
392	+	sg_strlcat(proctitle, *args, argslen + 1);
393	+	sg_strlcat(proctitle, " ", argslen + 1);
394	+	args++;
395	+	}
396	+	/* remove trailing space */
397	+	proctitle[strlen(proctitle)-1] = '\0';
398	+	proc_state_ptr->proctitle = proctitle;
399	+	}
400	+	else {
401	+	proc_state_ptr->proctitle = NULL;
402	+	}
403	+	}
404	+	else {
405	+	proc_state_ptr->proctitle = NULL;
406	+	}
407	+	#endif
408	+
409	+	#ifdef FREEBSD5
410	+	proc_state_ptr->pid = kp_stats[i].ki_pid;
411	+	proc_state_ptr->parent = kp_stats[i].ki_ppid;
412	+	proc_state_ptr->pgid = kp_stats[i].ki_pgid;
413	+	#else
414	+	proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid;
415	+	proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid;
416	+	proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid;
417	+	#endif
418	+
419	+	#ifdef FREEBSD5
420	+	proc_state_ptr->uid = kp_stats[i].ki_ruid;
421	+	proc_state_ptr->euid = kp_stats[i].ki_uid;
422	+	proc_state_ptr->gid = kp_stats[i].ki_rgid;
423	+	proc_state_ptr->egid = kp_stats[i].ki_svgid;
424	+	#elif defined(DFBSD)
425	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid;
426	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid;
427	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid;
428	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid;
429	+	#else
430	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid;
431	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid;
432	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid;
433	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid;
434	+	#endif
435	+
436	+	#ifdef FREEBSD5
437	+	proc_state_ptr->proc_size = kp_stats[i].ki_size;
438	+	/* This is in pages */
439	+	proc_state_ptr->proc_resident =
440	+	kp_stats[i].ki_rssize * getpagesize();
441	+	/* This is in microseconds */
442	+	proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000;
443	+	proc_state_ptr->cpu_percent =
444	+	((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0;
445	+	proc_state_ptr->nice = kp_stats[i].ki_nice;
446	+	#else
447	+	proc_state_ptr->proc_size =
448	+	kp_stats[i].kp_eproc.e_vm.vm_map.size;
449	+	/* This is in pages */
450	+	proc_state_ptr->proc_resident =
451	+	kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize();
452	+	#if defined(NETBSD) || defined(OPENBSD)
453	+	proc_state_ptr->time_spent =
454	+	kp_stats[i].kp_proc.p_rtime.tv_sec;
455	+	#elif defined(DFBSD)
456	+	proc_state_ptr->time_spent =
457	+	( kp_stats[i].kp_thread.td_uticks +
458	+	kp_stats[i].kp_thread.td_sticks +
459	+	kp_stats[i].kp_thread.td_iticks ) / 1000000;
460	+	#else
461	+	/* This is in microseconds */
462	+	proc_state_ptr->time_spent =
463	+	kp_stats[i].kp_proc.p_runtime / 1000000;
464	+	#endif
465	+	proc_state_ptr->cpu_percent =
466	+	((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0;
467	+	proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
468	+	#endif
469	+
470	+	#ifdef NETBSD2
471	+	{
472	+	size_t size;
473	+	int mib[5];
474	+
475	+	mib[0] = CTL_KERN;
476	+	mib[1] = KERN_LWP;
477	+	mib[2] = kp_stats[i].kp_proc.p_pid;
478	+	mib[3] = sizeof(struct kinfo_lwp);
479	+	mib[4] = 0;
480	+
481	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
482	+	return NULL;
483	+	}
484	+
485	+	lwps = size / sizeof(struct kinfo_lwp);
486	+	mib[4] = lwps;
487	+
488	+	kl_stats = malloc(size);
489	+	if(kl_stats == NULL) {
490	+	return NULL;
491	+	}
492	+
493	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
494	+	return NULL;
495	+	}
496	+	}
497	+
498	+	switch(kp_stats[i].kp_proc.p_stat) {
499	+	case SIDL:
500	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
501	+	break;
502	+	case SACTIVE:
503	+	{
504	+	int i;
505	+
506	+	for(i = 0; i < lwps; i++) {
507	+	switch(kl_stats[i].l_stat) {
508	+	case LSONPROC:
509	+	case LSRUN:
510	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
511	+	goto end;
512	+	case LSSLEEP:
513	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
514	+	goto end;
515	+	case LSSTOP:
516	+	case LSSUSPENDED:
517	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
518	+	goto end;
519	+	}
520	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
521	+	}
522	+	end: ;
523	+	}
524	+	break;
525	+	case SSTOP:
526	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
527	+	break;
528	+	case SZOMB:
529	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
530	+	break;
531	+	default:
532	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
533	+	break;
534	+	}
535	+	#else
536	+	#ifdef FREEBSD5
537		switch (kp_stats[i].ki_stat) {
538		#else
539		switch (kp_stats[i].kp_proc.p_stat) {
#	Line 173 | Line 543 | process_stat_t *get_process_stats(){
543		#ifdef SONPROC
544		case SONPROC: /* NetBSD */
545		#endif
546	<	process_stat.running++;
546	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
547		break;
548		case SSLEEP:
549		#ifdef SWAIT
#	Line 182 | Line 552 | process_stat_t *get_process_stats(){
552		#ifdef SLOCK
553		case SLOCK: /* FreeBSD 5 */
554		#endif
555	<	process_stat.sleeping++;
555	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
556		break;
557		case SSTOP:
558	<	process_stat.stopped++;
558	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
559		break;
560		case SZOMB:
561		#ifdef SDEAD
562		case SDEAD: /* OpenBSD & NetBSD */
563		#endif
564	<	process_stat.zombie++;
564	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
565		break;
566	<	}
566	>	default:
567	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
568	>	break;
569	>	}
570	>	#endif
571	>	proc_state_size++;
572		}
573
574		free(kp_stats);
#	Line 203 | Line 578 | process_stat_t *get_process_stats(){
578		return NULL;
579		#endif
580
581	<	process_stat.total=process_stat.sleeping+process_stat.running+process_stat.zombie+process_stat.stopped;
581	>	*entries = proc_state_size;
582	>	return proc_state;
583	>	}
584	>
585	>	sg_process_count *sg_get_process_count() {
586	>	static sg_process_count process_stat;
587	>	sg_process_stats *ps;
588	>	int ps_size, x;
589	>
590	>	process_stat.sleeping = 0;
591	>	process_stat.running = 0;
592	>	process_stat.zombie = 0;
593	>	process_stat.stopped = 0;
594	>	process_stat.total = 0;
595	>
596	>	ps = sg_get_process_stats(&ps_size);
597	>	if (ps == NULL) {
598	>	return NULL;
599	>	}
600	>
601	>	for(x = 0; x < ps_size; x++) {
602	>	switch (ps->state) {
603	>	case SG_PROCESS_STATE_RUNNING:
604	>	process_stat.running++;
605	>	break;
606	>	case SG_PROCESS_STATE_SLEEPING:
607	>	process_stat.sleeping++;
608	>	break;
609	>	case SG_PROCESS_STATE_STOPPED:
610	>	process_stat.stopped++;
611	>	break;
612	>	case SG_PROCESS_STATE_ZOMBIE:
613	>	process_stat.zombie++;
614	>	break;
615	>	default:
616	>	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
617	>	* sg_process_count */
618	>	break;
619	>	}
620	>	ps++;
621	>	}
622	>
623	>	process_stat.total = ps_size;
624
625		return &process_stat;
626		}

Diff Legend

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