chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce new stop protocol for unit scopes
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index a46b09eddd8af068922208aaf805291055186758..358aba7ff9041fb998345f36e8d500d23897f3aa 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-57,6
+57,7
@@
typedef enum ManagerExitCode {
#include "path-lookup.h"
#include "execute.h"
#include "unit-name.h"
#include "path-lookup.h"
#include "execute.h"
#include "unit-name.h"
+#include "exit-status.h"
struct Manager {
/* Note that the set of units we know of is allowed to be
struct Manager {
/* Note that the set of units we know of is allowed to be
@@
-138,8
+139,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;
@@
-151,8
+153,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;
@@
-198,7
+199,7
@@
struct Manager {
bool taint_usr:1;
bool taint_usr:1;
-
bool
show_status;
+
ShowStatus
show_status;
bool confirm_spawn;
bool no_console_output;
bool confirm_spawn;
bool no_console_output;
@@
-234,9
+235,12
@@
struct Manager {
* them. It's a hashmap with a path string as key and a Set as
* value where Unit objects are contained. */
Hashmap *units_requiring_mounts_for;
* them. It's a hashmap with a path string as key and a Set as
* value where Unit objects are contained. */
Hashmap *units_requiring_mounts_for;
+
+ /* Reference to the kdbus bus control fd */
+ int kdbus_fd;
};
};
-int manager_new(SystemdRunningAs running_as,
bool reexecuting,
Manager **m);
+int manager_new(SystemdRunningAs running_as, Manager **m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
@@
-293,7
+297,8
@@
void manager_undo_generators(Manager *m);
void manager_recheck_journal(Manager *m);
void manager_recheck_journal(Manager *m);
-void manager_set_show_status(Manager *m,
bool b
);
+void manager_set_show_status(Manager *m,
ShowStatus mode
);
void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) _printf_(4,5);
void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) _printf_(4,5);
+void manager_flip_auto_status(Manager *m, bool enable);
Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path);
Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path);