refactor: better Pid type

This commit is contained in:
2021-11-30 18:07:39 +02:00
parent 4ffbb8c115
commit e965c25181
8 changed files with 67 additions and 40 deletions
+1 -1
View File
@@ -127,7 +127,7 @@ extern "C" fn __aa64_exc_sync_handler(exc: &mut ExceptionFrame) {
if num == SystemCall::Fork {
match unsafe { syscall::sys_fork(exc) } {
Ok(pid) => exc.x[0] = pid.value() as usize,
Ok(pid) => exc.x[0] = u32::from(pid) as usize,
Err(err) => {
exc.x[0] = err.to_negative_isize() as usize;
}
+1 -1
View File
@@ -60,7 +60,7 @@ pub trait TtyDevice<const N: usize>: SerialDevice {
},
IoctlCmd::TtySetPgrp => {
let src = arg::struct_ref::<u32>(ptr)?;
self.ring().inner.lock().fg_pgid = Some(unsafe { Pid::from_raw(*src) });
self.ring().inner.lock().fg_pgid = Some(Pid::try_from(*src)?);
Ok(0)
},
_ => Err(Errno::InvalidArgument)
+9 -9
View File
@@ -293,7 +293,7 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
}
SystemCall::WaitPid => {
// TODO special "pid" values
let pid = unsafe { Pid::from_raw(args[0] as u32) };
let pid = Pid::try_from(args[0] as u32)?;
let status = arg::struct_mut::<i32>(args[1])?;
match Process::waitpid(pid) {
@@ -312,7 +312,7 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
_ => todo!(),
}
}
SystemCall::GetPid => Ok(Process::current().id().value() as usize),
SystemCall::GetPid => Ok(u32::from(Process::current().id()) as usize),
SystemCall::GetTid => Ok(Thread::current().id() as usize),
SystemCall::Sleep => {
let rem_buf = arg::option_buf_ref(args[1], size_of::<u64>() * 2)?;
@@ -358,7 +358,7 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
let proc = if pid == 0 {
current
} else {
let pid = unsafe { Pid::from_raw(pid) };
let pid = Pid::try_from(pid)?;
let proc = Process::get(pid).ok_or(Errno::DoesNotExist)?;
if proc.sid() != current.sid() {
return Err(Errno::PermissionDenied);
@@ -366,7 +366,7 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
proc
};
Ok(proc.sid().value() as usize)
Ok(u32::from(proc.sid()) as usize)
}
SystemCall::GetPgid => {
// TODO handle kernel processes here?
@@ -375,13 +375,13 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
let proc = if pid == 0 {
current
} else {
let pid = unsafe { Pid::from_raw(pid) };
let pid = Pid::try_from(pid)?;
Process::get(pid).ok_or(Errno::DoesNotExist)?
};
Ok(proc.pgid().value() as usize)
Ok(u32::from(proc.pgid()) as usize)
}
SystemCall::GetPpid => Ok(Process::current().ppid().unwrap().value() as usize),
SystemCall::GetPpid => Ok(u32::from(Process::current().ppid().unwrap()) as usize),
SystemCall::SetSid => {
let proc = Process::current();
let mut io = proc.io.lock();
@@ -392,7 +392,7 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
let id = proc.id();
proc.set_sid(id);
Ok(id.value() as usize)
Ok(u32::from(id) as usize)
}
SystemCall::SetPgid => {
let pid = args[0] as u32;
@@ -407,7 +407,7 @@ pub fn syscall(num: SystemCall, args: &[usize]) -> Result<usize, Errno> {
todo!();
}
Ok(proc.pgid().value() as usize)
Ok(u32::from(proc.pgid()) as usize)
}
// System