Attachment 186142 Details for Bug 211432 – Fix getHostMemoryUsage() and getMemoryAvailable()

[patch] Fix getHostMemoryUsage() and getMemoryAvailable()

vbox.diff (text/plain), 4.51 KB, created by Jung-uk Kim on 2017-09-07 06:01:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2017-09-07 06:01:40 UTC

Size: 4.51 KB

patch

obsolete

>Index: emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp	(working copy)
>@@ -0,0 +1,24 @@
>+--- src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp.orig	2017-07-27 13:18:27 UTC
>++++ src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp
>+@@ -80,8 +80,10 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
>+     cbParameter = sizeof(cPagesMemInactive);
>+     if (!sysctlbyname("vm.stats.vm.v_inactive_count", &cPagesMemInactive, &cbParameter, NULL, 0))
>+         cProcessed++;
>++#if __FreeBSD_version < 1200016
>+     cbParameter = sizeof(cPagesMemCached);
>+     if (!sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
>++#endif
>+         cProcessed++;
>+     cbParameter = sizeof(cbPage);
>+     if (!sysctlbyname("hw.pagesize", &cbPage, &cbParameter, NULL, 0))
>+@@ -90,8 +92,8 @@ int CollectorFreeBSD::getHostMemoryUsage(ULONG *total,
>+     if (cProcessed == 6)
>+     {
>+         *total     = cbMemPhys / _1K;
>+-        *used      = cPagesMemUsed * (cbPage / _1K);
>+-        *available = (cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * (cbPage / _1K);
>++        *used      = (ULONG)cPagesMemUsed * (cbPage / _1K);
>++        *available = ((ULONG)cPagesMemFree + cPagesMemInactive + cPagesMemCached ) * (cbPage / _1K);
>+     }
>+     else
>+         rc = VERR_NOT_SUPPORTED;
>
>Property changes on: emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_PerformanceFreeBSD.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp.orig	2017-07-27 13:18:46 UTC
>++++ src/VBox/Runtime/r3/freebsd/systemmem-freebsd.cpp
>+@@ -65,7 +65,6 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)
>+     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;
>+@@ -73,25 +72,23 @@ RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb)
>+     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);
>++#if __FreeBSD_version < 1200016
>+     cbParameter = sizeof(cPagesMemCached);
>+     if (   RT_SUCCESS(rc)
>+         && sysctlbyname("vm.stats.vm.v_cache_count", &cPagesMemCached, &cbParameter, NULL, 0))
>+         rc = RTErrConvertFromErrno(errno);
>++#endif
>+     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;
>++        *pcb = ((uint64_t)cPagesMemFree + cPagesMemInactive + cPagesMemCached) * cbPage;
>+ 
>+     return rc;
>+ }
>
>Property changes on: emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r3_freebsd_systemmem-freebsd.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 211432: 186120 | 186123 | 186140 | 186142 | 186149 | 186154