X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=manager.h;h=b92680d96c619e5ccd1ad1fb6cbad6293c30442e;hb=be888ebbe6e3b07e7fbf68abbdc73a6f23b76522;hp=723e42dd1b065a7cb0c303448e0ff19311d54ec8;hpb=f94ea366d38fed424200b748cb042ca44f8c8d50;p=elogind.git
diff --git a/manager.h b/manager.h
index 723e42dd1..b92680d96 100644
--- a/manager.h
+++ b/manager.h
@@ -3,10 +3,31 @@
#ifndef foomanagerhfoo
#define foomanagerhfoo
+/***
+ 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
#include
+#include
+
typedef struct Manager Manager;
typedef enum WatchType WatchType;
typedef struct Watch Watch;
@@ -17,13 +38,20 @@ enum WatchType {
WATCH_FD,
WATCH_TIMER,
WATCH_MOUNT,
- WATCH_UDEV
+ WATCH_UDEV,
+ WATCH_DBUS_WATCH,
+ WATCH_DBUS_TIMEOUT
};
struct Watch {
int fd;
WatchType type;
- union Unit *unit;
+ bool fd_is_dupped;
+ union {
+ union Unit *unit;
+ DBusWatch *bus_watch;
+ DBusTimeout *bus_timeout;
+ } data;
};
#include "unit.h"
@@ -31,6 +59,7 @@ struct Watch {
#include "hashmap.h"
#include "list.h"
#include "set.h"
+#include "dbus.h"
#define SPECIAL_DEFAULT_TARGET "default.target"
#define SPECIAL_SYSLOG_SERVICE "syslog.service"
@@ -60,12 +89,24 @@ struct Manager {
/* Jobs that need to be run */
LIST_HEAD(Job, run_queue); /* more a stack than a queue, too */
+ /* Units and jobs that have not yet been announced via
+ * D-Bus. When something about a job changes it is added here
+ * if it is not in there yet. This allows easy coalescing of
+ * D-Bus change signals. */
+ LIST_HEAD(Meta, dbus_unit_queue);
+ LIST_HEAD(Job, dbus_job_queue);
+
/* Jobs to be added */
Hashmap *transaction_jobs; /* Unit object => Job object list 1:1 */
JobDependency *transaction_anchor;
bool dispatching_load_queue:1;
bool dispatching_run_queue:1;
+ bool dispatching_dbus_queue:1;
+
+ bool is_init:1;
+
+ bool request_bus_dispatch:1;
Hashmap *watch_pids; /* pid => Unit object n:1 */
@@ -81,6 +122,10 @@ struct Manager {
/* Data specific to the mount subsystem */
FILE *proc_self_mountinfo;
Watch mount_watch;
+
+ /* Data specific to the D-Bus subsystem */
+ DBusConnection *bus;
+ Set *subscribed;
};
Manager* manager_new(void);
@@ -91,6 +136,9 @@ int manager_coldplug(Manager *m);
Job *manager_get_job(Manager *m, uint32_t id);
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(Manager *m, const char *path_or_name, Unit **_ret);
int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret);
@@ -101,8 +149,9 @@ void manager_transaction_unlink_job(Manager *m, Job *j);
void manager_clear_jobs(Manager *m);
-void manager_dispatch_load_queue(Manager *m);
-void manager_dispatch_run_queue(Manager *m);
+unsigned manager_dispatch_load_queue(Manager *m);
+unsigned manager_dispatch_run_queue(Manager *m);
+unsigned manager_dispatch_dbus_queue(Manager *m);
int manager_loop(Manager *m);