bert/tracing-mutex
1
0
Fork 0
mirror of https://github.com/bertptrs/tracing-mutex.git synced 2025-12-27 21:40:32 +01:00
Code Issues Projects Releases Wiki Activity

Simplify code structure

Browse Source
This commit is contained in:
Bert Peters
2021-03-19 21:28:14 +01:00
parent 5f2e0e99a8
commit 9b56deac26
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib.rs
View File

@@ -53,7 +53,7 @@ impl MutexID {
pub fn new() -> Self { pub fn new() -> Self {
ID_SEQUENCE ID_SEQUENCE
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |id| id.checked_add(1)) .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |id| id.checked_add(1))
.map(|id| Self(id)) .map(Self)
.expect("Mutex ID wraparound happened, results unreliable") .expect("Mutex ID wraparound happened, results unreliable")
} }
} }
@@ -100,7 +100,7 @@ fn drop_lock(id: MutexID) {
/// ///
/// This function panics if the new dependency would introduce a cycle. /// This function panics if the new dependency would introduce a cycle.
fn register_dependency(lock: MutexID) { fn register_dependency(lock: MutexID) {
if HELD_LOCKS.with(|locks| { let creates_cycle = HELD_LOCKS.with(|locks| {
if let Some(&previous) = locks.borrow().last() { if let Some(&previous) = locks.borrow().last() {
let mut graph = get_depedency_graph(); let mut graph = get_depedency_graph();
@@ -108,7 +108,9 @@ fn register_dependency(lock: MutexID) {
} else { } else {
false false
} }
}) { });
if creates_cycle {
// Panic without holding the lock to avoid needlessly poisoning it // Panic without holding the lock to avoid needlessly poisoning it
panic!("Mutex order graph should not have cycles"); panic!("Mutex order graph should not have cycles");
} }