diff --git a/src/util/ProcessorTime/ProcessorTimeUnix.cpp b/src/util/ProcessorTime/ProcessorTimeUnix.cpp index 1eaafcc8..5ea4bf8c 100644 --- a/src/util/ProcessorTime/ProcessorTimeUnix.cpp +++ b/src/util/ProcessorTime/ProcessorTimeUnix.cpp @@ -13,6 +13,18 @@ uint32_t GetProcessorCount() return std::thread::hardware_concurrency(); } +uint64_t QueryRamUsage() +{ + long page_size = sysconf(_SC_PAGESIZE); + + std::ifstream file("/proc/self/statm"); + file.ignore(std::numeric_limits::max(), ' '); + uint64_t no_pages; + file >> no_pages; + + return no_pages * page_size; +} + void QueryProcTime(uint64_t &out_now, uint64_t &out_user, uint64_t &out_kernel) { struct tms time_info; @@ -42,16 +54,4 @@ void QueryCoreTimes(uint32_t count, ProcessorTime out[]) } } -uint64_t QueryRamUsage() -{ - long page_size = sysconf(_SC_PAGESIZE); - - std::ifstream file("/proc/self/statm"); - file.ignore(std::numeric_limits::max(), ' '); - uint64_t no_pages; - file >> no_pages; - - return no_pages * page_size; -} - #endif \ No newline at end of file diff --git a/src/util/ProcessorTime/ProcessorTimeWin.cpp b/src/util/ProcessorTime/ProcessorTimeWin.cpp index 0b9462e7..e0dcd19b 100644 --- a/src/util/ProcessorTime/ProcessorTimeWin.cpp +++ b/src/util/ProcessorTime/ProcessorTimeWin.cpp @@ -13,6 +13,14 @@ uint32_t GetProcessorCount() return sys_info.dwNumberOfProcessors; } +uint64_t QueryRamUsage() +{ + PROCESS_MEMORY_COUNTERS pmc{}; + pmc.cb = sizeof(pmc); + GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)); + return pmc.WorkingSetSize; +} + void QueryProcTime(uint64_t &out_now, uint64_t &out_user, uint64_t &out_kernel) { FILETIME ftime, fkernel, fuser; @@ -47,12 +55,4 @@ void QueryCoreTimes(uint32_t count, ProcessorTime out[]) } } -uint64_t QueryRamUsage() -{ - PROCESS_MEMORY_COUNTERS pmc{}; - pmc.cb = sizeof(pmc); - GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)); - return pmc.WorkingSetSize; -} - #endif \ No newline at end of file