儲存庫 vbox 的更動 36071

時間撮記:

2011-2-24 下午03:02:10 (14 年 以前)

作者:

vboxsync

訊息:

Main/src-server/PerformanceSolaris: Tweak free memory accounting to include ZFS arc c_min.

檔案:

• trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp (修改) (5 筆差異)

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

@@ -26 +26 @@
 #include <sys/sysinfo.h>
 #include <sys/time.h>
+#include <syslog.h>
 
 #include <iprt/err.h>
@@ -85 +86 @@
 CollectorSolaris::~CollectorSolaris()
 {
-    kstat_close(mKC);
+    if (mKC)
+        kstat_close(mKC);
 }
 
@@ -191 +193 @@
         {
             if ((kn = (kstat_named_t *)kstat_data_lookup(mZFSCache, "size")))
-                *available += (kn->value.ul / 1024);
+            {
+                ulong_t ulSize = kn->value.ul;
+
+                if ((kn = (kstat_named_t *)kstat_data_lookup(mZFSCache, "c_min")))
+                {
+                    /*
+                     * Account for ZFS minimum arc cache size limit.
+                     * "c_min" is the target minimum size of the ZFS cache, and not the hard limit. It's possible
+                     * for "size" to shrink below "c_min" (e.g: during boot & high memory consumption).
+                     */
+                    ulong_t ulMin = kn->value.ul;
+                    *available += ulSize > ulMin ? ulSize - ulMin : 0;
+                }
+                else
+                    Log(("kstat_data_lookup(c_min) ->%d\n", errno));
+            }
             else
                 Log(("kstat_data_lookup(size) -> %d\n", errno));
@@ -209 +226 @@
     return rc;
 }
+
 int CollectorSolaris::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {
@@ -243 +261 @@
 }
 
-}
-
+