chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'python-systemd-reader'
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 0bd7a6d48b5fa8043233000a67e3722864a9e64c..c486a16887938045f560fe9b27a65f75eddc7c9e 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-61,7
+61,8
@@
enum WatchType {
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT,
WATCH_UDEV,
WATCH_DBUS_WATCH,
WATCH_DBUS_TIMEOUT,
- WATCH_TIME_CHANGE
+ WATCH_TIME_CHANGE,
+ WATCH_JOBS_IN_PROGRESS
};
struct Watch {
};
struct Watch {
@@
-127,6
+128,7
@@
struct Manager {
Watch notify_watch;
Watch signal_watch;
Watch time_change_watch;
Watch notify_watch;
Watch signal_watch;
Watch time_change_watch;
+ Watch jobs_in_progress_watch;
int epoll_fd;
int epoll_fd;
@@
-225,7
+227,10
@@
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_running_jobs;
+ unsigned n_on_console;
+ unsigned jobs_in_progress_iteration;
/* Type=idle pipes */
int idle_pipe[2];
/* Type=idle pipes */
int idle_pipe[2];
@@
-278,8
+283,6
@@
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);
-
void manager_reset_failed(Manager *m);
void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success);
void manager_reset_failed(Manager *m);
void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success);
@@
-295,6
+298,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);
-
bool manager_get_show_status(Manager *m
);
+
void manager_status_printf(Manager *m, bool ephemeral, const char *status, const char *format, ...
);
void watch_init(Watch *w);
void watch_init(Watch *w);