user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the right wait_timeout implementation

Browse source 
Our condvar doesn't support setting attributes, like
pthread_condattr_setclock, which the current wait_timeout expects to
have configured.

Switch to a different implementation, following espidf.
This commit is contained in:
AzureMarker 2022-02-03 19:29:20 -08:00 • committed by Mark Drobnak
parent be8b88f2b6
commit 06eae30034
No known key found for this signature in database
GPG key ID: 47A133F3BF9D03D3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
library/std/src/sys/unix/locks/pthread_condvar.rs
View file

@ -16,11 +16,7 @@ const TIMESPEC_MAX: libc::timespec =
libc::timespec { tv_sec: <libc::time_t>::MAX, tv_nsec: 1_000_000_000 - 1 };
fn saturating_cast_to_time_t(value: u64) -> libc::time_t {
if value > <libc::time_t>::MAX as u64 {
<libc::time_t>::MAX
} else {
value as libc::time_t
}
if value > <libc::time_t>::MAX as u64 { <libc::time_t>::MAX } else { value as libc::time_t }
}
impl LazyInit for Condvar {
@ -51,6 +47,8 @@ impl Condvar {
// So on that platform, init() should always be called
// Moreover, that platform does not have pthread_condattr_setclock support,
// hence that initialization should be skipped as well
//
// Similar story for the 3DS (horizon).
#[cfg(any(target_os = "espidf", target_os = "horizon"))]
unsafe fn init(&mut self) {
let r = libc::pthread_cond_init(self.inner.get(), crate::ptr::null());
@ -105,7 +103,8 @@ impl Condvar {
target_os = "macos",
target_os = "ios",
target_os = "android",
target_os = "espidf"
target_os = "espidf",
target_os = "horizon"
)))]
pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
use crate::mem;
@ -137,7 +136,8 @@ impl Condvar {
target_os = "macos",
target_os = "ios",
target_os = "android",
target_os = "espidf"
target_os = "espidf",
target_os = "horizon"
))]
pub unsafe fn wait_timeout(&self, mutex: &Mutex, mut dur: Duration) -> bool {
use crate::ptr;