From be176910eb870209576326ffaad8bf21241fccbd Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 5 Oct 2022 14:10:11 +0200
Subject: refactor(sim/core): Rename runBlockingSimulation to runSimulation

This change renames the method `runBlockingSimulation` to
`runSimulation` to put more emphasis on the simulation part of the
method. The blocking part is not that important, but this behavior is
still described in the method documentation.
---
 .../kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt |  4 ++--
 .../kotlin/org/opendc/experiments/capelin/CapelinRunner.kt     |  4 ++--
 .../org/opendc/experiments/capelin/CapelinIntegrationTest.kt   | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'opendc-experiments/opendc-experiments-capelin/src')

diff --git a/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt b/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt
index ea3d9b0d..ef3deeb2 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt
@@ -32,7 +32,7 @@ import org.opendc.experiments.capelin.topology.clusterTopology
 import org.opendc.experiments.compute.*
 import org.opendc.experiments.compute.topology.HostSpec
 import org.opendc.experiments.provisioner.Provisioner
-import org.opendc.simulator.kotlin.runBlockingSimulation
+import org.opendc.simulator.kotlin.runSimulation
 import org.openjdk.jmh.annotations.*
 import java.io.File
 import java.util.*
@@ -60,7 +60,7 @@ class CapelinBenchmarks {
     }
 
     @Benchmark
-    fun benchmarkCapelin() = runBlockingSimulation {
+    fun benchmarkCapelin() = runSimulation {
         val serviceDomain = "compute.opendc.org"
 
         Provisioner(coroutineContext, clock, seed = 0).use { provisioner ->
diff --git a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt
index 669fd3b1..7461038d 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/main/kotlin/org/opendc/experiments/capelin/CapelinRunner.kt
@@ -28,7 +28,7 @@ import org.opendc.experiments.capelin.topology.clusterTopology
 import org.opendc.experiments.compute.*
 import org.opendc.experiments.compute.export.parquet.ParquetComputeMonitor
 import org.opendc.experiments.provisioner.Provisioner
-import org.opendc.simulator.kotlin.runBlockingSimulation
+import org.opendc.simulator.kotlin.runSimulation
 import java.io.File
 import java.time.Duration
 import java.util.*
@@ -54,7 +54,7 @@ public class CapelinRunner(
     /**
      * Run a single [scenario] with the specified seed.
      */
-    fun runScenario(scenario: Scenario, seed: Long) = runBlockingSimulation {
+    fun runScenario(scenario: Scenario, seed: Long) = runSimulation {
         val serviceDomain = "compute.opendc.org"
         val topology = clusterTopology(File(envPath, "${scenario.topology.name}.txt"))
 
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 3214a0bd..238a5f87 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
@@ -39,7 +39,7 @@ import org.opendc.experiments.compute.telemetry.table.HostTableReader
 import org.opendc.experiments.compute.telemetry.table.ServiceTableReader
 import org.opendc.experiments.compute.topology.HostSpec
 import org.opendc.experiments.provisioner.Provisioner
-import org.opendc.simulator.kotlin.runBlockingSimulation
+import org.opendc.simulator.kotlin.runSimulation
 import java.io.File
 import java.time.Duration
 import java.util.*
@@ -80,7 +80,7 @@ class CapelinIntegrationTest {
      * Test a large simulation setup.
      */
     @Test
-    fun testLarge() = runBlockingSimulation {
+    fun testLarge() = runSimulation {
         val seed = 0L
         val workload = createTestWorkload(1.0, seed)
         val topology = createTopology()
@@ -124,7 +124,7 @@ class CapelinIntegrationTest {
      * Test a small simulation setup.
      */
     @Test
-    fun testSmall() = runBlockingSimulation {
+    fun testSmall() = runSimulation {
         val seed = 1L
         val workload = createTestWorkload(0.25, seed)
         val topology = createTopology("single")
@@ -164,7 +164,7 @@ class CapelinIntegrationTest {
      * Test a small simulation setup with interference.
      */
     @Test
-    fun testInterference() = runBlockingSimulation {
+    fun testInterference() = runSimulation {
         val seed = 0L
         val workload = createTestWorkload(1.0, seed)
         val topology = createTopology("single")
@@ -202,7 +202,7 @@ class CapelinIntegrationTest {
      * Test a small simulation setup with failures.
      */
     @Test
-    fun testFailures() = runBlockingSimulation {
+    fun testFailures() = runSimulation {
         val seed = 0L
         val topology = createTopology("single")
         val workload = createTestWorkload(0.25, seed)
-- 
cgit v1.2.3