chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autogen.sh: diet and sync with udev and kmod
[elogind.git]
/
src
/
manager.h
diff --git
a/src/manager.h
b/src/manager.h
index 5037127655db799a26cf08d40add610b0d285bca..6e7558e17558c3b69034671ee045f8229d0b6cf9 100644
(file)
--- a/
src/manager.h
+++ b/
src/manager.h
@@
-30,7
+30,7
@@
#include "fdset.h"
/* Enforce upper limit how many names we allow */
#include "fdset.h"
/* Enforce upper limit how many names we allow */
-#define MANAGER_MAX_NAMES
2048
+#define MANAGER_MAX_NAMES
131072 /* 128K */
typedef struct Manager Manager;
typedef enum WatchType WatchType;
typedef struct Manager Manager;
typedef enum WatchType WatchType;
@@
-41,13
+41,17
@@
typedef enum ManagerExitCode {
MANAGER_EXIT,
MANAGER_RELOAD,
MANAGER_REEXECUTE,
MANAGER_EXIT,
MANAGER_RELOAD,
MANAGER_REEXECUTE,
+ MANAGER_REBOOT,
+ MANAGER_POWEROFF,
+ MANAGER_HALT,
+ MANAGER_KEXEC,
_MANAGER_EXIT_CODE_MAX,
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
typedef enum ManagerRunningAs {
MANAGER_SYSTEM,
_MANAGER_EXIT_CODE_MAX,
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
typedef enum ManagerRunningAs {
MANAGER_SYSTEM,
- MANAGER_
SESSION
,
+ MANAGER_
USER
,
_MANAGER_RUNNING_AS_MAX,
_MANAGER_RUNNING_AS_INVALID = -1
} ManagerRunningAs;
_MANAGER_RUNNING_AS_MAX,
_MANAGER_RUNNING_AS_INVALID = -1
} ManagerRunningAs;
@@
-60,6
+64,7
@@
enum WatchType {
WATCH_UNIT_TIMER,
WATCH_JOB_TIMER,
WATCH_MOUNT,
WATCH_UNIT_TIMER,
WATCH_JOB_TIMER,
WATCH_MOUNT,
+ WATCH_SWAP,
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT
@@
-88,7
+93,7
@@
struct Watch {
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
- * incosistent. However the subset of it that is loaded may
+ * inco
n
sistent. However the subset of it that is loaded may
* not, and the list of jobs may neither. */
/* Active jobs and units */
* not, and the list of jobs may neither. */
/* Active jobs and units */
@@
-97,7
+102,7
@@
struct Manager {
/* To make it easy to iterate through the units of a specific
* type we maintain a per type linked list */
/* 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]);
+ LIST_HEAD(Meta, units_
by
_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. */
/* Units that need to be loaded */
LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
@@
-137,11
+142,13
@@
struct Manager {
Set *unit_path_cache;
char **environment;
Set *unit_path_cache;
char **environment;
+ char **default_controllers;
+ dual_timestamp initrd_timestamp;
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
dual_timestamp startup_timestamp;
dual_timestamp finish_timestamp;
- char *
console
;
+ char *
generator_unit_path
;
/* Data specific to the device subsystem */
struct udev* udev;
/* Data specific to the device subsystem */
struct udev* udev;
@@
-155,6
+162,9
@@
struct Manager {
/* Data specific to the swap filesystem */
FILE *proc_swaps;
/* Data specific to the swap filesystem */
FILE *proc_swaps;
+ Hashmap *swaps_by_proc_swaps;
+ bool request_reload;
+ Watch swap_watch;
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
/* Data specific to the D-Bus subsystem */
DBusConnection *api_bus, *system_bus;
@@
-169,6
+179,7
@@
struct Manager {
Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */
int32_t name_data_slot;
Hashmap *watch_bus; /* D-Bus names => Unit object n:1 */
int32_t name_data_slot;
+ int32_t conn_data_slot;
int32_t subscribed_data_slot;
uint32_t current_job_id;
int32_t subscribed_data_slot;
uint32_t current_job_id;
@@
-184,7
+195,7
@@
struct Manager {
int gc_marker;
unsigned n_in_gc_queue;
int gc_marker;
unsigned n_in_gc_queue;
- /* Make sure the user cannot accidentaly unmount our cgroup
+ /* Make sure the user cannot accidental
l
y unmount our cgroup
* file system */
int pin_cgroupfs_fd;
* file system */
int pin_cgroupfs_fd;
@@
-195,12
+206,14
@@
struct Manager {
/* Flags */
ManagerRunningAs running_as;
/* Flags */
ManagerRunningAs running_as;
- ManagerExitCode exit_code:
4
;
+ ManagerExitCode exit_code:
5
;
bool dispatching_load_queue:1;
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
bool dispatching_load_queue:1;
bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1;
+ bool taint_usr:1;
+
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
bool show_status;
bool confirm_spawn;
#ifdef HAVE_SYSV_COMPAT
@@
-209,7
+222,10
@@
struct Manager {
bool mount_auto;
bool swap_auto;
bool mount_auto;
bool swap_auto;
- int n_deserializing;
+ ExecOutput default_std_output, default_std_error;
+
+ /* non-zero if we are reloading or reexecuting, */
+ int n_reloading;
unsigned n_installed_jobs;
unsigned n_failed_jobs;
unsigned n_installed_jobs;
unsigned n_failed_jobs;
@@
-245,7
+261,7
@@
unsigned manager_dispatch_load_queue(Manager *m);
unsigned manager_dispatch_run_queue(Manager *m);
unsigned manager_dispatch_dbus_queue(Manager *m);
unsigned manager_dispatch_run_queue(Manager *m);
unsigned manager_dispatch_dbus_queue(Manager *m);
-int manager_set_
console(Manager *m, const char *console
);
+int manager_set_
default_controllers(Manager *m, char **controllers
);
int manager_loop(Manager *m);
int manager_loop(Manager *m);
@@
-270,6
+286,14
@@
bool manager_unit_pending_inactive(Manager *m, const char *name);
void manager_check_finished(Manager *m);
void manager_check_finished(Manager *m);
+void manager_run_generators(Manager *m);
+void manager_undo_generators(Manager *m);
+
+void manager_recheck_syslog(Manager *m);
+
+void manager_set_show_status(Manager *m, bool b);
+bool manager_get_show_status(Manager *m);
+
const char *manager_running_as_to_string(ManagerRunningAs i);
ManagerRunningAs manager_running_as_from_string(const char *s);
const char *manager_running_as_to_string(ManagerRunningAs i);
ManagerRunningAs manager_running_as_from_string(const char *s);