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

Changeset - 0fb83f27a238

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Christopher Esterhuyse - 5 years ago 2020-02-05 18:07:44
christopheresterhuyse@gmail.com

fixed natives sometimes choosing incomplete branches as solutions

6 files changed with 31 insertions and 20 deletions:

src/protocol/mod.rs

src/runtime/actors.rs

src/runtime/connector.rs

src/runtime/mod.rs

src/runtime/setup.rs

src/test/setup.rs

0 comments (0 inline, 0 general)

src/protocol/mod.rs

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ use crate::protocol::inputsource::*; @@
 use crate::protocol::parser::*;
 use std::hint::unreachable_unchecked;
 pub struct ProtocolDescriptionImpl {
     heap: Heap,
     source: InputSource,
     root: RootId
+    root: RootId,
+}
 impl std::fmt::Debug for ProtocolDescriptionImpl {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(f, "Protocol")
+    }
@@ @@ -83,21 +83,19 @@ impl ProtocolDescription for ProtocolDescriptionImpl { @@
+    }
     fn new_main_component(&self, identifier: &[u8], ports: &[Key]) -> ComponentStateImpl {
         let mut args = Vec::new();
         for (&x, y) in ports.iter().zip(self.component_polarities(identifier).unwrap()) {
             match y {
                 Polarity::Getter => args.push(Value::Input(InputValue(x))),
                 Polarity::Putter => args.push(Value::Output(OutputValue(x)))
+                Polarity::Putter => args.push(Value::Output(OutputValue(x))),
+            }
+        }
         let h = &self.heap;
         let root = &h[self.root];
         let def = root.get_definition_ident(h, identifier).unwrap();
         ComponentStateImpl {
             prompt: Prompt::new(h, def, &args)
+        }
         ComponentStateImpl { prompt: Prompt::new(h, def, &args) }
+    }
+}
 #[derive(Debug, Clone)]
 pub struct ComponentStateImpl {
     prompt: Prompt,

src/runtime/actors.rs

➞

Show inline comments

@@ @@ -381,13 +381,17 @@ impl PolyN { @@
     pub fn become_mono(
         mut self,
         decision: &Predicate,
         table_row: &mut HashMap<Key, Payload>,
     ) -> MonoN {
         if let Some((_, branch)) = self.branches.drain().find(|(p, _)| decision.satisfies(p)) {
         if let Some((_, branch)) = self
             .branches
             .drain()
             .find(|(p, branch)| branch.to_get.is_empty() && decision.satisfies(p))
+        {
             let BranchN { gotten, sync_batch_index, .. } = branch;
             for (&key, payload) in gotten.iter() {
                 assert!(table_row.insert(key, payload.clone()).is_none());
+            }
             MonoN { ekeys: self.ekeys, result: Some((sync_batch_index, gotten)) }
         } else {

src/runtime/connector.rs

➞

Show inline comments

@@ @@ -32,12 +32,13 @@ impl Connector { @@
         let polarities = protocol_description.component_polarities(main_component)?;
         let configured = Configured {
             controller_id,
             protocol_description,
             bindings: Default::default(),
             polarities,
             main_component: main_component.to_vec(),
         };
         *self = Connector::Configured(configured);
         Ok(())
+    }
     /// Bind the (configured) connector's port corresponding to the
@@ @@ -66,22 +67,28 @@ impl Connector { @@
             Connector::Unconfigured { .. } => return Err(NotConfigured),
             Connector::Connected(_) => return Err(AlreadyConnected),
             Connector::Configured(configured) => configured,
         };
         // 1. Unwrap bindings or err
         let bound_proto_interface: Vec<(_, _)> = configured
-            .proto_maybe_bindings
+            .polarities
             .iter()
             .copied()
             .enumerate()
             .map(|(native_index, (polarity, maybe_binding))| {
                 Ok((maybe_binding.ok_or(PortNotBound { native_index })?, polarity))
             .map(|(native_index, polarity)| {
                 let binding = configured
                     .bindings
                     .get(&native_index)
                     .copied()
                     .ok_or(PortNotBound { native_index })?;
                 Ok((binding, polarity))
             })
             .collect::<Result<Vec<(_, _)>, ConnectErr>>()?;
         let (controller, native_interface) = Controller::connect(
             configured.controller_id,
             &configured.main_component,
             configured.protocol_description.clone(),
             &bound_proto_interface[..],
             deadline,
         )?;
         *self = Connector::Connected(Connected {
             native_interface,

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -51,12 +51,13 @@ pub struct Unconfigured { @@
 #[derive(Debug)]
 pub struct Configured {
     controller_id: ControllerId,
     polarities: Vec<Polarity>,
     bindings: HashMap<usize, PortBinding>,
     protocol_description: Arc<ProtocolD>,
     main_component: Vec<u8>,
+}
 #[derive(Debug)]
 pub struct Connected {
     native_interface: Vec<(Key, Polarity)>,
     sync_batches: Vec<SyncBatch>,
     controller: Controller,

src/runtime/setup.rs

➞

Show inline comments

@@ @@ -17,12 +17,13 @@ enum EndpointExtTodo { @@
 ///////////////////// IMPL /////////////////////
 impl Controller {
     // Given port bindings and a protocol config, create a connector with 1 native node
     pub fn connect(
         major: ControllerId,
         main_component: &[u8],
         protocol_description: Arc<ProtocolD>,
         bound_proto_interface: &[(PortBinding, Polarity)],
         deadline: Instant,
     ) -> Result<(Self, Vec<(Key, Polarity)>), ConnectErr> {
         use ConnectErr::*;
@@ @@ -98,13 +99,13 @@ impl Controller { @@
         // 2. convert the arena to Arena<EndpointExt>  and return the
         let (mut messenger_state, mut endpoint_exts) =
             Self::finish_endpoint_ext_todos(major, &mut logger, endpoint_ext_todos, deadline)?;
         let n_mono = Some(MonoN { ekeys: ekeys_native.into_iter().collect(), result: None });
         let p_monos = vec![MonoP {
             state: protocol_description.new_main_component(&ekeys_proto),
+            state: protocol_description.new_main_component(main_component, &ekeys_proto),
             ekeys: ekeys_proto.into_iter().collect(),
         }];
         // 6. Become a node in a sink tree, computing {PARENT, CHILDREN} from {NEIGHBORS}
         let family = Self::setup_sink_tree_family(
             major,

src/test/setup.rs

➞

Show inline comments

@@ @@ -6,22 +6,22 @@ use PortBinding::*; @@
 use super::*;
 #[test]
 fn config_ok_0() {
     let pdl = b"primitive main() {}";
     let d = ProtocolD::parse(pdl).unwrap();
-    let pol = d.main_interface_polarities();
+    let pol = d.component_polarities(b"main").unwrap();
     assert_eq!(&pol[..], &[]);
+}
 #[test]
 fn config_ok_2() {
     let pdl = b"primitive main(in x, out y) {}";
     let d = ProtocolD::parse(pdl).unwrap();
     let pol = d.main_interface_polarities();
     assert_eq!(&pol[..], &[Polarity::Getter, Polarity::Putter]);
     let pol = d.component_polarities(b"main").unwrap();
     assert_eq!(&pol[..], &[Getter, Putter]);
+}
 #[test]
 #[should_panic]
 fn config_non_port() {
     let pdl = b"primitive main(in q, int q) {}";
@@ @@ -34,20 +34,20 @@ fn config_and_connect_2() { @@
     let addrs = ["127.0.0.1:9000".parse().unwrap(), "127.0.0.1:9001".parse().unwrap()];
     use std::thread;
     let handles = vec![
         //
         thread::spawn(move || {
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
             x.configure(b"primitive main(in a, out b) {}").unwrap();
+            x.configure(b"primitive main(in a, out b) {}", b"main").unwrap();
             x.bind_port(0, Passive(addrs[0])).unwrap();
             x.bind_port(1, Passive(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 1 });
             x.configure(b"primitive main(out a, in b) {}").unwrap();
+            x.configure(b"primitive main(out a, in b) {}", b"main").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.bind_port(1, Active(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
         }),
     ];
     for h in handles {
@@ @@ -55,13 +55,13 @@ fn config_and_connect_2() { @@
+    }
+}
 #[test]
 fn bind_too_much() {
     let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
     x.configure(b"primitive main(in a) {}").unwrap();
+    x.configure(b"primitive main(in a) {}", b"main").unwrap();
     x.bind_port(0, Native).unwrap();
     assert!(x.bind_port(1, Native).is_err());
+}
 #[test]
 fn config_and_connect_chain() {
@@ @@ -74,36 +74,36 @@ fn config_and_connect_chain() { @@
     use std::thread;
     let handles = vec![
         //
         thread::spawn(move || {
             // PRODUCER A->
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 0 });
             x.configure(b"primitive main(out a) {}").unwrap();
+            x.configure(b"primitive main(out a) {}", b"main").unwrap();
             x.bind_port(0, Active(addrs[0])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             // FORWARDER ->B->
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 1 });
             x.configure(b"primitive main(in a, out b) {}").unwrap();
+            x.configure(b"primitive main(in a, out b) {}", b"main").unwrap();
             x.bind_port(0, Passive(addrs[0])).unwrap();
             x.bind_port(1, Active(addrs[1])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             // FORWARDER ->C->
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 2 });
             x.configure(b"primitive main(in a, out b) {}").unwrap();
+            x.configure(b"primitive main(in a, out b) {}", b"main").unwrap();
             x.bind_port(0, Passive(addrs[1])).unwrap();
             x.bind_port(1, Active(addrs[2])).unwrap();
             x.connect(timeout).unwrap();
         }),
         thread::spawn(move || {
             // CONSUMER ->D
             let mut x = Connector::Unconfigured(Unconfigured { controller_id: 3 });
             x.configure(b"primitive main(in a) {}").unwrap();
+            x.configure(b"primitive main(in a) {}", b"main").unwrap();
             x.bind_port(0, Passive(addrs[2])).unwrap();
             x.connect(timeout).unwrap();
         }),
     ];
     for h in handles {
         handle(h.join())

0 comments (0 inline, 0 general)