chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: clean environment before passing it on to others
[elogind.git]
/
src
/
core
/
manager.h
diff --git
a/src/core/manager.h
b/src/core/manager.h
index be2780bafe2a53e6375da5e21ee944f80da71ca6..cc4edf8f1ef0bac2acea3005b07c4765870c50b2 100644
(file)
--- a/
src/core/manager.h
+++ b/
src/core/manager.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foomanagerhfoo
-#define foomanagerhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-50,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,
@@
-68,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 {
@@
-133,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;
@@
-147,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;
@@
-205,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;
@@
-240,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);
@@
-278,8
+270,9
@@
void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid
int manager_open_serialization(Manager *m, FILE **_f);
int manager_open_serialization(Manager *m, FILE **_f);
-int manager_serialize(Manager *m, FILE *f, FDSet *fds);
+int manager_serialize(Manager *m, FILE *f, FDSet *fds
, bool serialize_jobs
);
int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
+int manager_distribute_fds(Manager *m, FDSet *fds);
int manager_reload(Manager *m);
int manager_reload(Manager *m);
@@
-302,7
+295,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);
-
-#endif
+void watch_init(Watch *w);