[libcxx-commits] [libcxx] [libc++] Fix flakiness in `atomic_notify_all.pass.cpp` (PR #70436)
via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Oct 27 02:24:28 PDT 2023
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libcxx
Author: Konstantin Varlamov (var-const)
<details>
<summary>Changes</summary>
Avoid relying on sleep for synchronization.
---
Full diff: https://github.com/llvm/llvm-project/pull/70436.diff
1 Files Affected:
- (modified) libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp (+10-4)
``````````diff
diff --git a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp
index d22ea426057113b..b96691735a4ccbd 100644
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp
@@ -56,15 +56,21 @@ struct TestFn {
{
volatile A a(T(2));
static_assert(noexcept(std::atomic_notify_all(&a)), "");
- auto f = [&]() {
+
+ std::atomic<bool> is_ready[2] = {false, false};
+ auto f = [&](int index) {
assert(std::atomic_load(&a) == T(2));
+ is_ready[index].store(true);
+
std::atomic_wait(&a, T(2));
assert(std::atomic_load(&a) == T(4));
};
- std::thread t1 = support::make_test_thread(f);
- std::thread t2 = support::make_test_thread(f);
- std::this_thread::sleep_for(std::chrono::milliseconds(100));
+ std::thread t1 = support::make_test_thread(f, /*index=*/0);
+ std::thread t2 = support::make_test_thread(f, /*index=*/1);
+ while (!is_ready[0] || !is_ready[1]) {
+ // Spin
+ }
std::atomic_store(&a, T(4));
std::atomic_notify_all(&a);
t1.join();
``````````
</details>
https://github.com/llvm/llvm-project/pull/70436
More information about the libcxx-commits
mailing list