chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build-sys: Add --disable-hostnamed configure switch
[elogind.git]
/
src
/
cgroup-util.c
diff --git
a/src/cgroup-util.c
b/src/cgroup-util.c
index 090573bd31ee7d0167e47f7ef3603ee0c6082623..fd0ac98e28faad081e1b2faa17425b592f2e9ea7 100644
(file)
--- a/
src/cgroup-util.c
+++ b/
src/cgroup-util.c
@@
-482,13
+482,26
@@
finish:
int cg_get_path(const char *controller, const char *path, const char *suffix, char **fs) {
const char *p;
int cg_get_path(const char *controller, const char *path, const char *suffix, char **fs) {
const char *p;
- char *mp;
- int r;
+ char *t;
static __thread bool good = false;
assert(controller);
assert(fs);
static __thread bool good = false;
assert(controller);
assert(fs);
+ if (_unlikely_(!good)) {
+ int r;
+
+ r = path_is_mount_point("/sys/fs/cgroup");
+ if (r <= 0)
+ return r < 0 ? r : -ENOENT;
+
+ /* Cache this to save a few stat()s */
+ good = true;
+ }
+
+ if (isempty(controller))
+ return -EINVAL;
+
/* This is a very minimal lookup from controller names to
* paths. Since we have mounted most hierarchies ourselves
* should be kinda safe, but eventually we might want to
/* This is a very minimal lookup from controller names to
* paths. Since we have mounted most hierarchies ourselves
* should be kinda safe, but eventually we might want to
@@
-502,34
+515,22
@@
int cg_get_path(const char *controller, const char *path, const char *suffix, ch
else
p = controller;
else
p = controller;
- if (asprintf(&mp, "/sys/fs/cgroup/%s", p) < 0)
- return -ENOMEM;
-
- if (!good) {
- if ((r = path_is_mount_point(mp)) <= 0) {
- free(mp);
- return r < 0 ? r : -ENOENT;
- }
-
- /* Cache this to save a few stat()s */
- good = true;
- }
-
if (path && suffix)
if (path && suffix)
-
r = asprintf(fs, "%s/%s/%s", mp, path, suffix
);
+
t = join("/sys/fs/cgroup/", p, "/", path, "/", suffix, NULL
);
else if (path)
else if (path)
-
r = asprintf(fs, "%s/%s", mp, path
);
+
t = join("/sys/fs/cgroup/", p, "/", path, NULL
);
else if (suffix)
else if (suffix)
- r = asprintf(fs, "%s/%s", mp, suffix);
- else {
- path_kill_slashes(mp);
- *fs = mp;
- return 0;
- }
+ t = join("/sys/fs/cgroup/", p, "/", suffix, NULL);
+ else
+ t = join("/sys/fs/cgroup/", p, NULL);
- free(mp);
- path_kill_slashes(*fs);
- return r < 0 ? -ENOMEM : 0;
+ if (!t)
+ return -ENOMEM;
+
+ path_kill_slashes(t);
+
+ *fs = t;
+ return 0;
}
int cg_trim(const char *controller, const char *path, bool delete_root) {
}
int cg_trim(const char *controller, const char *path, bool delete_root) {