mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix new compilation warnings in debug_sync module

Browse source
This commit is contained in:
Matt Corallo 2022-07-26 20:29:36 +00:00
parent b84b53a14c
commit 10aa4aa42f
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lightning/src/debug_sync.rs
View file

@ -68,7 +68,8 @@ struct LockMetadata {
struct LockDep {
lock: Arc<LockMetadata>,
lockdep_trace: Backtrace,
/// lockdep_trace is unused unless we're building with `backtrace`, so we mark it _
_lockdep_trace: Backtrace,
}
#[cfg(feature = "backtrace")]
@ -140,13 +141,13 @@ impl LockMetadata {
// of the same lock.
debug_assert!(cfg!(feature = "backtrace"), "Tried to acquire a lock while it was held!");
}
for (locked_dep_idx, locked_dep) in locked.locked_before.lock().unwrap().iter() {
for (locked_dep_idx, _locked_dep) in locked.locked_before.lock().unwrap().iter() {
if *locked_dep_idx == this.lock_idx && *locked_dep_idx != locked.lock_idx {
#[cfg(feature = "backtrace")]
panic!("Tried to violate existing lockorder.\nMutex that should be locked after the current lock was created at the following backtrace.\nNote that to get a backtrace for the lockorder violation, you should set RUST_BACKTRACE=1\nLock being taken constructed at: {} ({}):\n{:?}\nLock constructed at: {} ({})\n{:?}\n\nLock dep created at:\n{:?}\n\n",
get_construction_location(&this._lock_construction_bt), this.lock_idx, this._lock_construction_bt,
get_construction_location(&locked._lock_construction_bt), locked.lock_idx, locked._lock_construction_bt,
locked_dep.lockdep_trace);
_locked_dep._lockdep_trace);
#[cfg(not(feature = "backtrace"))]
panic!("Tried to violate existing lockorder. Build with the backtrace feature for more info.");
}
@ -154,7 +155,7 @@ impl LockMetadata {
// Insert any already-held locks in our locked-before set.
let mut locked_before = this.locked_before.lock().unwrap();
if !locked_before.contains_key(&locked.lock_idx) {
let lockdep = LockDep { lock: Arc::clone(locked), lockdep_trace: Backtrace::new() };
let lockdep = LockDep { lock: Arc::clone(locked), _lockdep_trace: Backtrace::new() };
locked_before.insert(lockdep.lock.lock_idx, lockdep);
}
}
@ -175,7 +176,7 @@ impl LockMetadata {
let mut locked_before = this.locked_before.lock().unwrap();
for (locked_idx, locked) in held.borrow().iter() {
if !locked_before.contains_key(locked_idx) {
let lockdep = LockDep { lock: Arc::clone(locked), lockdep_trace: Backtrace::new() };
let lockdep = LockDep { lock: Arc::clone(locked), _lockdep_trace: Backtrace::new() };
locked_before.insert(*locked_idx, lockdep);
}
}