SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: on unified we don't need to check u->pids: we can use proper notifications (#3531)

Browse Source 
Fixes: #3483
This commit is contained in:
Evgeny Vereshchagin
2016-06-14 14:08:01 +02:00
committed by Lennart Poettering
parent f4f5e50a0a
commit bbc85a16e1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/scope.c
+3 -2
View File
@@ -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);
}
src/core/service.c
+3 -2
View File
@@ -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);
}