From b53121d071a071765df3dd7c2420d5f5fd3e3007 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 21 May 2009 14:26:29 -0700 Subject: [PATCH] (SIGAR-148) use sigar_statvfs --- src/os/solaris/solaris_sigar.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/os/solaris/solaris_sigar.c b/src/os/solaris/solaris_sigar.c index ad856eb1..bd867223 100644 --- a/src/os/solaris/solaris_sigar.c +++ b/src/os/solaris/solaris_sigar.c @@ -1352,8 +1352,6 @@ int sigar_file_system_list_get(sigar_t *sigar, return SIGAR_OK; } -#include - typedef struct { char device[PATH_MAX]; char name[8]; @@ -1716,29 +1714,16 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name, return status; } -#define SIGAR_FS_BLOCKS_TO_BYTES(val, bsize) ((val * bsize) >> 1) - int sigar_file_system_usage_get(sigar_t *sigar, const char *dirname, sigar_file_system_usage_t *fsusage) { - struct statvfs buf; - sigar_uint64_t val, bsize; + int status = sigar_statvfs(sigar, dirname, fsusage); - if (statvfs(dirname, &buf) != 0) { - return errno; + if (status != SIGAR_OK) { + return status; } - bsize = buf.f_frsize / 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); sigar_disk_usage_get(sigar, dirname, &fsusage->disk);