From fff99c726e53808b5b75a89ae66e5e84ab19268e Mon Sep 17 00:00:00 2001
From: pkova <pyry@urbit.org>
Date: Tue, 17 Sep 2024 01:52:51 +0300
Subject: [PATCH] Fix core sync test deadlock on darwin

---
 core/sync/futex_darwin.odin         | 10 ++++++++--
 core/sys/darwin/sync.odin           |  7 +++++++
 tests/core/sync/test_core_sync.odin |  1 -
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/sync/futex_darwin.odin b/core/sync/futex_darwin.odin
index daefd6699..3915a414d 100644
--- a/core/sync/futex_darwin.odin
+++ b/core/sync/futex_darwin.odin
@@ -12,6 +12,7 @@ foreign System {
 	// __ulock_wait is not available on 10.15
 	// See https://github.com/odin-lang/Odin/issues/1959
 	__ulock_wait  :: proc "c" (operation: u32, addr: rawptr, value: u64, timeout_us: u32) -> c.int ---
+	__ulock_wait2  :: proc "c" (operation: u32, addr: rawptr, value: u64, timeout_ns: u64, value2: u64) -> c.int ---
 	__ulock_wake  :: proc "c" (operation: u32, addr: rawptr, wake_value: u64) -> c.int ---
 }
 
@@ -52,8 +53,13 @@ _futex_wait_with_timeout :: proc "contextless" (f: ^Futex, expected: u32, durati
 		}
 	} else {
 
-	timeout_ns := u32(duration)
-	s := __ulock_wait(UL_COMPARE_AND_WAIT | ULF_NO_ERRNO, f, u64(expected), timeout_ns)
+	when darwin.ULOCK_WAIT_2_AVAILABLE {
+		timeout_ns := u64(duration)
+		s := __ulock_wait2(UL_COMPARE_AND_WAIT | ULF_NO_ERRNO, f, u64(expected), timeout_ns, 0)
+	} else {
+		timeout_us := u32(duration)
+		s := __ulock_wait(UL_COMPARE_AND_WAIT | ULF_NO_ERRNO, f, u64(expected), timeout_us)
+	}
 	if s >= 0 {
 		return true
 	}
diff --git a/core/sys/darwin/sync.odin b/core/sys/darwin/sync.odin
index 121d3edef..e90f30162 100644
--- a/core/sys/darwin/sync.odin
+++ b/core/sys/darwin/sync.odin
@@ -12,8 +12,15 @@ when ODIN_OS == .Darwin {
 	} else {
 		WAIT_ON_ADDRESS_AVAILABLE :: false
 	}
+	when ODIN_MINIMUM_OS_VERSION >= 11_00_00 {
+		ULOCK_WAIT_2_AVAILABLE :: true
+	} else {
+		ULOCK_WAIT_2_AVAILABLE :: false
+	}
+
 } else {
 	WAIT_ON_ADDRESS_AVAILABLE :: false
+	ULOCK_WAIT_2_AVAILABLE :: false
 }
 
 os_sync_wait_on_address_flag :: enum u32 {
diff --git a/tests/core/sync/test_core_sync.odin b/tests/core/sync/test_core_sync.odin
index 32c08f935..fdd865686 100644
--- a/tests/core/sync/test_core_sync.odin
+++ b/tests/core/sync/test_core_sync.odin
@@ -8,7 +8,6 @@
 // These tests are temporarily disabled on Darwin, as there is currently a
 // stall occurring which I cannot debug.
 
-//+build !darwin
 package test_core_sync
 
 import "base:intrinsics"