Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 12:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add temporary fix for #4778 (background processes on WSL)

Browse source 
As a temporary workaround for the behavior described in
Microsoft/WSL#2997 wherein WSL does not correctly assign the spawned
child its own PID as its PGID, explicitly set the PGID for the newly
spawned process.
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-04 20:18:38 -06:00
parent 912dbd85d8
commit cf8850a33f
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/exec.cpp
View file

@ -1078,10 +1078,28 @@ void exec_job(parser_t &parser, job_t *j) {
break;
}
// these are all things do_fork() takes care of normally:
// these are all things do_fork() takes care of normally (for forked processes):
p->pid = pid;
child_spawned = true;
on_process_created(j, p->pid);
//We explicitly don't call set_child_group() for spawned processes because that
//a) isn't necessary, and b) causes issues like fish-shell/fish-shell#4715
//However, on WSL `posix_spawn` does not correctly set the pgroup for the child process
//See fish-shell/fish-shell#4778, blocked by Microsoft/WSL#2997
if (is_windows_subsystem_for_linux()) {
set_child_group(j, p->pid);
}
else {
//in do_fork, the pid of the child process is used as the group leader if j->pgid == 2
//above, posix_spawn assigned the new group a pgid equal to its own id if j->pgid == 2
//so this is what we do instead of calling set_child_group:
if (j->pgid == -2) {
j->pgid = pid;
}
}
maybe_assign_terminal(j);
} else
#endif