25 |
|
#include <stdio.h> |
26 |
|
#include <stdlib.h> |
27 |
|
#include <string.h> |
28 |
+ |
#include <time.h> |
29 |
|
#include "statgrab.h" |
30 |
|
|
31 |
|
#ifdef SOLARIS |
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", \ |
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> |
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; |
100 |
< |
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 |
|
|
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 |
150 |
|
return NULL; |
151 |
|
} |
152 |
|
for(;nummnt--; mp++){ |
153 |
< |
valid_type=0; |
136 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
137 |
< |
if(strcmp(mp->f_fstypename, fs_types[x]) ==0){ |
138 |
< |
valid_type=1; |
139 |
< |
break; |
140 |
< |
} |
141 |
< |
} |
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 |
|
} |
163 |
|
continue; |
164 |
|
} |
165 |
|
|
166 |
< |
valid_type=0; |
155 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
156 |
< |
if(strcmp(mp->mnt_type, fs_types[x]) ==0){ |
157 |
< |
valid_type=1; |
158 |
< |
break; |
159 |
< |
} |
160 |
< |
} |
166 |
> |
valid_type = is_valid_fs_type(mp->mnt_type); |
167 |
|
#endif |
168 |
|
|
169 |
|
#ifdef SOLARIS |
174 |
|
if ((statvfs(mp.mnt_mountp, &fs)) !=0){ |
175 |
|
continue; |
176 |
|
} |
177 |
< |
valid_type=0; |
172 |
< |
for(x=0;x<((sizeof(fs_types))/(sizeof(char*)));x++){ |
173 |
< |
if(strcmp(mp.mnt_fstype, fs_types[x]) ==0){ |
174 |
< |
valid_type=1; |
175 |
< |
break; |
176 |
< |
} |
177 |
< |
} |
177 |
> |
valid_type = is_valid_fs_type(mp.mnt_fstype); |
178 |
|
#endif |
179 |
|
|
180 |
|
if(valid_type){ |
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 |
|
} |
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 |
|
|
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; |
339 |
|
FILE *f; |
340 |
|
char *line_ptr; |
341 |
|
int major, minor; |
336 |
– |
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; |
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 |
|
|
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 |
|
|
535 |
|
char *s; |
536 |
|
long long rsect, wsect; |
537 |
|
|
538 |
< |
int nr = sscanf(line_ptr, |
526 |
< |
" %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; |
529 |
– |
if (nr < 5) { |
530 |
– |
has_pp_stats = 0; |
531 |
– |
rsect = 0; |
532 |
– |
wsect = 0; |
533 |
– |
} |
541 |
|
|
542 |
|
/* Skip device names ending in numbers, since they're |
543 |
|
partitions. */ |
545 |
|
while (*s != '\0') s++; |
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); |