X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fbasic%2Fcgroup-util.c;h=3506ca8bffaf0c1b1085c3121c2b10d76e4deffb;hb=27e59415d0da0580569d6c48434ebc3c18c0d73c;hp=5dc631eee410a97a8fa6e277f20a781a5dabd414;hpb=c6999740c1a68767c5397306b8d7e14e08533111;p=elogind.git
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 5dc631eee..3506ca8bf 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
@@ -19,28 +17,45 @@
along with systemd; If not, see .
***/
+#include
#include
-#include
+#include
+//#include
#include
-#include
+//#include
#include
-#include
+#include
#include
+//#include
#include
-#include
+#include
-#include "set.h"
-#include "macro.h"
-#include "util.h"
-#include "formats-util.h"
-#include "process-util.h"
-#include "path-util.h"
-// #include "unit-name.h"
+#include "alloc-util.h"
+#include "cgroup-util.h"
+//#include "def.h"
+#include "dirent-util.h"
+#include "extract-word.h"
+#include "fd-util.h"
#include "fileio.h"
-// #include "special.h"
-#include "mkdir.h"
+#include "formats-util.h"
+#include "fs-util.h"
+//#include "log.h"
#include "login-util.h"
-#include "cgroup-util.h"
+#include "macro.h"
+//#include "missing.h"
+#include "mkdir.h"
+#include "parse-util.h"
+#include "path-util.h"
+#include "proc-cmdline.h"
+#include "process-util.h"
+#include "set.h"
+//#include "special.h"
+#include "stat-util.h"
+#include "stdio-util.h"
+#include "string-table.h"
+#include "string-util.h"
+#include "unit-name.h"
+#include "user-util.h"
int cg_enumerate_processes(const char *controller, const char *path, FILE **_f) {
_cleanup_free_ char *fs = NULL;
@@ -76,7 +91,7 @@ int cg_read_pid(FILE *f, pid_t *_pid) {
if (feof(f))
return 0;
- return errno ? -errno : -EIO;
+ return errno > 0 ? -errno : -EIO;
}
if (ul <= 0)
@@ -461,7 +476,7 @@ static const char *controller_to_dirname(const char *controller) {
if (e)
return e;
- return controller;
+ return controller;
}
static int join_path_legacy(const char *controller, const char *path, const char *suffix, char **fs) {
@@ -520,7 +535,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
* *below* the controllers, without any prefix. */
if (!path && !suffix)
- return -EINVAL;
+ return -EINVAL;
if (!suffix)
t = strdup(path);
@@ -546,12 +561,12 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
r = join_path_unified(path, suffix, fs);
else
r = join_path_legacy(controller, path, suffix, fs);
- if (r < 0)
- return r;
+ if (r < 0)
+ return r;
path_kill_slashes(*fs);
return 0;
- }
+}
static int controller_is_accessible(const char *controller) {
int unified;
@@ -573,7 +588,7 @@ static int controller_is_accessible(const char *controller) {
/* We don't support named hierarchies if we are using
* the unified hierarchy. */
- if (streq(controller, ELOGIND_CGROUP_CONTROLLER))
+ if (streq(controller, SYSTEMD_CGROUP_CONTROLLER))
return 0;
if (startswith(controller, "name="))
@@ -635,7 +650,7 @@ int cg_trim(const char *controller, const char *path, bool delete_root) {
if (nftw(fs, trim_cb, 64, FTW_DEPTH|FTW_MOUNT|FTW_PHYS) != 0) {
if (errno == ENOENT)
r = 0;
- else if (errno != 0)
+ else if (errno > 0)
r = -errno;
else
r = -EIO;
@@ -704,9 +719,9 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
if (pid == 0)
pid = getpid();
- snprintf(c, sizeof(c), PID_FMT"\n", pid);
+ xsprintf(c, PID_FMT "\n", pid);
- return write_string_file_no_create(fs, c);
+ return write_string_file(fs, c, 0);
}
int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
@@ -735,8 +750,7 @@ int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
return r;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int cg_set_group_access(
const char *controller,
const char *path,
@@ -819,12 +833,14 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
if (!cg_controller_is_valid(controller))
return -EINVAL;
} else
- controller = ELOGIND_CGROUP_CONTROLLER;
+ controller = SYSTEMD_CGROUP_CONTROLLER;
cs = strlen(controller);
}
fs = procfs_file_alloca(pid, "cgroup");
+ log_debug_elogind("Searching for PID %u in \"%s\" (controller \"%s\")",
+ pid, fs, controller);
f = fopen(fs, "re");
if (!f)
return errno == ENOENT ? -ESRCH : -errno;
@@ -869,6 +885,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
continue;
}
+ log_debug_elogind("Found %s:%s", line, e+1);
p = strdup(e + 1);
if (!p)
return -ENOMEM;
@@ -903,7 +920,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
sc = strstrip(contents);
if (isempty(sc)) {
- r = write_string_file_no_create(fs, agent);
+ r = write_string_file(fs, agent, 0);
if (r < 0)
return r;
} else if (!path_equal(sc, agent))
@@ -921,7 +938,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
sc = strstrip(contents);
if (streq(sc, "0")) {
- r = write_string_file_no_create(fs, "1");
+ r = write_string_file(fs, "1", 0);
if (r < 0)
return r;
@@ -948,7 +965,7 @@ int cg_uninstall_release_agent(const char *controller) {
if (r < 0)
return r;
- r = write_string_file_no_create(fs, "0");
+ r = write_string_file(fs, "0", 0);
if (r < 0)
return r;
@@ -958,7 +975,7 @@ int cg_uninstall_release_agent(const char *controller) {
if (r < 0)
return r;
- r = write_string_file_no_create(fs, "");
+ r = write_string_file(fs, "", 0);
if (r < 0)
return r;
@@ -1005,8 +1022,8 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
* via the "cgroup.populated" attribute. */
r = cg_get_path(controller, path, "cgroup.populated", &populated);
- if (r < 0)
- return r;
+ if (r < 0)
+ return r;
r = read_one_line_file(populated, &t);
if (r == -ENOENT)
@@ -1016,33 +1033,33 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
return streq(t, "0");
} else {
- _cleanup_closedir_ DIR *d = NULL;
- char *fn;
+ _cleanup_closedir_ DIR *d = NULL;
+ char *fn;
r = cg_is_empty(controller, path);
- if (r <= 0)
- return r;
+ if (r <= 0)
+ return r;
- r = cg_enumerate_subgroups(controller, path, &d);
- if (r == -ENOENT)
- return 1;
- if (r < 0)
+ r = cg_enumerate_subgroups(controller, path, &d);
+ if (r == -ENOENT)
+ return 1;
+ if (r < 0)
return r;
- while ((r = cg_read_subgroup(d, &fn)) > 0) {
- _cleanup_free_ char *p = NULL;
+ while ((r = cg_read_subgroup(d, &fn)) > 0) {
+ _cleanup_free_ char *p = NULL;
- p = strjoin(path, "/", fn, NULL);
- free(fn);
- if (!p)
- return -ENOMEM;
+ p = strjoin(path, "/", fn, NULL);
+ free(fn);
+ if (!p)
+ return -ENOMEM;
r = cg_is_empty_recursive(controller, p);
- if (r <= 0)
+ if (r <= 0)
+ return r;
+ }
+ if (r < 0)
return r;
- }
- if (r < 0)
- return r;
return true;
}
@@ -1155,18 +1172,17 @@ int cg_mangle_path(const char *path, char **result) {
if (r < 0)
return r;
- return cg_get_path(c ? c : ELOGIND_CGROUP_CONTROLLER, p ? p : "/", NULL, result);
+ return cg_get_path(c ?: SYSTEMD_CGROUP_CONTROLLER, p ?: "/", NULL, result);
}
int cg_get_root_path(char **path) {
-/// elogind does not support systemd scopes and slices
-#if 0
+#if 0 /// elogind does not support systemd scopes and slices
char *p, *e;
int r;
assert(path);
- r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 1, &p);
+ r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, &p);
if (r < 0)
return r;
@@ -1182,7 +1198,7 @@ int cg_get_root_path(char **path) {
return 0;
#else
assert(path);
- return cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 1, path);
+ return cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, path);
#endif // 0
}
@@ -1223,7 +1239,7 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
assert(pid >= 0);
assert(cgroup);
- r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, pid, &raw);
+ r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &raw);
if (r < 0)
return r;
@@ -1250,8 +1266,7 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
return 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int cg_path_decode_unit(const char *cgroup, char **unit){
char *c, *s;
size_t n;
@@ -1570,8 +1585,7 @@ int cg_pid_get_session(pid_t pid, char **session) {
return cg_path_get_session(cgroup, session);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int cg_path_get_owner_uid(const char *path, uid_t *uid) {
_cleanup_free_ char *slice = NULL;
char *start, *end;
@@ -1725,7 +1739,7 @@ char *cg_escape(const char *p) {
if (memcmp(p, n, l) != 0)
continue;
- need_prefix = true;
+ need_prefix = true;
break;
}
}
@@ -1734,7 +1748,7 @@ char *cg_escape(const char *p) {
if (need_prefix)
return strappend("_", p);
- return strdup(p);
+ return strdup(p);
}
char *cg_unescape(const char *p) {
@@ -1776,8 +1790,7 @@ bool cg_controller_is_valid(const char *p) {
return true;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int cg_slice_to_path(const char *unit, char **ret) {
_cleanup_free_ char *p = NULL, *s = NULL, *e = NULL;
const char *dash;
@@ -1856,11 +1869,10 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
if (r < 0)
return r;
- return write_string_file_no_create(p, value);
+ return write_string_file(p, value, 0);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
_cleanup_free_ char *p = NULL;
int r;
@@ -1881,7 +1893,7 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
* in all others */
/* First create the cgroup in our own hierarchy. */
- r = cg_create(ELOGIND_CGROUP_CONTROLLER, path);
+ r = cg_create(SYSTEMD_CGROUP_CONTROLLER, path);
if (r < 0)
return r;
@@ -1912,7 +1924,7 @@ int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m
CGroupController c;
int r, unified;
- r = cg_attach(ELOGIND_CGROUP_CONTROLLER, path, pid);
+ r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, path, pid);
if (r < 0)
return r;
@@ -1963,7 +1975,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
int r = 0, unified;
if (!path_equal(from, to)) {
- r = cg_migrate_recursive(ELOGIND_CGROUP_CONTROLLER, from, ELOGIND_CGROUP_CONTROLLER, to, false, true);
+ r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, false, true);
if (r < 0)
return r;
}
@@ -1987,7 +1999,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
if (!p)
p = to;
- (void) cg_migrate_recursive_fallback(ELOGIND_CGROUP_CONTROLLER, to, cgroup_controller_to_string(c), p, false, false);
+ (void) cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, to, cgroup_controller_to_string(c), p, false, false);
}
return 0;
@@ -1997,7 +2009,7 @@ int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root)
CGroupController c;
int r, unified;
- r = cg_trim(ELOGIND_CGROUP_CONTROLLER, path, delete_root);
+ r = cg_trim(SYSTEMD_CGROUP_CONTROLLER, path, delete_root);
if (r < 0)
return r;
@@ -2043,7 +2055,7 @@ int cg_mask_supported(CGroupMask *ret) {
if (r < 0)
return r;
- r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, root, "cgroup.controllers", &path);
+ r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, root, "cgroup.controllers", &path);
if (r < 0)
return r;
@@ -2069,9 +2081,10 @@ int cg_mask_supported(CGroupMask *ret) {
mask |= CGROUP_CONTROLLER_TO_MASK(v);
}
- /* Currently, we only support the memory controller in
- * the unified hierarchy, mask everything else off. */
- mask &= CGROUP_MASK_MEMORY;
+ /* Currently, we only support the memory and pids
+ * controller in the unified hierarchy, mask
+ * everything else off. */
+ mask &= CGROUP_MASK_MEMORY | CGROUP_MASK_PIDS;
} else {
CGroupController c;
@@ -2092,8 +2105,7 @@ int cg_mask_supported(CGroupMask *ret) {
return 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int cg_kernel_controllers(Set *controllers) {
_cleanup_fclose_ FILE *f = NULL;
char buf[LINE_MAX];
@@ -2126,7 +2138,7 @@ int cg_kernel_controllers(Set *controllers) {
if (feof(f))
break;
- if (ferror(f) && errno != 0)
+ if (ferror(f) && errno > 0)
return -errno;
return -EBADMSG;
@@ -2186,8 +2198,7 @@ int cg_unified(void) {
return unified_cache;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
void cg_unified_flush(void) {
unified_cache = -1;
}
@@ -2208,7 +2219,7 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
if (!unified) /* on the legacy hiearchy there's no joining of controllers defined */
return 0;
- r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs);
+ r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs);
if (r < 0)
return r;
@@ -2270,6 +2281,52 @@ bool cg_is_unified_wanted(void) {
bool cg_is_legacy_wanted(void) {
return !cg_is_unified_wanted();
}
+#else
+bool cg_is_legacy_wanted(void) {
+ return true;
+}
+#endif // 0
+
+#if 0 /// UNNEEDED by elogind
+int cg_cpu_shares_parse(const char *s, uint64_t *ret) {
+ uint64_t u;
+ int r;
+
+ if (isempty(s)) {
+ *ret = CGROUP_CPU_SHARES_INVALID;
+ return 0;
+ }
+
+ r = safe_atou64(s, &u);
+ if (r < 0)
+ return r;
+
+ if (u < CGROUP_CPU_SHARES_MIN || u > CGROUP_CPU_SHARES_MAX)
+ return -ERANGE;
+
+ *ret = u;
+ return 0;
+}
+
+int cg_blkio_weight_parse(const char *s, uint64_t *ret) {
+ uint64_t u;
+ int r;
+
+ if (isempty(s)) {
+ *ret = CGROUP_BLKIO_WEIGHT_INVALID;
+ return 0;
+ }
+
+ r = safe_atou64(s, &u);
+ if (r < 0)
+ return r;
+
+ if (u < CGROUP_BLKIO_WEIGHT_MIN || u > CGROUP_BLKIO_WEIGHT_MAX)
+ return -ERANGE;
+
+ *ret = u;
+ return 0;
+}
#endif // 0
static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
@@ -2277,7 +2334,8 @@ static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
[CGROUP_CONTROLLER_CPUACCT] = "cpuacct",
[CGROUP_CONTROLLER_BLKIO] = "blkio",
[CGROUP_CONTROLLER_MEMORY] = "memory",
- [CGROUP_CONTROLLER_DEVICE] = "devices",
+ [CGROUP_CONTROLLER_DEVICES] = "devices",
+ [CGROUP_CONTROLLER_PIDS] = "pids",
};
DEFINE_STRING_TABLE_LOOKUP(cgroup_controller, CGroupController);