chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: add public API call sd_journal_get_events()
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index d21f27dfd469b04fd3f9082641a08b044d2852a5..9d8d9439d2a426420042440f9236e4cace6014e1 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 {
@@
-84,6
+85,7
@@
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"
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
@@
-127,6
+129,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
+228,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,6
+284,8
@@
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);
+
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);
@@
-293,6
+301,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, const char *status, const char *format, ...);
+void manager_status_printf(Manager *m,
bool ephemeral,
const char *status, const char *format, ...);
void watch_init(Watch *w);
void watch_init(Watch *w);