konevsa/fish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename job_t::notified to job_t::notified_of_stop

Browse Source 
This makes it clear that the flag is only used to report whether a job
is stopped.

Also remove process_t::marked_exit_event as we no longer need it.
This commit is contained in:
ridiculousfish 2021-11-03 15:13:26 -07:00
parent c4fb857dac
commit 7bd9f1bb23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/proc.cpp
View File

@ -440,7 +440,7 @@ static void process_mark_finished_children(parser_t &parser, bool block_ok) {
j->group->set_is_foreground(false);
}
if (status.continued()) {
j->mut_flags().notified = false;
j->mut_flags().notified_of_stop = false;
}
if (status.normal_exited() || status.signal_exited()) {
FLOGF(proc_reap_external, "Reaped external process '%ls' (pid %d, status %d)",
@ -522,9 +522,6 @@ static bool proc_wants_summary(const shared_ptr<job_t> &j, const process_ptr_t &
/// \return whether to emit a fish_job_summary call for a job as a whole. We may also emit this for
/// its individual processes.
static bool job_wants_summary(const shared_ptr<job_t> &j) {
// Did we already print a status message?
if (j->flags().notified) return false;
// Do we just skip notifications?
if (j->skip_notification()) return false;
@ -698,9 +695,9 @@ static bool process_clean_after_marking(parser_t &parser, bool allow_interactive
// Handle stopped jobs. These stay in our list.
for (const auto &j : parser.jobs()) {
if (!j->is_completed() && j->is_stopped() && should_process_job(j) &&
if (j->is_stopped() && !j->flags().notified_of_stop && should_process_job(j) &&
job_wants_summary(j)) {
j->mut_flags().notified = true;
j->mut_flags().notified_of_stop = true;
jobs_to_summarize.push_back(j);
}
}
@ -993,7 +990,7 @@ job_id_t job_t::job_id() const { return group->get_id(); }
void job_t::continue_job(parser_t &parser, bool in_foreground) {
// Put job first in the job list.
parser.job_promote(this);
mut_flags().notified = false;
mut_flags().notified_of_stop = false;
int pgid = -2;
if (auto tmp = get_pgid()) pgid = *tmp;

7
src/proc.h
View File

@ -278,9 +278,6 @@ class process_t : noncopyable_t {
/// True if process has stopped.
bool stopped{false};
/// Set once we have generated (or decided not to generate) a process_exit event.
bool marked_exit_event{false};
/// Reported status value.
proc_status_t status{};
@ -402,8 +399,8 @@ class job_t : noncopyable_t {
/// forked, etc.
bool constructed{false};
/// Whether the user has been told about stopped job.
bool notified{false};
/// Whether the user has been notified that this job is stopped (if it is).
bool notified_of_stop{false};
/// Whether the exit status should be negated. This flag can only be set by the not builtin.
bool negate{false};