chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: convert PID 1 to libsystemd-bus
[elogind.git]
/
src
/
core
/
job.h
diff --git
a/src/core/job.h
b/src/core/job.h
index 45d04874516dd0aa54d94c54620cd563fc0e1b1f..60bb87d75a83bf9b94b93b49167a8439069a4a5d 100644
(file)
--- a/
src/core/job.h
+++ b/
src/core/job.h
@@
-27,7
+27,6
@@
typedef struct Job Job;
typedef struct JobDependency JobDependency;
typedef struct Job Job;
typedef struct JobDependency JobDependency;
-typedef struct JobBusClient JobBusClient;
typedef enum JobType JobType;
typedef enum JobState JobState;
typedef enum JobMode JobMode;
typedef enum JobType JobType;
typedef enum JobState JobState;
typedef enum JobMode JobMode;
@@
-102,6
+101,7
@@
enum JobResult {
_JOB_RESULT_INVALID = -1
};
_JOB_RESULT_INVALID = -1
};
+#include "sd-event.h"
#include "manager.h"
#include "unit.h"
#include "hashmap.h"
#include "manager.h"
#include "unit.h"
#include "hashmap.h"
@@
-120,13
+120,6
@@
struct JobDependency {
bool conflicts;
};
bool conflicts;
};
-struct JobBusClient {
- LIST_FIELDS(JobBusClient, client);
- /* Note that this bus object is not ref counted here. */
- DBusConnection *bus;
- char name[0];
-};
-
struct Job {
Manager *manager;
Unit *unit;
struct Job {
Manager *manager;
Unit *unit;
@@
-147,10
+140,11
@@
struct Job {
JobType type;
JobState state;
JobType type;
JobState state;
- Watch timer_watch;
+ sd_event_source *timer_event_source;
+ usec_t begin_usec;
/* There can be more than one client, because of job merging. */
/* There can be more than one client, because of job merging. */
-
LIST_HEAD(JobBusClient, bus_client_list)
;
+
Set *subscribed
;
JobResult result;
JobResult result;
@@
-165,8
+159,6
@@
struct Job {
bool irreversible:1;
};
bool irreversible:1;
};
-JobBusClient* job_bus_client_new(DBusConnection *connection, const char *name);
-
Job* job_new(Unit *unit, JobType type);
Job* job_new_raw(Unit *unit);
void job_free(Job *job);
Job* job_new(Unit *unit, JobType type);
Job* job_new_raw(Unit *unit);
void job_free(Job *job);
@@
-183,22
+175,22
@@
void job_dependency_free(JobDependency *l);
int job_merge(Job *j, Job *other);
int job_merge(Job *j, Job *other);
-JobType job_type_lookup_merge(JobType a, JobType b);
+JobType job_type_lookup_merge(JobType a, JobType b)
_pure_
;
-static inline bool job_type_is_mergeable(JobType a, JobType b) {
+
_pure_
static inline bool job_type_is_mergeable(JobType a, JobType b) {
return job_type_lookup_merge(a, b) >= 0;
}
return job_type_lookup_merge(a, b) >= 0;
}
-static inline bool job_type_is_conflicting(JobType a, JobType b) {
+
_pure_
static inline bool job_type_is_conflicting(JobType a, JobType b) {
return !job_type_is_mergeable(a, b);
}
return !job_type_is_mergeable(a, b);
}
-static inline bool job_type_is_superset(JobType a, JobType b) {
+
_pure_
static inline bool job_type_is_superset(JobType a, JobType b) {
/* Checks whether operation a is a "superset" of b in its actions */
return a == job_type_lookup_merge(a, b);
}
/* Checks whether operation a is a "superset" of b in its actions */
return a == job_type_lookup_merge(a, b);
}
-bool job_type_is_redundant(JobType a, UnitActiveState b);
+bool job_type_is_redundant(JobType a, UnitActiveState b)
_pure_
;
/* Collapses a state-dependent job type into a simpler type by observing
* the state of the unit which it is going to be applied to. */
/* Collapses a state-dependent job type into a simpler type by observing
* the state of the unit which it is going to be applied to. */
@@
-206,13
+198,10
@@
void job_type_collapse(JobType *t, Unit *u);
int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u);
int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u);
-bool job_is_runnable(Job *j);
-
void job_add_to_run_queue(Job *j);
void job_add_to_dbus_queue(Job *j);
int job_start_timer(Job *j);
void job_add_to_run_queue(Job *j);
void job_add_to_dbus_queue(Job *j);
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, JobResult result, bool recursive);
int job_run_and_invalidate(Job *j);
int job_finish_and_invalidate(Job *j, JobResult result, bool recursive);
@@
-221,14
+210,14
@@
char *job_dbus_path(Job *j);
void job_shutdown_magic(Job *j);
void job_shutdown_magic(Job *j);
-const char* job_type_to_string(JobType t);
-JobType job_type_from_string(const char *s);
+const char* job_type_to_string(JobType t)
_const_
;
+JobType job_type_from_string(const char *s)
_pure_
;
-const char* job_state_to_string(JobState t);
-JobState job_state_from_string(const char *s);
+const char* job_state_to_string(JobState t)
_const_
;
+JobState job_state_from_string(const char *s)
_pure_
;
-const char* job_mode_to_string(JobMode t);
-JobMode job_mode_from_string(const char *s);
+const char* job_mode_to_string(JobMode t)
_const_
;
+JobMode job_mode_from_string(const char *s)
_pure_
;
-const char* job_result_to_string(JobResult t);
-JobResult job_result_from_string(const char *s);
+const char* job_result_to_string(JobResult t)
_const_
;
+JobResult job_result_from_string(const char *s)
_pure_
;