Trying to close pending Completers. #18

Author: caduandrade

lib/src/internal/event_action.dart

@@ -64,6 +64,7 @@ class EventAction extends TimeAction implements SimContext {
     event(this).then((_) {
       print('then $eventName ${sim.runState.name}');
         if (_eventCompleter != null && sim.runState==RunState.running) {
+          SimDartHelper.removeCompleter(sim: sim, completer: _eventCompleter!.completer);
           //TODO method or throw?
           print('aqui 2?');
           SimDartHelper.error(
@@ -92,6 +93,7 @@ class EventAction extends TimeAction implements SimContext {
   @override
   Future<void> wait(int delay) async {
     if (_eventCompleter != null) {
+      SimDartHelper.removeCompleter(sim: sim, completer: _eventCompleter!.completer);
       //TODO method or throw?
       print('aqui 1?');
       SimDartHelper.error(
@@ -149,6 +151,7 @@ class EventAction extends TimeAction implements SimContext {
 
   @override
   SimCounter counter(String name) {
+    print("counter");
     return sim.counter(name);
   }
 
@@ -160,23 +163,25 @@ class EventAction extends TimeAction implements SimContext {
 
 class EventCompleter {
   EventCompleter({required this.event}){
-    SimDartHelper.addCompleter(sim: event.sim, completer: _completer);
+    SimDartHelper.addCompleter(sim: event.sim, completer: completer);
   }
 
-  final Completer<void> _completer = Completer();
+  final Completer<void> completer = Completer();
 
   final EventAction event;
 
-  Future<void> get future => _completer.future;
+  Future<void> get future {
+    return completer.future;
+  }
 
   void complete() {
     event.sim.listener?.onEvent(
         name: event.eventName,
         time: event.sim.now,
         phase: EventPhase.resumed,
         executionHash: hashCode);
-      _completer.complete();
+      completer.complete();
     event._eventCompleter = null;
-    SimDartHelper.removeCompleter(sim: event.sim, completer: _completer);
+    SimDartHelper.removeCompleter(sim: event.sim, completer: completer);
   }
 }

lib/src/resources.dart

@@ -154,6 +154,7 @@ class ResourcesContext extends Resources {
   /// - Returns: A [Future] that completes when the resource is acquired.
   Future<void> acquire(String name) async {
     if (_event.eventCompleter != null) {
+      SimDartHelper.removeCompleter(sim: _sim, completer: _event.eventCompleter!.completer);
       //TODO method or throw?
       SimDartHelper.error(
           sim: _sim,

lib/src/simdart.dart

@@ -110,6 +110,7 @@ class SimDart implements SimDartInterface {
   /// - [until]: The time at which execution should stop. Execution will include events
   ///   scheduled at this time (inclusive). If null, execution will continue indefinitely.
   Future<SimResult> run({int? until}) async {
+
     if (runState != RunState.notStarted) {
       throw StateError('Simulation has already started.');
     }
@@ -131,13 +132,8 @@ class SimDart implements SimDartInterface {
       _scheduleNextAction();
       await _terminator.future;
 
-      try {
-        _disposeCompleteList();
-      }catch(e){
-        print(e);
-      }
-
-      print('foi: ${_error.runtimeType}: $_error');
+      print('terminou');
+      print('foi com erro? -> ${_error.runtimeType}: $_error');
       if (_error != null) {
         print('ue? erro?');
         _runState = RunState.error;
@@ -266,6 +262,7 @@ class SimDart implements SimDartInterface {
     _debugListener?.onNextAction();
     _nextActionScheduled = false;
     if (_actions.isEmpty || runState!=RunState.running) {
+      _disposeCompleteList();
       if(!_terminator.isCompleted) {
         _terminator.complete();
       }

test/resource_test.dart

@@ -129,6 +129,9 @@ void main() {
         '[20][C][finished]'
       ]);
     });
+
+
+
     test('without await', () async {
       expect(
         () async {

test/stop_test.dart

@@ -1,8 +1,12 @@
+import 'dart:async';
+
 import 'package:simdart/src/simdart.dart';
 import 'package:test/test.dart';
 
 import 'test_helper.dart';
 
+
+
 void main() {
   late SimDart sim;
   TestHelper helper = TestHelper();
@@ -12,6 +16,8 @@ void main() {
     SimDartHelper.setDebugListener(sim: sim, listener: helper);
   });
 
+
+
   group('Stop', () {
     test('Simple', () async {
       sim.process(
@@ -76,8 +82,10 @@ void main() {
         'scheduleNextAction',
         'nextAction'
       ]);
+      print("counter valor:${sim.counter('counter').value} ");
       expect(sim.counter('counter').value, 1);
       expect(helper.completerCount, 0);
+      print('---------------');
     });
 
     test('Resource', () async {