manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-13 14:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not use WMI for memory stats revert to original method

Browse source
This commit is contained in:
sunshineinabox 2023-07-31 14:54:59 -07:00
parent cdbb389132
commit a15eb00ca7
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
View file

@ -4,11 +4,12 @@ using WmiLight;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
namespace Ryujinx.Common.SystemInfo namespace Ryujinx.Common.SystemInfo
{ {
[SupportedOSPlatform("windows")] [SupportedOSPlatform("windows")]
class WindowsSystemInfo : SystemInfo partial class WindowsSystemInfo : SystemInfo
{ {
internal WindowsSystemInfo() internal WindowsSystemInfo()
{ {
@ -17,8 +18,8 @@ namespace Ryujinx.Common.SystemInfo
using (WmiConnection connection = new()) using (WmiConnection connection = new())
{ {
(string cpuName, PhysicalCores) = GetCpuStatsLight(connection); (string cpuName, PhysicalCores) = GetCpuStatsLight(connection);
CpuName = $"{cpuName} ; {PhysicalCores} physical ; {LogicalCoreCount} logical"; CpuName = $"{cpuName ?? GetCpuidCpuName()} ; {PhysicalCores} physical ; {LogicalCoreCount} logical";
(RamTotal, RamAvailable) = GetMemoryStatsWmiLight(connection); (RamTotal, RamAvailable) = GetMemoryStats();
} }
} }
catch (Exception ex) catch (Exception ex)
@ -27,6 +28,18 @@ namespace Ryujinx.Common.SystemInfo
} }
} }
private static (ulong Total, ulong Available) GetMemoryStats()
{
MemoryStatusEx memStatus = new();
if (GlobalMemoryStatusEx(ref memStatus))
{
return (memStatus.TotalPhys, memStatus.AvailPhys); // Bytes
}
Logger.Error?.Print(LogClass.Application, $"GlobalMemoryStatusEx failed. Error {Marshal.GetLastWin32Error():X}");
return (0, 0);
}
private (string cpuName, int physicalCores) GetCpuStatsLight(WmiConnection connection) private (string cpuName, int physicalCores) GetCpuStatsLight(WmiConnection connection)
{ {
@ -45,24 +58,28 @@ namespace Ryujinx.Common.SystemInfo
return (cpuName, physicalCores); return (cpuName, physicalCores);
} }
private (ulong TotalPhys, ulong AvailPhys) GetMemoryStatsWmiLight(WmiConnection connection) [StructLayout(LayoutKind.Sequential)]
private struct MemoryStatusEx
{ {
ulong TotalPhys = 0; public uint Length;
ulong AvailPhys = 0; public uint MemoryLoad;
public ulong TotalPhys;
public ulong AvailPhys;
public ulong TotalPageFile;
public ulong AvailPageFile;
public ulong TotalVirtual;
public ulong AvailVirtual;
public ulong AvailExtendedVirtual;
foreach (WmiObject memObj in GetWmiObjects(connection, "SELECT TotalPhysicalMemory FROM Win32_ComputerSystem")) public MemoryStatusEx()
{ {
TotalPhys = Convert.ToUInt64(memObj["TotalPhysicalMemory"]); Length = (uint)Marshal.SizeOf<MemoryStatusEx>();
} }
foreach (WmiObject memObj2 in GetWmiObjects(connection, "SELECT FreePhysicalMemory FROM Win32_OperatingSystem"))
{
AvailPhys = Convert.ToUInt64(memObj2["FreePhysicalMemory"]) * 1000;
}
return (TotalPhys, AvailPhys);
} }
[LibraryImport("kernel32.dll", SetLastError = true)]
[return: MarshalAs(UnmanagedType.Bool)]
private static partial bool GlobalMemoryStatusEx(ref MemoryStatusEx lpBuffer);
private IEnumerable<WmiObject> GetWmiObjects(WmiConnection connection, string query) private IEnumerable<WmiObject> GetWmiObjects(WmiConnection connection, string query)
{ {