Merge branch 'SIGAR-148'

include/sigar_util.h

@@ -120,6 +120,10 @@ int sigar_procfs_args_get(sigar_t *sigar, sigar_pid_t pid,
 
 int sigar_mem_calc_ram(sigar_t *sigar, sigar_mem_t *mem);
 
+int sigar_statvfs(sigar_t *sigar,
+                  const char *dirname,
+                  sigar_file_system_usage_t *fsusage);
+
 double sigar_file_system_usage_calc_used(sigar_t *sigar,
                                          sigar_file_system_usage_t *fs);
 

src/os/linux/linux_sigar.c

@@ -1058,7 +1058,6 @@ int sigar_thread_cpu_get(sigar_t *sigar,
 }
 
 #include <mntent.h>
-#include <sys/statfs.h>
 
 int sigar_os_fs_type_get(sigar_file_system_t *fsp)
 {
@@ -1458,31 +1457,16 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
     return status;
 }
 
-#include <sys/vfs.h>
-
-#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 statfs buf;
+    int status = sigar_statvfs(sigar, dirname, fsusage);
-    sigar_uint64_t val, bsize;
+
- 
+    if (status != SIGAR_OK) {
-    if (statfs(dirname, &buf) != 0) {
+        return status;
-        return errno;
     }
 
-    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);
 
     (void)sigar_disk_usage_get(sigar, dirname, &fsusage->disk);

src/os/solaris/solaris_sigar.c

@@ -1352,8 +1352,6 @@ int sigar_file_system_list_get(sigar_t *sigar,
     return SIGAR_OK;
 }
 
-#include <sys/statvfs.h>
-
 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;
+    int status = sigar_statvfs(sigar, dirname, fsusage);
-    sigar_uint64_t val, bsize;
 
-    if (statvfs(dirname, &buf) != 0) {
+    if (status != SIGAR_OK) {
-        return errno;
+        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);

src/sigar_fileinfo.c

@@ -61,6 +61,40 @@
 #  endif
 #endif
 
+#include "sigar.h"
+
+#ifndef WIN32
+#include <sys/statvfs.h>
+#include <errno.h>
+
+#define SIGAR_FS_BLOCKS_TO_BYTES(val, bsize) ((val * bsize) >> 1)
+
+int sigar_statvfs(sigar_t *sigar,
+                  const char *dirname,
+                  sigar_file_system_usage_t *fsusage)
+{
+    struct statvfs buf;
+    sigar_uint64_t val, bsize;
+
+    if (statvfs(dirname, &buf) != 0) {
+        return errno;
+    }
+
+    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;
+
+    return SIGAR_OK;
+}
+#endif
+
 /*
  * whittled down version of apr/file_info/{unix,win32}/filestat.c
  * to fillin sigar_fileattrs_t