chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: automatically create non-existing mount point dirs prior to mounting
[elogind.git]
/
src
/
manager.h
diff --git
a/src/manager.h
b/src/manager.h
index 762a891ca61d7242700a77eee73208727579a451..eed137b10ab1d34effa6c61a8f7416f9af9117c2 100644
(file)
--- a/
src/manager.h
+++ b/
src/manager.h
@@
-46,9
+46,8
@@
typedef enum ManagerExitCode {
} ManagerExitCode;
typedef enum ManagerRunningAs {
} ManagerExitCode;
typedef enum ManagerRunningAs {
- MANAGER_INIT, /* root and pid=1 */
- MANAGER_SYSTEM, /* root and pid!=1 */
- MANAGER_SESSION, /* non-root, for a session */
+ MANAGER_SYSTEM,
+ MANAGER_SESSION,
_MANAGER_RUNNING_AS_MAX,
_MANAGER_RUNNING_AS_INVALID = -1
} ManagerRunningAs;
_MANAGER_RUNNING_AS_MAX,
_MANAGER_RUNNING_AS_INVALID = -1
} ManagerRunningAs;
@@
-125,6
+124,8
@@
struct Manager {
Hashmap *watch_pids; /* pid => Unit object n:1 */
Hashmap *watch_pids; /* pid => Unit object n:1 */
+ char *notify_socket;
+
Watch notify_watch;
Watch signal_watch;
Watch notify_watch;
Watch signal_watch;
@@
-136,7
+137,7
@@
struct Manager {
char **environment;
char **environment;
- timestamp startup_timestamp;
+
dual_
timestamp startup_timestamp;
/* Data specific to the device subsystem */
struct udev* udev;
/* Data specific to the device subsystem */
struct udev* udev;
@@
-152,6
+153,9
@@
struct Manager {
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
+ DBusServer *private_bus;
+ Set *bus_connections, *bus_connections_for_dispatch;
+
Set *subscribed;
DBusMessage *queued_message; /* This is used during reloading:
* before the reload we queue the
Set *subscribed;
DBusMessage *queued_message; /* This is used during reloading:
* before the reload we queue the
@@
-186,9
+190,6
@@
struct Manager {
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
- bool request_api_bus_dispatch:1;
- bool request_system_bus_dispatch:1;
-
bool utmp_reboot_written:1;
bool confirm_spawn:1;
bool utmp_reboot_written:1;
bool confirm_spawn:1;