[libc++] Fix flakiness in atomic_notify_all.pass.cpp
#70436
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Avoid relying on sleep for synchronization.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Konstantin Varlamov (var-const) ChangesAvoid relying on sleep for synchronization. Full diff: https://github.com/llvm/llvm-project/pull/70436.diff 1 Files Affected:
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();
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
ldionne
approved these changes
Oct 27, 2023
huixie90
reviewed
Oct 31, 2023
| @@ -56,15 +56,21 @@ struct TestFn { | |||
| { | |||
| volatile A a(T(2)); | |||
There was a problem hiding this comment.
The test point above this test is still relying on sleep to be long enough. (The first assertion could still fail if the test thread started really slowly)
There was a problem hiding this comment.
Thanks! Uploaded #71011
var-const
added a commit
to var-const/llvm-project
that referenced
this pull request
Nov 2, 2023
This is a follow-up to llvm#70436.
var-const
added a commit
that referenced
this pull request
Nov 2, 2023
This is a follow-up to #70436.
blueboxd
pushed a commit
to blueboxd/libcxx
that referenced
this pull request
Nov 18, 2023
This is a follow-up to llvm/llvm-project#70436. NOKEYCHECK=True GitOrigin-RevId: e98195f318375978e3e0b153cade8bb3a05029bb
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Avoid relying on sleep for synchronization.