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

Changeset - 39625667a9b6

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Esterhuyse - 5 years ago 2020-02-04 15:07:29
christopheresterhuyse@gmail.com

more debug prints on branch predicates

2 files changed with 42 insertions and 3 deletions:

src/runtime/actors.rs

src/runtime/communication.rs

0 comments (0 inline, 0 general)

src/runtime/actors.rs

➞

Show inline comments

@@ @@ -51,21 +51,30 @@ impl PolyP { @@
         &mut self,
         mut m_ctx: PolyPContext,
         protocol_description: &ProtocolD,
         mut to_run: Vec<(Predicate, BranchP)>,
     ) -> Result<SyncRunResult, EndpointErr> {
         use SyncRunResult as Srr;
         let cid = m_ctx.inner.channel_id_stream.controller_id;
         lockprintln!("{:?}: ~ Running branches for PolyP {:?}!", cid, m_ctx.my_subtree_id,);
         while let Some((mut predicate, mut branch)) = to_run.pop() {
             let mut r_ctx = BranchPContext {
                 m_ctx: m_ctx.reborrow(),
                 ekeys: &self.ekeys,
                 predicate: &predicate,
                 inbox: &branch.inbox,
             };
             use PolyBlocker as Sb;
             let blocker = branch.state.sync_run(&mut r_ctx, protocol_description);
             lockprintln!(
                 "{:?}: ~ ... ran PolyP {:?} with branch pred {:?} to blocker {:?}",
                 cid,
                 r_ctx.m_ctx.my_subtree_id,
                 &predicate,
                 &blocker
             );
             match blocker {
                 Sb::Inconsistent => {} // DROP
                 Sb::CouldntReadMsg(ekey) => {
                     assert!(self.ekeys.contains(&ekey));
                     let channel_id =
                         r_ctx.m_ctx.inner.endpoint_exts.get(ekey).unwrap().info.channel_id;

src/runtime/communication.rs

➞

Show inline comments

@@ @@ -448,12 +448,17 @@ impl From<EndpointErr> for SyncErr { @@
+}
 impl MonoContext for MonoPContext<'_> {
     type D = ProtocolD;
     type S = ProtocolS;
     fn new_component(&mut self, moved_ekeys: HashSet<Key>, init_state: Self::S) {
         lockprintln!(
             "{:?}: !! MonoContext callback to new_component with ekeys {:?}!",
             self.inner.channel_id_stream.controller_id,
             &moved_ekeys,
         );
         if moved_ekeys.is_subset(self.ekeys) {
             self.ekeys.retain(|x| !moved_ekeys.contains(x));
             self.inner.mono_ps.push(MonoP { state: init_state, ekeys: moved_ekeys });
         } else {
             panic!("MachineP attempting to move alien ekey!");
+        }
@@ @@ -466,19 +471,30 @@ impl MonoContext for MonoPContext<'_> { @@
             endpoint: a,
         });
         let kg = self.inner.endpoint_exts.alloc(EndpointExt {
             info: EndpointInfo { polarity: Putter, channel_id },
             endpoint: b,
         });
         lockprintln!(
             "{:?}: !! MonoContext callback to new_channel. returning ekeys {:?}!",
             self.inner.channel_id_stream.controller_id,
             [kp, kg],
         );
         [kp, kg]
+    }
     fn new_random(&self) -> u64 {
         type Bytes8 = [u8; std::mem::size_of::<u64>()];
         let mut bytes = Bytes8::default();
         getrandom::getrandom(&mut bytes).unwrap();
         unsafe { std::mem::transmute::<Bytes8, _>(bytes) }
         let val = unsafe { std::mem::transmute::<Bytes8, _>(bytes) };
         lockprintln!(
             "{:?}: !! MonoContext callback to new_random. returning val {:?}!",
             self.inner.channel_id_stream.controller_id,
             val,
         );
         val
+    }
+}
 impl SolutionStorage {
     fn is_clear(&self) -> bool {
         self.subtree_id_to_index.is_empty()
@@ @@ -562,13 +578,27 @@ impl SolutionStorage { @@
 impl PolyContext for BranchPContext<'_, '_> {
     type D = ProtocolD;
     fn is_firing(&self, ekey: Key) -> Option<bool> {
         assert!(self.ekeys.contains(&ekey));
         let channel_id = self.m_ctx.inner.endpoint_exts.get(ekey).unwrap().info.channel_id;
         self.predicate.query(channel_id)
         let val = self.predicate.query(channel_id);
         lockprintln!(
             "{:?}: !! PolyContext callback to is_firing by {:?}! returning {:?}",
             self.m_ctx.inner.channel_id_stream.controller_id,
             self.m_ctx.my_subtree_id,
             val,
         );
         val
+    }
     fn read_msg(&self, ekey: Key) -> Option<&Payload> {
         assert!(self.ekeys.contains(&ekey));
         self.inbox.get(&ekey)
         let val = self.inbox.get(&ekey);
         lockprintln!(
             "{:?}: !! PolyContext callback to read_msg by {:?}! returning {:?}",
             self.m_ctx.inner.channel_id_stream.controller_id,
             self.m_ctx.my_subtree_id,
             val,
         );
         val
+    }
+}

0 comments (0 inline, 0 general)