diff options
| -rw-r--r-- | src/access/screen.rs | 6 | ||||
| -rw-r--r-- | src/simtest/mod.rs | 54 |
2 files changed, 59 insertions, 1 deletions
diff --git a/src/access/screen.rs b/src/access/screen.rs index f9c67bf..b6fb8fd 100644 --- a/src/access/screen.rs +++ b/src/access/screen.rs @@ -283,6 +283,12 @@ impl Waiting { self.0.len() } + /// The changes waiting, oldest first. + #[cfg(test)] + pub(crate) fn changes(&self) -> &[Change] { + &self.0 + } + /// The newest `MAX_WAITING`: the oldest go, so changes a peer sent that will never /// be taken (whose dependencies or signatures never come) make way for others. fn keep_newest(&mut self) { diff --git a/src/simtest/mod.rs b/src/simtest/mod.rs index b886721..c28f8a2 100644 --- a/src/simtest/mod.rs +++ b/src/simtest/mod.rs @@ -36,7 +36,7 @@ use crate::document::store; use crate::document::{ChangeHash, Document}; use crate::files::Files; use crate::identity::NodeKey; -use crate::locks::RwLockExt; +use crate::locks::{MutexExt, RwLockExt}; use crate::node::{self, Node, NodeConfig}; use crate::state::{AppState, PeerState, Timing}; use crate::swarm::bootstrap::{self, Start}; @@ -384,6 +384,58 @@ impl Sim { .load(std::sync::atomic::Ordering::Acquire), ); let _ = writeln!(out, " view: {:?}", *node.neighbours.read_or_recover()); + { + let replica = node.doc.read().await; + let screening = node.screening.lock_or_recover(); + let refused: Vec<String> = screening + .refused() + .rev() + .take(4) + .map(|refused| { + format!( + "{} by {}: {}", + &refused.change.hash().to_string()[..8], + refused.committer.as_deref().unwrap_or("nobody"), + refused.why + ) + }) + .collect(); + let _ = writeln!( + out, + " writes as {}; screening: waiting={} refused (latest first)={refused:?}", + &replica.doc.get_actor().to_string()[..8], + screening.waiting.len() + ); + for change in screening.waiting.changes().iter().rev().take(4) { + let deps = change.deps(); + let held = deps + .iter() + .filter(|dep| crate::document::changes::holds(&replica.doc, dep)) + .count(); + let _ = writeln!( + out, + " waiting {} of {}#{}: deps held {held}/{}, vouched {}, signed {}", + &change.hash().to_string()[..8], + &change.actor_id().to_string()[..8], + change.seq(), + deps.len(), + replica.signatures.verified(change.actor_id(), change.seq()), + replica.signatures.signed(&change.hash()), + ); + } + } + #[cfg(feature = "federation")] + if let Some(store) = node.holding.with(|store| { + format!( + " store: checkpoint={} current={} taken={} refused={}", + &crate::federation::store::Id::of(store.checkpoint()).to_string()[..8], + &store.state().current().hash.to_string()[..8], + store.taken().len(), + store.refused().count() + ) + }) { + let _ = writeln!(out, "{store}"); + } for remake in crate::remake::testing::describe(node).await { let _ = writeln!(out, " {remake}"); } |
