unit,job: when we suppress a D-Bus signal because nobody is listening, don't delay...

[elogind.git] / job.c

diff --git a/job.c b/job.c
index c1b00714ec995de43c366abb872dc53654ed9a5e..887de92cadf88eb70033ff665e6be829b421b513 100644 (file)
--- a/job.c
+++ b/job.c
@@ -58,8 +58,10 @@ void job_free(Job *j) {
         if (j->installed) {
                 bus_job_send_removed_signal(j);
 
-                if (j->unit->meta.job == j)
+                if (j->unit->meta.job == j) {
                         j->unit->meta.job = NULL;
+                        unit_add_to_gc_queue(j->unit);
+                }
 
                 hashmap_remove(j->manager->jobs, UINT32_TO_PTR(j->id));
                 j->installed = false;
@@ -148,8 +150,8 @@ void job_dump(Job *j, FILE*f, const char *prefix) {
         assert(f);
 
         fprintf(f,
-                "%s→ Job %u:\n"
-                "%s\tAction: %s → %s\n"
+                "%s-> Job %u:\n"
+                "%s\tAction: %s -> %s\n"
                 "%s\tState: %s\n"
                 "%s\tForced: %s\n",
                 prefix, j->id,
@@ -462,7 +464,7 @@ int job_finish_and_invalidate(Job *j, bool success) {
         /* Patch restart jobs so that they become normal start jobs */
         if (success && (j->type == JOB_RESTART || j->type == JOB_TRY_RESTART)) {
 
-                log_debug("Converting job %s/%s → %s/%s",
+                log_debug("Converting job %s/%s -> %s/%s",
                           j->unit->meta.id, job_type_to_string(j->type),
                           j->unit->meta.id, job_type_to_string(JOB_START));
 
@@ -539,6 +541,11 @@ void job_add_to_dbus_queue(Job *j) {
         if (j->in_dbus_queue)
                 return;
 
+        if (set_isempty(j->manager->subscribed)) {
+                j->sent_dbus_new_signal = true;
+                return;
+        }
+
         LIST_PREPEND(Job, dbus_queue, j->manager->dbus_job_queue, j);
         j->in_dbus_queue = true;
 }
@@ -575,7 +582,8 @@ DEFINE_STRING_TABLE_LOOKUP(job_type, JobType);
 
 static const char* const job_mode_table[_JOB_MODE_MAX] = {
         [JOB_FAIL] = "fail",
-        [JOB_REPLACE] = "replace"
+        [JOB_REPLACE] = "replace",
+        [JOB_ISOLATE] = "isolate"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode);