X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=job.h;h=1ae97b75d02a0d7087e33bc32dd369e21252d6e4;hb=75db651adba49238a02fe031842155d30e7a8219;hp=f1a588cbc9f916f2f9cc97d5c120e445364de6fa;hpb=94f043472a5af62dc9cd5767e89ba33872212d5e;p=elogind.git
diff --git a/job.h b/job.h
index f1a588cbc..1ae97b75d 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 .
+***/
+
#include
#include
@@ -46,7 +65,9 @@ enum JobState {
enum JobMode {
JOB_FAIL,
JOB_REPLACE,
- _JOB_MODE_MAX
+ JOB_ISOLATE,
+ _JOB_MODE_MAX,
+ _JOB_MODE_INVALID = -1
};
struct JobDependency {
@@ -55,28 +76,19 @@ struct JobDependency {
Job *subject;
Job *object;
- bool matters;
-
LIST_FIELDS(JobDependency, subject);
LIST_FIELDS(JobDependency, object);
+
+ bool matters;
};
struct Job {
Manager *manager;
- uint32_t id;
-
Unit *unit;
- JobType type;
- JobState state;
-
- bool installed:1;
- bool in_run_queue:1;
- bool matters_to_anchor:1;
- bool forced: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);
@@ -85,6 +97,17 @@ struct Job {
Job* marker;
unsigned generation;
+ uint32_t id;
+
+ JobType type;
+ JobState state;
+
+ 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;
};
Job* job_new(Manager *m, JobType type, Unit *unit);
@@ -103,8 +126,13 @@ 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);
@@ -114,4 +142,9 @@ 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