Aphcity/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity Actions

common/thread: Fix data race in is_set

Browse source 
As report by tsan, Event::Set can write is_set while WaitFor and friends
are reading from it. To address this issue, make is_set an atomic.
This commit is contained in:
ReinUsesLisp 2020-08-26 01:41:46 +00:00
parent 4efaecf125
commit f119ef798b
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 {