mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #100539 - joboet:horizon_timeout_clock, r=thomcc

Browse Source 
Use correct clock in `park_timeout` on Horizon

Horizon does not support using `CLOCK_MONOTONIC` with condition variables, so use the system time instead.
This commit is contained in:
bors 2022-12-28 03:56:46 +00:00
commit 6a4624d73b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/std/src/sys/unix/thread_parker/pthread.rs
View File

@ -44,7 +44,8 @@ unsafe fn wait_timeout(
target_os = "macos", target_os = "macos",
target_os = "ios", target_os = "ios",
target_os = "watchos", target_os = "watchos",
target_os = "espidf" target_os = "espidf",
target_os = "horizon",
))] ))]
let (now, dur) = { let (now, dur) = {
use crate::cmp::min; use crate::cmp::min;
@ -70,7 +71,8 @@ unsafe fn wait_timeout(
target_os = "macos", target_os = "macos",
target_os = "ios", target_os = "ios",
target_os = "watchos", target_os = "watchos",
target_os = "espidf" target_os = "espidf",
target_os = "horizon",
)))] )))]
let (now, dur) = { let (now, dur) = {
use crate::sys::time::Timespec; use crate::sys::time::Timespec;