xrCore: implement Linux xrMemory functions

OpenXRay · May 24, 2018 · 253aca9 · 253aca9
1 parent 91064e0
commit 253aca9
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/src/xrCore/xrMemory.cpp b/src/xrCore/xrMemory.cpp
@@ -1,6 +1,12 @@
 #include "stdafx.h"
 
+#if defined(WINDOWS)
 #include <Psapi.h>
+#elif defined(LINUX)
+#include <sys/sysinfo.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
 
 xrMemory Memory;
 // Also used in src\xrCore\xrDebug.cpp to prevent use of g_pStringContainer before it initialized
@@ -27,6 +33,7 @@ void xrMemory::_destroy()
 
 XRCORE_API void vminfo(size_t* _free, size_t* reserved, size_t* committed)
 {
+#if defined(WINDOWS)
     MEMORY_BASIC_INFORMATION memory_info;
     memory_info.BaseAddress = 0;
     *_free = *reserved = *committed = 0;
@@ -40,6 +47,13 @@ XRCORE_API void vminfo(size_t* _free, size_t* reserved, size_t* committed)
         }
         memory_info.BaseAddress = (char*)memory_info.BaseAddress + memory_info.RegionSize;
     }
+#elif defined(LINUX)
+	struct sysinfo si;
+	sysinfo(&si);
+    *_free = si.freeram * si.mem_unit;
+    *reserved = si.bufferram * si.mem_unit;
+    *committed = (si.totalram - si.freeram + si.totalswap - si.freeswap) * si.mem_unit;
+#endif
 }
 
 XRCORE_API void log_vminfo()
@@ -51,19 +65,28 @@ XRCORE_API void log_vminfo()
 
 size_t xrMemory::mem_usage()
 {
+#if defined(WINDOWS)
     PROCESS_MEMORY_COUNTERS pmc = {};
     if (HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, GetCurrentProcessId()))
     {
         GetProcessMemoryInfo(h, &pmc, sizeof(pmc));
         CloseHandle(h);
     }
     return pmc.PagefileUsage;
+#elif defined(LINUX)
+    struct rusage ru;
+    getrusage(RUSAGE_SELF, &ru);
+    return (size_t)ru.ru_maxrss;
+#endif
 }
 
 void xrMemory::mem_compact()
 {
+#if defined(WINDOWS)
     RegFlushKey(HKEY_CLASSES_ROOT);
     RegFlushKey(HKEY_CURRENT_USER);
+#endif
+
     /*
     Следующие две команды в целом не нужны.
     Современные аллокаторы достаточно грамотно и когда нужно возвращают память операционной системе.
@@ -77,8 +100,11 @@ void xrMemory::mem_compact()
         g_pStringContainer->clean();
     if (g_pSharedMemoryContainer)
         g_pSharedMemoryContainer->clean();
-    if (strstr(Core.Params, "-swap_on_compact"))
+
+#if defined(WINDOWS)
+if (strstr(Core.Params, "-swap_on_compact"))
         SetProcessWorkingSetSize(GetCurrentProcess(), size_t(-1), size_t(-1));
+#endif
 }
 
 // xr_strdup