Author: Michael Buch Date: 2025-07-14T20:13:50+01:00 New Revision: 33fc0aed9def535c0fa54c8919416959c6a0e19f
URL: https://github.com/llvm/llvm-project/commit/33fc0aed9def535c0fa54c8919416959c6a0e19f DIFF: https://github.com/llvm/llvm-project/commit/33fc0aed9def535c0fa54c8919416959c6a0e19f.diff LOG: Revert "[libc++][NFC] atomic::wait use public API on macOS (#147146)" This reverts commit b9d8d1e4167699de3027ceac94d29253162158c3. Added: Modified: libcxx/src/atomic.cpp Removed: ################################################################################ diff --git a/libcxx/src/atomic.cpp b/libcxx/src/atomic.cpp index ed825aa0a2adf..903084da053a1 100644 --- a/libcxx/src/atomic.cpp +++ b/libcxx/src/atomic.cpp @@ -41,10 +41,6 @@ // OpenBSD has no indirect syscalls # define _LIBCPP_FUTEX(...) futex(__VA_ARGS__) -#elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) - -# include <os/os_sync_wait_on_address.h> - #else // <- Add other operating systems here // Baseline needs no new headers @@ -69,15 +65,24 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK) +extern "C" int __ulock_wait( + uint32_t operation, void* addr, uint64_t value, uint32_t timeout); /* timeout is specified in microseconds */ +extern "C" int __ulock_wake(uint32_t operation, void* addr, uint64_t wake_value); + +// https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/sys/ulock.h#L82 +# define UL_COMPARE_AND_WAIT64 5 +# define ULF_WAKE_ALL 0x00000100 + static void __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) { static_assert(sizeof(__cxx_atomic_contention_t) == 8, "Waiting on 8 bytes value"); - os_sync_wait_on_address(const_cast<__cxx_atomic_contention_t*>(__ptr), __val, 8, OS_SYNC_WAIT_ON_ADDRESS_NONE); + __ulock_wait(UL_COMPARE_AND_WAIT64, const_cast<__cxx_atomic_contention_t*>(__ptr), __val, 0); } static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr, bool __notify_one) { static_assert(sizeof(__cxx_atomic_contention_t) == 8, "Waking up on 8 bytes value"); - os_sync_wake_by_address_all(const_cast<__cxx_atomic_contention_t*>(__ptr), 8, OS_SYNC_WAKE_BY_ADDRESS_NONE); + __ulock_wake( + UL_COMPARE_AND_WAIT64 | (__notify_one ? 0 : ULF_WAKE_ALL), const_cast<__cxx_atomic_contention_t*>(__ptr), 0); } #elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
