ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/disk_stats.c

Comparing projects/libstatgrab/src/libstatgrab/disk_stats.c (file contents):
Revision 1.51 by tdb, Thu Feb 12 23:04:52 2004 UTC vs.
Revision 1.64 by ats, Wed Apr 7 10:33:50 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* i-scream central monitoring system
2	>	* i-scream libstatgrab
3		* http://www.i-scream.org
4		* Copyright (C) 2000-2004 i-scream
5		*
#	Line 30 | Line 30
30		#include <string.h>
31		#include <time.h>
32		#include "statgrab.h"
33	+	#include "vector.h"
34	+	#include "tools.h"
35
36		#ifdef SOLARIS
37		#include <sys/mnttab.h>
#	Line 41 | Line 43
43		#if defined(LINUX) || defined(CYGWIN)
44		#include <mntent.h>
45		#include <sys/vfs.h>
44	–	#include "tools.h"
46		#endif
47
48		#ifdef LINUX
#	Line 61 | Line 62
62		#include <sys/ucred.h>
63		#include <sys/mount.h>
64		#endif
65	<	#ifdef FREEBSD
65	>	#if defined(FREEBSD) || defined(DFBSD)
66		#include <sys/dkstat.h>
67		#include <devstat.h>
68		#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
#	Line 75 | Line 76
76		"ntfs"}
77		#endif
78
79	<	#define START_VAL 1
80	<
81	<	char *copy_string(char *orig_ptr, const char *newtext){
82	<
82	<	/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */
83	<	orig_ptr=realloc(orig_ptr, (1+strlen(newtext)));
84	<	if(orig_ptr==NULL){
85	<	return NULL;
86	<	}
87	<	strcpy(orig_ptr, newtext);
88	<
89	<	return orig_ptr;
79	>	static void disk_stat_init(sg_fs_stats *d) {
80	>	d->device_name = NULL;
81	>	d->fs_type = NULL;
82	>	d->mnt_point = NULL;
83		}
84
85	<
86	<	void init_disk_stat(int start, int end, disk_stat_t *disk_stats){
87	<
88	<	for(disk_stats+=start; start<=end; start++){
96	<	disk_stats->device_name=NULL;
97	<	disk_stats->fs_type=NULL;
98	<	disk_stats->mnt_point=NULL;
99	<
100	<	disk_stats++;
101	<	}
85	>	static void disk_stat_destroy(sg_fs_stats *d) {
86	>	free(d->device_name);
87	>	free(d->fs_type);
88	>	free(d->mnt_point);
89		}
90
91	<	int is_valid_fs_type(const char *type) {
91	>	static int is_valid_fs_type(const char *type) {
92		const char *types[] = VALID_FS_TYPES;
93		int i;
94
#	Line 113 | Line 100 | int is_valid_fs_type(const char *type) {
100		return 0;
101		}
102
103	<	disk_stat_t *get_disk_stats(int *entries){
103	>	sg_fs_stats *sg_get_fs_stats(int *entries){
104	>	VECTOR_DECLARE_STATIC(disk_stats, sg_fs_stats, 10,
105	>	disk_stat_init, disk_stat_destroy);
106
118	–	static disk_stat_t *disk_stats;
119	–	static int watermark=-1;
120	–
107		int valid_type;
108		int num_disks=0;
109		#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
110		FILE *f;
111		#endif
112
113	<	disk_stat_t *disk_ptr;
113	>	sg_fs_stats *disk_ptr;
114
115		#ifdef SOLARIS
116		struct mnttab mp;
#	Line 139 | Line 125 | disk_stat_t *get_disk_stats(int *entries){
125		struct statfs *mp;
126		#endif
127
142	–	if(watermark==-1){
143	–	disk_stats=malloc(START_VAL * sizeof(disk_stat_t));
144	–	if(disk_stats==NULL){
145	–	return NULL;
146	–	}
147	–	watermark=START_VAL;
148	–	init_disk_stat(0, watermark-1, disk_stats);
149	–	}
128		#ifdef ALLBSD
129		nummnt=getmntinfo(&mp , MNT_LOCAL);
130		if (nummnt<=0){
#	Line 181 | Line 159 | disk_stat_t *get_disk_stats(int *entries){
159		#endif
160
161		if(valid_type){
162	<	if(num_disks>watermark-1){
163	<	disk_ptr=disk_stats;
186	<	if((disk_stats=realloc(disk_stats, (watermark*2 * sizeof(disk_stat_t))))==NULL){
187	<	disk_stats=disk_ptr;
188	<	return NULL;
189	<	}
190	<
191	<	watermark=watermark*2;
192	<	init_disk_stat(num_disks, watermark-1, disk_stats);
162	>	if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) {
163	>	return NULL;
164		}
194	–
165		disk_ptr=disk_stats+num_disks;
166	+
167		#ifdef ALLBSD
168	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
168	>	if (sg_update_string(&disk_ptr->device_name, mp->f_mntfromname) < 0) {
169		return NULL;
170		}
171	<
201	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->f_fstypename))==NULL){
171	>	if (sg_update_string(&disk_ptr->fs_type, mp->f_fstypename) < 0) {
172		return NULL;
173		}
174	<
205	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->f_mntonname))==NULL){
174	>	if (sg_update_string(&disk_ptr->mnt_point, mp->f_mntonname) < 0) {
175		return NULL;
176		}
177
#	Line 216 | Line 185 | disk_stat_t *get_disk_stats(int *entries){
185		disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
186		#endif
187		#if defined(LINUX) || defined(CYGWIN)
188	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
188	>	if (sg_update_string(&disk_ptr->device_name, mp->mnt_fsname) < 0) {
189		return NULL;
190		}
191
192	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp->mnt_type))==NULL){
192	>	if (sg_update_string(&disk_ptr->fs_type, mp->mnt_type) < 0) {
193		return NULL;
194		}
195
196	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp->mnt_dir))==NULL){
196	>	if (sg_update_string(&disk_ptr->mnt_point, mp->mnt_dir) < 0) {
197		return NULL;
198		}
199		disk_ptr->size = (long long)fs.f_bsize * (long long)fs.f_blocks;
#	Line 238 | Line 207 | disk_stat_t *get_disk_stats(int *entries){
207		#endif
208
209		#ifdef SOLARIS
241	–	/* Memory leak in event of realloc failing */
210		/* Maybe make this char[bigenough] and do strncpy's and put a null in the end?
211		* Downside is its a bit hungry for a lot of mounts, as MNT_MAX_SIZE would prob
212		* be upwards of a k each
213		*/
214	<	if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp.mnt_special))==NULL){
214	>	if (sg_update_string(&disk_ptr->device_name, mp.mnt_special) < 0) {
215		return NULL;
216		}
217
218	<	if((disk_ptr->fs_type=copy_string(disk_ptr->fs_type, mp.mnt_fstype))==NULL){
218	>	if (sg_update_string(&disk_ptr->fs_type, mp.mnt_fstype) < 0) {
219		return NULL;
220		}
221
222	<	if((disk_ptr->mnt_point=copy_string(disk_ptr->mnt_point, mp.mnt_mountp))==NULL){
222	>	if (sg_update_string(&disk_ptr->mnt_point, mp.mnt_mountp) < 0) {
223		return NULL;
224		}
225
#	Line 281 | Line 249 | disk_stat_t *get_disk_stats(int *entries){
249		return disk_stats;
250
251		}
284	–	void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){
252
253	<	for(diskio_stats+=start; start<end; start++){
254	<	diskio_stats->disk_name=NULL;
288	<
289	<	diskio_stats++;
290	<	}
253	>	static void diskio_stat_init(sg_disk_io_stats *d) {
254	>	d->disk_name = NULL;
255		}
256
257	<	diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){
258	<
295	<	if(diskio_stats==NULL){
296	<
297	<	if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){
298	<	return NULL;
299	<	}
300	<	diskio_stat_init(0, needed_entries, diskio_stats);
301	<	*cur_entries=needed_entries;
302	<
303	<	return diskio_stats;
304	<	}
305	<
306	<
307	<	if(*cur_entries<needed_entries){
308	<	diskio_stats=realloc(diskio_stats, (sizeof(diskio_stat_t)*needed_entries));
309	<	if(diskio_stats==NULL){
310	<	return NULL;
311	<	}
312	<	diskio_stat_init(*cur_entries, needed_entries, diskio_stats);
313	<	*cur_entries=needed_entries;
314	<	}
315	<
316	<	return diskio_stats;
257	>	static void diskio_stat_destroy(sg_disk_io_stats *d) {
258	>	free(d->disk_name);
259		}
260
261	<	static diskio_stat_t *diskio_stats=NULL;
262	<	static int num_diskio=0;
261	>	VECTOR_DECLARE_STATIC(diskio_stats, sg_disk_io_stats, 10,
262	>	diskio_stat_init, diskio_stat_destroy);
263
264		#ifdef LINUX
265		typedef struct {
#	Line 326 | Line 268 | typedef struct {
268		} partition;
269		#endif
270
271	<	diskio_stat_t *get_diskio_stats(int *entries){
272	<
331	<	static int sizeof_diskio_stats=0;
271	>	sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
272	>	int num_diskio;
273		#ifndef LINUX
274	<	diskio_stat_t *diskio_stats_ptr;
274	>	sg_disk_io_stats *diskio_stats_ptr;
275		#endif
276
277		#ifdef SOLARIS
#	Line 343 | Line 284 | diskio_stat_t *get_diskio_stats(int *entries){
284		char *line_ptr;
285		int major, minor;
286		int has_pp_stats = 1;
287	<	static partition *parts = NULL;
347	<	static int alloc_parts = 0;
287	>	VECTOR_DECLARE_STATIC(parts, partition, 16, NULL, NULL);
288		int i, n;
289		time_t now;
290		const char *format;
291		#endif
292	<	#ifdef FREEBSD
292	>	#if defined(FREEBSD) || defined(DFBSD)
293		static struct statinfo stats;
294		static int stats_init = 0;
295		int counter;
#	Line 362 | Line 302 | diskio_stat_t *get_diskio_stats(int *entries){
302		struct disk_sysctl *stats;
303		#endif
304		#ifdef OPENBSD
305	+	int diskcount;
306	+	char *disknames, *name, *bufpp;
307	+	char **dk_name;
308		struct diskstats *stats;
309		#endif
310		#ifdef NETBSD
#	Line 378 | Line 321 | diskio_stat_t *get_diskio_stats(int *entries){
321
322		num_diskio=0;
323
324	+	#ifdef OPENBSD
325	+	mib[0] = CTL_HW;
326	+	mib[1] = HW_DISKCOUNT;
327	+
328	+	size = sizeof(diskcount);
329	+	if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
330	+	return NULL;
331	+	}
332	+
333	+	mib[0] = CTL_HW;
334	+	mib[1] = HW_DISKNAMES;
335	+
336	+	if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
337	+	return NULL;
338	+	}
339	+
340	+	disknames = sg_malloc(size);
341	+	if (disknames == NULL) {
342	+	return NULL;
343	+	}
344	+
345	+	if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
346	+	return NULL;
347	+	}
348	+
349	+	dk_name = sg_malloc(diskcount * sizeof(char *));
350	+	bufpp = disknames;
351	+	for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
352	+	dk_name[i] = name;
353	+	}
354	+	#endif
355	+
356		#if defined(NETBSD) || defined(OPENBSD)
357		mib[0] = CTL_HW;
358		mib[1] = HW_DISKSTATS;
#	Line 395 | Line 370 | diskio_stat_t *get_diskio_stats(int *entries){
370		num_disks = size / sizeof(struct diskstats);
371		#endif
372
373	<	stats = malloc(size);
373	>	stats = sg_malloc(size);
374		if (stats == NULL) {
375		return NULL;
376		}
#	Line 405 | Line 380 | diskio_stat_t *get_diskio_stats(int *entries){
380		}
381
382		for (i = 0; i < num_disks; i++) {
383	+	const char *name;
384		u_int64_t rbytes, wbytes;
385
386		#ifdef NETBSD
#	Line 424 | Line 400 | diskio_stat_t *get_diskio_stats(int *entries){
400		continue;
401		}
402
403	<	diskio_stats = diskio_stat_malloc(num_diskio + 1,
428	<	&sizeof_diskio_stats,
429	<	diskio_stats);
430	<	if (diskio_stats == NULL) {
403	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
404		return NULL;
405		}
406		diskio_stats_ptr = diskio_stats + num_diskio;
407
408		diskio_stats_ptr->read_bytes = rbytes;
409		diskio_stats_ptr->write_bytes = wbytes;
437	–	if (diskio_stats_ptr->disk_name != NULL) {
438	–	free(diskio_stats_ptr->disk_name);
439	–	}
410		#ifdef NETBSD
411	<	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
411	>	name = stats[i].dk_name;
412		#else
413	<	asprintf((&diskio_stats_ptr->disk_name), "%s%d", "disk", i);
413	>	name = dk_name[i];
414		#endif
415	+	if (sg_update_string(&diskio_stats_ptr->disk_name, name) < 0) {
416	+	return NULL;
417	+	}
418		diskio_stats_ptr->systime = time(NULL);
419
420		num_diskio++;
421		}
422
423		free(stats);
424	+	#ifdef OPENBSD
425	+	free(dk_name);
426	+	free(disknames);
427		#endif
428	+	#endif
429
430	<	#ifdef FREEBSD
430	>	#if defined(FREEBSD) || defined(DFBSD)
431		if (!stats_init) {
432	<	stats.dinfo=malloc(sizeof(struct devinfo));
432	>	stats.dinfo=sg_malloc(sizeof(struct devinfo));
433		if(stats.dinfo==NULL) return NULL;
434		bzero(stats.dinfo, sizeof(struct devinfo));
435		stats_init = 1;
#	Line 485 | Line 462 | diskio_stat_t *get_diskio_stats(int *entries){
462		#else
463		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
464		#endif
465	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
465	>
466	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
467		return NULL;
468		}
469		diskio_stats_ptr=diskio_stats+num_diskio;
#	Line 498 | Line 476 | diskio_stat_t *get_diskio_stats(int *entries){
476		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
477		#endif
478		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
479	<	asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
479	>	if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) {
480	>	return NULL;
481	>	}
482		diskio_stats_ptr->systime=time(NULL);
483
484		num_diskio++;
#	Line 520 | Line 500 | diskio_stat_t *get_diskio_stats(int *entries){
500		if((kstat_read(kc, ksp, &kios))==-1){
501		}
502
503	<	if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
503	>	if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
504		kstat_close(kc);
505		return NULL;
506		}
507		diskio_stats_ptr=diskio_stats+num_diskio;
508
509		diskio_stats_ptr->read_bytes=kios.nread;
530	–
510		diskio_stats_ptr->write_bytes=kios.nwritten;
511	<
512	<	if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
513	<
514	<	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
511	>	if (sg_update_string(&diskio_stats_ptr->disk_name,
512	>	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
513	>	return NULL;
514	>	}
515		diskio_stats_ptr->systime=time(NULL);
516	+
517		num_diskio++;
518		}
519		}
#	Line 551 | Line 531 | diskio_stat_t *get_diskio_stats(int *entries){
531		the same format. */
532
533		f = fopen("/proc/diskstats", "r");
534	<	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
534	>	format = " %d %d %99s %*d %*d %lld %*d %*d %*d %lld";
535		if (f == NULL) {
536		f = fopen("/proc/partitions", "r");
537	<	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
537	>	format = " %d %d %*d %99s %*d %*d %lld %*d %*d %*d %lld";
538		}
539		if (f == NULL) goto out;
540		now = time(NULL);
541
542	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
543	<	char name[20];
542	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
543	>	char name[100];
544		char *s;
545		long long rsect, wsect;
546
#	Line 581 | Line 561 | diskio_stat_t *get_diskio_stats(int *entries){
561		wsect = 0;
562		}
563
564	<	diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
565	<	diskio_stats);
586	<	if (diskio_stats == NULL) goto out;
587	<	if (n >= alloc_parts) {
588	<	alloc_parts += 16;
589	<	parts = realloc(parts, alloc_parts * sizeof *parts);
590	<	if (parts == NULL) {
591	<	alloc_parts = 0;
592	<	goto out;
593	<	}
564	>	if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) {
565	>	goto out;
566		}
567	+	if (VECTOR_RESIZE(parts, n + 1) < 0) {
568	+	goto out;
569	+	}
570
571	<	if (diskio_stats[n].disk_name != NULL)
572	<	free(diskio_stats[n].disk_name);
573	<	diskio_stats[n].disk_name = strdup(name);
571	>	if (sg_update_string(&diskio_stats[n].disk_name, name) < 0) {
572	>	goto out;
573	>	}
574		diskio_stats[n].read_bytes = rsect * 512;
575		diskio_stats[n].write_bytes = wsect * 512;
576		diskio_stats[n].systime = now;
#	Line 617 | Line 592 | diskio_stat_t *get_diskio_stats(int *entries){
592		if (f == NULL) goto out;
593		now = time(NULL);
594
595	<	line_ptr = f_read_line(f, "disk_io:");
595	>	line_ptr = sg_f_read_line(f, "disk_io:");
596		if (line_ptr == NULL) goto out;
597
598		while((line_ptr=strchr(line_ptr, ' '))!=NULL){
#	Line 689 | Line 664 | out:
664		return diskio_stats;
665		}
666
667	<	diskio_stat_t *get_diskio_stats_diff(int *entries){
668	<	static diskio_stat_t *diff = NULL;
669	<	static int diff_count = 0;
670	<	diskio_stat_t *src, *dest;
671	<	int i, j, new_count;
667	>	sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries){
668	>	VECTOR_DECLARE_STATIC(diff, sg_disk_io_stats, 1,
669	>	diskio_stat_init, diskio_stat_destroy);
670	>	sg_disk_io_stats *src = NULL, *dest;
671	>	int i, j, diff_count, new_count;
672
673		if (diskio_stats == NULL) {
674		/* No previous stats, so we can't calculate a difference. */
675	<	return get_diskio_stats(entries);
675	>	return sg_get_disk_io_stats(entries);
676		}
677
678		/* Resize the results array to match the previous stats. */
679	<	diff = diskio_stat_malloc(num_diskio, &diff_count, diff);
680	<	if (diff == NULL) {
679	>	diff_count = VECTOR_SIZE(diskio_stats);
680	>	if (VECTOR_RESIZE(diff, diff_count) < 0) {
681		return NULL;
682		}
683
#	Line 711 | Line 686 | diskio_stat_t *get_diskio_stats_diff(int *entries){
686		src = &diskio_stats[i];
687		dest = &diff[i];
688
689	<	if (dest->disk_name != NULL) {
690	<	free(dest->disk_name);
689	>	if (sg_update_string(&dest->disk_name, src->disk_name) < 0) {
690	>	return NULL;
691		}
717	–	dest->disk_name = strdup(src->disk_name);
692		dest->read_bytes = src->read_bytes;
693		dest->write_bytes = src->write_bytes;
694		dest->systime = src->systime;
695		}
696
697		/* Get a new set of stats. */
698	<	if (get_diskio_stats(&new_count) == NULL) {
698	>	if (sg_get_disk_io_stats(&new_count) == NULL) {
699		return NULL;
700		}
701

Diff Legend

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