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.10 by pajs, Thu Oct 9 16:48:33 2003 UTC vs.
Revision 1.46 by tdb, Sun Apr 4 23:57:33 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 38 | Line 41
41		#define MAX_FILE_LENGTH PATH_MAX
42		#endif
43		#ifdef LINUX
44	<	#include "tools.h"
45	<	#include <linux/limits.h>
44	>	#include <limits.h>
45	>	#include <unistd.h>
46	>	#include <sys/stat.h>
47	>	#include <fcntl.h>
48		#define PROC_LOCATION "/proc"
49		#define MAX_FILE_LENGTH PATH_MAX
50		#endif
51	<	#ifdef FREEBSD
52	<	#include <kvm.h>
48	<	#include <fcntl.h>
51	>	#ifdef ALLBSD
52	>	#include <stdlib.h>
53		#include <sys/param.h>
54		#include <sys/sysctl.h>
55	+	#if defined(FREEBSD) || defined(DFBSD)
56		#include <sys/user.h>
57	+	#else
58	+	#include <sys/proc.h>
59		#endif
60	+	#include <string.h>
61	+	#include <paths.h>
62	+	#include <fcntl.h>
63	+	#include <limits.h>
64	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
65	+	#include <kvm.h>
66	+	#include <tools.h>
67	+	#endif
68	+	#include <unistd.h>
69	+	#endif
70
71	<	process_stat_t *get_process_stats(){
71	>	int get_proc_snapshot(proc_state_t **ps){
72	>	proc_state_t *proc_state = NULL;
73	>	proc_state_t *proc_state_ptr;
74	>	int proc_state_size = 0;
75	>	#ifdef ALLBSD
76	>	int mib[4];
77	>	size_t size;
78	>	struct kinfo_proc *kp_stats;
79	>	int procs, i;
80	>	char *proctitle;
81	>	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
82	>	kvm_t *kvmd;
83	>	char **args;
84	>	int alloc;
85	>	char *proctitletmp;
86	>	#else
87	>	long buflen;
88	>	char *p;
89	>	#endif
90	>	#endif
91	>	#if defined(SOLARIS) || defined(LINUX)
92	>	DIR *proc_dir;
93	>	struct dirent *dir_entry;
94	>	char filename[MAX_FILE_LENGTH];
95	>	FILE *f;
96	>	#ifdef SOLARIS
97	>	psinfo_t process_info;
98	>	#endif
99	>	#ifdef LINUX
100	>	char s;
101	>	/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */
102	>	char ps_name[4096];
103	>	char *ptr;
104	>	static char *psargs = NULL;
105	>	static int psarg_size = 0;
106	>	unsigned long stime, utime;
107	>	int x;
108	>	int fn;
109	>	int toread;
110	>	ssize_t size;
111	>	int t_read;
112	>	#endif
113
114	<	static process_stat_t process_stat;
114	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
115	>	return -1;
116	>	}
117
118	<	#if defined(SOLARIS) || defined(LINUX)
119	<	DIR *proc_dir;
120	<	struct dirent *dir_entry;
121	<	char filename[MAX_FILE_LENGTH];
122	<	FILE *f;
118	>	while((dir_entry=readdir(proc_dir))!=NULL){
119	>	if(atoi(dir_entry->d_name) == 0) continue;
120	>
121	>	#ifdef SOLARIS
122	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
123		#endif
124		#ifdef LINUX
125	<	char *line_ptr;
125	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
126		#endif
127	+	if((f=fopen(filename, "r"))==NULL){
128	+	/* Open failed.. Process since vanished, or the path was too long.
129	+	* Ah well, move onwards to the next one */
130	+	continue;
131	+	}
132		#ifdef SOLARIS
133	<	psinfo_t process_info;
133	>	fread(&process_info, sizeof(psinfo_t), 1, f);
134		#endif
135	<	#ifdef FREEBSD
136	<	struct kinfo_proc *kp_stats;
137	<	kvm_t *kvmd = NULL;
138	<	int procs;
135	>
136	>	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
137	>	proc_state_ptr = proc_state+proc_state_size;
138	>	#ifdef SOLARIS
139	>	proc_state_ptr->pid = process_info.pr_pid;
140	>	proc_state_ptr->parent = process_info.pr_ppid;
141	>	proc_state_ptr->pgid = process_info.pr_pgid;
142	>	proc_state_ptr->uid = process_info.pr_uid;
143	>	proc_state_ptr->euid = process_info.pr_euid;
144	>	proc_state_ptr->gid = process_info.pr_gid;
145	>	proc_state_ptr->egid = process_info.pr_egid;
146	>	proc_state_ptr->proc_size = (process_info.pr_size) * 1024;
147	>	proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
148	>	proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
149	>	proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
150	>	proc_state_ptr->process_name = strdup(process_info.pr_fname);
151	>	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
152	>
153	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
154	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
155	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
156	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
157	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
158		#endif
159	+	#ifdef LINUX
160	+	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));
161	+	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
162	+	if(s == 'S') proc_state_ptr->state = SLEEPING;
163	+	if(s == 'R') proc_state_ptr->state = RUNNING;
164	+	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
165	+	if(s == 'T') proc_state_ptr->state = STOPPED;
166	+	if(s == 'D') proc_state_ptr->state = STOPPED;
167	+
168	+	/* pa_name[0] should = '(' */
169	+	ptr = strchr(&ps_name[1], ')');
170	+	if(ptr !=NULL) *ptr='\0';
171	+	proc_state_ptr->process_name = strdup(&ps_name[1]);
172
173	<	process_stat.sleeping=0;
174	<	process_stat.running=0;
78	<	process_stat.zombie=0;
79	<	process_stat.stopped=0;
80	<	process_stat.total=0;
173	>	/* Need to do cpu */
174	>
175
176	<	#if defined(SOLARIS) || defined(LINUX)
177	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
178	<	return NULL;
176	>	/* proctitle */
177	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
178	>
179	>	if((fn=open(filename, O_RDONLY)) == -1){
180	>	/* Open failed.. Process since vanished, or the path was too long.
181	>	* Ah well, move onwards to the next one */
182	>	continue;
183	>	}
184	>	#define         PSARG_START_SIZE 128
185	>	if(psargs == NULL){
186	>	psargs = malloc(PSARG_START_SIZE);
187	>	psarg_size = PSARG_START_SIZE;
188	>	}
189	>	ptr = psargs;
190	>	t_read = 0;
191	>	toread = psarg_size;
192	>	while((size = read(fn, ptr, toread)) == toread){
193	>	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
194	>	ptr = psargs+psarg_size;
195	>	t_read = psarg_size;
196	>	psarg_size+=PSARG_START_SIZE;
197	>	toread = PSARG_START_SIZE;
198	>	}
199	>	if(size != -1) t_read+=size;
200	>
201	>	ptr = psargs;
202	>	for(x=0; x<t_read; x++){
203	>	if (*ptr == '\0') *ptr = ' ';
204	>	ptr++;
205	>	}
206	>	/*  for safety sake */
207	>	psargs[t_read] = '\0';
208	>
209	>	proc_state_ptr->proctitle = strdup(psargs);
210	>
211	>	#endif
212	>
213	>	proc_state_size++;
214	>
215	>	fclose(f);
216	>	}
217	>	closedir(proc_dir);
218	>	#endif
219	>
220	>	#ifdef ALLBSD
221	>	mib[0] = CTL_KERN;
222	>	mib[1] = KERN_PROC;
223	>	mib[2] = KERN_PROC_ALL;
224	>
225	>	if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
226	>	return -1;
227		}
228
229	<	while((dir_entry=readdir(proc_dir))!=NULL){
88	<	if(atoi(dir_entry->d_name) == 0) continue;
229	>	procs = size / sizeof(struct kinfo_proc);
230
231	<	#ifdef SOLARIS
232	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
231	>	kp_stats = malloc(size);
232	>	if(kp_stats == NULL) {
233	>	return -1;
234	>	}
235	>
236	>	if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
237	>	free(kp_stats);
238	>	return -1;
239	>	}
240	>
241	>	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
242	>	kvmd = get_kvm2();
243		#endif
244	<	#ifdef LINUX
245	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
244	>
245	>	for (i = 0; i < procs; i++) {
246	>	/* replace with something more sensible */
247	>	proc_state = realloc(proc_state,
248	>	(1+proc_state_size)*sizeof(proc_state_t));
249	>	if(proc_state == NULL ) {
250	>	return -1;
251	>	}
252	>	proc_state_ptr = proc_state+proc_state_size;
253	>
254	>	#ifdef FREEBSD5
255	>	proc_state_ptr->process_name =
256	>	strdup(kp_stats[i].ki_comm);
257	>	#elif defined(DFBSD)
258	>	proc_state_ptr->process_name =
259	>	strdup(kp_stats[i].kp_thread.td_comm);
260	>	#else
261	>	proc_state_ptr->process_name =
262	>	strdup(kp_stats[i].kp_proc.p_comm);
263		#endif
264
265	<	if((f=fopen(filename, "r"))==NULL){
266	<	/* Open failed.. Process since vanished, or the path was too long.
267	<	* Ah well, move onwards to the next one */
268	<	continue;
265	>	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
266	>	size = sizeof(buflen);
267	>
268	>	#ifdef FREEBSD5
269	>	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
270	>	return -1;
271		}
272	+	#else
273	+	mib[1] = KERN_ARGMAX;
274
275	<	#ifdef SOLARIS
276	<	fread(&process_info, sizeof(psinfo_t), 1, f);
277	<	if(process_info.pr_lwp.pr_state==1) process_stat.sleeping++;
106	<	if(process_info.pr_lwp.pr_state==2) process_stat.running++;
107	<	if(process_info.pr_lwp.pr_state==3) process_stat.zombie++;
108	<	if(process_info.pr_lwp.pr_state==4) process_stat.stopped++;
109	<	if(process_info.pr_lwp.pr_state==6) process_stat.running++;
275	>	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
276	>	return -1;
277	>	}
278		#endif
279	<	#ifdef LINUX
280	<	if((line_ptr=f_read_line(f, "State:"))==NULL){
281	<	fclose(f);
282	<	continue;
279	>
280	>	proctitle = malloc(buflen);
281	>	if(proctitle == NULL) {
282	>	return -1;
283		}
284	<	if((line_ptr=strchr(line_ptr, '\t'))==NULL){
285	<	fclose(f);
286	<	continue;
284	>
285	>	size = buflen;
286	>
287	>	#ifdef FREEBSD5
288	>	mib[2] = KERN_PROC_ARGS;
289	>	mib[3] = kp_stats[i].ki_pid;
290	>	#else
291	>	mib[1] = KERN_PROC_ARGS;
292	>	mib[2] = kp_stats[i].kp_proc.p_pid;
293	>	mib[3] = KERN_PROC_ARGV;
294	>	#endif
295	>
296	>	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
297	>	free(proctitle);
298	>	proc_state_ptr->proctitle = NULL;
299		}
300	<	line_ptr++;
301	<	if(line_ptr=='\0'){
302	<	fclose(f);
303	<	continue;
300	>	else if(size > 0) {
301	>	proc_state_ptr->proctitle = malloc(size+1);
302	>	if(proc_state_ptr->proctitle == NULL) {
303	>	return -1;
304	>	}
305	>	p = proctitle;
306	>	proc_state_ptr->proctitle[0] = NULL;
307	>	do {
308	>	strlcat(proc_state_ptr->proctitle, p, size+1);
309	>	strlcat(proc_state_ptr->proctitle, " ", size+1);
310	>	p += strlen(p) + 1;
311	>	} while (p < proctitle + size);
312	>	free(proctitle);
313	>	/* remove trailing space */
314	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
315		}
316	+	else {
317	+	free(proctitle);
318	+	proc_state_ptr->proctitle = NULL;
319	+	}
320	+	#else
321	+	if(kvmd != NULL) {
322	+	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
323	+	if(args != NULL) {
324	+	alloc = 1;
325	+	proctitle = malloc(alloc);
326	+	if(proctitle == NULL) {
327	+	return -1;
328	+	}
329	+	while(*args != NULL) {
330	+	if(strlen(proctitle) + strlen(*args) >= alloc) {
331	+	alloc = (alloc + strlen(*args)) * 2;
332	+	proctitletmp = realloc(proctitle, alloc);
333	+	if(proctitletmp == NULL) {
334	+	return -1;
335	+	}
336	+	proctitle = proctitletmp;
337	+	}
338	+	strlcat(proctitle, *args, alloc);
339	+	strlcat(proctitle, " ", alloc);
340	+	args++;
341	+	}
342	+	/* remove trailing space */
343	+	proctitle[strlen(proctitle)-1] = '\0';
344	+	proc_state_ptr->proctitle = proctitle;
345	+	}
346	+	else {
347	+	proc_state_ptr->proctitle = NULL;
348	+	}
349	+	}
350	+	else {
351	+	proc_state_ptr->proctitle = NULL;
352	+	}
353	+	#endif
354
355	<	if(*line_ptr=='S') process_stat.sleeping++;
356	<	if(*line_ptr=='R') process_stat.running++;
357	<	if(*line_ptr=='Z') process_stat.zombie++;
358	<	if(*line_ptr=='T') process_stat.stopped++;
359	<	if(*line_ptr=='D') process_stat.stopped++;
360	<	#endif
355	>	#ifdef FREEBSD5
356	>	proc_state_ptr->pid = kp_stats[i].ki_pid;
357	>	proc_state_ptr->parent = kp_stats[i].ki_ppid;
358	>	proc_state_ptr->pgid = kp_stats[i].ki_pgid;
359	>	#else
360	>	proc_state_ptr->pid = kp_stats[i].kp_proc.p_pid;
361	>	proc_state_ptr->parent = kp_stats[i].kp_eproc.e_ppid;
362	>	proc_state_ptr->pgid = kp_stats[i].kp_eproc.e_pgid;
363	>	#endif
364
365	<	fclose(f);
366	<	}
367	<	closedir(proc_dir);
365	>	#ifdef FREEBSD5
366	>	proc_state_ptr->uid = kp_stats[i].ki_ruid;
367	>	proc_state_ptr->euid = kp_stats[i].ki_uid;
368	>	proc_state_ptr->gid = kp_stats[i].ki_rgid;
369	>	proc_state_ptr->egid = kp_stats[i].ki_svgid;
370	>	#elif defined(DFBSD)
371	>	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_ucred.cr_ruid;
372	>	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_ucred.cr_svuid;
373	>	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_ucred.cr_rgid;
374	>	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_ucred.cr_svgid;
375	>	#else
376	>	proc_state_ptr->uid = kp_stats[i].kp_eproc.e_pcred.p_ruid;
377	>	proc_state_ptr->euid = kp_stats[i].kp_eproc.e_pcred.p_svuid;
378	>	proc_state_ptr->gid = kp_stats[i].kp_eproc.e_pcred.p_rgid;
379	>	proc_state_ptr->egid = kp_stats[i].kp_eproc.e_pcred.p_svgid;
380		#endif
137	–	#ifdef FREEBSD
138	–	if((kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL)) == NULL){
139	–	return NULL;
140	–	}
381
382	<	kp_stats=kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &procs);
382	>	#ifdef FREEBSD5
383	>	proc_state_ptr->proc_size = kp_stats[i].ki_size;
384	>	/* This is in pages */
385	>	proc_state_ptr->proc_resident =
386	>	kp_stats[i].ki_rssize * getpagesize();
387	>	/* This is in microseconds */
388	>	proc_state_ptr->time_spent = kp_stats[i].ki_runtime / 1000000;
389	>	proc_state_ptr->cpu_percent =
390	>	((double)kp_stats[i].ki_pctcpu / FSCALE) * 100.0;
391	>	proc_state_ptr->nice = kp_stats[i].ki_nice;
392	>	#else
393	>	proc_state_ptr->proc_size =
394	>	kp_stats[i].kp_eproc.e_vm.vm_map.size;
395	>	/* This is in pages */
396	>	proc_state_ptr->proc_resident =
397	>	kp_stats[i].kp_eproc.e_vm.vm_rssize * getpagesize();
398	>	#if defined(NETBSD) || defined(OPENBSD)
399	>	proc_state_ptr->time_spent =
400	>	kp_stats[i].kp_proc.p_rtime.tv_sec;
401	>	#elif defined(DFBSD)
402	>	proc_state_ptr->time_spent =
403	>	( kp_stats[i].kp_thread.td_uticks +
404	>	kp_stats[i].kp_thread.td_sticks +
405	>	kp_stats[i].kp_thread.td_iticks ) / 1000000;
406	>	#else
407	>	/* This is in microseconds */
408	>	proc_state_ptr->time_spent =
409	>	kp_stats[i].kp_proc.p_runtime / 1000000;
410	>	#endif
411	>	proc_state_ptr->cpu_percent =
412	>	((double)kp_stats[i].kp_proc.p_pctcpu / FSCALE) * 100.0;
413	>	proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
414	>	#endif
415
144	–	while(procs--){
416		#ifdef FREEBSD5
417	<	if (kp_stats[procs].ki_stat == SSLEEP) process_stat.sleeping++;
147	<	if (kp_stats[procs].ki_stat == SRUN) process_stat.running++;
148	<	if (kp_stats[procs].ki_stat == SIDL) process_stat.running++;
149	<	if (kp_stats[procs].ki_stat == SZOMB) process_stat.zombie++;
150	<	if (kp_stats[procs].ki_stat == SSTOP) process_stat.stopped++;
417	>	switch (kp_stats[i].ki_stat) {
418		#else
419	<	if (kp_stats[procs].kp_proc.p_stat == SSLEEP) process_stat.sleeping++;
153	<	if (kp_stats[procs].kp_proc.p_stat == SRUN) process_stat.running++;
154	<	if (kp_stats[procs].kp_proc.p_stat == SIDL) process_stat.running++;
155	<	if (kp_stats[procs].kp_proc.p_stat == SZOMB) process_stat.zombie++;
156	<	if (kp_stats[procs].kp_proc.p_stat == SSTOP) process_stat.stopped++;
157	<	process_stat.total++;
419	>	switch (kp_stats[i].kp_proc.p_stat) {
420		#endif
421	+	case SIDL:
422	+	case SRUN:
423	+	#ifdef SONPROC
424	+	case SONPROC: /* NetBSD */
425	+	#endif
426	+	proc_state_ptr->state = RUNNING;
427	+	break;
428	+	case SSLEEP:
429	+	#ifdef SWAIT
430	+	case SWAIT: /* FreeBSD 5 */
431	+	#endif
432	+	#ifdef SLOCK
433	+	case SLOCK: /* FreeBSD 5 */
434	+	#endif
435	+	proc_state_ptr->state = SLEEPING;
436	+	break;
437	+	case SSTOP:
438	+	proc_state_ptr->state = STOPPED;
439	+	break;
440	+	case SZOMB:
441	+	#ifdef SDEAD
442	+	case SDEAD: /* OpenBSD & NetBSD */
443	+	#endif
444	+	proc_state_ptr->state = ZOMBIE;
445	+	break;
446	+	default:
447	+	proc_state_ptr->state = UNKNOWN;
448	+	break;
449	+	}
450	+	proc_state_size++;
451		}
452
453	<	kvm_close(kvmd);
453	>	free(kp_stats);
454		#endif
455
456	<	#ifndef FREEBSD5
457	<	process_stat.total=process_stat.sleeping+process_stat.running+process_stat.zombie+process_stat.stopped;
458	<	#endif
456	>	*ps = proc_state;
457	>	return proc_state_size;
458	>	}
459	>
460	>	process_stat_t *get_process_stats() {
461	>	static process_stat_t process_stat;
462	>	proc_state_t *ps;
463	>	int ps_size, x;
464	>
465	>	process_stat.sleeping = 0;
466	>	process_stat.running = 0;
467	>	process_stat.zombie = 0;
468	>	process_stat.stopped = 0;
469	>	process_stat.total = 0;
470	>
471	>	ps_size = get_proc_snapshot(&ps);
472	>
473	>	if(ps_size < 0) {
474	>	return NULL;
475	>	}
476	>
477	>	for(x = 0; x < ps_size; x++) {
478	>	switch (ps->state) {
479	>	case RUNNING:
480	>	process_stat.running++;
481	>	break;
482	>	case SLEEPING:
483	>	process_stat.sleeping++;
484	>	break;
485	>	case STOPPED:
486	>	process_stat.stopped++;
487	>	break;
488	>	case ZOMBIE:
489	>	process_stat.zombie++;
490	>	break;
491	>	default:
492	>	/* currently no mapping for UNKNOWN in process_stat_t */
493	>	break;
494	>	}
495	>	ps++;
496	>	}
497	>
498	>	process_stat.total = ps_size;
499
500		return &process_stat;
501		}

Diff Legend

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