(SIGAR-148) use sigar_statvfs on AIX
This commit is contained in:
parent
d29ef6d6ac
commit
a788e2b6e2
|
@ -1262,10 +1262,6 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
|
||||||
return SIGAR_OK;
|
return SIGAR_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX this is exactly the same as linux and hpux, solaris is darn close */
|
|
||||||
|
|
||||||
#define SIGAR_FS_BLOCKS_TO_BYTES(val, bsize) ((val * bsize) >> 1)
|
|
||||||
|
|
||||||
int sigar_file_system_usage_get(sigar_t *sigar,
|
int sigar_file_system_usage_get(sigar_t *sigar,
|
||||||
const char *dirname,
|
const char *dirname,
|
||||||
sigar_file_system_usage_t *fsusage)
|
sigar_file_system_usage_t *fsusage)
|
||||||
|
@ -1273,23 +1269,13 @@ int sigar_file_system_usage_get(sigar_t *sigar,
|
||||||
sigar_cache_entry_t *ent;
|
sigar_cache_entry_t *ent;
|
||||||
struct stat sb;
|
struct stat sb;
|
||||||
int status;
|
int status;
|
||||||
struct statfs buf;
|
|
||||||
sigar_uint64_t val, bsize;
|
|
||||||
|
|
||||||
if (statfs((char *)dirname, &buf) != 0) {
|
status = sigar_statvfs(sigar, dirname, fsusage);
|
||||||
return errno;
|
|
||||||
|
if (status != SIGAR_OK) {
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
bsize = buf.f_bsize / 512;
|
|
||||||
val = buf.f_blocks;
|
|
||||||
fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
|
|
||||||
val = buf.f_bfree;
|
|
||||||
fsusage->free = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
|
|
||||||
val = buf.f_bavail;
|
|
||||||
fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
|
|
||||||
fsusage->used = fsusage->total - fsusage->free;
|
|
||||||
fsusage->files = buf.f_files;
|
|
||||||
fsusage->free_files = buf.f_ffree;
|
|
||||||
fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
|
fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
|
||||||
|
|
||||||
SIGAR_DISK_STATS_INIT(&fsusage->disk);
|
SIGAR_DISK_STATS_INIT(&fsusage->disk);
|
||||||
|
|
Loading…
Reference in New Issue