Use lightning::sync via symlink in lightning-liquidity

tnull · tnull · commit 5bd9afdb8eea · 2024-12-09T16:29:27.000+01:00
.. to which end we also need to make some additions to `debug_sync` and
`nostd_sync`.
diff --git a/lightning-liquidity/Cargo.toml b/lightning-liquidity/Cargo.toml
@@ -16,6 +16,7 @@ categories = ["cryptography::cryptocurrencies"]
 [features]
 default = ["std"]
 std = ["lightning/std"]
+backtrace = ["dep:backtrace"]
 
 [dependencies]
 lightning = { version = "0.0.124", path = "../lightning", default-features = false }
@@ -27,6 +28,7 @@ bitcoin = { version = "0.32.2", default-features = false, features = ["serde"] }
 chrono = { version = "0.4", default-features = false, features = ["serde", "alloc"] }
 serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
 serde_json = "1.0"
+backtrace = { version = "0.3", optional = true }
 
 [dev-dependencies]
 lightning = { version = "0.0.124", path = "../lightning", default-features = false, features = ["_test_utils"] }
@@ -43,4 +45,6 @@ level = "forbid"
 check-cfg = [
 	"cfg(lsps1_service)",
 	"cfg(c_bindings)",
+	"cfg(backtrace)",
+	"cfg(ldk_bench)",
 ]
diff --git a/lightning-liquidity/src/events.rs b/lightning-liquidity/src/events.rs
@@ -28,7 +28,7 @@ pub(crate) struct EventQueue {
 	queue: Arc<Mutex<VecDeque<Event>>>,
 	waker: Arc<Mutex<Option<Waker>>>,
 	#[cfg(feature = "std")]
-	condvar: std::sync::Condvar,
+	condvar: crate::sync::Condvar,
 }
 
 impl EventQueue {
@@ -37,7 +37,7 @@ impl EventQueue {
 		let waker = Arc::new(Mutex::new(None));
 		#[cfg(feature = "std")]
 		{
-			let condvar = std::sync::Condvar::new();
+			let condvar = crate::sync::Condvar::new();
 			Self { queue, waker, condvar }
 		}
 		#[cfg(not(feature = "std"))]
@@ -67,8 +67,10 @@ impl EventQueue {
 
 	#[cfg(feature = "std")]
 	pub fn wait_next_event(&self) -> Event {
-		let mut queue =
-			self.condvar.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
+		let mut queue = self
+			.condvar
+			.wait_while(self.queue.lock().unwrap(), |queue: &mut VecDeque<Event>| queue.is_empty())
+			.unwrap();
 
 		let event = queue.pop_front().expect("non-empty queue");
 		let should_notify = !queue.is_empty();
diff --git a/lightning-liquidity/src/lib.rs b/lightning-liquidity/src/lib.rs
@@ -61,6 +61,8 @@ pub mod lsps1;
 pub mod lsps2;
 mod manager;
 pub mod message_queue;
+#[allow(dead_code)]
+#[allow(unused_imports)]
 mod sync;
 #[cfg(test)]
 mod tests;
diff --git a/lightning-liquidity/src/sync/debug_sync.rs b/lightning-liquidity/src/sync/debug_sync.rs
@@ -0,0 +1 @@
+../../../lightning/src/sync/debug_sync.rs
diff --git a/lightning-liquidity/src/sync/fairrwlock.rs b/lightning-liquidity/src/sync/fairrwlock.rs
@@ -0,0 +1 @@
+../../../lightning/src/sync/fairrwlock.rs
diff --git a/lightning-liquidity/src/sync/mod.rs b/lightning-liquidity/src/sync/mod.rs
diff --git a/lightning-liquidity/src/sync/mod.rs b/lightning-liquidity/src/sync/mod.rs
@@ -0,0 +1 @@
+../../../lightning/src/sync/mod.rs
diff --git a/lightning-liquidity/src/sync/nostd_sync.rs b/lightning-liquidity/src/sync/nostd_sync.rs
diff --git a/lightning-liquidity/src/sync/nostd_sync.rs b/lightning-liquidity/src/sync/nostd_sync.rs
@@ -0,0 +1 @@
+../../../lightning/src/sync/nostd_sync.rs
diff --git a/lightning-liquidity/src/sync/test_lockorder_checks.rs b/lightning-liquidity/src/sync/test_lockorder_checks.rs
@@ -0,0 +1 @@
+../../../lightning/src/sync/test_lockorder_checks.rs
diff --git a/lightning/src/sync/debug_sync.rs b/lightning/src/sync/debug_sync.rs
@@ -1,4 +1,5 @@
 pub use alloc::sync::Arc;
+use core::fmt;
 use core::ops::{Deref, DerefMut};
 use core::time::Duration;
 
@@ -65,6 +66,10 @@ impl Condvar {
 	pub fn notify_all(&self) {
 		self.inner.notify_all();
 	}
+
+	pub fn notify_one(&self) {
+		self.inner.notify_one();
+	}
 }
 
 thread_local! {
@@ -254,6 +259,21 @@ impl<T: Sized> Mutex<T> {
 	}
 }
 
+impl<T: Sized + fmt::Debug> fmt::Debug for Mutex<T> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		let mut d = f.debug_struct("Mutex");
+		match self.try_lock() {
+			Ok(guard) => {
+				d.field("data", &&*guard);
+			},
+			Err(()) => {
+				d.field("data", &format_args!("<locked>"));
+			},
+		}
+		d.finish_non_exhaustive()
+	}
+}
+
 #[must_use = "if unused the Mutex will immediately unlock"]
 pub struct MutexGuard<'a, T: Sized + 'a> {
 	mutex: &'a Mutex<T>,
diff --git a/lightning/src/sync/nostd_sync.rs b/lightning/src/sync/nostd_sync.rs
@@ -5,6 +5,7 @@ use core::ops::{Deref, DerefMut};
 
 pub type LockResult<Guard> = Result<Guard, ()>;
 
+#[derive(Debug)]
 pub struct Mutex<T: ?Sized> {
 	inner: RefCell<T>,
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../lightning/src/sync/debug_sync.rs`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../lightning/src/sync/fairrwlock.rs`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../lightning/src/sync/nostd_sync.rs`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../../../lightning/src/sync/test_lockorder_checks.rs`