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

Changeset - bcfb0eaf7288

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Christopher Esterhuyse - 5 years ago 2020-03-03 17:11:05
christopheresterhuyse@gmail.com

2 files changed with 44 insertions and 25 deletions:

src/runtime/communication.rs

src/runtime/mod.rs

0 comments (0 inline, 0 general)

src/runtime/communication.rs

➞

Show inline comments

@@ @@ -26,9 +26,14 @@ impl Controller { @@
                 let mono_p = poly_p.choose_mono(&decision).unwrap();
                 (mono_p, poly_p)
             })
             .collect::<Vec<_>>();
             .collect::<Vec<_>>()
             .into_boxed_slice();
         self.inner.mono_ps.extend(p_pairs.iter().map(|p_pair| p_pair.0.clone()));
         self.round_histories.push(RoundHistory::Consistent(decision.clone(), n_pair, p_pairs));
         self.round_histories.push(RoundHistory::Consistent {
             decision: decision.clone(),
             native_component: n_pair,
             protocol_components: p_pairs,
         });
         let announcement =
             CommMsgContents::Announce { oracle: decision }.into_msg(self.inner.round_index);
         for &child_ekey in self.inner.family.children_ekeys.iter() {
@@ @@ -143,30 +148,35 @@ impl Controller { @@
         deadline: Instant,
         sync_batches: Option<impl Iterator<Item = SyncBatch>>,
     ) -> Result<(), SyncErr> {
         if !self.consistent() {
             // was previously inconsistent
             return Err(SyncErr::Inconsistent);
+        }
         match self.sync_round_inner(deadline, sync_batches) {
             Ok(()) => Ok(()),
             Err(e) => {
                 log!(
                     &mut self.inner.logger,
                     "/\\/\\/\\/\\/\\/ Sync round failed! Preparing for diagnosis...",
                 );
                 let h = RoundHistory::Inconsistent(
                     std::mem::take(&mut self.ephemeral.solution_storage),
                     self.ephemeral.poly_n.take().unwrap(),
                     std::mem::take(&mut self.ephemeral.poly_ps),
                 );
                 self.round_histories.push(h);
                 for (round_index, round) in self.round_histories.iter().enumerate() {
                     log!(&mut self.inner.logger, "round {}:{:#?}\n", round_index, round);
         if self.consistent() {
             match self.sync_round_inner(deadline, sync_batches) {
                 Ok(()) => return Ok(()),
                 Err(error) => {
                     log!(
                         &mut self.inner.logger,
                         "/\\/\\/\\/\\/\\/ Sync round failed! Preparing for diagnosis...",
                     );
                     let h = RoundHistory::Inconsistent {
                         error,
                         subtree_solutions: std::mem::take(&mut self.ephemeral.solution_storage),
                         native_component: self.ephemeral.poly_n.take().unwrap(),
                         protocol_components: std::mem::take(&mut self.ephemeral.poly_ps)
                             .into_boxed_slice(),
                     };
                     self.round_histories.push(h);
                     for (round_index, round) in self.round_histories.iter().enumerate() {
                         log!(&mut self.inner.logger, "round {}:{:#?}\n", round_index, round);
+                    }
+                }
                 Err(e)
+            }
+        }
         if let Some(RoundHistory::Inconsistent { error, .. }) =
             self.round_histories.iter().rev().next()
+        {
             Err(error.clone())
         } else {
             unreachable!()
+        }
+    }
     // Runs a synchronous round until all the actors are in decided state OR 1+ are inconsistent.

src/runtime/mod.rs

➞

Show inline comments

@@ @@ -97,8 +97,17 @@ struct ChannelIdStream { @@
 #[derive(Debug)]
 enum RoundHistory {
     Consistent(Predicate, (MonoN, PolyN), Vec<(MonoP, PolyP)>),
     Inconsistent(SolutionStorage, PolyN, Vec<PolyP>),
     Consistent {
         decision: Predicate,
         native_component: (MonoN, PolyN),
         protocol_components: Box<[(MonoP, PolyP)]>,
     },
     Inconsistent {
         error: SyncErr,
         subtree_solutions: SolutionStorage,
         native_component: PolyN,
         protocol_components: Box<[PolyP]>,
     },
+}
 #[derive(Debug)]

0 comments (0 inline, 0 general)