RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

ThreadPool unittests: do not hold mutex when calling condition_variable:notify()

Browse Source 
From: Mehdi Amini <mehdi.amini@apple.com>
llvm-svn: 256111
This commit is contained in:
Mehdi Amini 2015-12-19 22:56:24 +00:00
parent d080ee893d
commit a61b37683e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
unittests/Support/ThreadPool.cpp
View File

@ -62,12 +62,16 @@ protected:
} }
/// Set the readiness of the main thread. /// Set the readiness of the main thread.
void setMainThreadReadyState(bool Ready) { void setMainThreadReady() {
std::unique_lock<std::mutex> LockGuard(WaitMainThreadMutex); {
MainThreadReady = Ready; std::unique_lock<std::mutex> LockGuard(WaitMainThreadMutex);
MainThreadReady = true;
}
WaitMainThread.notify_all(); WaitMainThread.notify_all();
} }
void SetUp() override { MainThreadReady = false; }
std::condition_variable WaitMainThread; std::condition_variable WaitMainThread;
std::mutex WaitMainThreadMutex; std::mutex WaitMainThreadMutex;
bool MainThreadReady; bool MainThreadReady;
@ -86,7 +90,6 @@ TEST_F(ThreadPoolTest, AsyncBarrier) {
std::atomic_int checked_in{0}; std::atomic_int checked_in{0};
setMainThreadReadyState(false);
ThreadPool Pool; ThreadPool Pool;
for (size_t i = 0; i < 5; ++i) { for (size_t i = 0; i < 5; ++i) {
Pool.async([this, &checked_in, i] { Pool.async([this, &checked_in, i] {
@ -95,7 +98,7 @@ TEST_F(ThreadPoolTest, AsyncBarrier) {
}); });
} }
ASSERT_EQ(0, checked_in); ASSERT_EQ(0, checked_in);
setMainThreadReadyState(true); setMainThreadReady();
Pool.wait(); Pool.wait();
ASSERT_EQ(5, checked_in); ASSERT_EQ(5, checked_in);
} }
@ -119,14 +122,13 @@ TEST_F(ThreadPoolTest, Async) {
CHECK_UNSUPPORTED(); CHECK_UNSUPPORTED();
ThreadPool Pool; ThreadPool Pool;
std::atomic_int i{0}; std::atomic_int i{0};
setMainThreadReadyState(false);
Pool.async([this, &i] { Pool.async([this, &i] {
waitForMainThread(); waitForMainThread();
++i; ++i;
}); });
Pool.async([&i] { ++i; }); Pool.async([&i] { ++i; });
ASSERT_NE(2, i.load()); ASSERT_NE(2, i.load());
setMainThreadReadyState(true); setMainThreadReady();
Pool.wait(); Pool.wait();
ASSERT_EQ(2, i.load()); ASSERT_EQ(2, i.load());
} }
@ -135,7 +137,6 @@ TEST_F(ThreadPoolTest, GetFuture) {
CHECK_UNSUPPORTED(); CHECK_UNSUPPORTED();
ThreadPool Pool; ThreadPool Pool;
std::atomic_int i{0}; std::atomic_int i{0};
setMainThreadReadyState(false);
Pool.async([this, &i] { Pool.async([this, &i] {
waitForMainThread(); waitForMainThread();
++i; ++i;
@ -143,7 +144,7 @@ TEST_F(ThreadPoolTest, GetFuture) {
// Force the future using get() // Force the future using get()
Pool.async([&i] { ++i; }).get(); Pool.async([&i] { ++i; }).get();
ASSERT_NE(2, i.load()); ASSERT_NE(2, i.load());
setMainThreadReadyState(true); setMainThreadReady();
Pool.wait(); Pool.wait();
ASSERT_EQ(2, i.load()); ASSERT_EQ(2, i.load());
} }
@ -153,7 +154,6 @@ TEST_F(ThreadPoolTest, PoolDestruction) {
// Test that we are waiting on destruction // Test that we are waiting on destruction
std::atomic_int checked_in{0}; std::atomic_int checked_in{0};
{ {
setMainThreadReadyState(false);
ThreadPool Pool; ThreadPool Pool;
for (size_t i = 0; i < 5; ++i) { for (size_t i = 0; i < 5; ++i) {
Pool.async([this, &checked_in, i] { Pool.async([this, &checked_in, i] {
@ -162,7 +162,7 @@ TEST_F(ThreadPoolTest, PoolDestruction) {
}); });
} }
ASSERT_EQ(0, checked_in); ASSERT_EQ(0, checked_in);
setMainThreadReadyState(true); setMainThreadReady();
} }
ASSERT_EQ(5, checked_in); ASSERT_EQ(5, checked_in);
} }