picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: simplify - don't add jobs to dbus queue if we immediately remove them (#7251) 

job_finish_and_invalidate() calls job_free() to destroy jobs (and remove
them from the dbus queue).  So we don't need to add them to the dbus queue
first.

We only want to add jobs to the dbus queue if they're a restart job, which
we're transmogrifying into a start job and putting back into the system.
This commit is contained in:
Alan Jenkins 2017-11-07 16:14:15 +00:00 committed by Lennart Poettering
parent 30046d9c89
commit fec7615c07
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/job.c
View File

@ -868,14 +868,13 @@ int job_finish_and_invalidate(Job *j, JobResult result, bool recursive, bool alr
if (!already)
job_emit_status_message(u, t, result);
job_add_to_dbus_queue(j);
/* Patch restart jobs so that they become normal start jobs */
if (result == JOB_DONE && t == JOB_RESTART) {
job_change_type(j, JOB_START);
job_set_state(j, JOB_WAITING);
job_add_to_dbus_queue(j);
job_add_to_run_queue(j);
job_add_to_gc_queue(j);