franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4588 from ReinUsesLisp/tsan-event 

common/thread: Fix data race in is_set
This commit is contained in:
bunnei 2020-08-31 21:21:38 -04:00 committed by GitHub
parent a1f13a3662 f119ef798b
commit ad9ce67b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/thread.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <atomic>
#include <chrono> #include <chrono>
#include <condition_variable> #include <condition_variable>
#include <cstddef> #include <cstddef>
@ -25,13 +26,13 @@ public:
void Wait() { void Wait() {
std::unique_lock lk{mutex}; std::unique_lock lk{mutex};
condvar.wait(lk, [&] { return is_set; }); condvar.wait(lk, [&] { return is_set.load(); });
is_set = false; is_set = false;
} }
bool WaitFor(const std::chrono::nanoseconds& time) { bool WaitFor(const std::chrono::nanoseconds& time) {
std::unique_lock lk{mutex}; std::unique_lock lk{mutex};
if (!condvar.wait_for(lk, time, [this] { return is_set; })) if (!condvar.wait_for(lk, time, [this] { return is_set.load(); }))
return false; return false;
is_set = false; is_set = false;
return true; return true;
@ -40,7 +41,7 @@ public:
template <class Clock, class Duration> template <class Clock, class Duration>
bool WaitUntil(const std::chrono::time_point<Clock, Duration>& time) { bool WaitUntil(const std::chrono::time_point<Clock, Duration>& time) {
std::unique_lock lk{mutex}; std::unique_lock lk{mutex};
if (!condvar.wait_until(lk, time, [this] { return is_set; })) if (!condvar.wait_until(lk, time, [this] { return is_set.load(); }))
return false; return false;
is_set = false; is_set = false;
return true; return true;
@ -54,9 +55,9 @@ public:
} }
private: private:
bool is_set = false;
std::condition_variable condvar; std::condition_variable condvar;
std::mutex mutex; std::mutex mutex;
std::atomic_bool is_set{false};
}; };
class Barrier { class Barrier {