Eliminate use of Domain and simulationContext in OpenDC

This change takes the first step in eliminating the explict use of
Domain and simulationContext from OpenDC. In this way, we decouple the
logic of various datacenter services from simulation logic, which should
promote re-use.

9 files changed, 66 insertions, 32 deletions

diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt
index 1c3f70e6..4c4dcf37 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/EnvironmentReader.kt
@@ -24,8 +24,8 @@
 
 package com.atlarge.opendc.format.environment
 
-import com.atlarge.odcsim.Domain
 import com.atlarge.opendc.core.Environment
+import kotlinx.coroutines.CoroutineScope
 import java.io.Closeable
 
 /**
@@ -33,7 +33,7 @@ import java.io.Closeable
  */
 interface EnvironmentReader : Closeable {
     /**
-     * Construct an [Environment] in the specified domain.
+     * Construct an [Environment] in the specified [CoroutineScope].
      */
-    suspend fun construct(dom: Domain): Environment
+    suspend fun construct(coroutineScope: CoroutineScope): Environment
 }
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
index a9aa3337..2b608aef 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
@@ -24,7 +24,7 @@
 
 package com.atlarge.opendc.format.environment.sc18
 
-import com.atlarge.odcsim.Domain
+import com.atlarge.odcsim.simulationContext
 import com.atlarge.opendc.compute.core.MemoryUnit
 import com.atlarge.opendc.compute.core.ProcessingNode
 import com.atlarge.opendc.compute.core.ProcessingUnit
@@ -39,6 +39,7 @@ import com.atlarge.opendc.format.environment.EnvironmentReader
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
+import kotlinx.coroutines.CoroutineScope
 import java.io.InputStream
 import java.util.UUID
 
@@ -55,8 +56,8 @@ class Sc18EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
      */
     private val setup: Setup = mapper.readValue(input)
 
-    override suspend fun construct(dom: Domain): Environment {
-        val provisioningDomain = dom.newDomain("provisioner")
+    override suspend fun construct(coroutineScope: CoroutineScope): Environment {
+        val clock = simulationContext.clock
 
         var counter = 0
         val nodes = setup.rooms.flatMap { room ->
@@ -78,7 +79,8 @@ class Sc18EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
                                 }
                             }
                             SimpleBareMetalDriver(
-                                dom.newDomain("node-$counter"),
+                                coroutineScope,
+                                clock,
                                 UUID.randomUUID(),
                                 "node-${counter++}",
                                 emptyMap(),
@@ -91,14 +93,16 @@ class Sc18EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
             }
         }
 
