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.62 by ats, Mon Apr 5 18:10:11 2004 UTC vs.
Revision 1.66 by tdb, Wed Apr 7 19:26:16 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 47 | Line 47
47
48		#ifdef LINUX
49		#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \
50	<	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
51	<	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
52	<	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
53	<	"umsdos", "vfat", "xfs", "jfs"}
50	>	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
51	>	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
52	>	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
53	>	"umsdos", "vfat", "xfs", "jfs"}
54		#endif
55
56		#ifdef CYGWIN
#	Line 66 | Line 66
66		#include <sys/dkstat.h>
67		#include <devstat.h>
68		#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
69	<	"ufs", "mfs"}
69	>	"ufs", "mfs"}
70		#endif
71		#if defined(NETBSD) || defined(OPENBSD)
72		#include <sys/param.h>
73		#include <sys/sysctl.h>
74		#include <sys/disk.h>
75		#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
76	<	"ntfs"}
76	>	"ntfs"}
77		#endif
78
79		static void disk_stat_init(sg_fs_stats *d) {
#	Line 102 | Line 102 | static int is_valid_fs_type(const char *type) {
102
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);
105	>	disk_stat_init, disk_stat_destroy);
106
107		int valid_type;
108		int num_disks=0;
#	Line 128 | Line 128 | sg_fs_stats *sg_get_fs_stats(int *entries){
128		#ifdef ALLBSD
129		nummnt=getmntinfo(&mp , MNT_LOCAL);
130		if (nummnt<=0){
131	+	sg_set_error(SG_ERROR_GETMNTINFO, NULL);
132		return NULL;
133		}
134		for(;nummnt--; mp++){
#	Line 136 | Line 137 | sg_fs_stats *sg_get_fs_stats(int *entries){
137
138		#if defined(LINUX) || defined(CYGWIN)
139		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
140	+	sg_set_error(SG_ERROR_SETMNTENT, NULL);
141		return NULL;
142		}
143
#	Line 149 | Line 151 | sg_fs_stats *sg_get_fs_stats(int *entries){
151
152		#ifdef SOLARIS
153		if ((f=fopen("/etc/mnttab", "r" ))==NULL){
154	+	sg_set_error(SG_ERROR_OPEN, "/etc/mnttab");
155		return NULL;
156		}
157		while((getmntent(f, &mp)) == 0){
#	Line 216 | Line 219 | sg_fs_stats *sg_get_fs_stats(int *entries){
219		}
220
221		if (sg_update_string(&disk_ptr->fs_type, mp.mnt_fstype) < 0) {
222	<	return NULL;
223	<	}
222	>	return NULL;
223	>	}
224
225		if (sg_update_string(&disk_ptr->mnt_point, mp.mnt_mountp) < 0) {
226	<	return NULL;
227	<	}
226	>	return NULL;
227	>	}
228
229		disk_ptr->size = (long long)fs.f_frsize * (long long)fs.f_blocks;
230		disk_ptr->avail = (long long)fs.f_frsize * (long long)fs.f_bavail;
#	Line 238 | Line 241 | sg_fs_stats *sg_get_fs_stats(int *entries){
241		*entries=num_disks;
242
243		/* If this fails, there is very little i can do about it, so
244	<	I'll ignore it :) */
244	>	I'll ignore it :) */
245		#if defined(LINUX) || defined(CYGWIN)
246		endmntent(f);
247		#endif
#	Line 259 | Line 262 | static void diskio_stat_destroy(sg_disk_io_stats *d) {
262		}
263
264		VECTOR_DECLARE_STATIC(diskio_stats, sg_disk_io_stats, 10,
265	<	diskio_stat_init, diskio_stat_destroy);
265	>	diskio_stat_init, diskio_stat_destroy);
266
267		#ifdef LINUX
268		typedef struct {
#	Line 275 | Line 278 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
278		#endif
279
280		#ifdef SOLARIS
281	<	kstat_ctl_t *kc;
282	<	kstat_t *ksp;
281	>	kstat_ctl_t *kc;
282	>	kstat_t *ksp;
283		kstat_io_t kios;
284		#endif
285		#ifdef LINUX
#	Line 327 | Line 330 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
330
331		size = sizeof(diskcount);
332		if (sysctl(mib, MIBSIZE, &diskcount, &size, NULL, 0) < 0) {
333	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKCOUNT");
334		return NULL;
335		}
336
#	Line 334 | Line 338 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
338		mib[1] = HW_DISKNAMES;
339
340		if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
341	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
342		return NULL;
343		}
344
345	<	disknames = malloc(size);
345	>	disknames = sg_malloc(size);
346		if (disknames == NULL) {
347		return NULL;
348		}
349
350		if (sysctl(mib, MIBSIZE, disknames, &size, NULL, 0) < 0) {
351	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKNAMES");
352		return NULL;
353		}
354
355	<	dk_name = calloc(diskcount, sizeof(char *));
355	>	dk_name = sg_malloc(diskcount * sizeof(char *));
356		bufpp = disknames;
357		for (i = 0; i < diskcount && (name = strsep(&bufpp, ",")) != NULL; i++) {
358		dk_name[i] = name;
#	Line 361 | Line 367 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
367		#endif
368
369		if (sysctl(mib, MIBSIZE, NULL, &size, NULL, 0) < 0) {
370	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
371		return NULL;
372		}
373
#	Line 370 | Line 377 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
377		num_disks = size / sizeof(struct diskstats);
378		#endif
379
380	<	stats = malloc(size);
380	>	stats = sg_malloc(size);
381		if (stats == NULL) {
382		return NULL;
383		}
384
385		if (sysctl(mib, MIBSIZE, stats, &size, NULL, 0) < 0) {
386	+	sg_error(SG_ERROR_SYSCTL, "CTL_HW.HW_DISKSTATS");
387		return NULL;
388		}
389
#	Line 429 | Line 437 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
437
438		#if defined(FREEBSD) || defined(DFBSD)
439		if (!stats_init) {
440	<	stats.dinfo=malloc(sizeof(struct devinfo));
440	>	stats.dinfo=sg_malloc(sizeof(struct devinfo));
441		if(stats.dinfo==NULL) return NULL;
442		bzero(stats.dinfo, sizeof(struct devinfo));
443		stats_init = 1;
444		}
445		#ifdef FREEBSD5
446	<	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
446	>	if ((devstat_getdevs(NULL, &stats)) < 0) {
447	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
448	>	return NULL;
449	>	}
450		/* Not aware of a get all devices, so i said 999. If we ever
451		* find a machine with more than 999 disks, then i'll change
452		* this number :)
453		*/
454	<	if (devstat_selectdevs(&dev_sel, &n_selected, &n_selections, &sel_gen, stats.dinfo->generation, stats.dinfo->devices, stats.dinfo->numdevs, NULL, 0, NULL, 0, DS_SELECT_ONLY, 999, 1) < 0) return NULL;
454	>	if (devstat_selectdevs(&dev_sel, &n_selected, &n_selections, &sel_gen, stats.dinfo->generation, stats.dinfo->devices, stats.dinfo->numdevs, NULL, 0, NULL, 0, DS_SELECT_ONLY, 999, 1) < 0) {
455	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
456	>	return NULL;
457	>	}
458		#else
459	<	if ((getdevs(&stats)) < 0) return NULL;
459	>	if ((getdevs(&stats)) < 0) {
460	>	sg_set_error(SG_ERROR_DEVSTAT_GETDEVS, NULL);
461	>	return NULL;
462	>	}
463		/* Not aware of a get all devices, so i said 999. If we ever
464		* find a machine with more than 999 disks, then i'll change
465		* this number :)
466		*/
467	<	if (selectdevs(&dev_sel, &n_selected, &n_selections, &sel_gen, stats.dinfo->generation, stats.dinfo->devices, stats.dinfo->numdevs, NULL, 0, NULL, 0, DS_SELECT_ONLY, 999, 1) < 0) return NULL;
467	>	if (selectdevs(&dev_sel, &n_selected, &n_selections, &sel_gen, stats.dinfo->generation, stats.dinfo->devices, stats.dinfo->numdevs, NULL, 0, NULL, 0, DS_SELECT_ONLY, 999, 1) < 0) {
468	>	sg_set_error(SG_ERROR_DEVSTAT_SELECTDEVS, NULL);
469	>	return NULL;
470	>	}
471		#endif
472
473		for(counter=0;counter<stats.dinfo->numdevs;counter++){
#	Line 477 | Line 497 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
497		#endif
498		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
499		if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) {
500	+	sg_set_error(SG_ERROR_ASPRINTF, NULL);
501		return NULL;
502		}
503		diskio_stats_ptr->systime=time(NULL);
#	Line 488 | Line 509 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
509		#endif
510		#ifdef SOLARIS
511		if ((kc = kstat_open()) == NULL) {
512	<	return NULL;
513	<	}
512	>	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
513	>	return NULL;
514	>	}
515
516		for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
517	<	if (!strcmp(ksp->ks_class, "disk")) {
517	>	if (!strcmp(ksp->ks_class, "disk")) {
518
519		if(ksp->ks_type != KSTAT_TYPE_IO) continue;
520		/* We dont want metadevices appearins as num_diskio */
521		if(strcmp(ksp->ks_module, "md")==0) continue;
522	<	if((kstat_read(kc, ksp, &kios))==-1){
522	>	if((kstat_read(kc, ksp, &kios))==-1){
523		}
524
525		if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) {
#	Line 509 | Line 531 | sg_disk_io_stats *sg_get_disk_io_stats(int *entries){
531		diskio_stats_ptr->read_bytes=kios.nread;
532		diskio_stats_ptr->write_bytes=kios.nwritten;
533		if (sg_update_string(&diskio_stats_ptr->disk_name,
534	<	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
534	>	sg_get_svr_from_bsd(ksp->ks_name)) < 0) {
535		return NULL;
536		}
537		diskio_stats_ptr->systime=time(NULL);
#	Line 656 | Line 678 | out:
678		#endif
679
680		#ifdef CYGWIN
681	+	sg_set_error(SG_ERROR_UNSUPPORTED, "Cygwin");
682		return NULL;
683		#endif
684
#	Line 666 | Line 689 | out:
689
690		sg_disk_io_stats *sg_get_disk_io_stats_diff(int *entries){
691		VECTOR_DECLARE_STATIC(diff, sg_disk_io_stats, 1,
692	<	diskio_stat_init, diskio_stat_destroy);
692	>	diskio_stat_init, diskio_stat_destroy);
693		sg_disk_io_stats *src = NULL, *dest;
694		int i, j, diff_count, new_count;
695

Diff Legend

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