diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-02-21 16:57:17 +0100 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-02-21 16:57:17 +0100 |
| commit | 8d05ee524981bacfe4af4fe0097c935309115481 (patch) | |
| tree | 9b9931ec263cd071e96617e339aa907af332f296 /opendc/opendc-format/src/main | |
| parent | 37a5902767bc787bcc470e42b5b078e340a67b18 (diff) | |
| parent | 49b673e26ebf9f6a1c96f083d3876b19027b2abc (diff) | |
Merge branch 'feat/2.x-tagging' into 'feat/2.x'
Add support for resource tagging
See merge request opendc/opendc-simulator!26
Diffstat (limited to 'opendc/opendc-format/src/main')
2 files changed, 4 insertions, 3 deletions
diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt index 33db78c9..498e2d1d 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt @@ -120,7 +120,7 @@ class GwfTraceReader(reader: BufferedReader) : TraceReader<Job> { val workflow = entry.workload val task = Task( UUID(0L, taskId), "<unnamed>", - FlopsApplicationImage(flops, cores), + FlopsApplicationImage(UUID.randomUUID(), "<unnamed>", emptyMap(), flops, cores), HashSet() ) entry.submissionTime = min(entry.submissionTime, submitTime) diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt index b5c6ca0d..f4ed0f57 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt @@ -108,9 +108,10 @@ class VmTraceReader(traceDirectory: File) : TraceReader<VmWorkload> { } } + val uuid = UUID(0L, vmId) val vmWorkload = VmWorkload( - UUID(0L, vmId), "<unnamed>", UnnamedUser, - VmImage(flopsHistory, cores) + uuid, "<unnamed>", UnnamedUser, + VmImage(uuid, "<unnamed>", emptyMap(), flopsHistory, cores) ) entries[vmId] = TraceEntryImpl( flopsHistory.firstOrNull()?.tick ?: -1, |