From d7a7ccd1bc913fb1276da82caeb5c57010cfc9fb Mon Sep 17 00:00:00 2001 From: DarthDestroyer Date: Sun, 6 Dec 2015 17:20:03 +0100 Subject: [PATCH 1/6] VRAM used / free / total as Value? #753 --- Hardware/Nvidia/NvidiaGPU.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Hardware/Nvidia/NvidiaGPU.cs b/Hardware/Nvidia/NvidiaGPU.cs index 8d387b3..0acaf6c 100644 --- a/Hardware/Nvidia/NvidiaGPU.cs +++ b/Hardware/Nvidia/NvidiaGPU.cs @@ -26,6 +26,9 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { private readonly Sensor[] loads; private readonly Sensor control; private readonly Sensor memoryLoad; + private readonly Sensor memoryUsed; + private readonly Sensor memoryFree; + private readonly Sensor memoryAvail; private readonly Control fanControl; public NvidiaGPU(int adapterIndex, NvPhysicalGpuHandle handle, @@ -75,7 +78,9 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { loads[1] = new Sensor("GPU Memory Controller", 1, SensorType.Load, this, settings); loads[2] = new Sensor("GPU Video Engine", 2, SensorType.Load, this, settings); memoryLoad = new Sensor("GPU Memory", 3, SensorType.Load, this, settings); - + memoryFree = new Sensor("GPU Memory Free", 1, SensorType.Data, this, settings); + memoryUsed = new Sensor("GPU Memory Used", 2, SensorType.Data, this, settings); + memoryAvail = new Sensor("GPU Memory Total", 3, SensorType.Data, this, settings); control = new Sensor("GPU Fan", 0, SensorType.Control, this, settings); NvGPUCoolerSettings coolerSettings = GetCoolerSettings(); @@ -204,7 +209,13 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { uint totalMemory = memoryInfo.Values[0]; uint freeMemory = memoryInfo.Values[4]; float usedMemory = Math.Max(totalMemory - freeMemory, 0); + memoryFree.Value = (float)freeMemory/ 1048576; + memoryAvail.Value = (float)totalMemory/ 1048576; + memoryUsed.Value = usedMemory/ 1048576; memoryLoad.Value = 100f * usedMemory / totalMemory; + ActivateSensor(memoryAvail); + ActivateSensor(memoryUsed); + ActivateSensor(memoryFree); ActivateSensor(memoryLoad); } } From 0469416627b6ab2be23ba23e755a1c94a5c0f7b5 Mon Sep 17 00:00:00 2001 From: DarthDestroyer Date: Thu, 28 Apr 2016 19:57:12 +0200 Subject: [PATCH 2/6] Update SensorNode.cs --- GUI/SensorNode.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/GUI/SensorNode.cs b/GUI/SensorNode.cs index 876ccba..de2d452 100644 --- a/GUI/SensorNode.cs +++ b/GUI/SensorNode.cs @@ -50,6 +50,7 @@ namespace OpenHardwareMonitor.GUI { case SensorType.Level: format = "{0:F1} %"; break; case SensorType.Power: format = "{0:F1} W"; break; case SensorType.Data: format = "{0:F1} GB"; break; + case SensorType.SmallData: format = "{0:F1} MB"; break; case SensorType.Factor: format = "{0:F3}"; break; } From 6ea14cb58d2208aff5a2460874c5ee0fcc96063b Mon Sep 17 00:00:00 2001 From: DarthDestroyer Date: Thu, 28 Apr 2016 19:58:19 +0200 Subject: [PATCH 3/6] Update TypeNode.cs --- GUI/TypeNode.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GUI/TypeNode.cs b/GUI/TypeNode.cs index 95d8417..b57d58b 100644 --- a/GUI/TypeNode.cs +++ b/GUI/TypeNode.cs @@ -61,6 +61,10 @@ namespace OpenHardwareMonitor.GUI { this.Image = Utilities.EmbeddedResources.GetImage("data.png"); this.Text = "Data"; break; + case SensorType.SmallData : + this.Image = Utilities.EmbeddedResources.GetImage("data.png"); + this.Text = "Data"; + break; case SensorType.Factor: this.Image = Utilities.EmbeddedResources.GetImage("factor.png"); this.Text = "Factors"; From b3140327d90cfd42b9abe4b4fb3eb8337d185274 Mon Sep 17 00:00:00 2001 From: DarthDestroyer Date: Thu, 28 Apr 2016 19:58:59 +0200 Subject: [PATCH 4/6] Update ISensor.cs --- Hardware/ISensor.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Hardware/ISensor.cs b/Hardware/ISensor.cs index fdc2d7a..e157949 100644 --- a/Hardware/ISensor.cs +++ b/Hardware/ISensor.cs @@ -26,6 +26,7 @@ namespace OpenHardwareMonitor.Hardware { Factor, // 1 Power, // W Data, // GB = 2^30 Bytes + SmallData, // MB = 2^20 Bytes } public struct SensorValue { From 51c6d776e1e802c3e3b9670a627d0c2b9c8c11ac Mon Sep 17 00:00:00 2001 From: DarthDestroyer Date: Thu, 28 Apr 2016 19:59:52 +0200 Subject: [PATCH 5/6] Update NvidiaGPU.cs --- Hardware/Nvidia/NvidiaGPU.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hardware/Nvidia/NvidiaGPU.cs b/Hardware/Nvidia/NvidiaGPU.cs index 0acaf6c..89b0004 100644 --- a/Hardware/Nvidia/NvidiaGPU.cs +++ b/Hardware/Nvidia/NvidiaGPU.cs @@ -78,9 +78,9 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { loads[1] = new Sensor("GPU Memory Controller", 1, SensorType.Load, this, settings); loads[2] = new Sensor("GPU Video Engine", 2, SensorType.Load, this, settings); memoryLoad = new Sensor("GPU Memory", 3, SensorType.Load, this, settings); - memoryFree = new Sensor("GPU Memory Free", 1, SensorType.Data, this, settings); - memoryUsed = new Sensor("GPU Memory Used", 2, SensorType.Data, this, settings); - memoryAvail = new Sensor("GPU Memory Total", 3, SensorType.Data, this, settings); + memoryFree = new Sensor("GPU Memory Free", 1, SensorType.SmallData, this, settings); + memoryUsed = new Sensor("GPU Memory Used", 2, SensorType.SmallData, this, settings); + memoryAvail = new Sensor("GPU Memory Total", 3, SensorType.SmallData, this, settings); control = new Sensor("GPU Fan", 0, SensorType.Control, this, settings); NvGPUCoolerSettings coolerSettings = GetCoolerSettings(); @@ -209,9 +209,9 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { uint totalMemory = memoryInfo.Values[0]; uint freeMemory = memoryInfo.Values[4]; float usedMemory = Math.Max(totalMemory - freeMemory, 0); - memoryFree.Value = (float)freeMemory/ 1048576; - memoryAvail.Value = (float)totalMemory/ 1048576; - memoryUsed.Value = usedMemory/ 1048576; + memoryFree.Value = (float)freeMemory/ 1024; + memoryAvail.Value = (float)totalMemory/ 1024; + memoryUsed.Value = usedMemory/ 1024; memoryLoad.Value = 100f * usedMemory / totalMemory; ActivateSensor(memoryAvail); ActivateSensor(memoryUsed); From 4f87cc3bb47d5ceaab11fde117fe719ad2deb6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=B6ller?= Date: Sun, 6 Nov 2016 12:15:29 +0100 Subject: [PATCH 6/6] Corrected the source code format. --- Hardware/Nvidia/NvidiaGPU.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hardware/Nvidia/NvidiaGPU.cs b/Hardware/Nvidia/NvidiaGPU.cs index 89b0004..a7268c1 100644 --- a/Hardware/Nvidia/NvidiaGPU.cs +++ b/Hardware/Nvidia/NvidiaGPU.cs @@ -210,12 +210,12 @@ namespace OpenHardwareMonitor.Hardware.Nvidia { uint freeMemory = memoryInfo.Values[4]; float usedMemory = Math.Max(totalMemory - freeMemory, 0); memoryFree.Value = (float)freeMemory/ 1024; - memoryAvail.Value = (float)totalMemory/ 1024; - memoryUsed.Value = usedMemory/ 1024; + memoryAvail.Value = (float)totalMemory/ 1024; + memoryUsed.Value = usedMemory/ 1024; memoryLoad.Value = 100f * usedMemory / totalMemory; ActivateSensor(memoryAvail); - ActivateSensor(memoryUsed); - ActivateSensor(memoryFree); + ActivateSensor(memoryUsed); + ActivateSensor(memoryFree); ActivateSensor(memoryLoad); } }