Move OpenDC modules into simulator root

This change moves the OpenDC modules previously living in the simulator/opendc
directory to the simulator directory itself given that we do not make a
distinction between OpenDC and odcsim anymore.

2 files changed, 0 insertions, 153 deletions

diff --git a/simulator/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt b/simulator/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt
deleted file mode 100644
index 0cece647..00000000
--- a/simulator/opendc/opendc-experiments-sc18/src/main/kotlin/com/atlarge/opendc/experiments/sc18/TestExperiment.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2019 atlarge-research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.atlarge.opendc.experiments.sc18
-
-import com.atlarge.opendc.compute.metal.service.ProvisioningService
-import com.atlarge.opendc.format.environment.sc18.Sc18EnvironmentReader
-import com.atlarge.opendc.format.trace.gwf.GwfTraceReader
-import com.atlarge.opendc.workflows.service.StageWorkflowService
-import com.atlarge.opendc.workflows.service.WorkflowEvent
-import com.atlarge.opendc.workflows.service.WorkflowSchedulerMode
-import com.atlarge.opendc.workflows.service.stage.job.NullJobAdmissionPolicy
-import com.atlarge.opendc.workflows.service.stage.job.SubmissionTimeJobOrderPolicy
-import com.atlarge.opendc.workflows.service.stage.resource.FirstFitResourceSelectionPolicy
-import com.atlarge.opendc.workflows.service.stage.resource.FunctionalResourceFilterPolicy
-import com.atlarge.opendc.workflows.service.stage.task.NullTaskEligibilityPolicy
-import com.atlarge.opendc.workflows.service.stage.task.SubmissionTimeTaskOrderPolicy
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.test.TestCoroutineScope
-import org.opendc.simulator.utils.DelayControllerClockAdapter
-import java.io.File
-import kotlin.math.max
-
-/**
- * Main entry point of the experiment.
- */
-@OptIn(ExperimentalCoroutinesApi::class)
-fun main(args: Array<String>) {
-    if (args.isEmpty()) {
-        println("error: Please provide path to GWF trace")
-        return
-    }
-
-    var total = 0
-    var finished = 0
-
-    val token = Channel<Boolean>()
-    val testScope = TestCoroutineScope()
-    val clock = DelayControllerClockAdapter(testScope)
-
-    val schedulerAsync = testScope.async {
-        val environment = Sc18EnvironmentReader(object {}.javaClass.getResourceAsStream("/env/setup-test.json"))
-            .use { it.construct(this, clock) }
-
-        StageWorkflowService(
-            this,
-            clock,
-            environment.platforms[0].zones[0].services[ProvisioningService],
-            mode = WorkflowSchedulerMode.Batch(100),
-            jobAdmissionPolicy = NullJobAdmissionPolicy,
-            jobOrderPolicy = SubmissionTimeJobOrderPolicy(),
-            taskEligibilityPolicy = NullTaskEligibilityPolicy,
-            taskOrderPolicy = SubmissionTimeTaskOrderPolicy(),
-            resourceFilterPolicy = FunctionalResourceFilterPolicy,
-            resourceSelectionPolicy = FirstFitResourceSelectionPolicy
-        )
-    }
-
-    testScope.launch {
-        val scheduler = schedulerAsync.await()
-        scheduler.events
-            .onEach { event ->
-                when (event) {
-                    is WorkflowEvent.JobStarted -> {
-                        println("Job ${event.job.uid} started")
-                    }
-                    is WorkflowEvent.JobFinished -> {
-                        finished += 1
-                        println("Jobs $finished/$total finished (${event.job.tasks.size} tasks)")
-
-                        if (finished == total) {
-                            token.send(true)
-                        }
-                    }
-                }
-            }
-            .collect()
-    }
-
-    testScope.launch {
-        val reader = GwfTraceReader(File(args[0]))
-        val scheduler = schedulerAsync.await()
-
-        while (reader.hasNext()) {
-            val (time, job) = reader.next()
-            total += 1
-            delay(max(0, time * 1000 - clock.millis()))
-            scheduler.submit(job)
-        }
-    }
-
-    testScope.advanceUntilIdle()
-}
diff --git a/simulator/opendc/opendc-experiments-sc18/src/main/resources/env/setup-test.json b/simulator/opendc/opendc-experiments-sc18/src/main/resources/env/setup-test.json
deleted file mode 100644
index 0965b250..00000000
--- a/simulator/opendc/opendc-experiments-sc18/src/main/resources/env/setup-test.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "Experimental Setup 2",
-    "rooms": [
-        {
-            "type": "SERVER",
-            "objects": [
-                {
-                    "type": "RACK",
-                    "machines": [
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]},
-                        { "cpus": [2] }, { "cpus": [2]}
-                    ]
-                },
-                {
-                    "type": "RACK",
-                    "machines": [
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]},
-                        { "cpus": [1] }, { "cpus": [1]}
-                    ]
-                }
-            ]
-        }
-    ]
-}