chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: install some properties on the job objects
[elogind.git]
/
manager.h
diff --git
a/manager.h
b/manager.h
index 6e0b500e5b0589f00157b103a19c20a619b187f3..b2b93e9b45f9cd0fd04e8143363d436015b02b7f 100644
(file)
--- a/
manager.h
+++ b/
manager.h
@@
-7,57
+7,123
@@
#include <inttypes.h>
#include <stdio.h>
#include <inttypes.h>
#include <stdio.h>
+#include <dbus/dbus.h>
+
typedef struct Manager Manager;
typedef struct Manager Manager;
+typedef enum WatchType WatchType;
+typedef struct Watch Watch;
+
+enum WatchType {
+ WATCH_INVALID,
+ WATCH_SIGNAL,
+ WATCH_FD,
+ WATCH_TIMER,
+ WATCH_MOUNT,
+ WATCH_UDEV,
+ WATCH_DBUS_WATCH,
+ WATCH_DBUS_TIMEOUT
+};
+
+struct Watch {
+ int fd;
+ WatchType type;
+ bool fd_is_dupped;
+ union {
+ union Unit *unit;
+ DBusWatch *bus_watch;
+ DBusTimeout *bus_timeout;
+ } data;
+};
-#include "
name
.h"
+#include "
unit
.h"
#include "job.h"
#include "hashmap.h"
#include "list.h"
#include "set.h"
#include "job.h"
#include "hashmap.h"
#include "list.h"
#include "set.h"
+#include "dbus.h"
+
+#define SPECIAL_DEFAULT_TARGET "default.target"
+#define SPECIAL_SYSLOG_SERVICE "syslog.service"
+#define SPECIAL_DBUS_SERVICE "messagebus.service"
+#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
+#define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
+#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
struct Manager {
uint32_t current_job_id;
struct Manager {
uint32_t current_job_id;
- /* Note that the set of
name
s we know of is allowed to be
+ /* Note that the set of
unit
s we know of is allowed to be
* incosistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
* incosistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
- /* Active jobs and
name
s */
- Hashmap *
names; /* name string => Name
object n:1 */
+ /* Active jobs and
unit
s */
+ Hashmap *
units; /* name string => Unit
object n:1 */
Hashmap *jobs; /* job id => Job object 1:1 */
Hashmap *jobs; /* job id => Job object 1:1 */
- /* Names that need to be loaded */
+ /* To make it easy to iterate through the units of a specific
+ * type we maintain a per type linked list */
+ LIST_HEAD(Meta, units_per_type[_UNIT_TYPE_MAX]);
+
+ /* Units that need to be loaded */
LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
+ /* Jobs that need to be run */
+ LIST_HEAD(Job, run_queue); /* more a stack than a queue, too */
+
/* Jobs to be added */
/* Jobs to be added */
- Hashmap *transaction_jobs; /*
Name
object => Job object list 1:1 */
+ Hashmap *transaction_jobs; /*
Unit
object => Job object list 1:1 */
JobDependency *transaction_anchor;
bool dispatching_load_queue:1;
JobDependency *transaction_anchor;
bool dispatching_load_queue:1;
+ bool dispatching_run_queue:1;
+
+ bool is_init:1;
- Hashmap *watch_pids; /* pid => Name object n:1 */
+ bool request_bus_dispatch:1;
+
+ Hashmap *watch_pids; /* pid => Unit object n:1 */
int epoll_fd;
int epoll_fd;
- int signal_fd;
+
+ Watch signal_watch;
+
+ /* Data specific to the device subsystem */
+ struct udev* udev;
+ struct udev_monitor* udev_monitor;
+ Watch udev_watch;
+
+ /* Data specific to the mount subsystem */
+ FILE *proc_self_mountinfo;
+ Watch mount_watch;
+
+ /* Data specific to the D-Bus subsystem */
+ DBusConnection *bus;
};
Manager* manager_new(void);
void manager_free(Manager *m);
};
Manager* manager_new(void);
void manager_free(Manager *m);
+int manager_coldplug(Manager *m);
+
Job *manager_get_job(Manager *m, uint32_t id);
Job *manager_get_job(Manager *m, uint32_t id);
-
Name *manager_get_name
(Manager *m, const char *name);
+
Unit *manager_get_unit
(Manager *m, const char *name);
-int manager_
load_name(Manager *m, const char *name, Name **_ret
);
-int manager_
add_job(Manager *m, JobType type, Name *name, JobMode mode, bool force, Job **_ret
);
+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
);
-void manager_dump_names(Manager *s, FILE *f, const char *prefix);
+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);
+
+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_clear_jobs(Manager *m);
void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
void manager_transaction_unlink_job(Manager *m, Job *j);
void manager_clear_jobs(Manager *m);
-void manager_run_jobs(Manager *m);
+void manager_dispatch_load_queue(Manager *m);
+void manager_dispatch_run_queue(Manager *m);
+
int manager_loop(Manager *m);
#endif
int manager_loop(Manager *m);
#endif