add file_system_usage_t.used field

bindings/dotnet/src/Sigar.cs

@@ -356,6 +356,7 @@ namespace Hyperic.Sigar {
         public readonly ulong Total;
         public readonly ulong Free;
         public readonly ulong Avail;
+        public readonly ulong Used;
         private readonly ulong NA_Files; //XXX not implemented
         private readonly ulong NA_FreeFiles;
         private readonly ulong DiskReads;

bindings/java/src/jni/generate.pl

@@ -453,6 +453,11 @@ my %classes = (
          desc => 'Total free bytes on filesytem',
          plat => '*'
       },
+      {
+         name => 'used', type => 'Long',
+         desc => 'Total used bytes on filesystem',
+         plat => '*'
+      },
       {
          name => 'avail', type => 'Long',
          desc => 'Total free bytes on filesytem available to caller',

bindings/java/src/net/hyperic/sigar/test/TestFileSystem.java

@@ -49,8 +49,9 @@ public class TestFileSystem extends SigarTestCase {
                 //possible machines have full filesystems
                 assertGtEqZeroTrace("  Free", usage.getFree());
                 assertGtEqZeroTrace("  Avail", usage.getAvail());
+                assertGtEqZeroTrace("   Used", usage.getUsed());
                 double usePercent = usage.getUsePercent() * 100;
-                traceln("  Used=" + usePercent + "%");
+                traceln("  Usage=" + usePercent + "%");
                 assertTrue(usePercent <= 100.0);
               default:
                 traceln("  DiskReads=" + usage.getDiskReads());

include/sigar.h

@@ -340,6 +340,7 @@ typedef struct {
     sigar_uint64_t
         total,
         free,
+        used,
         avail,
         files,
         free_files,

src/os/aix/aix_sigar.c

@@ -1750,6 +1750,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks);
     fsusage->free  = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree);
     fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail);
+    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);

src/os/darwin/darwin_sigar.c

@@ -1074,6 +1074,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks);
     fsusage->free  = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree);
     fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail);
+    fsusage->used  = fsusage->total - fsusage->free;
     fsusage->files = buf.f_files;
     fsusage->free_files = buf.f_files;
     fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);

src/os/hpux/hpux_sigar.c

@@ -594,6 +594,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks);
     fsusage->free  = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree);
     fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail);
+    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);

src/os/linux/linux_sigar.c

@@ -1147,6 +1147,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks);
     fsusage->free  = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree);
     fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail);
+    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);

src/os/osf1/osf1_sigar.c

@@ -458,6 +458,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks);
     fsusage->free  = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree);
     fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail);
+    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);

src/os/solaris/solaris_sigar.c

@@ -1384,6 +1384,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks);
     fsusage->free  = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree);
     fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail);
+    fsusage->used  = fsusage->total - fsusage->free;
     fsusage->files = buf.f_files;
     fsusage->free_files = buf.f_files;
     fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);

src/os/stub/stub_sigar.c

@@ -200,6 +200,7 @@ int sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = -1;
     fsusage->free  = -1;
     fsusage->avail = -1;
+    fsusage->used  = -1;
     fsusage->files = -1;
     fsusage->free_files = -1;
     SIGAR_DISK_STATS_NOTIMPL(fsusage);

src/os/win32/win32_sigar.c

@@ -1566,7 +1566,7 @@ sigar_file_system_usage_get(sigar_t *sigar,
     fsusage->total = total.QuadPart / 1024;
     fsusage->free  = free.QuadPart / 1024;
     fsusage->avail = avail.QuadPart / 1024;
-
+    fsusage->used  = fsusage->total - fsusage->free;
     fsusage->use_percent = sigar_file_system_usage_calc_used(sigar, fsusage);
 
     /* N/A */