chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for building elogind against musl libc
[elogind.git]
/
src
/
basic
/
cgroup-util.c
diff --git
a/src/basic/cgroup-util.c
b/src/basic/cgroup-util.c
index cd5db6f69c1ab46ed94efdb01bc43a12217a6766..c83010d8ad8945d92b70d5b936eff3ef2b14e633 100644
(file)
--- a/
src/basic/cgroup-util.c
+++ b/
src/basic/cgroup-util.c
@@
-297,6
+297,10
@@
int cg_migrate(const char *cfrom, const char *pfrom, const char *cto, const char
my_pid = getpid();
my_pid = getpid();
+ log_debug_elogind("Migrating \"%s\"/\"%s\" to \"%s\"/\"%s\" (%s)",
+ cfrom, pfrom, cto, pto,
+ ignore_self ? "ignoring self" : "watching self");
+
do {
_cleanup_fclose_ FILE *f = NULL;
pid_t pid = 0;
do {
_cleanup_fclose_ FILE *f = NULL;
pid_t pid = 0;
@@
-457,7
+461,7
@@
static const char *controller_to_dirname(const char *controller) {
if (e)
return e;
if (e)
return e;
-
return controller;
+ return controller;
}
static int join_path_legacy(const char *controller, const char *path, const char *suffix, char **fs) {
}
static int join_path_legacy(const char *controller, const char *path, const char *suffix, char **fs) {
@@
-542,8
+546,9
@@
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);
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;
path_kill_slashes(*fs);
return 0;
@@
-570,7
+575,7
@@
static int controller_is_accessible(const char *controller) {
* the unified hierarchy. */
if (streq(controller, ELOGIND_CGROUP_CONTROLLER))
* the unified hierarchy. */
if (streq(controller, ELOGIND_CGROUP_CONTROLLER))
- return 0;
+
return 0;
if (startswith(controller, "name="))
return -EOPNOTSUPP;
if (startswith(controller, "name="))
return -EOPNOTSUPP;
@@
-581,8
+586,8
@@
static int controller_is_accessible(const char *controller) {
dn = controller_to_dirname(controller);
cc = strjoina("/sys/fs/cgroup/", dn);
dn = controller_to_dirname(controller);
cc = strjoina("/sys/fs/cgroup/", dn);
- if (laccess(cc, F_OK) < 0)
- return -errno;
+
if (laccess(cc, F_OK) < 0)
+
return -errno;
}
return 0;
}
return 0;
@@
-811,16
+816,18
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
if (unified < 0)
return unified;
if (unified == 0) {
if (unified < 0)
return unified;
if (unified == 0) {
- if (controller) {
- if (!cg_controller_is_valid(controller))
- return -EINVAL;
- } else
- controller = ELOGIND_CGROUP_CONTROLLER;
+
if (controller) {
+
if (!cg_controller_is_valid(controller))
+
return -EINVAL;
+
} else
+
controller = ELOGIND_CGROUP_CONTROLLER;
cs = strlen(controller);
}
fs = procfs_file_alloca(pid, "cgroup");
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;
f = fopen(fs, "re");
if (!f)
return errno == ENOENT ? -ESRCH : -errno;
@@
-840,31
+847,32
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
continue;
} else {
char *l;
continue;
} else {
char *l;
- size_t k;
- const char *word, *state;
- bool found = false;
+
size_t k;
+
const char *word, *state;
+
bool found = false;
- l = strchr(line, ':');
- if (!l)
- continue;
+
l = strchr(line, ':');
+
if (!l)
+
continue;
- l++;
- e = strchr(l, ':');
- if (!e)
- continue;
+
l++;
+
e = strchr(l, ':');
+
if (!e)
+
continue;
- *e = 0;
- FOREACH_WORD_SEPARATOR(word, k, l, ",", state) {
- if (k == cs && memcmp(word, controller, cs) == 0) {
- found = true;
- break;
+ *e = 0;
+ FOREACH_WORD_SEPARATOR(word, k, l, ",", state) {
+ if (k == cs && memcmp(word, controller, cs) == 0) {
+ found = true;
+ break;
+ }
}
}
- }
- if (!found)
- continue;
+
if (!found)
+
continue;
}
}
+ log_debug_elogind("Found %s:%s", line, e+1);
p = strdup(e + 1);
if (!p)
return -ENOMEM;
p = strdup(e + 1);
if (!p)
return -ENOMEM;
@@
-1001,8
+1009,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);
* 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)
r = read_one_line_file(populated, &t);
if (r == -ENOENT)
@@
-1012,33
+1020,33
@@
int cg_is_empty_recursive(const char *controller, const char *path) {
return streq(t, "0");
} else {
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);
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;
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);
r = cg_is_empty_recursive(controller, p);
- if (r <= 0)
+ if (r <= 0)
+ return r;
+ }
+ if (r < 0)
return r;
return r;
- }
- if (r < 0)
- return r;
return true;
}
return true;
}
@@
-1199,10
+1207,11
@@
int cg_shift_path(const char *cgroup, const char *root, const char **shifted) {
return r;
root = rt;
return r;
root = rt;
+ log_debug_elogind("Determined root path: \"%s\"", root);
}
p = path_startswith(cgroup, root);
}
p = path_startswith(cgroup, root);
- if (p && p
> cgroup
)
+ if (p && p
[0] && (p > cgroup)
)
*shifted = p - 1;
else
*shifted = cgroup;
*shifted = p - 1;
else
*shifted = cgroup;
@@
-1222,6
+1231,8
@@
int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
if (r < 0)
return r;
if (r < 0)
return r;
+ log_debug_elogind("Shifting path: \"%s\" (PID %u, root: \"%s\")",
+ raw, pid, root ? root : "NULL");
r = cg_shift_path(raw, root, &c);
if (r < 0)
return r;
r = cg_shift_path(raw, root, &c);
if (r < 0)
return r;
@@
-1238,6
+1249,7
@@
int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
*cgroup = n;
}
*cgroup = n;
}
+ log_debug_elogind("Resulting cgroup:\"%s\"", *cgroup);
return 0;
}
return 0;
}
@@
-1522,6
+1534,7
@@
int cg_path_get_session(const char *path, char **session) {
const char *e, *n, *start;
assert(path);
const char *e, *n, *start;
assert(path);
+ log_debug_elogind("path is \"%s\"", path);
assert(path[0] == '/');
e = path + 1;
assert(path[0] == '/');
e = path + 1;
@@
-1539,6
+1552,7
@@
int cg_path_get_session(const char *path, char **session) {
if (session) {
char *rr;
if (session) {
char *rr;
+ log_debug_elogind("found session: \"%s\"", start);
rr = strdup(start);
if (!rr)
return -ENOMEM;
rr = strdup(start);
if (!rr)
return -ENOMEM;
@@
-1715,7
+1729,7
@@
char *cg_escape(const char *p) {
if (memcmp(p, n, l) != 0)
continue;
if (memcmp(p, n, l) != 0)
continue;
-
need_prefix = true;
+ need_prefix = true;
break;
}
}
break;
}
}
@@
-1724,7
+1738,7
@@
char *cg_escape(const char *p) {
if (need_prefix)
return strappend("_", p);
if (need_prefix)
return strappend("_", p);
-
return strdup(p);
+ return strdup(p);
}
char *cg_unescape(const char *p) {
}
char *cg_unescape(const char *p) {
@@
-1897,7
+1911,6
@@
int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
return 0;
}
return 0;
}
-#endif // 0
int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_migrate_callback_t path_callback, void *userdata) {
CGroupController c;
int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_migrate_callback_t path_callback, void *userdata) {
CGroupController c;
@@
-1932,8
+1945,6
@@
int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m
return 0;
}
return 0;
}
-/// UNNEEDED by elogind
-#if 0
int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids, cg_migrate_callback_t path_callback, void *userdata) {
Iterator i;
void *pidp;
int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids, cg_migrate_callback_t path_callback, void *userdata) {
Iterator i;
void *pidp;
@@
-2171,7
+2182,7
@@
int cg_unified(void) {
else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC))
#else
if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC))
else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC))
#else
if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC))
-#endif //
elogind
+#endif //
0
unified_cache = false;
else
return -ENOEXEC;
unified_cache = false;
else
return -ENOEXEC;
@@
-2227,7
+2238,6
@@
int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
return 0;
}
return 0;
}
-#endif // 0
bool cg_is_unified_wanted(void) {
static thread_local int wanted = -1;
bool cg_is_unified_wanted(void) {
static thread_local int wanted = -1;
@@
-2261,8
+2271,6
@@
bool cg_is_unified_wanted(void) {
}
}
}
}
-/// UNNEEDED by elogind
-#if 0
bool cg_is_legacy_wanted(void) {
return !cg_is_unified_wanted();
}
bool cg_is_legacy_wanted(void) {
return !cg_is_unified_wanted();
}