summaryrefslogtreecommitdiff
path: root/src/test-cgroup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-11 00:50:49 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-11 00:50:49 +0200
commitc6c18be35bb1d300d0b62a568783cc1c477f7151 (patch)
treee4bad2452f20b6d1d6df9714d6abe72cdc56599c /src/test-cgroup.c
parent55096547212928b0ba83fca2595cae0d66d3c0b0 (diff)
cgroup: kill processes, not tasks and other cgroup changes
Diffstat (limited to 'src/test-cgroup.c')
-rw-r--r--src/test-cgroup.c54
1 files changed, 26 insertions, 28 deletions
diff --git a/src/test-cgroup.c b/src/test-cgroup.c
index 389df6d398..45e7f0fe03 100644
--- a/src/test-cgroup.c
+++ b/src/test-cgroup.c
@@ -22,8 +22,6 @@
#include <unistd.h>
#include <string.h>
-#include <libcgroup.h>
-
#include "cgroup-util.h"
#include "util.h"
#include "log.h"
@@ -31,54 +29,54 @@
int main(int argc, char*argv[]) {
char *path;
- assert_se(cgroup_init() == 0);
+ assert_se(cg_init() >= 0);
- assert_se(cg_create("name=systemd", "/test-a") == 0);
- assert_se(cg_create("name=systemd", "/test-a") == 0);
- assert_se(cg_create("name=systemd", "/test-b") == 0);
- assert_se(cg_create("name=systemd", "/test-b/test-c") == 0);
- assert_se(cg_create_and_attach("name=systemd", "/test-b", 0) == 0);
+ assert_se(cg_create(SYSTEMD_CGROUP_CONTROLLER, "/test-a") == 0);
+ assert_se(cg_create(SYSTEMD_CGROUP_CONTROLLER, "/test-a") == 0);
+ assert_se(cg_create(SYSTEMD_CGROUP_CONTROLLER, "/test-b") == 0);
+ assert_se(cg_create(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-c") == 0);
+ assert_se(cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0) == 0);
- assert_se(cg_get_by_pid("name=systemd", getpid(), &path) == 0);
+ assert_se(cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0);
assert_se(streq(path, "/test-b"));
free(path);
- assert_se(cg_attach("name=systemd", "/test-a", 0) == 0);
+ assert_se(cg_attach(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0) == 0);
- assert_se(cg_get_by_pid("name=systemd", getpid(), &path) == 0);
+ assert_se(cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0);
assert_se(path_equal(path, "/test-a"));
free(path);
- assert_se(cg_create_and_attach("name=systemd", "/test-b/test-d", 0) == 0);
+ assert_se(cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-d", 0) == 0);
- assert_se(cg_get_by_pid("name=systemd", getpid(), &path) == 0);
+ assert_se(cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0);
assert_se(path_equal(path, "/test-b/test-d"));
free(path);
- assert_se(cg_get_path("name=systemd", "/test-b/test-d", NULL, &path) == 0);
+ assert_se(cg_get_path(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-d", NULL, &path) == 0);
assert_se(path_equal(path, "/cgroup/systemd/test-b/test-d"));
free(path);
- assert_se(cg_is_empty("name=systemd", "/test-a", false) > 0);
- assert_se(cg_is_empty("name=systemd", "/test-b", false) > 0);
- assert_se(cg_is_empty_recursive("name=systemd", "/test-a", false) > 0);
- assert_se(cg_is_empty_recursive("name=systemd", "/test-b", false) == 0);
+ assert_se(cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, "/test-a", false) > 0);
+ assert_se(cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 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("name=systemd", "/test-a", 0, false) == 0);
- assert_se(cg_kill_recursive("name=systemd", "/test-b", 0, false) > 0);
+ assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0, false) == 0);
+ assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false) > 0);
- assert_se(cg_migrate_recursive("name=systemd", "/test-b", "/test-a", false) == 0);
+ assert_se(cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", "/test-a", false) == 0);
- assert_se(cg_is_empty_recursive("name=systemd", "/test-a", false) == 0);
- assert_se(cg_is_empty_recursive("name=systemd", "/test-b", 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("name=systemd", "/test-a", 0, false) > 0);
- assert_se(cg_kill_recursive("name=systemd", "/test-b", 0, false) == 0);
+ assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0, false) > 0);
+ assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false) == 0);
- cg_trim("name=systemd", "/", false);
+ cg_trim(SYSTEMD_CGROUP_CONTROLLER, "/", false);
- assert_se(cg_delete("name=systemd", "/test-b") < 0);
- assert_se(cg_delete("name=systemd", "/test-a") == 0);
+ assert_se(cg_delete(SYSTEMD_CGROUP_CONTROLLER, "/test-b") < 0);
+ assert_se(cg_delete(SYSTEMD_CGROUP_CONTROLLER, "/test-a") == 0);
return 0;
}