X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=job.h;h=bfe20339ece02aa5277159aa9ea12c90e46e5ac3;hb=f62c0e4f30a96bcb0cfeae607d729a6658bfae83;hp=fbfaa16b2ff7a1bb6c1a7b4919abf85f4dac135e;hpb=5cb5a6ffc33667c93e9bc3572534dcaa684046e3;p=elogind.git
diff --git a/job.h b/job.h
index fbfaa16b2..bfe20339e 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
@@ -13,12 +32,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 +58,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 {
@@ -56,36 +77,40 @@ struct JobDependency {
bool matters;
- /* Linked list for the subjects, resp objects */
- JobDependency *subject_prev, *subject_next;
- JobDependency *object_prev, *object_next;
+ LIST_FIELDS(JobDependency, subject);
+ LIST_FIELDS(JobDependency, object);
};
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;
+ bool in_dbus_queue:1;
+ bool sent_dbus_new_signal:1;
- /* These fields are used only while building a transaction */
- Job *transaction_next, *transaction_prev;
+ LIST_FIELDS(Job, transaction);
+ LIST_FIELDS(Job, run_queue);
+ LIST_FIELDS(Job, dbus_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;
unsigned generation;
+
};
-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);
@@ -97,14 +122,28 @@ 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);
bool job_type_is_conflicting(JobType a, JobType b);
-bool job_type_is_applicable(JobType j, NameType n);
+
+bool job_is_runnable(Job *j);
+
+void job_add_to_run_queue(Job *j);
+void job_add_to_dbus_queue(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