From d536cc8ae6d6725780365d858f2fd64b66d90b7f Mon Sep 17 00:00:00 2001 From: Wunk Date: Wed, 16 Nov 2022 14:27:42 -0800 Subject: Update units of memory from decimal to binary prefixes (#3716) `MB` and `GB` can either be interpreted as having base-10 units, or base-2. `MiB` and `GiB` removes this discrepancy so that units of memory are always interpreted using base-2 units. --- Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs | 10 +++++----- Ryujinx.Common/SystemInfo/SystemInfo.cs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Ryujinx.Common/SystemInfo') diff --git a/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs b/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs index 069cd5aa..cd4a3d82 100644 --- a/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs +++ b/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs @@ -36,13 +36,13 @@ namespace Ryujinx.Common.SystemInfo ParseKeyValues("/proc/meminfo", memDict); - // Entries are in KB - ulong.TryParse(memDict["MemTotal"]?.Split(' ')[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong totalKB); - ulong.TryParse(memDict["MemAvailable"]?.Split(' ')[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong availableKB); + // Entries are in KiB + ulong.TryParse(memDict["MemTotal"]?.Split(' ')[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong totalKiB); + ulong.TryParse(memDict["MemAvailable"]?.Split(' ')[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out ulong availableKiB); CpuName = $"{cpuName} ; {LogicalCoreCount} logical"; - RamTotal = totalKB * 1024; - RamAvailable = availableKB * 1024; + RamTotal = totalKiB * 1024; + RamAvailable = availableKiB * 1024; } private static void ParseKeyValues(string filePath, Dictionary itemDict) diff --git a/Ryujinx.Common/SystemInfo/SystemInfo.cs b/Ryujinx.Common/SystemInfo/SystemInfo.cs index 98f520bc..1db72d9b 100644 --- a/Ryujinx.Common/SystemInfo/SystemInfo.cs +++ b/Ryujinx.Common/SystemInfo/SystemInfo.cs @@ -20,13 +20,13 @@ namespace Ryujinx.Common.SystemInfo CpuName = "Unknown"; } - private static string ToMBString(ulong bytesValue) => (bytesValue == 0) ? "Unknown" : $"{bytesValue / 1024 / 1024} MB"; + private static string ToMiBString(ulong bytesValue) => (bytesValue == 0) ? "Unknown" : $"{bytesValue / 1024 / 1024} MiB"; public void Print() { Logger.Notice.Print(LogClass.Application, $"Operating System: {OsDescription}"); Logger.Notice.Print(LogClass.Application, $"CPU: {CpuName}"); - Logger.Notice.Print(LogClass.Application, $"RAM: Total {ToMBString(RamTotal)} ; Available {ToMBString(RamAvailable)}"); + Logger.Notice.Print(LogClass.Application, $"RAM: Total {ToMiBString(RamTotal)} ; Available {ToMiBString(RamAvailable)}"); } public static SystemInfo Gather() -- cgit v1.2.3