diff options
| author | bunnei <bunneidev@gmail.com> | 2021-08-14 02:28:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-14 02:28:59 -0700 |
| commit | bdd617da03526f94e72185fd96da93c5a2ae50cf (patch) | |
| tree | dbb2d74fb6977b22e4cef4bd3658ba2f8060ae18 /src | |
| parent | 71d8d84b59ae6e1cfad37d70e6ea7d61001326f3 (diff) | |
| parent | 0ba521e63455d2222b61bde70abfe4fed43ee117 (diff) | |
Merge pull request #6868 from yzct12345/safe-threads-no-deadlocks
threadsafe_queue: Fix deadlock
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/threadsafe_queue.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h index ad04df8cab..8430b9778a 100644 --- a/src/common/threadsafe_queue.h +++ b/src/common/threadsafe_queue.h @@ -46,15 +46,13 @@ public: ElementPtr* new_ptr = new ElementPtr(); write_ptr->next.store(new_ptr, std::memory_order_release); 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. // 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(); } |