From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2062) id C35973858280; Tue, 14 Feb 2023 01:47:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C35973858280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676339248; bh=fggX4dITeyXPlkBz1v4IgPtoeD/u3sCySUOX+Hof3ek=; h=From:To:Subject:Date:From; b=YHpNQ58A0BobOFIAOCCHJWVnFLqKGaFEzGXarJQmVPFitsgV2R2NrIxv5GzkgCgCT caBwa5tR6DRHkCGEwYuzuwfskP9kxAILaXvfsqD61Oxi1SxIE+AM26OddiWCq9hkYD RdIDS5dsYzkhHreb54sz23wS8GQLCfggIXzHC1nk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Rodgers To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5977] libstdc++: Add missing free functions for atomic_flag [PR103934] X-Act-Checkin: gcc X-Git-Author: Thomas W Rodgers X-Git-Refname: refs/heads/master X-Git-Oldrev: a8d769045b43e8509490362865a85cb31a855ccf X-Git-Newrev: 56cf9372c0596c4df4003c72dc4665a306fbfe31 Message-Id: <20230214014728.C35973858280@sourceware.org> Date: Tue, 14 Feb 2023 01:47:28 +0000 (GMT) List-Id: https://gcc.gnu.org/g:56cf9372c0596c4df4003c72dc4665a306fbfe31 commit r13-5977-g56cf9372c0596c4df4003c72dc4665a306fbfe31 Author: Thomas W Rodgers Date: Fri Feb 10 10:09:06 2023 -0800 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. Diff: --- libstdc++-v3/include/std/atomic | 19 ++++++++++++++++ .../29_atomics/atomic_flag/wait_notify/1.cc | 26 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 1edd3ae16fa..96e87ded864 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 240fb4259f7..777fa915ea1 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 -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; }