Skip to content

Use common Timestamp impl in Hermit (attempt 2) #154234

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
Mar 28, 2026
+17 −125
Merged

Use common Timestamp impl in Hermit (attempt 2) #154234

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
6 changes: 3 additions & 3 deletions library/std/src/sys/fs/hermit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,15 @@ pub struct DirBuilder {

impl FileAttr {
pub fn modified(&self) -> io::Result<SystemTime> {
Ok(SystemTime::new(self.stat_val.st_mtim.tv_sec, self.stat_val.st_mtim.tv_nsec))
SystemTime::new(self.stat_val.st_mtim.tv_sec, self.stat_val.st_mtim.tv_nsec.into())
}

pub fn accessed(&self) -> io::Result<SystemTime> {
Ok(SystemTime::new(self.stat_val.st_atim.tv_sec, self.stat_val.st_atim.tv_nsec))
SystemTime::new(self.stat_val.st_atim.tv_sec, self.stat_val.st_atim.tv_nsec.into())
}

pub fn created(&self) -> io::Result<SystemTime> {
Ok(SystemTime::new(self.stat_val.st_ctim.tv_sec, self.stat_val.st_ctim.tv_nsec))
SystemTime::new(self.stat_val.st_ctim.tv_sec, self.stat_val.st_ctim.tv_nsec.into())
}

pub fn size(&self) -> u64 {
Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/pal/hermit/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use crate::os::raw::c_char;
use crate::sys::env;

pub mod futex;
#[path = "../unix/time.rs"]
pub mod time;

pub fn unsupported<T>() -> io::Result<T> {
Expand Down
110 changes: 0 additions & 110 deletions library/std/src/sys/pal/hermit/time.rs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion library/std/src/sys/pal/unix/time.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub(in crate::sys) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec {
tv_nsec: (u64::MAX % NSEC_PER_SEC) as i64,
};

#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
pub(crate) struct Timespec {
pub tv_sec: i64,
pub tv_nsec: Nanoseconds,
Expand Down Expand Up @@ -66,6 +66,7 @@ impl Timespec {
}
}

#[allow(dead_code)]
pub fn now(clock: libc::clockid_t) -> Timespec {
use crate::mem::MaybeUninit;
use crate::sys::cvt;
Expand Down
22 changes: 11 additions & 11 deletions library/std/src/sys/time/hermit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
use hermit_abi::{self, CLOCK_MONOTONIC, CLOCK_REALTIME};

use crate::hash::Hash;
use crate::io;
use crate::sys::pal::time::Timespec;
use crate::time::Duration;

fn clock_gettime(clock: hermit_abi::clockid_t) -> Timespec {
let mut t = hermit_abi::timespec { tv_sec: 0, tv_nsec: 0 };
let _ = unsafe { hermit_abi::clock_gettime(clock, &raw mut t) };
Copy link
Copy Markdown
Member

@Mark-Simulacrum Mark-Simulacrum Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we ignoring the error here? In unix/time.rs we panic if there's an error, probably should match that here?

                cvt(unsafe { clock_gettime64(clock, t.as_mut_ptr()) }).unwrap();

Copy link
Copy Markdown
Contributor Author

@stepancheg stepancheg Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Mark-Simulacrum

It was ignored before, so I did not include it in this PR which moves files and does not change semantics.

rust/library/std/src/sys/time/hermit.rs

Line 13 in fda6d37

let _ = unsafe { hermit_abi::clock_gettime(CLOCK_MONOTONIC, &raw mut time.t) };

Should I include unwrap in this PR?

Copy link
Copy Markdown
Member

@Mark-Simulacrum Mark-Simulacrum Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge this and if you can file a followup (maybe check for other similar discrepancies too) that would be good. Thanks!

Copy link
Copy Markdown
Contributor Author

@stepancheg stepancheg Mar 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing!

Timespec::new(t.tv_sec, t.tv_nsec.into()).unwrap()
}

#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
pub struct Instant(Timespec);

impl Instant {
pub fn now() -> Instant {
let mut time: Timespec = Timespec::zero();
let _ = unsafe { hermit_abi::clock_gettime(CLOCK_MONOTONIC, &raw mut time.t) };

Instant(time)
Instant(clock_gettime(CLOCK_MONOTONIC))
}

pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> {
Expand All @@ -38,15 +41,12 @@ impl SystemTime {

pub const MIN: SystemTime = SystemTime(Timespec::MIN);

pub fn new(tv_sec: i64, tv_nsec: i32) -> SystemTime {
SystemTime(Timespec::new(tv_sec, tv_nsec))
pub fn new(tv_sec: i64, tv_nsec: i64) -> Result<SystemTime, io::Error> {
Ok(SystemTime(Timespec::new(tv_sec, tv_nsec)?))
}

pub fn now() -> SystemTime {
let mut time: Timespec = Timespec::zero();
let _ = unsafe { hermit_abi::clock_gettime(CLOCK_REALTIME, &raw mut time.t) };

SystemTime(time)
SystemTime(clock_gettime(CLOCK_REALTIME))
}

pub fn sub_time(&self, other: &SystemTime) -> Result<Duration, Duration> {
Expand Down
Loading