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

Generate job & process exit events for background jobs

Browse Source
This commit is contained in:
Baspar 2022-07-29 22:11:35 +02:00 committed by ridiculousfish
parent 91c68ec1af
commit ec8fd628bd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/proc.cpp
View File

@ -463,9 +463,9 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
/// Generate process_exit events for any completed processes in \p j. /// Generate process_exit events for any completed processes in \p j.
static void generate_process_exit_events(const job_ref_t &j, std::vector<event_t> *out_evts) { static void generate_process_exit_events(const job_ref_t &j, std::vector<event_t> *out_evts) {
// Historically we have avoided generating events for jobs from event handlers, as an event // Historically we have avoided generating events for foreground jobs from event handlers, as an
// handler may itself produce a new event. // event handler may itself produce a new event.
if (!j->from_event_handler()) { if (!j->from_event_handler() || !j->is_foreground()) {
for (const auto &p : j->processes) { for (const auto &p : j->processes) {
if (p->pid > 0 && p->completed && !p->posted_proc_exit) { if (p->pid > 0 && p->completed && !p->posted_proc_exit) {
p->posted_proc_exit = true; p->posted_proc_exit = true;
@ -477,8 +477,8 @@ static void generate_process_exit_events(const job_ref_t &j, std::vector<event_t
/// Given a job that has completed, generate job_exit and caller_exit events. /// Given a job that has completed, generate job_exit and caller_exit events.
static void generate_job_exit_events(const job_ref_t &j, std::vector<event_t> *out_evts) { static void generate_job_exit_events(const job_ref_t &j, std::vector<event_t> *out_evts) {
// Generate proc and job exit events, except for jobs originating in event handlers. // Generate proc and job exit events, except for foreground jobs originating in event handlers.
if (!j->from_event_handler()) { if (!j->from_event_handler() || !j->is_foreground()) {
// job_exit events. // job_exit events.
if (j->posts_job_exit_events()) { if (j->posts_job_exit_events()) {
if (auto last_pid = j->get_last_pid()) { if (auto last_pid = j->get_last_pid()) {