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

Changeset - 8ec435d9b2c8

Parent rev.

Child rev.

[Not reviewed]

0 3 0

MH - 3 years ago 2022-04-22 13:22:43
contact@maxhenger.nl

WIP on async control message bug regarding transferred closed ports

3 files changed with 54 insertions and 15 deletions:

src/runtime2/component/component_pdl.rs

src/runtime2/tests/error_handling.rs

src/runtime2/tests/mod.rs

0 comments (0 inline, 0 general)

src/runtime2/component/component_pdl.rs

➞

Show inline comments

@@ @@ -760,22 +760,34 @@ impl CompPDL { @@
                 peer_port_info.peer_comp_id = component.ctx.id;
                 peer_port_info.peer_port_id = created_port_info.self_id;
                 creator_ctx.add_peer(peer_port_handle, sched_ctx, component.ctx.id, None);
+            }
+        }
         // Do the same for the closed ports
         // Do the same for the closed ports. Note that we might still have to
         // transfer messages that cause the new owner of the port to fail.
         for pair in closed_port_id_pairs.iter() {
             let port_index = creator_ctx.get_port_index(pair.creator_handle);
             creator_ctx.remove_port(pair.creator_handle);
             let _removed_message = self.inbox_main.remove(port_index);
             if let Some(mut message) = self.inbox_main.remove(port_index) {
                 message.data_header.target_port = pair.created_id;
                 component.component.adopt_message(&mut component.ctx, message);
+            }
             // In debug mode: since we've closed the port we shouldn't have any
             // messages for that port.
             debug_assert!(_removed_message.is_none());
             debug_assert!(!self.inbox_backup.iter().any(|v| v.data_header.target_port == pair.creator_id));
             let mut message_index = 0;
             while message_index < self.inbox_backup.len() {
                 let message = &self.inbox_backup[message_index];
                 if message.data_header.target_port == pair.created_id {
                     // Transfer message
                     let mut message = self.inbox_backup.remove(message_index);
                     message.data_header.target_port = pair.created_id;
                     component.component.adopt_message(&mut component.ctx, message);
                 } else {
                     message_index += 1;
+                }
+            }
+        }
         // By now all ports and messages have been transferred. If there are any
         // peers that need to be notified about this new component, then we
         // initiate the protocol that will notify everyone here.
         if created_component_has_remote_peers {

src/runtime2/tests/error_handling.rs

➞

Show inline comments

 use super::*;
 #[test]
 fn test_unconnected_component_error() {
-    let pd = ProtocolDescription::parse(b"
+    compile_and_create_component("
     primitive interact_with_noone() {
         u8[] array = { 5 };
         auto value = array[1];
+    }
     ").unwrap();
     let rt = Runtime::new(1, true, pd).unwrap();
     create_component(&rt, "", "interact_with_noone", no_args());
     }", "interact_with_noone", no_args());
+}
 #[test]
 fn test_connected_uncommunicating_component_error() {
-    let pd = ProtocolDescription::parse(b"
+    compile_and_create_component("
     primitive crashing_and_burning(out<u32> unused) {
         u8[] array = { 1337 };
         auto value = array[1337];
+    }
     primitive sitting_idly_waiting(in<u32> never_providing) {
         sync auto a = get(never_providing);
+    }
     composite constructor() {
         channel a -> b;
         new sitting_idly_waiting(b);
         new crashing_and_burning(a);
     }").unwrap();
     let rt = Runtime::new(1, true, pd).unwrap();
     create_component(&rt, "", "constructor", no_args());
     }", "constructor", no_args())
+}
 #[test]
 fn test_connected_communicating_component_error() {
     compile_and_create_component("
     primitive send_and_fail(out<u32> tx) {
         u8[] array = {};
         sync {
             put(tx, 0);
             array[0] = 5;
+        }
+    }
     primitive receive_once(in<u32> rx) {
         sync auto a = get(rx);
+    }
     composite constructor() {
         channel a -> b;
         new send_and_fail(a);
         new receive_once(b);
+    }
     ", "constructor", no_args())
+}
@@ \ No newline at end of file @@

src/runtime2/tests/mod.rs

➞

Show inline comments

@@ @@ -2,12 +2,23 @@ use crate::protocol::*; @@
 use crate::protocol::eval::*;
 use crate::runtime2::runtime::*;
 use crate::runtime2::component::{CompCtx, CompPDL};
 mod error_handling;
 const NUM_THREADS: u32 = 1;
 const DEBUG_LOGGING: bool = true;
 pub(crate) fn compile_and_create_component(source: &str, routine_name: &str, args: ValueGroup) {
     let protocol = ProtocolDescription::parse(source.as_bytes())
         .expect("successful compilation");
     let runtime = Runtime::new(NUM_THREADS, DEBUG_LOGGING, protocol)
         .expect("successful runtime startup");
     create_component(&runtime, "", routine_name, args);
+}
 pub(crate) fn create_component(rt: &Runtime, module_name: &str, routine_name: &str, args: ValueGroup) {
     let prompt = rt.inner.protocol.new_component(
         module_name.as_bytes(), routine_name.as_bytes(), args
     ).expect("create prompt");
     let reserved = rt.inner.start_create_pdl_component();
     let ctx = CompCtx::new(&reserved);

0 comments (0 inline, 0 general)