Changeset 55095 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 2, 2015 4:52:46 PM (10 years ago)

Author:

vboxsync

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

99390

Message:

Assorted fixes for FreeBSD hosts, VBox compiles and runs again without further patches (tested on 10.1 amd64 )

File:

• trunk/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/linux/systemmem-linux.cpp ) (2 diffs)

trunk/src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp

@@ -36 +36 @@
 #include <iprt/string.h>
 
-#include <stdio.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #include <errno.h>
-
-/* Satisfy compiller warning */
-#define __EXPORTED_HEADERS__
-#include <sys/sysinfo.h>
-#undef __EXPORTED_HEADERS__
 
 
 RTDECL(int) RTSystemQueryTotalRam(uint64_t *pcb)
 {
+    int rc = VINF_SUCCESS;
+    u_long cbMemPhys = 0;
+    size_t cbParameter = sizeof(cbMemPhys);
+
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
 
-    struct sysinfo info;
-    int rc = sysinfo(&info);
-    if (rc == 0)
+    if (!sysctlbyname("hw.physmem", &cbMemPhys, &cbParameter, NULL, 0))
     {
-        *pcb = (uint64_t)info.totalram * info.mem_unit;
+        *pcb = cbMemPhys;
         return VINF_SUCCESS;
     }
@@ -64 +62 @@
     AssertPtrReturn(pcb, VERR_INVALID_POINTER);
 
-    FILE *pFile = fopen("/proc/meminfo", "r");
-    if (pFile)
-    {
-        int rc = VERR_NOT_FOUND;
-        uint64_t cbTotal = 0;
-        uint64_t cbFree = 0;
-        uint64_t cbBuffers = 0;
-        uint64_t cbCached = 0;
-        char sz[256];
-        while (fgets(sz, sizeof(sz), pFile))
-        {
-            if (!strncmp(sz, RT_STR_TUPLE("MemTotal:")))
-                rc = RTStrToUInt64Ex(RTStrStripL(&sz[sizeof("MemTotal:")]), NULL, 0, &cbTotal);
-            else if (!strncmp(sz, RT_STR_TUPLE("MemFree:")))
-                rc = RTStrToUInt64Ex(RTStrStripL(&sz[sizeof("MemFree:")]), NULL, 0, &cbFree);
-            else if (!strncmp(sz, RT_STR_TUPLE("Buffers:")))
-                rc = RTStrToUInt64Ex(RTStrStripL(&sz[sizeof("Buffers:")]), NULL, 0, &cbBuffers);
-            else if (!strncmp(sz, RT_STR_TUPLE("Cached:")))
-                rc = RTStrToUInt64Ex(RTStrStripL(&sz[sizeof("Cached:")]), NULL, 0, &cbCached);
-            if (RT_FAILURE(rc))
-                break;
-        }
-        fclose(pFile);
-        if (RT_SUCCESS(rc))
-        {
-            *pcb = (cbFree + cbBuffers + cbCached) * _1K;
-            return VINF_SUCCESS;
-        }
-    }
-    /*
-     * Fallback (e.g. /proc not mapped) to sysinfo. Less accurat because there
-     * is no information about the cached memory. 'Cached:' from above is only
-     * accessible through proc :-(
-     */
-    struct sysinfo info;
-    int rc = sysinfo(&info);
-    if (rc == 0)
-    {
-        *pcb = ((uint64_t)info.freeram + info.bufferram) * info.mem_unit;
-        return VINF_SUCCESS;
-    }
-    return RTErrConvertFromErrno(errno);
+    int rc = VINF_SUCCESS;
+    u_int cPagesMemFree = 0;
+    u_int cPagesMemInactive = 0;
+    u_int cPagesMemCached = 0;
+    u_int cPagesMemUsed = 0;
+    int cbPage = 0;
+    size_t cbParameter;
+    int cProcessed = 0;
+
+    cbParameter = sizeof(cPagesMemFree);
+    if (sysctlbyname("vm.stats.vm.v_free_count", &cPagesMemFree, &cbParameter, NULL, 0))
+        rc = RTErrConvertFromErrno(errno);
+    cbParameter = sizeof(cPagesMemUsed);
+    if (   RT_SUCCESS(rc)
+        && sysctlbyname("vm.stats.vm.v_active_count", &cPagesMemUsed, &cbParameter, NULL, 0))
+        rc = RTErrConvertFromErrno(errno);
+    cbParameter = sizeof(cPagesMemInactive);
+    if (   RT_SUCCESS(rc)
+        && sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
+        rc = RTErrConvertFromErrno(errno);
+    cbParameter = sizeof(cPagesMemCached);
+    if (   RT_SUCCESS(rc)
+        && sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
+        rc = RTErrConvertFromErrno(errno);
+    cbParameter = sizeof(cbPage);
+    if (   RT_SUCCESS(rc)
+        && sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
+        rc = RTErrConvertFromErrno(errno);
+
+    if (RT_SUCCESS(rc))
+        *pcb = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * cbPage;
+
+    return rc;
 }