Exit the process a short time after entering our ctrl-c handler
This commit is contained in:
parent
213ad10c8f
commit
f1a18da4bb
@ -57,7 +57,7 @@
|
||||
use std::str;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, OnceLock};
|
||||
use std::time::{Instant, SystemTime};
|
||||
use std::time::{Duration, Instant, SystemTime};
|
||||
use time::OffsetDateTime;
|
||||
use tracing::trace;
|
||||
|
||||
@ -1502,14 +1502,13 @@ pub fn init_logger(early_dcx: &EarlyDiagCtxt, cfg: rustc_log::LoggerConfig) {
|
||||
pub fn install_ctrlc_handler() {
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
ctrlc::set_handler(move || {
|
||||
// Indicate that we have been signaled to stop. If we were already signaled, exit
|
||||
// immediately. In our interpreter loop we try to consult this value often, but if for
|
||||
// whatever reason we don't get to that check or the cleanup we do upon finding that
|
||||
// this bool has become true takes a long time, the exit here will promptly exit the
|
||||
// process on the second Ctrl-C.
|
||||
if CTRL_C_RECEIVED.swap(true, Ordering::Relaxed) {
|
||||
std::process::exit(1);
|
||||
}
|
||||
// Indicate that we have been signaled to stop, then give the rest of the compiler a bit of
|
||||
// time to check CTRL_C_RECEIVED and run its own shutdown logic, but after a short amount
|
||||
// of time exit the process. This sleep+exit ensures that even if nobody is checking
|
||||
// CTRL_C_RECEIVED, the compiler exits reasonably promptly.
|
||||
CTRL_C_RECEIVED.store(true, Ordering::Relaxed);
|
||||
std::thread::sleep(Duration::from_millis(100));
|
||||
std::process::exit(1);
|
||||
})
|
||||
.expect("Unable to install ctrlc handler");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user