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

Rollup merge of #121498 - flba-eb:make_timespec_capping_public, r=Nilstrieb

Browse Source 
Make QNX/NTO specific "timespec capping" public to crate::sys

It is used in:

- `library/std/src/sys/locks/condvar/pthread.rs`
- `library/std/src/sys/pal/unix/thread_parking/pthread.rs`

This is probably required due to introduction of `sys/pal` and #121177

`@rustbot` label +O-neutrino
CC: `@jonathanpallant` `@japaric` `@gh-tr`
This commit is contained in:
Matthias Krüger 2024-02-23 17:02:05 +01:00 committed by GitHub
commit 2e8177a208
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/std/src/sys/pal/unix/time.rs
View File

@ -10,7 +10,7 @@
// This additional constant is only used when calling // This additional constant is only used when calling
// `libc::pthread_cond_timedwait`. // `libc::pthread_cond_timedwait`.
#[cfg(target_os = "nto")] #[cfg(target_os = "nto")]
pub(super) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec { pub(in crate::sys) const TIMESPEC_MAX_CAPPED: libc::timespec = libc::timespec {
tv_sec: (u64::MAX / NSEC_PER_SEC) as i64, tv_sec: (u64::MAX / NSEC_PER_SEC) as i64,
tv_nsec: (u64::MAX % NSEC_PER_SEC) as i64, tv_nsec: (u64::MAX % NSEC_PER_SEC) as i64,
}; };
@ -204,7 +204,7 @@ pub fn to_timespec(&self) -> Option<libc::timespec> {
// On QNX Neutrino, the maximum timespec for e.g. pthread_cond_timedwait // On QNX Neutrino, the maximum timespec for e.g. pthread_cond_timedwait
// is 2^64 nanoseconds // is 2^64 nanoseconds
#[cfg(target_os = "nto")] #[cfg(target_os = "nto")]
pub(super) fn to_timespec_capped(&self) -> Option<libc::timespec> { pub(in crate::sys) fn to_timespec_capped(&self) -> Option<libc::timespec> {
// Check if timeout in nanoseconds would fit into an u64 // Check if timeout in nanoseconds would fit into an u64
if (self.tv_nsec.0 as u64) if (self.tv_nsec.0 as u64)
.checked_add((self.tv_sec as u64).checked_mul(NSEC_PER_SEC)?) .checked_add((self.tv_sec as u64).checked_mul(NSEC_PER_SEC)?)