-
Notifications
You must be signed in to change notification settings - Fork 12.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[libc++] Fix sporadic test failure in condition_variable notify_all test #97622
Conversation
@llvm/pr-subscribers-libcxx Author: Hui (huixie90) ChangesFull diff: https://github.com/llvm/llvm-project/pull/97622.diff 1 Files Affected:
diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp
index e0d587dbca0e9..995e4c9f72f8b 100644
--- a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp
+++ b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_all.pass.cpp
@@ -14,6 +14,7 @@
// void notify_all();
+#include <atomic>
#include <condition_variable>
#include <mutex>
#include <thread>
@@ -29,10 +30,13 @@ int test0 = 0;
int test1 = 0;
int test2 = 0;
+std::atomic<int> ready_count = 0;
+
void f1()
{
std::unique_lock<std::mutex> lk(mut);
assert(test1 == 0);
+ ready_count.fetch_add(1);
while (test1 == 0)
cv.wait(lk);
assert(test1 == 1);
@@ -43,6 +47,7 @@ void f2()
{
std::unique_lock<std::mutex> lk(mut);
assert(test2 == 0);
+ ready_count.fetch_add(1);
while (test2 == 0)
cv.wait(lk);
assert(test2 == 1);
@@ -53,7 +58,9 @@ int main(int, char**)
{
std::thread t1 = support::make_test_thread(f1);
std::thread t2 = support::make_test_thread(f2);
- std::this_thread::sleep_for(std::chrono::milliseconds(100));
+ while (ready_count.load() != 2) {
+ std::this_thread::sleep_for(std::chrono::milliseconds(100));
+ }
{
std::unique_lock<std::mutex>lk(mut);
test1 = 1;
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
void f1() | ||
{ | ||
std::unique_lock<std::mutex> lk(mut); | ||
assert(test1 == 0); | ||
ready_count.fetch_add(1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Slight preference for ready_count += 1
since that's easier to read.
fixes #95944