Changeset 25415 in vbox

Timestamp:

Dec 15, 2009 5:04:40 PM (15 years ago)

Author:

vboxsync

Message:

Main/PerformanceSolaris: #4555 - account ZFS cache size while collecting RAM usage metrics.

File:

• trunk/src/VBox/Main/solaris/PerformanceSolaris.cpp (modified) (4 diffs)

trunk/src/VBox/Main/solaris/PerformanceSolaris.cpp

@@ -53 +53 @@
     kstat_ctl_t *mKC;
     kstat_t     *mSysPages;
+    kstat_t     *mZFSCache;
 };
 
@@ -63 +64 @@
 
 
-CollectorSolaris::CollectorSolaris() : mKC(0), mSysPages(0)
+CollectorSolaris::CollectorSolaris()
+    : mKC(0),
+      mSysPages(0),
+      mZFSCache(0)
 {
     if ((mKC = kstat_open()) == 0)
@@ -75 +79 @@
         Log(("kstat_lookup(system_pages) -> %d\n", errno));
         return;
+    }
+
+    if ((mZFSCache = kstat_lookup(mKC, "zfs", 0, "arcstats")) == 0)
+    {
+        Log(("kstat_lookup(system_pages) -> %d\n", errno));
     }
 }
@@ -180 +189 @@
     }
     *available = kn->value.ul * (PAGE_SIZE/1024);
+
+    // Optional don't fail if kstat is missing; as ZFS kstats are not be available for SunOS < 5.10 U8
+    if (kstat_read(mKC, mZFSCache, 0) != -1)
+    {
+        if (mZFSCache)
+        {
+            if ((kn = (kstat_named_t *)kstat_data_lookup(mZFSCache, "size")))
+                *available += (kn->value.ul / 1024);
+            else
+                Log(("kstat_data_lookup(size) -> %d\n", errno));
+        }
+        else
+            Log(("mZFSCache missing.\n"));
+    }
+
     if ((kn = (kstat_named_t *)kstat_data_lookup(mSysPages, "physmem")) == 0)
     {