Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-28 20:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle child receiving SIGCONT

Browse source 
Fixes #6818
This commit is contained in:
Johannes Altmanninger 2020-03-27 20:21:32 +01:00
parent 1406d63b85
commit 6699a72e0e
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/proc.cpp
View file

@ -248,6 +248,8 @@ static void handle_child_status(process_t *proc, proc_status_t status) {
proc->status = status; proc->status = status;
if (status.stopped()) { if (status.stopped()) {
proc->stopped = true; proc->stopped = true;
} else if (status.continued()) {
proc->stopped = false;
} else { } else {
proc->completed = true; proc->completed = true;
} }
@ -417,13 +419,20 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
} else if (proc->pid > 0) { } else if (proc->pid > 0) {
// Try reaping an external process. // Try reaping an external process.
int status = -1; int status = -1;
auto pid = waitpid(proc->pid, &status, WNOHANG | WUNTRACED); auto pid = waitpid(proc->pid, &status, WNOHANG | WUNTRACED | WCONTINUED);
if (pid > 0) { if (pid > 0) {
assert(pid == proc->pid && "Unexpcted waitpid() return"); assert(pid == proc->pid && "Unexpcted waitpid() return");
handle_child_status(proc.get(), proc_status_t::from_waitpid(status)); handle_child_status(proc.get(), proc_status_t::from_waitpid(status));
FLOGF(proc_reap_external, if (proc->status.normal_exited() || proc->status.signal_exited()) {
"Reaped external process '%ls' (pid %d, status %d)", FLOGF(proc_reap_external,
proc->argv0(), pid, proc->status.status_value()); "Reaped external process '%ls' (pid %d, status %d)",
proc->argv0(), pid, proc->status.status_value());
} else {
assert(proc->status.stopped() || proc->status.continued());
FLOGF(proc_reap_external,
"External process '%ls' (pid %d, %s)",
proc->argv0(), pid, proc->status.stopped() ? "stopped" : "continued");
}
} }
} else { } else {
assert(0 && "Don't know how to reap this process"); assert(0 && "Don't know how to reap this process");

3
src/proc.h
View file

@ -82,6 +82,9 @@ class proc_status_t {
/// \return if we are stopped (as in SIGSTOP). /// \return if we are stopped (as in SIGSTOP).
bool stopped() const { return WIFSTOPPED(status_); } bool stopped() const { return WIFSTOPPED(status_); }
/// \return if we are continued (as in SIGCONT).
bool continued() const { return WIFCONTINUED(status_); }
/// \return if we exited normally (not a signal). /// \return if we exited normally (not a signal).
bool normal_exited() const { return WIFEXITED(status_); } bool normal_exited() const { return WIFEXITED(status_); }

3
tests/wait.expect
View file

@ -58,6 +58,9 @@ expect_prompt
send_line "jobs" send_line "jobs"
expect_prompt "jobs: There are no jobs" {} unmatched { puts stderr $error_msg } expect_prompt "jobs: There are no jobs" {} unmatched { puts stderr $error_msg }
send_line "sleep .3 &; kill -STOP %1; kill -CONT %1; jobs | string match -r running; wait"
expect_prompt "running" {} unmatched { puts stderr "continued job should be running: Fail" }
# return immediately when no jobs # return immediately when no jobs
set error_msg "return immediately when no jobs: Fail" set error_msg "return immediately when no jobs: Fail"