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

Changeset - cc23d3cb40d3

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Christopher Esterhuyse - 5 years ago 2020-02-05 17:54:35
christopheresterhuyse@gmail.com

natives working

5 files changed with 49 insertions and 22 deletions:

src/runtime/connector.rs

src/runtime/errors.rs

src/runtime/ffi.rs

src/runtime/mod.rs

src/test/connector.rs

0 comments (0 inline, 0 general)

src/runtime/connector.rs

➞

Show inline comments

@@ @@ -18,22 +18,27 @@ impl Default for Connector { @@
     fn default() -> Self {
         Self::Unconfigured(Unconfigured::default())
+    }
+}
 impl Connector {
     /// Configure the Connector with the given Pdl description.
     pub fn configure(&mut self, pdl: &[u8]) -> Result<(), ConfigErr> {
+    pub fn configure(&mut self, pdl: &[u8], main_component: &[u8]) -> Result<(), ConfigErr> {
         use ConfigErr::*;
         let controller_id = match self {
             Connector::Configured(_) => return Err(AlreadyConfigured),
             Connector::Connected(_) => return Err(AlreadyConnected),
             Connector::Unconfigured(Unconfigured { controller_id }) => *controller_id,
         };
         let protocol_description = Arc::new(ProtocolD::parse(pdl).map_err(ParseErr)?);
         let configured =
             Configured { controller_id, protocol_description, bindings: Default::default() };
         let polarities = protocol_description.component_polarities(main_component)?;
         let configured = Configured {
             controller_id,
             protocol_description,
             bindings: Default::default(),
             polarities,
         };
         *self = Connector::Configured(configured);
         Ok(())
+    }
     /// Bind the (configured) connector's port corresponding to the
     pub fn bind_port(
@@ @@ -43,12 +48,15 @@ impl Connector { @@
     ) -> Result<(), PortBindErr> {
         use PortBindErr::*;
         match self {
             Connector::Unconfigured { .. } => Err(NotConfigured),
             Connector::Connected(_) => Err(AlreadyConnected),
             Connector::Configured(configured) => {
                 if configured.polarities.len() <= proto_port_index {
                     return Err(IndexOutOfBounds);
+                }
                 configured.bindings.insert(proto_port_index, binding);
                 Ok(())
+            }
+        }
+    }
     pub fn connect(&mut self, timeout: Duration) -> Result<(), ConnectErr> {
@@ @@ -57,20 +65,13 @@ impl Connector { @@
         let configured = match self {
             Connector::Unconfigured { .. } => return Err(NotConfigured),
             Connector::Connected(_) => return Err(AlreadyConnected),
             Connector::Configured(configured) => configured,
         };
         // 1. Unwrap bindings or err
         let mut bindings_vec = Vec::with_capacity(configured.bindings.len());
         for native_index in 0..configured.bindings.len() {
             let binding =
                 configured.bindings.get(&native_index).ok_or(PortNotBound { native_index })?;
             bindings_vec.push(*binding);
+        }
         let bound_proto_interface: Vec<(_, _)> = (0..num_bindings)
             .map(|i| configured.bindings.get())
         let bound_proto_interface: Vec<(_, _)> = configured
             .proto_maybe_bindings
             .iter()
             .copied()
             .enumerate()
             .map(|(native_index, (polarity, maybe_binding))| {
                 Ok((maybe_binding.ok_or(PortNotBound { native_index })?, polarity))

src/runtime/errors.rs

➞

Show inline comments

@@ @@ -25,12 +25,14 @@ pub enum PortOpErr { @@
+}
 #[derive(Debug)]
 pub enum ConfigErr {
     AlreadyConnected,
     ParseErr(String),
     AlreadyConfigured,
     NoSuchComponent,
     NonPortTypeParameters,
+}
 #[derive(Debug, Clone)]
 pub enum ConnectErr {
     PortNotBound { native_index: usize },
     NotConfigured,
     AlreadyConnected,
@@ @@ -76,6 +78,16 @@ pub enum EvalErr { @@
+}
 #[derive(Debug, Clone)]
 pub enum MessengerRecvErr {
     PollingFailed,
     EndpointErr(EndpointErr),
+}
 impl From<MainComponentErr> for ConfigErr {
     fn from(e: MainComponentErr) -> Self {
         use ConfigErr as C;
         use MainComponentErr as M;
         match e {
             M::NoSuchComponent => C::NoSuchComponent,
             M::NonPortTypeParameters => C::NonPortTypeParameters,
+        }
+    }
+}

src/runtime/ffi.rs

➞

Show inline comments

 /// Configures the given Reowolf connector with a protocol description in PDL.
 /// Returns:
 /// # Safety
 /// TODO
 #[no_mangle]
 pub unsafe extern "C" fn connector_configure(connector: *mut Connector, pdl: *mut c_char) -> c_int {
 pub unsafe extern "C" fn connector_configure(
     connector: *mut Connector,
     pdl: *mut c_char,
     main: *mut c_char,
 ) -> c_int {
     let mut b = Box::from_raw(connector); // unsafe!
     let ret = as_rust_bytes(pdl, |pdl_bytes| match b.configure(pdl_bytes) {
         Ok(()) => 0,
         Err(e) => {
             overwrite_last_error(format!("{:?}", e).as_bytes());
             -1
+        }
     let ret = as_rust_bytes(pdl, |pdl_bytes| {
         as_rust_bytes(main, |main_bytes| match b.configure(pdl_bytes, main_bytes) {
             Ok(()) => 0,
             Err(e) => {
                 overwrite_last_error(format!("{:?}", e).as_bytes());
                 -1
+            }
         })
     });
     Box::into_raw(b); // don't drop!
     ret
+}
 /// Provides a binding annotation for the port with the given index with "native":

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -48,12 +48,13 @@ pub enum Connector { @@
 pub struct Unconfigured {
     pub controller_id: ControllerId,
+}
 #[derive(Debug)]
 pub struct Configured {
     controller_id: ControllerId,
     polarities: Vec<Polarity>,
     bindings: HashMap<usize, PortBinding>,
     protocol_description: Arc<ProtocolD>,
+}
 #[derive(Debug)]
 pub struct Connected {
     native_interface: Vec<(Key, Polarity)>,

src/test/connector.rs

➞

Show inline comments

@@ @@ -20,23 +20,25 @@ fn next_addr() -> SocketAddr { @@
+}
 #[test]
 fn incremental() {
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr(), next_addr()];
     static PDL: &[u8] = b"";
     let handles = vec![
         thread::spawn(move || {
             let controller_id = 0;
             let mut x = Connector::Unconfigured(Unconfigured { controller_id });
             x.configure(
                 b"primitive main(out a, out b) {
                     synchronous {
                         msg m = create(0);
                         put(a, m);
+                    }
                 }",
                 b"main",
+            )
             .unwrap();
             x.bind_port(0, Passive(addrs[0])).unwrap();
             x.bind_port(1, Passive(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
             assert_eq!(0, x.sync(timeout).unwrap());
@@ @@ -48,12 +50,13 @@ fn incremental() { @@
             x.configure(
                 b"primitive main(in a, in b) {
                     synchronous {
                         get(a);
+                    }
                 }",
                 b"main",
+            )
             .unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.bind_port(1, Active(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
             assert_eq!(0, x.sync(timeout).unwrap());
@@ @@ -82,12 +85,13 @@ fn duo_positive() { @@
+                }
                 synchronous {
                     msg m = create(0);
                     put(b, m);
+                }
             }",
             b"main",
+        )
         .unwrap();
         x.bind_port(0, Passive(addrs[0])).unwrap();
         x.bind_port(1, Passive(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
@@ @@ -111,12 +115,13 @@ fn duo_positive() { @@
                         if (fires(b)) {
                             get(b);
+                        }
+                    }
+                }
             }",
             b"main",
+        )
         .unwrap();
         x.bind_port(0, Active(addrs[0])).unwrap();
         x.bind_port(1, Active(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
@@ @@ -141,12 +146,13 @@ fn duo_negative() { @@
                 synchronous {}
                 synchronous {
                     msg m = create(0);
                     put(a, m); // fires a on second round
+                }
             }",
             b"main",
+        )
         .unwrap();
         x.bind_port(0, Passive(addrs[0])).unwrap();
         x.bind_port(1, Passive(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
@@ @@ -172,12 +178,13 @@ fn duo_negative() { @@
                         if (fires(b)) { // never fire a on even round
                             get(b);
+                        }
+                    }
+                }
             }",
             b"main",
+        )
         .unwrap();
         x.bind_port(0, Active(addrs[0])).unwrap();
         x.bind_port(1, Active(addrs[1])).unwrap();
         x.connect(timeout).unwrap();
         assert_eq!(0, x.sync(timeout).unwrap());
@@ @@ -199,20 +206,20 @@ fn connect_natives() { @@
         while(true) synchronous {}
     }";
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr()];
     do_all(&[
         &|x| {
             x.configure(CHAIN).unwrap();
+            x.configure(CHAIN, b"main").unwrap();
             x.bind_port(0, Native).unwrap();
             x.bind_port(1, Passive(addrs[0])).unwrap();
             x.connect(timeout).unwrap();
             assert_eq!(0, x.sync(timeout).unwrap());
         },
         &|x| {
             x.configure(CHAIN).unwrap();
+            x.configure(CHAIN, b"main").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.bind_port(1, Native).unwrap();
             x.connect(timeout).unwrap();
             assert_eq!(0, x.sync(timeout).unwrap());
         },
     ]);
@@ @@ -228,23 +235,23 @@ fn forward() { @@
     }";
     let timeout = Duration::from_millis(1_500);
     let addrs = [next_addr()];
     do_all(&[
         //
         &|x| {
             x.configure(FORWARD).unwrap();
+            x.configure(FORWARD, b"main").unwrap();
             x.bind_port(0, Native).unwrap();
             x.bind_port(1, Passive(addrs[0])).unwrap();
             x.connect(timeout).unwrap();
             let msg = b"HELLO!".to_vec();
             x.put(0, msg).unwrap();
             assert_eq!(0, x.sync(timeout).unwrap());
         },
         &|x| {
             x.configure(FORWARD).unwrap();
+            x.configure(FORWARD, b"main").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.bind_port(1, Native).unwrap();
             x.connect(timeout).unwrap();
             let expect = b"HELLO!".to_vec();
             x.get(0).unwrap();

0 comments (0 inline, 0 general)