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.20 by ats, Thu Aug 28 23:05:56 2003 UTC vs.
Revision 1.42 by ats, Wed Nov 12 01:36:19 2003 UTC

#	Line 25 | Line 25
25		#include <stdio.h>
26		#include <stdlib.h>
27		#include <string.h>
28	+	#include <time.h>
29		#include "statgrab.h"
30
31		#ifdef SOLARIS
#	Line 34 | Line 35
35		#define VALID_FS_TYPES {"ufs", "tmpfs"}
36		#endif
37
38	<	#ifdef LINUX
38	<	#include <sys/vfs.h>
38	>	#if defined(LINUX) || defined(CYGWIN)
39		#include <mntent.h>
40	+	#include <sys/vfs.h>
41		#include "tools.h"
41	–	#define VALID_FS_TYPES {"ext2", "ext3", "xfs", "reiserfs", "vfat", "tmpfs"}
42		#endif
43
44	<	#ifdef FREEBSD
44	>	#ifdef LINUX
45	>	#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \
46	>	"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \
47	>	"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \
48	>	"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \
49	>	"umsdos", "vfat", "xfs", "jfs"}
50	>	#endif
51	>
52	>	#ifdef CYGWIN
53	>	#define VALID_FS_TYPES {"user"}
54	>	#endif
55	>
56	>	#ifdef ALLBSD
57		#include <sys/param.h>
58		#include <sys/ucred.h>
59		#include <sys/mount.h>
60	+	#endif
61	+	#ifdef FREEBSD
62		#include <sys/dkstat.h>
63		#include <devstat.h>
64	<	#define VALID_FS_TYPES {"ufs", "mfs"}
64	>	#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \
65	>	"ufs", "mfs"}
66		#endif
67	+	#ifdef NETBSD
68	+	#include <sys/param.h>
69	+	#include <sys/sysctl.h>
70	+	#include <sys/disk.h>
71	+	#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \
72	+	"ntfs"}
73	+	#endif
74	+
75		#define START_VAL 1
76
77		char *copy_string(char *orig_ptr, const char *newtext){
#	Line 75 | Line 98 | void init_disk_stat(int start, int end, disk_stat_t *d
98		}
99		}
100
101	+	int is_valid_fs_type(const char *type) {
102	+	const char *types[] = VALID_FS_TYPES;
103	+	int i;
104	+
105	+	for (i = 0; i < (sizeof types / sizeof *types); i++) {
106	+	if (strcmp(types[i], type) == 0) {
107	+	return 1;
108	+	}
109	+	}
110	+	return 0;
111	+	}
112	+
113		disk_stat_t *get_disk_stats(int *entries){
114
115		static disk_stat_t *disk_stats;
116		static int watermark=-1;
117
118	<	char *fs_types[] = VALID_FS_TYPES;
84	<	int x, valid_type;
118	>	int valid_type;
119		int num_disks=0;
120	<	#if defined(LINUX) || defined (SOLARIS)
120	>	#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN)
121		FILE *f;
122		#endif
123
#	Line 93 | Line 127 | disk_stat_t *get_disk_stats(int *entries){
127		struct mnttab mp;
128		struct statvfs fs;
129		#endif
130	<	#ifdef LINUX
130	>	#if defined(LINUX) || defined(CYGWIN)
131		struct mntent *mp;
132		struct statfs fs;
133		#endif
134	<	#ifdef FREEBSD
134	>	#ifdef ALLBSD
135		int nummnt;
136		struct statfs *mp;
137		#endif
#	Line 110 | Line 144 | disk_stat_t *get_disk_stats(int *entries){
144		watermark=START_VAL;
145		init_disk_stat(0, watermark-1, disk_stats);
146		}
147	<	#ifdef FREEBSD
147	>	#ifdef ALLBSD
148		nummnt=getmntinfo(&mp , MNT_LOCAL);
149		if (nummnt<=0){
150		return NULL;
151		}
152		for(;nummnt--; mp++){
153	<	valid_type=0;
120	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
121	<	if(strcmp(mp->f_fstypename, fs_types[x]) ==0){
122	<	valid_type=1;
123	<	break;
124	<	}
125	<	}
153	>	valid_type = is_valid_fs_type(mp->f_fstypename);
154		#endif
155
156	<	#ifdef LINUX
156	>	#if defined(LINUX) || defined(CYGWIN)
157		if ((f=setmntent("/etc/mtab", "r" ))==NULL){
158		return NULL;
159		}
#	Line 135 | Line 163 | disk_stat_t *get_disk_stats(int *entries){
163		continue;
164		}
165
166	<	valid_type=0;
139	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
140	<	if(strcmp(mp->mnt_type, fs_types[x]) ==0){
141	<	valid_type=1;
142	<	break;
143	<	}
144	<	}
166	>	valid_type = is_valid_fs_type(mp->mnt_type);
167		#endif
168
169		#ifdef SOLARIS
#	Line 152 | Line 174 | disk_stat_t *get_disk_stats(int *entries){
174		if ((statvfs(mp.mnt_mountp, &fs)) !=0){
175		continue;
176		}
177	<	valid_type=0;
156	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
157	<	if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){
158	<	valid_type=1;
159	<	break;
160	<	}
161	<	}
177	>	valid_type = is_valid_fs_type(mp.mnt_fstype);
178		#endif
179
180		if(valid_type){
#	Line 174 | Line 190 | disk_stat_t *get_disk_stats(int *entries){
190		}
191
192		disk_ptr=disk_stats+num_disks;
193	<	#ifdef FREEBSD
193	>	#ifdef ALLBSD
194		if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){
195		return NULL;
196		}
#	Line 196 | Line 212 | disk_stat_t *get_disk_stats(int *entries){
212		/* Freebsd doesn't have a "available" inodes */
213		disk_ptr->used_inodes=disk_ptr->total_inodes-disk_ptr->free_inodes;
214		#endif
215	<	#ifdef LINUX
215	>	#if defined(LINUX) || defined(CYGWIN)
216		if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->mnt_fsname))==NULL){
217		return NULL;
218		}
#	Line 250 | Line 266 | disk_stat_t *get_disk_stats(int *entries){
266
267		*entries=num_disks;
268
269	<	/* If this fails, there is very little i can do about it, so i'll ignore it :) */
270	<	#if defined(LINUX) || defined(SOLARIS)
269	>	/* If this fails, there is very little i can do about it, so
270	>	I'll ignore it :) */
271	>	#if defined(LINUX) || defined(CYGWIN)
272	>	endmntent(f);
273	>	#endif
274	>	#if defined(SOLARIS)
275		fclose(f);
276		#endif
277
#	Line 306 | Line 326 | typedef struct {
326		diskio_stat_t *get_diskio_stats(int *entries){
327
328		static int sizeof_diskio_stats=0;
329	+	#ifndef LINUX
330		diskio_stat_t *diskio_stats_ptr;
331	+	#endif
332
333		#ifdef SOLARIS
334		kstat_ctl_t *kc;
#	Line 317 | Line 339 | diskio_stat_t *get_diskio_stats(int *entries){
339		FILE *f;
340		char *line_ptr;
341		int major, minor;
320	–	char dev_letter;
342		int has_pp_stats = 1;
343		static partition *parts = NULL;
344		static int alloc_parts = 0;
345		int i, n;
346		time_t now;
347	+	const char *format;
348		#endif
349		#ifdef FREEBSD
350	<	struct statinfo stats;
350	>	static struct statinfo stats;
351	>	static int stats_init = 0;
352		int counter;
353		struct device_selection *dev_sel = NULL;
354		int n_selected, n_selections;
355		long sel_gen;
356		struct devstat *dev_ptr;
357		#endif
358	+	#ifdef NETBSD
359	+	struct disk_sysctl *stats;
360	+	int num_disks, i;
361	+	int mib[3];
362	+	size_t size;
363	+	#endif
364	+
365		num_diskio=0;
366
367	+	#ifdef NETBSD
368	+	mib[0] = CTL_HW;
369	+	mib[1] = HW_DISKSTATS;
370	+	mib[2] = sizeof(struct disk_sysctl);
371	+
372	+	if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
373	+	return NULL;
374	+	}
375	+	num_disks = size / sizeof(struct disk_sysctl);
376	+
377	+	stats = malloc(size);
378	+	if (stats == NULL) {
379	+	return NULL;
380	+	}
381	+
382	+	if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) {
383	+	return NULL;
384	+	}
385	+
386	+	for (i = 0; i < num_disks; i++) {
387	+	u_int64_t rbytes, wbytes;
388	+
389	+	#ifdef HAVE_DK_RBYTES
390	+	rbytes = stats[i].dk_rbytes;
391	+	wbytes = stats[i].dk_wbytes;
392	+	#else
393	+	/* Before 1.7, NetBSD merged reads and writes. */
394	+	rbytes = wbytes = stats[i].dk_bytes;
395	+	#endif
396	+
397	+	/* Don't keep stats for disks that have never been used. */
398	+	if (rbytes == 0 && wbytes == 0) {
399	+	continue;
400	+	}
401	+
402	+	diskio_stats = diskio_stat_malloc(num_diskio + 1,
403	+	&sizeof_diskio_stats,
404	+	diskio_stats);
405	+	if (diskio_stats == NULL) {
406	+	return NULL;
407	+	}
408	+	diskio_stats_ptr = diskio_stats + num_diskio;
409	+
410	+	diskio_stats_ptr->read_bytes = rbytes;
411	+	diskio_stats_ptr->write_bytes = wbytes;
412	+	if (diskio_stats_ptr->disk_name != NULL) {
413	+	free(diskio_stats_ptr->disk_name);
414	+	}
415	+	diskio_stats_ptr->disk_name = strdup(stats[i].dk_name);
416	+	diskio_stats_ptr->systime = time(NULL);
417	+
418	+	num_diskio++;
419	+	}
420	+
421	+	free(stats);
422	+	#endif
423	+
424		#ifdef FREEBSD
425	<	stats.dinfo=malloc(sizeof(struct devinfo));
426	<	if(stats.dinfo==NULL) return NULL;
425	>	if (!stats_init) {
426	>	stats.dinfo=malloc(sizeof(struct devinfo));
427	>	if(stats.dinfo==NULL) return NULL;
428	>	bzero(stats.dinfo, sizeof(struct devinfo));
429	>	stats_init = 1;
430	>	}
431	>	#ifdef FREEBSD5
432	>	if ((devstat_getdevs(NULL, &stats)) < 0) return NULL;
433	>	/* Not aware of a get all devices, so i said 999. If we ever
434	>	* find a machine with more than 999 disks, then i'll change
435	>	* this number :)
436	>	*/
437	>	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;
438	>	#else
439		if ((getdevs(&stats)) < 0) return NULL;
440		/* Not aware of a get all devices, so i said 999. If we ever
441		* find a machine with more than 999 disks, then i'll change
442		* this number :)
443		*/
444		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;
445	+	#endif
446
447		for(counter=0;counter<stats.dinfo->numdevs;counter++){
448		dev_ptr=&stats.dinfo->devices[dev_sel[counter].position];
#	Line 351 | Line 451 | diskio_stat_t *get_diskio_stats(int *entries){
451		* devices.. like mem, proc.. and also doesn't report floppy
452		* drives etc unless they are doing stuff :)
453		*/
454	+	#ifdef FREEBSD5
455	+	if((dev_ptr->bytes[DEVSTAT_READ]==0) && (dev_ptr->bytes[DEVSTAT_WRITE]==0)) continue;
456	+	#else
457		if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue;
458	+	#endif
459		if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){
460		return NULL;
461		}
462		diskio_stats_ptr=diskio_stats+num_diskio;
463	<
463	>
464	>	#ifdef FREEBSD5
465	>	diskio_stats_ptr->read_bytes=dev_ptr->bytes[DEVSTAT_READ];
466	>	diskio_stats_ptr->write_bytes=dev_ptr->bytes[DEVSTAT_WRITE];
467	>	#else
468		diskio_stats_ptr->read_bytes=dev_ptr->bytes_read;
469		diskio_stats_ptr->write_bytes=dev_ptr->bytes_written;
470	+	#endif
471		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
472		asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number);
473		diskio_stats_ptr->systime=time(NULL);
#	Line 366 | Line 475 | diskio_stat_t *get_diskio_stats(int *entries){
475		num_diskio++;
476		}
477		free(dev_sel);
369	–	free(stats.dinfo);
478
479		#endif
480		#ifdef SOLARIS
#	Line 409 | Line 517 | diskio_stat_t *get_diskio_stats(int *entries){
517		n = 0;
518
519		/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels
520	<	have statistics in here too, so we can use those directly. */
520	>	have statistics in here too, so we can use those directly.
521	>	2.6 kernels have /proc/diskstats instead with almost (but not quite)
522	>	the same format. */
523
524	<	f = fopen("/proc/partitions", "r");
524	>	f = fopen("/proc/diskstats", "r");
525	>	format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld";
526	>	if (f == NULL) {
527	>	f = fopen("/proc/partitions", "r");
528	>	format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld";
529	>	}
530		if (f == NULL) goto out;
531		now = time(NULL);
532
#	Line 420 | Line 535 | diskio_stat_t *get_diskio_stats(int *entries){
535		char *s;
536		long long rsect, wsect;
537
538	<	int nr = sscanf(line_ptr,
424	<	" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld",
538	>	int nr = sscanf(line_ptr, format,
539		&major, &minor, name, &rsect, &wsect);
540		if (nr < 3) continue;
427	–	if (nr < 5) {
428	–	has_pp_stats = 0;
429	–	rsect = 0;
430	–	wsect = 0;
431	–	}
541
542		/* Skip device names ending in numbers, since they're
543		partitions. */
#	Line 437 | Line 546 | diskio_stat_t *get_diskio_stats(int *entries){
546		--s;
547		if (*s >= '0' && *s <= '9') continue;
548
549	+	if (nr < 5) {
550	+	has_pp_stats = 0;
551	+	rsect = 0;
552	+	wsect = 0;
553	+	}
554	+
555		diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats,
556		diskio_stats);
557		if (diskio_stats == NULL) goto out;
#	Line 530 | Line 645 | diskio_stat_t *get_diskio_stats(int *entries){
645		num_diskio = n;
646		out:
647		if (f != NULL) fclose(f);
648	+	#endif
649
650	+	#ifdef CYGWIN
651	+	return NULL;
652		#endif
653	+
654		*entries=num_diskio;
655
656		return diskio_stats;

Diff Legend

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