Adding error handling. #18

Author: caduandrade

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Added
   * `stop` method in `SimContext`.
+  * Error handling.
 
 ## 0.3.0
 

example/example.dart

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

lib/src/internal/completer_interrupt.dart

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

lib/src/internal/debug_listener.dart

@@ -2,15 +2,7 @@ import 'package:meta/meta.dart';
 
 @internal
 abstract class DebugListener {
-
-  void onScheduleNextAction();
-
-  void onExecuteAction();
-
-  void onStop();
-
   void onAddCompleter();
 
   void onRemoveCompleter();
 }
-

lib/src/internal/event_action.dart

@@ -50,7 +50,6 @@ class EventAction extends TimeAction implements SimContext {
 
   @override
   void execute() {
-    print('execute: $eventName');
     if (_eventCompleter != null) {
       throw StateError('This event is yielding');
     }
@@ -62,43 +61,38 @@ class EventAction extends TimeAction implements SimContext {
         executionHash: hashCode);
 
     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(
-              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);
+      if (_eventCompleter != null && sim.runState == RunState.running) {
+        SimDartHelper.removeCompleter(
+            sim: sim, completer: _eventCompleter!.completer);
+        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) {
-      print('ZZ $error');
-      //TODO rever
-      if(error is! CompleterInterrupt) {
-        print('aqui 3?');
+      if (error is! CompleterInterrupt) {
         SimDartHelper.error(sim: sim, error: error);
+        SimDartHelper.scheduleNextAction(sim: sim);
       }
     });
   }
 
   @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.removeCompleter(
+          sim: sim, completer: _eventCompleter!.completer);
       SimDartHelper.error(
           sim: sim,
-          error: StateError("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;
     }
 
@@ -119,7 +113,7 @@ class EventAction extends TimeAction implements SimContext {
             order: order));
 
     SimDartHelper.scheduleNextAction(sim: sim);
-      await _eventCompleter!.future;
+    await _eventCompleter!.future;
   }
 
   @override
@@ -145,13 +139,13 @@ class EventAction extends TimeAction implements SimContext {
   }
 
   @override
-  void stop(){
-    SimDartHelper.addAction(sim: sim, action: StopAction(start: sim.now, sim:sim));
+  void stop() {
+    SimDartHelper.addAction(
+        sim: sim, action: StopAction(start: sim.now, sim: sim));
   }
 
   @override
   SimCounter counter(String name) {
-    print("counter");
     return sim.counter(name);
   }
 
@@ -162,7 +156,7 @@ class EventAction extends TimeAction implements SimContext {
 }
 
 class EventCompleter {
-  EventCompleter({required this.event}){
+  EventCompleter({required this.event}) {
     SimDartHelper.addCompleter(sim: event.sim, completer: completer);
   }
 
@@ -180,7 +174,7 @@ class EventCompleter {
         time: event.sim.now,
         phase: EventPhase.resumed,
         executionHash: hashCode);
-      completer.complete();
+    completer.complete();
     event._eventCompleter = null;
     SimDartHelper.removeCompleter(sim: event.sim, completer: completer);
   }

lib/src/internal/stop_action.dart

@@ -3,17 +3,14 @@ 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});
+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);
   }
-
-}
+}

lib/src/resources.dart

@@ -153,11 +153,13 @@ 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);
+      SimDartHelper.removeCompleter(
+          sim: _sim, completer: _event.eventCompleter!.completer);
       //TODO method or throw?
       SimDartHelper.error(
           sim: _sim,
-          error:StateError("This event should be waiting. Did you forget to use 'await'?"));
+          error: StateError(
+              "This event should be waiting. Did you forget to use 'await'?"));
       return;
     }
     _ResourceImpl? resource = _store._map[name];
