Browse Source

Use `RtlWaitOnAddress` to allow for a `i64` sized duration rather than `u32`

gingerBill 3 years ago
parent
commit
a86574da84
1 changed files with 9 additions and 9 deletions
  1. 9 9
      core/sync/futex_windows.odin

+ 9 - 9
core/sync/futex_windows.odin

@@ -5,28 +5,28 @@ package sync
 import "core:time"
 
 foreign import Synchronization "system:Synchronization.lib"
-
 @(default_calling_convention="stdcall")
 foreign Synchronization {
-	WaitOnAddress       :: proc(Address: rawptr, CompareAddress: rawptr, AddressSize: uint, Timeout: u32) -> b32 ---
 	WakeByAddressSingle :: proc(Address: rawptr) ---
 	WakeByAddressAll    :: proc(Address: rawptr) ---
 }
 
-
+foreign import Ntdll "system:Ntdll.lib"
+@(default_calling_convention="stdcall")
+foreign Ntdll {
+	RtlWaitOnAddress :: proc(Address: rawptr, CompareAddress: rawptr, AddressSize: uint, Timeout: ^i64) -> i32 ---
+}
 
 _futex_wait :: proc(f: ^Futex, expect: u32) -> bool {
 	expect := expect
-	return bool(WaitOnAddress(f, &expect, size_of(expect), ~u32(0)))
+	return 0 == RtlWaitOnAddress(f, &expect, size_of(expect), nil)
 }
 
 _futex_wait_with_timeout :: proc(f: ^Futex, expect: u32, duration: time.Duration) -> bool {
 	expect := expect
-	timeout := u32(0)
-	if duration > 0 {
-		timeout = u32(duration/1e6)
-	}
-	return bool(WaitOnAddress(f, &expect, size_of(expect), timeout))
+	// NOTE(bill): for some bizarre reason, this has be a negative number
+	timeout := -i64(duration / 100)
+	return 0 == RtlWaitOnAddress(f, &expect, size_of(expect), &timeout)
 }
 
 _futex_signal :: proc(f: ^Futex) {