Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2226331/?format=api
{ "id": 2226331, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2226331/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhubrmqub2.gcc.gcc-TEST.redi.31.1.10@forge-stage.sourceware.org/", "project": { "id": 17, "url": "http://patchwork.ozlabs.org/api/1.2/projects/17/?format=api", "name": "GNU Compiler Collection", "link_name": "gcc", "list_id": "gcc-patches.gcc.gnu.org", "list_email": "gcc-patches@gcc.gnu.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<bmm.hhubrmqub2.gcc.gcc-TEST.redi.31.1.10@forge-stage.sourceware.org>", "list_archive_url": null, "date": "2026-04-22T10:44:25", "name": "[v1,10/16] libstdc++: Rename __waiter_pool_impl to __waitable_state", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "070f91859811192d183b35914749e59c5ae52adc", "submitter": { "id": 93210, "url": "http://patchwork.ozlabs.org/api/1.2/people/93210/?format=api", "name": "Jonathan Wakely via Sourceware Forge", "email": "forge-bot+redi@forge-stage.sourceware.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/gcc/patch/bmm.hhubrmqub2.gcc.gcc-TEST.redi.31.1.10@forge-stage.sourceware.org/mbox/", "series": [ { "id": 500987, "url": "http://patchwork.ozlabs.org/api/1.2/series/500987/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/list/?series=500987", "date": "2026-04-22T10:44:17", "name": "atomic wait/notify ABI stabilization", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/500987/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2226331/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226331/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "gcc-patches@gcc.gnu.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "gcc-patches@gcc.gnu.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)", "sourceware.org; dmarc=none (p=none dis=none)\n header.from=forge-stage.sourceware.org", "sourceware.org;\n spf=pass smtp.mailfrom=forge-stage.sourceware.org", "server2.sourceware.org;\n arc=none smtp.remote-ip=38.145.34.39" ], "Received": [ "from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0xnx6DXfz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 21:29:25 +1000 (AEST)", "from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id A6B154293374\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 11:29:23 +0000 (GMT)", "from forge-stage.sourceware.org (vm08.sourceware.org [38.145.34.39])\n by sourceware.org (Postfix) with ESMTPS id 8EAD74015EB5\n for <gcc-patches@gcc.gnu.org>; Wed, 22 Apr 2026 10:46:05 +0000 (GMT)", "from forge-stage.sourceware.org (localhost [IPv6:::1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256)\n (No client certificate requested)\n by forge-stage.sourceware.org (Postfix) with ESMTPS id 0963042BB9\n for <gcc-patches@gcc.gnu.org>; Wed, 22 Apr 2026 10:46:02 +0000 (UTC)" ], "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 sourceware.org A6B154293374", "OpenDKIM Filter v2.11.0 sourceware.org 8EAD74015EB5" ], "DMARC-Filter": "OpenDMARC Filter v1.4.2 sourceware.org 8EAD74015EB5", "ARC-Filter": "OpenARC Filter v1.0.0 sourceware.org 8EAD74015EB5", "ARC-Seal": "i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776854765; cv=none;\n b=TRsxAn3OWQRGqYPZJWNIVz48uxf1BGt5Jj8Kc4zqOLXI/NPU/vJN7WVhZinWE7HNmJF34Jd471EqHuTpLyBta3y59+QabLDqYfHmEijocqAz/GCzrHqLrs87//8yRtpMIEt1LVmdA+5mVn+oGTC1GGSzBVIgDsdh4spMZzxA1qM=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1776854765; c=relaxed/simple;\n bh=5IHwnveKgeM+9yoDWxdPo19WBrN7GNpiuKuT7E/aI/Q=;\n h=From:Date:Subject:To:Message-ID;\n b=O6dXJGli8PE7miGsFHk0ieAgAy5bm+2Na1KJ6voE/P/nl3tJSuH0R8E2QdKsmW63aVQUcg6zk03hWrOAUbXw6KaOUqbwVcnQifnaNqe7P2uwl7IJExT1V/UFfW27HQDyyVeUUngxPKdkvHdrZGUxlUbtvC4dvMzZ+9PymwCl99k=", "ARC-Authentication-Results": "i=1; server2.sourceware.org", "From": "Jonathan Wakely via Sourceware Forge\n <forge-bot+redi@forge-stage.sourceware.org>", "Date": "Wed, 22 Apr 2026 10:44:25 +0000", "Subject": "[PATCH v1 10/16] libstdc++: Rename __waiter_pool_impl to\n __waitable_state", "To": "gcc-patches mailing list <gcc-patches@gcc.gnu.org>", "Message-ID": "\n <bmm.hhubrmqub2.gcc.gcc-TEST.redi.31.1.10@forge-stage.sourceware.org>", "X-Mailer": "batrachomyomachia", "X-Pull-Request-Organization": "gcc", "X-Pull-Request-Repository": "gcc-TEST", "X-Pull-Request": "https://forge.sourceware.org/gcc/gcc-TEST/pulls/31", "References": "\n <bmm.hhubrmqub2.gcc.gcc-TEST.redi.31.1.0@forge-stage.sourceware.org>", "In-Reply-To": "\n <bmm.hhubrmqub2.gcc.gcc-TEST.redi.31.1.0@forge-stage.sourceware.org>", "X-Patch-URL": "\n https://forge.sourceware.org/redi/gcc/commit/3eff721ea5c5d249d557887628f9ae75b9d0abce", "X-BeenThere": "gcc-patches@gcc.gnu.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Gcc-patches mailing list <gcc-patches.gcc.gnu.org>", "List-Unsubscribe": "<https://gcc.gnu.org/mailman/options/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>", "List-Archive": "<https://gcc.gnu.org/pipermail/gcc-patches/>", "List-Post": "<mailto:gcc-patches@gcc.gnu.org>", "List-Help": "<mailto:gcc-patches-request@gcc.gnu.org?subject=help>", "List-Subscribe": "<https://gcc.gnu.org/mailman/listinfo/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>", "Reply-To": "gcc-patches mailing list <gcc-patches@gcc.gnu.org>, redi@gcc.gnu.org", "Errors-To": "gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org" }, "content": "From: Jonathan Wakely <jwakely@redhat.com>\n\nThe name __waiter_pool_impl is misleading. An object of that type is a\nmember of the pool, not the pool itself, and it's not an \"impl\" of\nany abstract base class or generic concept. Just call it\n__waitable_state since it maintains the state used for waiting/notifying\na waitable atomic object.\n\nSimilarly, rename _S_impl_for to _S_state_for.\n\nOnce these functions move into the shared library they won't be exported\nand so the naming won't matter much anyway.\n\nlibstdc++-v3/ChangeLog:\n\n\t* include/bits/atomic_timed_wait.h (__wait_until_impl): Adjust\n\tto use new naming.\n\t* include/bits/atomic_wait.h (__waiter_pool_impl): Rename to\n\t__waitable_state.\n\t(__waiter_pool_impl::_S_wait): Rename to _M_waiters.\n\t(__waiter_pool_impl::_S_impl_for): Rename to _S_state_for.\n\t(__waiter_pool_impl::_S_track): Adjust to use new naming.\n\t(__wait_impl, __notify_impl): Likewise.\n\t* testsuite/29_atomics/atomic/wait_notify/100334.cc: Adjust to\n\tuse new naming.\n---\n libstdc++-v3/include/bits/atomic_timed_wait.h | 16 ++--\n libstdc++-v3/include/bits/atomic_wait.h | 81 ++++++++++---------\n .../29_atomics/atomic/wait_notify/100334.cc | 5 +-\n 3 files changed, 53 insertions(+), 49 deletions(-)", "diff": "diff --git a/libstdc++-v3/include/bits/atomic_timed_wait.h b/libstdc++-v3/include/bits/atomic_timed_wait.h\nindex 800f461e9e48..19a0225c63b2 100644\n--- a/libstdc++-v3/include/bits/atomic_timed_wait.h\n+++ b/libstdc++-v3/include/bits/atomic_timed_wait.h\n@@ -174,12 +174,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \t\t const __wait_clock_t::time_point& __atime)\n {\n __wait_args_base __args = __a;\n- __waiter_pool_impl* __pool = nullptr;\n+ __waitable_state* __state = nullptr;\n const __platform_wait_t* __wait_addr;\n if (__args & __wait_flags::__proxy_wait)\n \t{\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n-\t __wait_addr = &__pool->_M_ver;\n+\t __state = &__waitable_state::_S_state_for(__addr);\n+\t __wait_addr = &__state->_M_ver;\n \t __atomic_load(__wait_addr, &__args._M_old, __args._M_order);\n \t}\n else\n@@ -194,7 +194,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \t return __res;\n \t}\n \n- auto __tracker = __waiter_pool_impl::_S_track(__pool, __args, __addr);\n+ auto __tracker = __waitable_state::_S_track(__state, __args, __addr);\n \n #ifdef _GLIBCXX_HAVE_PLATFORM_TIMED_WAIT\n if (__platform_wait_until(__wait_addr, __args._M_old, __atime))\n@@ -206,12 +206,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __atomic_load(__wait_addr, &__val, __args._M_order);\n if (__val == __args._M_old)\n \t{\n-\t if (!__pool)\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n-\t lock_guard<mutex> __l{ __pool->_M_mtx };\n+\t if (!__state)\n+\t __state = &__waitable_state::_S_state_for(__addr);\n+\t lock_guard<mutex> __l{ __state->_M_mtx };\n \t __atomic_load(__wait_addr, &__val, __args._M_order);\n \t if (__val == __args._M_old\n-\t\t&& __cond_wait_until(__pool->_M_cv, __pool->_M_mtx, __atime))\n+\t\t&& __cond_wait_until(__state->_M_cv, __state->_M_mtx, __atime))\n \t return { true, __val };\n \t}\n return { false, __val };\ndiff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h\nindex 40d8471413a2..bdc8677e9ea9 100644\n--- a/libstdc++-v3/include/bits/atomic_wait.h\n+++ b/libstdc++-v3/include/bits/atomic_wait.h\n@@ -163,47 +163,52 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n struct __wait_args_base;\n \n- struct __waiter_pool_impl\n+ // The state used by atomic waiting and notifying functions.\n+ struct __waitable_state\n {\n // Don't use std::hardware_destructive_interference_size here because we\n // don't want the layout of library types to depend on compiler options.\n static constexpr auto _S_align = 64;\n \n- alignas(_S_align) __platform_wait_t _M_wait = 0;\n+ // Count of threads blocked waiting on this state.\n+ alignas(_S_align) __platform_wait_t _M_waiters = 0;\n \n #ifndef _GLIBCXX_HAVE_PLATFORM_WAIT\n mutex _M_mtx;\n #endif\n \n+ // If we can't do a platform wait on the atomic variable itself,\n+ // we use this member as a proxy for the atomic variable and we\n+ // use this for waiting and notifying functions instead.\n alignas(_S_align) __platform_wait_t _M_ver = 0;\n \n #ifndef _GLIBCXX_HAVE_PLATFORM_WAIT\n __condvar _M_cv;\n #endif\n \n- __waiter_pool_impl() = default;\n+ __waitable_state() = default;\n \n void\n _M_enter_wait() noexcept\n- { __atomic_fetch_add(&_M_wait, 1, __ATOMIC_SEQ_CST); }\n+ { __atomic_fetch_add(&_M_waiters, 1, __ATOMIC_SEQ_CST); }\n \n void\n _M_leave_wait() noexcept\n- { __atomic_fetch_sub(&_M_wait, 1, __ATOMIC_RELEASE); }\n+ { __atomic_fetch_sub(&_M_waiters, 1, __ATOMIC_RELEASE); }\n \n bool\n _M_waiting() const noexcept\n {\n \t__platform_wait_t __res;\n-\t__atomic_load(&_M_wait, &__res, __ATOMIC_SEQ_CST);\n+\t__atomic_load(&_M_waiters, &__res, __ATOMIC_SEQ_CST);\n \treturn __res != 0;\n }\n \n- static __waiter_pool_impl&\n- _S_impl_for(const void* __addr) noexcept\n+ static __waitable_state&\n+ _S_state_for(const void* __addr) noexcept\n {\n \tconstexpr __UINTPTR_TYPE__ __ct = 16;\n-\tstatic __waiter_pool_impl __w[__ct];\n+\tstatic __waitable_state __w[__ct];\n \tauto __key = ((__UINTPTR_TYPE__)__addr >> 2) % __ct;\n \treturn __w[__key];\n }\n@@ -211,7 +216,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n // Return an RAII type that calls _M_enter_wait() on construction\n // and _M_leave_wait() on destruction.\n static auto\n- _S_track(__waiter_pool_impl*& __pool, const __wait_args_base& __args,\n+ _S_track(__waitable_state*& __state, const __wait_args_base& __args,\n \t const void* __addr) noexcept;\n };\n \n@@ -298,9 +303,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n };\n \n inline auto\n- __waiter_pool_impl::_S_track(__waiter_pool_impl*& __pool,\n-\t\t\t\t const __wait_args_base& __args,\n-\t\t\t\t const void* __addr) noexcept\n+ __waitable_state::_S_track(__waitable_state*& __state,\n+\t\t\t const __wait_args_base& __args,\n+\t\t\t const void* __addr) noexcept\n {\n struct _Tracker\n {\n@@ -308,7 +313,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n \t[[__gnu__::__nonnull__]]\n \texplicit\n-\t_Tracker(__waiter_pool_impl* __st) noexcept\n+\t_Tracker(__waitable_state* __st) noexcept\n \t: _M_st(__st)\n \t{ __st->_M_enter_wait(); }\n \n@@ -317,21 +322,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n \t~_Tracker() { if (_M_st) _M_st->_M_leave_wait(); }\n \n-\t__waiter_pool_impl* _M_st;\n+\t__waitable_state* _M_st;\n };\n \n if (__args & __wait_flags::__track_contention)\n \t{\n \t // Caller does not externally track contention,\n-\t // so we want to increment+decrement __pool->_M_waiters\n+\t // so we want to increment+decrement __state->_M_waiters\n \n \t // First make sure we have a waitable state for the address.\n-\t if (!__pool)\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n+\t if (!__state)\n+\t __state = &__waitable_state::_S_state_for(__addr);\n \n \t // This object will increment the number of waiters and\n \t // decrement it again on destruction.\n-\t return _Tracker{__pool};\n+\t return _Tracker{__state};\n \t}\n return _Tracker{}; // For bare waits caller tracks waiters.\n }\n@@ -359,13 +364,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __wait_impl(const void* __addr, const __wait_args_base& __a)\n {\n __wait_args_base __args = __a;\n- __waiter_pool_impl* __pool = nullptr;\n+ __waitable_state* __state = nullptr;\n \n const __platform_wait_t* __wait_addr;\n if (__args & __wait_flags::__proxy_wait)\n \t{\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n-\t __wait_addr = &__pool->_M_ver;\n+\t __state = &__waitable_state::_S_state_for(__addr);\n+\t __wait_addr = &__state->_M_ver;\n \t __atomic_load(__wait_addr, &__args._M_old, __args._M_order);\n \t}\n else\n@@ -380,7 +385,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \t return __res;\n \t}\n \n- auto __tracker = __waiter_pool_impl::_S_track(__pool, __args, __addr);\n+ auto __tracker = __waitable_state::_S_track(__state, __args, __addr);\n \n #ifdef _GLIBCXX_HAVE_PLATFORM_WAIT\n __platform_wait(__wait_addr, __args._M_old);\n@@ -390,12 +395,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __atomic_load(__wait_addr, &__val, __args._M_order);\n if (__val == __args._M_old)\n \t{\n-\t if (!__pool)\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n-\t lock_guard<mutex> __l{ __pool->_M_mtx };\n+\t if (!__state)\n+\t __state = &__waitable_state::_S_state_for(__addr);\n+\t lock_guard<mutex> __l{ __state->_M_mtx };\n \t __atomic_load(__wait_addr, &__val, __args._M_order);\n \t if (__val == __args._M_old)\n-\t __pool->_M_cv.wait(__pool->_M_mtx);\n+\t __state->_M_cv.wait(__state->_M_mtx);\n \t}\n return { false, __val };\n #endif\n@@ -405,15 +410,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n __notify_impl(const void* __addr, [[maybe_unused]] bool __all,\n \t\t const __wait_args_base& __args)\n {\n- __waiter_pool_impl* __pool = nullptr;\n+ __waitable_state* __state = nullptr;\n \n const __platform_wait_t* __wait_addr;\n if (__args & __wait_flags::__proxy_wait)\n \t{\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n+\t __state = &__waitable_state::_S_state_for(__addr);\n \t // Waiting for *__addr is actually done on the proxy's _M_ver.\n-\t __wait_addr = &__pool->_M_ver;\n-\t __atomic_fetch_add(&__pool->_M_ver, 1, __ATOMIC_RELAXED);\n+\t __wait_addr = &__state->_M_ver;\n+\t __atomic_fetch_add(&__state->_M_ver, 1, __ATOMIC_RELAXED);\n \t // Because the proxy might be shared by several waiters waiting\n \t // on different atomic variables, we need to wake them all so\n \t // they can re-evaluate their conditions to see if they should\n@@ -425,19 +430,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION\n \n if (__args & __wait_flags::__track_contention)\n \t{\n-\t if (!__pool)\n-\t __pool = &__waiter_pool_impl::_S_impl_for(__addr);\n-\t if (!__pool->_M_waiting())\n+\t if (!__state)\n+\t __state = &__waitable_state::_S_state_for(__addr);\n+\t if (!__state->_M_waiting())\n \t return;\n \t}\n \n #ifdef _GLIBCXX_HAVE_PLATFORM_WAIT\n __platform_notify(__wait_addr, __all);\n #else\n- if (!__pool)\n-\t__pool = &__waiter_pool_impl::_S_impl_for(__addr);\n- lock_guard<mutex> __l{ __pool->_M_mtx };\n- __pool->_M_cv.notify_all();\n+ if (!__state)\n+\t__state = &__waitable_state::_S_state_for(__addr);\n+ lock_guard<mutex> __l{ __state->_M_mtx };\n+ __state->_M_cv.notify_all();\n #endif\n }\n } // namespace __detail\ndiff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc\nindex ec596e316500..58a0da6e6def 100644\n--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc\n+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc\n@@ -47,15 +47,14 @@ int\n main()\n {\n // all atomic share the same waiter\n-// atomics_sharing_same_waiter<char> atomics;\n atomics_sharing_same_waiter<char> atomics;\n for (auto& atom : atomics.a)\n {\n atom->store(0);\n }\n \n- auto a = &std::__detail::__waiter_pool_impl::_S_impl_for(reinterpret_cast<char *>(atomics.a[0]));\n- auto b = &std::__detail::__waiter_pool_impl::_S_impl_for(reinterpret_cast<char *>(atomics.a[1]));\n+ auto a = &std::__detail::__waitable_state::_S_state_for((void*)(atomics.a[0]));\n+ auto b = &std::__detail::__waitable_state::_S_state_for((void*)(atomics.a[1]));\n VERIFY( a == b );\n \n auto fut0 = std::async(std::launch::async, [&] { atomics.a[0]->wait(0); });\n", "prefixes": [ "v1", "10/16" ] }