chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: sysv priorities in link names should take precedence, since they are possibl...
[elogind.git]
/
job.h
diff --git
a/job.h
b/job.h
index 28ed07dbe4ce363dd7c823b56f421d4a86e35e66..1ae97b75d02a0d7087e33bc32dd369e21252d6e4 100644
(file)
--- a/
job.h
+++ b/
job.h
@@
-65,6
+65,7
@@
enum JobState {
enum JobMode {
JOB_FAIL,
JOB_REPLACE,
enum JobMode {
JOB_FAIL,
JOB_REPLACE,
+ JOB_ISOLATE,
_JOB_MODE_MAX,
_JOB_MODE_INVALID = -1
};
_JOB_MODE_MAX,
_JOB_MODE_INVALID = -1
};
@@
-75,28
+76,19
@@
struct JobDependency {
Job *subject;
Job *object;
Job *subject;
Job *object;
- bool matters;
-
LIST_FIELDS(JobDependency, subject);
LIST_FIELDS(JobDependency, object);
LIST_FIELDS(JobDependency, subject);
LIST_FIELDS(JobDependency, object);
+
+ bool matters;
};
struct Job {
Manager *manager;
};
struct Job {
Manager *manager;
- uint32_t id;
-
Unit *unit;
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, transaction);
LIST_FIELDS(Job, run_queue);
+ LIST_FIELDS(Job, dbus_queue);
LIST_HEAD(JobDependency, subject_list);
LIST_HEAD(JobDependency, object_list);
LIST_HEAD(JobDependency, subject_list);
LIST_HEAD(JobDependency, object_list);
@@
-105,6
+97,17
@@
struct Job {
Job* marker;
unsigned generation;
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);
};
Job* job_new(Manager *m, JobType type, Unit *unit);
@@
-123,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_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);
int job_run_and_invalidate(Job *j);
int job_finish_and_invalidate(Job *j, bool success);