chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: remove unused session->closing field
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 9eddef20dc1165401f886384678c0a77a97fcdb8..bf05812fc5b6e1953c290c042bd6139312c0fa2a 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-97,6
+97,8
@@
struct Manager {
Hashmap *watch_pids; /* pid => Unit object n:1 */
Hashmap *watch_pids; /* pid => Unit object n:1 */
+ sd_event_source *run_queue_event_source;
+
char *notify_socket;
int notify_fd;
sd_event_source *notify_event_source;
char *notify_socket;
int notify_fd;
sd_event_source *notify_event_source;
@@
-136,8
+138,9
@@
struct Manager {
char *generator_unit_path_early;
char *generator_unit_path_late;
char *generator_unit_path_early;
char *generator_unit_path_late;
- /* Data specific to the device subsystem */
struct udev* udev;
struct udev* udev;
+
+ /* Data specific to the device subsystem */
struct udev_monitor* udev_monitor;
sd_event_source *udev_event_source;
Hashmap *devices_by_sysfs;
struct udev_monitor* udev_monitor;
sd_event_source *udev_event_source;
Hashmap *devices_by_sysfs;
@@
-149,8
+152,7
@@
struct Manager {
/* Data specific to the swap filesystem */
FILE *proc_swaps;
sd_event_source *swap_event_source;
/* Data specific to the swap filesystem */
FILE *proc_swaps;
sd_event_source *swap_event_source;
- Hashmap *swaps_by_proc_swaps;
- bool request_reload;
+ Hashmap *swaps_by_devnode;
/* Data specific to the D-Bus subsystem */
sd_bus *api_bus, *system_bus;
/* Data specific to the D-Bus subsystem */
sd_bus *api_bus, *system_bus;
@@
-192,7
+194,6
@@
struct Manager {
ManagerExitCode exit_code:5;
bool dispatching_load_queue:1;
ManagerExitCode exit_code:5;
bool dispatching_load_queue:1;
- bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool taint_usr:1;
bool dispatching_dbus_queue:1;
bool taint_usr:1;