nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-31 00:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Round timeouts up to infinite in futex_wait on DragonFlyBSD.

Browse Source
This commit is contained in:
Mara Bos 2022-05-03 12:33:10 +02:00
parent 8ee9b93c4f
commit 9299e6915d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/std/src/sys/unix/futex.rs
View File

@ -185,16 +185,15 @@ pub fn futex_wake_all(futex: &AtomicU32) {
#[cfg(target_os = "dragonfly")]
pub fn futex_wait(futex: &AtomicU32, expected: u32, timeout: Option<Duration>) -> bool {
use crate::convert::TryFrom;
// A timeout of 0 means infinite.
// We round smaller timeouts up to 1 millisecond.
// Overflows are rounded up to an infinite timeout.
let timeout_ms =
timeout.and_then(|d| Some(i32::try_from(d.as_millis()).ok()?.max(1))).unwrap_or(0);
let r = unsafe {
libc::umtx_sleep(
futex as *const AtomicU32 as *const i32,
expected as i32,
// A timeout of 0 means infinite, so we round smaller timeouts up to 1 millisecond.
// Timeouts larger than i32::MAX milliseconds saturate.
timeout.map_or(0, |d| {
i32::try_from(d.as_millis()).map_or(i32::MAX, |millis| millis.max(1))
}),
)
libc::umtx_sleep(futex as *const AtomicU32 as *const i32, expected as i32, timeout_ms)
};
r == 0 || super::os::errno() != libc::ETIMEDOUT