Skip to content

std: use 64-bit clock_nanosleep on GNU/Linux if available #151403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Jan 25, 2026
+51 −1
Merged

std: use 64-bit clock_nanosleep on GNU/Linux if available #151403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions library/std/src/sys/thread/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,56 @@ pub fn sleep(dur: Duration) {
pub fn sleep_until(deadline: crate::time::Instant) {
use crate::time::Instant;

#[cfg(all(
target_os = "linux",
target_env = "gnu",
target_pointer_width = "32",
not(target_arch = "riscv32")
))]
{
use crate::sys::pal::time::__timespec64;
use crate::sys::pal::weak::weak;

// This got added in glibc 2.31, along with a 64-bit `clock_gettime`
// function.
weak! {
fn __clock_nanosleep_time64(
clock_id: libc::clockid_t,
flags: libc::c_int,
req: *const __timespec64,
rem: *mut __timespec64,
) -> libc::c_int;
}

if let Some(clock_nanosleep) = __clock_nanosleep_time64.get() {
let ts = deadline.into_inner().into_timespec().to_timespec64();
loop {
let r = unsafe {
clock_nanosleep(
crate::sys::time::Instant::CLOCK_ID,
libc::TIMER_ABSTIME,
&ts,
core::ptr::null_mut(),
)
};

match r {
0 => return,
libc::EINTR => continue,
// If the underlying kernel doesn't support the 64-bit
// syscall, `__clock_nanosleep_time64` will fail. The
// error code nowadays is EOVERFLOW, but it used to be
// ENOSYS – so just don't rely on any particular value.
// The parameters are all valid, so the only reasons
// why the call might fail are EINTR and the call not
// being supported. Fall through to the clamping version
// in that case.
_ => break,
}
}
}
}

let Some(ts) = deadline.into_inner().into_timespec().to_timespec() else {
// The deadline is further in the future then can be passed to
// clock_nanosleep. We have to use Self::sleep instead. This might
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/src/shims/extern_static.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl<'tcx> MiriMachine<'tcx> {
Os::Linux => {
Self::null_ptr_extern_statics(
ecx,
&["__cxa_thread_atexit_impl", "__clock_gettime64"],
&["__cxa_thread_atexit_impl", "__clock_gettime64", "__clock_nanosleep_time64"],
)?;
Self::weak_symbol_extern_statics(ecx, &["getrandom", "gettid", "statx"])?;
}
Expand Down
Loading