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

Changeset - a1b2108ed856

Parent rev.

Child rev.

[Not reviewed]

0 2 0

mh - 3 years ago 2022-05-11 22:10:34
contact@maxhenger.nl

Prepare fixing another blocking/transfer bug

2 files changed with 46 insertions and 1 deletions:

src/runtime2/component/component.rs

src/runtime2/tests/transfer_ports.rs

0 comments (0 inline, 0 general)

src/runtime2/component/component.rs

➞

Show inline comments

@@ @@ -424,26 +424,28 @@ pub(crate) fn default_handle_received_data_message( @@
     let port_handle = comp_ctx.get_port_handle(targeted_port);
     let port_index = comp_ctx.get_port_index(port_handle);
     debug_assert!(inbox_main[port_index].is_none()); // because we've just received from it
     // If we received any ports, add them to the port tracking and inbox struct.
     // Then notify the peers that they can continue sending to this port, but
     // now at a new address.
     for received_port in &mut message.ports {
         // Transfer messages to main/backup inbox
         let _new_inbox_index = inbox_main.len();
         if !received_port.messages.is_empty() {
             inbox_main.push(Some(received_port.messages.remove(0)));
             inbox_backup.extend(received_port.messages.drain(..));
         } else {
             inbox_main.push(None);
+        }
         inbox_backup.extend(received_port.messages.drain(..));
         // Create a new port locally
         let mut new_port_state = received_port.state;
         new_port_state.set(PortStateFlag::Received);
         let new_port_handle = comp_ctx.add_port(
             received_port.peer_comp, received_port.peer_port,
             received_port.kind, new_port_state
         );
         debug_assert_eq!(_new_inbox_index, comp_ctx.get_port_index(new_port_handle));
         comp_ctx.change_port_peer(sched_ctx, new_port_handle, Some(received_port.peer_comp));
         let new_port = comp_ctx.get_port(new_port_handle);

src/runtime2/tests/transfer_ports.rs

➞

Show inline comments

@@ @@ -65,19 +65,62 @@ fn test_transfer_synccreated_port() { @@
 #[test]
 fn test_transfer_precreated_port_with_owned_peer_back_and_forth() {
+}
 #[test]
 fn test_transfer_precreated_port_with_foreign_peer_back_and_forth() {
+}
 #[test]
 fn test_transfer_precreated_port_with_owned_peer_and_communication() {
     compile_and_create_component("
     primitive port_sender(out<in<u32>> tx) {
         channel a -> b;
         sync put(tx, b);
         sync put(a, 1337);
+    }
     primitive port_receiver(in<in<u32>> rx) {
         channel a -> b; // this is stupid, but we need to have a variable to use
         sync b = get(rx);
         u32 value = 0;
         sync value = get(b);
         while (value != 1337) {}
+    }
     composite constructor() {
         channel a -> b;
         new port_sender(a);
         new port_receiver(b);
+    }
     ", "constructor", no_args());
+}
 #[test]
 fn test_transfer_precreated_port_with_foreign_peer_and_communication() {
     compile_and_create_component("
     primitive port_sender(out<in<u32>> tx, in<u32> to_send) {
         sync put(tx, to_send);
+    }
     primitive message_transmitter(out<u32> tx) {
         sync put(tx, 1337);
+    }
     primitive port_receiver(in<in<u32>> rx) {
         channel unused -> b;
         sync b = get(rx);
         u32 value = 0;
         sync value = get(b);
         while (value != 1337) {}
+    }
     composite constructor() {
         channel port_tx -> port_rx;
         channel value_tx -> value_rx;
         new port_sender(port_tx, value_rx);
         new port_receiver(port_rx);
         new message_transmitter(value_tx);
+    }
     ", "constructor", no_args());
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)