chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: if we do a cgroup operation then do something on all supported controllers
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index a0be2927f71a4111758dbcfbd101a0635a77b0ff..3969553e3ed791e83a3e7cdf470454cab25d1eb1 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 */
@@
-62,7
+63,8
@@
enum WatchType {
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT,
WATCH_TIME_CHANGE,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT,
WATCH_TIME_CHANGE,
- WATCH_JOBS_IN_PROGRESS
+ WATCH_JOBS_IN_PROGRESS,
+ WATCH_IDLE_PIPE,
};
struct Watch {
};
struct Watch {
@@
-86,6
+88,7
@@
struct Watch {
#include "dbus.h"
#include "path-lookup.h"
#include "execute.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
@@
-122,6
+125,9
@@
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;
Hashmap *watch_pids; /* pid => Unit object n:1 */
char *notify_socket;
@@
-130,6
+136,7
@@
struct Manager {
Watch signal_watch;
Watch time_change_watch;
Watch jobs_in_progress_watch;
Watch signal_watch;
Watch time_change_watch;
Watch jobs_in_progress_watch;
+ Watch idle_pipe_watch;
int epoll_fd;
int epoll_fd;
@@
-139,7
+146,6
@@
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;
@@
-150,6
+156,10
@@
struct Manager {
dual_timestamp initrd_timestamp;
dual_timestamp userspace_timestamp;
dual_timestamp finish_timestamp;
dual_timestamp initrd_timestamp;
dual_timestamp userspace_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;
@@
-187,6
+197,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;
@@
-194,10
+206,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;
@@
-217,6
+229,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;
@@
-234,13
+247,13
@@
struct Manager {
unsigned jobs_in_progress_iteration;
/* Type=idle pipes */
unsigned jobs_in_progress_iteration;
/* 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;
};
-int manager_new(SystemdRunningAs 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);
@@
-268,7
+281,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);
@@
-284,7
+297,7
@@
int manager_distribute_fds(Manager *m, FDSet *fds);
int manager_reload(Manager *m);
int manager_reload(Manager *m);
-bool manager_is_reloading_or_reexecuting(Manager *m);
+bool manager_is_reloading_or_reexecuting(Manager *m)
_pure_
;
void manager_reset_failed(Manager *m);
void manager_reset_failed(Manager *m);
@@
-301,6
+314,6
@@
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);
-void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...);
+void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...)
_printf_attr_(4,5)
;
void watch_init(Watch *w);
void watch_init(Watch *w);