summaryrefslogtreecommitdiffstats
path: root/src/common/threadsafe_queue.h
diff options
context:
space:
mode:
authoryzct12345 <87620833+yzct12345@users.noreply.github.com>2021-08-13 21:22:51 +0200
committerGitHub <noreply@github.com>2021-08-13 21:22:51 +0200
commit0ba521e63455d2222b61bde70abfe4fed43ee117 (patch)
treedbb2d74fb6977b22e4cef4bd3658ba2f8060ae18 /src/common/threadsafe_queue.h
parentMerge pull request #6862 from german77/badsdl (diff)
downloadyuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.tar
yuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.tar.gz
yuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.tar.bz2
yuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.tar.lz
yuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.tar.xz
yuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.tar.zst
yuzu-0ba521e63455d2222b61bde70abfe4fed43ee117.zip
Diffstat (limited to 'src/common/threadsafe_queue.h')
-rw-r--r--src/common/threadsafe_queue.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h
index ad04df8ca..8430b9778 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();
}