mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-08-31 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the hardware monitoring code into a library (Issue 101).

Browse Source
This commit is contained in:
Michael Möller
2010-08-08 13:57:26 +00:00
parent 9f90d4063b
commit a2650ba983
59 changed files with 698 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Hardware/CPU/IntelCPU.cs
View File

@@ -37,7 +37,6 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Diagnostics;
using System.Globalization;
using System.Reflection;
@@ -46,14 +45,13 @@ using System.Threading;
using System.Text;
namespace OpenHardwareMonitor.Hardware.CPU {
public class IntelCPU : Hardware, IHardware {
internal class IntelCPU : Hardware, IHardware {
private int processorIndex;
private CPUID[][] cpuid;
private int coreCount;
private string name;
private Image icon;
private uint family;
private uint model;
@@ -94,13 +92,12 @@ namespace OpenHardwareMonitor.Hardware.CPU {
return result;
}
public IntelCPU(int processorIndex, CPUID[][] cpuid) {
public IntelCPU(int processorIndex, CPUID[][] cpuid, ISettings settings) {
this.processorIndex = processorIndex;
this.cpuid = cpuid;
this.coreCount = cpuid.Length;
this.name = cpuid[0][0].Name;
this.icon = Utilities.EmbeddedResources.GetImage("cpu.png");
this.family = cpuid[0][0].Family;
this.model = cpuid[0][0].Model;
@@ -179,7 +176,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
"Temperature = TjMax - TSlope * Value.", tjMax[i]),
new ParameterDescription("TSlope [°C]",
"Temperature slope of the digital thermal sensor.\n" +
"Temperature = TjMax - TSlope * Value.", 1)});
"Temperature = TjMax - TSlope * Value.", 1)}, settings);
ActivateSensor(coreTemperatures[i]);
}
} else {
@@ -187,13 +184,13 @@ namespace OpenHardwareMonitor.Hardware.CPU {
}
if (coreCount > 1)
totalLoad = new Sensor("CPU Total", 0, SensorType.Load, this);
totalLoad = new Sensor("CPU Total", 0, SensorType.Load, this, settings);
else
totalLoad = null;
coreLoads = new Sensor[coreCount];
for (int i = 0; i < coreLoads.Length; i++)
coreLoads[i] = new Sensor(CoreString(i), i + 1,
SensorType.Load, this);
SensorType.Load, this, settings);
cpuLoad = new CPULoad(cpuid);
if (cpuLoad.IsAvailable) {
foreach (Sensor sensor in coreLoads)
@@ -229,11 +226,11 @@ namespace OpenHardwareMonitor.Hardware.CPU {
lastTimeStampCount = 0;
lastTime = 0;
busClock = new Sensor("Bus Speed", 0, SensorType.Clock, this);
busClock = new Sensor("Bus Speed", 0, SensorType.Clock, this, settings);
coreClocks = new Sensor[coreCount];
for (int i = 0; i < coreClocks.Length; i++) {
coreClocks[i] =
new Sensor(CoreString(i), i + 1, SensorType.Clock, this);
new Sensor(CoreString(i), i + 1, SensorType.Clock, this, settings);
if (hasTSC)
ActivateSensor(coreClocks[i]);
}
@@ -249,8 +246,8 @@ namespace OpenHardwareMonitor.Hardware.CPU {
get { return new Identifier("intelcpu", processorIndex.ToString()); }
}
public override Image Icon {
get { return icon; }
public override HardwareType HardwareType {
get { return HardwareType.CPU; }
}
private void AppendMSRData(StringBuilder r, uint msr, int thread) {