X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.h;h=5bea2948c7b1b922afc0627595b17a56dc775beb;hp=5527d6e4272e3392d501ba1056e2ffcb1eb25252;hb=013b87c09199926434583e8bb54ac6cb4b835eb5;hpb=ac1135be1f18443981211e38fc66437f147c6aee

diff --git a/job.h b/job.h
index 5527d6e42..5bea2948c 100644
--- a/job.h
+++ b/job.h
@@ -3,6 +3,25 @@
 #ifndef foojobhfoo
 #define foojobhfoo
 
+/***
+  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 <stdbool.h>
 #include <inttypes.h>
 
@@ -13,12 +32,12 @@ typedef enum JobState JobState;
 typedef enum JobMode JobMode;
 
 #include "manager.h"
-#include "name.h"
+#include "unit.h"
 #include "hashmap.h"
 #include "list.h"
 
 enum JobType {
-        JOB_START,                  /* if a name does not support being started, we'll just wait until it becomes active */
+        JOB_START,                  /* if a unit does not support being started, we'll just wait until it becomes active */
         JOB_VERIFY_ACTIVE,
 
         JOB_STOP,
@@ -39,13 +58,15 @@ enum JobType {
 enum JobState {
         JOB_WAITING,
         JOB_RUNNING,
-        _JOB_STATE_MAX
+        _JOB_STATE_MAX,
+        _JOB_STATE_INVALID = -1
 };
 
 enum JobMode {
         JOB_FAIL,
         JOB_REPLACE,
-        _JOB_MODE_MAX
+        _JOB_MODE_MAX,
+        _JOB_MODE_INVALID = -1
 };
 
 struct JobDependency {
@@ -64,7 +85,7 @@ struct Job {
         Manager *manager;
         uint32_t id;
 
-        Name *name;
+        Unit *unit;
 
         JobType type;
         JobState state;
@@ -73,9 +94,12 @@ struct Job {
         bool in_run_queue:1;
         bool matters_to_anchor:1;
         bool forced:1;
+        bool in_dbus_queue:1;
+        bool sent_dbus_new_signal:1;
 
         LIST_FIELDS(Job, transaction);
         LIST_FIELDS(Job, run_queue);
+        LIST_FIELDS(Job, dbus_queue);
 
         LIST_HEAD(JobDependency, subject_list);
         LIST_HEAD(JobDependency, object_list);
@@ -86,7 +110,7 @@ struct Job {
 
 };
 
-Job* job_new(Manager *m, JobType type, Name *name);
+Job* job_new(Manager *m, JobType type, Unit *unit);
 void job_free(Job *job);
 void job_dump(Job *j, FILE*f, const char *prefix);
 
@@ -98,14 +122,29 @@ bool job_is_anchor(Job *j);
 
 int job_merge(Job *j, Job *other);
 
-const char* job_type_to_string(JobType t);
 int job_type_merge(JobType *a, JobType b);
 bool job_type_is_mergeable(JobType a, JobType b);
 bool job_type_is_superset(JobType a, JobType b);
 bool job_type_is_conflicting(JobType a, JobType b);
+bool job_type_is_redundant(JobType a, UnitActiveState b);
+
+bool job_is_runnable(Job *j);
+
+void job_add_to_run_queue(Job *j);
+void job_add_to_dbus_queue(Job *j);
 
-void job_schedule_run(Job *j);
 int job_run_and_invalidate(Job *j);
 int job_finish_and_invalidate(Job *j, bool success);
 
+const char* job_type_to_string(JobType t);
+JobType job_type_from_string(const char *s);
+
+const char* job_state_to_string(JobState t);
+JobState job_state_from_string(const char *s);
+
+const char* job_mode_to_string(JobMode t);
+JobMode job_mode_from_string(const char *s);
+
+char *job_dbus_path(Job *j);
+
 #endif