4141// OpenBSD has no indirect syscalls
4242# define _LIBCPP_FUTEX (...) futex(__VA_ARGS__)
4343
44- #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)
45-
46- # include < os/os_sync_wait_on_address.h>
47-
4844#else // <- Add other operating systems here
4945
5046// Baseline needs no new headers
@@ -69,15 +65,24 @@ static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const vo
6965
7066#elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)
7167
68+ extern " C" int __ulock_wait (
69+ uint32_t operation, void * addr, uint64_t value, uint32_t timeout); /* timeout is specified in microseconds */
70+ extern " C" int __ulock_wake (uint32_t operation, void * addr, uint64_t wake_value);
71+
72+ // https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/sys/ulock.h#L82
73+ # define UL_COMPARE_AND_WAIT64 5
74+ # define ULF_WAKE_ALL 0x00000100
75+
7276static void
7377__libcpp_platform_wait_on_address (__cxx_atomic_contention_t const volatile * __ptr, __cxx_contention_t __val) {
7478 static_assert (sizeof (__cxx_atomic_contention_t ) == 8 , " Waiting on 8 bytes value" );
75- os_sync_wait_on_address ( const_cast <__cxx_atomic_contention_t *>(__ptr), __val, 8 , OS_SYNC_WAIT_ON_ADDRESS_NONE );
79+ __ulock_wait (UL_COMPARE_AND_WAIT64, const_cast <__cxx_atomic_contention_t *>(__ptr), __val, 0 );
7680}
7781
7882static void __libcpp_platform_wake_by_address (__cxx_atomic_contention_t const volatile * __ptr, bool __notify_one) {
7983 static_assert (sizeof (__cxx_atomic_contention_t ) == 8 , " Waking up on 8 bytes value" );
80- os_sync_wake_by_address_all (const_cast <__cxx_atomic_contention_t *>(__ptr), 8 , OS_SYNC_WAKE_BY_ADDRESS_NONE);
84+ __ulock_wake (
85+ UL_COMPARE_AND_WAIT64 | (__notify_one ? 0 : ULF_WAKE_ALL), const_cast <__cxx_atomic_contention_t *>(__ptr), 0 );
8186}
8287
8388#elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8
0 commit comments