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.35 by ats, Sun Oct 19 21:06:55 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 <time.h>
39	<	#include <sys/vfs.h>
38	>	#if defined(LINUX) || defined(CYGWIN)
39		#include <mntent.h>
40	+	#include <sys/vfs.h>
41		#include "tools.h"
42	+	#endif
43	+
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", \
#	Line 46 | Line 49
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>
#	Line 54 | Line 61
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>
#	Line 90 | 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;
99	<	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 108 | 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
#	Line 131 | Line 150 | disk_stat_t *get_disk_stats(int *entries){
150		return NULL;
151		}
152		for(;nummnt--; mp++){
153	<	valid_type=0;
135	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
136	<	if(strcmp(mp->f_fstypename, fs_types[x]) ==0){
137	<	valid_type=1;
138	<	break;
139	<	}
140	<	}
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 150 | Line 163 | disk_stat_t *get_disk_stats(int *entries){
163		continue;
164		}
165
166	<	valid_type=0;
154	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
155	<	if(strcmp(mp->mnt_type, fs_types[x]) ==0){
156	<	valid_type=1;
157	<	break;
158	<	}
159	<	}
166	>	valid_type = is_valid_fs_type(mp->mnt_type);
167		#endif
168
169		#ifdef SOLARIS
#	Line 167 | 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;
171	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
172	<	if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){
173	<	valid_type=1;
174	<	break;
175	<	}
176	<	}
177	>	valid_type = is_valid_fs_type(mp.mnt_fstype);
178		#endif
179
180		if(valid_type){
#	Line 211 | 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 265 | 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 321 | 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 332 | Line 339 | diskio_stat_t *get_diskio_stats(int *entries){
339		FILE *f;
340		char *line_ptr;
341		int major, minor;
335	–	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		static struct statinfo stats;
#	Line 383 | Line 390 | diskio_stat_t *get_diskio_stats(int *entries){
390		rbytes = stats[i].dk_rbytes;
391		wbytes = stats[i].dk_wbytes;
392		#else
393	<	/* Before 1.6.1, NetBSD merged reads and writes. */
393	>	/* Before 1.7, NetBSD merged reads and writes. */
394		rbytes = wbytes = stats[i].dk_bytes;
395		#endif
396
#	Line 510 | 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 521 | 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,
525	<	" %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;
528	–	if (nr < 5) {
529	–	has_pp_stats = 0;
530	–	rsect = 0;
531	–	wsect = 0;
532	–	}
541
542		/* Skip device names ending in numbers, since they're
543		partitions. */
#	Line 538 | 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 631 | 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