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.39 by tdb, Mon Nov 10 21:07:04 2003 UTC vs.
Revision 1.43 by tdb, Thu Nov 20 12:13:12 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	<	#ifdef CYGWIN
43	<	#define VALID_FS_TYPES {"user"}
44	<	#else
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", \
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
#	Line 95 | 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;
104	<	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 113 | 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 136 | Line 150 | disk_stat_t *get_disk_stats(int *entries){
150		return NULL;
151		}
152		for(;nummnt--; mp++){
153	<	valid_type=0;
140	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
141	<	if(strcmp(mp->f_fstypename, fs_types[x]) ==0){
142	<	valid_type=1;
143	<	break;
144	<	}
145	<	}
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 155 | Line 163 | disk_stat_t *get_disk_stats(int *entries){
163		continue;
164		}
165
166	<	valid_type=0;
159	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
160	<	if(strcmp(mp->mnt_type, fs_types[x]) ==0){
161	<	valid_type=1;
162	<	break;
163	<	}
164	<	}
166	>	valid_type = is_valid_fs_type(mp->mnt_type);
167		#endif
168
169		#ifdef SOLARIS
#	Line 172 | 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;
176	<	for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){
177	<	if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){
178	<	valid_type=1;
179	<	break;
180	<	}
181	<	}
177	>	valid_type = is_valid_fs_type(mp.mnt_fstype);
178		#endif
179
180		if(valid_type){
#	Line 216 | 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 272 | Line 268 | disk_stat_t *get_disk_stats(int *entries){
268
269		/* If this fails, there is very little i can do about it, so
270		I'll ignore it :) */
271	<	#if defined(LINUX)
271	>	#if defined(LINUX) || defined(CYGWIN)
272		endmntent(f);
273		#endif
274		#if defined(SOLARIS)
#	Line 507 | Line 503 | diskio_stat_t *get_diskio_stats(int *entries){
503
504		if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name);
505
506	<	diskio_stats_ptr->disk_name=strdup(ksp->ks_name);
506	>	diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name));
507		diskio_stats_ptr->systime=time(NULL);
508		num_diskio++;
509		}
#	Line 649 | 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