X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjob.h;h=2c65d94879b2270aade1c4bb2ffb4e3808154d69;hp=e42c9647a843bd1bea8202dd5699e9dd99e4826a;hb=d68201e9aa5e9ebd6085b1bb8892c42e9d20be75;hpb=03467c88fba6caeffce2a57a31ee2344e3d3ba31 diff --git a/src/job.h b/src/job.h index e42c9647a..2c65d9487 100644 --- a/src/job.h +++ b/src/job.h @@ -30,6 +30,7 @@ typedef struct JobDependency JobDependency; typedef enum JobType JobType; typedef enum JobState JobState; typedef enum JobMode JobMode; +typedef enum JobResult JobResult; #include "manager.h" #include "unit.h" @@ -66,10 +67,22 @@ enum JobMode { JOB_FAIL, JOB_REPLACE, JOB_ISOLATE, + JOB_IGNORE_DEPENDENCIES, _JOB_MODE_MAX, _JOB_MODE_INVALID = -1 }; +enum JobResult { + JOB_DONE, + JOB_CANCELED, + JOB_TIMEOUT, + JOB_FAILED, + JOB_DEPENDENCY, + JOB_SKIPPED, + _JOB_RESULT_MAX, + _JOB_RESULT_INVALID = -1 +}; + struct JobDependency { /* Encodes that the 'subject' job needs the 'object' job in * some way. This structure is used only while building a transaction. */ @@ -109,13 +122,15 @@ struct Job { DBusConnection *bus; char *bus_client; + JobResult result; + bool installed:1; bool in_run_queue:1; bool matters_to_anchor:1; bool override:1; bool in_dbus_queue:1; bool sent_dbus_new_signal:1; - bool failed:1; + bool ignore_deps:1; }; Job* job_new(Manager *m, JobType type, Unit *unit); @@ -144,7 +159,7 @@ int job_start_timer(Job *j); void job_timer_event(Job *j, uint64_t n_elapsed, Watch *w); int job_run_and_invalidate(Job *j); -int job_finish_and_invalidate(Job *j, bool success); +int job_finish_and_invalidate(Job *j, JobResult result); char *job_dbus_path(Job *j); @@ -157,4 +172,7 @@ JobState job_state_from_string(const char *s); const char* job_mode_to_string(JobMode t); JobMode job_mode_from_string(const char *s); +const char* job_result_to_string(JobResult t); +JobResult job_result_from_string(const char *s); + #endif