X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest-cgroup.c;h=486656b41ddadb0a8f30bdd46aabc08f111d2311;hp=389df6d39873d80893710d2d15fa83f717b0168a;hb=57b63f363ffeed8556da11eab395f902adcefd5b;hpb=8c6db8336536916d0476ff8233e0abf40a2f6aab

diff --git a/src/test-cgroup.c b/src/test-cgroup.c
index 389df6d39..486656b41 100644
--- a/src/test-cgroup.c
+++ b/src/test-cgroup.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -22,63 +22,83 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <libcgroup.h>
-
 #include "cgroup-util.h"
 #include "util.h"
 #include "log.h"
 
 int main(int argc, char*argv[]) {
         char *path;
+        char *c, *p;
 
-        assert_se(cgroup_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(path_equal(path, "/cgroup/systemd/test-b/test-d"));
+        assert_se(cg_get_path(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-d", NULL, &path) == 0);
+        assert_se(path_equal(path, "/sys/fs/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(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, NULL) > 0);
+        assert_se(cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0, false, false, NULL) == 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);
+        cg_trim(SYSTEMD_CGROUP_CONTROLLER, "/", false);
 
-        assert_se(cg_migrate_recursive("name=systemd", "/test-b", "/test-a", false) == 0);
+        assert_se(cg_delete(SYSTEMD_CGROUP_CONTROLLER, "/test-b") < 0);
+        assert_se(cg_delete(SYSTEMD_CGROUP_CONTROLLER, "/test-a") >= 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_split_spec("foobar:/", &c, &p) == 0);
+        assert(streq(c, "foobar"));
+        assert(streq(p, "/"));
+        free(c);
+        free(p);
 
-        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_split_spec("foobar:", &c, &p) < 0);
+        assert_se(cg_split_spec("foobar:asdfd", &c, &p) < 0);
+        assert_se(cg_split_spec(":///", &c, &p) < 0);
+        assert_se(cg_split_spec(":", &c, &p) < 0);
+        assert_se(cg_split_spec("", &c, &p) < 0);
+        assert_se(cg_split_spec("fo/obar:/", &c, &p) < 0);
 
-        cg_trim("name=systemd", "/", false);
+        assert_se(cg_split_spec("/", &c, &p) >= 0);
+        assert(c == NULL);
+        assert(streq(p, "/"));
+        free(p);
 
-        assert_se(cg_delete("name=systemd", "/test-b") < 0);
-        assert_se(cg_delete("name=systemd", "/test-a") == 0);
+        assert_se(cg_split_spec("foo", &c, &p) >= 0);
+        assert(streq(c, "foo"));
+        assert(p == NULL);
+        free(c);
 
         return 0;
 }