Merge pull request #152 from taks/fix-deadlock

Fix deadlock in BLECharacteristic::handle_gap_event
taks · Jan 2, 2025 · d3ef051 · d3ef051
2 parents 93e974b + 6a0a32e
commit d3ef051
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - target: riscv32imc-esp-espidf

diff --git a/src/server/ble_characteristic.rs b/src/server/ble_characteristic.rs
@@ -310,7 +310,9 @@ impl BLECharacteristic {
     let ctxt = unsafe { &*ctxt };
 
     let mutex = unsafe { voidp_to_ref::<Mutex<Self>>(arg) };
-    let mut characteristic = mutex.lock();
+    let Some(mut characteristic) = mutex.try_lock() else {
+      return sys::BLE_ATT_ERR_UNLIKELY as _;
+    };
 
     if unsafe { sys::ble_uuid_cmp((*ctxt.__bindgen_anon_1.chr).uuid, &characteristic.uuid.u) != 0 }
     {

diff --git a/src/utilities/mutex.rs b/src/utilities/mutex.rs
@@ -22,6 +22,12 @@ impl RawMutex {
     debug_assert_eq!(r, 0);
   }
 
+  #[inline(always)]
+  #[allow(clippy::missing_safety_doc)]
+  pub unsafe fn try_lock(&self) -> bool {
+    pthread_mutex_trylock(self.0.get()) == 0
+  }
+
   #[inline(always)]
   #[allow(clippy::missing_safety_doc)]
   pub unsafe fn unlock(&self) {
@@ -54,6 +60,11 @@ impl<T> Mutex<T> {
     MutexGuard::new(self)
   }
 
+  #[inline(always)]
+  pub fn try_lock(&self) -> Option<MutexGuard<'_, T>> {
+    MutexGuard::try_new(self)
+  }
+
   #[inline(always)]
   pub(crate) fn into_innter(self) -> T {
     self.1.into_inner()
@@ -79,6 +90,15 @@ impl<'a, T> MutexGuard<'a, T> {
 
     Self(mutex)
   }
+
+  #[inline(always)]
+  fn try_new(mutex: &'a Mutex<T>) -> Option<Self> {
+    if unsafe { mutex.0.try_lock() } {
+      Some(Self(mutex))
+    } else {
+      None
+    }
+  }
 }
 
 impl<T> Drop for MutexGuard<'_, T> {