35 |
|
#endif |
36 |
|
|
37 |
|
#ifdef LINUX |
38 |
+ |
#include <time.h> |
39 |
|
#include <sys/vfs.h> |
40 |
|
#include <mntent.h> |
41 |
|
#include "tools.h" |
42 |
< |
#define VALID_FS_TYPES {"ext2", "ext3", "xfs", "reiserfs", "vfat", "tmpfs"} |
42 |
> |
#ifdef CYGWIN |
43 |
> |
#define VALID_FS_TYPES {"user"} |
44 |
> |
#else |
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 |
+ |
#endif |
52 |
|
|
53 |
< |
#ifdef FREEBSD |
53 |
> |
#ifdef ALLBSD |
54 |
|
#include <sys/param.h> |
55 |
|
#include <sys/ucred.h> |
56 |
|
#include <sys/mount.h> |
57 |
+ |
#endif |
58 |
+ |
#ifdef FREEBSD |
59 |
|
#include <sys/dkstat.h> |
60 |
|
#include <devstat.h> |
61 |
< |
#define VALID_FS_TYPES {"ufs", "mfs"} |
61 |
> |
#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ |
62 |
> |
"ufs", "mfs"} |
63 |
|
#endif |
64 |
+ |
#ifdef NETBSD |
65 |
+ |
#include <sys/param.h> |
66 |
+ |
#include <sys/sysctl.h> |
67 |
+ |
#include <sys/disk.h> |
68 |
+ |
#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \ |
69 |
+ |
"ntfs"} |
70 |
+ |
#endif |
71 |
+ |
|
72 |
|
#define START_VAL 1 |
73 |
|
|
74 |
|
char *copy_string(char *orig_ptr, const char *newtext){ |
117 |
|
struct mntent *mp; |
118 |
|
struct statfs fs; |
119 |
|
#endif |
120 |
< |
#ifdef FREEBSD |
120 |
> |
#ifdef ALLBSD |
121 |
|
int nummnt; |
122 |
|
struct statfs *mp; |
123 |
|
#endif |
130 |
|
watermark=START_VAL; |
131 |
|
init_disk_stat(0, watermark-1, disk_stats); |
132 |
|
} |
133 |
< |
#ifdef FREEBSD |
133 |
> |
#ifdef ALLBSD |
134 |
|
nummnt=getmntinfo(&mp , MNT_LOCAL); |
135 |
|
if (nummnt<=0){ |
136 |
|
return NULL; |
194 |
|
} |
195 |
|
|
196 |
|
disk_ptr=disk_stats+num_disks; |
197 |
< |
#ifdef FREEBSD |
197 |
> |
#ifdef ALLBSD |
198 |
|
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){ |
199 |
|
return NULL; |
200 |
|
} |
270 |
|
|
271 |
|
*entries=num_disks; |
272 |
|
|
273 |
< |
/* If this fails, there is very little i can do about it, so i'll ignore it :) */ |
274 |
< |
#if defined(LINUX) || defined(SOLARIS) |
273 |
> |
/* If this fails, there is very little i can do about it, so |
274 |
> |
I'll ignore it :) */ |
275 |
> |
#if defined(LINUX) |
276 |
> |
endmntent(f); |
277 |
> |
#endif |
278 |
> |
#if defined(SOLARIS) |
279 |
|
fclose(f); |
280 |
|
#endif |
281 |
|
|
330 |
|
diskio_stat_t *get_diskio_stats(int *entries){ |
331 |
|
|
332 |
|
static int sizeof_diskio_stats=0; |
333 |
+ |
#ifndef LINUX |
334 |
|
diskio_stat_t *diskio_stats_ptr; |
335 |
+ |
#endif |
336 |
|
|
337 |
|
#ifdef SOLARIS |
338 |
|
kstat_ctl_t *kc; |
343 |
|
FILE *f; |
344 |
|
char *line_ptr; |
345 |
|
int major, minor; |
320 |
– |
char dev_letter; |
346 |
|
int has_pp_stats = 1; |
347 |
|
static partition *parts = NULL; |
348 |
|
static int alloc_parts = 0; |
349 |
|
int i, n; |
350 |
|
time_t now; |
351 |
+ |
const char *format; |
352 |
|
#endif |
353 |
|
#ifdef FREEBSD |
354 |
|
static struct statinfo stats; |
359 |
|
long sel_gen; |
360 |
|
struct devstat *dev_ptr; |
361 |
|
#endif |
362 |
+ |
#ifdef NETBSD |
363 |
+ |
struct disk_sysctl *stats; |
364 |
+ |
int num_disks, i; |
365 |
+ |
int mib[3]; |
366 |
+ |
size_t size; |
367 |
+ |
#endif |
368 |
+ |
|
369 |
|
num_diskio=0; |
370 |
|
|
371 |
+ |
#ifdef NETBSD |
372 |
+ |
mib[0] = CTL_HW; |
373 |
+ |
mib[1] = HW_DISKSTATS; |
374 |
+ |
mib[2] = sizeof(struct disk_sysctl); |
375 |
+ |
|
376 |
+ |
if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
377 |
+ |
return NULL; |
378 |
+ |
} |
379 |
+ |
num_disks = size / sizeof(struct disk_sysctl); |
380 |
+ |
|
381 |
+ |
stats = malloc(size); |
382 |
+ |
if (stats == NULL) { |
383 |
+ |
return NULL; |
384 |
+ |
} |
385 |
+ |
|
386 |
+ |
if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) { |
387 |
+ |
return NULL; |
388 |
+ |
} |
389 |
+ |
|
390 |
+ |
for (i = 0; i < num_disks; i++) { |
391 |
+ |
u_int64_t rbytes, wbytes; |
392 |
+ |
|
393 |
+ |
#ifdef HAVE_DK_RBYTES |
394 |
+ |
rbytes = stats[i].dk_rbytes; |
395 |
+ |
wbytes = stats[i].dk_wbytes; |
396 |
+ |
#else |
397 |
+ |
/* Before 1.7, NetBSD merged reads and writes. */ |
398 |
+ |
rbytes = wbytes = stats[i].dk_bytes; |
399 |
+ |
#endif |
400 |
+ |
|
401 |
+ |
/* Don't keep stats for disks that have never been used. */ |
402 |
+ |
if (rbytes == 0 && wbytes == 0) { |
403 |
+ |
continue; |
404 |
+ |
} |
405 |
+ |
|
406 |
+ |
diskio_stats = diskio_stat_malloc(num_diskio + 1, |
407 |
+ |
&sizeof_diskio_stats, |
408 |
+ |
diskio_stats); |
409 |
+ |
if (diskio_stats == NULL) { |
410 |
+ |
return NULL; |
411 |
+ |
} |
412 |
+ |
diskio_stats_ptr = diskio_stats + num_diskio; |
413 |
+ |
|
414 |
+ |
diskio_stats_ptr->read_bytes = rbytes; |
415 |
+ |
diskio_stats_ptr->write_bytes = wbytes; |
416 |
+ |
if (diskio_stats_ptr->disk_name != NULL) { |
417 |
+ |
free(diskio_stats_ptr->disk_name); |
418 |
+ |
} |
419 |
+ |
diskio_stats_ptr->disk_name = strdup(stats[i].dk_name); |
420 |
+ |
diskio_stats_ptr->systime = time(NULL); |
421 |
+ |
|
422 |
+ |
num_diskio++; |
423 |
+ |
} |
424 |
+ |
|
425 |
+ |
free(stats); |
426 |
+ |
#endif |
427 |
+ |
|
428 |
|
#ifdef FREEBSD |
429 |
|
if (!stats_init) { |
430 |
|
stats.dinfo=malloc(sizeof(struct devinfo)); |
341 |
– |
bzero(stats.dinfo, sizeof(struct devinfo)); |
431 |
|
if(stats.dinfo==NULL) return NULL; |
432 |
+ |
bzero(stats.dinfo, sizeof(struct devinfo)); |
433 |
|
stats_init = 1; |
434 |
|
} |
435 |
|
#ifdef FREEBSD5 |
436 |
|
if ((devstat_getdevs(NULL, &stats)) < 0) return NULL; |
437 |
< |
/* Not aware of a get all devices, so i said 999. If we ever * find a machine with more than 999 disks, then i'll change * this number :) */ |
437 |
> |
/* Not aware of a get all devices, so i said 999. If we ever |
438 |
> |
* find a machine with more than 999 disks, then i'll change |
439 |
> |
* this number :) |
440 |
> |
*/ |
441 |
|
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; |
442 |
|
#else |
443 |
|
if ((getdevs(&stats)) < 0) return NULL; |
521 |
|
n = 0; |
522 |
|
|
523 |
|
/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels |
524 |
< |
have statistics in here too, so we can use those directly. */ |
524 |
> |
have statistics in here too, so we can use those directly. |
525 |
> |
2.6 kernels have /proc/diskstats instead with almost (but not quite) |
526 |
> |
the same format. */ |
527 |
|
|
528 |
< |
f = fopen("/proc/partitions", "r"); |
528 |
> |
f = fopen("/proc/diskstats", "r"); |
529 |
> |
format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld"; |
530 |
> |
if (f == NULL) { |
531 |
> |
f = fopen("/proc/partitions", "r"); |
532 |
> |
format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld"; |
533 |
> |
} |
534 |
|
if (f == NULL) goto out; |
535 |
|
now = time(NULL); |
536 |
|
|
539 |
|
char *s; |
540 |
|
long long rsect, wsect; |
541 |
|
|
542 |
< |
int nr = sscanf(line_ptr, |
443 |
< |
" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld", |
542 |
> |
int nr = sscanf(line_ptr, format, |
543 |
|
&major, &minor, name, &rsect, &wsect); |
544 |
|
if (nr < 3) continue; |
446 |
– |
if (nr < 5) { |
447 |
– |
has_pp_stats = 0; |
448 |
– |
rsect = 0; |
449 |
– |
wsect = 0; |
450 |
– |
} |
545 |
|
|
546 |
|
/* Skip device names ending in numbers, since they're |
547 |
|
partitions. */ |
549 |
|
while (*s != '\0') s++; |
550 |
|
--s; |
551 |
|
if (*s >= '0' && *s <= '9') continue; |
552 |
+ |
|
553 |
+ |
if (nr < 5) { |
554 |
+ |
has_pp_stats = 0; |
555 |
+ |
rsect = 0; |
556 |
+ |
wsect = 0; |
557 |
+ |
} |
558 |
|
|
559 |
|
diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats, |
560 |
|
diskio_stats); |