summaryrefslogtreecommitdiff
path: root/opendc-compute
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-08-25 21:03:34 +0200
committerGitHub <noreply@github.com>2021-08-25 21:03:34 +0200
commit719d4eb5856ecfe1900b305e682c3c5b7749793c (patch)
tree276eddd32297cf370ca37504ac0ef770f55ec4fe /opendc-compute
parent4f333808d823abadd603ef2221092d82dc0f02b4 (diff)
parentb0f6402f60ddbba1aad7e198fe6757792337f4d4 (diff)
merge: Measure power draw in SimHost without PSU overhead
This pull request implements power draw reporting in SimHost where the power draw is computed without PSU overhead. * Remove usage and speed fields from SimMachine * Measure power draw without PSU overhead **Breaking API Changes** * `SimMachine.usage` and `SimMachine.speed` fields are removed.
Diffstat (limited to 'opendc-compute')
-rw-r--r--opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
index dcc525cb..20e5a9db 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
@@ -114,7 +114,7 @@ public class SimHost(
_interferedWork.add(interferedWork)
_cpuDemand.record(cpuDemand)
_cpuUsage.record(cpuUsage)
- _powerUsage.record(machine.psu.powerDraw)
+ _powerUsage.record(machine.powerDraw)
}
}
)