Report metrics for the size of the native heap.

3 files changed, 58 insertions, 4 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/nativec/MallInfo.java b/vespajlib/src/main/java/com/yahoo/nativec/MallInfo.java
index a4f5486ccf1..d7da1b2d8c2 100644
--- a/vespajlib/src/main/java/com/yahoo/nativec/MallInfo.java
+++ b/vespajlib/src/main/java/com/yahoo/nativec/MallInfo.java
@@ -2,7 +2,7 @@ package com.yahoo.nativec;
 
 import com.sun.jna.Structure;
 
-public class MallInfo {
+public class MallInfo extends NativeHeap {
     private final static Throwable initException = NativeC.loadLibrary(MallInfo.class);
     public static Throwable init() {
         return initException;
@@ -23,8 +23,27 @@ public class MallInfo {
         public int keepcost;  /* Top-most, releasable space (bytes) */
     }
     private static native MallInfoStruct.ByValue mallinfo();
+
+    private final MallInfoStruct mallinfo;
     public MallInfo() {
         mallinfo = mallinfo();
     }
-    private final MallInfoStruct mallinfo;
+
+    @Override
+    public long usedSize() {
+        long v = mallinfo.uordblks;
+        return v << 20; // Due to too few bits in ancient mallinfo vespamalloc reports in 1M units
+    }
+
+    @Override
+    public long totalSize() {
+        long v = mallinfo.arena;
+        return v << 20; // Due to too few bits in ancient mallinfo vespamalloc reports in 1M units
+    }
+
+    @Override
+    public long availableSize() {
+        long v = mallinfo.fordblks;
+        return v << 20; // Due to too few bits in ancient mallinfo vespamalloc reports in 1M units
+    }
 }
diff --git a/vespajlib/src/main/java/com/yahoo/nativec/MallInfo2.java b/vespajlib/src/main/java/com/yahoo/nativec/MallInfo2.java
index 1ae3bc590e2..9e94bad8d40 100644
--- a/vespajlib/src/main/java/com/yahoo/nativec/MallInfo2.java
+++ b/vespajlib/src/main/java/com/yahoo/nativec/MallInfo2.java
@@ -2,7 +2,7 @@ package com.yahoo.nativec;
 
 import com.sun.jna.Structure;
 
-public class MallInfo2 {
+public class MallInfo2 extends NativeHeap {
     private final static Throwable initException = NativeC.loadLibrary(MallInfo2.class);
     public static Throwable init() {
         return initException;
@@ -23,8 +23,24 @@ public class MallInfo2 {
         public long keepcost;  /* Top-most, releasable space (bytes) */
     }
     private static native MallInfo2Struct.ByValue mallinfo2();
+    private final MallInfo2Struct mallinfo;
+
     public MallInfo2() {
         mallinfo = mallinfo2();
     }
-    private final MallInfo2Struct mallinfo;
+
+    @Override
+    public long usedSize() {
+        return mallinfo.uordblks;
+    }
+
+    @Override
+    public long totalSize() {
+        return mallinfo.arena;
+    }
+
+    @Override
+    public long availableSize() {
+        return mallinfo.fordblks;
+    }
 }
diff --git a/vespajlib/src/main/java/com/yahoo/nativec/NativeHeap.java b/vespajlib/src/main/java/com/yahoo/nativec/NativeHeap.java
new file mode 100644
index 00000000000..929ebdd1737
--- /dev/null
+++ b/vespajlib/src/main/java/com/yahoo/nativec/NativeHeap.java
@@ -0,0 +1,19 @@
+package com.yahoo.nativec;
+
+import com.sun.jna.Platform;
+
+public class NativeHeap {
+    public long usedSize() { return 0; }
+    public long totalSize() { return 0; }
+    public long availableSize() { return 0; }
+    public static NativeHeap sample() {
+        if (Platform.isLinux()) {
+            GLibcVersion version = new GLibcVersion();
+            if ((version.major() >= 3) || ((version.major() == 2) && (version.minor() >= 33))) {
+                return new MallInfo2();
+            }
+            return new MallInfo();
+        }
+        return new NativeHeap();
+    }
+}