JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix missing DIMM temperature sensors (#1821)

Browse Source 
* Fix missing DIMM temperature sensors

* Update MemoryGroup.cs

---------

Co-authored-by: PhyxionNL <7643972+PhyxionNL@users.noreply.github.com>
This commit is contained in:
MoshiMoshi0
2025-08-29 10:39:41 +02:00
committed by GitHub
co-authored by PhyxionNL
parent 78829b97e1
commit 418e9ec85f
1 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs
+14 -35
View File
@@ -1,4 +1,4 @@
// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. // This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. // If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
// Copyright (C) LibreHardwareMonitor and Contributors. // Copyright (C) LibreHardwareMonitor and Contributors.
// Partial Copyright (C) Michael Möller <mmoeller@openhardwaremonitor.org> and Contributors. // Partial Copyright (C) Michael Möller <mmoeller@openhardwaremonitor.org> and Contributors.
@@ -27,7 +27,7 @@ internal class MemoryGroup : IGroup, IHardwareChanged
private CancellationTokenSource _cancellationTokenSource; private CancellationTokenSource _cancellationTokenSource;
private Exception _lastException; private Exception _lastException;
private bool _opened = false; private bool _disposed = false;
public MemoryGroup(ISettings settings) public MemoryGroup(ISettings settings)
{ {
@@ -50,8 +50,6 @@ internal class MemoryGroup : IGroup, IHardwareChanged
{ {
StartRetryTask(settings); StartRetryTask(settings);
} }
_opened = true;
} }
public event HardwareEventHandler HardwareAdded; public event HardwareEventHandler HardwareAdded;
@@ -83,17 +81,17 @@ internal class MemoryGroup : IGroup, IHardwareChanged
public void Close() public void Close()
{ {
_cancellationTokenSource?.Cancel();
_cancellationTokenSource?.Dispose();
_cancellationTokenSource = null;
lock (_lock) lock (_lock)
{ {
_opened = false;
foreach (Hardware ram in _hardware) foreach (Hardware ram in _hardware)
ram.Close(); ram.Close();
_hardware.Clear(); _hardware = [];
_disposed = true;
_cancellationTokenSource?.Cancel();
_cancellationTokenSource?.Dispose();
_cancellationTokenSource = null;
} }
} }
@@ -103,9 +101,9 @@ internal class MemoryGroup : IGroup, IHardwareChanged
{ {
lock (_lock) lock (_lock)
{ {
if (!_opened) if (_disposed)
{ {
return true; return false;
} }
if (DetectThermalSensors(out List<SPDAccessor> accessors)) if (DetectThermalSensors(out List<SPDAccessor> accessors))
@@ -138,24 +136,7 @@ internal class MemoryGroup : IGroup, IHardwareChanged
if (TryAddDimms(settings)) if (TryAddDimms(settings))
{ {
lock (_lock) break;
{
if (!_opened)
{
return;
}
foreach (Hardware hardware in _hardware.OfType<DimmMemory>())
{
HardwareAdded?.Invoke(hardware);
}
_cancellationTokenSource.Dispose();
_cancellationTokenSource = null;
break;
}
} }
} }
}, _cancellationTokenSource.Token); }, _cancellationTokenSource.Token);
@@ -195,8 +176,6 @@ internal class MemoryGroup : IGroup, IHardwareChanged
private void AddDimms(List<SPDAccessor> accessors, ISettings settings) private void AddDimms(List<SPDAccessor> accessors, ISettings settings)
{ {
List<Hardware> newHardwareList = [.. _hardware];
foreach (SPDAccessor ram in accessors) foreach (SPDAccessor ram in accessors)
{ {
//Default value //Default value
@@ -207,9 +186,9 @@ internal class MemoryGroup : IGroup, IHardwareChanged
name = $"{ram.GetModuleManufacturerString()} - {ram.ModulePartNumber()} (#{ram.Index})"; name = $"{ram.GetModuleManufacturerString()} - {ram.ModulePartNumber()} (#{ram.Index})";
DimmMemory memory = new(ram, name, new Identifier($"memory/dimm/{ram.Index}"), settings); DimmMemory memory = new(ram, name, new Identifier($"memory/dimm/{ram.Index}"), settings);
newHardwareList.Add(memory);
}
_hardware = newHardwareList; _hardware.Add(memory);
HardwareAdded?.Invoke(memory);
}
} }
} }