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: add the missing setting of variable's value
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 57a0a8d251ed2dd2081a4927a9dcceec1ed998c9..3969553e3ed791e83a3e7cdf470454cab25d1eb1 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-63,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 {
@@
-135,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;
@@
-195,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;
@@
-225,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;
@@
-242,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);
@@
-276,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_environment
(Manager *m, char **environment);
+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);