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

Diff Legend

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