summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2016-06-14 15:08:01 +0300
committerLennart Poettering <lennart@poettering.net>2016-06-14 14:08:01 +0200
commitbbc85a16e12083fdf13215c07a57ad7a5fb56ef8 (patch)
tree3b495f29a51effb57bbb41bd5636be51afbee1ff
parentf4f5e50a0ab828991ff54e7013acc6917a9510fa (diff)
core: on unified we don't need to check u->pids: we can use proper notifications (#3531)
Fixes: #3483
-rw-r--r--src/core/scope.c5
-rw-r--r--src/core/service.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/scope.c b/src/core/scope.c
index 238f63a729..decd1a1f3f 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -428,8 +428,9 @@ static void scope_sigchld_event(Unit *u, pid_t pid, int code, int status) {
unit_tidy_watch_pids(u, 0, 0);
unit_watch_all_pids(u);
- /* If the PID set is empty now, then let's finish this off */
- if (set_isempty(u->pids))
+ /* If the PID set is empty now, then let's finish this off
+ (On unified we use proper notifications) */
+ if (cg_unified() <= 0 && set_isempty(u->pids))
scope_notify_cgroup_empty_event(u);
}
diff --git a/src/core/service.c b/src/core/service.c
index 7ebabca5d6..14da6a58a9 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2800,8 +2800,9 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
unit_tidy_watch_pids(u, s->main_pid, s->control_pid);
unit_watch_all_pids(u);
- /* If the PID set is empty now, then let's finish this off */
- if (set_isempty(u->pids))
+ /* If the PID set is empty now, then let's finish this off
+ (On unified we use proper notifications) */
+ if (cg_unified() <= 0 && set_isempty(u->pids))
service_notify_cgroup_empty_event(u);
}