From 48a768b873e390825178073232ce18b429cdf4c3 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 2 Nov 2020 23:21:52 +0100
Subject: Integrate event tracer in SimVirtProvisioningService

---
 .../org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt  | 6 ++++--
 .../main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt    | 6 +++++-
 .../kotlin/org/opendc/experiments/sc20/Sc20IntegrationTest.kt    | 9 +++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'simulator/opendc-experiments')

diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
index 09f44199..f939738d 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/ExperimentHelpers.kt
@@ -52,6 +52,7 @@ import org.opendc.simulator.compute.interference.PerformanceInterferenceModel
 import org.opendc.simulator.failures.CorrelatedFaultInjector
 import org.opendc.simulator.failures.FailureDomain
 import org.opendc.simulator.failures.FaultInjector
+import org.opendc.trace.core.EventTracer
 import java.io.File
 import java.time.Clock
 import kotlin.math.ln
@@ -140,7 +141,8 @@ public suspend fun createProvisioner(
     coroutineScope: CoroutineScope,
     clock: Clock,
     environmentReader: EnvironmentReader,
-    allocationPolicy: AllocationPolicy
+    allocationPolicy: AllocationPolicy,
+    eventTracer: EventTracer
 ): Pair<ProvisioningService, SimVirtProvisioningService> {
     val environment = environmentReader.use { it.construct(coroutineScope, clock) }
     val bareMetalProvisioner = environment.platforms[0].zones[0].services[ProvisioningService]
@@ -148,7 +150,7 @@ public suspend fun createProvisioner(
     // Wait for the bare metal nodes to be spawned
     delay(10)
 
-    val scheduler = SimVirtProvisioningService(coroutineScope, clock, bareMetalProvisioner, allocationPolicy)
+    val scheduler = SimVirtProvisioningService(coroutineScope, clock, bareMetalProvisioner, allocationPolicy, eventTracer)
 
     // Wait for the hypervisors to be spawned
     delay(10)
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
index 660fc882..8d8d608d 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/main/kotlin/org/opendc/experiments/sc20/experiment/Run.kt
@@ -37,6 +37,7 @@ import org.opendc.experiments.sc20.trace.Sc20ParquetTraceReader
 import org.opendc.experiments.sc20.trace.Sc20RawParquetTraceReader
 import org.opendc.format.environment.sc20.Sc20ClusterEnvironmentReader
 import org.opendc.simulator.utils.DelayControllerClockAdapter
+import org.opendc.trace.core.EventTracer
 import java.io.File
 import kotlin.random.Random
 
@@ -102,12 +103,15 @@ public data class Run(override val parent: Scenario, val id: Int, val seed: Int)
             parent.parent.parent.bufferSize
         )
 
+        val tracer = EventTracer(clock)
+
         testScope.launch {
             val (bareMetalProvisioner, scheduler) = createProvisioner(
                 this,
                 clock,
                 environment,
-                allocationPolicy
+                allocationPolicy,
+                tracer
             )
 
             val failureDomain = if (parent.operationalPhenomena.failureFrequency > 0) {
diff --git a/simulator/opendc-experiments/opendc-experiments-sc20/src/test/kotlin/org/opendc/experiments/sc20/Sc20IntegrationTest.kt b/simulator/opendc-experiments/opendc-experiments-sc20/src/test/kotlin/org/opendc/experiments/sc20/Sc20IntegrationTest.kt
index 9c44edfc..72a2484a 100644
--- a/simulator/opendc-experiments/opendc-experiments-sc20/src/test/kotlin/org/opendc/experiments/sc20/Sc20IntegrationTest.kt
+++ b/simulator/opendc-experiments/opendc-experiments-sc20/src/test/kotlin/org/opendc/experiments/sc20/Sc20IntegrationTest.kt
@@ -48,6 +48,7 @@ import org.opendc.format.environment.EnvironmentReader
 import org.opendc.format.environment.sc20.Sc20ClusterEnvironmentReader
 import org.opendc.format.trace.TraceReader
 import org.opendc.simulator.utils.DelayControllerClockAdapter
+import org.opendc.trace.core.EventTracer
 import java.io.File
 import java.time.Clock
 
@@ -97,13 +98,15 @@ class Sc20IntegrationTest {
         val traceReader = createTestTraceReader()
         val environmentReader = createTestEnvironmentReader()
         lateinit var scheduler: SimVirtProvisioningService
+        val tracer = EventTracer(clock)
 
         testScope.launch {
             val res = createProvisioner(
                 this,
                 clock,
                 environmentReader,
-                allocationPolicy
+                allocationPolicy,
+                tracer
             )
             val bareMetalProvisioner = res.first
             scheduler = res.second
@@ -160,13 +163,15 @@ class Sc20IntegrationTest {
         val traceReader = createTestTraceReader(0.5, seed)
         val environmentReader = createTestEnvironmentReader("single")
         lateinit var scheduler: SimVirtProvisioningService
+        val tracer = EventTracer(clock)
 
         testScope.launch {
             val res = createProvisioner(
                 this,
                 clock,
                 environmentReader,
-                allocationPolicy
+                allocationPolicy,
+                tracer
             )
             scheduler = res.second
 
-- 
cgit v1.2.3