diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-04-13 17:45:18 +0200 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-04-13 17:45:18 +0200 |
| commit | 60372f0022d423efd5267ef4008d9afcbe870911 (patch) | |
| tree | fccbcd3ca40ef702dd11da1e3772fbb329ef711d /opendc/opendc-format/src | |
| parent | 6e7c253cb61f2c529f6e852183c997d733ad864d (diff) | |
| parent | facf2a785ff7c7cd4f904b4b42af415bb85ea7a0 (diff) | |
Merge branch 'bug/slice-sync' into '2.x'
Address issues with total requested burst
See merge request opendc/opendc-simulator!60
Diffstat (limited to 'opendc/opendc-format/src')
2 files changed, 8 insertions, 6 deletions
diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt index 708e27bf..89a59e1c 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt @@ -59,6 +59,7 @@ class Sc20ClusterEnvironmentReader( var memoryPerHostCol = 0 var coresPerHostCol = 0 + var clusterIdx: Int = 0 var clusterId: String var speed: Double var numberOfHosts: Int @@ -99,7 +100,7 @@ class Sc20ClusterEnvironmentReader( nodes.add( SimpleBareMetalDriver( dom.newDomain("node-$clusterId-$it"), - UUID.randomUUID(), + UUID((clusterIdx++).toLong(), it.toLong()), "node-$clusterId-$it", mapOf(NODE_CLUSTER to clusterId), List(coresPerHost) { coreId -> diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt index 950d2630..c40cb039 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt @@ -79,7 +79,7 @@ class Sc20TraceReader( } vms - .forEach { vmFile -> + .forEachIndexed { idx, vmFile -> println(vmFile) val flopsHistory = mutableListOf<FlopsHistoryFragment>() var vmId = "" @@ -107,9 +107,8 @@ class Sc20TraceReader( if (flopsHistory.isEmpty()) { flopsHistory.add(FlopsHistoryFragment(timestamp, flops, traceInterval, cpuUsage, cores)) } else { - if (flopsHistory.last().flops != flops) { - flopsHistory.add(FlopsHistoryFragment(timestamp, flops, traceInterval, cpuUsage, cores)) - } else { + // Restrict merging to empty fragments for now + if (flopsHistory.last().flops == 0L && flops == 0L) { val oldFragment = flopsHistory.removeAt(flopsHistory.size - 1) flopsHistory.add( FlopsHistoryFragment( @@ -119,12 +118,14 @@ class Sc20TraceReader( cpuUsage, cores) ) + } else { + flopsHistory.add(FlopsHistoryFragment(timestamp, flops, traceInterval, cpuUsage, cores)) } } } } - val uuid = UUID.randomUUID() + val uuid = UUID(0, idx.toLong()) val relevantPerformanceInterferenceModelItems = PerformanceInterferenceModel( performanceInterferenceModel.items.filter { it.workloadNames.contains(vmId) }.toSet() |