main: Log host system memory parameters
Logs both physical memory and swapfile sizes, this is useful for support.
This commit is contained in:
		@@ -213,6 +213,10 @@ GMainWindow::GMainWindow()
 | 
			
		||||
    LOG_INFO(Frontend, "Host CPU: {}", cpu_string);
 | 
			
		||||
#endif
 | 
			
		||||
    LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString());
 | 
			
		||||
    LOG_INFO(Frontend, "Host RAM: {:.2f} GB",
 | 
			
		||||
             Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024);
 | 
			
		||||
    LOG_INFO(Frontend, "Host Swap: {:.2f} GB",
 | 
			
		||||
             Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024);
 | 
			
		||||
    UpdateWindowTitle();
 | 
			
		||||
 | 
			
		||||
    show();
 | 
			
		||||
 
 | 
			
		||||
@@ -83,6 +83,8 @@ add_library(common STATIC
 | 
			
		||||
    logging/text_formatter.cpp
 | 
			
		||||
    logging/text_formatter.h
 | 
			
		||||
    math_util.h
 | 
			
		||||
    memory_detect.cpp
 | 
			
		||||
    memory_detect.h
 | 
			
		||||
    memory_ref.h
 | 
			
		||||
    memory_ref.cpp
 | 
			
		||||
    microprofile.cpp
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										57
									
								
								src/common/memory_detect.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								src/common/memory_detect.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,57 @@
 | 
			
		||||
// Copyright 2020 yuzu Emulator Project
 | 
			
		||||
// Licensed under GPLv2 or any later version
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#ifdef _WIN32
 | 
			
		||||
// clang-format off
 | 
			
		||||
#include <windows.h>
 | 
			
		||||
#include <sysinfoapi.h>
 | 
			
		||||
// clang-format on
 | 
			
		||||
#else
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
#ifdef __APPLE__
 | 
			
		||||
#include <sys/sysctl.h>
 | 
			
		||||
#else
 | 
			
		||||
#include <sys/sysinfo.h>
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#include "common/memory_detect.h"
 | 
			
		||||
 | 
			
		||||
namespace Common {
 | 
			
		||||
 | 
			
		||||
// Detects the RAM and Swapfile sizes
 | 
			
		||||
static MemoryInfo Detect() {
 | 
			
		||||
    MemoryInfo mem_info{};
 | 
			
		||||
 | 
			
		||||
#ifdef _WIN32
 | 
			
		||||
    MEMORYSTATUSEX memorystatus;
 | 
			
		||||
    memorystatus.dwLength = sizeof(memorystatus);
 | 
			
		||||
    GlobalMemoryStatusEx(&memorystatus);
 | 
			
		||||
    mem_info.TotalPhysicalMemory = memorystatus.ullTotalPhys;
 | 
			
		||||
    mem_info.TotalSwapMemory = memorystatus.ullTotalPageFile - mem_info.TotalPhysicalMemory;
 | 
			
		||||
#elif defined(__APPLE__)
 | 
			
		||||
    u64 ramsize;
 | 
			
		||||
    struct xsw_usage vmusage;
 | 
			
		||||
    // hw and vm are defined in sysctl.h
 | 
			
		||||
    // https://github.com/apple/darwin-xnu/blob/master/bsd/sys/sysctl.h#L471
 | 
			
		||||
    sysctlbyname(hw.memsize, &ramsize, sizeof(ramsize), NULL, 0);
 | 
			
		||||
    sysctlbyname(vm.swapusage, &vmusage, sizeof(vmusage), NULL, 0);
 | 
			
		||||
    mem_info.TotalPhysicalMemory = ramsize;
 | 
			
		||||
    mem_info.TotalSwapMemory = vmusage.xsu_total;
 | 
			
		||||
#else
 | 
			
		||||
    struct sysinfo meminfo;
 | 
			
		||||
    sysinfo(&meminfo);
 | 
			
		||||
    mem_info.TotalPhysicalMemory = meminfo.totalram;
 | 
			
		||||
    mem_info.TotalSwapMemory = meminfo.totalswap;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    return mem_info;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const MemoryInfo& GetMemInfo() {
 | 
			
		||||
    static MemoryInfo mem_info = Detect();
 | 
			
		||||
    return mem_info;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
} // namespace Common
 | 
			
		||||
							
								
								
									
										22
									
								
								src/common/memory_detect.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								src/common/memory_detect.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,22 @@
 | 
			
		||||
// Copyright 2020 yuzu Emulator Project
 | 
			
		||||
// Licensed under GPLv2 or any later version
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "common/common_types.h"
 | 
			
		||||
 | 
			
		||||
namespace Common {
 | 
			
		||||
 | 
			
		||||
struct MemoryInfo {
 | 
			
		||||
    u64 TotalPhysicalMemory{};
 | 
			
		||||
    u64 TotalSwapMemory{};
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Gets the memory info of the host system
 | 
			
		||||
 * @return Reference to a MemoryInfo struct with the physical and swap memory sizes in bytes
 | 
			
		||||
 */
 | 
			
		||||
const MemoryInfo& GetMemInfo();
 | 
			
		||||
 | 
			
		||||
} // namespace Common
 | 
			
		||||
		Reference in New Issue
	
	Block a user