diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-31 23:24:47 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-31 23:24:47 +0200 |
| commit | ca949c9dcf17ea8d6512ac4c5c1a806ded9b8dc1 (patch) | |
| tree | f5c0f995815f9b50ff54602a2a34bdc1ead51405 /src/test-cgroup.c | |
| parent | 22f4096ca96acd504ac74e7dfad96f07edb6da51 (diff) | |
service: rework killing logic so that we always kill the main process, even if it left our service cgroup
Related to:
http://bugzilla.redhat.com/show_bug.cgi?id=626477
Diffstat (limited to 'src/test-cgroup.c')
| -rw-r--r-- | src/test-cgroup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test-cgroup.c b/src/test-cgroup.c index 63329a397c..486656b41d 100644 --- a/src/test-cgroup.c +++ b/src/test-cgroup.c @@ -61,16 +61,16 @@ int main(int argc, char*argv[]) { assert_se(cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", false) > 0); assert_se(cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", false) == 0); - assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0, false, false) == 0); - assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false, false) > 0); + assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0, false, false, NULL) == 0); + assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false, false, NULL) > 0); assert_se(cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", "/test-a", false, false) > 0); assert_se(cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", false) == 0); assert_se(cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", false) > 0); - assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0, false, false) > 0); - assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false, false) == 0); + assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0, false, false, NULL) > 0); + assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false, false, NULL) == 0); cg_trim(SYSTEMD_CGROUP_CONTROLLER, "/", false); |