foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 09:31:22 -05:00
Code Issues Packages 1 Wiki Activity

refactor(runtime/signal): revert SIGINT and SIGBREAK Deno.kill Windows changes (#14865)

Browse source
This commit is contained in:
David Sherret 2022-06-14 15:31:50 -04:00 • committed by GitHub
parent d4f609d8e7
commit 4cff05b275
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli/tests/unit/signal_test.ts
View file

@ -204,10 +204,10 @@ Deno.test(
function windowsThrowsOnNegativeProcessIdTest() {
assertThrows(
() => {
Deno.kill(-1, "SIGINT");
Deno.kill(-1, "SIGKILL");
},
TypeError,
"Invalid process id (pid) -1 for signal SIGINT.",
"Invalid pid",
);
},
);
@ -225,7 +225,7 @@ Deno.test(
Deno.kill(0, signal);
},
TypeError,
`Cannot use ${signal} on PID 0`,
`Invalid pid`,
);
signal = "SIGTERM";
@ -234,7 +234,7 @@ Deno.test(
Deno.kill(0, signal);
},
TypeError,
`Cannot use ${signal} on PID 0`,
`Invalid pid`,
);
},
);

49
runtime/ops/process.rs
View file

@ -301,6 +301,7 @@ pub fn kill(pid: i32, signal: &str) -> Result<(), AnyError> {
use deno_core::error::type_error;
use std::io::Error;
use std::io::ErrorKind::NotFound;
use winapi::shared::minwindef::DWORD;
use winapi::shared::minwindef::FALSE;
use winapi::shared::minwindef::TRUE;
use winapi::shared::winerror::ERROR_INVALID_PARAMETER;
@ -308,45 +309,14 @@ pub fn kill(pid: i32, signal: &str) -> Result<(), AnyError> {
use winapi::um::handleapi::CloseHandle;
use winapi::um::processthreadsapi::OpenProcess;
use winapi::um::processthreadsapi::TerminateProcess;
use winapi::um::wincon::GenerateConsoleCtrlEvent;
use winapi::um::wincon::{CTRL_BREAK_EVENT, CTRL_CLOSE_EVENT, CTRL_C_EVENT};
use winapi::um::winnt::PROCESS_TERMINATE;
if pid < 0 {
return Err(type_error(format!(
"Invalid process id (pid) {} for signal {}.",
pid, signal
)));
}
if matches!(signal, "SIGINT" | "SIGBREAK" | "SIGHUP") {
let is_generated = unsafe {
GenerateConsoleCtrlEvent(
match signal {
"SIGINT" => CTRL_C_EVENT,
"SIGBREAK" => CTRL_BREAK_EVENT,
// Need tokio::windows::signal::CtrlClose or equivalent
// in signal.rs to get this working
"SIGHUP" => CTRL_CLOSE_EVENT,
_ => unreachable!(),
},
pid as u32,
)
};
match is_generated {
FALSE => {
Err(Error::from_raw_os_error(unsafe { GetLastError() } as i32).into())
}
TRUE => Ok(()),
_ => unreachable!(),
}
} else if matches!(signal, "SIGKILL" | "SIGTERM") {
// PID 0 = System Idle Process and can't be opened.
if pid == 0 {
return Err(type_error(format!("Cannot use {} on PID 0", signal)));
}
let handle = unsafe { OpenProcess(PROCESS_TERMINATE, FALSE, pid as u32) };
if !matches!(signal, "SIGKILL" | "SIGTERM") {
Err(type_error(format!("Invalid signal: {}", signal)))
} else if pid <= 0 {
Err(type_error("Invalid pid"))
} else {
let handle = unsafe { OpenProcess(PROCESS_TERMINATE, FALSE, pid as DWORD) };
if handle.is_null() {
let err = match unsafe { GetLastError() } {
@ -363,11 +333,6 @@ pub fn kill(pid: i32, signal: &str) -> Result<(), AnyError> {
_ => unreachable!(),
}
}
} else {
Err(type_error(format!(
"Signal {} is unsupported on Windows.",
signal
)))
}
}