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.41 by tdb, Sun Apr 4 21:54:49 2004 UTC vs.
Revision 1.46 by tdb, Sun Apr 4 23:57:33 2004 UTC

#	Line 63 | Line 63
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
#	Line 78 | Line 79 | int get_proc_snapshot(proc_state_t **ps){
79		int procs, i;
80		char *proctitle;
81		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
82	<	static kvm_t *kvmd;
82	>	kvm_t *kvmd;
83		char **args;
84		int alloc;
85	+	char *proctitletmp;
86		#else
87		long buflen;
88		char *p;
#	Line 221 | Line 223 | int get_proc_snapshot(proc_state_t **ps){
223		mib[2] = KERN_PROC_ALL;
224
225		if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
226	<	return NULL;
226	>	return -1;
227		}
228
229		procs = size / sizeof(struct kinfo_proc);
230
231		kp_stats = malloc(size);
232		if(kp_stats == NULL) {
233	<	return NULL;
233	>	return -1;
234		}
235
236		if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
237		free(kp_stats);
238	<	return NULL;
238	>	return -1;
239		}
240
241		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
242	<	kvmd = kvm_openfiles(_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
242	>	kvmd = get_kvm2();
243		#endif
244
245		for (i = 0; i < procs; i++) {
#	Line 245 | Line 247 | int get_proc_snapshot(proc_state_t **ps){
247		proc_state = realloc(proc_state,
248		(1+proc_state_size)*sizeof(proc_state_t));
249		if(proc_state == NULL ) {
250	<	return NULL;
250	>	return -1;
251		}
252		proc_state_ptr = proc_state+proc_state_size;
253
#	Line 265 | Line 267 | int get_proc_snapshot(proc_state_t **ps){
267
268		#ifdef FREEBSD5
269		if(sysctlbyname("kern.ps_arg_cache_limit", &buflen, &size, NULL, 0) < 0) {
270	<	return NULL;
270	>	return -1;
271		}
272		#else
273		mib[1] = KERN_ARGMAX;
274
275		if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {
276	<	return NULL;
276	>	return -1;
277		}
278		#endif
279
280		proctitle = malloc(buflen);
281		if(proctitle == NULL) {
282	<	return NULL;
282	>	return -1;
283		}
284
285		size = buflen;
#	Line 296 | Line 298 | int get_proc_snapshot(proc_state_t **ps){
298		proc_state_ptr->proctitle = NULL;
299		}
300		else if(size > 0) {
301	<	proc_state_ptr->proctitle = malloc(size);
301	>	proc_state_ptr->proctitle = malloc(size+1);
302		if(proc_state_ptr->proctitle == NULL) {
303	<	return NULL;
303	>	return -1;
304		}
305		p = proctitle;
306		proc_state_ptr->proctitle[0] = NULL;
307		do {
308	<	strncat(proc_state_ptr->proctitle, p, strlen(p));
309	<	strncat(proc_state_ptr->proctitle, " ", 1);
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	<	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = NULL;
313	>	/* remove trailing space */
314	>	proc_state_ptr->proctitle[strlen(proc_state_ptr->proctitle)-1] = '\0';
315		}
316		else {
317		free(proctitle);
#	Line 321 | Line 324 | int get_proc_snapshot(proc_state_t **ps){
324		alloc = 1;
325		proctitle = malloc(alloc);
326		if(proctitle == NULL) {
327	<	return NULL;
327	>	return -1;
328		}
329		while(*args != NULL) {
330		if(strlen(proctitle) + strlen(*args) >= alloc) {
331	<	alloc = (alloc + strlen(*args)) << 1;
332	<	proctitle = realloc(proctitle, alloc);
333	<	if(proctitle == NULL) {
334	<	return NULL;
331	>	alloc = (alloc + strlen(*args)) * 2;
332	>	proctitletmp = realloc(proctitle, alloc);
333	>	if(proctitletmp == NULL) {
334	>	return -1;
335		}
336	+	proctitle = proctitletmp;
337		}
338	<	strncat(proctitle, *args, strlen(*args));
339	<	strncat(proctitle, " ", 1);
338	>	strlcat(proctitle, *args, alloc);
339	>	strlcat(proctitle, " ", alloc);
340		args++;
341		}
342		/* remove trailing space */
343	<	proctitle[strlen(proctitle)-1] = NULL;
343	>	proctitle[strlen(proctitle)-1] = '\0';
344		proc_state_ptr->proctitle = proctitle;
345		}
346		else {
#	Line 466 | Line 470 | process_stat_t *get_process_stats() {
470
471		ps_size = get_proc_snapshot(&ps);
472
473	<	if(ps_size == 0) {
473	>	if(ps_size < 0) {
474		return NULL;
475		}
476

Diff Legend

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