diff mbox series

[06/10] libstdc++: Simplify futex wrapper functions for atomic wait/notify

Message ID 20250110212810.832494-7-jwakely@redhat.com
State New
Headers
Series C++20 atomic wait/notify ABI stabilization |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 fail Test failed
linaro-tcwg-bot/tcwg_gcc_check--master-arm fail Test failed

Commit Message

Jonathan Wakely Jan. 10, 2025, 9:23 p.m. UTC 
  Making these non-templates will allow them to be moved into the library
at some point.

libstdc++-v3/ChangeLog:

	* include/bits/atomic_wait.h (__platform_wait): Change function
	template to a normal function. The parameter is always
	__platform_wait_t* which is just int* for this implementation of
	the function.
	(__platform_notify): Likewise.
---
 libstdc++-v3/include/bits/atomic_wait.h | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h
index 4a9652ed8f1d..38a2bd3f95f2 100644
--- a/libstdc++-v3/include/bits/atomic_wait.h
+++ b/libstdc++-v3/include/bits/atomic_wait.h
@@ -108,27 +108,27 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
       __bitset_match_any = -1
     };
 
-    template<typename _Tp>
-      void
-      __platform_wait(const _Tp* __addr, __platform_wait_t __val) noexcept
-      {
-	auto __e = syscall (SYS_futex, static_cast<const void*>(__addr),
-			    static_cast<int>(__futex_wait_flags::__wait_private),
-			    __val, nullptr);
-	if (!__e || errno == EAGAIN)
-	  return;
-	if (errno != EINTR)
-	  __throw_system_error(errno);
-      }
+    // If the futex *__addr is equal to __val, wait on the futex until woken.
+    inline void
+    __platform_wait(const int* __addr, int __val) noexcept
+    {
+      auto __e = syscall (SYS_futex, __addr,
+			  static_cast<int>(__futex_wait_flags::__wait_private),
+			  __val, nullptr);
+      if (!__e || errno == EAGAIN)
+	return;
+      if (errno != EINTR)
+	__throw_system_error(errno);
+    }
 
-    template<typename _Tp>
-      void
-      __platform_notify(const _Tp* __addr, bool __all) noexcept
-      {
-	syscall (SYS_futex, static_cast<const void*>(__addr),
-		 static_cast<int>(__futex_wait_flags::__wake_private),
-		 __all ? INT_MAX : 1);
-      }
+    // Wake threads waiting on the futex *__addr.
+    inline void
+    __platform_notify(const int* __addr, bool __all) noexcept
+    {
+      syscall (SYS_futex, __addr,
+	       static_cast<int>(__futex_wait_flags::__wake_private),
+	       __all ? INT_MAX : 1);
+    }
 #endif
 
     inline void