summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/cgroup-util.c42
-rw-r--r--src/shared/cgroup-util.h2
2 files changed, 22 insertions, 22 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index 88bc33e3d5..2c2ffc5898 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1082,42 +1082,42 @@ int cg_get_root_path(char **path) {
return 0;
}
-int cg_pid_get_path_shifted(pid_t pid, char **root, char **cgroup) {
+int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
_cleanup_free_ char *cg_root = NULL;
char *cg_process, *p;
int r;
- r = cg_get_root_path(&cg_root);
- if (r < 0)
- return r;
+ assert(pid >= 0);
+ assert(cgroup);
+
+ if (!root) {
+ /* If the root was specified let's use that, otherwise
+ * let's determine it from PID 1 */
+
+ r = cg_get_root_path(&cg_root);
+ if (r < 0)
+ return r;
+
+ root = cg_root;
+ }
r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &cg_process);
if (r < 0)
return r;
- p = path_startswith(cg_process, cg_root);
- if (p)
- p--;
- else
- p = cg_process;
+ p = path_startswith(cg_process, root);
+ if (p) {
+ char *c;
- if (cgroup) {
- char* c;
+ c = strdup(p - 1);
+ free(cg_process);
- c = strdup(p);
- if (!c) {
- free(cg_process);
+ if (!c)
return -ENOMEM;
- }
*cgroup = c;
- }
-
- if (root) {
- cg_process[p-cg_process] = 0;
- *root = cg_process;
} else
- free(cg_process);
+ *cgroup = cg_process;
return 0;
}
diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h
index b64457300a..3e6a3f6abe 100644
--- a/src/shared/cgroup-util.h
+++ b/src/shared/cgroup-util.h
@@ -103,7 +103,7 @@ int cg_path_get_user_unit(const char *path, char **unit);
int cg_path_get_machine_name(const char *path, char **machine);
int cg_path_get_slice(const char *path, char **slice);
-int cg_pid_get_path_shifted(pid_t pid, char **root, char **cgroup);
+int cg_pid_get_path_shifted(pid_t pid, const char *cached_root, char **cgroup);
int cg_pid_get_session(pid_t pid, char **session);
int cg_pid_get_owner_uid(pid_t pid, uid_t *uid);