[llvm] r256111 - ThreadPool unittests: do not hold mutex when calling condition_variable:notify()
Mehdi Amini via llvm-commits
llvm-commits at lists.llvm.org
Sat Dec 19 14:56:25 PST 2015
Author: mehdi_amini
Date: Sat Dec 19 16:56:24 2015
New Revision: 256111
URL: http://llvm.org/viewvc/llvm-project?rev=256111&view=rev
Log:
ThreadPool unittests: do not hold mutex when calling condition_variable:notify()
From: Mehdi Amini <mehdi.amini at apple.com>
Modified:
llvm/trunk/unittests/Support/ThreadPool.cpp
Modified: llvm/trunk/unittests/Support/ThreadPool.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/ThreadPool.cpp?rev=256111&r1=256110&r2=256111&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/ThreadPool.cpp (original)
+++ llvm/trunk/unittests/Support/ThreadPool.cpp Sat Dec 19 16:56:24 2015
@@ -62,12 +62,16 @@ protected:
}
/// Set the readiness of the main thread.
- void setMainThreadReadyState(bool Ready) {
- std::unique_lock<std::mutex> LockGuard(WaitMainThreadMutex);
- MainThreadReady = Ready;
+ void setMainThreadReady() {
+ {
+ std::unique_lock<std::mutex> LockGuard(WaitMainThreadMutex);
+ MainThreadReady = true;
+ }
WaitMainThread.notify_all();
}
+ void SetUp() override { MainThreadReady = false; }
+
std::condition_variable WaitMainThread;
std::mutex WaitMainThreadMutex;
bool MainThreadReady;
@@ -86,7 +90,6 @@ TEST_F(ThreadPoolTest, AsyncBarrier) {
std::atomic_int checked_in{0};
- setMainThreadReadyState(false);
ThreadPool Pool;
for (size_t i = 0; i < 5; ++i) {
Pool.async([this, &checked_in, i] {
@@ -95,7 +98,7 @@ TEST_F(ThreadPoolTest, AsyncBarrier) {
});
}
ASSERT_EQ(0, checked_in);
- setMainThreadReadyState(true);
+ setMainThreadReady();
Pool.wait();
ASSERT_EQ(5, checked_in);
}
@@ -119,14 +122,13 @@ TEST_F(ThreadPoolTest, Async) {
CHECK_UNSUPPORTED();
ThreadPool Pool;
std::atomic_int i{0};
- setMainThreadReadyState(false);
Pool.async([this, &i] {
waitForMainThread();
++i;
});
Pool.async([&i] { ++i; });
ASSERT_NE(2, i.load());
- setMainThreadReadyState(true);
+ setMainThreadReady();
Pool.wait();
ASSERT_EQ(2, i.load());
}
@@ -135,7 +137,6 @@ TEST_F(ThreadPoolTest, GetFuture) {
CHECK_UNSUPPORTED();
ThreadPool Pool;
std::atomic_int i{0};
- setMainThreadReadyState(false);
Pool.async([this, &i] {
waitForMainThread();
++i;
@@ -143,7 +144,7 @@ TEST_F(ThreadPoolTest, GetFuture) {
// Force the future using get()
Pool.async([&i] { ++i; }).get();
ASSERT_NE(2, i.load());
- setMainThreadReadyState(true);
+ setMainThreadReady();
Pool.wait();
ASSERT_EQ(2, i.load());
}
@@ -153,7 +154,6 @@ TEST_F(ThreadPoolTest, PoolDestruction)
// Test that we are waiting on destruction
std::atomic_int checked_in{0};
{
- setMainThreadReadyState(false);
ThreadPool Pool;
for (size_t i = 0; i < 5; ++i) {
Pool.async([this, &checked_in, i] {
@@ -162,7 +162,7 @@ TEST_F(ThreadPoolTest, PoolDestruction)
});
}
ASSERT_EQ(0, checked_in);
- setMainThreadReadyState(true);
+ setMainThreadReady();
}
ASSERT_EQ(5, checked_in);
}
More information about the llvm-commits
mailing list