From 728fd6d75dcad9483814343f9f825990c9fd059c Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Sun, 5 Dec 2004 23:42:23 +0000 Subject: [PATCH] initialize disk metrics for all platforms --- include/sigar_private.h | 3 +++ src/os/aix/aix_sigar.c | 2 ++ src/os/darwin/darwin_sigar.c | 2 ++ src/os/hpux/hpux_sigar.c | 2 ++ src/os/linux/linux_sigar.c | 3 +-- src/os/osf1/osf1_sigar.c | 2 ++ src/os/solaris/solaris_sigar.c | 2 ++ src/os/stub/stub_sigar.c | 1 + src/os/win32/win32_sigar.c | 3 +-- 9 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/sigar_private.h b/include/sigar_private.h index 295d86ec..b967a9c7 100644 --- a/include/sigar_private.h +++ b/include/sigar_private.h @@ -193,4 +193,7 @@ int sigar_group_name_get(sigar_t *sigar, int gid, char *buf, int buflen); return SIGAR_OK; \ } +#define SIGAR_DISK_STATS_NOTIMPL(fsusage) \ + fsusage->disk_reads = fsusage->disk_writes = SIGAR_FIELD_NOTIMPL + #endif diff --git a/src/os/aix/aix_sigar.c b/src/os/aix/aix_sigar.c index c34c3967..328ed2c5 100644 --- a/src/os/aix/aix_sigar.c +++ b/src/os/aix/aix_sigar.c @@ -1383,6 +1383,8 @@ int sigar_file_system_usage_get(sigar_t *sigar, fsusage->free_files = buf.f_ffree; fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); + SIGAR_DISK_STATS_NOTIMPL(fsusage); + return SIGAR_OK; } diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index 005600ec..0fec4ddb 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -604,6 +604,8 @@ int sigar_file_system_usage_get(sigar_t *sigar, fsusage->free_files = buf.f_files; fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); + SIGAR_DISK_STATS_NOTIMPL(fsusage); + return SIGAR_OK; } diff --git a/src/os/hpux/hpux_sigar.c b/src/os/hpux/hpux_sigar.c index a6a8e5aa..f8001d06 100644 --- a/src/os/hpux/hpux_sigar.c +++ b/src/os/hpux/hpux_sigar.c @@ -559,6 +559,8 @@ int sigar_file_system_usage_get(sigar_t *sigar, fsusage->free_files = buf.f_ffree; fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); + SIGAR_DISK_STATS_NOTIMPL(fsusage); + return SIGAR_OK; } diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c index ef10bd38..e25dca58 100644 --- a/src/os/linux/linux_sigar.c +++ b/src/os/linux/linux_sigar.c @@ -1229,8 +1229,7 @@ int sigar_file_system_usage_get(sigar_t *sigar, break; } - fsusage->disk_reads = fsusage->disk_writes = - SIGAR_FIELD_NOTIMPL; + SIGAR_DISK_STATS_NOTIMPL(fsusage); return SIGAR_OK; } diff --git a/src/os/osf1/osf1_sigar.c b/src/os/osf1/osf1_sigar.c index b051c9a9..b554d27f 100644 --- a/src/os/osf1/osf1_sigar.c +++ b/src/os/osf1/osf1_sigar.c @@ -462,6 +462,8 @@ int sigar_file_system_usage_get(sigar_t *sigar, fsusage->free_files = buf.f_ffree; fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); + SIGAR_DISK_STATS_NOTIMPL(fsusage); + return SIGAR_OK; } diff --git a/src/os/solaris/solaris_sigar.c b/src/os/solaris/solaris_sigar.c index 42709f2f..2f2ba690 100644 --- a/src/os/solaris/solaris_sigar.c +++ b/src/os/solaris/solaris_sigar.c @@ -1133,6 +1133,8 @@ int sigar_file_system_usage_get(sigar_t *sigar, fsusage->free_files = buf.f_files; fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage); + SIGAR_DISK_STATS_NOTIMPL(fsusage); + return SIGAR_OK; } diff --git a/src/os/stub/stub_sigar.c b/src/os/stub/stub_sigar.c index 58334b68..0dfe648a 100644 --- a/src/os/stub/stub_sigar.c +++ b/src/os/stub/stub_sigar.c @@ -202,6 +202,7 @@ int sigar_file_system_usage_get(sigar_t *sigar, fsusage->avail = -1; fsusage->files = -1; fsusage->free_files = -1; + SIGAR_DISK_STATS_NOTIMPL(fsusage); return SIGAR_OK; } diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c index 9e13e80c..6caf8cda 100644 --- a/src/os/win32/win32_sigar.c +++ b/src/os/win32/win32_sigar.c @@ -1457,8 +1457,7 @@ sigar_file_system_usage_get(sigar_t *sigar, status = get_disk_metrics(sigar, dirname, fsusage); if (status != SIGAR_OK) { - fsusage->disk_reads = fsusage->disk_writes = - SIGAR_FIELD_NOTIMPL; + SIGAR_DISK_STATS_NOTIMPL(fsusage); } return SIGAR_OK;