aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas W Rodgers <rodgert@twrodgers.com>2023-02-10 10:09:06 -0800
committerThomas W Rodgers <rodgert@twrodgers.com>2023-02-13 17:46:59 -0800
commit56cf9372c0596c4df4003c72dc4665a306fbfe31 (patch)
treea7bcfff63c4650a95be26cb0d0cf461bc5cd7a06
parenta8d769045b43e8509490362865a85cb31a855ccf (diff)
downloadgcc-56cf9372c0596c4df4003c72dc4665a306fbfe31.zip
gcc-56cf9372c0596c4df4003c72dc4665a306fbfe31.tar.gz
gcc-56cf9372c0596c4df4003c72dc4665a306fbfe31.tar.bz2
libstdc++: Add missing free functions for atomic_flag [PR103934]
This patch adds - atomic_flag_wait atomic_flag_wait_explicit atomic_flag_notify atomic_flag_notify_explicit Which were missed when commit 83a1be introduced C++20 atomic wait. libstdc++-v3/ChangeLog: PR libstdc++/103934 * include/std/atomic (atomic_flag_wait): Add. (atomic_flag_wait_explicit): Add. (atomic_flag_notify): Add. (atomic_flag_notify_explicit): Add. * testsuite/29_atomics/atomic_flag/wait_notify/1.cc: Add test case to cover missing atomic_flag free functions.
-rw-r--r--libstdc++-v3/include/std/atomic19
-rw-r--r--libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc26
2 files changed, 43 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index 1edd3ae..96e87de 100644
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -1259,6 +1259,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
atomic_flag_clear(volatile atomic_flag* __a) noexcept
{ atomic_flag_clear_explicit(__a, memory_order_seq_cst); }
+#if __cpp_lib_atomic_wait
+ inline void
+ atomic_flag_wait(atomic_flag* __a, bool __old) noexcept
+ { __a->wait(__old); }
+
+ inline void
+ atomic_flag_wait_explicit(atomic_flag* __a, bool __old,
+ memory_order __m) noexcept
+ { __a->wait(__old, __m); }
+
+ inline void
+ atomic_flag_notify_one(atomic_flag* __a) noexcept
+ { __a->notify_one(); }
+
+ inline void
+ atomic_flag_notify_all(atomic_flag* __a) noexcept
+ { __a->notify_all(); }
+#endif // __cpp_lib_atomic_wait
+
/// @cond undocumented
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 3220. P0558 broke conforming C++14 uses of atomic shared_ptr
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc
index 240fb42..777fa91 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/wait_notify/1.cc
@@ -26,8 +26,8 @@
#include <testsuite_hooks.h>
-int
-main()
+void
+test01()
{
std::atomic_flag a;
VERIFY( !a.test() );
@@ -39,5 +39,27 @@ main()
});
a.wait(false);
t.join();
+}
+
+void
+test02()
+{
+ std::atomic_flag a;
+ VERIFY( !std::atomic_flag_test(&a) );
+ std::atomic_flag_wait(&a, true);
+ std::thread t([&]
+ {
+ std::atomic_flag_test_and_set(&a);
+ std::atomic_flag_notify_one(&a);
+ });
+ std::atomic_flag_wait(&a, false);
+ t.join();
+}
+
+int
+main()
+{
+ test01();
+ test02();
return 0;
}