stuff/suyu
stuff/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-29 06:46:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix macOS code and change "Swapfile" to "Swap"

Browse source
This commit is contained in:
Morph 2020-05-27 11:21:59 -04:00
parent 9a36d8600c
commit b2af304918
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/memory_detect.cpp
View file

@ -33,10 +33,13 @@ static MemoryInfo Detect() {
#elif defined(__APPLE__) #elif defined(__APPLE__)
u64 ramsize; u64 ramsize;
struct xsw_usage vmusage; struct xsw_usage vmusage;
std::size_t sizeof_ramsize = sizeof(ramsize);
std::size_t sizeof_vmusage = sizeof(vmusage);
// hw and vm are defined in sysctl.h // hw and vm are defined in sysctl.h
// https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471 // https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471
sysctlbyname(hw.memsize, &ramsize, sizeof(ramsize), NULL, 0); // sysctlbyname(const char *, void *, size_t *, void *, size_t);
sysctlbyname(vm.swapusage, &vmusage, sizeof(vmusage), NULL, 0); sysctlbyname("hw.memsize", &ramsize, &sizeof_ramsize, NULL, 0);
sysctlbyname("vm.swapusage", &vmusage, &sizeof_vmusage, NULL, 0);
mem_info.TotalPhysicalMemory = ramsize; mem_info.TotalPhysicalMemory = ramsize;
mem_info.TotalSwapMemory = vmusage.xsu_total; mem_info.TotalSwapMemory = vmusage.xsu_total;
#else #else

2
src/yuzu/main.cpp
View file

@ -222,7 +222,7 @@ GMainWindow::GMainWindow()
LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString()); LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString());
LOG_INFO(Frontend, "Host RAM: {:.2f} GB", LOG_INFO(Frontend, "Host RAM: {:.2f} GB",
Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024); Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024);
LOG_INFO(Frontend, "Host Swapfile: {:.2f} GB", LOG_INFO(Frontend, "Host Swap: {:.2f} GB",
Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024); Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024);
UpdateWindowTitle(); UpdateWindowTitle();