emu-mirror/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu.git synced 2024-11-17 23:37:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/thread_worker: Fix data race

Browse Source
This commit is contained in:
FernandoS27 2021-04-06 04:23:02 +02:00 committed by ReinUsesLisp
parent bf5b5c1bf4
commit a10e112e64
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/thread_worker.cpp
View File

@ -8,9 +8,17 @@
namespace Common { namespace Common {
ThreadWorker::ThreadWorker(std::size_t num_workers, const std::string& name) { ThreadWorker::ThreadWorker(std::size_t num_workers, const std::string& name) {
workers_queued.store(static_cast<u64>(num_workers), std::memory_order_release);
const auto lambda = [this, thread_name{std::string{name}}] { const auto lambda = [this, thread_name{std::string{name}}] {
Common::SetCurrentThreadName(thread_name.c_str()); Common::SetCurrentThreadName(thread_name.c_str());
// TODO(Blinkhawk): Change the design, this is very prone to data races
// Wait for first request
{
std::unique_lock lock{queue_mutex};
condition.wait(lock, [this] { return stop || !requests.empty(); });
}
while (!stop) { while (!stop) {
UniqueFunction<void> task; UniqueFunction<void> task;
{ {
@ -26,7 +34,9 @@ ThreadWorker::ThreadWorker(std::size_t num_workers, const std::string& name) {
requests.pop(); requests.pop();
} }
task(); task();
work_done++;
} }
workers_stopped++;
wait_condition.notify_all(); wait_condition.notify_all();
}; };
for (size_t i = 0; i < num_workers; ++i) { for (size_t i = 0; i < num_workers; ++i) {
@ -49,13 +59,15 @@ void ThreadWorker::QueueWork(UniqueFunction<void> work) {
{ {
std::unique_lock lock{queue_mutex}; std::unique_lock lock{queue_mutex};
requests.emplace(std::move(work)); requests.emplace(std::move(work));
work_scheduled++;
} }
condition.notify_one(); condition.notify_one();
} }
void ThreadWorker::WaitForRequests() { void ThreadWorker::WaitForRequests() {
std::unique_lock lock{queue_mutex}; std::unique_lock lock{queue_mutex};
wait_condition.wait(lock, [this] { return stop || requests.empty(); }); wait_condition.wait(
lock, [this] { return workers_stopped >= workers_queued || work_done >= work_scheduled; });
} }
} // namespace Common } // namespace Common

5
src/common/thread_worker.h
View File

@ -11,6 +11,7 @@
#include <vector> #include <vector>
#include <queue> #include <queue>
#include "common/common_types.h"
#include "common/unique_function.h" #include "common/unique_function.h"
namespace Common { namespace Common {
@ -29,6 +30,10 @@ private:
std::condition_variable condition; std::condition_variable condition;
std::condition_variable wait_condition; std::condition_variable wait_condition;
std::atomic_bool stop{}; std::atomic_bool stop{};
std::atomic<u64> work_scheduled{};
std::atomic<u64> work_done{};
std::atomic<u64> workers_stopped{};
std::atomic<u64> workers_queued{};
}; };
} // namespace Common } // namespace Common