From 0df646c2951e9950f27472fdf0cb2624303c2d74 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 1 Oct 2020 00:23:37 +0200 Subject: Move custom Flows to separate utility module This change moves the custom Flow object we provide (e.g. EventFlow and StateFlow) outside of the odcsim-api module into a separate opendc-utils module. This is in preparation for the removal of the odcsim components in OpenDC. --- simulator/opendc/opendc-workflows/build.gradle.kts | 1 + .../kotlin/com/atlarge/opendc/workflows/service/StageWorkflowService.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'simulator/opendc/opendc-workflows') diff --git a/simulator/opendc/opendc-workflows/build.gradle.kts b/simulator/opendc/opendc-workflows/build.gradle.kts index 62c4bc25..f8a9a1f3 100644 --- a/simulator/opendc/opendc-workflows/build.gradle.kts +++ b/simulator/opendc/opendc-workflows/build.gradle.kts @@ -32,6 +32,7 @@ plugins { dependencies { api(project(":opendc:opendc-core")) api(project(":opendc:opendc-compute")) + implementation(project(":opendc:opendc-utils")) testImplementation(project(":opendc:opendc-simulator")) testImplementation(project(":opendc:opendc-format")) diff --git a/simulator/opendc/opendc-workflows/src/main/kotlin/com/atlarge/opendc/workflows/service/StageWorkflowService.kt b/simulator/opendc/opendc-workflows/src/main/kotlin/com/atlarge/opendc/workflows/service/StageWorkflowService.kt index aea27972..3a5b963c 100644 --- a/simulator/opendc/opendc-workflows/src/main/kotlin/com/atlarge/opendc/workflows/service/StageWorkflowService.kt +++ b/simulator/opendc/opendc-workflows/src/main/kotlin/com/atlarge/opendc/workflows/service/StageWorkflowService.kt @@ -24,7 +24,6 @@ package com.atlarge.opendc.workflows.service -import com.atlarge.odcsim.flow.EventFlow import com.atlarge.opendc.compute.core.Server import com.atlarge.opendc.compute.core.ServerEvent import com.atlarge.opendc.compute.core.ServerState @@ -43,6 +42,7 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import org.opendc.utils.flow.EventFlow import java.time.Clock import java.util.PriorityQueue import java.util.Queue -- cgit v1.2.3