summaryrefslogtreecommitdiff
path: root/opendc/opendc-format/src
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2020-02-24 20:30:28 +0100
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2020-02-24 20:30:28 +0100
commit6f1162730d548baa12c9d594a94c4523d7e51889 (patch)
tree230fc63cd84d7eac75860ec868e47a91a83d5995 /opendc/opendc-format/src
parent8d05ee524981bacfe4af4fe0097c935309115481 (diff)
parent3dedd93628b7fb73613850ea1b4e870b70b45f27 (diff)
Merge branch 'feat/2.x-workflow-extensions' into 'feat/2.x'
Incorporate extensions to workflow scheduler See merge request opendc/opendc-simulator!27
Diffstat (limited to 'opendc/opendc-format/src')
-rw-r--r--opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/gwf/GwfTraceReader.kt4
1 files changed, 3 insertions, 1 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 498e2d1d..3a4e2e89 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
@@ -30,6 +30,7 @@ import com.atlarge.opendc.format.trace.TraceEntry
import com.atlarge.opendc.format.trace.TraceReader
import com.atlarge.opendc.workflows.workload.Job
import com.atlarge.opendc.workflows.workload.Task
+import com.atlarge.opendc.workflows.workload.WORKFLOW_TASK_DEADLINE
import java.io.BufferedReader
import java.io.File
import java.io.InputStream
@@ -121,7 +122,8 @@ class GwfTraceReader(reader: BufferedReader) : TraceReader<Job> {
val task = Task(
UUID(0L, taskId), "<unnamed>",
FlopsApplicationImage(UUID.randomUUID(), "<unnamed>", emptyMap(), flops, cores),
- HashSet()
+ HashSet(),
+ mapOf(WORKFLOW_TASK_DEADLINE to runtime)
)
entry.submissionTime = min(entry.submissionTime, submitTime)
(workflow.tasks as MutableSet<Task>).add(task)