chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load-fragment: fix parsing of Socket= setting
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index 111167a8c2a19147af66dfec669a72de2b2f444a..7fd860ed06666db407eb06c42920d3eb5c287e2f 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-41,6
+41,8
@@
#include <libaudit.h>
#endif
#include <libaudit.h>
#endif
+#include <systemd/sd-daemon.h>
+
#include "manager.h"
#include "hashmap.h"
#include "macro.h"
#include "manager.h"
#include "hashmap.h"
#include "macro.h"
@@
-58,7
+60,6
@@
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
-#include "sd-daemon.h"
#include "virt.h"
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
#include "virt.h"
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
@@
-231,7
+232,7
@@
int manager_new(ManagerRunningAs running_as, Manager **_m) {
dual_timestamp_get(&m->startup_timestamp);
m->running_as = running_as;
dual_timestamp_get(&m->startup_timestamp);
m->running_as = running_as;
- m->name_data_slot = m->subscribed_data_slot = -1;
+ m->name_data_slot = m->
conn_data_slot = m->
subscribed_data_slot = -1;
m->exit_code = _MANAGER_EXIT_CODE_INVALID;
m->pin_cgroupfs_fd = -1;
m->exit_code = _MANAGER_EXIT_CODE_INVALID;
m->pin_cgroupfs_fd = -1;
@@
-2032,7
+2033,7
@@
static int manager_dispatch_sigchld(Manager *m) {
if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
char *name = NULL;
if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
char *name = NULL;
- get_process_
name
(si.si_pid, &name);
+ get_process_
comm
(si.si_pid, &name);
log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
free(name);
}
log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
free(name);
}
@@
-2117,7
+2118,7
@@
static int manager_process_signal_fd(Manager *m) {
if (sfsi.ssi_pid > 0) {
char *p = NULL;
if (sfsi.ssi_pid > 0) {
char *p = NULL;
- get_process_
name
(sfsi.ssi_pid, &p);
+ get_process_
comm
(sfsi.ssi_pid, &p);
log_debug("Received SIG%s from PID %lu (%s).",
signal_to_string(sfsi.ssi_signo),
log_debug("Received SIG%s from PID %lu (%s).",
signal_to_string(sfsi.ssi_signo),