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.16 by ats, Wed Nov 12 01:41:17 2003 UTC vs.
Revision 1.53 by ats, Mon Apr 5 18:10:11 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3		* http://www.i-scream.org
4	<	* Copyright (C) 2000-2003 i-scream
4	>	* Copyright (C) 2000-2004 i-scream
5		*
6	<	* This program is free software; you can redistribute it and/or
7	<	* modify it under the terms of the GNU General Public License
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
17	>	* License along with this library; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19	>	* 02111-1307 USA
20	>	*
21	>	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 23 | 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 31 | Line 36
36		#include <string.h>
37		#endif
38
34	–	#include "tools.h"
39		#ifdef SOLARIS
40		#include <procfs.h>
41		#include <limits.h>
#	Line 40 | 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
53		#ifdef ALLBSD
54	<	#include <kvm.h>
54	>	#include <stdlib.h>
55		#include <sys/param.h>
56		#include <sys/sysctl.h>
57	<	#endif
51	<	#ifdef FREEBSD
57	>	#if defined(FREEBSD) || defined(DFBSD)
58		#include <sys/user.h>
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	+	#endif
72
73	<	process_stat_t *get_process_stats(){
73	>	static void proc_state_init(sg_process_stats *s) {
74	>	s->process_name = NULL;
75	>	s->proctitle = NULL;
76	>	}
77
78	<	static process_stat_t process_stat;
78	>	static void proc_state_destroy(sg_process_stats *s) {
79	>	free(s->process_name);
80	>	free(s->proctitle);
81	>	}
82
83	<	#if defined(SOLARIS) || defined(LINUX)
84	<	DIR *proc_dir;
85	<	struct dirent *dir_entry;
86	<	char filename[MAX_FILE_LENGTH];
87	<	FILE *f;
83	>	sg_process_stats *sg_get_process_stats(int *entries){
84	>	VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64,
85	>	proc_state_init, proc_state_destroy);
86	>	int proc_state_size = 0;
87	>	sg_process_stats *proc_state_ptr;
88	>	#ifdef ALLBSD
89	>	int mib[4];
90	>	size_t size;
91	>	struct kinfo_proc *kp_stats;
92	>	int procs, i;
93	>	char *proctitle;
94	>	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
95	>	kvm_t *kvmd;
96	>	char **args, **argsp;
97	>	int argslen = 0;
98	>	#else
99	>	long buflen;
100	>	char *p;
101		#endif
65	–	#ifdef LINUX
66	–	char *line_ptr;
102		#endif
103	+	#if defined(SOLARIS) || defined(LINUX)
104	+	DIR *proc_dir;
105	+	struct dirent *dir_entry;
106	+	char filename[MAX_FILE_LENGTH];
107	+	FILE *f;
108		#ifdef SOLARIS
109		psinfo_t process_info;
110		#endif
111	<	#ifdef ALLBSD
112	<	struct kinfo_proc *kp_stats;
113	<	kvm_t *kvmd;
114	<	int procs;
111	>	#ifdef LINUX
112	>	char s;
113	>	/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */
114	>	char ps_name[4096];
115	>	char *ptr;
116	>	VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
117	>	unsigned long stime, utime;
118	>	int x;
119	>	int fn;
120	>	int len;
121	>	int rc;
122		#endif
123
124	<	process_stat.sleeping=0;
125	<	process_stat.running=0;
126	<	process_stat.zombie=0;
80	<	process_stat.stopped=0;
81	<	process_stat.total=0;
124	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
125	>	return NULL;
126	>	}
127
128	<	#if defined(SOLARIS) || defined(LINUX)
129	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
85	<	return NULL;
86	<	}
128	>	while((dir_entry=readdir(proc_dir))!=NULL){
129	>	if(atoi(dir_entry->d_name) == 0) continue;
130
88	–	while((dir_entry=readdir(proc_dir))!=NULL){
89	–	if(atoi(dir_entry->d_name) == 0) continue;
90	–
131		#ifdef SOLARIS
132	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
132	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
133		#endif
134		#ifdef LINUX
135	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
135	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
136		#endif
137	+	if((f=fopen(filename, "r"))==NULL){
138	+	/* Open failed.. Process since vanished, or the path was too long.
139	+	* Ah well, move onwards to the next one */
140	+	continue;
141	+	}
142	+	#ifdef SOLARIS
143	+	fread(&process_info, sizeof(psinfo_t), 1, f);
144	+	#endif
145
146	<	if((f=fopen(filename, "r"))==NULL){
147	<	/* Open failed.. Process since vanished, or the path was too long.
100	<	* Ah well, move onwards to the next one */
101	<	continue;
146	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
147	>	return NULL;
148		}
149	+	proc_state_ptr = proc_state+proc_state_size;
150
151	<	#ifdef SOLARIS
152	<	fread(&process_info, sizeof(psinfo_t), 1, f);
153	<	if(process_info.pr_lwp.pr_state==1) process_stat.sleeping++;
154	<	if(process_info.pr_lwp.pr_state==2) process_stat.running++;
155	<	if(process_info.pr_lwp.pr_state==3) process_stat.zombie++;
156	<	if(process_info.pr_lwp.pr_state==4) process_stat.stopped++;
157	<	if(process_info.pr_lwp.pr_state==6) process_stat.running++;
151	>	#ifdef SOLARIS
152	>	proc_state_ptr->pid = process_info.pr_pid;
153	>	proc_state_ptr->parent = process_info.pr_ppid;
154	>	proc_state_ptr->pgid = process_info.pr_pgid;
155	>	proc_state_ptr->uid = process_info.pr_uid;
156	>	proc_state_ptr->euid = process_info.pr_euid;
157	>	proc_state_ptr->gid = process_info.pr_gid;
158	>	proc_state_ptr->egid = process_info.pr_egid;
159	>	proc_state_ptr->proc_size = (process_info.pr_size) * 1024;
160	>	proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
161	>	proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
162	>	proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
163	>	proc_state_ptr->process_name = strdup(process_info.pr_fname);
164	>	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
165	>
166	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
167	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
168	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
169	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
170	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
171		#endif
172		#ifdef LINUX
173	<	if((line_ptr=f_read_line(f, "State:"))==NULL){
174	<	fclose(f);
175	<	continue;
173	>	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));
174	>	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
175	>	if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
176	>	if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
177	>	if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
178	>	if(s == 'T') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
179	>	if(s == 'D') proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
180	>
181	>	/* pa_name[0] should = '(' */
182	>	ptr = strchr(&ps_name[1], ')');
183	>	if(ptr !=NULL) *ptr='\0';
184	>
185	>	if (sg_update_string(&proc_state_ptr->process_name,
186	>	&ps_name[1]) < 0) {
187	>	return NULL;
188		}
189	<	if((line_ptr=strchr(line_ptr, '\t'))==NULL){
190	<	fclose(f);
189	>
190	>	/* Need to do cpu */
191	>
192	>
193	>	fclose(f);
194	>
195	>	/* proctitle */
196	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
197	>
198	>	if((fn=open(filename, O_RDONLY)) == -1){
199	>	/* Open failed.. Process since vanished, or the path was too long.
200	>	* Ah well, move onwards to the next one */
201	>	continue;
202	>	}
203	>
204	>	#define READ_BLOCK_SIZE 128
205	>	len = 0;
206	>	do {
207	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
208	>	return NULL;
209	>	}
210	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
211	>	if (rc > 0) {
212	>	len += rc;
213	>	}
214	>	} while (rc == READ_BLOCK_SIZE);
215	>	close(fn);
216	>
217	>	if (rc == -1) {
218	>	/* Read failed; move on. */
219		continue;
220		}
221	<	line_ptr++;
222	<	if(line_ptr=='\0'){
223	<	fclose(f);
224	<	continue;
221	>
222	>	/* Turn \0s into spaces within the command line. */
223	>	ptr = psargs;
224	>	for(x = 0; x < len; x++) {
225	>	if (*ptr == '\0') *ptr = ' ';
226	>	ptr++;
227		}
228
229	<	if(*line_ptr=='S') process_stat.sleeping++;
230	<	if(*line_ptr=='R') process_stat.running++;
231	<	if(*line_ptr=='Z') process_stat.zombie++;
232	<	if(*line_ptr=='T') process_stat.stopped++;
233	<	if(*line_ptr=='D') process_stat.stopped++;
234	<	#endif
229	>	if (len == 0) {
230	>	/* We want psargs to be NULL. */
231	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
232	>	return NULL;
233	>	}
234	>	} else {
235	>	/* Not empty, so append a \0. */
236	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
237	>	return NULL;
238	>	}
239	>	psargs[len] = '\0';
240	>	}
241
242	<	fclose(f);
243	<	}
244	<	closedir(proc_dir);
242	>	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
243	>	return NULL;
244	>	}
245		#endif
246	+
247	+	proc_state_size++;
248	+	}
249	+	closedir(proc_dir);
250	+	#endif
251	+
252		#ifdef ALLBSD
253	<	if((kvmd = get_kvm()) == NULL){
253	>	mib[0] = CTL_KERN;
254	>	mib[1] = KERN_PROC;
255	>	mib[2] = KERN_PROC_ALL;
256	>
257	>	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
258		return NULL;
259		}
260
261	<	kp_stats=kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &procs);
261	>	procs = size / sizeof(struct kinfo_proc);
262
263	<	while(procs--){
263	>	kp_stats = malloc(size);
264	>	if(kp_stats == NULL) {
265	>	return NULL;
266	>	}
267	>
268	>	if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
269	>	free(kp_stats);
270	>	return NULL;
271	>	}
272	>
273	>	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
274	>	kvmd = sg_get_kvm2();
275	>	#endif
276	>
277	>	for (i = 0; i < procs; i++) {
278	>	const char *name;
279	>
280	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
281	>	return NULL;
282	>	}
283	>	proc_state_ptr = proc_state+proc_state_size;
284	>
285		#ifdef FREEBSD5
286	<	if (kp_stats[procs].ki_stat == SSLEEP) process_stat.sleeping++;
287	<	if (kp_stats[procs].ki_stat == SWAIT) process_stat.sleeping++;
288	<	if (kp_stats[procs].ki_stat == SLOCK) process_stat.sleeping++;
150	<	if (kp_stats[procs].ki_stat == SRUN) process_stat.running++;
151	<	if (kp_stats[procs].ki_stat == SIDL) process_stat.running++;
152	<	if (kp_stats[procs].ki_stat == SZOMB) process_stat.zombie++;
153	<	if (kp_stats[procs].ki_stat == SSTOP) process_stat.stopped++;
154	<
286	>	name = kp_stats[i].ki_comm;
287	>	#elif defined(DFBSD)
288	>	name = kp_stats[i].kp_thread.td_comm;
289		#else
290	<	if (kp_stats[procs].kp_proc.p_stat == SSLEEP) process_stat.sleeping++;
157	<	if (kp_stats[procs].kp_proc.p_stat == SRUN) process_stat.running++;
158	<	if (kp_stats[procs].kp_proc.p_stat == SIDL) process_stat.running++;
159	<	if (kp_stats[procs].kp_proc.p_stat == SZOMB) process_stat.zombie++;
160	<	if (kp_stats[procs].kp_proc.p_stat == SSTOP) process_stat.stopped++;
290	>	name = kp_stats[i].kp_proc.p_comm;
291		#endif
292	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
293	+	return NULL;
294	+	}
295	+
296	+	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
297	+	size = sizeof(buflen);
298	+
299	+	#ifdef FREEBSD5
300	+	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
301	+	return NULL;
302	+	}
303	+	#else
304	+	mib[1] = KERN_ARGMAX;
305	+
306	+	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
307	+	return NULL;
308	+	}
309	+	#endif
310	+
311	+	proctitle = malloc(buflen);
312	+	if(proctitle == NULL) {
313	+	return NULL;
314	+	}
315	+
316	+	size = buflen;
317	+
318	+	#ifdef FREEBSD5
319	+	mib[2] = KERN_PROC_ARGS;
320	+	mib[3] = kp_stats[i].ki_pid;
321	+	#else
322	+	mib[1] = KERN_PROC_ARGS;
323	+	mib[2] = kp_stats[i].kp_proc.p_pid;
324	+	mib[3] = KERN_PROC_ARGV;
325	+	#endif
326	+
327	+	free(proc_state_ptr->proctitle);
328	+	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
329	+	free(proctitle);
330	+	proc_state_ptr->proctitle = NULL;
331	+	}
332	+	else if(size > 0) {
333	+	proc_state_ptr->proctitle = malloc(size+1);
334	+	if(proc_state_ptr->proctitle == NULL) {
335	+	return NULL;
336	+	}
337	+	p = proctitle;
338	+	proc_state_ptr->proctitle[0] = '\0';
339	+	do {
340	+	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
341	+	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
342	+	p += strlen(p) + 1;
343	+	} while (p < proctitle + size);
344	+	free(proctitle);
345	+	/* remove trailing space */
346	+	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
347	+	}
348	+	else {
349	+	free(proctitle);
350	+	proc_state_ptr->proctitle = NULL;
351	+	}
352	+	#else
353	+	free(proc_state_ptr->proctitle);
354	+	if(kvmd != NULL) {
355	+	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
356	+	if(args != NULL) {
357	+	argsp = args;
358	+	while(*argsp != NULL) {
359	+	argslen += strlen(*argsp) + 1;
360	+	argsp++;
361	+	}
362	+	proctitle = malloc(argslen + 1);
363	+	proctitle[0] = '\0';
364	+	if(proctitle == NULL) {
365	+	return NULL;
366	+	}
367	+	while(*args != NULL) {
368	+	sg_strlcat(proctitle, *args, argslen + 1);
369	+	sg_strlcat(proctitle, " ", argslen + 1);
370	+	args++;
371	+	}
372	+	/* remove trailing space */
373	+	proctitle[strlen(proctitle)-1] = '\0';
374	+	proc_state_ptr->proctitle = proctitle;
375	+	}
376	+	else {
377	+	proc_state_ptr->proctitle = NULL;
378	+	}
379	+	}
380	+	else {
381	+	proc_state_ptr->proctitle = NULL;
382	+	}
383	+	#endif
384	+
385	+	#ifdef FREEBSD5
386	+	proc_state_ptr->pid = kp_stats[i].ki_pid;
387	+	proc_state_ptr->parent = kp_stats[i].ki_ppid;
388	+	proc_state_ptr->pgid = kp_stats[i].ki_pgid;
389	+	#else
390	+	proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid;
391	+	proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid;
392	+	proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid;
393	+	#endif
394	+
395	+	#ifdef FREEBSD5
396	+	proc_state_ptr->uid = kp_stats[i].ki_ruid;
397	+	proc_state_ptr->euid = kp_stats[i].ki_uid;
398	+	proc_state_ptr->gid = kp_stats[i].ki_rgid;
399	+	proc_state_ptr->egid = kp_stats[i].ki_svgid;
400	+	#elif defined(DFBSD)
401	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid;
402	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid;
403	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid;
404	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid;
405	+	#else
406	+	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid;
407	+	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid;
408	+	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid;
409	+	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid;
410	+	#endif
411	+
412	+	#ifdef FREEBSD5
413	+	proc_state_ptr->proc_size = kp_stats[i].ki_size;
414	+	/* This is in pages */
415	+	proc_state_ptr->proc_resident =
416	+	kp_stats[i].ki_rssize * getpagesize();
417	+	/* This is in microseconds */
418	+	proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000;
419	+	proc_state_ptr->cpu_percent =
420	+	((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0;
421	+	proc_state_ptr->nice = kp_stats[i].ki_nice;
422	+	#else
423	+	proc_state_ptr->proc_size =
424	+	kp_stats[i].kp_eproc.e_vm.vm_map.size;
425	+	/* This is in pages */
426	+	proc_state_ptr->proc_resident =
427	+	kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize();
428	+	#if defined(NETBSD) || defined(OPENBSD)
429	+	proc_state_ptr->time_spent =
430	+	kp_stats[i].kp_proc.p_rtime.tv_sec;
431	+	#elif defined(DFBSD)
432	+	proc_state_ptr->time_spent =
433	+	( kp_stats[i].kp_thread.td_uticks +
434	+	kp_stats[i].kp_thread.td_sticks +
435	+	kp_stats[i].kp_thread.td_iticks ) / 1000000;
436	+	#else
437	+	/* This is in microseconds */
438	+	proc_state_ptr->time_spent =
439	+	kp_stats[i].kp_proc.p_runtime / 1000000;
440	+	#endif
441	+	proc_state_ptr->cpu_percent =
442	+	((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0;
443	+	proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
444	+	#endif
445	+
446	+	#ifdef FREEBSD5
447	+	switch (kp_stats[i].ki_stat) {
448	+	#else
449	+	switch (kp_stats[i].kp_proc.p_stat) {
450	+	#endif
451	+	case SIDL:
452	+	case SRUN:
453	+	#ifdef SONPROC
454	+	case SONPROC: /* NetBSD */
455	+	#endif
456	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
457	+	break;
458	+	case SSLEEP:
459	+	#ifdef SWAIT
460	+	case SWAIT: /* FreeBSD 5 */
461	+	#endif
462	+	#ifdef SLOCK
463	+	case SLOCK: /* FreeBSD 5 */
464	+	#endif
465	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
466	+	break;
467	+	case SSTOP:
468	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
469	+	break;
470	+	case SZOMB:
471	+	#ifdef SDEAD
472	+	case SDEAD: /* OpenBSD & NetBSD */
473	+	#endif
474	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
475	+	break;
476	+	default:
477	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
478	+	break;
479	+	}
480	+	proc_state_size++;
481		}
482	+
483	+	free(kp_stats);
484		#endif
485
486		#ifdef CYGWIN
487		return NULL;
488		#endif
489
490	<	process_stat.total=process_stat.sleeping+process_stat.running+process_stat.zombie+process_stat.stopped;
490	>	*entries = proc_state_size;
491	>	return proc_state;
492	>	}
493	>
494	>	sg_process_count *sg_get_process_count() {
495	>	static sg_process_count process_stat;
496	>	sg_process_stats *ps;
497	>	int ps_size, x;
498	>
499	>	process_stat.sleeping = 0;
500	>	process_stat.running = 0;
501	>	process_stat.zombie = 0;
502	>	process_stat.stopped = 0;
503	>	process_stat.total = 0;
504	>
505	>	ps = sg_get_process_stats(&ps_size);
506	>	if (ps == NULL) {
507	>	return NULL;
508	>	}
509	>
510	>	for(x = 0; x < ps_size; x++) {
511	>	switch (ps->state) {
512	>	case SG_PROCESS_STATE_RUNNING:
513	>	process_stat.running++;
514	>	break;
515	>	case SG_PROCESS_STATE_SLEEPING:
516	>	process_stat.sleeping++;
517	>	break;
518	>	case SG_PROCESS_STATE_STOPPED:
519	>	process_stat.stopped++;
520	>	break;
521	>	case SG_PROCESS_STATE_ZOMBIE:
522	>	process_stat.zombie++;
523	>	break;
524	>	default:
525	>	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
526	>	* sg_process_count */
527	>	break;
528	>	}
529	>	ps++;
530	>	}
531	>
532	>	process_stat.total = ps_size;
533
534		return &process_stat;
535		}

Diff Legend

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