| 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 |
> |
#define VALID_FS_TYPES {"adfs", "affs", "befs", "bfs", "efs", "ext2", \ |
| 43 |
> |
"ext3", "vxfs", "hfs", "hfsplus", "hpfs", "jffs", \ |
| 44 |
> |
"jffs2", "minix", "msdos", "ntfs", "qnx4", "ramfs", \ |
| 45 |
> |
"rootfs", "reiserfs", "sysv", "v7", "udf", "ufs", \ |
| 46 |
> |
"umsdos", "vfat", "xfs", "jfs"} |
| 47 |
|
#endif |
| 48 |
|
|
| 49 |
|
#ifdef ALLBSD |
| 50 |
|
#include <sys/param.h> |
| 51 |
|
#include <sys/ucred.h> |
| 52 |
|
#include <sys/mount.h> |
| 49 |
– |
#define VALID_FS_TYPES {"ufs", "mfs", "ffs"} |
| 53 |
|
#endif |
| 54 |
|
#ifdef FREEBSD |
| 55 |
|
#include <sys/dkstat.h> |
| 56 |
|
#include <devstat.h> |
| 57 |
+ |
#define VALID_FS_TYPES {"hpfs", "msdosfs", "ntfs", "udf", "ext2fs", \ |
| 58 |
+ |
"ufs", "mfs"} |
| 59 |
|
#endif |
| 60 |
+ |
#ifdef NETBSD |
| 61 |
+ |
#include <sys/param.h> |
| 62 |
+ |
#include <sys/sysctl.h> |
| 63 |
+ |
#include <sys/disk.h> |
| 64 |
+ |
#define VALID_FS_TYPES {"ffs", "mfs", "msdos", "lfs", "adosfs", "ext2fs", \ |
| 65 |
+ |
"ntfs"} |
| 66 |
+ |
#endif |
| 67 |
|
|
| 68 |
|
#define START_VAL 1 |
| 69 |
|
|
| 322 |
|
diskio_stat_t *get_diskio_stats(int *entries){ |
| 323 |
|
|
| 324 |
|
static int sizeof_diskio_stats=0; |
| 325 |
+ |
#ifndef LINUX |
| 326 |
|
diskio_stat_t *diskio_stats_ptr; |
| 327 |
+ |
#endif |
| 328 |
|
|
| 329 |
|
#ifdef SOLARIS |
| 330 |
|
kstat_ctl_t *kc; |
| 335 |
|
FILE *f; |
| 336 |
|
char *line_ptr; |
| 337 |
|
int major, minor; |
| 324 |
– |
char dev_letter; |
| 338 |
|
int has_pp_stats = 1; |
| 339 |
|
static partition *parts = NULL; |
| 340 |
|
static int alloc_parts = 0; |
| 341 |
|
int i, n; |
| 342 |
|
time_t now; |
| 343 |
+ |
const char *format; |
| 344 |
|
#endif |
| 345 |
|
#ifdef FREEBSD |
| 346 |
|
static struct statinfo stats; |
| 352 |
|
struct devstat *dev_ptr; |
| 353 |
|
#endif |
| 354 |
|
#ifdef NETBSD |
| 355 |
< |
/* FIXME get_diskio_stats NYI on NetBSD. |
| 356 |
< |
* See vmstat/dkstats.c in NetBSD source for examples. |
| 357 |
< |
*/ |
| 355 |
> |
struct disk_sysctl *stats; |
| 356 |
> |
int num_disks, i; |
| 357 |
> |
int mib[3]; |
| 358 |
> |
size_t size; |
| 359 |
|
#endif |
| 360 |
+ |
|
| 361 |
|
num_diskio=0; |
| 362 |
|
|
| 363 |
+ |
#ifdef NETBSD |
| 364 |
+ |
mib[0] = CTL_HW; |
| 365 |
+ |
mib[1] = HW_DISKSTATS; |
| 366 |
+ |
mib[2] = sizeof(struct disk_sysctl); |
| 367 |
+ |
|
| 368 |
+ |
if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) { |
| 369 |
+ |
return NULL; |
| 370 |
+ |
} |
| 371 |
+ |
num_disks = size / sizeof(struct disk_sysctl); |
| 372 |
+ |
|
| 373 |
+ |
stats = malloc(size); |
| 374 |
+ |
if (stats == NULL) { |
| 375 |
+ |
return NULL; |
| 376 |
+ |
} |
| 377 |
+ |
|
| 378 |
+ |
if (sysctl(mib, 3, stats, &size, NULL, 0) < 0) { |
| 379 |
+ |
return NULL; |
| 380 |
+ |
} |
| 381 |
+ |
|
| 382 |
+ |
for (i = 0; i < num_disks; i++) { |
| 383 |
+ |
u_int64_t rbytes, wbytes; |
| 384 |
+ |
|
| 385 |
+ |
#ifdef HAVE_DK_RBYTES |
| 386 |
+ |
rbytes = stats[i].dk_rbytes; |
| 387 |
+ |
wbytes = stats[i].dk_wbytes; |
| 388 |
+ |
#else |
| 389 |
+ |
/* Before 1.7, NetBSD merged reads and writes. */ |
| 390 |
+ |
rbytes = wbytes = stats[i].dk_bytes; |
| 391 |
+ |
#endif |
| 392 |
+ |
|
| 393 |
+ |
/* Don't keep stats for disks that have never been used. */ |
| 394 |
+ |
if (rbytes == 0 && wbytes == 0) { |
| 395 |
+ |
continue; |
| 396 |
+ |
} |
| 397 |
+ |
|
| 398 |
+ |
diskio_stats = diskio_stat_malloc(num_diskio + 1, |
| 399 |
+ |
&sizeof_diskio_stats, |
| 400 |
+ |
diskio_stats); |
| 401 |
+ |
if (diskio_stats == NULL) { |
| 402 |
+ |
return NULL; |
| 403 |
+ |
} |
| 404 |
+ |
diskio_stats_ptr = diskio_stats + num_diskio; |
| 405 |
+ |
|
| 406 |
+ |
diskio_stats_ptr->read_bytes = rbytes; |
| 407 |
+ |
diskio_stats_ptr->write_bytes = wbytes; |
| 408 |
+ |
if (diskio_stats_ptr->disk_name != NULL) { |
| 409 |
+ |
free(diskio_stats_ptr->disk_name); |
| 410 |
+ |
} |
| 411 |
+ |
diskio_stats_ptr->disk_name = strdup(stats[i].dk_name); |
| 412 |
+ |
diskio_stats_ptr->systime = time(NULL); |
| 413 |
+ |
|
| 414 |
+ |
num_diskio++; |
| 415 |
+ |
} |
| 416 |
+ |
|
| 417 |
+ |
free(stats); |
| 418 |
+ |
#endif |
| 419 |
+ |
|
| 420 |
|
#ifdef FREEBSD |
| 421 |
|
if (!stats_init) { |
| 422 |
|
stats.dinfo=malloc(sizeof(struct devinfo)); |
| 350 |
– |
bzero(stats.dinfo, sizeof(struct devinfo)); |
| 423 |
|
if(stats.dinfo==NULL) return NULL; |
| 424 |
+ |
bzero(stats.dinfo, sizeof(struct devinfo)); |
| 425 |
|
stats_init = 1; |
| 426 |
|
} |
| 427 |
|
#ifdef FREEBSD5 |
| 513 |
|
n = 0; |
| 514 |
|
|
| 515 |
|
/* Read /proc/partitions to find what devices exist. Recent 2.4 kernels |
| 516 |
< |
have statistics in here too, so we can use those directly. */ |
| 516 |
> |
have statistics in here too, so we can use those directly. |
| 517 |
> |
2.6 kernels have /proc/diskstats instead with almost (but not quite) |
| 518 |
> |
the same format. */ |
| 519 |
|
|
| 520 |
< |
f = fopen("/proc/partitions", "r"); |
| 520 |
> |
f = fopen("/proc/diskstats", "r"); |
| 521 |
> |
format = " %d %d %19s %*d %*d %lld %*d %*d %*d %lld"; |
| 522 |
> |
if (f == NULL) { |
| 523 |
> |
f = fopen("/proc/partitions", "r"); |
| 524 |
> |
format = " %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld"; |
| 525 |
> |
} |
| 526 |
|
if (f == NULL) goto out; |
| 527 |
|
now = time(NULL); |
| 528 |
|
|
| 531 |
|
char *s; |
| 532 |
|
long long rsect, wsect; |
| 533 |
|
|
| 534 |
< |
int nr = sscanf(line_ptr, |
| 455 |
< |
" %d %d %*d %19s %*d %*d %lld %*d %*d %*d %lld", |
| 534 |
> |
int nr = sscanf(line_ptr, format, |
| 535 |
|
&major, &minor, name, &rsect, &wsect); |
| 536 |
|
if (nr < 3) continue; |
| 458 |
– |
if (nr < 5) { |
| 459 |
– |
has_pp_stats = 0; |
| 460 |
– |
rsect = 0; |
| 461 |
– |
wsect = 0; |
| 462 |
– |
} |
| 537 |
|
|
| 538 |
|
/* Skip device names ending in numbers, since they're |
| 539 |
|
partitions. */ |
| 541 |
|
while (*s != '\0') s++; |
| 542 |
|
--s; |
| 543 |
|
if (*s >= '0' && *s <= '9') continue; |
| 544 |
+ |
|
| 545 |
+ |
if (nr < 5) { |
| 546 |
+ |
has_pp_stats = 0; |
| 547 |
+ |
rsect = 0; |
| 548 |
+ |
wsect = 0; |
| 549 |
+ |
} |
| 550 |
|
|
| 551 |
|
diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats, |
| 552 |
|
diskio_stats); |
