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.47 by tdb, Mon Apr 5 00:21:29 2004 UTC vs.
Revision 1.48 by ats, Mon Apr 5 01:41:25 2004 UTC

#	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>
#	Line 68 | Line 70
70		#include <unistd.h>
71		#endif
72
73	+	static void proc_state_init(proc_state_t *s) {
74	+	s->process_name = NULL;
75	+	s->proctitle = NULL;
76	+	}
77	+
78	+	static void proc_state_destroy(proc_state_t *s) {
79	+	free(s->process_name);
80	+	free(s->proctitle);
81	+	}
82	+
83		int get_proc_snapshot(proc_state_t **ps){
84	<	proc_state_t *proc_state = NULL;
85	<	proc_state_t *proc_state_ptr;
84	>	VECTOR_DECLARE_STATIC(proc_state, proc_state_t, 64,
85	>	proc_state_init, proc_state_destroy);
86		int proc_state_size = 0;
87	+	proc_state_t *proc_state_ptr;
88		#ifdef ALLBSD
89		int mib[4];
90		size_t size;
#	Line 101 | Line 114 | int get_proc_snapshot(proc_state_t **ps){
114		/* If someone has a executable of 4k filename length, they deserve to get it truncated :) */
115		char ps_name[4096];
116		char *ptr;
117	<	static char *psargs = NULL;
105	<	static int psarg_size = 0;
117	>	VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
118		unsigned long stime, utime;
119		int x;
120		int fn;
121	<	int toread;
122	<	ssize_t size;
111	<	int t_read;
121	>	int len;
122	>	int rc;
123		#endif
124
125		if((proc_dir=opendir(PROC_LOCATION))==NULL){
#	Line 133 | Line 144 | int get_proc_snapshot(proc_state_t **ps){
144		fread(&process_info, sizeof(psinfo_t), 1, f);
145		#endif
146
147	<	proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
147	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
148	>	return -1;
149	>	}
150		proc_state_ptr = proc_state+proc_state_size;
151	+
152		#ifdef SOLARIS
153		proc_state_ptr->pid = process_info.pr_pid;
154		proc_state_ptr->parent = process_info.pr_ppid;
#	Line 168 | Line 182 | int get_proc_snapshot(proc_state_t **ps){
182		/* pa_name[0] should = '(' */
183		ptr = strchr(&ps_name[1], ')');
184		if(ptr !=NULL) *ptr='\0';
171	–	proc_state_ptr->process_name = strdup(&ps_name[1]);
185
186	+	if (update_string(&proc_state_ptr->process_name,
187	+	&ps_name[1]) == NULL) {
188	+	return -1;
189	+	}
190	+
191		/* Need to do cpu */
192
193
194	+	fclose(f);
195	+
196		/* proctitle */
197		snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
198
#	Line 181 | Line 201 | int get_proc_snapshot(proc_state_t **ps){
201		* Ah well, move onwards to the next one */
202		continue;
203		}
204	<	#define         PSARG_START_SIZE 128
205	<	if(psargs == NULL){
206	<	psargs = malloc(PSARG_START_SIZE);
207	<	psarg_size = PSARG_START_SIZE;
204	>
205	>	#define READ_BLOCK_SIZE 128
206	>	len = 0;
207	>	do {
208	>	if (VECTOR_RESIZE(psargs, len + READ_BLOCK_SIZE + 1) < 0) {
209	>	return -1;
210	>	}
211	>	rc = read(fn, psargs + len, READ_BLOCK_SIZE);
212	>	if (rc > 0) {
213	>	len += rc;
214	>	}
215	>	} while (rc == READ_BLOCK_SIZE);
216	>	close(fn);
217	>
218	>	if (rc == -1) {
219	>	/* Read failed; move on. */
220	>	continue;
221		}
189	–	ptr = psargs;
190	–	t_read = 0;
191	–	toread = psarg_size;
192	–	while((size = read(fn, ptr, toread)) == toread){
193	–	psargs = realloc(psargs, (psarg_size + PSARG_START_SIZE));
194	–	ptr = psargs+psarg_size;
195	–	t_read = psarg_size;
196	–	psarg_size+=PSARG_START_SIZE;
197	–	toread = PSARG_START_SIZE;
198	–	}
199	–	if(size != -1) t_read+=size;
222
223	+	/* Turn \0s into spaces within the command line. */
224		ptr = psargs;
225	<	for(x=0; x<t_read; x++){
225	>	for(x = 0; x < len; x++) {
226		if (*ptr == '\0') *ptr = ' ';
227		ptr++;
228		}
229	<	/*  for safety sake */
230	<	psargs[t_read] = '\0';
229	>	/* for safety's sake */
230	>	psargs[len] = '\0';
231
232	<	proc_state_ptr->proctitle = strdup(psargs);
233	<
232	>	if (update_string(&proc_state_ptr->proctitle, psargs) == NULL) {
233	>	return -1;
234	>	}
235		#endif
236
237		proc_state_size++;
214	–
215	–	fclose(f);
238		}
239		closedir(proc_dir);
240		#endif
#	Line 243 | Line 265 | int get_proc_snapshot(proc_state_t **ps){
265		#endif
266
267		for (i = 0; i < procs; i++) {
268	<	/* replace with something more sensible */
269	<	proc_state = realloc(proc_state,
270	<	(1+proc_state_size)*sizeof(proc_state_t));
249	<	if(proc_state == NULL ) {
268	>	const char *name;
269	>
270	>	if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
271		return -1;
272		}
273		proc_state_ptr = proc_state+proc_state_size;
274
275		#ifdef FREEBSD5
276	<	proc_state_ptr->process_name =
256	<	strdup(kp_stats[i].ki_comm);
276	>	name = kp_stats[i].ki_comm;
277		#elif defined(DFBSD)
278	<	proc_state_ptr->process_name =
259	<	strdup(kp_stats[i].kp_thread.td_comm);
278	>	name = kp_stats[i].kp_thread.td_comm;
279		#else
280	<	proc_state_ptr->process_name =
262	<	strdup(kp_stats[i].kp_proc.p_comm);
280	>	name = kp_stats[i].kp_proc.p_comm;
281		#endif
282	+	if (update_string(&proc_state_ptr->process_name, name) == NULL) {
283	+	return -1;
284	+	}
285
286		#if defined(FREEBSD5) || defined(NETBSD) || defined(OPENBSD)
287		size = sizeof(buflen);
#	Line 293 | Line 314 | int get_proc_snapshot(proc_state_t **ps){
314		mib[3] = KERN_PROC_ARGV;
315		#endif
316
317	+	free(proc_state_ptr->proctitle);
318		if(sysctl(mib, 4, proctitle, &size, NULL, 0) < 0) {
319		free(proctitle);
320		proc_state_ptr->proctitle = NULL;
#	Line 318 | Line 340 | int get_proc_snapshot(proc_state_t **ps){
340		proc_state_ptr->proctitle = NULL;
341		}
342		#else
343	+	free(proc_state_ptr->proctitle);
344		if(kvmd != NULL) {
345		args = kvm_getargv(kvmd, &(kp_stats[i]), 0);
346		if(args != NULL) {

Diff Legend

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