chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: move close_all_fds() to util.c
[elogind.git]
/
manager.h
diff --git
a/manager.h
b/manager.h
index 870db97bc0a6bfef7c31d48f50f156efd3e4a2ef..3dbac34e6c1239c9208607d76819957efad99c62 100644
(file)
--- a/
manager.h
+++ b/
manager.h
@@
-82,6
+82,7
@@
struct Watch {
#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
#define SPECIAL_SYSLOG_TARGET "syslog.target" /* Should pull in syslog.socket or syslog.service */
#define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */
#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
#define SPECIAL_SYSLOG_TARGET "syslog.target" /* Should pull in syslog.socket or syslog.service */
#define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */
+#define SPECIAL_SYSINIT_SERVICE "sysinit.service"
/* For SysV compatibility. Usually an alias for a saner target. On
* SysV-free systems this doesn't exist. */
/* For SysV compatibility. Usually an alias for a saner target. On
* SysV-free systems this doesn't exist. */
@@
-124,6
+125,8
@@
struct Manager {
LIST_HEAD(Meta, dbus_unit_queue);
LIST_HEAD(Job, dbus_job_queue);
LIST_HEAD(Meta, dbus_unit_queue);
LIST_HEAD(Job, dbus_job_queue);
+ LIST_HEAD(Meta, cleanup_queue);
+
/* Jobs to be added */
Hashmap *transaction_jobs; /* Unit object => Job object list 1:1 */
JobDependency *transaction_anchor;
/* Jobs to be added */
Hashmap *transaction_jobs; /* Unit object => Job object list 1:1 */
JobDependency *transaction_anchor;
@@
-132,7
+135,8
@@
struct Manager {
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
- bool request_bus_dispatch:1;
+ bool request_api_bus_dispatch:1;
+ bool request_system_bus_dispatch:1;
Hashmap *watch_pids; /* pid => Unit object n:1 */
Hashmap *watch_pids; /* pid => Unit object n:1 */
@@
-153,11
+157,16
@@
struct Manager {
Watch mount_watch;
/* Data specific to the D-Bus subsystem */
Watch mount_watch;
/* Data specific to the D-Bus subsystem */
- DBusConnection *bus;
+ DBusConnection *
api_bus, *system_
bus;
Set *subscribed;
Set *subscribed;
+
+ /* Data specific to the cgroup subsystem */
+ Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
+ char *cgroup_controller;
+ char *cgroup_hierarchy;
};
};
-
Manager* manager_new(void
);
+
int manager_new(Manager **m
);
void manager_free(Manager *m);
int manager_coldplug(Manager *m);
void manager_free(Manager *m);
int manager_coldplug(Manager *m);
@@
-174,7
+183,7
@@
int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
void manager_dump_units(Manager *s, FILE *f, const char *prefix);
void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
void manager_dump_units(Manager *s, FILE *f, const char *prefix);
void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
-void manager_transaction_unlink_job(Manager *m, Job *j);
+void manager_transaction_unlink_job(Manager *m, Job *j
, bool delete_dependencies
);
void manager_clear_jobs(Manager *m);
void manager_clear_jobs(Manager *m);