github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 06:56:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved blocked prcoess comments, clarified job vs command chain

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi 2017-07-25 23:04:57 -05:00 committed by Kurtis Rader
parent f653fbfaf4
commit dfac81803b
1 changed files with 6 additions and 4 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) {
// This is the child process.
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);
// start child processes that are part of a job in a stopped state
// Start child processes that are part of a chain in a stopped state
// to ensure that they are still running when the next command in the
// 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) {
kill(p->pid, SIGSTOP);
}
@ -1081,7 +1081,7 @@ void exec_job(parser_t &parser, job_t *j) {
} else {
if (pipes_to_next_command) {
//it actually blocked itself after forking above, but print in here for output
//synchronization and so we can assign blocked_pid in the correct address space
//synchronization & so we can assign command_blocked in the correct address space
debug(2, L"Blocking process %d waiting for next command in chain.\n", pid);
command_blocked = true;
}
@ -1115,6 +1115,8 @@ void exec_job(parser_t &parser, job_t *j) {
blocked_pid = -1;
}
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;
}