Fix crash of LibreHardwareMonitorLib using Linux and Net5 / Add RAM support for linux (#573)

Thanks to @Tederean.
This commit is contained in:
Florian Porsch
2022-02-07 17:18:16 +01:00
committed by GitHub
parent 5152b435fc
commit ca615c952f
6 changed files with 119 additions and 7 deletions
@@ -19,6 +19,9 @@ namespace LibreHardwareMonitor.Hardware
public static bool Open()
{
if (Software.OperatingSystem.IsUnix)
return false;
if (IsOpen)
return true;
@@ -0,0 +1,96 @@
// 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/.
// Copyright (C) LibreHardwareMonitor and Contributors.
// Partial Copyright (C) Michael Möller <mmoeller@openhardwaremonitor.org> and Contributors.
// All Rights Reserved.
using System.IO;
using System.Linq;
namespace LibreHardwareMonitor.Hardware.Memory
{
internal sealed class GenericLinuxMemory : Hardware
{
private readonly Sensor _physicalMemoryAvailable;
private readonly Sensor _physicalMemoryLoad;
private readonly Sensor _physicalMemoryUsed;
private readonly Sensor _virtualMemoryAvailable;
private readonly Sensor _virtualMemoryLoad;
private readonly Sensor _virtualMemoryUsed;
public override HardwareType HardwareType => HardwareType.Memory;
public GenericLinuxMemory(string name, ISettings settings) : base(name, new Identifier("ram"), settings)
{
_physicalMemoryUsed = new Sensor("Memory Used", 0, SensorType.Data, this, settings);
ActivateSensor(_physicalMemoryUsed);
_physicalMemoryAvailable = new Sensor("Memory Available", 1, SensorType.Data, this, settings);
ActivateSensor(_physicalMemoryAvailable);
_physicalMemoryLoad = new Sensor("Memory", 0, SensorType.Load, this, settings);
ActivateSensor(_physicalMemoryLoad);
_virtualMemoryUsed = new Sensor("Virtual Memory Used", 2, SensorType.Data, this, settings);
ActivateSensor(_virtualMemoryUsed);
_virtualMemoryAvailable = new Sensor("Virtual Memory Available", 3, SensorType.Data, this, settings);
ActivateSensor(_virtualMemoryAvailable);
_virtualMemoryLoad = new Sensor("Virtual Memory", 1, SensorType.Load, this, settings);
ActivateSensor(_virtualMemoryLoad);
}
public override void Update()
{
try
{
var memoryInfo = File.ReadAllLines("/proc/meminfo");
{
var totalMemory_GB = GetMemInfoValue(memoryInfo.First(entry => entry.StartsWith("MemTotal:"))) / 1024.0f / 1024.0f;
var freeMemory_GB = GetMemInfoValue(memoryInfo.First(entry => entry.StartsWith("MemFree:"))) / 1024.0f / 1024.0f;
var cachedMemory_GB = GetMemInfoValue(memoryInfo.First(entry => entry.StartsWith("Cached:"))) / 1024.0f / 1024.0f;
var usedMemory_GB = totalMemory_GB - freeMemory_GB - cachedMemory_GB;
_physicalMemoryUsed.Value = usedMemory_GB;
_physicalMemoryAvailable.Value = totalMemory_GB;
_physicalMemoryLoad.Value = 100.0f * (usedMemory_GB / totalMemory_GB);
}
{
var totalSwapMemory_GB = GetMemInfoValue(memoryInfo.First(entry => entry.StartsWith("SwapTotal"))) / 1024.0f / 1024.0f;
var freeSwapMemory_GB = GetMemInfoValue(memoryInfo.First(entry => entry.StartsWith("SwapFree"))) / 1024.0f / 1024.0f;
var usedSwapMemory_GB = totalSwapMemory_GB - freeSwapMemory_GB;
_virtualMemoryUsed.Value = usedSwapMemory_GB;
_virtualMemoryAvailable.Value = totalSwapMemory_GB;
_virtualMemoryLoad.Value = 100.0f * (usedSwapMemory_GB / totalSwapMemory_GB);
}
}
catch
{
_physicalMemoryUsed.Value = null;
_physicalMemoryAvailable.Value = null;
_physicalMemoryLoad.Value = null;
_virtualMemoryUsed.Value = null;
_virtualMemoryAvailable.Value = null;
_virtualMemoryLoad.Value = null;
}
}
private long GetMemInfoValue(string line)
{
// Example: "MemTotal: 32849676 kB"
var valueWithUnit = line.Split(':').Skip(1).First().Trim();
var valueAsString = valueWithUnit.Split(' ').First();
return long.Parse(valueAsString);
}
}
}
@@ -9,7 +9,7 @@ using LibreHardwareMonitor.Interop;
namespace LibreHardwareMonitor.Hardware.Memory
{
internal sealed class GenericMemory : Hardware
internal sealed class GenericWindowsMemory : Hardware
{
private readonly Sensor _physicalMemoryAvailable;
private readonly Sensor _physicalMemoryLoad;
@@ -18,7 +18,7 @@ namespace LibreHardwareMonitor.Hardware.Memory
private readonly Sensor _virtualMemoryLoad;
private readonly Sensor _virtualMemoryUsed;
public GenericMemory(string name, ISettings settings) : base(name, new Identifier("ram"), settings)
public GenericWindowsMemory(string name, ISettings settings) : base(name, new Identifier("ram"), settings)
{
_physicalMemoryUsed = new Sensor("Memory Used", 0, SensorType.Data, this, settings);
ActivateSensor(_physicalMemoryUsed);
@@ -14,13 +14,14 @@ namespace LibreHardwareMonitor.Hardware.Memory
public MemoryGroup(ISettings settings)
{
// No implementation for RAM on Unix systems
if (Software.OperatingSystem.IsUnix)
{
_hardware = new Hardware[0];
return;
_hardware = new Hardware[] { new GenericLinuxMemory("Generic Memory", settings) };
}
else
{
_hardware = new Hardware[] { new GenericWindowsMemory("Generic Memory", settings) };
}
_hardware = new Hardware[] { new GenericMemory("Generic Memory", settings) };
}
public string GetReport()
@@ -225,7 +225,12 @@ namespace LibreHardwareMonitor.Hardware
if (Software.OperatingSystem.IsUnix)
{
#if NETFRAMEWORK
Assembly assembly = Assembly.Load("Mono.Posix, Version=2.0.0.0, Culture=neutral, " + "PublicKeyToken=0738eb9f132ed756");
#else
Assembly assembly = Assembly.Load("Mono.Posix.NETStandard, Version=1.0.0.0, Culture=neutral");
#endif
Type sysCall = assembly.GetType("Mono.Unix.Native.Syscall");
MethodInfo mmap = sysCall.GetMethod("mmap");
@@ -265,7 +270,12 @@ namespace LibreHardwareMonitor.Hardware
if (Software.OperatingSystem.IsUnix)
{
#if NETFRAMEWORK
Assembly assembly = Assembly.Load("Mono.Posix, Version=2.0.0.0, Culture=neutral, " + "PublicKeyToken=0738eb9f132ed756");
#else
Assembly assembly = Assembly.Load("Mono.Posix.NETStandard, Version=1.0.0.0, Culture=neutral");
#endif
Type sysCall = assembly.GetType("Mono.Unix.Native.Syscall");
MethodInfo method = sysCall.GetMethod("munmap");
method?.Invoke(null, new object[] { _codeBuffer, _size });
@@ -37,12 +37,14 @@
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.Management" Version="5.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="HidSharp" Version="2.1.0" />
@@ -54,4 +56,4 @@
<PackagePath></PackagePath>
</None>
</ItemGroup>
</Project>
</Project>