diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-03-11 14:09:16 +0100 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-03-11 14:09:16 +0100 |
| commit | 0655127dcd945289f045d8e04304e6a050e2a2f9 (patch) | |
| tree | 186b056f4db6cb77c302e3e1856458c43fb132e7 /opendc/opendc-experiments-sc20 | |
| parent | 1ccfcb28bb91c9dc456a1f324a0be6300086eb28 (diff) | |
| parent | e24748a93b698efe47c440676e28d0997398433f (diff) | |
Merge branch '2.x-read-internal-traces' into '2.x'
Write parsers for internal (proprietary) traces and environment files
See merge request opendc/opendc-simulator!37
Diffstat (limited to 'opendc/opendc-experiments-sc20')
| -rw-r--r-- | opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index 76f7b600..b48abf2e 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -33,9 +33,9 @@ import com.atlarge.opendc.compute.core.monitor.ServerMonitor import com.atlarge.opendc.compute.metal.service.ProvisioningService import com.atlarge.opendc.compute.virt.service.SimpleVirtProvisioningService import com.atlarge.opendc.compute.virt.service.allocation.AvailableMemoryAllocationPolicy -import com.atlarge.opendc.format.environment.sc20.Sc20EnvironmentReader +import com.atlarge.opendc.format.environment.sc20.Sc20ClusterEnvironmentReader import com.atlarge.opendc.format.trace.sc20.Sc20PerformanceInterferenceReader -import com.atlarge.opendc.format.trace.vm.VmTraceReader +import com.atlarge.opendc.format.trace.sc20.Sc20TraceReader import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -47,8 +47,8 @@ import kotlin.math.max * Main entry point of the experiment. */ fun main(args: Array<String>) { - if (args.isEmpty()) { - println("error: Please provide path to directory containing VM trace files") + if (args.size < 2) { + println("error: Please provide path to directory containing VM trace files and the path to the environment file") return } @@ -64,7 +64,7 @@ fun main(args: Array<String>) { val root = system.newDomain("root") root.launch { - val environment = Sc20EnvironmentReader(object {}.javaClass.getResourceAsStream("/env/setup-small.json")) + val environment = Sc20ClusterEnvironmentReader(File(args[1])) .use { it.construct(root) } val performanceInterferenceModel = Sc20PerformanceInterferenceReader( @@ -80,8 +80,8 @@ fun main(args: Array<String>) { hypervisorMonitor ) - val reader = VmTraceReader(File(args[0]), performanceInterferenceModel) - delay(1376314846 * 1000L) + val reader = Sc20TraceReader(File(args[0]), performanceInterferenceModel) +// delay(1376314846 * 1000L) while (reader.hasNext()) { val (time, workload) = reader.next() delay(max(0, time * 1000 - simulationContext.clock.millis())) |