mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-13 00:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #98 from matklad/debug

Browse source 
show SharedState in Debug for Runtime
This commit is contained in:
Niko Matsakis 2018-12-28 10:25:16 -05:00 committed by GitHub
commit 7074e258ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/runtime.rs
View file

@ -56,7 +56,8 @@ where
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
fmt.debug_struct("Runtime") fmt.debug_struct("Runtime")
.field("id", &self.id()) .field("id", &self.id())
.field("revision", &self.current_revision()) .field("forked", &self.revision_guard.is_some())
.field("shared_state", &self.shared_state)
.finish() .finish()
} }
} }
@ -398,6 +399,26 @@ impl<DB: Database> Default for SharedState<DB> {
} }
} }
impl<DB> std::fmt::Debug for SharedState<DB>
where
DB: Database,
{
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let query_lock = if self.query_lock.try_write().is_some() {
"<unlocked>"
} else if self.query_lock.try_read().is_some() {
"<rlocked>"
} else {
"<wlocked>"
};
fmt.debug_struct("SharedState")
.field("query_lock", &query_lock)
.field("revision", &self.revision)
.field("pending_revision_increments", &self.pending_revision_increments)
.finish()
}
}
/// State that will be specific to a single execution threads (when we /// State that will be specific to a single execution threads (when we
/// support multiple threads) /// support multiple threads)
struct LocalState<DB: Database> { struct LocalState<DB: Database> {