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

Changeset - 1e885fa95b12

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Christopher Esterhuyse - 5 years ago 2020-02-04 14:41:54
christopheresterhuyse@gmail.com

more debug prints on branch predicates

5 files changed with 67 insertions and 14 deletions:

Cargo.toml

src/macros.rs

src/runtime/actors.rs

src/runtime/communication.rs

src/runtime/mod.rs

0 comments (0 inline, 0 general)

Cargo.toml

➞

Show inline comments

 [package]
 name = "reowolf_rs"
 version = "0.1.0"
 authors = ["Christopher Esterhuyse <christopher.esterhuyse@gmail.com>", "Hans-Dieter Hiep <hdh@cwi.nl>"]
 authors = [
 	"Christopher Esterhuyse <christopher.esterhuyse@gmail.com>",
 	"Hans-Dieter Hiep <hdh@cwi.nl>"
+]
 edition = "2018"
 [dependencies]
 # runtime stuff
 getrandom = "0.1.14" # tiny crate. used to guess controller-id
 take_mut = "0.2.2"
 maplit = "1.0.2" # convenience macros
 indexmap = "1.3.0" # hashsets with efficient arbitrary element removal
+indexmap = "1.3.0" # hashsets/hashmaps with efficient arbitrary element removal
 # network stuff
 integer-encoding = "1.0.7"
 byteorder = "1.3.2"
 mio = "0.6.21" # migrate to mio 0.7.0 when it stabilizes. It's much better.
 mio-extras = "2.0.6"
@@ @@ -26,7 +30,7 @@ test-generator = "0.3.0" @@
 [lib]
 crate-type = ["cdylib"]
 [features]
 default = ["ffi"]
 ffi = []
@@ \ No newline at end of file @@
 ffi = [] # no feature dependencies
@@ \ No newline at end of file @@

src/macros.rs

➞

Show inline comments

 macro_rules! lockprintln {
     () => (print!("\n"));
     ($($arg:tt)*) => ({
         use std::io::Write;
         std::writeln!(std::io::stdout().lock(), $($arg)*).expect("LPRINTLN");
     })
+}
 macro_rules! assert_let {
     ($pat:pat = $expr:expr => $work:expr) => {
         if let $pat = $expr {
             $work
         } else {
             panic!("assert_let failed");

src/runtime/actors.rs

➞

Show inline comments

@@ @@ -138,64 +138,108 @@ impl PolyP { @@
         protocol_description: &ProtocolD,
         ekey: Key,
         payload_predicate: Predicate,
         payload: Payload,
     ) -> Result<SyncRunResult, EndpointErr> {
         // try exact match
         let cid = m_ctx.inner.channel_id_stream.controller_id;
         let to_run = if self.complete.contains_key(&payload_predicate) {
             // exact match with stopped machine
             lockprintln!(
                 "{:?}: ... poly_recv_run matched stopped machine exactly! nothing to do here",
                 cid,
             );
             vec![]
         } else if let Some(mut branch) = self.incomplete.remove(&payload_predicate) {
             // exact match with running machine
             lockprintln!(
                 "{:?}: ... poly_recv_run matched running machine exactly! pred is {:?}",
                 cid,
                 &payload_predicate
             );
             branch.inbox.insert(ekey, payload);
             vec![(payload_predicate, branch)]
         } else {
             lockprintln!(
                 "{:?}: ... poly_recv_run didn't have any exact matches... Let's try feed it to all branches",
                 cid,
             );
             let mut incomplete2 = HashMap::<_, _>::default();
             let to_run = self
                 .incomplete
                 .drain()
                 .filter_map(|(old_predicate, mut branch)| {
                     use CommonSatResult as Csr;
                     match old_predicate.common_satisfier(&payload_predicate) {
                         Csr::FormerNotLatter | Csr::Equivalent => {
                             lockprintln!(
                                 "{:?}: ... poly_recv_run This branch is compatible unaltered! branch pred: {:?}",
                                 cid,
                                 &old_predicate
                             );
                             // old_predicate COVERS the assumptions of payload_predicate
                             let was = branch.inbox.insert(ekey, payload.clone());
                             assert!(was.is_none()); // INBOX MUST BE EMPTY!
                             Some((old_predicate, branch))
+                        }
                         Csr::New(unified) => {
                         Csr::New(new) => {
                             lockprintln!(
                                 "{:?}: ... poly_recv_run payloadpred {:?} and branchpred {:?} satisfied by new pred {:?}. FORKING",
                                 cid,
                                 &old_predicate,
                                 &payload_predicate,
                                 &new,
                             );
                             // payload_predicate has new assumptions. FORK!
                             let mut payload_branch = branch.clone();
                             let was = payload_branch.inbox.insert(ekey, payload.clone());
                             assert!(was.is_none()); // INBOX MUST BE EMPTY!
                             // put the original back untouched
                             incomplete2.insert(old_predicate, branch);
-                            Some((unified, payload_branch))
+                            Some((new, payload_branch))
+                        }
                         Csr::LatterNotFormer => {
                             lockprintln!(
                                 "{:?}: ... poly_recv_run payloadpred {:?} subsumes branch pred {:?}. FORKING",
                                 cid,
                                 &old_predicate,
                                 &payload_predicate,
                             );
                             // payload_predicate has new assumptions. FORK!
                             let mut payload_branch = branch.clone();
                             let was = payload_branch.inbox.insert(ekey, payload.clone());
                             assert!(was.is_none()); // INBOX MUST BE EMPTY!
                             // put the original back untouched
                             incomplete2.insert(old_predicate, branch);
                             Some((payload_predicate.clone(), payload_branch))
+                        }
                         Csr::Nonexistant => {
                             lockprintln!(
                                 "{:?}: ... poly_recv_run SKIPPING because branchpred={:?}. payloadpred={:?}",
                                 cid,
                                 &old_predicate,
                                 &payload_predicate,
                             );
                             // predicates contradict
                             incomplete2.insert(old_predicate, branch);
                             None
+                        }
+                    }
                 })
                 .collect();
             std::mem::swap(&mut self.incomplete, &mut incomplete2);
             to_run
         };
         lockprintln!("{:?}: ... DONE FEEDING BRANCHES. {} branches to run!", cid, to_run.len(),);
         self.poly_run_these_branches(m_ctx, protocol_description, to_run)
+    }
     pub(crate) fn become_mono(
         mut self,
         decision: &Predicate,

src/runtime/communication.rs

➞

Show inline comments

 use crate::common::*;
 use crate::runtime::{actors::*, endpoint::*, errors::*, *};
 macro_rules! lockprintln {
     () => (print!("\n"));
     ($($arg:tt)*) => ({
         use std::io::Write;
         std::writeln!(std::io::stdout().lock(), $($arg)*).expect("LPRINTLN");
     })
+}
 impl Controller {
     fn end_round_with_decision(&mut self, decision: Predicate) -> Result<(), SyncErr> {
         let mut all_inboxes = HashMap::default();
         self.inner.mono_n = self
             .ephemeral
             .poly_n

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -435,13 +435,19 @@ impl Predicate { @@
         Self { assigned: Default::default() }
+    }
+}
 impl Debug for Predicate {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         for (ChannelId { controller_id, channel_index }, &v) in self.assigned.iter() {
             write!(f, "{:?}=>{}", (controller_id, channel_index), if v { 'T' } else { 'F' })?;
             write!(
                 f,
                 "({:?},{:?})=>{}, ",
                 controller_id,
                 channel_index,
                 if v { 'T' } else { 'F' }
             )?;
+        }
         Ok(())
+    }
+}
 #[test]

0 comments (0 inline, 0 general)