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

Remove legacy generic process/job exit events

Browse source
This commit is contained in:
Mahmoud Al-Qudsi 2019-03-28 18:16:51 -05:00
parent 7f5e58ae69
commit f8b2e818ed
2 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/proc.cpp
View file

@ -491,13 +491,6 @@ static bool process_clean_after_marking(bool allow_interactive) {
} }
auto s = p->status; auto s = p->status;
// TODO: The generic process-exit event is useless and unused.
// Remove this in future.
// Update: This event is used for cleaning up the psub temporary files and folders.
// Removing it breaks the psub tests as a result.
proc_fire_event(L"PROCESS_EXIT", event_type_t::exit, p->pid,
(s.signal_exited() ? -1 : s.exit_code()));
// Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader // Ignore signal SIGPIPE.We issue it ourselves to the pipe writer when the pipe reader
// dies. // dies.
if (!s.signal_exited() || s.signal_code() == SIGPIPE) { if (!s.signal_exited() || s.signal_code() == SIGPIPE) {
@ -558,15 +551,6 @@ static bool process_clean_after_marking(bool allow_interactive) {
print_job_status(j.get(), JOB_ENDED); print_job_status(j.get(), JOB_ENDED);
found = true; found = true;
} }
// TODO: The generic process-exit event is useless and unused.
// Remove this in future.
// Don't fire the exit-event for jobs with pgid INVALID_PID.
// 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 != INVALID_PID) {
proc_fire_event(L"JOB_EXIT", event_type_t::exit, -j->pgid, 0);
}
erase_list.push_back(j); erase_list.push_back(j);
} else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) { } else if (j->is_stopped() && !j->get_flag(job_flag_t::NOTIFIED)) {

9
tests/signal.out
View file

@ -1,17 +1,8 @@
ALRM received ALRM received
command false: command false:
PROCESS_EXIT 1
JOB_EXIT 0
command true: command true:
PROCESS_EXIT 0
JOB_EXIT 0
command false | true: command false | true:
PROCESS_EXIT 1
PROCESS_EXIT 0
JOB_EXIT 0
This is the process whose exit event shuld be blocked This is the process whose exit event shuld be blocked
This should come before the event handler This should come before the event handler
PROCESS_EXIT 0
JOB_EXIT 0
Now event handler should have run Now event handler should have run
PROCESS_EXIT 0 PROCESS_EXIT 0