X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.h;h=132c46db7e5b4e8b5dbb67f9eb7a49750e95c5d0;hp=165feb6895ed81dc78bed3a88c121a5ad72656bb;hb=b548631afcd317fd0f762b324c086d1580f83a50;hpb=034c6ed7da5e44bfdde5a5d0da75f7b7a59953b8

diff --git a/job.h b/job.h
index 165feb689..132c46db7 100644
--- a/job.h
+++ b/job.h
@@ -13,12 +13,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 +39,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,12 +66,12 @@ struct Job {
         Manager *manager;
         uint32_t id;
 
-        Name *name;
+        Unit *unit;
 
         JobType type;
         JobState state;
 
-        bool linked:1;
+        bool installed:1;
         bool in_run_queue:1;
         bool matters_to_anchor:1;
         bool forced:1;
@@ -77,8 +79,8 @@ struct Job {
         LIST_FIELDS(Job, transaction);
         LIST_FIELDS(Job, run_queue);
 
-        JobDependency *subject_list;
-        JobDependency *object_list;
+        LIST_HEAD(JobDependency, subject_list);
+        LIST_HEAD(JobDependency, object_list);
 
         /* Used for graph algs as a "I have been here" marker */
         Job* marker;
@@ -86,7 +88,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,7 +100,6 @@ 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);
@@ -108,4 +109,15 @@ 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