@@ -172,7 +174,7 @@ class ResourcesContext extends Resources {
         _event.buildCompleter();
         resource._waiting.add(_event);
         SimDartHelper.scheduleNextAction(sim: _sim);
-          await _event.eventCompleter!.future;
+        await _event.eventCompleter!.future;
         return await acquire(name);
       }
     }

lib/src/simdart.dart

@@ -49,7 +49,7 @@ class SimDart implements SimDartInterface {
   RunState _runState = RunState.notStarted;
   RunState get runState => _runState;
 
-   DebugListener? _debugListener;
+  DebugListener? _debugListener;
 
   final SimListener? listener;
 
@@ -110,7 +110,6 @@ 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,11 +130,7 @@ class SimDart implements SimDartInterface {
       _startTime = null;
       _scheduleNextAction();
       await _terminator.future;
-
-      print('terminou');
-      print('foi com erro? -> ${_error.runtimeType}: $_error');
       if (_error != null) {
-        print('ue? erro?');
         _runState = RunState.error;
         throw _error!;
       } else {
@@ -147,18 +142,16 @@ class SimDart implements SimDartInterface {
   }
 
   void stop() {
-    print("stop");
-    _addAction(StopAction(start: now, sim:this));
+    _addAction(StopAction(start: now, sim: this));
   }
 
   void _disposeCompleterList() {
     while (_completerList.isNotEmpty) {
       Completer<void> completer = _completerList.removeAt(0);
       _debugListener?.onRemoveCompleter();
       if (!completer.isCompleted) {
-        print('vai CompleterInterrupt');
         // prevents subsequent methods from being executed after complete inside the async method.
-          completer.completeError(CompleterInterrupt());
+        completer.completeError(CompleterInterrupt());
       }
     }
   }
@@ -237,8 +230,6 @@ class SimDart implements SimDartInterface {
 
   void _scheduleNextAction() {
     if (!_nextActionScheduled) {
-      print('_scheduleNextAction');
-      _debugListener?.onScheduleNextAction();
       _nextActionScheduled = true;
       if (executionPriority == 0 || _executionCount < executionPriority) {
         _executionCount++;
@@ -251,16 +242,16 @@ class SimDart implements SimDartInterface {
   }
 
   void _addAction(TimeAction action) {
-    if (_runState==RunState.running || _runState==RunState.notStarted) {
+    if (_runState == RunState.running || _runState == RunState.notStarted) {
       _actions.add(action);
     }
   }
 
   Future<void> _nextAction() async {
     _nextActionScheduled = false;
-    if (_actions.isEmpty || runState!=RunState.running) {
+    if (_actions.isEmpty || runState != RunState.running) {
       _disposeCompleterList();
-      if(!_terminator.isCompleted) {
+      if (!_terminator.isCompleted) {
         _terminator.complete();
       }
       return;
@@ -282,7 +273,6 @@ class SimDart implements SimDartInterface {
 
     _startTime ??= now;
 
-    _debugListener?.onExecuteAction();
     action.execute();
   }
 }
@@ -320,21 +310,19 @@ class SimDartHelper {
     sim._debugListener?.onRemoveCompleter();
   }
 
-  static void error({required SimDart sim, required StateError error}) {
-    print('error');
-    if(sim._error==null) {
+  static void error({required SimDart sim, required Object error}) {
+    if (sim._error == null) {
       sim._error = error;
       sim._runState = RunState.error;
     }
   }
-  
-  static void setDebugListener({required SimDart sim, required DebugListener? listener}) {
-    sim._debugListener=listener;
+
+  static void setDebugListener(
+      {required SimDart sim, required DebugListener? listener}) {
+    sim._debugListener = listener;
   }
 
   static void stop({required SimDart sim}) {
-    print('stopando');
-    sim._debugListener?.onStop();
     sim._runState = RunState.stopped;
   }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: simdart
 description: A discrete event simulation package for Dart, designed for modeling and analyzing processes and systems.
-version: 0.3.0
+version: 0.4.0
 repository: https://github.com/SimDart/simdart
 
 topics: