github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Better set_child_group logic for multi-process jobs"

Browse Source 
This reverts commit 99c6f65fee.
It was meant for the major branch.
This commit is contained in:
Kurtis Rader 2017-08-13 15:27:57 -07:00
parent 8a1af4a38d
commit a8a8d33fe0
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/exec.cpp
View File

@ -1138,7 +1138,7 @@ void exec_job(parser_t &parser, job_t *j) {
} }
if (child_spawned) { if (child_spawned) {
//posix_spawn'd processes won't SIGSTOP child_set_group(j, p);
set_child_group(j, p->pid); set_child_group(j, p->pid);
} }
else if (child_forked) { else if (child_forked) {
@ -1147,17 +1147,17 @@ void exec_job(parser_t &parser, job_t *j) {
pid_t pid_status{}; pid_t pid_status{};
if (waitpid(p->pid, &pid_status, WUNTRACED) != -1) { if (waitpid(p->pid, &pid_status, WUNTRACED) != -1) {
//the child is SIGSTOP'd and is guaranteed to have called child_set_group() at this point. //the child is SIGSTOP'd and is guaranteed to have called child_set_group() at this point.
//but we only need to call set_child_group for the first process in the group. set_child_group(j, p->pid); //update our own process group info to match
//If needs_keepalive is set, this has already been called for the keepalive process
if (p->is_first_in_job) {
set_child_group(j, p->pid);
}
//we are not unblocking the child via SIGCONT just yet to give the next process a chance to open //we are not unblocking the child via SIGCONT just yet to give the next process a chance to open
//the pipes and join the process group. We only unblock the last process in the job chain because //the pipes and join the process group. We only unblock the last process in the job chain because
//no one awaits it. //no one awaits it.
if (!pipes_to_next_command)
{
kill(p->pid, SIGCONT);
}
} }
else { else {
debug(1, L"waitpid(%d) call in unblock_pid failed:!\n", p->pid); debug(2, L"waitpid(%d) call in unblock_pid failed:!\n", p->pid);
wperror(L"waitpid"); wperror(L"waitpid");
} }
} }
@ -1184,13 +1184,6 @@ void exec_job(parser_t &parser, job_t *j) {
} }
} }
//unblock the last process in the group
if (blocked_pid != -1)
{
kill(blocked_pid, SIGCONT);
blocked_pid = -1;
}
// Clean up any file descriptors we left open. // Clean up any file descriptors we left open.
if (pipe_current_read >= 0) exec_close(pipe_current_read); if (pipe_current_read >= 0) exec_close(pipe_current_read);
if (pipe_current_write >= 0) exec_close(pipe_current_write); if (pipe_current_write >= 0) exec_close(pipe_current_write);