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.58 by pajs, Tue Apr 6 16:29:44 2004 UTC vs.
Revision 1.61 by ats, Wed Apr 7 10:33:50 2004 UTC

#	Line 65 | Line 65
65		#include <limits.h>
66		#if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
67		#include <kvm.h>
68	–	#include <tools.h>
68		#endif
69		#include <unistd.h>
70		#ifdef NETBSD2
#	Line 178 | Line 177 | sg_process_stats *sg_get_process_stats(int *entries){
177		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
178		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
179		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
180	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
181	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
180	>	if (sg_update_string(&proc_state_ptr->process_name,
181	>	process_info.pr_fname) < 0) {
182	>	return NULL;
183	>	}
184	>	if (sg_update_string(&proc_state_ptr->proctitle,
185	>	process_info.pr_psargs) < 0) {
186	>	return NULL;
187	>	}
188
189		if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
190		if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
#	Line 280 | Line 285 | sg_process_stats *sg_get_process_stats(int *entries){
285
286		procs = size / sizeof(struct kinfo_proc);
287
288	<	kp_stats = malloc(size);
288	>	kp_stats = sg_malloc(size);
289		if(kp_stats == NULL) {
290		return NULL;
291		}
#	Line 345 | Line 350 | sg_process_stats *sg_get_process_stats(int *entries){
350		}
351		#endif
352
353	<	proctitle = malloc(buflen);
353	>	proctitle = sg_malloc(buflen);
354		if(proctitle == NULL) {
355		return NULL;
356		}
#	Line 367 | Line 372 | sg_process_stats *sg_get_process_stats(int *entries){
372		proc_state_ptr->proctitle = NULL;
373		}
374		else if(size > 0) {
375	<	proc_state_ptr->proctitle = malloc(size+1);
375	>	proc_state_ptr->proctitle = sg_malloc(size+1);
376		if(proc_state_ptr->proctitle == NULL) {
377		return NULL;
378		}
#	Line 396 | Line 401 | sg_process_stats *sg_get_process_stats(int *entries){
401		argslen += strlen(*argsp) + 1;
402		argsp++;
403		}
404	<	proctitle = malloc(argslen + 1);
404	>	proctitle = sg_malloc(argslen + 1);
405		proctitle[0] = '\0';
406		if(proctitle == NULL) {
407		return NULL;
#	Line 498 | Line 503 | sg_process_stats *sg_get_process_stats(int *entries){
503		lwps = size / sizeof(struct kinfo_lwp);
504		mib[4] = lwps;
505
506	<	kl_stats = malloc(size);
506	>	kl_stats = sg_malloc(size);
507		if(kl_stats == NULL) {
508		return NULL;
509		}

Diff Legend

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