github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-20 02:52:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't fire exit events for jobs with pgid == -2

Browse Source 
This fixes a hang common on WSL, when fish has PID 2.

Fixes #4582.
This commit is contained in:
Fabian Homborg 2018-02-02 23:31:53 +01:00
parent 3be0261294
commit 5262719995
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/proc.cpp
View File

@ -617,7 +617,13 @@ static int process_clean_after_marking(bool allow_interactive) {
format_job_info(j, JOB_ENDED);
found = 1;
}
proc_fire_event(L"JOB_EXIT", EVENT_EXIT, -j->pgid, 0);
// Don't fire the exit-event for jobs with pgid -2.
// That's our "sentinel" pgid, for jobs that don't (yet) have a pgid,
// or jobs that consist entirely of builtins (and hence don't have a process).
// This causes issues if fish is PID 2, which is quite common on WSL. See #4582.
if (j->pgid != -2) {
proc_fire_event(L"JOB_EXIT", EVENT_EXIT, -j->pgid, 0);
}
proc_fire_event(L"JOB_EXIT", EVENT_JOB_ID, j->job_id, 0);
job_remove(j);