bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'SIGAR-164' into sigar-1.6

This commit is contained in:
Doug MacEachern 2009-07-18 18:44:10 -07:00
parent 8cef393365 ceab542f7b
commit ab8759261e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/aix/aix_sigar.c
View File

@ -1247,7 +1247,7 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
SIGAR_SSTRCPY(id.name, name); SIGAR_SSTRCPY(id.name, name);
if (perfstat_disk(&id, &disk, sizeof(disk), 1) != 1) { if (perfstat_disk(&id, &disk, sizeof(disk), 1) != 1) {
return ENOENT; return ENXIO;
} }
usage->reads = disk.rblks; usage->reads = disk.rblks;

2
src/os/darwin/darwin_sigar.c
View File

@ -2137,7 +2137,7 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
SIGAR_DISK_STATS_INIT(disk); SIGAR_DISK_STATS_INIT(disk);
if (!iodev) { if (!iodev) {
return ESRCH; return ENXIO;
} }
/* "/dev/disk0s1" -> "disk0" */ /* XXX better way? */ /* "/dev/disk0s1" -> "disk0" */ /* XXX better way? */

6
src/os/linux/linux_sigar.c
View File

@ -1159,7 +1159,7 @@ static int get_iostat_sys(sigar_t *sigar,
int partition, status; int partition, status;
if (!(*iodev = sigar_iodev_get(sigar, dirname))) { if (!(*iodev = sigar_iodev_get(sigar, dirname))) {
return ENOENT; return ENXIO;
} }
name = fsdev = (*iodev)->name; name = fsdev = (*iodev)->name;
@ -1211,7 +1211,7 @@ static int get_iostat_proc_dstat(sigar_t *sigar,
SIGAR_DISK_STATS_INIT(device_usage); SIGAR_DISK_STATS_INIT(device_usage);
if (!(*iodev = sigar_iodev_get(sigar, dirname))) { if (!(*iodev = sigar_iodev_get(sigar, dirname))) {
return ENOENT; return ENXIO;
} }
if (stat((*iodev)->name, &sb) < 0) { if (stat((*iodev)->name, &sb) < 0) {
@ -1313,7 +1313,7 @@ static int get_iostat_procp(sigar_t *sigar,
struct stat sb; struct stat sb;
if (!(*iodev = sigar_iodev_get(sigar, dirname))) { if (!(*iodev = sigar_iodev_get(sigar, dirname))) {
return ENOENT; return ENXIO;
} }
if (stat((*iodev)->name, &sb) < 0) { if (stat((*iodev)->name, &sb) < 0) {

2
src/os/win32/win32_sigar.c
View File

@ -1956,7 +1956,7 @@ SIGAR_DECLARE(int) sigar_disk_usage_get(sigar_t *sigar,
} }
} }
return ENOENT; return ENXIO;
} }
SIGAR_DECLARE(int) SIGAR_DECLARE(int)