Skip to content

Commit 6a4624d

Browse files
committed
Auto merge of #100539 - joboet:horizon_timeout_clock, r=thomcc
Use correct clock in `park_timeout` on Horizon Horizon does not support using `CLOCK_MONOTONIC` with condition variables, so use the system time instead.
2 parents 739d68a + ce051df commit 6a4624d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

library/std/src/sys/unix/thread_parker/pthread.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ unsafe fn wait_timeout(
4444
target_os = "macos",
4545
target_os = "ios",
4646
target_os = "watchos",
47-
target_os = "espidf"
47+
target_os = "espidf",
48+
target_os = "horizon",
4849
))]
4950
let (now, dur) = {
5051
use crate::cmp::min;
@@ -70,7 +71,8 @@ unsafe fn wait_timeout(
7071
target_os = "macos",
7172
target_os = "ios",
7273
target_os = "watchos",
73-
target_os = "espidf"
74+
target_os = "espidf",
75+
target_os = "horizon",
7476
)))]
7577
let (now, dur) = {
7678
use crate::sys::time::Timespec;

0 commit comments

Comments
 (0)