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

Diff Legend

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