fix(capelin): Eliminate unnecessary double to long conversions

This change eliminates the unnecessary conversions from double to long
in the Capelin metric processing code.

4 files changed, 56 insertions, 56 deletions

diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt
index 16358817..be94593c 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMetricExporter.kt
@@ -65,12 +65,12 @@ public class ExperimentMetricExporter(
         for ((id, hostMetric) in hostMetrics) {
             val lastHostMetric = lastHostMetrics.getOrDefault(id, hostMetricsSingleton)
             val host = hosts.getValue(id)
-            monitor.reportHostSlice(
+            monitor.reportHostData(
                 clock.millis(),
-                (hostMetric.requestedBurst - lastHostMetric.requestedBurst).toLong(),
-                (hostMetric.grantedBurst - lastHostMetric.grantedBurst).toLong(),
-                (hostMetric.overcommissionedBurst - lastHostMetric.overcommissionedBurst).toLong(),
-                (hostMetric.interferedBurst - lastHostMetric.interferedBurst).toLong(),
+                hostMetric.requestedBurst - lastHostMetric.requestedBurst,
+                hostMetric.grantedBurst - lastHostMetric.grantedBurst,
+                hostMetric.overcommissionedBurst - lastHostMetric.overcommissionedBurst,
+                hostMetric.interferedBurst - lastHostMetric.interferedBurst,
                 hostMetric.cpuUsage,
                 hostMetric.cpuDemand,
                 hostMetric.powerDraw,
@@ -141,7 +141,7 @@ public class ExperimentMetricExporter(
         val hosts = metrics["hosts.total"]?.longSumData?.points?.last()?.value?.toInt() ?: 0
         val availableHosts = metrics["hosts.available"]?.longSumData?.points?.last()?.value?.toInt() ?: 0
 
-        monitor.reportProvisionerMetrics(
+        monitor.reportServiceData(
             clock.millis(),
             hosts,
             availableHosts,
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt
index 79af88fe..9a4aec35 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ExperimentMonitor.kt
@@ -44,23 +44,23 @@ public interface ExperimentMonitor : AutoCloseable {
     /**
      * This method is invoked for a host for each slice that is finishes.
      */
-    public fun reportHostSlice(
+    public fun reportHostData(
         time: Long,
-        requestedBurst: Long,
-        grantedBurst: Long,
-        overcommissionedBurst: Long,
-        interferedBurst: Long,
+        totalWork: Double,
+        grantedWork: Double,
+        overcommittedWork: Double,
+        interferedWork: Double,
         cpuUsage: Double,
         cpuDemand: Double,
         powerDraw: Double,
-        numberOfDeployedImages: Int,
+        instanceCount: Int,
         host: Host
     ) {}
 
     /**
-     * This method is invoked for a provisioner event.
+     * This method is invoked for reporting service data.
      */
-    public fun reportProvisionerMetrics(
+    public fun reportServiceData(
         time: Long,
         totalHostCount: Int,
         availableHostCount: Int,
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt
index d314c6f5..83351c41 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/monitor/ParquetExperimentMonitor.kt
@@ -57,16 +57,16 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
         logger.debug { "Host ${host.uid} changed state $newState [$time]" }
     }
 
-    override fun reportHostSlice(
+    override fun reportHostData(
         time: Long,
-        requestedBurst: Long,
-        grantedBurst: Long,
-        overcommissionedBurst: Long,
-        interferedBurst: Long,
+        totalWork: Double,
+        grantedWork: Double,
+        overcommittedWork: Double,
+        interferedWork: Double,
         cpuUsage: Double,
         cpuDemand: Double,
         powerDraw: Double,
-        numberOfDeployedImages: Int,
+        instanceCount: Int,
         host: Host
     ) {
         hostWriter.write(
@@ -74,11 +74,11 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
                 time,
                 5 * 60 * 1000L,
                 host,
-                numberOfDeployedImages,
-                requestedBurst.toLong(),
-                grantedBurst.toLong(),
-                overcommissionedBurst.toLong(),
-                interferedBurst.toLong(),
+                instanceCount,
+                totalWork.toLong(),
+                grantedWork.toLong(),
+                overcommittedWork.toLong(),
+                interferedWork.toLong(),
                 cpuUsage,
                 cpuDemand,
                 powerDraw,
@@ -87,7 +87,7 @@ public class ParquetExperimentMonitor(base: File, partition: String, bufferSize:
         )
     }
 
-    override fun reportProvisionerMetrics(
+    override fun reportServiceData(
         time: Long,
         totalHostCount: Int,
         availableHostCount: Int,
diff --git a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
index 9b98b329..8008c944 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
@@ -120,10 +120,10 @@ class CapelinIntegrationTest {
             { assertEquals(0, monitorResults.runningVms, "All VMs should finish after a run") },
             { assertEquals(0, monitorResults.unscheduledVms, "No VM should not be unscheduled") },
             { assertEquals(0, monitorResults.queuedVms, "No VM should not be in the queue") },
-            { assertEquals(220346369672, monitor.totalRequestedBurst) { "Incorrect requested burst" } },
-            { assertEquals(206667809431, monitor.totalGrantedBurst) { "Incorrect granted burst" } },
-            { assertEquals(1151611104, monitor.totalOvercommissionedBurst) { "Incorrect overcommitted burst" } },
-            { assertEquals(0, monitor.totalInterferedBurst) { "Incorrect interfered burst" } }
+            { assertEquals(220346369753, monitor.totalWork) { "Incorrect requested burst" } },
+            { assertEquals(206667809529, monitor.totalGrantedWork) { "Incorrect granted burst" } },
+            { assertEquals(1151611104, monitor.totalOvercommittedWork) { "Incorrect overcommitted burst" } },
+            { assertEquals(0, monitor.totalInterferedWork) { "Incorrect interfered burst" } }
         )
     }
 
@@ -160,10 +160,10 @@ class CapelinIntegrationTest {
 
         // Note that these values have been verified beforehand
         assertAll(
-            { assertEquals(38051879542, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
-            { assertEquals(34888186396, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
-            { assertEquals(971668973, monitor.totalOvercommissionedBurst) { "Total overcommitted work incorrect" } },
-            { assertEquals(0, monitor.totalInterferedBurst) { "Total interfered work incorrect" } }
+            { assertEquals(38051879552, monitor.totalWork) { "Total requested work incorrect" } },
+            { assertEquals(34888186408, monitor.totalGrantedWork) { "Total granted work incorrect" } },
+            { assertEquals(971668973, monitor.totalOvercommittedWork) { "Total overcommitted work incorrect" } },
+            { assertEquals(0, monitor.totalInterferedWork) { "Total interfered work incorrect" } }
         )
     }
 
@@ -204,10 +204,10 @@ class CapelinIntegrationTest {
 
         // Note that these values have been verified beforehand
         assertAll(
-            { assertEquals(38051879542, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
-            { assertEquals(34888186396, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
-            { assertEquals(971668973, monitor.totalOvercommissionedBurst) { "Total overcommitted work incorrect" } },
-            { assertEquals(13910799, monitor.totalInterferedBurst) { "Total interfered work incorrect" } }
+            { assertEquals(38051879552, monitor.totalWork) { "Total requested work incorrect" } },
+            { assertEquals(34888186408, monitor.totalGrantedWork) { "Total granted work incorrect" } },
+            { assertEquals(971668973, monitor.totalOvercommittedWork) { "Total overcommitted work incorrect" } },
+            { assertEquals(13910814, monitor.totalInterferedWork) { "Total interfered work incorrect" } }
         )
     }
 
@@ -256,10 +256,10 @@ class CapelinIntegrationTest {
 
         // Note that these values have been verified beforehand
         assertAll(
-            { assertEquals(25412073100, monitor.totalRequestedBurst) { "Total requested work incorrect" } },
-            { assertEquals(23695061847, monitor.totalGrantedBurst) { "Total granted work incorrect" } },
-            { assertEquals(368502468, monitor.totalOvercommissionedBurst) { "Total overcommitted work incorrect" } },
-            { assertEquals(0, monitor.totalInterferedBurst) { "Total interfered work incorrect" } }
+            { assertEquals(25412073109, monitor.totalWork) { "Total requested work incorrect" } },
+            { assertEquals(23695061858, monitor.totalGrantedWork) { "Total granted work incorrect" } },
+            { assertEquals(368502468, monitor.totalOvercommittedWork) { "Total overcommitted work incorrect" } },
+            { assertEquals(0, monitor.totalInterferedWork) { "Total interfered work incorrect" } }
         )
     }
 
@@ -283,27 +283,27 @@ class CapelinIntegrationTest {
     }
 
     class TestExperimentReporter : ExperimentMonitor {
-        var totalRequestedBurst = 0L
-        var totalGrantedBurst = 0L
-        var totalOvercommissionedBurst = 0L
-        var totalInterferedBurst = 0L
+        var totalWork = 0L
+        var totalGrantedWork = 0L
+        var totalOvercommittedWork = 0L
+        var totalInterferedWork = 0L
 
-        override fun reportHostSlice(
+        override fun reportHostData(
             time: Long,
-            requestedBurst: Long,
-            grantedBurst: Long,
-            overcommissionedBurst: Long,
-            interferedBurst: Long,
+            totalWork: Double,
+            grantedWork: Double,
+            overcommittedWork: Double,
+            interferedWork: Double,
             cpuUsage: Double,
             cpuDemand: Double,
             powerDraw: Double,
-            numberOfDeployedImages: Int,
+            instanceCount: Int,
             host: Host,
         ) {
-            totalRequestedBurst += requestedBurst.toLong()
-            totalGrantedBurst += grantedBurst.toLong()
-            totalOvercommissionedBurst += overcommissionedBurst.toLong()
-            totalInterferedBurst += interferedBurst.toLong()
+            this.totalWork += totalWork.toLong()
+            totalGrantedWork += grantedWork.toLong()
+            totalOvercommittedWork += overcommittedWork.toLong()
+            totalInterferedWork += interferedWork.toLong()
         }
 
         override fun close() {}