return 0;
}
-int cg_migrate(const char *controller, const char *from, const char *to, bool ignore_self) {
+int cg_migrate(const char *cfrom, const char *pfrom, const char *cto, const char *pto, bool ignore_self) {
bool done = false;
- Set *s;
+ _cleanup_set_free_ Set *s = NULL;
int r, ret = 0;
pid_t my_pid;
- FILE *f = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
- assert(controller);
- assert(from);
- assert(to);
+ assert(cfrom);
+ assert(pfrom);
+ assert(cto);
+ assert(pto);
- if (!(s = set_new(trivial_hash_func, trivial_compare_func)))
+ s = set_new(trivial_hash_func, trivial_compare_func);
+ if (!s)
return -ENOMEM;
my_pid = getpid();
pid_t pid = 0;
done = true;
- if ((r = cg_enumerate_tasks(controller, from, &f)) < 0) {
+ r = cg_enumerate_tasks(cfrom, pfrom, &f);
+ if (r < 0) {
if (ret >= 0 && r != -ENOENT)
ret = r;
- goto finish;
+ return ret;
}
while ((r = cg_read_pid(f, &pid)) > 0) {
if (set_get(s, LONG_TO_PTR(pid)) == LONG_TO_PTR(pid))
continue;
- if ((r = cg_attach(controller, to, pid)) < 0) {
+ r = cg_attach(cto, pto, pid);
+ if (r < 0) {
if (ret >= 0 && r != -ESRCH)
ret = r;
} else if (ret == 0)
done = false;
- if ((r = set_put(s, LONG_TO_PTR(pid))) < 0) {
+ r = set_put(s, LONG_TO_PTR(pid));
+ if (r < 0) {
if (ret >= 0)
ret = r;
- goto finish;
+ return ret;
}
}
if (ret >= 0)
ret = r;
- goto finish;
+ return ret;
}
fclose(f);
f = NULL;
-
} while (!done);
-finish:
- set_free(s);
-
- if (f)
- fclose(f);
-
return ret;
}
-int cg_migrate_recursive(const char *controller, const char *from, const char *to, bool ignore_self, bool rem) {
+int cg_migrate_recursive(const char *cfrom, const char *pfrom, const char *cto, const char *pto, bool ignore_self, bool rem) {
int r, ret = 0;
- DIR *d = NULL;
+ _cleanup_closedir_ DIR *d = NULL;
char *fn;
- assert(controller);
- assert(from);
- assert(to);
+ assert(cfrom);
+ assert(pfrom);
+ assert(cto);
+ assert(pto);
- ret = cg_migrate(controller, from, to, ignore_self);
+ ret = cg_migrate(cfrom, pfrom, cto, pto, ignore_self);
- if ((r = cg_enumerate_subgroups(controller, from, &d)) < 0) {
+ r = cg_enumerate_subgroups(cfrom, pfrom, &d);
+ if (r < 0) {
if (ret >= 0 && r != -ENOENT)
ret = r;
- goto finish;
+ return ret;
}
while ((r = cg_read_subgroup(d, &fn)) > 0) {
- char *p = NULL;
+ _cleanup_free_ char *p = NULL;
- r = asprintf(&p, "%s/%s", from, fn);
+ p = strjoin(pfrom, "/", fn, NULL);
free(fn);
-
- if (r < 0) {
+ if (!p) {
if (ret >= 0)
ret = -ENOMEM;
- goto finish;
+ return ret;
}
- r = cg_migrate_recursive(controller, p, to, ignore_self, rem);
- free(p);
-
+ r = cg_migrate_recursive(cfrom, p, cto, pto, ignore_self, rem);
if (r != 0 && ret >= 0)
ret = r;
}
if (r < 0 && ret >= 0)
ret = r;
- if (rem)
- if ((r = cg_rmdir(controller, from, true)) < 0) {
- if (ret >= 0 &&
- r != -ENOENT &&
- r != -EBUSY)
- ret = r;
- }
-
-finish:
- if (d)
- closedir(d);
+ if (rem) {
+ r = cg_rmdir(cfrom, pfrom, true);
+ if (r < 0 && ret >= 0 && r != -ENOENT && r != -EBUSY)
+ return r;
+ }
return ret;
}
if (controller) {
if (path && suffix)
- t = join("/sys/fs/cgroup/", controller, "/", path, "/", suffix, NULL);
+ t = strjoin("/sys/fs/cgroup/", controller, "/", path, "/", suffix, NULL);
else if (path)
- t = join("/sys/fs/cgroup/", controller, "/", path, NULL);
+ t = strjoin("/sys/fs/cgroup/", controller, "/", path, NULL);
else if (suffix)
- t = join("/sys/fs/cgroup/", controller, "/", suffix, NULL);
+ t = strjoin("/sys/fs/cgroup/", controller, "/", suffix, NULL);
else
- t = join("/sys/fs/cgroup/", controller, NULL);
+ t = strjoin("/sys/fs/cgroup/", controller, NULL);
} else {
if (path && suffix)
- t = join(path, "/", suffix, NULL);
+ t = strjoin(path, "/", suffix, NULL);
else if (path)
t = strdup(path);
}
if ((r = path_get_parent(path, &parent)) < 0)
return r;
- r = cg_migrate_recursive(controller, path, parent, false, true);
+ r = cg_migrate_recursive(controller, path, controller, parent, false, true);
free(parent);
return r == -ENOENT ? 0 : r;
return !found;
}
+int cg_is_empty_by_spec(const char *spec, bool ignore_self) {
+ int r;
+ _cleanup_free_ char *controller = NULL, *path = NULL;
+
+ assert(spec);
+
+ r = cg_split_spec(spec, &controller, &path);
+ if (r < 0)
+ return r;
+
+ return cg_is_empty(controller, path, ignore_self);
+}
+
int cg_is_empty_recursive(const char *controller, const char *path, bool ignore_self) {
int r;
DIR *d = NULL;
char *t = NULL, *u = NULL;
assert(spec);
- assert(controller || path);
if (*spec == '/') {
if (path) {
- if (!(t = strdup(spec)))
+ t = strdup(spec);
+ if (!t)
return -ENOMEM;
*path = t;
return 0;
}
- if (!(e = strchr(spec, ':'))) {
-
+ e = strchr(spec, ':');
+ if (!e) {
if (strchr(spec, '/') || spec[0] == 0)
return -EINVAL;
if (controller) {
- if (!(t = strdup(spec)))
+ t = strdup(spec);
+ if (!t)
return -ENOMEM;
*controller = t;
return 0;
}
- if (e[1] != '/' ||
- e == spec ||
- memchr(spec, '/', e-spec))
+ if (e[1] != '/' || e == spec || memchr(spec, '/', e-spec))
return -EINVAL;
- if (controller)
- if (!(t = strndup(spec, e-spec)))
+ if (controller) {
+ t = strndup(spec, e-spec);
+ if (!t)
return -ENOMEM;
- if (path)
- if (!(u = strdup(e+1))) {
+ }
+
+ if (path) {
+ u = strdup(e+1);
+ if (!u) {
free(t);
return -ENOMEM;
}
+ }
if (controller)
*controller = t;
*t = NULL;
return controllers;
}
+
+int cg_pid_get_cgroup(pid_t pid, char **root, char **cgroup) {
+ char *cg_process, *cg_init, *p;
+ int r;
+
+ assert(pid >= 0);
+
+ if (pid == 0)
+ pid = getpid();
+
+ r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &cg_process);
+ if (r < 0)
+ return r;
+
+ r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &cg_init);
+ if (r < 0) {
+ free(cg_process);
+ return r;
+ }
+
+ if (endswith(cg_init, "/system"))
+ cg_init[strlen(cg_init)-7] = 0;
+ else if (streq(cg_init, "/"))
+ cg_init[0] = 0;
+
+ if (startswith(cg_process, cg_init))
+ p = cg_process + strlen(cg_init);
+ else
+ p = cg_process;
+
+ free(cg_init);
+
+ if (cgroup) {
+ char* c;
+
+ c = strdup(p);
+ if (!c) {
+ free(cg_process);
+ return -ENOMEM;
+ }
+
+ *cgroup = c;
+ }
+
+ if (root) {
+ cg_process[p-cg_process] = 0;
+ *root = cg_process;
+ } else
+ free(cg_process);
+
+ return 0;
+}
+
+int cg_pid_get_unit(pid_t pid, char **unit) {
+ int r;
+ char *cgroup, *p, *at, *b;
+ size_t k;
+
+ assert(pid >= 0);
+ assert(unit);
+
+ r = cg_pid_get_cgroup(pid, NULL, &cgroup);
+ if (r < 0)
+ return r;
+
+ if (!startswith(cgroup, "/system/")) {
+ free(cgroup);
+ return -ENOENT;
+ }
+
+ p = cgroup + 8;
+ k = strcspn(p, "/");
+
+ at = memchr(p, '@', k);
+ if (at && at[1] == '.') {
+ size_t j;
+
+ /* This is a templated service */
+ if (p[k] != '/') {
+ free(cgroup);
+ return -EIO;
+ }
+
+ j = strcspn(p+k+1, "/");
+
+ b = malloc(k + j + 1);
+
+ if (b) {
+ memcpy(b, p, at - p + 1);
+ memcpy(b + (at - p) + 1, p + k + 1, j);
+ memcpy(b + (at - p) + 1 + j, at + 1, k - (at - p) - 1);
+ b[k+j] = 0;
+ }
+ } else
+ b = strndup(p, k);
+
+ free(cgroup);
+
+ if (!b)
+ return -ENOMEM;
+
+ *unit = b;
+ return 0;
+
+}
~ianmdlvl / elogind.git / blobdiff