CSY/reowolf Changeset - 84e785174232 · Centrum Wiskunde & Informatica (CWI)

Changeset - 84e785174232

Parent rev.

Child rev.

[Not reviewed]

0 1 0

mh - 3 years ago 2022-04-20 16:13:24
contact@maxhenger.nl

Removed some duplicated code in error handling

1 file changed with 9 insertions and 13 deletions:

src/runtime2/component/component_pdl.rs

0 comments (0 inline, 0 general)

src/runtime2/component/component_pdl.rs

➞

Show inline comments

@@ @@ -260,7 +260,7 @@ impl Component for CompPDL { @@
                     &mut self.exec_state, &mut self.control, &mut self.consensus,
                     message, sched_ctx, comp_ctx
                 ) {
-                    self.handle_component_error(sched_ctx, location_and_message);
+                    self.handle_generic_component_error(sched_ctx, location_and_message);
+                }
             },
             Message::Sync(message) => {
@@ @@ -297,15 +297,7 @@ impl Component for CompPDL { @@
         let run_result = self.execute_prompt(&sched_ctx);
         if let Err(error) = run_result {
             // TODO: Cleanup before @nocommit
             sched_ctx.error(&format!("{}", error));
             let exit_reason = if self.exec_state.mode.is_in_sync_block() {
                 ExitReason::ErrorInSync
             } else {
                 ExitReason::ErrorNonSync
             };
             self.exec_state.set_as_start_exit(exit_reason);
             self.handle_component_error(sched_ctx, CompError::Executor(error));
             return CompScheduling::Immediate;
+        }
@@ @@ -339,7 +331,7 @@ impl Component for CompPDL { @@
                             comp_ctx, sched_ctx, &mut self.control
                         );
                         if let Err(location_and_message) = receive_result {
-                            self.handle_component_error(sched_ctx, location_and_message);
+                            self.handle_generic_component_error(sched_ctx, location_and_message);
                             return CompScheduling::Immediate
                         } else {
                             self.exec_ctx.stmt = ExecStmt::PerformedGet(message.content);
@@ @@ -367,7 +359,7 @@ impl Component for CompPDL { @@
                     sched_ctx, &mut self.consensus, comp_ctx
                 );
                 if let Err(location_and_message) = send_result {
-                    self.handle_component_error(sched_ctx, location_and_message);
+                    self.handle_generic_component_error(sched_ctx, location_and_message);
                     return CompScheduling::Immediate;
                 } else {
                     // When `run` is called again (potentially after becoming
@@ @@ -571,7 +563,7 @@ impl CompPDL { @@
     /// Handles an error coming from the generic `component::handle_xxx`
     /// functions. Hence accepts argument as a tuple.
-    fn handle_component_error(&mut self, sched_ctx: &SchedulerCtx, location_and_message: (PortInstruction, String)) {
+    fn handle_generic_component_error(&mut self, sched_ctx: &SchedulerCtx, location_and_message: (PortInstruction, String)) {
         // Retrieve location and message, display in terminal
         let (location, message) = location_and_message;
         let error = match location {
@@ @@ -586,6 +578,10 @@ impl CompPDL { @@
+            }
         };
         self.handle_component_error(sched_Ctx, error);
+    }
     fn handle_component_error(&mut self, sched_ctx: &SchedulerCtx, error: CompError) {
         sched_ctx.error(&format!("{}", error));
         // Set state to handle subsequent error

0 comments (0 inline, 0 general)