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

Check only not blocked signals in Pauser

Browse Source
This commit is contained in:
Jianfeng Jiang
2024-05-09 06:37:13 +00:00
committed by Tate, Hongliang Tian
parent 5cde55da3d
commit 6f3a483be6
4 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/aster-nix/src/process/signal/pauser.rs
View File

@ -111,25 +111,28 @@ impl Pauser {
{
self.is_interrupted.store(false, Ordering::Release);
// Register observer on sigqueue
let observer = Arc::downgrade(self) as Weak<dyn Observer<SigEvents>>;
let filter = {
let sig_mask = {
let current_thread = current_thread!();
let poxis_thread = current_thread.as_posix_thread().unwrap();
let mut current_sigmask = *poxis_thread.sig_mask().lock();
current_sigmask.block(self.sig_mask.as_u64());
current_sigmask
};
SigEventsFilter::new(sig_mask)
};
let current_thread = current_thread!();
let posix_thread = current_thread.as_posix_thread().unwrap();
// Block `self.sig_mask`
let (old_mask, filter) = {
let mut current_mask = posix_thread.sig_mask().lock();
let old_mask = *current_mask;
let new_mask = {
current_mask.block(self.sig_mask.as_u64());
*current_mask
};
(old_mask, SigEventsFilter::new(new_mask))
};
// Register observer on sigqueue
let observer = Arc::downgrade(self) as Weak<dyn Observer<SigEvents>>;
posix_thread.register_sigqueue_observer(observer.clone(), filter);
// Some signal may come before we register observer, so we do another check here.
if posix_thread.has_pending_signal() {
if posix_thread.has_pending_signals() {
self.is_interrupted.store(true, Ordering::Release);
}
@ -159,6 +162,7 @@ impl Pauser {
};
posix_thread.unregiser_sigqueue_observer(&observer);
posix_thread.sig_mask().lock().set(old_mask.as_u64());
match res? {
Res::Ok(r) => Ok(r),