diff options
| -rw-r--r-- | src/common/memory_detect.cpp | 7 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
2 files changed, 6 insertions, 3 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 |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f690a1508..270cccc77 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -222,7 +222,7 @@ GMainWindow::GMainWindow() | |||
| 222 | LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString()); | 222 | LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString()); |
| 223 | LOG_INFO(Frontend, "Host RAM: {:.2f} GB", | 223 | LOG_INFO(Frontend, "Host RAM: {:.2f} GB", |
| 224 | Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024); | 224 | Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024); |
| 225 | LOG_INFO(Frontend, "Host Swapfile: {:.2f} GB", | 225 | LOG_INFO(Frontend, "Host Swap: {:.2f} GB", |
| 226 | Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024); | 226 | Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024); |
| 227 | UpdateWindowTitle(); | 227 | UpdateWindowTitle(); |
| 228 | 228 | ||