diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-10-03 17:20:34 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-10-03 20:47:12 +0200 |
| commit | bd476d11ab24fe745bb54e97a11133706bb96cb1 (patch) | |
| tree | b5edaff69212986265f9edc620e40bb8695f11eb /opendc-experiments/opendc-experiments-capelin/src/jmh | |
| parent | 448b4cafe3c757812138a8ca7580975191ac2f9c (diff) | |
refactor(exp/compute): Remove Topology interface
This change removes the Topology interface from the
`opendc-experiments-compute` module, which was meant for provisioning
the experimental topology. Howerver, with the stateless `HostSpec`
class, it is not needed to resolve the topology everytime.
Diffstat (limited to 'opendc-experiments/opendc-experiments-capelin/src/jmh')
| -rw-r--r-- | opendc-experiments/opendc-experiments-capelin/src/jmh/kotlin/org/opendc/experiments/capelin/CapelinBenchmarks.kt | 6 |
1 files changed, 3 insertions, 3 deletions
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 db56f75d..f021e223 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 @@ -30,7 +30,7 @@ import org.opendc.compute.service.scheduler.filters.VCpuFilter import org.opendc.compute.service.scheduler.weights.CoreRamWeigher import org.opendc.experiments.capelin.topology.clusterTopology import org.opendc.experiments.compute.* -import org.opendc.experiments.compute.topology.Topology +import org.opendc.experiments.compute.topology.HostSpec import org.opendc.experiments.provisioner.Provisioner import org.opendc.simulator.core.runBlockingSimulation import org.openjdk.jmh.annotations.* @@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit @Measurement(iterations = 5, time = 5, timeUnit = TimeUnit.SECONDS) class CapelinBenchmarks { private lateinit var vms: List<VirtualMachine> - private lateinit var topology: Topology + private lateinit var topology: List<HostSpec> @Param("true", "false") private var isOptimized: Boolean = false @@ -71,7 +71,7 @@ class CapelinBenchmarks { provisioner.runSteps( setupComputeService(serviceDomain, { computeScheduler }), - setupHosts(serviceDomain, topology.resolve(), optimize = isOptimized) + setupHosts(serviceDomain, topology, optimize = isOptimized) ) val service = provisioner.registry.resolve(serviceDomain, ComputeService::class.java)!! |