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

Changeset - a5c3b27c535e

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Esterhuyse - 5 years ago 2020-09-21 14:10:20
christopher.esterhuyse@gmail.com

shortened names

2 files changed with 32 insertions and 32 deletions:

src/protocol/inputsource.rs

src/runtime/tests.rs

0 comments (0 inline, 0 general)

src/protocol/inputsource.rs

➞

Show inline comments

@@ @@ -12,38 +12,38 @@ pub struct InputSource { @@
     line: usize,
     column: usize,
     offset: usize,
+}
 static STD_LIB_PDL: &'static [u8] = b"
 primitive forward(in i, out o) {
     while(true) synchronous() put(o, get(i));
+}
 primitive sync(in i, out o) {
     while(true) synchronous() if(fires(i)) put(o, get(i));
+}
-primitive alternator2(in i, out l, out r) {
+primitive alternator(in i, out l, out r) {
     while(true) {
         synchronous() if(fires(i)) put(l, get(i));
         synchronous() if(fires(i)) put(r, get(i));
+    }
+}
-primitive replicator2(in i, out l, out r) {
+primitive replicator(in i, out l, out r) {
     while(true) synchronous() if(fires(i)) {
         msg m = get(i);
         put(l, m);
         put(r, m);
+    }
+}
-primitive merger2(in l, in r, out o) {
+primitive merger(in l, in r, out o) {
     while(true) synchronous {
         if(fires(l))      put(o, get(l));
         else if(fires(r)) put(o, get(r));
+    }
 }";
 impl InputSource {
     // Constructors
     pub fn new<R: io::Read, S: ToString>(filename: S, reader: &mut R) -> io::Result<InputSource> {
         let mut vec = STD_LIB_PDL.to_vec();
         reader.read_to_end(&mut vec)?;
         Ok(InputSource {

src/runtime/tests.rs

➞

Show inline comments

@@ @@ -1082,29 +1082,29 @@ fn sequencer3_comp() { @@
     composite fifo1(in a, out b) {
         new fifo1_init(null, a, b);
+    }
     composite sequencer3(out a, out b, out c) {
         channel d -> e;
         channel f -> g;
         channel h -> i;
         channel j -> k;
         channel l -> m;
         channel n -> o;
         new fifo1_full(o, d);
-        new replicator2(e, f, a);
+        new replicator(e, f, a);
         new fifo1(g, h);
-        new replicator2(i, j, b);
+        new replicator(i, j, b);
         new fifo1(k, l);
-        new replicator2(m, n, c);
+        new replicator(m, n, c);
+    }
     ";
     let pd = reowolf::ProtocolDescription::parse(pdl).unwrap();
     let mut c = file_logged_configured_connector(0, test_log_path, Arc::new(pd));
     // setup a session between (a) native, and (b) sequencer3, connected by 3 ports.
     let [p0, g0] = c.new_port_pair();
     let [p1, g1] = c.new_port_pair();
     let [p2, g2] = c.new_port_pair();
     c.add_component(b"sequencer3", &[p0, p1, p2]).unwrap();
     c.connect(None).unwrap();
@@ @@ -1119,135 +1119,135 @@ fn sequencer3_comp() { @@
     };
     const TEST_ROUNDS: usize = 50;
     // check that the batch index for rounds 0..TEST_ROUNDS are [0, 1, 2, 0, 1, 2, ...]
     for expected_batch_idx in (0..=2).cycle().take(TEST_ROUNDS) {
         // silent round
         assert_eq!(0, c.sync(SEC1).unwrap());
         // non silent round
         assert_eq!(expected_batch_idx, which_of_three(&mut c));
+    }
+}
-enum XRouter2Item {
+enum XRouterItem {
     Silent,
     GetA,
     GetB,
+}
 // Hardcoded pseudo-random sequence of round behaviors for the native component
 const XROUTER2_ITEMS: &[XRouter2Item] = {
     use XRouter2Item::{GetA as A, GetB as B, Silent as S};
 const XROUTER_ITEMS: &[XRouterItem] = {
     use XRouterItem::{GetA as A, GetB as B, Silent as S};
     &[
         B, A, S, B, A, A, B, S, B, S, A, A, S, B, B, S, B, S, B, B, S, B, B, A, B, B, A, B, A, B,
         S, B, S, B, S, A, S, B, A, S, B, A, B, S, B, S, B, S, S, B, B, A, A, A, S, S, S, B, A, A,
         A, S, S, B, B, B, A, B, S, S, A, A, B, A, B, B, A, A, A, B, A, B, S, A, B, S, A, A, B, S,
+    ]
 };
 #[test]
 fn xrouter2_prim() {
     let test_log_path = Path::new("./logs/xrouter2_prim");
 fn xrouter_prim() {
     let test_log_path = Path::new("./logs/xrouter_prim");
     let pdl = b"
-    primitive xrouter2(in a, out b, out c) {
+    primitive xrouter(in a, out b, out c) {
         while(true) synchronous {
             if(fires(a)) {
                 if(fires(b)) put(b, get(a));
                 else         put(c, get(a));
+            }
+        }
+    }
     ";
     let pd = reowolf::ProtocolDescription::parse(pdl).unwrap();
     let mut c = file_logged_configured_connector(0, test_log_path, Arc::new(pd));
     // setup a session between (a) native, and (b) xrouter2, connected by 3 ports.
     let [p0, g0] = c.new_port_pair();
     let [p1, g1] = c.new_port_pair();
     let [p2, g2] = c.new_port_pair();
-    c.add_component(b"xrouter2", &[g0, p1, p2]).unwrap();
+    c.add_component(b"xrouter", &[g0, p1, p2]).unwrap();
     c.connect(None).unwrap();
     let now = std::time::Instant::now();
-    for item in XROUTER2_ITEMS.iter() {
+    for item in XROUTER_ITEMS.iter() {
         match item {
             XRouter2Item::Silent => {}
             XRouter2Item::GetA => {
             XRouterItem::Silent => {}
             XRouterItem::GetA => {
                 c.put(p0, TEST_MSG.clone()).unwrap();
                 c.get(g1).unwrap();
+            }
-            XRouter2Item::GetB => {
+            XRouterItem::GetB => {
                 c.put(p0, TEST_MSG.clone()).unwrap();
                 c.get(g2).unwrap();
+            }
+        }
         assert_eq!(0, c.sync(SEC1).unwrap());
+    }
     println!("PRIM {:?}", now.elapsed());
+}
 #[test]
 fn xrouter2_comp() {
     let test_log_path = Path::new("./logs/xrouter2_comp");
 fn xrouter_comp() {
     let test_log_path = Path::new("./logs/xrouter_comp");
     let pdl = b"
     primitive lossy(in a, out b) {
         while(true) synchronous {
             if(fires(a)) {
                 msg m = get(a);
                 if(fires(b)) put(b, get(a));
+            }
+        }
+    }
-    primitive sync_drain2(in a, in b) {
+    primitive sync_drain(in a, in b) {
         while(true) synchronous {
             if(fires(a)) {
                 get(a);
                 get(b);
+            }
+        }
+    }
-    composite xrouter2(in a, out b, out c) {
+    composite xrouter(in a, out b, out c) {
         channel d -> e;
         channel f -> g;
         channel h -> i;
         channel j -> k;
         channel l -> m;
         channel n -> o;
         channel p -> q;
         channel r -> s;
         channel t -> u;
         new replicator2(a, d, f); // ok
         new replicator2(g, t, h); // ok
         new replicator(a, d, f); // ok
         new replicator(g, t, h); // ok
         new lossy(e, l); // ok
         new lossy(i, j); // ok
         new replicator2(m, b, p); // ok
         new replicator2(k, n, c); // ok
         new merger2(q, o, r);
         new sync_drain2(u, s);
         new replicator(m, b, p); // ok
         new replicator(k, n, c); // ok
         new merger(q, o, r);
         new sync_drain(u, s);
+    }
     ";
     let pd = reowolf::ProtocolDescription::parse(pdl).unwrap();
     let mut c = file_logged_configured_connector(0, test_log_path, Arc::new(pd));
     // setup a session between (a) native, and (b) xrouter2, connected by 3 ports.
     let [p0, g0] = c.new_port_pair();
     let [p1, g1] = c.new_port_pair();
     let [p2, g2] = c.new_port_pair();
-    c.add_component(b"xrouter2", &[g0, p1, p2]).unwrap();
+    c.add_component(b"xrouter", &[g0, p1, p2]).unwrap();
     c.connect(None).unwrap();
     let now = std::time::Instant::now();
-    for item in XROUTER2_ITEMS.iter() {
+    for item in XROUTER_ITEMS.iter() {
         match item {
             XRouter2Item::Silent => {}
             XRouter2Item::GetA => {
             XRouterItem::Silent => {}
             XRouterItem::GetA => {
                 c.put(p0, TEST_MSG.clone()).unwrap();
                 c.get(g1).unwrap();
+            }
-            XRouter2Item::GetB => {
+            XRouterItem::GetB => {
                 c.put(p0, TEST_MSG.clone()).unwrap();
                 c.get(g2).unwrap();
+            }
+        }
         assert_eq!(0, c.sync(SEC1).unwrap());
+    }
     println!("COMP {:?}", now.elapsed());
+}

0 comments (0 inline, 0 general)