nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #90401 - mkroening:hermit-condvar, r=joshtriplett

Browse Source 
hermit: Implement Condvar::wait_timeout

This implements `Condvar::wait_timeout` for the `hermit` target.

See
* https://github.com/hermitcore/rust/pull/2
* https://github.com/hermitcore/rust/pull/5

CC: `@stlankes`
This commit is contained in:
Matthias Krüger 2021-10-31 00:33:25 +02:00 committed by GitHub
commit 0da75bcc9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/std/src/sys/hermit/condvar.rs
View File

@ -55,8 +55,20 @@ impl Condvar {
mutex.lock(); mutex.lock();
} }
pub unsafe fn wait_timeout(&self, _mutex: &Mutex, _dur: Duration) -> bool { pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
panic!("wait_timeout not supported on hermit"); self.counter.fetch_add(1, SeqCst);
mutex.unlock();
let millis = dur.as_millis().min(u32::MAX as u128) as u32;
let res = if millis > 0 {
abi::sem_timedwait(self.sem1, millis)
} else {
abi::sem_trywait(self.sem1)
};
abi::sem_post(self.sem2);
mutex.lock();
res == 0
} }
pub unsafe fn destroy(&self) { pub unsafe fn destroy(&self) {