Просмотр исходного кода

Merge pull request #6868 from yzct12345/safe-threads-no-deadlocks

threadsafe_queue: Fix deadlock
bunnei 5 лет назад
Родитель
Сommit
bdd617da03
1 измененных файлов с 4 добавлено и 6 удалено
  1. 4 6
      src/common/threadsafe_queue.h

+ 4 - 6
src/common/threadsafe_queue.h

@@ -46,15 +46,13 @@ public:
         ElementPtr* new_ptr = new ElementPtr();
         ElementPtr* new_ptr = new ElementPtr();
         write_ptr->next.store(new_ptr, std::memory_order_release);
         write_ptr->next.store(new_ptr, std::memory_order_release);
         write_ptr = new_ptr;
         write_ptr = new_ptr;
+        ++size;
 
 
-        const size_t previous_size{size++};
-
-        // Acquire the mutex and then immediately release it as a fence.
+        // cv_mutex must be held or else there will be a missed wakeup if the other thread is in the
+        // line before cv.wait
         // TODO(bunnei): This can be replaced with C++20 waitable atomics when properly supported.
         // TODO(bunnei): This can be replaced with C++20 waitable atomics when properly supported.
         // See discussion on https://github.com/yuzu-emu/yuzu/pull/3173 for details.
         // See discussion on https://github.com/yuzu-emu/yuzu/pull/3173 for details.
-        if (previous_size == 0) {
-            std::lock_guard lock{cv_mutex};
-        }
+        std::lock_guard lock{cv_mutex};
         cv.notify_one();
         cv.notify_one();
     }
     }