chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce _cleanup_fdset_free_
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 603c2dc31824dfbb68371b369ab4e66f3e460aec..a3049b5e5b665fe7937ca4cf2a3274cdb8670732 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-27,6
+27,7
@@
#include <dbus/dbus.h>
#include "fdset.h"
#include <dbus/dbus.h>
#include "fdset.h"
+#include "cgroup-util.h"
/* Enforce upper limit how many names we allow */
#define MANAGER_MAX_NAMES 131072 /* 128K */
/* Enforce upper limit how many names we allow */
#define MANAGER_MAX_NAMES 131072 /* 128K */
@@
-49,13
+50,6
@@
typedef enum ManagerExitCode {
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
_MANAGER_EXIT_CODE_INVALID = -1
} ManagerExitCode;
-typedef enum ManagerRunningAs {
- MANAGER_SYSTEM,
- MANAGER_USER,
- _MANAGER_RUNNING_AS_MAX,
- _MANAGER_RUNNING_AS_INVALID = -1
-} ManagerRunningAs;
-
enum WatchType {
WATCH_INVALID,
WATCH_SIGNAL,
enum WatchType {
WATCH_INVALID,
WATCH_SIGNAL,
@@
-67,7
+61,10
@@
enum WatchType {
WATCH_SWAP,
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_SWAP,
WATCH_UDEV,
WATCH_DBUS_WATCH,
- WATCH_DBUS_TIMEOUT
+ WATCH_DBUS_TIMEOUT,
+ WATCH_TIME_CHANGE,
+ WATCH_JOBS_IN_PROGRESS,
+ WATCH_IDLE_PIPE,
};
struct Watch {
};
struct Watch {
@@
-90,6
+87,8
@@
struct Watch {
#include "set.h"
#include "dbus.h"
#include "path-lookup.h"
#include "set.h"
#include "dbus.h"
#include "path-lookup.h"
+#include "execute.h"
+#include "unit-name.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
@@
-104,9
+103,6
@@
struct Manager {
* type we maintain a per type linked list */
LIST_HEAD(Unit, units_by_type[_UNIT_TYPE_MAX]);
* type we maintain a per type linked list */
LIST_HEAD(Unit, units_by_type[_UNIT_TYPE_MAX]);
- /* To optimize iteration of units that have requires_mounts_for set */
- LIST_HEAD(Unit, has_requires_mounts_for);
-
/* Units that need to be loaded */
LIST_HEAD(Unit, load_queue); /* this is actually more a stack than a queue, but uh. */
/* Units that need to be loaded */
LIST_HEAD(Unit, load_queue); /* this is actually more a stack than a queue, but uh. */
@@
-126,12
+122,18
@@
struct Manager {
/* Units to check when doing GC */
LIST_HEAD(Unit, gc_queue);
/* Units to check when doing GC */
LIST_HEAD(Unit, gc_queue);
+ /* Units that should be realized */
+ LIST_HEAD(Unit, cgroup_queue);
+
Hashmap *watch_pids; /* pid => Unit object n:1 */
char *notify_socket;
Watch notify_watch;
Watch signal_watch;
Hashmap *watch_pids; /* pid => Unit object n:1 */
char *notify_socket;
Watch notify_watch;
Watch signal_watch;
+ Watch time_change_watch;
+ Watch jobs_in_progress_watch;
+ Watch idle_pipe_watch;
int epoll_fd;
int epoll_fd;
@@
-141,14
+143,20
@@
struct Manager {
Set *unit_path_cache;
char **environment;
Set *unit_path_cache;
char **environment;
- char **default_controllers;
usec_t runtime_watchdog;
usec_t shutdown_watchdog;
usec_t runtime_watchdog;
usec_t shutdown_watchdog;
+ dual_timestamp firmware_timestamp;
+ dual_timestamp loader_timestamp;
+ dual_timestamp kernel_timestamp;
dual_timestamp initrd_timestamp;
dual_timestamp initrd_timestamp;
- dual_timestamp
startup
_timestamp;
+ dual_timestamp
userspace
_timestamp;
dual_timestamp finish_timestamp;
dual_timestamp finish_timestamp;
+ dual_timestamp generators_start_timestamp;
+ dual_timestamp generators_finish_timestamp;
+ dual_timestamp unitsload_start_timestamp;
+ dual_timestamp unitsload_finish_timestamp;
char *generator_unit_path;
char *generator_unit_path_early;
char *generator_unit_path;
char *generator_unit_path_early;
@@
-186,6
+194,8
@@
struct Manager {
int32_t conn_data_slot;
int32_t subscribed_data_slot;
int32_t conn_data_slot;
int32_t subscribed_data_slot;
+ bool send_reloading_done;
+
uint32_t current_job_id;
uint32_t default_unit_job_id;
uint32_t current_job_id;
uint32_t default_unit_job_id;
@@
-193,10
+203,10
@@
struct Manager {
int dev_autofs_fd;
/* Data specific to the cgroup subsystem */
int dev_autofs_fd;
/* Data specific to the cgroup subsystem */
- Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
- char *cgroup_hierarchy;
+ Hashmap *cgroup_unit;
+ CGroupControllerMask cgroup_supported;
+ char *cgroup_root;
- usec_t gc_queue_timestamp;
int gc_marker;
unsigned n_in_gc_queue;
int gc_marker;
unsigned n_in_gc_queue;
@@
-204,13
+214,8
@@
struct Manager {
* file system */
int pin_cgroupfs_fd;
* file system */
int pin_cgroupfs_fd;
- /* Audit fd */
-#ifdef HAVE_AUDIT
- int audit_fd;
-#endif
-
/* Flags */
/* Flags */
-
Manager
RunningAs running_as;
+
Systemd
RunningAs running_as;
ManagerExitCode exit_code:5;
bool dispatching_load_queue:1;
ManagerExitCode exit_code:5;
bool dispatching_load_queue:1;
@@
-221,6
+226,7
@@
struct Manager {
bool show_status;
bool confirm_spawn;
bool show_status;
bool confirm_spawn;
+ bool no_console_output;
ExecOutput default_std_output, default_std_error;
ExecOutput default_std_output, default_std_error;
@@
-232,14
+238,24
@@
struct Manager {
unsigned n_installed_jobs;
unsigned n_failed_jobs;
unsigned n_installed_jobs;
unsigned n_failed_jobs;
+ /* Jobs in progress watching */
+ unsigned n_running_jobs;
+ unsigned n_on_console;
+ unsigned jobs_in_progress_iteration;
+
/* Type=idle pipes */
/* Type=idle pipes */
- int idle_pipe[
2
];
+ int idle_pipe[
4
];
char *switch_root;
char *switch_root_init;
char *switch_root;
char *switch_root_init;
+
+ /* This maps all possible path prefixes to the units needing
+ * 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;
};
};
-int manager_new(
ManagerRunningAs running_as
, Manager **m);
+int manager_new(
SystemdRunningAs running_as, bool reexecuting
, Manager **m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
@@
-249,6
+265,8
@@
int manager_startup(Manager *m, FILE *serialization, FDSet *fds);
Job *manager_get_job(Manager *m, uint32_t id);
Unit *manager_get_unit(Manager *m, const char *name);
Job *manager_get_job(Manager *m, uint32_t id);
Unit *manager_get_unit(Manager *m, const char *name);
+int manager_get_unit_by_path(Manager *m, const char *path, const char *suffix, Unit **_found);
+
int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret);
int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret);
@@
-267,7
+285,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_default_controllers(Manager *m, char **controllers
);
+int manager_
environment_add(Manager *m, char **environment
);
int manager_set_default_rlimits(Manager *m, struct rlimit **default_rlimit);
int manager_loop(Manager *m);
int manager_set_default_rlimits(Manager *m, struct rlimit **default_rlimit);
int manager_loop(Manager *m);
@@
-277,19
+295,20
@@
void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid
int manager_open_serialization(Manager *m, FILE **_f);
int manager_open_serialization(Manager *m, FILE **_f);
-int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool s
erialize_jobs
);
+int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool s
witching_root
);
int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
+int manager_distribute_fds(Manager *m, FDSet *fds);
int manager_reload(Manager *m);
int manager_reload(Manager *m);
-bool manager_is_
booting_or_shutting_down(Manager *m)
;
+bool manager_is_
reloading_or_reexecuting(Manager *m) _pure_
;
void manager_reset_failed(Manager *m);
void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success);
void manager_send_unit_plymouth(Manager *m, Unit *u);
void manager_reset_failed(Manager *m);
void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success);
void manager_send_unit_plymouth(Manager *m, Unit *u);
-bool manager_unit_
pending_inactive
(Manager *m, const char *name);
+bool manager_unit_
inactive_or_pending
(Manager *m, const char *name);
void manager_check_finished(Manager *m);
void manager_check_finished(Manager *m);
@@
-299,7
+318,8
@@
void manager_undo_generators(Manager *m);
void manager_recheck_journal(Manager *m);
void manager_set_show_status(Manager *m, bool b);
void manager_recheck_journal(Manager *m);
void manager_set_show_status(Manager *m, bool b);
-bool manager_get_show_status(Manager *m);
+void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...) _printf_attr_(4,5);
+
+Set *manager_get_units_requiring_mounts_for(Manager *m, const char *path);
-const char *manager_running_as_to_string(ManagerRunningAs i);
-ManagerRunningAs manager_running_as_from_string(const char *s);
+void watch_init(Watch *w);