generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc++ tests: wait_until.pass test sporadically fails (bug 21998)

Browse Source 
Summary:
Hello Howard,

While running the libc++ tests on our ARM boards, we encounter sporadic failures of the two tests:
test/std/thread/futures/futures.shared_future/wait_until.pass.cpp
test/std/thread/futures/futures.unique_future/wait_until.pass.cpp

The worker thread might not finish yet when the main thread checks its result.
I filed the bug 21998 for this case: http://llvm.org/bugs/show_bug.cgi?id=21998

Would you be able to review this please?
Thank you.
Oleg

Reviewers: howard.hinnant, mclow.lists, danalbert, jroelofs, EricWF

Reviewed By: jroelofs, EricWF

Subscribers: EricWF, mclow.lists, aemerson, llvm-commits

Differential Revision: http://reviews.llvm.org/D6750

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@228783 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-02-11 01:25:57 +00:00
parent 566739170a
commit 578c9e8f46
2 changed files with 238 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
test/std/thread/futures/futures.shared_future/wait_until.pass.cpp
View File

@ -1,50 +1,67 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is dual licensed under the MIT and the University of Illinois Open // This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details. // Source Licenses. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// <future> // <future>
// class shared_future<R> // class shared_future<R>
// template <class Clock, class Duration> // template <class Clock, class Duration>
// future_status // future_status
// wait_until(const chrono::time_point<Clock, Duration>& abs_time) const; // wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
#include <future> #include <future>
#include <cassert> #include <atomic>
#include <cassert>
typedef std::chrono::milliseconds ms; enum class WorkerThreadState { Uninitialized, AllowedToRun, Exiting };
typedef std::chrono::milliseconds ms;
void func1(std::promise<int> p) std::atomic<WorkerThreadState> thread_state(WorkerThreadState::Uninitialized);
{
std::this_thread::sleep_for(ms(500)); void set_worker_thread_state(WorkerThreadState state)
{
thread_state.store(state, std::memory_order_relaxed);
}
void wait_for_worker_thread_state(WorkerThreadState state)
{
while (thread_state.load(std::memory_order_relaxed) != state);
}
void func1(std::promise<int> p)
{
wait_for_worker_thread_state(WorkerThreadState::AllowedToRun);
p.set_value(3); p.set_value(3);
} set_worker_thread_state(WorkerThreadState::Exiting);
}
int j = 0; int j = 0;
void func3(std::promise<int&> p) void func3(std::promise<int&> p)
{ {
std::this_thread::sleep_for(ms(500)); wait_for_worker_thread_state(WorkerThreadState::AllowedToRun);
j = 5; j = 5;
p.set_value(j); p.set_value(j);
} set_worker_thread_state(WorkerThreadState::Exiting);
}
void func5(std::promise<void> p) void func5(std::promise<void> p)
{ {
std::this_thread::sleep_for(ms(500)); wait_for_worker_thread_state(WorkerThreadState::AllowedToRun);
p.set_value(); p.set_value();
} set_worker_thread_state(WorkerThreadState::Exiting);
}
int main() int main()
{ {
typedef std::chrono::high_resolution_clock Clock; typedef std::chrono::high_resolution_clock Clock;
{ {
typedef int T; typedef int T;
@ -52,9 +69,14 @@ int main()
std::shared_future<T> f = p.get_future(); std::shared_future<T> f = p.get_future();
std::thread(func1, std::move(p)).detach(); std::thread(func1, std::move(p)).detach();
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::timeout);
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready);
// allow the worker thread to produce the result and wait until the worker is done
set_worker_thread_state(WorkerThreadState::AllowedToRun);
wait_for_worker_thread_state(WorkerThreadState::Exiting);
assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::ready);
assert(f.valid()); assert(f.valid());
Clock::time_point t0 = Clock::now(); Clock::time_point t0 = Clock::now();
f.wait(); f.wait();
@ -68,9 +90,14 @@ int main()
std::shared_future<T> f = p.get_future(); std::shared_future<T> f = p.get_future();
std::thread(func3, std::move(p)).detach(); std::thread(func3, std::move(p)).detach();
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::timeout);
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready);
// allow the worker thread to produce the result and wait until the worker is done
set_worker_thread_state(WorkerThreadState::AllowedToRun);
wait_for_worker_thread_state(WorkerThreadState::Exiting);
assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::ready);
assert(f.valid()); assert(f.valid());
Clock::time_point t0 = Clock::now(); Clock::time_point t0 = Clock::now();
f.wait(); f.wait();
@ -84,9 +111,14 @@ int main()
std::shared_future<T> f = p.get_future(); std::shared_future<T> f = p.get_future();
std::thread(func5, std::move(p)).detach(); std::thread(func5, std::move(p)).detach();
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::timeout);
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready);
// allow the worker thread to produce the result and wait until the worker is done
set_worker_thread_state(WorkerThreadState::AllowedToRun);
wait_for_worker_thread_state(WorkerThreadState::Exiting);
assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::ready);
assert(f.valid()); assert(f.valid());
Clock::time_point t0 = Clock::now(); Clock::time_point t0 = Clock::now();
f.wait(); f.wait();
@ -94,4 +126,4 @@ int main()
assert(f.valid()); assert(f.valid());
assert(t1-t0 < ms(5)); assert(t1-t0 < ms(5));
} }
} }

