summaryrefslogtreecommitdiff
path: root/src/common/memory_detect.cpp
diff options
context:
space:
mode:
authorGravatar Morph2020-05-27 11:21:59 -0400
committerGravatar Morph2020-05-27 11:21:59 -0400
commitb2af3049185567dfb48aab18957221198c8eab09 (patch)
treefe6794672dd5fb3001c44810674e4179b8c0b208 /src/common/memory_detect.cpp
parentmain: Log host system memory parameters (diff)
downloadyuzu-b2af3049185567dfb48aab18957221198c8eab09.tar.gz
yuzu-b2af3049185567dfb48aab18957221198c8eab09.tar.xz
yuzu-b2af3049185567dfb48aab18957221198c8eab09.zip
Fix macOS code and change "Swapfile" to "Swap"
Diffstat (limited to 'src/common/memory_detect.cpp')
-rw-r--r--src/common/memory_detect.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/common/memory_detect.cpp b/src/common/memory_detect.cpp
index b59a45d55..3fdc309a2 100644
--- a/src/common/memory_detect.cpp
+++ b/src/common/memory_detect.cpp
@@ -33,10 +33,13 @@ static MemoryInfo Detect() {
33#elif defined(__APPLE__) 33#elif defined(__APPLE__)
34 u64 ramsize; 34 u64 ramsize;
35 struct xsw_usage vmusage; 35 struct xsw_usage vmusage;
36 std::size_t sizeof_ramsize = sizeof(ramsize);
37 std::size_t sizeof_vmusage = sizeof(vmusage);
36 // hw and vm are defined in sysctl.h 38 // hw and vm are defined in sysctl.h
37 // https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471 39 // https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471
38 sysctlbyname(hw.memsize, &ramsize, sizeof(ramsize), NULL, 0); 40 // sysctlbyname(const char *, void *, size_t *, void *, size_t);
39 sysctlbyname(vm.swapusage, &vmusage, sizeof(vmusage), NULL, 0); 41 sysctlbyname("hw.memsize", &ramsize, &sizeof_ramsize, NULL, 0);
42 sysctlbyname("vm.swapusage", &vmusage, &sizeof_vmusage, NULL, 0);
40 mem_info.TotalPhysicalMemory = ramsize; 43 mem_info.TotalPhysicalMemory = ramsize;
41 mem_info.TotalSwapMemory = vmusage.xsu_total; 44 mem_info.TotalSwapMemory = vmusage.xsu_total;
42#else 45#else