X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=job.h;h=e8857edaca4739a42a8e93152eb4bd4099810ef0;hb=15ae422b7471cf6f41ccf450243d8afd8ea0a054;hp=132c46db7e5b4e8b5dbb67f9eb7a49750e95c5d0;hpb=911081dde7ec28b28bfed7e08ab901158c18712d;p=elogind.git
diff --git a/job.h b/job.h
index 132c46db7..e8857edac 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
@@ -56,28 +75,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);
@@ -86,6 +96,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);
@@ -104,8 +125,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);