Trying to close pending Completers. #18

Author: caduandrade

CHANGELOG.md

@@ -1,10 +1,15 @@
+## 0.4.0
+
+* Added
+  * `stop` method in `SimContext`.
+
 ## 0.3.0
 
 * Access the list of created resources.
 * Added
   * `runState` getter to determine whether the simulation has not started, is running, or has completed.
   * `stop` method to manually stop the simulation before it completes.
-  * Observer to receive data throughout the simulation.
+  * Listener to receive data throughout the simulation.
 
 ## 0.2.0
 

example/example.dart

@@ -1,7 +1,9 @@
+import 'dart:async';
+
 import 'package:simdart/simdart.dart';
 
 void main() async {
-  final SimDart sim = SimDart(observer: ConsoleEventObserver());
+  final SimDart sim = SimDart(listener: ConsoleEventListener());
 
   sim.process(event: _eventA, name: 'A');
 

lib/simdart.dart

@@ -1,7 +1,7 @@
 export 'src/event.dart';
 export 'src/interval.dart';
 export 'src/observable.dart';
-export 'src/sim_observer.dart';
+export 'src/sim_listener.dart';
 export 'src/event_phase.dart';
 export 'src/resources.dart' hide ResourcesFactory, ResourceStore;
 export 'src/simdart.dart' hide SimDartHelper;

lib/src/event_phase.dart

@@ -11,6 +11,8 @@ enum EventPhase {
 
   yielded,
 
+  interrupted,
+
   finished;
 
   /// Returns the string representation of the status.

lib/src/internal/completer_action.dart

@@ -12,7 +12,4 @@ class CompleterAction extends TimeAction {
   void execute() {
     complete.call();
   }
-
-  @override
-  void dispose() {}
 }

lib/src/internal/completer_interrupt.dart

@@ -0,0 +1,6 @@
+import 'package:meta/meta.dart';
+
+@internal
+class CompleterInterrupt{
+
+}

lib/src/internal/debug_listener.dart

@@ -0,0 +1,18 @@
+import 'package:meta/meta.dart';
+
+@internal
+abstract class DebugListener {
+
+  void onScheduleNextAction();
+
+  void onNextAction();
+  
+  void onExecuteAction();
+
+  void onStop();
+
+  void onAddCompleter();
+
+  void onRemoveCompleter();
+}
+

lib/src/internal/event_action.dart

@@ -4,6 +4,8 @@ import 'package:meta/meta.dart';
 import 'package:simdart/src/event.dart';
 import 'package:simdart/src/event_phase.dart';
 import 'package:simdart/src/internal/completer_action.dart';
+import 'package:simdart/src/internal/completer_interrupt.dart';
+import 'package:simdart/src/internal/stop_action.dart';
 import 'package:simdart/src/internal/time_action.dart';
 import 'package:simdart/src/interval.dart';
 import 'package:simdart/src/resources.dart';
@@ -48,50 +50,60 @@ class EventAction extends TimeAction implements SimContext {
 
   @override
   void execute() {
+    print('execute: $eventName');
     if (_eventCompleter != null) {
       throw StateError('This event is yielding');
     }
 
-    sim.observer?.onEvent(
+    sim.listener?.onEvent(
         name: eventName,
         time: sim.now,
         phase: EventPhase.called,
         executionHash: hashCode);
 
-    _runEvent().then((_) {
-      if (_eventCompleter != null) {
-        SimDartHelper.error(
-            sim: sim,
-            msg:
-                "Next event is being scheduled, but the current one is still paused waiting for continuation. Did you forget to use 'await'?");
-        return;
+    event(this).then((_) {
+      print('then $eventName ${sim.runState.name}');
+        if (_eventCompleter != null && sim.runState==RunState.running) {
+          //TODO method or throw?
+          SimDartHelper.error(
+              sim: sim,
+              error:
+              StateError(
+                  "Next event is being scheduled, but the current one is still paused waiting for continuation. Did you forget to use 'await'?"));
+          return;
+        }
+        sim.listener?.onEvent(
+            name: eventName,
+            time: sim.now,
+            phase: EventPhase.finished,
+            executionHash: hashCode);
+        SimDartHelper.scheduleNextAction(sim: sim);
+    }).catchError((error) {
+      //TODO rever
+      if(error is CompleterInterrupt) {
+        sim.listener?.onEvent(
+            name: eventName,
+            time: sim.now,
+            phase: EventPhase.interrupted,
+            executionHash: hashCode);
+      } else  {
+        print('ZZ');
+        SimDartHelper.error(sim: sim, error: error);
       }
-      sim.observer?.onEvent(
-          name: eventName,
-          time: sim.now,
-          phase: EventPhase.finished,
-          executionHash: hashCode);
-
-      SimDartHelper.scheduleNextAction(sim: sim);
-    }).catchError((e) {
-      // Sim already marked to finish. Let the last event finalize.
     });
   }
 
-  Future<void> _runEvent() async {
-    await event(this);
-  }
-
   @override
   Future<void> wait(int delay) async {
     if (_eventCompleter != null) {
+      //TODO method or throw?
       SimDartHelper.error(
           sim: sim,
-          msg: "The event is already waiting. Did you forget to use 'await'?");
+          error: StateError("The event is already waiting. Did you forget to use 'await'?"));
       return;
     }
 
-    sim.observer?.onEvent(
+    sim.listener?.onEvent(
         name: eventName,
         time: sim.now,
         phase: EventPhase.yielded,
@@ -106,9 +118,9 @@ class EventAction extends TimeAction implements SimContext {
             start: sim.now + delay,
             complete: _eventCompleter!.complete,
             order: order));
-    SimDartHelper.scheduleNextAction(sim: sim);
 
-    await _eventCompleter!.future;
+    SimDartHelper.scheduleNextAction(sim: sim);
+      await _eventCompleter!.future;
   }
 
   @override
@@ -133,6 +145,11 @@ class EventAction extends TimeAction implements SimContext {
         name: name);
   }
 
+  @override
+  void stop(){
+    SimDartHelper.addAction(sim: sim, action: StopAction(start: sim.now, sim:sim));
+  }
+
   @override
   SimCounter counter(String name) {
     return sim.counter(name);
@@ -142,15 +159,12 @@ class EventAction extends TimeAction implements SimContext {
   SimNum num(String name) {
     return sim.num(name);
   }
-
-  @override
-  void dispose() {
-    _eventCompleter?.complete();
-  }
 }
 
 class EventCompleter {
-  EventCompleter({required this.event});
+  EventCompleter({required this.event}){
+    SimDartHelper.addCompleter(sim: event.sim, completer: _completer);
+  }
 
   final Completer<void> _completer = Completer();
 
@@ -159,12 +173,13 @@ class EventCompleter {
   Future<void> get future => _completer.future;
 
   void complete() {
-    event.sim.observer?.onEvent(
+    event.sim.listener?.onEvent(
         name: event.eventName,
         time: event.sim.now,
         phase: EventPhase.resumed,
         executionHash: hashCode);
     _completer.complete();
     event._eventCompleter = null;
+    SimDartHelper.removeCompleter(sim: event.sim, completer: _completer);
   }
 }

lib/src/internal/repeat_event_action.dart

@@ -45,7 +45,4 @@ class RepeatEventAction extends TimeAction {
     }
     SimDartHelper.scheduleNextAction(sim: sim);
   }
-
-  @override
-  void dispose() {}
 }

lib/src/internal/stop_action.dart

@@ -0,0 +1,19 @@
+import 'package:meta/meta.dart';
+import 'package:simdart/src/internal/time_action.dart';
+import 'package:simdart/src/simdart.dart';
+
+@internal
+class StopAction extends TimeAction{
+
+  StopAction({required super.start, super.order=-1, required this.sim});
+
+  final SimDart sim;
+
+  @override
+  void execute() {
+    print('entrou no stopAction');
+    SimDartHelper.stop(sim: sim);
+    SimDartHelper.scheduleNextAction(sim: sim);
+  }
+
+}