summaryrefslogtreecommitdiff
path: root/opendc-experiments/opendc-experiments-energy21
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-05-04 20:31:48 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2021-05-05 10:03:18 +0200
commit6466d5e1b8da4582434f02dff2ab56e8f736ef85 (patch)
treee8c8e6b96c7abdd80fa0a3198da5776488cd06fe /opendc-experiments/opendc-experiments-energy21
parent4a8b32d288ba3ee986ecef7933fa77554d34e762 (diff)
harness: Extend Harness CLI with classpath options
This change adds support for appending libraries to the classpath when searching for experiments to run using the OpenDC Harness command line interface.
Diffstat (limited to 'opendc-experiments/opendc-experiments-energy21')
-rw-r--r--opendc-experiments/opendc-experiments-energy21/build.gradle.kts6
-rw-r--r--opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt3
2 files changed, 0 insertions, 9 deletions
diff --git a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts
index 618c525e..7d5fc98d 100644
--- a/opendc-experiments/opendc-experiments-energy21/build.gradle.kts
+++ b/opendc-experiments/opendc-experiments-energy21/build.gradle.kts
@@ -27,12 +27,6 @@ plugins {
`kotlin-library-conventions`
`experiment-conventions`
`testing-conventions`
- application
-}
-
-application {
- mainClass.set("org.opendc.harness.runner.cli.ConsoleRunnerKt")
- applicationDefaultJvmArgs = listOf("-Xms2500M")
}
dependencies {
diff --git a/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt b/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt
index bb6dcd3a..772c9bcc 100644
--- a/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt
+++ b/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt
@@ -26,7 +26,6 @@ import io.opentelemetry.api.metrics.MeterProvider
import io.opentelemetry.sdk.metrics.SdkMeterProvider
import io.opentelemetry.sdk.metrics.export.MetricProducer
import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.coroutineScope
import mu.KotlinLogging
@@ -85,9 +84,7 @@ public class EnergyExperiment : Experiment("Energy Modeling 2021") {
*/
private val powerModel by anyOf(PowerModelType.LINEAR, PowerModelType.CUBIC, PowerModelType.INTERPOLATION)
- @OptIn(ExperimentalCoroutinesApi::class)
override fun doRun(repeat: Int): Unit = runBlockingSimulation {
-
val chan = Channel<Unit>(Channel.CONFLATED)
val allocationPolicy = FilterScheduler(
filters = listOf(ComputeFilter(), ComputeCapabilitiesFilter()),