Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-21 16:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using current in semop

Browse Source
This commit is contained in:
Yuke Peng
2024-08-25 15:33:33 +08:00
committed by Tate, Hongliang Tian
parent 090b5a1c1d
commit 4b1f2f720e
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/src/syscall/semop.rs
View File

@ -13,12 +13,12 @@ use crate::{
time::timespec_t,
};
pub fn sys_semop(sem_id: i32, tsops: Vaddr, nsops: usize, _ctx: &Context) -> Result<SyscallReturn> {
pub fn sys_semop(sem_id: i32, tsops: Vaddr, nsops: usize, ctx: &Context) -> Result<SyscallReturn> {
debug!(
"[sys_semop] sem_id = {:?}, tsops_vaddr = {:x?}, nsops = {:?}",
sem_id, tsops, nsops
);
do_sys_semtimedop(sem_id, tsops, nsops, None)
do_sys_semtimedop(sem_id, tsops, nsops, None, ctx)
}
pub fn sys_semtimedop(
@ -41,7 +41,7 @@ pub fn sys_semtimedop(
)?)
};
do_sys_semtimedop(sem_id, tsops, nsops, timeout)
do_sys_semtimedop(sem_id, tsops, nsops, timeout, ctx)
}
fn do_sys_semtimedop(
@ -49,6 +49,7 @@ fn do_sys_semtimedop(
tsops: Vaddr,
nsops: usize,
timeout: Option<Duration>,
ctx: &Context,
) -> Result<SyscallReturn> {
if sem_id <= 0 || nsops == 0 {
return_errno!(Errno::EINVAL);
@ -64,7 +65,7 @@ fn do_sys_semtimedop(
check_sem(sem_id, None, PermissionMode::ALTER)?;
}
sem_op(sem_id, sem_buf, timeout)?;
sem_op(sem_id, sem_buf, timeout, ctx)?;
}
Ok(SyscallReturn::Return(0))