更新 GetMemoryUsage 方法的实现

删除旧实现,新增实现中移除 MemFree 处理,仅保留 MemTotal 和 MemAvailable。将单位从 KB 转换为字节,计算已用内存和内存使用率,返回内存使用率、总内存和已用内存。
This commit is contained in:
token
2024-11-20 13:46:03 +08:00
parent fcdb45412b
commit 3e09d1fa38
@@ -130,40 +130,41 @@ public class LinuxSystemUsage : ISystemUsage
}
public (float memoryUsage, ulong totalMemory, ulong useMemory) GetMemoryUsage()
{
var memInfo = ExecuteCommand("cat /proc/meminfo", "/bin/bash");
var lines = memInfo.Split('\n');
ulong totalMemory = 0;
ulong freeMemory = 0;
ulong availableMemory = 0;
{
var memInfo = ExecuteCommand("cat /proc/meminfo", "/bin/bash");
var lines = memInfo.Split('\n');
ulong totalMemory = 0;
ulong availableMemory = 0;
foreach (var line in lines)
{
var parts = line.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length < 2) continue;
foreach (var line in lines)
{
var parts = line.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length < 2) continue;
var key = parts[0].Trim();
var value = ulong.Parse(parts[1].Trim().Split(' ')[0]);
var key = parts[0].Trim();
var value = ulong.Parse(parts[1].Trim().Split(' ')[0]);
switch (key)
{
case "MemTotal":
totalMemory = value;
break;
case "MemFree":
freeMemory = value;
break;
case "MemAvailable":
availableMemory = value;
break;
}
}
switch (key)
{
case "MemTotal":
totalMemory = value;
break;
case "MemAvailable":
availableMemory = value;
break;
}
}
ulong usedMemory = totalMemory - availableMemory;
float memoryUsage = (float)usedMemory / totalMemory * 100;
// 默认单位是KB,需要转换byte
totalMemory *= 1024;
availableMemory *= 1024;
return (memoryUsage, totalMemory, usedMemory);
}
ulong usedMemory = totalMemory - availableMemory;
float memoryUsage = (float)usedMemory / totalMemory * 100;
return (memoryUsage, totalMemory, usedMemory);
}
public (float read, float write) GetDiskUsage()
{