Changeset 23150 in vbox

Timestamp:

Sep 18, 2009 10:36:15 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52564

Message:

Main: Fix getHostMemoryUsage for FreeBSD. Contributed by Bernhard Froehlich

File:

• trunk/src/VBox/Main/freebsd/PerformanceFreeBSD.cpp (modified) (2 diffs)

trunk/src/VBox/Main/freebsd/PerformanceFreeBSD.cpp

@@ -66 +66 @@
     u_long cbMemPhys = 0;
     u_int cPagesMemFree = 0;
+    u_int cPagesMemInactive = 0;
+    u_int cPagesMemCached = 0;
     u_int cPagesMemUsed = 0;
     int cbPage = 0;
@@ -80 +82 @@
     if (!sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
         cProcessed++;
+    cbParameter = sizeof(cPagesMemInactive);
+    if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
+        cProcessed++;
+    cbParameter = sizeof(cPagesMemCached);
+    if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
+        cProcessed++;
     cbParameter = sizeof(cbPage);
     if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
         cProcessed++;
 
-    if (cProcessed == 4)
+    if (cProcessed == 6)
     {
         *total     = cbMemPhys / _1K;
         *used      = cPagesMemUsed * (cbPage / _1K);
-        *available = cPagesMemFree * (cbPage / _1K);
+        *available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * (cbPage / _1K);
     }
     else