Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 09:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make *_or_timeout APIs concise

Browse Source
This commit is contained in:
Ruihan Li
2024-11-02 13:28:43 +08:00
committed by Tate, Hongliang Tian
parent 10cc85d588
commit 32b8e05cc3
6 changed files with 163 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/src/process/posix_thread/futex.rs
View File

@ -9,7 +9,7 @@ use ostd::{
};
use spin::Once;
use crate::{prelude::*, process::Pid, time::wait::TimerBuilder};
use crate::{prelude::*, process::Pid, time::wait::ManagedTimeout};
type FutexBitSet = u32;
type FutexBucketRef = Arc<Mutex<FutexBucket>>;
@ -22,14 +22,14 @@ const FUTEX_BITSET_MATCH_ANY: FutexBitSet = 0xFFFF_FFFF;
pub fn futex_wait(
futex_addr: u64,
futex_val: i32,
timer_builder: Option<TimerBuilder>,
timeout: Option<ManagedTimeout>,
ctx: &Context,
pid: Option<Pid>,
) -> Result<()> {
futex_wait_bitset(
futex_addr as _,
futex_val,
timer_builder,
timeout,
FUTEX_BITSET_MATCH_ANY,
ctx,
pid,
@ -40,7 +40,7 @@ pub fn futex_wait(
pub fn futex_wait_bitset(
futex_addr: Vaddr,
futex_val: i32,
timer_builder: Option<TimerBuilder>,
timeout: Option<ManagedTimeout>,
bitset: FutexBitSet,
ctx: &Context,
pid: Option<Pid>,
@ -73,7 +73,7 @@ pub fn futex_wait_bitset(
// drop lock
drop(futex_bucket);
waiter.pause_timer_timeout(timer_builder.as_ref())
waiter.pause_timeout(timeout)
}
/// Does futex wake