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

Changeset - 6f608e19fa8a

Parent rev.

Child rev.

[Not reviewed]

0 5 0

MH - 4 years ago 2021-11-22 18:52:41
contact@maxhenger.nl

Fix part of the error-handling code

5 files changed with 19 insertions and 10 deletions:

src/runtime2/consensus.rs

src/runtime2/mod.rs

src/runtime2/scheduler.rs

src/runtime2/tests/mod.rs

src/runtime2/tests/sync_failure.rs

0 comments (0 inline, 0 general)

src/runtime2/consensus.rs

➞

Show inline comments

@@ @@ -350,7 +350,10 @@ impl Consensus { @@
         // TODO: Handle multiple firings. Right now we just assign the current
         //  branch to the `None` value because we know we can only send once.
         let data_header = DataHeader{
             expected_mapping: branch.channel_mapping.clone(),
             expected_mapping: branch.channel_mapping.iter()
                 .filter(|v| v.registered_id.is_some() || v.channel_id == port_info.channel_id)
                 .copied()
                 .collect(),
             sending_port: port_info.self_id,
             target_port: port_info.peer_id,
             new_mapping: branch.cur_marker,

src/runtime2/mod.rs

➞

Show inline comments

@@ @@ -431,7 +431,7 @@ impl ConnectorStore { @@
+            }
+        }
         println!("DEBUG [ global store  ] Created component at {}", key.index);
+        // println!("DEBUG [ global store  ] Created component at {}", key.index);
         return key;
+    }
@@ @@ -444,7 +444,7 @@ impl ConnectorStore { @@
             // Note: but not deallocating!
+        }
         println!("DEBUG [ global store  ] Destroyed component at {}", key.index);
+        // println!("DEBUG [ global store  ] Destroyed component at {}", key.index);
         self.free.push(key.index as usize);
+    }
+}

src/runtime2/scheduler.rs

➞

Show inline comments

@@ @@ -208,7 +208,7 @@ impl Scheduler { @@
         // Note: we're not handling the public inbox, we're dealing with the
         // private one!
         debug_assert!(scheduled.shutting_down);
-        while let Some(message) = scheduled.ctx.read_next_message() {
+        while let Some(message) = scheduled.ctx.read_next_message_even_if_not_in_sync() {
             let target_port_and_round_number = match &message {
                 Message::Data(msg) => Some((msg.data_header.target_port, msg.sync_header.sync_round)),
                 Message::SyncComp(_) => None,
@@ @@ -405,11 +405,11 @@ impl Scheduler { @@
     // TODO: Remove, this is debugging stuff
     fn debug(&self, message: &str) {
         println!("DEBUG [thrd:{:02} conn:  ]: {}", self.scheduler_id, message);
+        // println!("DEBUG [thrd:{:02} conn:  ]: {}", self.scheduler_id, message);
+    }
     fn debug_conn(&self, conn: ConnectorId, message: &str) {
         println!("DEBUG [thrd:{:02} conn:{:02}]: {}", self.scheduler_id, conn.0, message);
+        // println!("DEBUG [thrd:{:02} conn:{:02}]: {}", self.scheduler_id, conn.0, message);
+    }
+}
@@ @@ -579,6 +579,10 @@ impl ComponentCtx { @@
     // TODO: Fix the clone of the data message, entirely unnecessary
     pub(crate) fn read_next_message(&mut self) -> Option<Message> {
         if !self.is_in_sync { return None; }
         return self.read_next_message_even_if_not_in_sync();
+    }
     pub(crate) fn read_next_message_even_if_not_in_sync(&mut self) -> Option<Message> {
         if self.inbox_len_read == self.inbox_messages.len() { return None; }
         // We want to keep data messages in the inbox, because we need to check

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -16,8 +16,8 @@ use crate::runtime2::native::{ApplicationSyncAction}; @@
 // pub(crate) const NUM_LOOPS: u32 = 8;       // number of loops within a single test (not used by all tests)
 pub(crate) const NUM_THREADS: u32 = 1;
 pub(crate) const NUM_INSTANCES: u32 = 1;
 pub(crate) const NUM_LOOPS: u32 = 1;
 pub(crate) const NUM_INSTANCES: u32 = 5;
 pub(crate) const NUM_LOOPS: u32 = 5;
 fn create_runtime(pdl: &str) -> Runtime {

src/runtime2/tests/sync_failure.rs

➞

Show inline comments

@@ @@ -36,7 +36,9 @@ fn test_local_sync_failure() { @@
 #[test]
 fn test_shared_sync_failure() {
     // Same as above. One of the components should fail, the other should follow
     // suit because it cannot complete a sync round.
     // suit because it cannot complete a sync round. We intentionally have an
     // infinite loop in the while condition because we need at least two loops
     // for the last error to get picked up.
     const CODE: &'static str = "
     enum Location { BeforeSync, AfterPut, AfterGet, AfterSync, Never }
     primitive failing_at_location(in<bool> input, out<bool> output, Location loc) {
@@ @@ -63,7 +65,7 @@ fn test_shared_sync_failure() { @@
     ";
     run_test_in_runtime(CODE, |api| {
-        for variant in 0..1 {
+        for variant in 0..4 { // all `Location` enum variants, except `Never`.
             // Create the channels
             api.create_connector("", "constructor", ValueGroup::new_stack(vec![
                 Value::Enum(variant)

0 comments (0 inline, 0 general)