112
test/std/thread/futures/futures.unique_future/wait_until.pass.cpp
View File

@ -1,50 +1,67 @@
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is dual licensed under the MIT and the University of Illinois Open // This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details. // Source Licenses. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// <future> // <future>
// class future<R> // class future<R>
// template <class Clock, class Duration> // template <class Clock, class Duration>
// future_status // future_status
// wait_until(const chrono::time_point<Clock, Duration>& abs_time) const; // wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
#include <future> #include <future>
#include <cassert> #include <atomic>
#include <cassert>
typedef std::chrono::milliseconds ms; enum class WorkerThreadState { Uninitialized, AllowedToRun, Exiting };
typedef std::chrono::milliseconds ms;
void func1(std::promise<int> p) std::atomic<WorkerThreadState> thread_state(WorkerThreadState::Uninitialized);
{
std::this_thread::sleep_for(ms(500)); void set_worker_thread_state(WorkerThreadState state)
{
thread_state.store(state, std::memory_order_relaxed);
}
void wait_for_worker_thread_state(WorkerThreadState state)
{
while (thread_state.load(std::memory_order_relaxed) != state);
}
void func1(std::promise<int> p)
{
wait_for_worker_thread_state(WorkerThreadState::AllowedToRun);
p.set_value(3); p.set_value(3);
} set_worker_thread_state(WorkerThreadState::Exiting);
}
int j = 0; int j = 0;
void func3(std::promise<int&> p) void func3(std::promise<int&> p)
{ {
std::this_thread::sleep_for(ms(500)); wait_for_worker_thread_state(WorkerThreadState::AllowedToRun);
j = 5; j = 5;
p.set_value(j); p.set_value(j);
} set_worker_thread_state(WorkerThreadState::Exiting);
}
void func5(std::promise<void> p) void func5(std::promise<void> p)
{ {
std::this_thread::sleep_for(ms(500)); wait_for_worker_thread_state(WorkerThreadState::AllowedToRun);
p.set_value(); p.set_value();
} set_worker_thread_state(WorkerThreadState::Exiting);
}
int main() int main()
{ {
typedef std::chrono::high_resolution_clock Clock; typedef std::chrono::high_resolution_clock Clock;
{ {
typedef int T; typedef int T;
@ -52,9 +69,14 @@ int main()
std::future<T> f = p.get_future(); std::future<T> f = p.get_future();
std::thread(func1, std::move(p)).detach(); std::thread(func1, std::move(p)).detach();
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::timeout);
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready);
// allow the worker thread to produce the result and wait until the worker is done
set_worker_thread_state(WorkerThreadState::AllowedToRun);
wait_for_worker_thread_state(WorkerThreadState::Exiting);
assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::ready);
assert(f.valid()); assert(f.valid());
Clock::time_point t0 = Clock::now(); Clock::time_point t0 = Clock::now();
f.wait(); f.wait();
@ -68,9 +90,14 @@ int main()
std::future<T> f = p.get_future(); std::future<T> f = p.get_future();
std::thread(func3, std::move(p)).detach(); std::thread(func3, std::move(p)).detach();
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::timeout);
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready);
// allow the worker thread to produce the result and wait until the worker is done
set_worker_thread_state(WorkerThreadState::AllowedToRun);
wait_for_worker_thread_state(WorkerThreadState::Exiting);
assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::ready);
assert(f.valid()); assert(f.valid());
Clock::time_point t0 = Clock::now(); Clock::time_point t0 = Clock::now();
f.wait(); f.wait();
@ -84,9 +111,14 @@ int main()
std::future<T> f = p.get_future(); std::future<T> f = p.get_future();
std::thread(func5, std::move(p)).detach(); std::thread(func5, std::move(p)).detach();
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::timeout); assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::timeout);
assert(f.valid()); assert(f.valid());
assert(f.wait_until(Clock::now() + ms(300)) == std::future_status::ready);
// allow the worker thread to produce the result and wait until the worker is done
set_worker_thread_state(WorkerThreadState::AllowedToRun);
wait_for_worker_thread_state(WorkerThreadState::Exiting);
assert(f.wait_until(Clock::now() + ms(10)) == std::future_status::ready);
assert(f.valid()); assert(f.valid());
Clock::time_point t0 = Clock::now(); Clock::time_point t0 = Clock::now();
f.wait(); f.wait();
@ -94,4 +126,4 @@ int main()
assert(f.valid()); assert(f.valid());
assert(t1-t0 < ms(5)); assert(t1-t0 < ms(5));
} }
} }