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.69 by ats, Thu Apr 8 13:16:05 2004 UTC vs.
Revision 1.72 by ats, Thu Apr 8 23:30:29 2004 UTC

#	Line 51 | 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 99 | Line 100 | sg_process_stats *sg_get_process_stats(int *entries){
100		int argslen = 0;
101		#else
102		long buflen;
103	<	char *p;
103	>	char *p, *proctitletmp;
104		#endif
105		#ifdef NETBSD2
106		int lwps;
#	Line 361 | Line 362 | sg_process_stats *sg_get_process_stats(int *entries){
362		}
363
364		#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
364	–	size = sizeof(buflen);
365
366		#ifdef FREEBSD5
367	–	if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
368	–	sg_set_error(SG_ERROR_SYSCTLBYNAME, "kern.ps_arg_cache_limit");
369	–	return NULL;
370	–	}
371	–	#else
372	–	/* FIXME - this value can be too large on some of
373	–	the BSD's, which causes sysctl not to return
374	–	anything. Maybe we need something smaller? */
375	–	mib[1] = KERN_ARGMAX;
376	–
377	–	if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
378	–	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_ARGMAX");
379	–	return NULL;
380	–	}
381	–	#endif
382	–
383	–	proctitle = sg_malloc(buflen);
384	–	if(proctitle == NULL) {
385	–	return NULL;
386	–	}
387	–
388	–	size = buflen;
389	–
390	–	#ifdef FREEBSD5
367		mib[2] = KERN_PROC_ARGS;
368		mib[3] = kp_stats[i].ki_pid;
369		#else
#	Line 397 | Line 373 | sg_process_stats *sg_get_process_stats(int *entries){
373		#endif
374
375		free(proc_state_ptr->proctitle);
376	<	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
377	<	free(proctitle);
378	<	proc_state_ptr->proctitle = NULL;
379	<	}
380	<	else if(size > 0) {
376	>	proc_state_ptr->proctitle = NULL;
377	>
378	>	/* Starting size - we'll double this straight away */
379	>	#define PROCTITLE_START_SIZE 64
380	>	buflen = PROCTITLE_START_SIZE;
381	>	size = buflen;
382	>	proctitle = NULL;
383	>
384	>	do {
385	>	if(size >= buflen) {
386	>	buflen *= 2;
387	>	size = buflen;
388	>	proctitletmp = sg_realloc(proctitle, buflen);
389	>	if(proctitletmp == NULL) {
390	>	free(proctitle);
391	>	proctitle = NULL;
392	>	proc_state_ptr->proctitle = NULL;
393	>	size = 0;
394	>	break;
395	>	}
396	>	proctitle = proctitletmp;
397	>	bzero(proctitle, buflen);
398	>	}
399	>
400	>	if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
401	>	free(proctitle);
402	>	proctitle = NULL;
403	>	proc_state_ptr->proctitle = NULL;
404	>	size = 0;
405	>	break;
406	>	}
407	>	} while(size >= buflen);
408	>
409	>	if(size > 0) {
410		proc_state_ptr->proctitle = sg_malloc(size+1);
411		if(proc_state_ptr->proctitle == NULL) {
412		return NULL;
413		}
414		p = proctitle;
415	+	#ifdef OPENBSD
416	+	/* On OpenBSD, this value has the argv pointers (which
417	+	* are terminated by a NULL) at the front, so we have
418	+	* to skip over them to get to the strings. */
419	+	while (*(char ***)p != NULL) {
420	+	p += sizeof(char **);
421	+	}
422	+	p += sizeof(char **);
423	+	#endif
424		proc_state_ptr->proctitle[0] = '\0';
425		do {
426		sg_strlcat(proc_state_ptr->proctitle, p, size+1);
#	Line 414 | Line 428 | sg_process_stats *sg_get_process_stats(int *entries){
428		p += strlen(p) + 1;
429		} while (p < proctitle + size);
430		free(proctitle);
431	+	proctitle = NULL;
432		/* remove trailing space */
433		proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
434		}
435		else {
436	<	free(proctitle);
436	>	if(proctitle != NULL) {
437	>	free(proctitle);
438	>	proctitle = NULL;
439	>	}
440		proc_state_ptr->proctitle = NULL;
441		}
442		#else
443		free(proc_state_ptr->proctitle);
444	+	proc_state_ptr->proctitle = NULL;
445		if(kvmd != NULL) {
446		args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
447		if(args != NULL) {
#	Line 674 | Line 693 | sg_process_count *sg_get_process_count() {
693		process_stat.total = ps_size;
694
695		return &process_stat;
696	+	}
697	+
698	+	int sg_process_compare_name(const void *va, const void *vb) {
699	+	const sg_process_stats *a = (sg_process_stats *)va;
700	+	const sg_process_stats *b = (sg_process_stats *)vb;
701	+
702	+	return strcmp(a->process_name, b->process_name);
703		}
704
705		int sg_process_compare_pid(const void *va, const void *vb) {

Diff Legend

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