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

Revert "Improved blocked prcoess comments, clarified job vs command chain"

Browse Source 
This reverts commit dfac81803b.
It was meant for the major branch.
This commit is contained in:
Kurtis Rader 2017-08-13 15:29:33 -07:00
parent 8ebba2066d
commit e0ccb8c48e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/exec.cpp
View File

@ -1064,13 +1064,13 @@ void exec_job(parser_t &parser, job_t *j) {
if (pid == 0) { if (pid == 0) {
// This is the child process. // This is the child process.
p->pid = getpid(); p->pid = getpid();
// the process will be resumed by the shell when the next command in the
// chain is started
setup_child_process(j, p, process_net_io_chain); setup_child_process(j, p, process_net_io_chain);
// Start child processes that are part of a chain in a stopped state // start child processes that are part of a job in a stopped state
// to ensure that they are still running when the next command in the // to ensure that they are still running when the next command in the
// chain is started. // chain is started.
// The process will be resumed when the next command in the chain is started.
// Note that this may span multiple jobs, as jobs can read from each other.
if (pipes_to_next_command) { if (pipes_to_next_command) {
kill(p->pid, SIGSTOP); kill(p->pid, SIGSTOP);
} }
@ -1081,7 +1081,7 @@ void exec_job(parser_t &parser, job_t *j) {
} else { } else {
if (pipes_to_next_command) { if (pipes_to_next_command) {
//it actually blocked itself after forking above, but print in here for output //it actually blocked itself after forking above, but print in here for output
//synchronization & so we can assign command_blocked in the correct address space //synchronization and so we can assign blocked_pid in the correct address space
debug(2, L"Blocking process %d waiting for next command in chain.\n", pid); debug(2, L"Blocking process %d waiting for next command in chain.\n", pid);
command_blocked = true; command_blocked = true;
} }
@ -1115,8 +1115,6 @@ void exec_job(parser_t &parser, job_t *j) {
blocked_pid = -1; blocked_pid = -1;
} }
if (command_blocked) { if (command_blocked) {
//store the newly-blocked command's PID so that it can be SIGCONT'd once the next process
//in the chain is started. That may be in this job or in another job.
blocked_pid = p->pid; blocked_pid = p->pid;
} }