fixup! add new memory sensors

Author: sergiye

OpenHardwareMonitor/Utilities/Updater.cs

@@ -105,11 +105,11 @@ internal static void CheckForUpdates(bool silent)
                 if (string.Compare(CurrentVersion, newVersion, StringComparison.Ordinal) >= 0)
                 {
                     if (!silent)
-                        MessageBox.Show($"Your version is: {CurrentVersion}\nLatest released version is: {newVersion}\nNo need to update.", "Update", MessageBoxButtons.OK,
+                        MessageBox.Show($"Your version: {CurrentVersion}\nLast release: {newVersion}\nNo need to update.", "Update", MessageBoxButtons.OK,
                           MessageBoxIcon.Information);
                     return;
                 }
-                update = MessageBox.Show($"Your version is: {CurrentVersion}\nLatest released version is: {newVersion}\nDownload this update?",
+                update = MessageBox.Show($"Your version: {CurrentVersion}\nLast release: {newVersion}\nDownload this update?",
                   "Update", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes;
             }
             catch (Exception ex)

OpenHardwareMonitorLib/Hardware/Memory/GenericWindowsMemory.cs

@@ -5,34 +5,34 @@ namespace OpenHardwareMonitor.Hardware.Memory;
 
 internal sealed class GenericWindowsMemory : Hardware
 {
-    private readonly Sensor _totalPhysicalMemory;
+    private readonly Sensor _physicalMemoryTotal;
     private readonly Sensor _physicalMemoryAvailable;
     private readonly Sensor _physicalMemoryLoad;
     private readonly Sensor _physicalMemoryUsed;
+
+    private readonly Sensor _virtualMemoryTotal;
     private readonly Sensor _virtualMemoryAvailable;
     private readonly Sensor _virtualMemoryLoad;
     private readonly Sensor _virtualMemoryUsed;
 
-    private readonly Sensor _commitLimit;
-    private readonly Sensor _currentCommit;
     private readonly Sensor _kernelSize;
+
     private readonly Sensor _processCount;
     private readonly Sensor _threadCount;
     private readonly Sensor _handleCount;
 
     public GenericWindowsMemory(string name, ISettings settings) : base(name, new Identifier("ram"), settings)
     {
-        ActivateSensor(_physicalMemoryLoad = new Sensor("Memory", 0, SensorType.Load, this, settings));
+        ActivateSensor(_physicalMemoryLoad = new Sensor("Physical Memory", 0, SensorType.Load, this, settings));
         ActivateSensor(_virtualMemoryLoad = new Sensor("Virtual Memory", 1, SensorType.Load, this, settings));
 
-        ActivateSensor(_totalPhysicalMemory = new Sensor("Total Physical Memory", 0, SensorType.Data, this, settings));
-        ActivateSensor(_physicalMemoryUsed = new Sensor("Memory Used", 1, SensorType.Data, this, settings));
-        ActivateSensor(_physicalMemoryAvailable = new Sensor("Memory Available", 2, SensorType.Data, this, settings));
-        ActivateSensor(_virtualMemoryUsed = new Sensor("Virtual Memory Used", 3, SensorType.Data, this, settings));
-        ActivateSensor(_virtualMemoryAvailable = new Sensor("Virtual Memory Available", 4, SensorType.Data, this, settings));
-        ActivateSensor(_commitLimit = new Sensor("Virtual memory commit limit", 5, SensorType.Data, this, settings));
-        ActivateSensor(_currentCommit = new Sensor("Virtual memory in use", 6, SensorType.Data, this, settings));
-        ActivateSensor(_kernelSize = new Sensor("Kernel memory usage", 7, SensorType.Data, this, settings));
+        ActivateSensor(_physicalMemoryTotal = new Sensor("Physical Memory Total", 0, SensorType.Data, this, settings));
+        ActivateSensor(_physicalMemoryUsed = new Sensor("Physical Memory Used", 1, SensorType.Data, this, settings));
+        ActivateSensor(_physicalMemoryAvailable = new Sensor("Physical Memory Available", 2, SensorType.Data, this, settings));
+        ActivateSensor(_virtualMemoryTotal = new Sensor("Virtual Memory Total", 3, SensorType.Data, this, settings));
+        ActivateSensor(_virtualMemoryUsed = new Sensor("Virtual Memory Used", 4, SensorType.Data, this, settings));
+        ActivateSensor(_virtualMemoryAvailable = new Sensor("Virtual Memory Available", 5, SensorType.Data, this, settings));
+        ActivateSensor(_kernelSize = new Sensor("Kernel memory usage", 6, SensorType.Data, this, settings));
 
         ActivateSensor(_processCount = new Sensor("Processes", 0, SensorType.IntFactor, this, settings));
         ActivateSensor(_threadCount = new Sensor("Threads", 1, SensorType.IntFactor, this, settings));
@@ -46,7 +46,7 @@ public override void Update()
         Kernel32.MEMORYSTATUSEX status = new() { dwLength = (uint)Marshal.SizeOf<Kernel32.MEMORYSTATUSEX>() };
         if (Kernel32.GlobalMemoryStatusEx(ref status))
         {
-            _totalPhysicalMemory.Value = (float)status.ullTotalPhys / (1024 * 1024 * 1024);
+            _physicalMemoryTotal.Value = (float)status.ullTotalPhys / (1024 * 1024 * 1024);
             _physicalMemoryUsed.Value = (float)(status.ullTotalPhys - status.ullAvailPhys) / (1024 * 1024 * 1024);
             _physicalMemoryAvailable.Value = (float)status.ullAvailPhys / (1024 * 1024 * 1024);
             _physicalMemoryLoad.Value = 100.0f - 100.0f * status.ullAvailPhys / status.ullTotalPhys;
@@ -60,8 +60,8 @@ public override void Update()
         Kernel32.PERFORMANCE_INFORMATION performanceInfo = new() { cb = (uint)Marshal.SizeOf<Kernel32.PERFORMANCE_INFORMATION>() };
         if (Kernel32.GetPerformanceInfo(ref performanceInfo, performanceInfo.cb))
         {
-            _commitLimit.Value = (float)performanceInfo.CommitLimit * performanceInfo.PageSize / (1024 * 1024 * 1024);
-            _currentCommit.Value = (float)performanceInfo.CommitTotal * performanceInfo.PageSize / (1024 * 1024 * 1024);
+            _virtualMemoryTotal.Value = (float)performanceInfo.CommitLimit * performanceInfo.PageSize / (1024 * 1024 * 1024);
+            //_virtualMemoryUsed.Value = (float)performanceInfo.CommitTotal * performanceInfo.PageSize / (1024 * 1024 * 1024);
             _kernelSize.Value = (float)performanceInfo.KernelNonpaged * performanceInfo.PageSize / (1024 * 1024 * 1024);
 
             _processCount.Value = performanceInfo.ProcessCount;

OpenHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs

@@ -8,7 +8,7 @@ internal class MemoryGroup : IGroup
 
     public MemoryGroup(ISettings settings)
     {
-        _hardware = new Hardware[] { Software.OperatingSystem.IsUnix ? new GenericLinuxMemory("Generic Memory", settings) : new GenericWindowsMemory("Generic Memory", settings) };
+        _hardware = [Software.OperatingSystem.IsUnix ? new GenericLinuxMemory("Memory", settings) : new GenericWindowsMemory("Memory", settings)];
     }
 
     public string GetReport()