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

Changeset - d87415c6ea52

Parent rev.

Child rev.

[Not reviewed]

refactor-runtime-1.2.5

0 2 0

mh - 3 years ago 2022-02-02 17:34:36
contact@maxhenger.nl

WIP: Fix bugs during multithreading as well

2 files changed with 3 insertions and 4 deletions:

src/runtime2/component/component_pdl.rs

src/runtime2/tests/mod.rs

0 comments (0 inline, 0 general)

src/runtime2/component/component_pdl.rs

➞

Show inline comments

@@ @@ -309,24 +309,24 @@ impl CompPDL { @@
+    }
     /// Handles decision from the consensus round. This will cause a change in
     /// the internal `Mode`, such that the next call to `run` can take the
     /// appropriate next steps.
     fn handle_sync_decision(&mut self, sched_ctx: &SchedulerCtx, comp_ctx: &mut CompCtx, decision: SyncRoundDecision) {
         debug_assert_eq!(self.mode, Mode::SyncEnd);
         sched_ctx.log(&format!("Handling sync decision: {:?}", decision));
         sched_ctx.log(&format!("Handling sync decision: {:?} (in mode {:?})", decision, self.mode));
         let is_success = match decision {
             SyncRoundDecision::None => {
                 // No decision yet
                 return;
             },
             SyncRoundDecision::Solution => true,
             SyncRoundDecision::Failure => false,
         };
         // If here then we've reached a decision
         debug_assert_eq!(self.mode, Mode::SyncEnd);
         if is_success {
             self.mode = Mode::NonSync;
             self.consensus.notify_sync_decision(decision);
         } else {
             self.mode = Mode::StartExit;
+        }
@@ @@ -528,13 +528,12 @@ impl CompPDL { @@
+            }
+        }
+    }
     fn handle_incoming_sync_message(&mut self, sched_ctx: &SchedulerCtx, comp_ctx: &mut CompCtx, message: SyncMessage) {
         let decision = self.consensus.receive_sync_message(sched_ctx, comp_ctx, message);
         debug_assert!(self.mode == Mode::Sync || self.mode == Mode::SyncEnd);
         self.handle_sync_decision(sched_ctx, comp_ctx, decision);
+    }
     /// Little helper that notifies the control layer of an `Ack`, and takes the
     /// appropriate subsequent action
     fn handle_ack(&mut self, sched_ctx: &SchedulerCtx, comp_ctx: &mut CompCtx, control_id: ControlId) {

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -77,9 +77,9 @@ fn test_component_communication() { @@
         new receiver(i_ormm, 1, 5);
         // multiple rounds, multiple messages per round
         new sender(o_mrmm, 5, 5);
         new receiver(i_mrmm, 5, 5);
     }").expect("compilation");
-    let rt = Runtime::new(1, pd);
+    let rt = Runtime::new(3, pd);
     create_component(&rt, "", "constructor", no_args());
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)