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: mention to which unit a SIGCHLD belongs
[elogind.git]
/
manager.c
diff --git
a/manager.c
b/manager.c
index 7d3b8b503922d55a54880d28ca5eb6f227e0c614..6c73acf403fc0abe43be94abea08ec05aaa3e495 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-256,15
+256,18
@@
static int manager_find_paths(Manager *m) {
return 0;
}
return 0;
}
-int manager_new(Manager **_m) {
+int manager_new(Manager
RunningAs running_as, Manager
**_m) {
Manager *m;
int r = -ENOMEM;
assert(_m);
Manager *m;
int r = -ENOMEM;
assert(_m);
+ assert(running_as >= 0);
+ assert(running_as < _MANAGER_RUNNING_AS_MAX);
if (!(m = new0(Manager, 1)))
return -ENOMEM;
if (!(m = new0(Manager, 1)))
return -ENOMEM;
+ m->running_as = running_as;
m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = -1;
m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = -1;
m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
@@
-286,15
+289,6
@@
int manager_new(Manager **_m) {
if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
goto fail;
if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
goto fail;
- if (getpid() == 1)
- m->running_as = MANAGER_INIT;
- else if (getuid() == 0)
- m->running_as = MANAGER_SYSTEM;
- else
- m->running_as = MANAGER_SESSION;
-
- log_debug("systemd running in %s mode.", manager_running_as_to_string(m->running_as));
-
if ((r = manager_find_paths(m)) < 0)
goto fail;
if ((r = manager_find_paths(m)) < 0)
goto fail;
@@
-1421,6
+1415,8
@@
static int manager_dispatch_sigchld(Manager *m) {
if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid))))
continue;
if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid))))
continue;
+ log_debug("child %llu belongs to %s", (long long unsigned) si.si_pid, unit_id(u));
+
UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status);
}
UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status);
}