chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd: record the timestamps as early as possible
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index f8d097e368aac39c8925f53016dd4012ffe349e1..2265ef7173716d0be419b7853e027a974137a396 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-70,7
+70,6
@@
#include "cgroup-util.h"
#include "path-util.h"
#include "audit-fd.h"
#include "cgroup-util.h"
#include "path-util.h"
#include "audit-fd.h"
-#include "efivars.h"
#include "env-util.h"
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
#include "env-util.h"
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
@@
-440,12
+439,6
@@
int manager_new(SystemdRunningAs running_as, Manager **_m) {
if (!m)
return -ENOMEM;
if (!m)
return -ENOMEM;
- dual_timestamp_get(&m->userspace_timestamp);
- dual_timestamp_from_monotonic(&m->kernel_timestamp, 0);
-#ifdef ENABLE_EFI
- efi_get_boot_timestamps(&m->userspace_timestamp, &m->firmware_timestamp, &m->loader_timestamp);
-#endif
-
m->running_as = running_as;
m->name_data_slot = m->conn_data_slot = m->subscribed_data_slot = -1;
m->exit_code = _MANAGER_EXIT_CODE_INVALID;
m->running_as = running_as;
m->name_data_slot = m->conn_data_slot = m->subscribed_data_slot = -1;
m->exit_code = _MANAGER_EXIT_CODE_INVALID;
@@
-766,7
+759,7
@@
int manager_coldplug(Manager *m) {
static void manager_build_unit_path_cache(Manager *m) {
char **i;
static void manager_build_unit_path_cache(Manager *m) {
char **i;
-
DIR _cleanup_free_
*d = NULL;
+
_cleanup_free_ DIR
*d = NULL;
int r;
assert(m);
int r;
assert(m);
@@
-804,11
+797,9
@@
static void manager_build_unit_path_cache(Manager *m) {
goto fail;
}
goto fail;
}
- r = set_put(m->unit_path_cache, p);
- if (r < 0) {
- free(p);
+ r = set_consume(m->unit_path_cache, p);
+ if (r < 0)
goto fail;
goto fail;
- }
}
closedir(d);
}
closedir(d);
@@
-1189,7
+1180,7
@@
static int manager_process_notify_fd(Manager *m) {
};
struct ucred *ucred;
Unit *u;
};
struct ucred *ucred;
Unit *u;
-
char _cleanup_strv_free_
**tags = NULL;
+
_cleanup_strv_free_ char
**tags = NULL;
n = recvmsg(m->notify_watch.fd, &msghdr, MSG_DONTWAIT);
if (n <= 0) {
n = recvmsg(m->notify_watch.fd, &msghdr, MSG_DONTWAIT);
if (n <= 0) {
@@
-1262,7
+1253,7
@@
static int manager_dispatch_sigchld(Manager *m) {
break;
if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
break;
if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
-
char _cleanup_free_
*name = NULL;
+
_cleanup_free_ char
*name = NULL;
get_process_comm(si.si_pid, &name);
log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
get_process_comm(si.si_pid, &name);
log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));