-        val provisioningService = SimpleProvisioningService(provisioningDomain)
+        val provisioningService = SimpleProvisioningService()
         for (node in nodes) {
             provisioningService.create(node)
         }
 
         val serviceRegistry = ServiceRegistry().put(ProvisioningService, provisioningService)
         val platform = Platform(
-            UUID.randomUUID(), "sc18-platform", listOf(
+            UUID.randomUUID(),
+            "sc18-platform",
+            listOf(
                 Zone(UUID.randomUUID(), "zone", serviceRegistry)
             )
         )
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
index e34ee2dc..49118675 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
@@ -24,7 +24,7 @@
 
 package com.atlarge.opendc.format.environment.sc20
 
-import com.atlarge.odcsim.Domain
+import com.atlarge.odcsim.simulationContext
 import com.atlarge.opendc.compute.core.MemoryUnit
 import com.atlarge.opendc.compute.core.ProcessingNode
 import com.atlarge.opendc.compute.core.ProcessingUnit
@@ -38,6 +38,7 @@ import com.atlarge.opendc.core.Platform
 import com.atlarge.opendc.core.Zone
 import com.atlarge.opendc.core.services.ServiceRegistry
 import com.atlarge.opendc.format.environment.EnvironmentReader
+import kotlinx.coroutines.CoroutineScope
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -56,7 +57,9 @@ class Sc20ClusterEnvironmentReader(
     constructor(file: File) : this(FileInputStream(file))
 
     @Suppress("BlockingMethodInNonBlockingContext")
-    override suspend fun construct(dom: Domain): Environment {
+    override suspend fun construct(coroutineScope: CoroutineScope): Environment {
+        val clock = simulationContext.clock
+
         var clusterIdCol = 0
         var speedCol = 0
         var numberOfHostsCol = 0
@@ -105,7 +108,8 @@ class Sc20ClusterEnvironmentReader(
                     repeat(numberOfHosts) {
                         nodes.add(
                             SimpleBareMetalDriver(
-                                dom.newDomain("node-$clusterId-$it"),
+                                coroutineScope,
+                                clock,
                                 UUID(random.nextLong(), random.nextLong()),
                                 "node-$clusterId-$it",
                                 mapOf(NODE_CLUSTER to clusterId),
@@ -123,7 +127,7 @@ class Sc20ClusterEnvironmentReader(
                 }
         }
 
-        val provisioningService = SimpleProvisioningService(dom.newDomain("provisioner"))
+        val provisioningService = SimpleProvisioningService()
         for (node in nodes) {
             provisioningService.create(node)
         }
@@ -131,7 +135,9 @@ class Sc20ClusterEnvironmentReader(
         val serviceRegistry = ServiceRegistry().put(ProvisioningService, provisioningService)
 
         val platform = Platform(
-            UUID.randomUUID(), "sc20-platform", listOf(
+            UUID.randomUUID(),
+            "sc20-platform",
+            listOf(
                 Zone(UUID.randomUUID(), "zone", serviceRegistry)
             )
         )
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20EnvironmentReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
index 4b5d6fb7..f22f595f 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
@@ -24,7 +24,7 @@
 
 package com.atlarge.opendc.format.environment.sc20
 
-import com.atlarge.odcsim.Domain
+import com.atlarge.odcsim.simulationContext
 import com.atlarge.opendc.compute.core.MemoryUnit
 import com.atlarge.opendc.compute.core.ProcessingNode
 import com.atlarge.opendc.compute.core.ProcessingUnit
@@ -40,6 +40,7 @@ import com.atlarge.opendc.format.environment.EnvironmentReader
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
+import kotlinx.coroutines.CoroutineScope
 import java.io.InputStream
 import java.util.UUID
 
@@ -55,7 +56,8 @@ class Sc20EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
      */
     private val setup: Setup = mapper.readValue(input)
 
-    override suspend fun construct(dom: Domain): Environment {
+    override suspend fun construct(coroutineScope: CoroutineScope): Environment {
+        val clock = simulationContext.clock
         var counter = 0
         val nodes = setup.rooms.flatMap { room ->
             room.objects.flatMap { roomObject ->
@@ -82,7 +84,8 @@ class Sc20EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
                                 }
                             }
                             SimpleBareMetalDriver(
-                                dom.newDomain("node-$counter"),
+                                coroutineScope,
+                                clock,
                                 UUID.randomUUID(),
                                 "node-${counter++}",
                                 emptyMap(),
@@ -99,7 +102,7 @@ class Sc20EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
             }
         }
 
-        val provisioningService = SimpleProvisioningService(dom.newDomain("provisioner"))
+        val provisioningService = SimpleProvisioningService()
         for (node in nodes) {
             provisioningService.create(node)
         }
@@ -107,7 +110,9 @@ class Sc20EnvironmentReader(input: InputStream, mapper: ObjectMapper = jacksonOb
         val serviceRegistry = ServiceRegistry().put(ProvisioningService, provisioningService)
 
         val platform = Platform(
-            UUID.randomUUID(), "sc20-platform", listOf(
+            UUID.randomUUID(),
+            "sc20-platform",
+            listOf(
                 Zone(UUID.randomUUID(), "zone", serviceRegistry)
             )
         )
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
index 1cabc8bc..6ee43b6a 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
@@ -129,7 +129,9 @@ class BitbrainsTraceReader(
                     )
 
                 val vmWorkload = VmWorkload(
-                    uuid, "VM Workload $vmId", UnnamedUser,
+                    uuid,
+                    "VM Workload $vmId",
+                    UnnamedUser,
                     VmImage(
                         uuid,
                         vmId.toString(),
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt
index 3a4e2e89..6db3975e 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt
@@ -120,7 +120,8 @@ class GwfTraceReader(reader: BufferedReader) : TraceReader<Job> {
                     }
                     val workflow = entry.workload
                     val task = Task(
-                        UUID(0L, taskId), "<unnamed>",
+                        UUID(0L, taskId),
+                        "<unnamed>",
                         FlopsApplicationImage(UUID.randomUUID(), "<unnamed>", emptyMap(), flops, cores),
                         HashSet(),
                         mapOf(WORKFLOW_TASK_DEADLINE to runtime)
@@ -136,9 +137,11 @@ class GwfTraceReader(reader: BufferedReader) : TraceReader<Job> {
 
         // Fix dependencies and dependents for all tasks
         taskDependencies.forEach { (task, dependencies) ->
-            (task.dependencies as MutableSet<Task>).addAll(dependencies.map { taskId ->
-                tasks[taskId] ?: throw IllegalArgumentException("Dependency task with id $taskId not found")
-            })
+            (task.dependencies as MutableSet<Task>).addAll(
+                dependencies.map { taskId ->
+                    tasks[taskId] ?: throw IllegalArgumentException("Dependency task with id $taskId not found")
+                }
+            )
         }
 
         // Create the entry iterator
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
index 8e34505a..28dc7793 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
@@ -164,7 +164,9 @@ class Sc20TraceReader(
                         Random(random.nextInt())
                     )
                 val vmWorkload = VmWorkload(
-                    uuid, "VM Workload $vmId", UnnamedUser,
+                    uuid,
+                    "VM Workload $vmId",
+                    UnnamedUser,
                     VmImage(
                         uuid,
                         vmId,
diff --git a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReader.kt b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReader.kt
index 2f6ce238..f7c74562 100644
--- a/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReader.kt
+++ b/simulator/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReader.kt
@@ -115,7 +115,11 @@ class SwfTraceReader(
                         for (tick in submitTime until (submitTime + waitTime - sliceDuration) step sliceDuration) {
                             flopsHistory.add(
                                 FlopsHistoryFragment(
-                                    tick * 1000L, 0L, sliceDuration * 1000L, 0.0, cores
+                                    tick * 1000L,
+                                    0L,
+                                    sliceDuration * 1000L,
+                                    0.0,
+                                    cores
                                 )
                             )
                             slicedWaitTime += sliceDuration
@@ -129,12 +133,18 @@ class SwfTraceReader(
                     flopsPartialSlice = flopsPerSecond * runtimePartialSliceRemainder
                     flopsFullSlice = flopsPerSecond * runTime - flopsPartialSlice
 
-                    for (tick in (submitTime + slicedWaitTime)
-                        until (submitTime + slicedWaitTime + runTime - sliceDuration)
-                        step sliceDuration) {
+                    for (
+                        tick in (submitTime + slicedWaitTime)
+                            until (submitTime + slicedWaitTime + runTime - sliceDuration)
+                            step sliceDuration
+                    ) {
                         flopsHistory.add(
                             FlopsHistoryFragment(
-                                tick * 1000L, flopsFullSlice / sliceDuration, sliceDuration * 1000L, 1.0, cores
+                                tick * 1000L,
+                                flopsFullSlice / sliceDuration,
+                                sliceDuration * 1000L,
+                                1.0,
+                                cores
                             )
                         )
                     }
@@ -153,7 +163,9 @@ class SwfTraceReader(
 
                     val uuid = UUID(0L, jobNumber)
                     val vmWorkload = VmWorkload(
-                        uuid, "SWF Workload $jobNumber", UnnamedUser,
+                        uuid,
+                        "SWF Workload $jobNumber",
+                        UnnamedUser,
                         VmImage(
                             uuid,
                             jobNumber.toString(),
diff --git a/simulator/opendc/opendc-format/src/test/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReaderTest.kt b/simulator/opendc/opendc-format/src/test/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReaderTest.kt
index 94e4b0fc..41ad8aba 100644
--- a/simulator/opendc/opendc-format/src/test/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReaderTest.kt
+++ b/simulator/opendc/opendc-format/src/test/kotlin/com/atlarge/opendc/format/trace/swf/SwfTraceReaderTest.kt
@@ -1,8 +1,8 @@
 package com.atlarge.opendc.format.trace.swf
 
-import java.io.File
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import java.io.File
 
 class SwfTraceReaderTest {
     @Test