Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comment out signals #92

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Comment out signals #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions src/safeposix/syscalls/sys_calls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,19 @@ impl Cage {
let newsigset = interface::RustHashMap::new();
if !interface::RUSTPOSIX_TESTSUITE.load(interface::RustAtomicOrdering::Relaxed) {
// we don't add these for the test suite
let mainsigsetatomic = self
.sigset
.get(
&self
.main_threadid
.load(interface::RustAtomicOrdering::Relaxed),
)
.unwrap();
let mainsigset = interface::RustAtomicU64::new(
mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
);
newsigset.insert(0, mainsigset);
// BUG: Signals are commented out until we add them to lind-wasm
// let mainsigsetatomic = self
// .sigset
// .get(
// &self
// .main_threadid
// .load(interface::RustAtomicOrdering::Relaxed),
// )
// .unwrap();
// let mainsigset = interface::RustAtomicU64::new(
// mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
// );
// newsigset.insert(0, mainsigset);
}

/*
Expand Down Expand Up @@ -206,18 +207,19 @@ impl Cage {
let newsigset = interface::RustHashMap::new();
if !interface::RUSTPOSIX_TESTSUITE.load(interface::RustAtomicOrdering::Relaxed) {
// we don't add these for the test suite
let mainsigsetatomic = self
.sigset
.get(
&self
.main_threadid
.load(interface::RustAtomicOrdering::Relaxed),
)
.unwrap();
let mainsigset = interface::RustAtomicU64::new(
mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
);
newsigset.insert(0, mainsigset);
// BUG: Signals are commented out until we add them to lind-wasm
// let mainsigsetatomic = self
// .sigset
// .get(
// &self
// .main_threadid
// .load(interface::RustAtomicOrdering::Relaxed),
// )
// .unwrap();
// let mainsigset = interface::RustAtomicU64::new(
// mainsigsetatomic.load(interface::RustAtomicOrdering::Relaxed),
// );
// newsigset.insert(0, mainsigset);
}

let newcage = Cage {
Expand Down Expand Up @@ -259,9 +261,10 @@ impl Cage {
// Trigger SIGCHLD
if !interface::RUSTPOSIX_TESTSUITE.load(interface::RustAtomicOrdering::Relaxed) {
// dont trigger SIGCHLD for test suite
if self.cageid != self.parent {
interface::lind_kill_from_id(self.parent, libc::SIGCHLD);
}
// BUG: Signals are commented out until we add them to lind-wasm
// if self.cageid != self.parent {
// interface::lind_kill_from_id(self.parent, libc::SIGCHLD);
// }
}

//fdtable will be dropped at end of dispatcher scope because of Arc
Expand Down
Loading