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.36 by tdb, Sun Apr 4 16:12:59 2004 UTC vs.
Revision 1.78 by ats, Sat Nov 6 15:31:26 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 49 | 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 61 | Line 64
64		#include <paths.h>
65		#include <fcntl.h>
66		#include <limits.h>
67	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
68		#include <kvm.h>
69		#endif
70	+	#include <unistd.h>
71	+	#ifdef NETBSD2
72	+	#include <sys/lwp.h>
73	+	#endif
74	+	#endif
75	+	#ifdef HPUX
76	+	#include <sys/param.h>
77	+	#include <sys/pstat.h>
78	+	#include <unistd.h>
79	+	#define PROCESS_BATCH 30
80	+	#endif
81
82	<	int get_proc_snapshot(proc_state_t **ps){
83	<	proc_state_t *proc_state = NULL;
84	<	proc_state_t *proc_state_ptr;
82	>	static void proc_state_init(sg_process_stats *s) {
83	>	s->process_name = NULL;
84	>	s->proctitle = NULL;
85	>	}
86	>
87	>	static void proc_state_destroy(sg_process_stats *s) {
88	>	free(s->process_name);
89	>	free(s->proctitle);
90	>	}
91	>
92	>	sg_process_stats *sg_get_process_stats(int *entries){
93	>	VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64,
94	>	proc_state_init, proc_state_destroy);
95		int proc_state_size = 0;
96	+	sg_process_stats *proc_state_ptr;
97	+	#ifdef HPUX
98	+	struct pst_status pstat_procinfo[PROCESS_BATCH];
99	+	long procidx = 0;
100	+	long long pagesize;
101	+	int num, i;
102	+	#endif
103		#ifdef ALLBSD
104	<	int mib[3];
104	>	int mib[4];
105		size_t size;
106		struct kinfo_proc *kp_stats;
107	<	int procs, i, alloc;
76	<	static kvm_t *kvmd;
77	<	char **args;
107	>	int procs, i;
108		char *proctitle;
109	+	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
110	+	kvm_t *kvmd;
111	+	char **args, **argsp;
112	+	int argslen = 0;
113	+	#else
114	+	long buflen;
115	+	char *p, *proctitletmp;
116		#endif
117	+	#ifdef NETBSD2
118	+	int lwps;
119	+	struct kinfo_lwp *kl_stats;
120	+	#endif
121	+	#endif
122		#if defined(SOLARIS) || defined(LINUX)
123	<	DIR *proc_dir;
124	<	struct dirent *dir_entry;
125	<	char filename[MAX_FILE_LENGTH];
126	<	FILE *f;
123	>	DIR *proc_dir;
124	>	struct dirent *dir_entry;
125	>	char filename[MAX_FILE_LENGTH];
126	>	FILE *f;
127		#ifdef SOLARIS
128		psinfo_t process_info;
129		#endif
#	Line 90 | Line 132 | int get_proc_snapshot(proc_state_t **ps){
132		/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */
133		char ps_name[4096];
134		char *ptr;
135	<	static char *psargs = NULL;
136	<	static int psarg_size = 0;
95	<	unsigned long stime, utime;
135	>	VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
136	>	unsigned long stime, utime, starttime;
137		int x;
138		int fn;
139	<	int toread;
140	<	ssize_t size;
141	<	int t_read;
139	>	int len;
140	>	int rc;
141	>	time_t uptime;
142		#endif
143
144	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
145	<	return -1;
146	<	}
144	>	#ifdef LINUX
145	>	if ((f=fopen("/proc/uptime", "r")) == NULL) {
146	>	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/uptime");
147	>	return NULL;
148	>	}
149	>	if((fscanf(f,"%lu %*d",&uptime)) != 1){
150	>	sg_set_error(SG_ERROR_PARSE, NULL);
151	>	return NULL;
152	>	}
153	>	fclose(f);
154	>	#endif
155
156	<	while((dir_entry=readdir(proc_dir))!=NULL){
157	<	if(atoi(dir_entry->d_name) == 0) continue;
156	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
157	>	sg_set_error_with_errno(SG_ERROR_OPENDIR, PROC_LOCATION);
158	>	return NULL;
159	>	}
160
161	+	while((dir_entry=readdir(proc_dir))!=NULL){
162	+	if(atoi(dir_entry->d_name) == 0) continue;
163	+
164		#ifdef SOLARIS
165	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
165	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
166		#endif
167		#ifdef LINUX
168		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
169		#endif
170	<	if((f=fopen(filename, "r"))==NULL){
171	<	/* Open failed.. Process since vanished, or the path was too long.
172	<	* Ah well, move onwards to the next one */
173	<	continue;
174	<	}
170	>	if((f=fopen(filename, "r"))==NULL){
171	>	/* Open failed.. Process since vanished, or the path was too long.
172	>	* Ah well, move onwards to the next one */
173	>	continue;
174	>	}
175		#ifdef SOLARIS
176	<	fread(&process_info, sizeof(psinfo_t), 1, f);
176	>	fread(&process_info, sizeof(psinfo_t), 1, f);
177	>	fclose(f);
178		#endif
179
180	<	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
180	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
181	>	return NULL;
182	>	}
183		proc_state_ptr = proc_state+proc_state_size;
184	+
185		#ifdef SOLARIS
186		proc_state_ptr->pid = process_info.pr_pid;
187		proc_state_ptr->parent = process_info.pr_ppid;
#	Line 136 | Line 194 | int get_proc_snapshot(proc_state_t **ps){
194		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
195		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
196		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
197	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
198	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
197	>	proc_state_ptr->nice = (int)process_info.pr_lwp.pr_nice - 20;
198	>	if (sg_update_string(&proc_state_ptr->process_name,
199	>	process_info.pr_fname) < 0) {
200	>	return NULL;
201	>	}
202	>	if (sg_update_string(&proc_state_ptr->proctitle,
203	>	process_info.pr_psargs) < 0) {
204	>	return NULL;
205	>	}
206
207	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SLEEPING;
208	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = RUNNING;
209	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = ZOMBIE;
210	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = STOPPED;
211	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = RUNNING;
207	>	switch (process_info.pr_lwp.pr_state) {
208	>	case 1:
209	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
210	>	break;
211	>	case 2:
212	>	case 5:
213	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
214	>	break;
215	>	case 3:
216	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
217	>	break;
218	>	case 4:
219	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
220	>	break;
221	>	}
222		#endif
223		#ifdef LINUX
224	<	x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*lu %*lu %*lu %*lu %*lu %lu %lu %*ld %*ld %*ld %d %*ld %*ld %*lu %llu %llu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*lu %*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));
225	<	proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
226	<	if(s == 'S') proc_state_ptr->state = SLEEPING;
227	<	if(s == 'R') proc_state_ptr->state = RUNNING;
228	<	if(s == 'Z') proc_state_ptr->state = ZOMBIE;
229	<	if(s == 'T') proc_state_ptr->state = STOPPED;
230	<	if(s == 'D') proc_state_ptr->state = STOPPED;
224	>	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));
225	>	/* +3 becuase man page says "Resident  Set Size: number of pages the process has in real memory, minus 3 for administrative purposes." */
226	>	proc_state_ptr->proc_resident = (proc_state_ptr->proc_resident + 3) * getpagesize();
227	>	switch (s) {
228	>	case 'S':
229	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
230	>	break;
231	>	case 'R':
232	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
233	>	break;
234	>	case 'Z':
235	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
236	>	break;
237	>	case 'T':
238	>	case 'D':
239	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
240	>	break;
241	>	}
242
243		/* pa_name[0] should = '(' */
244		ptr = strchr(&ps_name[1], ')');
245		if(ptr !=NULL) *ptr='\0';
160	–	proc_state_ptr->process_name = strdup(&ps_name[1]);
246
247	<	/* Need to do cpu */
248	<
247	>	if (sg_update_string(&proc_state_ptr->process_name,
248	>	&ps_name[1]) < 0) {
249	>	return NULL;
250	>	}
251
252	+	/* cpu */
253	+	proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
254	+
255	+	fclose(f);
256	+
257	+	/* uid / gid */
258	+	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
259	+	if ((f=fopen(filename, "r")) == NULL) {
260	+	/* Open failed.. Process since vanished, or the path was too long.
261	+	* Ah well, move onwards to the next one */
262	+	continue;
263	+	}
264	+
265	+	if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
266	+	fclose(f);
267	+	continue;
268	+	}
269	+	sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
270	+
271	+	if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
272	+	fclose(f);
273	+	continue;
274	+	}
275	+	sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
276	+
277	+	fclose(f);
278	+
279		/* proctitle */
280		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
281
282	<	if((fn=open(filename, O_RDONLY)) == -1){
283	<	/* Open failed.. Process since vanished, or the path was too long.
284	<	* Ah well, move onwards to the next one */
285	<	continue;
172	<	}
173	<	#define         PSARG_START_SIZE 128
174	<	if(psargs == NULL){
175	<	psargs = malloc(PSARG_START_SIZE);
176	<	psarg_size = PSARG_START_SIZE;
282	>	if((fn=open(filename, O_RDONLY)) == -1){
283	>	/* Open failed.. Process since vanished, or the path was too long.
284	>	* Ah well, move onwards to the next one */
285	>	continue;
286		}
287	<	ptr = psargs;
288	<	t_read = 0;
289	<	toread = psarg_size;
290	<	while((size = read(fn, ptr, toread)) == toread){
291	<	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
292	<	ptr = psargs+psarg_size;
293	<	t_read = psarg_size;
294	<	psarg_size+=PSARG_START_SIZE;
295	<	toread = PSARG_START_SIZE;
287	>
288	>	#define READ_BLOCK_SIZE 128
289	>	len = 0;
290	>	do {
291	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE) < 0) {
292	>	return NULL;
293	>	}
294	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
295	>	if (rc > 0) {
296	>	len += rc;
297	>	}
298	>	} while (rc == READ_BLOCK_SIZE);
299	>	close(fn);
300	>
301	>	if (rc == -1) {
302	>	/* Read failed; move on. */
303	>	continue;
304		}
188	–	if(size != -1) t_read+=size;
305
306	+	/* Turn \0s into spaces within the command line. */
307		ptr = psargs;
308	<	for(x=0; x<t_read; x++){
308	>	for(x = 0; x < len; x++) {
309		if (*ptr == '\0') *ptr = ' ';
310		ptr++;
311		}
195	–	/*  for safety sake */
196	–	psargs[t_read] = '\0';
312
313	<	proc_state_ptr->proctitle = strdup(psargs);
313	>	if (len == 0) {
314	>	/* We want psargs to be NULL. */
315	>	if (VECTOR_RESIZE(psargs, 0) < 0) {
316	>	return NULL;
317	>	}
318	>	} else {
319	>	/* Not empty, so append a \0. */
320	>	if (VECTOR_RESIZE(psargs, len + 1) < 0) {
321	>	return NULL;
322	>	}
323	>	psargs[len] = '\0';
324	>	}
325
326	+	if (sg_update_string(&proc_state_ptr->proctitle, psargs) < 0) {
327	+	return NULL;
328	+	}
329		#endif
330
331		proc_state_size++;
332	<
333	<	fclose(f);
205	<	}
206	<	closedir(proc_dir);
332	>	}
333	>	closedir(proc_dir);
334		#endif
335
336		#ifdef ALLBSD
#	Line 212 | Line 339 | int get_proc_snapshot(proc_state_t **ps){
339		mib[2] = KERN_PROC_ALL;
340
341		if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
342	+	sg_set_error_with_errno(SG_ERROR_SYSCTL,
343	+	"CTL_KERN.KERN_PROC.KERN_PROC_ALL");
344		return NULL;
345		}
346
347		procs = size / sizeof(struct kinfo_proc);
348
349	<	kp_stats = malloc(size);
349	>	kp_stats = sg_malloc(size);
350		if(kp_stats == NULL) {
351		return NULL;
352		}
353	+	memset(kp_stats, 0, size);
354
355		if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
356	+	sg_set_error_with_errno(SG_ERROR_SYSCTL,
357	+	"CTL_KERN.KERN_PROC.KERN_PROC_ALL");
358		free(kp_stats);
359		return NULL;
360		}
361
362	<	#if defined(NETBSD) || defined(OPENBSD)
363	<	kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, NULL);
232	<	#else
233	<	kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
362	>	#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
363	>	kvmd = sg_get_kvm2();
364		#endif
365
366		for (i = 0; i < procs; i++) {
367	<	/* replace with something more sensible */
368	<	proc_state = realloc(proc_state,
369	<	(1+proc_state_size)*sizeof(proc_state_t));
370	<	if(proc_state == NULL ) {
367	>	const char *name;
368	>
369	>	#ifdef FREEBSD5
370	>	if (kp_stats[i].ki_stat == 0) {
371	>	#else
372	>	if (kp_stats[i].kp_proc.p_stat == 0) {
373	>	#endif
374	>	/* FreeBSD 5 deliberately overallocates the array that
375	>	* the sysctl returns, so we'll get a few junk
376	>	* processes on the end that we have to ignore. (Search
377	>	* for "overestimate by 5 procs" in
378	>	* src/sys/kern/kern_proc.c for more details.) */
379	>	continue;
380	>	}
381	>
382	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
383		return NULL;
384		}
385		proc_state_ptr = proc_state+proc_state_size;
386
387		#ifdef FREEBSD5
388	<	proc_state_ptr->process_name =
247	<	strdup(kp_stats[i].ki_comm);
388	>	name = kp_stats[i].ki_comm;
389		#elif defined(DFBSD)
390	<	proc_state_ptr->process_name =
250	<	strdup(kp_stats[i].kp_thread.td_comm);
390	>	name = kp_stats[i].kp_thread.td_comm;
391		#else
392	<	proc_state_ptr->process_name =
253	<	strdup(kp_stats[i].kp_proc.p_comm);
392	>	name = kp_stats[i].kp_proc.p_comm;
393		#endif
394	+	if (sg_update_string(&proc_state_ptr->process_name, name) < 0) {
395	+	return NULL;
396	+	}
397
398	<	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
399	<	if(args != NULL) {
400	<	alloc = 1;
401	<	proctitle = malloc(alloc);
402	<	if(proctitle == NULL) {
398	>	#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
399	>
400	>	#ifdef FREEBSD5
401	>	mib[2] = KERN_PROC_ARGS;
402	>	mib[3] = kp_stats[i].ki_pid;
403	>	#else
404	>	mib[1] = KERN_PROC_ARGS;
405	>	mib[2] = kp_stats[i].kp_proc.p_pid;
406	>	mib[3] = KERN_PROC_ARGV;
407	>	#endif
408	>
409	>	free(proc_state_ptr->proctitle);
410	>	proc_state_ptr->proctitle = NULL;
411	>
412	>	/* Starting size - we'll double this straight away */
413	>	#define PROCTITLE_START_SIZE 64
414	>	buflen = PROCTITLE_START_SIZE;
415	>	size = buflen;
416	>	proctitle = NULL;
417	>
418	>	do {
419	>	if(size >= buflen) {
420	>	buflen *= 2;
421	>	size = buflen;
422	>	proctitletmp = sg_realloc(proctitle, buflen);
423	>	if(proctitletmp == NULL) {
424	>	free(proctitle);
425	>	proctitle = NULL;
426	>	proc_state_ptr->proctitle = NULL;
427	>	size = 0;
428	>	break;
429	>	}
430	>	proctitle = proctitletmp;
431	>	bzero(proctitle, buflen);
432	>	}
433	>
434	>	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
435	>	free(proctitle);
436	>	proctitle = NULL;
437	>	proc_state_ptr->proctitle = NULL;
438	>	size = 0;
439	>	break;
440	>	}
441	>	} while(size >= buflen);
442	>
443	>	if(size > 0) {
444	>	proc_state_ptr->proctitle = sg_malloc(size+1);
445	>	if(proc_state_ptr->proctitle == NULL) {
446		return NULL;
447		}
448	<	while(*args != NULL) {
449	<	if(strlen(proctitle) + strlen(*args) >= alloc) {
450	<	alloc = (alloc + strlen(*args)) << 1;
451	<	proctitle = realloc(proctitle, alloc);
452	<	if(proctitle == NULL) {
453	<	return NULL;
454	<	}
270	<	}
271	<	strncat(proctitle, *args, strlen(*args));
272	<	strncat(proctitle, " ", 1);
273	<	args++;
448	>	p = proctitle;
449	>	#ifdef OPENBSD
450	>	/* On OpenBSD, this value has the argv pointers (which
451	>	* are terminated by a NULL) at the front, so we have
452	>	* to skip over them to get to the strings. */
453	>	while (*(char ***)p != NULL) {
454	>	p += sizeof(char **);
455		}
456	+	p += sizeof(char **);
457	+	#endif
458	+	proc_state_ptr->proctitle[0] = '\0';
459	+	do {
460	+	sg_strlcat(proc_state_ptr->proctitle, p, size+1);
461	+	sg_strlcat(proc_state_ptr->proctitle, " ", size+1);
462	+	p += strlen(p) + 1;
463	+	} while (p < proctitle + size);
464	+	free(proctitle);
465	+	proctitle = NULL;
466		/* remove trailing space */
467	<	proctitle[strlen(proctitle)-1] = NULL;
277	<	proc_state_ptr->proctitle = proctitle;
467	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
468		}
469		else {
470	<	/* Should probably be returning NULL here */
471	<	proc_state_ptr->proctitle =
472	<	malloc(strlen(proc_state_ptr->process_name)+4);
283	<	if(proc_state_ptr->proctitle == NULL) {
284	<	return NULL;
470	>	if(proctitle != NULL) {
471	>	free(proctitle);
472	>	proctitle = NULL;
473		}
474	<	sprintf(proc_state_ptr->proctitle, " (%s)",
287	<	proc_state_ptr->process_name);
474	>	proc_state_ptr->proctitle = NULL;
475		}
476	+	#else
477	+	free(proc_state_ptr->proctitle);
478	+	proc_state_ptr->proctitle = NULL;
479	+	if(kvmd != NULL) {
480	+	args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
481	+	if(args != NULL) {
482	+	argsp = args;
483	+	while(*argsp != NULL) {
484	+	argslen += strlen(*argsp) + 1;
485	+	argsp++;
486	+	}
487	+	proctitle = sg_malloc(argslen + 1);
488	+	proctitle[0] = '\0';
489	+	if(proctitle == NULL) {
490	+	return NULL;
491	+	}
492	+	while(*args != NULL) {
493	+	sg_strlcat(proctitle, *args, argslen + 1);
494	+	sg_strlcat(proctitle, " ", argslen + 1);
495	+	args++;
496	+	}
497	+	/* remove trailing space */
498	+	proctitle[strlen(proctitle)-1] = '\0';
499	+	proc_state_ptr->proctitle = proctitle;
500	+	}
501	+	else {
502	+	proc_state_ptr->proctitle = NULL;
503	+	}
504	+	}
505	+	else {
506	+	proc_state_ptr->proctitle = NULL;
507	+	}
508	+	#endif
509
510		#ifdef FREEBSD5
511		proc_state_ptr->pid = kp_stats[i].ki_pid;
#	Line 348 | Line 568 | int get_proc_snapshot(proc_state_t **ps){
568		proc_state_ptr->nice = kp_stats[i].kp_proc.p_nice;
569		#endif
570
571	+	#ifdef NETBSD2
572	+	{
573	+	size_t size;
574	+	int mib[5];
575	+
576	+	mib[0] = CTL_KERN;
577	+	mib[1] = KERN_LWP;
578	+	mib[2] = kp_stats[i].kp_proc.p_pid;
579	+	mib[3] = sizeof(struct kinfo_lwp);
580	+	mib[4] = 0;
581	+
582	+	if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
583	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.0");
584	+	return NULL;
585	+	}
586	+
587	+	lwps = size / sizeof(struct kinfo_lwp);
588	+	mib[4] = lwps;
589	+
590	+	kl_stats = sg_malloc(size);
591	+	if(kl_stats == NULL) {
592	+	return NULL;
593	+	}
594	+
595	+	if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
596	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.buffersize");
597	+	return NULL;
598	+	}
599	+	}
600	+
601	+	switch(kp_stats[i].kp_proc.p_stat) {
602	+	case SIDL:
603	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
604	+	break;
605	+	case SACTIVE:
606	+	{
607	+	int i;
608	+
609	+	for(i = 0; i < lwps; i++) {
610	+	switch(kl_stats[i].l_stat) {
611	+	case LSONPROC:
612	+	case LSRUN:
613	+	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
614	+	goto end;
615	+	case LSSLEEP:
616	+	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
617	+	goto end;
618	+	case LSSTOP:
619	+	case LSSUSPENDED:
620	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
621	+	goto end;
622	+	}
623	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
624	+	}
625	+	end: ;
626	+	}
627	+	break;
628	+	case SSTOP:
629	+	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
630	+	break;
631	+	case SZOMB:
632	+	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
633	+	break;
634	+	default:
635	+	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
636	+	break;
637	+	}
638	+
639	+	free(kl_stats);
640	+	#else
641		#ifdef FREEBSD5
642		switch (kp_stats[i].ki_stat) {
643		#else
#	Line 358 | Line 648 | int get_proc_snapshot(proc_state_t **ps){
648		#ifdef SONPROC
649		case SONPROC: /* NetBSD */
650		#endif
651	<	proc_state_ptr->state = RUNNING;
651	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
652		break;
653		case SSLEEP:
654		#ifdef SWAIT
#	Line 367 | Line 657 | int get_proc_snapshot(proc_state_t **ps){
657		#ifdef SLOCK
658		case SLOCK: /* FreeBSD 5 */
659		#endif
660	<	proc_state_ptr->state = SLEEPING;
660	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
661		break;
662		case SSTOP:
663	<	proc_state_ptr->state = STOPPED;
663	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
664		break;
665		case SZOMB:
666		#ifdef SDEAD
667		case SDEAD: /* OpenBSD & NetBSD */
668		#endif
669	<	proc_state_ptr->state = ZOMBIE;
669	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
670		break;
671		default:
672	<	proc_state_ptr->state = UNKNOWN;
672	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
673		break;
674		}
675	+	#endif
676		proc_state_size++;
677		}
678
679		free(kp_stats);
680		#endif
681
682	<	*ps = proc_state;
683	<	return proc_state_size;
682	>	#ifdef HPUX
683	>	if ((pagesize = sysconf(_SC_PAGESIZE)) == -1) {
684	>	sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
685	>	return NULL;
686	>	}
687	>
688	>	while (1) {
689	>	num = pstat_getproc(pstat_procinfo, sizeof pstat_procinfo[0],
690	>	PROCESS_BATCH, procidx);
691	>	if (num == -1) {
692	>	sg_set_error_with_errno(SG_ERROR_PSTAT,
693	>	"pstat_getproc");
694	>	return NULL;
695	>	} else if (num == 0) {
696	>	break;
697	>	}
698	>
699	>	for (i = 0; i < num; i++) {
700	>	struct pst_status *pi = &pstat_procinfo[i];
701	>
702	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
703	>	return NULL;
704	>	}
705	>	proc_state_ptr = proc_state+proc_state_size;
706	>
707	>	proc_state_ptr->pid = pi->pst_pid;
708	>	proc_state_ptr->parent = pi->pst_ppid;
709	>	proc_state_ptr->pgid = pi->pst_pgrp;
710	>	proc_state_ptr->uid = pi->pst_uid;
711	>	proc_state_ptr->euid = pi->pst_euid;
712	>	proc_state_ptr->gid = pi->pst_gid;
713	>	proc_state_ptr->egid = pi->pst_egid;
714	>	proc_state_ptr->proc_size = (pi->pst_dsize + pi->pst_tsize + pi->pst_ssize) * pagesize;
715	>	proc_state_ptr->proc_resident = pi->pst_rssize * pagesize;
716	>	proc_state_ptr->time_spent = pi->pst_time;
717	>	proc_state_ptr->cpu_percent = (pi->pst_pctcpu * 100.0) / 0x8000;
718	>	proc_state_ptr->nice = pi->pst_nice;
719	>
720	>	if (sg_update_string(&proc_state_ptr->process_name,
721	>	pi->pst_ucomm) < 0) {
722	>	return NULL;
723	>	}
724	>	if (sg_update_string(&proc_state_ptr->proctitle,
725	>	pi->pst_cmd) < 0) {
726	>	return NULL;
727	>	}
728	>
729	>	switch (pi->pst_stat) {
730	>	case PS_SLEEP:
731	>	proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
732	>	break;
733	>	case PS_RUN:
734	>	proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
735	>	break;
736	>	case PS_STOP:
737	>	proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
738	>	break;
739	>	case PS_ZOMBIE:
740	>	proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
741	>	break;
742	>	case PS_IDLE:
743	>	case PS_OTHER:
744	>	proc_state_ptr->state = SG_PROCESS_STATE_UNKNOWN;
745	>	break;
746	>	}
747	>
748	>	proc_state_size++;
749	>	}
750	>	procidx = pstat_procinfo[num - 1].pst_idx + 1;
751	>	}
752	>	#endif
753	>
754	>	#ifdef CYGWIN
755	>	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
756	>	return NULL;
757	>	#endif
758	>
759	>	*entries = proc_state_size;
760	>	return proc_state;
761		}
762
763	<	process_stat_t *get_process_stats() {
764	<	static process_stat_t process_stat;
765	<	proc_state_t *ps;
763	>	sg_process_count *sg_get_process_count() {
764	>	static sg_process_count process_stat;
765	>	sg_process_stats *ps;
766		int ps_size, x;
767
768		process_stat.sleeping = 0;
#	Line 403 | Line 771 | process_stat_t *get_process_stats() {
771		process_stat.stopped = 0;
772		process_stat.total = 0;
773
774	<	ps_size = get_proc_snapshot(&ps);
775	<
408	<	if(ps_size == NULL) {
774	>	ps = sg_get_process_stats(&ps_size);
775	>	if (ps == NULL) {
776		return NULL;
777		}
778
779		for(x = 0; x < ps_size; x++) {
780		switch (ps->state) {
781	<	/* currently no mapping for UNKNOWN in process_stat_t */
415	<	case RUNNING:
781	>	case SG_PROCESS_STATE_RUNNING:
782		process_stat.running++;
783		break;
784	<	case SLEEPING:
784	>	case SG_PROCESS_STATE_SLEEPING:
785		process_stat.sleeping++;
786		break;
787	<	case STOPPED:
787	>	case SG_PROCESS_STATE_STOPPED:
788		process_stat.stopped++;
789		break;
790	<	case ZOMBIE:
790	>	case SG_PROCESS_STATE_ZOMBIE:
791		process_stat.zombie++;
792		break;
793	+	default:
794	+	/* currently no mapping for SG_PROCESS_STATE_UNKNOWN in
795	+	* sg_process_count */
796	+	break;
797		}
798		ps++;
799		}
#	Line 432 | Line 802 | process_stat_t *get_process_stats() {
802
803		return &process_stat;
804		}
805	+
806	+	int sg_process_compare_name(const void *va, const void *vb) {
807	+	const sg_process_stats *a = (sg_process_stats *)va;
808	+	const sg_process_stats *b = (sg_process_stats *)vb;
809	+
810	+	return strcmp(a->process_name, b->process_name);
811	+	}
812	+
813	+	int sg_process_compare_pid(const void *va, const void *vb) {
814	+	const sg_process_stats *a = (sg_process_stats *)va;
815	+	const sg_process_stats *b = (sg_process_stats *)vb;
816	+
817	+	if (a->pid < b->pid) {
818	+	return -1;
819	+	} else if (a->pid == b->pid) {
820	+	return 0;
821	+	} else {
822	+	return 1;
823	+	}
824	+	}
825	+
826	+	int sg_process_compare_uid(const void *va, const void *vb) {
827	+	const sg_process_stats *a = (sg_process_stats *)va;
828	+	const sg_process_stats *b = (sg_process_stats *)vb;
829	+
830	+	if (a->uid < b->uid) {
831	+	return -1;
832	+	} else if (a->uid == b->uid) {
833	+	return 0;
834	+	} else {
835	+	return 1;
836	+	}
837	+	}
838	+
839	+	int sg_process_compare_gid(const void *va, const void *vb) {
840	+	const sg_process_stats *a = (sg_process_stats *)va;
841	+	const sg_process_stats *b = (sg_process_stats *)vb;
842	+
843	+	if (a->gid < b->gid) {
844	+	return -1;
845	+	} else if (a->gid == b->gid) {
846	+	return 0;
847	+	} else {
848	+	return 1;
849	+	}
850	+	}
851	+
852	+	int sg_process_compare_size(const void *va, const void *vb) {
853	+	const sg_process_stats *a = (sg_process_stats *)va;
854	+	const sg_process_stats *b = (sg_process_stats *)vb;
855	+
856	+	if (a->proc_size < b->proc_size) {
857	+	return -1;
858	+	} else if (a->proc_size == b->proc_size) {
859	+	return 0;
860	+	} else {
861	+	return 1;
862	+	}
863	+	}
864	+
865	+	int sg_process_compare_res(const void *va, const void *vb) {
866	+	const sg_process_stats *a = (sg_process_stats *)va;
867	+	const sg_process_stats *b = (sg_process_stats *)vb;
868	+
869	+	if (a->proc_resident < b->proc_resident) {
870	+	return -1;
871	+	} else if (a->proc_resident == b->proc_resident) {
872	+	return 0;
873	+	} else {
874	+	return 1;
875	+	}
876	+	}
877	+
878	+	int sg_process_compare_cpu(const void *va, const void *vb) {
879	+	const sg_process_stats *a = (sg_process_stats *)va;
880	+	const sg_process_stats *b = (sg_process_stats *)vb;
881	+
882	+	if (a->cpu_percent < b->cpu_percent) {
883	+	return -1;
884	+	} else if (a->cpu_percent == b->cpu_percent) {
885	+	return 0;
886	+	} else {
887	+	return 1;
888	+	}
889	+	}
890	+
891	+	int sg_process_compare_time(const void *va, const void *vb) {
892	+	const sg_process_stats *a = (sg_process_stats *)va;
893	+	const sg_process_stats *b = (sg_process_stats *)vb;
894	+
895	+	if (a->time_spent < b->time_spent) {
896	+	return -1;
897	+	} else if (a->time_spent == b->time_spent) {
898	+	return 0;
899	+	} else {
900	+	return 1;
901	+	}
902	+	}
903	+

Diff Legend

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