瀏覽代碼

Fix pte_osSemaphorePend deadlock

Jeremy Soller 5 年之前
父節點
當前提交
37a5da34b9
共有 1 個文件被更改,包括 7 次插入6 次删除
  1. 7 6
      src/platform/pte.rs

+ 7 - 6
src/platform/pte.rs

@@ -340,12 +340,13 @@ pub unsafe extern "C" fn pte_osSemaphorePend(
 ) -> pte_osResult {
     //TODO: pTimeout
     let semaphore = &mut *handle;
-    let mut acquired = false;
-    while !acquired {
-        let _guard = semaphore.lock.lock();
-        if intrinsics::atomic_load(&semaphore.count) > 0 {
-            intrinsics::atomic_xsub(&mut semaphore.count, 1);
-            acquired = true;
+    loop {
+        {
+            let _guard = semaphore.lock.lock();
+            if intrinsics::atomic_load(&semaphore.count) > 0 {
+                intrinsics::atomic_xsub(&mut semaphore.count, 1);
+                break;
+            }
         }
         Sys::sched_yield();
     }