chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: compress mount table a bit
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index c0139587e38b98d8e7beeafbd1a97f5e667204b3..64d1028d4f1e42f90ba440fcbdde1a0f588bbaa8 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-131,7
+131,7
@@
static void socket_done(Unit *u) {
unit_unwatch_timer(u, &s->timer_watch);
/* Make sure no service instance refers to us anymore. */
unit_unwatch_timer(u, &s->timer_watch);
/* Make sure no service instance refers to us anymore. */
- LIST_FOREACH(units_
per_type, i, u->meta.manager->units_per
_type[UNIT_SERVICE]) {
+ LIST_FOREACH(units_
by_type, i, u->meta.manager->units_by
_type[UNIT_SERVICE]) {
Service *service = (Service *) i;
if (service->accept_socket == s)
Service *service = (Service *) i;
if (service->accept_socket == s)
@@
-283,7
+283,7
@@
static int socket_add_mount_links(Socket *s) {
assert(s);
assert(s);
- LIST_FOREACH(units_
per_type, other, s->meta.manager->units_per
_type[UNIT_MOUNT])
+ LIST_FOREACH(units_
by_type, other, s->meta.manager->units_by
_type[UNIT_MOUNT])
if ((r = socket_add_one_mount_link(s, (Mount*) other)) < 0)
return r;
if ((r = socket_add_one_mount_link(s, (Mount*) other)) < 0)
return r;
@@
-1361,7
+1361,7
@@
static void socket_enter_running(Socket *s, int cfd) {
/* If there's already a start pending don't bother to
* do anything */
/* If there's already a start pending don't bother to
* do anything */
- LIST_FOREACH(units_
per_type, i, s->meta.manager->units_per
_type[UNIT_SERVICE]) {
+ LIST_FOREACH(units_
by_type, i, s->meta.manager->units_by
_type[UNIT_SERVICE]) {
Service *service = (Service *) i;
if (!set_get(service->configured_sockets, s))
Service *service = (Service *) i;
if (!set_get(service->configured_sockets, s))
@@
-2022,19
+2022,20
@@
static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Socket units have no main processes");
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Socket units have no main processes");
- return -E
INVAL
;
+ return -E
SRCH
;
}
if (s->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
}
if (s->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
- return -E
NOENT
;
+ return -E
SRCH
;
}
}
- if (s->control_pid > 0)
- if (kill(s->control_pid, signo) < 0)
- r = -errno;
+ if (who == KILL_CONTROL || who == KILL_ALL)
+ if (s->control_pid > 0)
+ if (kill(s->control_pid, signo) < 0)
+ r = -errno;
- if (mode == KILL_CONTROL_GROUP) {
+ if (
who == KILL_ALL &&
mode == KILL_CONTROL_GROUP) {
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
@@
-2048,7
+2049,7
@@
static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
}
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
}
if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
- if (
r != -EAGAIN && r != -ESRCH && r
!= -ENOENT)
+ if (
q != -EAGAIN && q != -ESRCH && q
!= -ENOENT)
r = q;
}
r = q;
}