vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make thread kill API async.

Browse Source
This commit is contained in:
4lDO2
2025-02-26 23:54:14 +01:00
parent f40ec48b3e
commit 7b06ca16b1
2 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scheme/proc.rs
+23 -23
View File
@@ -990,31 +990,31 @@ impl ContextHandle {
let is_current = context::is_current(&context);
if is_current {
// The following functionality simplifies the cleanup step when detached threads
// terminate.
if let Some(post_unmap) = args.next() {
let base = post_unmap?;
let size = args.next().ok_or(Error::new(EINVAL))??;
if size == 0 {
return Ok(3 * mem::size_of::<usize>());
}
let addrsp = Arc::clone(context.read().addr_space()?);
let res = addrsp.munmap(
PageSpan::validate_nonempty(VirtualAddress::new(base), size)
.ok_or(Error::new(EINVAL))?,
false,
)?;
for r in res {
let _ = r.unmap();
}
}
crate::syscall::exit_this_context();
} else {
crate::syscall::wait_for_exit(Arc::clone(&context));
}
// The following functionality simplifies the cleanup step when detached threads
// terminate.
if let Some(post_unmap) = args.next() {
let base = post_unmap?;
let size = args.next().ok_or(Error::new(EINVAL))??;
if size == 0 {
return Ok(3 * mem::size_of::<usize>());
}
let addrsp = Arc::clone(context.read().addr_space()?);
let res = addrsp.munmap(
PageSpan::validate_nonempty(VirtualAddress::new(base), size)
.ok_or(Error::new(EINVAL))?,
false,
)?;
for r in res {
let _ = r.unmap();
}
Ok(3 * mem::size_of::<usize>())
} else {
let mut ctxt = context.write();
ctxt.status = context::Status::Runnable;
ctxt.being_sigkilled = true;
Ok(mem::size_of::<usize>())
}
}
src/syscall/process.rs
-11
View File
@@ -69,17 +69,6 @@ pub fn exit_this_context() -> ! {
unreachable!();
}
pub fn wait_for_exit(context_lock: Arc<RwSpinlock<Context>>) {
{
let mut ctxt = context_lock.write();
ctxt.status = context::Status::Runnable;
ctxt.being_sigkilled = true;
}
while !matches!(context_lock.read().status, context::Status::Dead) {
context::switch();
}
}
pub fn send_signal(
context: Arc<RwLock<Context>>,
sig: usize,