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

Changeset - 32d9f23a4c87

Parent rev.

Child rev.

[Not reviewed]

0 3 0

MH - 4 years ago 2021-11-12 13:37:37
contact@maxhenger.nl

fix clearing too many messages

3 files changed with 47 insertions and 4 deletions:

src/runtime2/connector.rs

src/runtime2/scheduler.rs

src/runtime2/tests/api_component.rs

0 comments (0 inline, 0 general)

src/runtime2/connector.rs

➞

Show inline comments

@@ @@ -55,7 +55,7 @@ impl ConnectorPublic { @@
+    }
+}
 #[derive(Eq, PartialEq)]
+#[derive(Debug, Eq, PartialEq)]
 pub(crate) enum ConnectorScheduling {
     Immediate,      // Run again, immediately
     Later,          // Schedule for running, at some later point in time

src/runtime2/scheduler.rs

➞

Show inline comments

@@ @@ -296,8 +296,9 @@ impl Scheduler { @@
             if scheduled.ctx.is_in_sync {
                 // Just entered sync region
             } else {
                 // Just left sync region. So clear inbox
                 scheduled.ctx.inbox_messages.clear();
                 // Just left sync region. So clear inbox up until the last
                 // message that was read.
                 scheduled.ctx.inbox_messages.drain(0..scheduled.ctx.inbox_len_read);
                 scheduled.ctx.inbox_len_read = 0;
+            }
@@ @@ -380,7 +381,7 @@ pub(crate) struct ComponentCtx { @@
     // Mostly managed by the scheduler
     pub(crate) id: ConnectorId,
     ports: Vec<Port>,
-    inbox_messages: Vec<Message>, // never control or ping messages
     inbox_messages: Vec<Message>,
     inbox_len_read: usize,
     // Submitted by the component
     is_in_sync: bool,

src/runtime2/tests/api_component.rs

➞

Show inline comments

@@ @@ -47,4 +47,46 @@ fn test_put_and_get() { @@
             assert!(false);
+        }
+    }
+}
 #[test]
 fn test_getting_from_component() {
     const CODE: &'static str ="
     primitive loop_sender(out<u32> numbers, u32 cur, u32 last) {
         while (cur < last) {
             print(\"sync start\");
             synchronous {
                 print(\"sending\");
                 put(numbers, cur);
                 cur += 1;
+            }
             print(\"sync solution!\");
+        }
     }";
     let pd = ProtocolDescription::parse(CODE.as_bytes()).unwrap();
     let rt = Runtime::new(NUM_THREADS, pd);
     let mut api = rt.create_interface();
     let channel = api.create_channel().unwrap();
     api.create_connector("", "loop_sender", ValueGroup::new_stack(vec![
         Value::Output(PortId::new(channel.putter_id.index)),
         Value::UInt32(1337),
         Value::UInt32(1337 + NUM_LOOPS)
     ])).unwrap();
     for loop_idx in 0..NUM_LOOPS {
         api.perform_sync_round(vec![
             ApplicationSyncAction::Get(channel.getter_id),
         ]).expect("start sync round");
         let result = api.wait().expect("finish sync round");
         assert!(result.len() == 1 && result[0].values.len() == 1);
         if let Value::UInt32(gotten) = result[0].values[0] {
             assert_eq!(gotten, 1337 + loop_idx);
         } else {
             assert!(false);
+        }
+    }
+}
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)