X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.c;h=4784d9c05dbc200ae81853b9b026129690b0af8b;hp=ff30864e438fd2a3e666babcc7057aae94c6a8a2;hb=ab8ea24411df95861c53aeee1dd91e765331f717;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662

diff --git a/job.c b/job.c
index ff30864e4..4784d9c05 100644
--- a/job.c
+++ b/job.c
@@ -1,10 +1,34 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <assert.h>
 #include <errno.h>
 
+#include "set.h"
+#include "unit.h"
 #include "macro.h"
-#include "job.h"
+#include "strv.h"
+#include "load-fragment.h"
+#include "load-dropin.h"
+#include "log.h"
 
 Job* job_new(Manager *m, JobType type, Unit *unit) {
         Job *j;
@@ -108,30 +132,8 @@ void job_dependency_delete(Job *subject, Job *object, bool *matters) {
         job_dependency_free(l);
 }
 
-const char* job_type_to_string(JobType t) {
-
-        static const char* const job_type_table[_JOB_TYPE_MAX] = {
-                [JOB_START] = "start",
-                [JOB_VERIFY_ACTIVE] = "verify-active",
-                [JOB_STOP] = "stop",
-                [JOB_RELOAD] = "reload",
-                [JOB_RELOAD_OR_START] = "reload-or-start",
-                [JOB_RESTART] = "restart",
-                [JOB_TRY_RESTART] = "try-restart",
-        };
-
-        if (t < 0 || t >= _JOB_TYPE_MAX)
-                return "n/a";
-
-        return job_type_table[t];
-}
-
 void job_dump(Job *j, FILE*f, const char *prefix) {
 
-        static const char* const job_state_table[_JOB_STATE_MAX] = {
-                [JOB_WAITING] = "waiting",
-                [JOB_RUNNING] = "running"
-        };
 
         assert(j);
         assert(f);
@@ -143,7 +145,7 @@ void job_dump(Job *j, FILE*f, const char *prefix) {
                 "%s\tForced: %s\n",
                 prefix, j->id,
                 prefix, unit_id(j->unit), job_type_to_string(j->type),
-                prefix, job_state_table[j->state],
+                prefix, job_state_to_string(j->state),
                 prefix, yes_no(j->forced));
 }
 
@@ -405,10 +407,18 @@ int job_finish_and_invalidate(Job *j, bool success) {
         assert(j);
         assert(j->installed);
 
+        log_debug("Job %s/%s finished, success=%s", unit_id(j->unit), job_type_to_string(j->type), yes_no(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",
+                          unit_id(j->unit), job_type_to_string(j->type),
+                          unit_id(j->unit), job_type_to_string(JOB_START));
+
                 j->state = JOB_RUNNING;
                 j->type = JOB_START;
+
                 job_schedule_run(j);
                 return 0;
         }
@@ -471,3 +481,40 @@ void job_schedule_run(Job *j) {
         LIST_PREPEND(Job, run_queue, j->manager->run_queue, j);
         j->in_run_queue = true;
 }
+
+char *job_dbus_path(Job *j) {
+        char *p;
+
+        assert(j);
+
+        if (asprintf(&p, "/org/freedesktop/systemd1/job/%lu", (unsigned long) j->id) < 0)
+                return NULL;
+
+        return p;
+}
+
+static const char* const job_state_table[_JOB_STATE_MAX] = {
+        [JOB_WAITING] = "waiting",
+        [JOB_RUNNING] = "running"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(job_state, JobState);
+
+static const char* const job_type_table[_JOB_TYPE_MAX] = {
+        [JOB_START] = "start",
+        [JOB_VERIFY_ACTIVE] = "verify-active",
+        [JOB_STOP] = "stop",
+        [JOB_RELOAD] = "reload",
+        [JOB_RELOAD_OR_START] = "reload-or-start",
+        [JOB_RESTART] = "restart",
+        [JOB_TRY_RESTART] = "try-restart",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(job_type, JobType);
+
+static const char* const job_mode_table[_JOB_MODE_MAX] = {
+        [JOB_FAIL] = "fail",
+        [JOB_REPLACE] = "replace"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode);