refactor: Move experiments from TPDS module to SC18 module

These experiments were originally designed for the SC18 paper.

3 files changed, 8 insertions, 7 deletions

diff --git a/opendc/opendc-experiments-tpds/build.gradle.kts b/opendc/opendc-experiments-sc18/build.gradle.kts
index 297e1d94..2e366a43 100644
--- a/opendc/opendc-experiments-tpds/build.gradle.kts
+++ b/opendc/opendc-experiments-sc18/build.gradle.kts
@@ -31,7 +31,7 @@ plugins {
 }
 
 application {
-    mainClassName = "com.atlarge.opendc.experiments.tpds.TestExperiment"
+    mainClassName = "com.atlarge.opendc.experiments.sc18.TestExperiment"
 }
 
 dependencies {
diff --git a/opendc/opendc-experiments-tpds/src/main/kotlin/com/atlarge/opendc/experiments/tpds/TestExperiment.kt b/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt
index 3dcea99d..9ed4e369 100644
--- a/opendc/opendc-experiments-tpds/src/main/kotlin/com/atlarge/opendc/experiments/tpds/TestExperiment.kt
+++ b/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.atlarge.opendc.experiments.tpds
+package com.atlarge.opendc.experiments.sc18
 
 import com.atlarge.odcsim.SimulationEngineProvider
 import com.atlarge.opendc.compute.metal.service.ProvisioningService
@@ -65,8 +65,7 @@ fun main(args: Array<String>) {
 
     val monitor = object : WorkflowMonitor {
         override suspend fun onJobStart(job: Job, time: Long) {
-            println("Job ${job.uid} submitted")
-            total += 1
+            println("Job ${job.uid} started")
         }
 
         override suspend fun onJobFinish(job: Job, time: Long) {
@@ -79,16 +78,15 @@ fun main(args: Array<String>) {
         }
 
         override suspend fun onTaskStart(job: Job, task: Task, time: Long) {
-            println("Task started ${task.uid}")
         }
 
         override suspend fun onTaskFinish(job: Job, task: Task, status: Int, time: Long) {
-            println("Task finished ${task.uid}")
         }
     }
 
     val provider = ServiceLoader.load(SimulationEngineProvider::class.java).first()
     val system = provider({ ctx ->
+        println(ctx.clock.instant())
         val scheduler = StageWorkflowService(
             ctx,
             environment.platforms[0].zones[0].services[ProvisioningService.Key],
@@ -105,11 +103,14 @@ fun main(args: Array<String>) {
 
         while (reader.hasNext()) {
             val (time, job) = reader.next()
-            delay(max(0, time - ctx.clock.millis()))
+            total += 1
+            delay(max(0, time * 1000 - ctx.clock.millis()))
             scheduler.submit(job, monitor)
         }
 
         token.receive()
+
+        println(ctx.clock.instant())
     }, name = "sim")
 
     runBlocking {
diff --git a/opendc/opendc-experiments-tpds/src/main/resources/env/setup-test.json b/opendc/opendc-experiments-sc18/src/main/resources/env/setup-test.json
index 0965b250..0965b250 100644
--- a/opendc/opendc-experiments-tpds/src/main/resources/env/setup-test.json
+++ b/opendc/opendc-experiments-sc18/src/main/resources/env/setup-test.json