mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 15:16:17 +02:00
Revert 9693 to prevent CPU hangs (#9893)
# Description This reverts #9693 as it lead to CPU hangs. (btw, did the revert by hand as it couldn't be done automatically. Hopefully I didn't miss anything 😅 ) Fixes #9859 cc @IanManske # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
@ -28,7 +28,6 @@ pub struct ForegroundProcess {
|
||||
pub struct ForegroundChild {
|
||||
inner: Child,
|
||||
pipeline_state: Arc<(AtomicU32, AtomicU32)>,
|
||||
interactive: bool,
|
||||
}
|
||||
|
||||
impl ForegroundProcess {
|
||||
@ -39,14 +38,14 @@ impl ForegroundProcess {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn spawn(&mut self, interactive: bool) -> std::io::Result<ForegroundChild> {
|
||||
pub fn spawn(&mut self) -> std::io::Result<ForegroundChild> {
|
||||
let (ref pgrp, ref pcnt) = *self.pipeline_state;
|
||||
let existing_pgrp = pgrp.load(Ordering::SeqCst);
|
||||
fg_process_setup::prepare_to_foreground(&mut self.inner, existing_pgrp, interactive);
|
||||
fg_process_setup::prepare_to_foreground(&mut self.inner, existing_pgrp);
|
||||
self.inner
|
||||
.spawn()
|
||||
.map(|child| {
|
||||
fg_process_setup::set_foreground(&child, existing_pgrp, interactive);
|
||||
fg_process_setup::set_foreground(&child, existing_pgrp);
|
||||
let _ = pcnt.fetch_add(1, Ordering::SeqCst);
|
||||
if existing_pgrp == 0 {
|
||||
pgrp.store(child.id(), Ordering::SeqCst);
|
||||
@ -54,11 +53,10 @@ impl ForegroundProcess {
|
||||
ForegroundChild {
|
||||
inner: child,
|
||||
pipeline_state: self.pipeline_state.clone(),
|
||||
interactive,
|
||||
}
|
||||
})
|
||||
.map_err(|e| {
|
||||
fg_process_setup::reset_foreground_id(interactive);
|
||||
fg_process_setup::reset_foreground_id();
|
||||
e
|
||||
})
|
||||
}
|
||||
@ -75,7 +73,7 @@ impl Drop for ForegroundChild {
|
||||
let (ref pgrp, ref pcnt) = *self.pipeline_state;
|
||||
if pcnt.fetch_sub(1, Ordering::SeqCst) == 1 {
|
||||
pgrp.store(0, Ordering::SeqCst);
|
||||
fg_process_setup::reset_foreground_id(self.interactive)
|
||||
fg_process_setup::reset_foreground_id()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -103,10 +101,8 @@ mod fg_process_setup {
|
||||
pub(super) fn prepare_to_foreground(
|
||||
external_command: &mut std::process::Command,
|
||||
existing_pgrp: u32,
|
||||
interactive: bool,
|
||||
) {
|
||||
let tty = TtyHandle(unistd::dup(nix::libc::STDIN_FILENO).expect("dup"));
|
||||
let interactive = interactive && std::io::stdin().is_terminal();
|
||||
unsafe {
|
||||
// Safety:
|
||||
// POSIX only allows async-signal-safe functions to be called.
|
||||
@ -128,9 +124,7 @@ mod fg_process_setup {
|
||||
// According to glibc's job control manual:
|
||||
// https://www.gnu.org/software/libc/manual/html_node/Launching-Jobs.html
|
||||
// This has to be done *both* in the parent and here in the child due to race conditions.
|
||||
if interactive {
|
||||
set_foreground_pid(unistd::getpid(), existing_pgrp, tty.0);
|
||||
}
|
||||
set_foreground_pid(unistd::getpid(), existing_pgrp, tty.0);
|
||||
|
||||
// Now let the child process have all the signals by resetting with SIG_SETMASK.
|
||||
let mut sigset = signal::SigSet::empty();
|
||||
@ -143,13 +137,9 @@ mod fg_process_setup {
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn set_foreground(
|
||||
process: &std::process::Child,
|
||||
existing_pgrp: u32,
|
||||
interactive: bool,
|
||||
) {
|
||||
pub(super) fn set_foreground(process: &std::process::Child, existing_pgrp: u32) {
|
||||
// called from the parent shell process - do the stdin tty check here
|
||||
if interactive && std::io::stdin().is_terminal() {
|
||||
if std::io::stdin().is_terminal() {
|
||||
set_foreground_pid(
|
||||
Pid::from_raw(process.id() as i32),
|
||||
existing_pgrp,
|
||||
@ -173,8 +163,8 @@ mod fg_process_setup {
|
||||
}
|
||||
|
||||
/// Reset the foreground process group to the shell
|
||||
pub(super) fn reset_foreground_id(interactive: bool) {
|
||||
if interactive && std::io::stdin().is_terminal() {
|
||||
pub(super) fn reset_foreground_id() {
|
||||
if std::io::stdin().is_terminal() {
|
||||
if let Err(e) = nix::unistd::tcsetpgrp(nix::libc::STDIN_FILENO, unistd::getpgrp()) {
|
||||
println!("ERROR: reset foreground id failed, tcsetpgrp result: {e:?}");
|
||||
}
|
||||
@ -184,9 +174,9 @@ mod fg_process_setup {
|
||||
|
||||
#[cfg(any(not(target_family = "unix"), target_os = "macos"))]
|
||||
mod fg_process_setup {
|
||||
pub(super) fn prepare_to_foreground(_: &mut std::process::Command, _: u32, _: bool) {}
|
||||
pub(super) fn prepare_to_foreground(_: &mut std::process::Command, _: u32) {}
|
||||
|
||||
pub(super) fn set_foreground(_: &std::process::Child, _: u32, _: bool) {}
|
||||
pub(super) fn set_foreground(_: &std::process::Child, _: u32) {}
|
||||
|
||||
pub(super) fn reset_foreground_id(_: bool) {}
|
||||
pub(super) fn reset_foreground_id() {}
|
||||
}
|
||||
|
Reference in New Issue
Block a user