X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fsync%2Fnostd_sync.rs;h=17307997d8176cc2b82a0d9559307971f3e2c252;hb=c5cc1ede2631fa85d7121c70981d27eb200a24e5;hp=caf88a7cc04a8617a86e63988a7cc7a291fe96bc;hpb=fad52d8b98467e18e4112006cebdb1dec39d199a;p=rust-lightning

diff --git a/lightning/src/sync/nostd_sync.rs b/lightning/src/sync/nostd_sync.rs
index caf88a7c..17307997 100644
--- a/lightning/src/sync/nostd_sync.rs
+++ b/lightning/src/sync/nostd_sync.rs
@@ -2,6 +2,7 @@ pub use ::alloc::sync::Arc;
 use core::ops::{Deref, DerefMut};
 use core::time::Duration;
 use core::cell::{RefCell, Ref, RefMut};
+use super::{LockTestExt, LockHeldState};
 
 pub type LockResult<Guard> = Result<Guard, ()>;
 
@@ -59,6 +60,21 @@ impl<T> Mutex<T> {
 	pub fn try_lock<'a>(&'a self) -> LockResult<MutexGuard<'a, T>> {
 		Ok(MutexGuard { lock: self.inner.borrow_mut() })
 	}
+
+	pub fn into_inner(self) -> LockResult<T> {
+		Ok(self.inner.into_inner())
+	}
+}
+
+impl<'a, T: 'a> LockTestExt<'a> for Mutex<T> {
+	#[inline]
+	fn held_by_thread(&self) -> LockHeldState {
+		if self.lock().is_err() { return LockHeldState::HeldByThread; }
+		else { return LockHeldState::NotHeldByThread; }
+	}
+	type ExclLock = MutexGuard<'a, T>;
+	#[inline]
+	fn unsafe_well_ordered_double_lock_self(&'a self) -> MutexGuard<T> { self.lock().unwrap() }
 }
 
 pub struct RwLock<T: ?Sized> {
@@ -116,4 +132,15 @@ impl<T> RwLock<T> {
 	}
 }
 
+impl<'a, T: 'a> LockTestExt<'a> for RwLock<T> {
+	#[inline]
+	fn held_by_thread(&self) -> LockHeldState {
+		if self.write().is_err() { return LockHeldState::HeldByThread; }
+		else { return LockHeldState::NotHeldByThread; }
+	}
+	type ExclLock = RwLockWriteGuard<'a, T>;
+	#[inline]
+	fn unsafe_well_ordered_double_lock_self(&'a self) -> RwLockWriteGuard<T> { self.write().unwrap() }
+}
+
 pub type FairRwLock<T> = RwLock<T>;