chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket: properly serialize/desrialize mqueue fds
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index 603c2dc31824dfbb68371b369ab4e66f3e460aec..e9de4969b4138906d38d9df9e37f9ba1c83432db 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-49,13
+49,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
+60,8
@@
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
};
struct Watch {
};
struct Watch {
@@
-132,6
+126,7
@@
struct Manager {
Watch notify_watch;
Watch signal_watch;
Watch notify_watch;
Watch signal_watch;
+ Watch time_change_watch;
int epoll_fd;
int epoll_fd;
@@
-146,8
+141,11
@@
struct Manager {
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;
char *generator_unit_path;
dual_timestamp finish_timestamp;
char *generator_unit_path;
@@
-204,13
+202,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;
@@
-239,7
+232,7
@@
struct Manager {
char *switch_root_init;
};
char *switch_root_init;
};
-int manager_new(
Manager
RunningAs running_as, Manager **m);
+int manager_new(
Systemd
RunningAs running_as, Manager **m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
void manager_free(Manager *m);
int manager_enumerate(Manager *m);
@@
-301,5
+294,4
@@
void manager_recheck_journal(Manager *m);
void manager_set_show_status(Manager *m, bool b);
bool manager_get_show_status(Manager *m);
void manager_set_show_status(Manager *m, bool b);
bool manager_get_show_status(Manager *m);
-const char *manager_running_as_to_string(ManagerRunningAs i);
-ManagerRunningAs manager_running_as_from_string(const char *s);
+void watch_init(Watch *w);