Skip to content

musl: 64-bit time support #4463

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

musl: 64-bit time support #4463

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8578eaf
musl: riscv: fix public padding fields in `stat/stat64`
xbjfk Oct 30, 2025
ef2785f
musl: Merge stat64 and stat with `stat`
xbjfk Oct 30, 2025
dd90dd0
musl: add musl_time64 feature
xbjfk May 13, 2025
ef1407d
musl: time64: adjust struct timespec definition
xbjfk May 13, 2025
5da5ebe
musl: time64: set link names for symbols
xbjfk May 13, 2025
963d648
musl: time64: update struct sched_param
xbjfk May 13, 2025
1958f14
musl: time64: change time_t type and structs
xbjfk May 19, 2025
a59a247
musl: time64: update {IPC,MSG,SEM}_STAT definitions
xbjfk May 19, 2025
4feece3
semver: linux powerpc: split GNU-specific symbols into own file.
xbjfk May 24, 2025
5b58dda
linux: time64: skip testing input_event time field
xbjfk May 19, 2025
fb63658
libc-test: add allowlist for positive s! marco configs
xbjfk Jun 26, 2025
9387345
libc-test: delete handle_s_macro_no_attrs
xbjfk Oct 30, 2025
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
59 changes: 47 additions & 12 deletions src/unix/linux_like/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,53 @@ extern_ty! {
pub enum timezone {}
}

cfg_if! {
if #[cfg(not(any(
target_env = "musl",
target_os = "emscripten",
target_env = "ohos"
)))] {
s! {
pub struct sched_param {
pub sched_priority: c_int,
}
}
} else if #[cfg(musl_v1_2_3)] {
s! {
struct __c_anon_sched_param__reserved2 {
__reserved1: crate::time_t,
__reserved2: c_long,
}

pub struct sched_param {
pub sched_priority: c_int,

__reserved1: c_int,
#[cfg(musl32_time64)]
__reserved2: [c_long; 4],
#[cfg(not(musl32_time64))]
__reserved2: [__c_anon_sched_param__reserved2; 2],
__reserved3: c_int,
}
}
} else {
s! {
pub struct sched_param {
pub sched_priority: c_int,

#[deprecated(since = "0.2.173", note = "This field has been removed upstream")]
pub sched_ss_low_priority: c_int,
#[deprecated(since = "0.2.173", note = "This field has been removed upstream")]
pub sched_ss_repl_period: crate::timespec,
#[deprecated(since = "0.2.173", note = "This field has been removed upstream")]
pub sched_ss_init_budget: crate::timespec,
#[deprecated(since = "0.2.173", note = "This field has been removed upstream")]
pub sched_ss_max_repl: c_int,
}
}
}
}
Comment on lines +15 to +60
Copy link
Contributor

@tgross35 tgross35 Oct 30, 2025

Choose a reason for hiding this comment

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

Commit "musl: time64: update struct sched_param": to keep things a bit cleaner, move these musl definitions to the musl module. Then keep the existing struct sched_param in this module but add the deprecated notes and move it to a cfg_if block with the not(any(musl, emscripten, ohos)) bit.

Also could you put this cfg_if! after the main s! macro with the others? Around line 252 looking at this file currently.

Copy link
Contributor

@tgross35 tgross35 Oct 30, 2025

Choose a reason for hiding this comment

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

Actually if you wouldn't mind, the musl-specific bits could move directly to the new source structure a src/new/musl/sched.rs. Add pub(crate) mod sched; to src/new/musl/mod.rs and reexport its contents in the musl block at the bottom of new/mod.rs


s! {
// FIXME(1.0): This should not implement `PartialEq`
#[allow(unpredictable_function_pointer_comparisons)]
Expand Down Expand Up @@ -109,18 +156,6 @@ s! {
pub tm_zone: *const c_char,
}

pub struct sched_param {
pub sched_priority: c_int,
#[cfg(any(target_env = "musl", target_os = "emscripten", target_env = "ohos"))]
pub sched_ss_low_priority: c_int,
#[cfg(any(target_env = "musl", target_os = "emscripten", target_env = "ohos"))]
pub sched_ss_repl_period: crate::timespec,
#[cfg(any(target_env = "musl", target_os = "emscripten", target_env = "ohos"))]
pub sched_ss_init_budget: crate::timespec,
#[cfg(any(target_env = "musl", target_os = "emscripten", target_env = "ohos"))]
pub sched_ss_max_repl: c_int,
}

pub struct Dl_info {
pub dli_fname: *const c_char,
pub dli_fbase: *mut c_void,
Expand Down