X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.h;h=32fbacc4615e1a1094b27a29b63e9c1b2f8e4cc2;hp=b9971818da19199a3fcaf38213fc3702184f27ff;hb=9f611ad82e1eb1a9885f07ac95c244b25a7fbac7;hpb=9e58ff9c5c3bd46a796a20fc6c304cdab489f334

diff --git a/src/manager.h b/src/manager.h
index b9971818d..32fbacc46 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -134,6 +134,7 @@ struct Manager {
         unsigned n_snapshots;
 
         LookupPaths lookup_paths;
+        Set *unit_path_cache;
 
         char **environment;
 
@@ -160,6 +161,7 @@ struct Manager {
                                       * before the reload we queue the
                                       * reply message here, and
                                       * afterwards we send it */
+        DBusConnection *queued_message_connection; /* The connection to send the queued message on */
 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_data_slot;
@@ -170,8 +172,6 @@ struct Manager {
 
         /* Data specific to the cgroup subsystem */
         Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
-        char *cgroup_controller;
-        char *cgroup_mount_point;
         char *cgroup_hierarchy;
 
         usec_t gc_queue_timestamp;
@@ -192,6 +192,8 @@ struct Manager {
 
         bool utmp_reboot_written:1;
 
+        int n_deserializing;
+
         bool show_status;
         bool confirm_spawn;
 };
@@ -209,11 +211,11 @@ Unit *manager_get_unit(Manager *m, const char *name);
 int manager_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_u);
 int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
 
-int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Unit **_ret);
-int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret);
+int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret);
+int manager_load_unit(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret);
 
-int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret);
-int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, Job **_ret);
+int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, DBusError *e, Job **_ret);
+int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, DBusError *e, Job **_ret);
 
 void manager_dump_units(Manager *s, FILE *f, const char *prefix);
 void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);