1 files changed, 8 insertions, 13 deletions
diff --git a/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/flow2/FlowEngine.java b/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/flow2/FlowEngine.java
index cfa5a48f..c0f52505 100644
--- a/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/flow2/FlowEngine.java
+++ b/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/flow2/FlowEngine.java
@@ -26,9 +26,8 @@ import java.time.Clock;
 import java.time.InstantSource;
 import java.util.ArrayList;
 import java.util.List;
-import kotlin.coroutines.ContinuationInterceptor;
 import kotlin.coroutines.CoroutineContext;
-import kotlinx.coroutines.Delay;
+import org.opendc.common.Dispatcher;
 
 /**
  * A {@link FlowEngine} simulates a generic flow network.
@@ -57,23 +56,19 @@ public final class FlowEngine implements Runnable {
      */
     private boolean active;
 
-    private final CoroutineContext coroutineContext;
+    private final Dispatcher dispatcher;
     private final InstantSource clock;
-    private final Delay delay;
 
     /**
      * Create a new {@link FlowEngine} instance using the specified {@link CoroutineContext} and {@link InstantSource}.
      */
-    public static FlowEngine create(CoroutineContext coroutineContext, InstantSource clock) {
-        return new FlowEngine(coroutineContext, clock);
+    public static FlowEngine create(Dispatcher dispatcher) {
+        return new FlowEngine(dispatcher);
     }
 
-    FlowEngine(CoroutineContext coroutineContext, InstantSource clock) {
-        this.coroutineContext = coroutineContext;
-        this.clock = clock;
-
-        CoroutineContext.Key<? extends ContinuationInterceptor> key = ContinuationInterceptor.Key;
-        this.delay = (Delay) coroutineContext.get(key);
+    FlowEngine(Dispatcher dispatcher) {
+        this.dispatcher = dispatcher;
+        this.clock = dispatcher.getTimeSource();
     }
 
     /**
@@ -205,7 +200,7 @@ public final class FlowEngine implements Runnable {
         // Only schedule a new scheduler invocation in case the target is earlier than all other pending
         // scheduler invocations
         if (scheduled.tryAdd(target)) {
-            delay.invokeOnTimeout(target - now, this, coroutineContext);
+            dispatcher.schedule(target - now, this);
         }
     }