fix(native): remove deadlock detection (#3166)

Co-authored-by: Codex <codex@openai.com>

Author: kixelated

Cargo.lock

@@ -54,7 +54,6 @@ moq-net = { workspace = true }
 # congestion configs. Version matched to the copy iroh pulls in.
 noq-proto = { version = "1", default-features = false, optional = true }
 notify = { version = "8", optional = true }
-parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 qmux = { workspace = true, features = ["wss", "tls", "tcp"], optional = true }
 quinn = { version = "0.11", default-features = false, features = ["platform-verifier", "runtime-tokio", "bloom"], optional = true }
 rand = { workspace = true }

rs/moq-native/Cargo.toml

@@ -26,7 +26,7 @@
 use std::{
 	io,
 	sync::{
-		Arc,
+		Arc, Mutex,
 		atomic::{AtomicU64, Ordering},
 	},
 	time::{Duration, Instant},
@@ -214,7 +214,7 @@ struct Inner {
 	connection: AtomicU64,
 	exhausted: AtomicU64,
 	unknown: AtomicU64,
-	state: parking_lot::Mutex<State>,
+	state: Mutex<State>,
 }
 
 struct State {
@@ -235,7 +235,7 @@ impl Health {
 			connection: AtomicU64::new(0),
 			exhausted: AtomicU64::new(0),
 			unknown: AtomicU64::new(0),
-			state: parking_lot::Mutex::new(State {
+			state: Mutex::new(State {
 				stall: None,
 				consecutive: 0,
 				delay: RETRY_MIN,
@@ -251,7 +251,7 @@ impl Health {
 	/// An accept succeeded: the listener is serving, so any stall is over and the
 	/// next failure starts from the shortest delay again.
 	pub fn accepted(&self) {
-		let mut state = self.0.state.lock();
+		let mut state = self.0.state.lock().unwrap();
 		if state.stall.take().is_some() {
 			tracing::info!(listener = self.0.listener, "listener is accepting again");
 		}
@@ -276,7 +276,7 @@ impl Health {
 			return None;
 		}
 
-		let mut state = self.0.state.lock();
+		let mut state = self.0.state.lock().unwrap();
 		state.consecutive += 1;
 		let delay = jitter(state.delay);
 		state.delay = (state.delay * 2).min(RETRY_MAX);
@@ -316,7 +316,7 @@ impl Health {
 	/// Only a successful accept clears it, so a listener with no traffic holds its
 	/// last value rather than claiming a recovery it has no evidence for.
 	pub fn stalled(&self) -> Option<Duration> {
-		self.0.state.lock().stall.map(|since| since.elapsed())
+		self.0.state.lock().unwrap().stall.map(|since| since.elapsed())
 	}
 
 	fn counter(&self, failure: Failure) -> &AtomicU64 {

rs/moq-native/src/accept.rs

@@ -79,34 +79,6 @@ impl Log {
 			.try_init()
 			.map_err(|e| crate::Error::SetSubscriber(std::sync::Arc::new(e)))?;
 
-		// Start deadlock detection thread (only in debug builds)
-		#[cfg(debug_assertions)]
-		std::thread::spawn(Self::deadlock_detector);
-
 		Ok(())
 	}
-
-	#[cfg(debug_assertions)]
-	fn deadlock_detector() {
-		loop {
-			std::thread::sleep(std::time::Duration::from_secs(1));
-
-			let deadlocks = parking_lot::deadlock::check_deadlock();
-			if deadlocks.is_empty() {
-				continue;
-			}
-
-			tracing::error!("DEADLOCK DETECTED");
-
-			for (i, threads) in deadlocks.iter().enumerate() {
-				tracing::error!("Deadlock #{}", i);
-				for t in threads {
-					tracing::error!("Thread Id {:#?}", t.thread_id());
-					tracing::error!("{:#?}", t.backtrace());
-				}
-			}
-
-			// Optionally: std::process::abort() to get a core dump
-		}
-	}
 }