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: replace linked list by hashmap when merging files
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index 7ce1b3bab38ccc514bc859e03161c31a7d329d00..ac5bbef1a802ef63f2b190c2781e73707baad11d 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-59,6
+59,7
@@
#include "bus-errors.h"
#include "exit-status.h"
#include "sd-daemon.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 */
#define GC_QUEUE_ENTRIES_MAX 16
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
#define GC_QUEUE_ENTRIES_MAX 16
@@
-2023,7
+2024,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);
}
@@
-2108,7
+2109,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),