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

Refactor semaphore to support atomic semop

Browse Source
This commit is contained in:
Yuke Peng
2024-09-02 12:57:49 +08:00
committed by Tate, Hongliang Tian
parent 9a2faff07b
commit 6ce50fab1c
4 changed files with 417 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
kernel/src/syscall/semctl.rs
View File

@ -4,6 +4,7 @@ use super::SyscallReturn;
use crate::{
ipc::{
semaphore::system_v::{
sem::Semaphore,
sem_set::{check_sem, sem_sets, sem_sets_mut, SemaphoreSet},
PermissionMode,
},
@ -54,52 +55,39 @@ pub fn sys_semctl(
}
check_and_ctl(semid, PermissionMode::ALTER, |sem_set| {
let sem = sem_set
.get(semnum as usize)
.ok_or(Error::new(Errno::EINVAL))?;
sem.set_val(val, ctx.process.pid())?;
sem_set.update_ctime();
Ok(())
sem_set.setval(semnum as usize, val, ctx.process.pid())
})?;
}
IpcControlCmd::SEM_GETVAL => {
fn sem_val(sem: &Semaphore) -> i32 {
sem.val()
}
let val: i32 = check_and_ctl(semid, PermissionMode::READ, |sem_set| {
Ok(sem_set
.get(semnum as usize)
.ok_or(Error::new(Errno::EINVAL))?
.val())
sem_set.get(semnum as usize, &sem_val)
})?;
return Ok(SyscallReturn::Return(val as isize));
}
IpcControlCmd::SEM_GETPID => {
fn sem_pid(sem: &Semaphore) -> Pid {
sem.latest_modified_pid()
}
let pid: Pid = check_and_ctl(semid, PermissionMode::READ, |sem_set| {
Ok(sem_set
.get(semnum as usize)
.ok_or(Error::new(Errno::EINVAL))?
.last_modified_pid())
sem_set.get(semnum as usize, &sem_pid)
})?;
return Ok(SyscallReturn::Return(pid as isize));
}
IpcControlCmd::SEM_GETZCNT => {
let cnt: usize = check_and_ctl(semid, PermissionMode::READ, |sem_set| {
Ok(sem_set
.get(semnum as usize)
.ok_or(Error::new(Errno::EINVAL))?
.pending_zero_count())
Ok(sem_set.pending_const_count(semnum as u16))
})?;
return Ok(SyscallReturn::Return(cnt as isize));
}
IpcControlCmd::SEM_GETNCNT => {
let cnt: usize = check_and_ctl(semid, PermissionMode::READ, |sem_set| {
Ok(sem_set
.get(semnum as usize)
.ok_or(Error::new(Errno::EINVAL))?
.pending_alter_count())
Ok(sem_set.pending_alter_count(semnum as u16))
})?;
return Ok(SyscallReturn::Return(cnt as isize));

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

@ -58,10 +58,12 @@ fn do_sys_semtimedop(
}
let user_space = ctx.get_user_space();
let mut semops = Vec::with_capacity(nsops);
for i in 0..nsops {
let sem_buf = user_space.read_val::<SemBuf>(tsops + size_of::<SemBuf>() * i)?;
sem_op(sem_id, &sem_buf, timeout, ctx)?;
semops.push(user_space.read_val::<SemBuf>(tsops + size_of::<SemBuf>() * i)?);
}
sem_op(sem_id, semops, timeout, ctx)?;
Ok(SyscallReturn::Return(0))
}