Skip to content

Add const-only signals for wasm32 #5282

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

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Add const-only signals for wasm32 #5282

Show file tree
Hide file tree
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
7 changes: 1 addition & 6 deletions vm/src/stdlib/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ pub mod posix;
pub(crate) mod msvcrt;
#[cfg(all(unix, not(any(target_os = "android", target_os = "redox"))))]
mod pwd;
#[cfg(not(target_arch = "wasm32"))]
pub(crate) mod signal;
pub mod sys;
#[cfg(windows)]
Expand Down Expand Up @@ -82,6 +81,7 @@ pub fn get_module_inits() -> StdlibMap {
"_io" => io::make_module,
"marshal" => marshal::make_module,
"_operator" => operator::make_module,
"_signal" => signal::make_module,
"_sre" => sre::make_module,
"_string" => string::make_module,
"time" => time::make_module,
Expand All @@ -105,11 +105,6 @@ pub fn get_module_inits() -> StdlibMap {
"posix" => posix::make_module,
// "fcntl" => fcntl::make_module,
}
// disable some modules on WASM
#[cfg(not(target_arch = "wasm32"))]
{
"_signal" => signal::make_module,
}
#[cfg(feature = "threading")]
{
"_thread" => thread::make_module,
Expand Down
51 changes: 37 additions & 14 deletions vm/src/stdlib/signal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::{builtins::PyModule, PyRef, VirtualMachine};
pub(crate) fn make_module(vm: &VirtualMachine) -> PyRef<PyModule> {
let module = _signal::make_module(vm);

#[cfg(any(unix, windows))]
_signal::init_signal_handlers(&module, vm);

module
Expand All @@ -11,12 +12,17 @@ pub(crate) fn make_module(vm: &VirtualMachine) -> PyRef<PyModule> {
#[pymodule]
pub(crate) mod _signal {
use crate::{
builtins::PyModule,
convert::{IntoPyException, TryFromBorrowedObject},
signal, Py, PyObjectRef, PyResult, VirtualMachine,
};
use std::sync::atomic::{self, Ordering};

#[cfg(any(unix, windows))]
use libc::sighandler_t;
#[allow(non_camel_case_types)]
#[cfg(not(any(unix, windows)))]
type sighandler_t = usize;

cfg_if::cfg_if! {
if #[cfg(windows)] {
type WakeupFd = libc::SOCKET;
Expand All @@ -33,23 +39,23 @@ pub(crate) mod _signal {
}

#[cfg(unix)]
pub use nix::unistd::alarm as sig_alarm;

#[cfg(not(windows))]
pub use libc::SIG_ERR;
#[cfg(unix)]
pub use nix::unistd::alarm as sig_alarm;

#[cfg(not(windows))]
#[cfg(unix)]
#[pyattr]
pub use libc::{SIG_DFL, SIG_IGN};

#[cfg(windows)]
#[cfg(not(unix))]
#[pyattr]
pub const SIG_DFL: libc::sighandler_t = 0;
#[cfg(windows)]
pub const SIG_DFL: sighandler_t = 0;
#[cfg(not(unix))]
#[pyattr]
pub const SIG_IGN: libc::sighandler_t = 1;
#[cfg(windows)]
pub const SIG_ERR: libc::sighandler_t = !0;
pub const SIG_IGN: sighandler_t = 1;
#[cfg(not(unix))]
#[allow(dead_code)]
pub const SIG_ERR: sighandler_t = -1 as _;

#[cfg(all(unix, not(target_os = "redox")))]
extern "C" {
Expand All @@ -59,6 +65,7 @@ pub(crate) mod _signal {
#[pyattr]
use crate::signal::NSIG;

#[cfg(any(unix, windows))]
#[pyattr]
pub use libc::{SIGABRT, SIGFPE, SIGILL, SIGINT, SIGSEGV, SIGTERM};

Expand All @@ -80,7 +87,11 @@ pub(crate) mod _signal {
#[pyattr]
use libc::{SIGPWR, SIGSTKFLT};

pub(super) fn init_signal_handlers(module: &Py<PyModule>, vm: &VirtualMachine) {
#[cfg(any(unix, windows))]
pub(super) fn init_signal_handlers(
module: &Py<crate::builtins::PyModule>,
vm: &VirtualMachine,
) {
let sig_dfl = vm.new_pyobj(SIG_DFL as u8);
let sig_ign = vm.new_pyobj(SIG_IGN as u8);

Expand All @@ -107,6 +118,17 @@ pub(crate) mod _signal {
}
}

#[cfg(not(any(unix, windows)))]
#[pyfunction]
pub fn signal(
_signalnum: i32,
_handler: PyObjectRef,
vm: &VirtualMachine,
) -> PyResult<Option<PyObjectRef>> {
Err(vm.new_not_implemented_error("signal is not implemented on this platform".to_owned()))
}

#[cfg(any(unix, windows))]
#[pyfunction]
pub fn signal(
signalnum: i32,
Expand All @@ -123,7 +145,7 @@ pub(crate) mod _signal {
match usize::try_from_borrowed_object(vm, &handler).ok() {
Some(SIG_DFL) => SIG_DFL,
Some(SIG_IGN) => SIG_IGN,
None if handler.is_callable() => run_signal as libc::sighandler_t,
None if handler.is_callable() => run_signal as sighandler_t,
_ => return Err(vm.new_type_error(
"signal handler must be signal.SIG_IGN, signal.SIG_DFL, or a callable object"
.to_owned(),
Expand Down Expand Up @@ -226,7 +248,7 @@ pub(crate) mod _signal {
} else {
false
};
#[cfg(not(windows))]
#[cfg(unix)]
if fd != INVALID_WAKEUP {
use nix::fcntl;
let oflags = fcntl::fcntl(fd, fcntl::F_GETFL).map_err(|e| e.into_pyexception(vm))?;
Expand Down Expand Up @@ -256,6 +278,7 @@ pub(crate) mod _signal {
}
}

#[cfg(any(unix, windows))]
pub extern "C" fn run_signal(signum: i32) {
signal::TRIGGERS[signum as usize].store(true, Ordering::Relaxed);
signal::set_triggered();
Expand Down