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.65 by tdb, Wed Apr 7 21:08:40 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 85 | Line 84 | static void proc_state_destroy(sg_process_stats *s) {
84
85		sg_process_stats *sg_get_process_stats(int *entries){
86		VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64,
87	<	proc_state_init, proc_state_destroy);
87	>	proc_state_init, proc_state_destroy);
88		int proc_state_size = 0;
89		sg_process_stats *proc_state_ptr;
90		#ifdef ALLBSD
#	Line 108 | Line 107 | sg_process_stats *sg_get_process_stats(int *entries){
107		#endif
108		#endif
109		#if defined(SOLARIS) || defined(LINUX)
110	<	DIR *proc_dir;
111	<	struct dirent *dir_entry;
112	<	char filename[MAX_FILE_LENGTH];
113	<	FILE *f;
110	>	DIR *proc_dir;
111	>	struct dirent *dir_entry;
112	>	char filename[MAX_FILE_LENGTH];
113	>	FILE *f;
114		#ifdef SOLARIS
115		psinfo_t process_info;
116		#endif
#	Line 131 | Line 130 | sg_process_stats *sg_get_process_stats(int *entries){
130
131		#ifdef LINUX
132		if ((f=fopen("/proc/uptime", "r")) == NULL) {
133	+	sg_set_error(SG_ERROR_OPEN, "/proc/uptime");
134		return NULL;
135		}
136		if((fscanf(f,"%lu %*d",&uptime)) != 1){
137	+	sg_set_error(SG_ERROR_PARSE, NULL);
138		return NULL;
139		}
140		fclose(f);
141		#endif
142
143	<	if((proc_dir=opendir(PROC_LOCATION))==NULL){
144	<	return NULL;
145	<	}
143	>	if((proc_dir=opendir(PROC_LOCATION))==NULL){
144	>	sg_set_error(SG_ERROR_OPENDIR, PROC_LOCATION);
145	>	return NULL;
146	>	}
147
148	<	while((dir_entry=readdir(proc_dir))!=NULL){
149	<	if(atoi(dir_entry->d_name) == 0) continue;
148	>	while((dir_entry=readdir(proc_dir))!=NULL){
149	>	if(atoi(dir_entry->d_name) == 0) continue;
150
151		#ifdef SOLARIS
152	<	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
152	>	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
153		#endif
154		#ifdef LINUX
155		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
156		#endif
157	<	if((f=fopen(filename, "r"))==NULL){
158	<	/* Open failed.. Process since vanished, or the path was too long.
159	<	* Ah well, move onwards to the next one */
160	<	continue;
161	<	}
157	>	if((f=fopen(filename, "r"))==NULL){
158	>	/* Open failed.. Process since vanished, or the path was too long.
159	>	* Ah well, move onwards to the next one */
160	>	continue;
161	>	}
162		#ifdef SOLARIS
163	<	fread(&process_info, sizeof(psinfo_t), 1, f);
163	>	fread(&process_info, sizeof(psinfo_t), 1, f);
164	>	fclose(f);
165		#endif
166
167		if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
#	Line 178 | Line 181 | sg_process_stats *sg_get_process_stats(int *entries){
181		proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
182		proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
183		proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
184	<	proc_state_ptr->process_name = strdup(process_info.pr_fname);
185	<	proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
184	>	proc_state_ptr->nice = (int)process_info.pr_lwp.pr_nice - 20;
185	>	if (sg_update_string(&proc_state_ptr->process_name,
186	>	process_info.pr_fname) < 0) {
187	>	return NULL;
188	>	}
189	>	if (sg_update_string(&proc_state_ptr->proctitle,
190	>	process_info.pr_psargs) < 0) {
191	>	return NULL;
192	>	}
193
194	<	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
195	<	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
196	<	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
197	<	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
198	<	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
194	>	if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
195	>	if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
196	>	if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
197	>	if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
198	>	if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
199		#endif
200		#ifdef LINUX
201		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));
#	Line 202 | Line 212 | sg_process_stats *sg_get_process_stats(int *entries){
212		if(ptr !=NULL) *ptr='\0';
213
214		if (sg_update_string(&proc_state_ptr->process_name,
215	<	&ps_name[1]) < 0) {
215	>	&ps_name[1]) < 0) {
216		return NULL;
217		}
218
219		/* cpu */
220		proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
211	–	printf("%s  ut: %lu st: %lu up: %lu start: %lu\n", proc_state_ptr->process_name, utime, stime, uptime , starttime);
221
222	<	fclose(f);
222	>	fclose(f);
223
224	+	/* uid / gid */
225	+	snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
226	+	if ((f=fopen(filename, "r")) == NULL) {
227	+	/* Open failed.. Process since vanished, or the path was too long.
228	+	* Ah well, move onwards to the next one */
229	+	continue;
230	+	}
231	+
232	+	if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
233	+	fclose(f);
234	+	continue;
235	+	}
236	+	sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
237	+
238	+	if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
239	+	fclose(f);
240	+	continue;
241	+	}
242	+	sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
243	+
244	+	fclose(f);
245	+
246		/* proctitle */
247		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
248
249	<	if((fn=open(filename, O_RDONLY)) == -1){
250	<	/* Open failed.. Process since vanished, or the path was too long.
251	<	* Ah well, move onwards to the next one */
252	<	continue;
253	<	}
249	>	if((fn=open(filename, O_RDONLY)) == -1){
250	>	/* Open failed.. Process since vanished, or the path was too long.
251	>	* Ah well, move onwards to the next one */
252	>	continue;
253	>	}
254
255		#define READ_BLOCK_SIZE 128
256		len = 0;
#	Line 265 | Line 296 | sg_process_stats *sg_get_process_stats(int *entries){
296		#endif
297
298		proc_state_size++;
299	<	}
300	<	closedir(proc_dir);
299	>	}
300	>	closedir(proc_dir);
301		#endif
302
303		#ifdef ALLBSD
#	Line 275 | Line 306 | sg_process_stats *sg_get_process_stats(int *entries){
306		mib[2] = KERN_PROC_ALL;
307
308		if(sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
309	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
310		return NULL;
311		}
312
313		procs = size / sizeof(struct kinfo_proc);
314
315	<	kp_stats = malloc(size);
315	>	kp_stats = sg_malloc(size);
316		if(kp_stats == NULL) {
317		return NULL;
318		}
319		memset(kp_stats, 0, size);
320
321		if(sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
322	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_PROC.KERN_PROC_ALL");
323		free(kp_stats);
324		return NULL;
325		}
#	Line 332 | Line 365 | sg_process_stats *sg_get_process_stats(int *entries){
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
#	Line 341 | Line 375 | sg_process_stats *sg_get_process_stats(int *entries){
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 = malloc(buflen);
383	>	proctitle = sg_malloc(buflen);
384		if(proctitle == NULL) {
385		return NULL;
386		}
#	Line 367 | Line 402 | sg_process_stats *sg_get_process_stats(int *entries){
402		proc_state_ptr->proctitle = NULL;
403		}
404		else if(size > 0) {
405	<	proc_state_ptr->proctitle = malloc(size+1);
405	>	proc_state_ptr->proctitle = sg_malloc(size+1);
406		if(proc_state_ptr->proctitle == NULL) {
407		return NULL;
408		}
#	Line 396 | Line 431 | sg_process_stats *sg_get_process_stats(int *entries){
431		argslen += strlen(*argsp) + 1;
432		argsp++;
433		}
434	<	proctitle = malloc(argslen + 1);
434	>	proctitle = sg_malloc(argslen + 1);
435		proctitle[0] = '\0';
436		if(proctitle == NULL) {
437		return NULL;
#	Line 492 | Line 527 | sg_process_stats *sg_get_process_stats(int *entries){
527		mib[4] = 0;
528
529		if(sysctl(mib, 5, NULL, &size, NULL, 0) < 0) {
530	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.0");
531		return NULL;
532		}
533
534		lwps = size / sizeof(struct kinfo_lwp);
535		mib[4] = lwps;
536
537	<	kl_stats = malloc(size);
537	>	kl_stats = sg_malloc(size);
538		if(kl_stats == NULL) {
539		return NULL;
540		}
541
542		if(sysctl(mib, 5, kl_stats, &size, NULL, 0) < 0) {
543	+	sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_LWP.pid.structsize.buffersize");
544		return NULL;
545		}
546		}
#	Line 588 | Line 625 | sg_process_stats *sg_get_process_stats(int *entries){
625		#endif
626
627		#ifdef CYGWIN
628	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
629		return NULL;
630		#endif
631

Diff Legend

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