summaryrefslogtreecommitdiff
path: root/opendc-web/opendc-web-runner/src
diff options
context:
space:
mode:
Diffstat (limited to 'opendc-web/opendc-web-runner/src')
-rw-r--r--opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebExperimentMonitor.kt24
1 files changed, 12 insertions, 12 deletions
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebExperimentMonitor.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebExperimentMonitor.kt
index 140f067a..82e2a334 100644
--- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebExperimentMonitor.kt
+++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/WebExperimentMonitor.kt
@@ -43,16 +43,16 @@ public class WebExperimentMonitor : ExperimentMonitor {
logger.debug { "Host ${host.uid} changed state $newState [$time]" }
}
- override fun reportHostSlice(
+ override fun reportHostData(
time: Long,
- requestedBurst: Double,
- grantedBurst: Double,
- overcommissionedBurst: Double,
- interferedBurst: Double,
+ totalWork: Double,
+ grantedWork: Double,
+ overcommittedWork: Double,
+ interferedWork: Double,
cpuUsage: Double,
cpuDemand: Double,
powerDraw: Double,
- numberOfDeployedImages: Int,
+ instanceCount: Int,
host: Host,
) {
processHostEvent(
@@ -60,11 +60,11 @@ public class WebExperimentMonitor : ExperimentMonitor {
time,
5 * 60 * 1000L,
host,
- numberOfDeployedImages,
- requestedBurst,
- grantedBurst,
- overcommissionedBurst,
- interferedBurst,
+ instanceCount,
+ totalWork.toLong(),
+ grantedWork.toLong(),
+ overcommittedWork.toLong(),
+ interferedWork.toLong(),
cpuUsage,
cpuDemand,
powerDraw,
@@ -120,7 +120,7 @@ public class WebExperimentMonitor : ExperimentMonitor {
private var provisionerMetrics: AggregateProvisionerMetrics = AggregateProvisionerMetrics()
- override fun reportProvisionerMetrics(
+ override fun reportServiceData(
time: Long,
totalHostCount: Int,
availableHostCount: Int,