chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time-util: when formatting usec_t as raw integers use PRIu64
[elogind.git]
/
src
/
basic
/
cgroup-util.c
diff --git
a/src/basic/cgroup-util.c
b/src/basic/cgroup-util.c
index 272fb19735df8d068cec1dc3d5f057d8c9cac4b4..32cf4298f2628438fc6f843d2300e98fbc3b0c95 100644
(file)
--- a/
src/basic/cgroup-util.c
+++ b/
src/basic/cgroup-util.c
@@
-548,9
+548,6
@@
static const char *controller_to_dirname(const char *controller) {
* just cuts off the name= prefixed used for named
* hierarchies, if it is specified. */
* just cuts off the name= prefixed used for named
* hierarchies, if it is specified. */
- if (streq(controller, SYSTEMD_CGROUP_CONTROLLER))
- controller = SYSTEMD_CGROUP_CONTROLLER_LEGACY;
-
e = startswith(controller, "name=");
if (e)
return e;
e = startswith(controller, "name=");
if (e)
return e;
@@
-603,7
+600,7
@@
static int join_path_unified(const char *path, const char *suffix, char **fs) {
}
int cg_get_path(const char *controller, const char *path, const char *suffix, char **fs) {
}
int cg_get_path(const char *controller, const char *path, const char *suffix, char **fs) {
- int r;
+ int
unified,
r;
assert(fs);
assert(fs);
@@
-632,7
+629,11
@@
int cg_get_path(const char *controller, const char *path, const char *suffix, ch
if (!cg_controller_is_valid(controller))
return -EINVAL;
if (!cg_controller_is_valid(controller))
return -EINVAL;
- if (cg_all_unified())
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+
+ if (unified > 0)
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);
@@
-644,6
+645,7
@@
int cg_get_path(const char *controller, const char *path, const char *suffix, ch
}
static int controller_is_accessible(const char *controller) {
}
static int controller_is_accessible(const char *controller) {
+ int unified;
assert(controller);
assert(controller);
@@
-655,7
+657,10
@@
static int controller_is_accessible(const char *controller) {
if (!cg_controller_is_valid(controller))
return -EINVAL;
if (!cg_controller_is_valid(controller))
return -EINVAL;
- if (cg_all_unified()) {
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (unified > 0) {
/* We don't support named hierarchies if we are using
* the unified hierarchy. */
/* We don't support named hierarchies if we are using
* the unified hierarchy. */
@@
-853,7
+858,7
@@
int cg_set_task_access(
gid_t gid) {
_cleanup_free_ char *fs = NULL, *procs = NULL;
gid_t gid) {
_cleanup_free_ char *fs = NULL, *procs = NULL;
- int r;
+ int r
, unified
;
assert(path);
assert(path);
@@
-871,7
+876,10
@@
int cg_set_task_access(
if (r < 0)
return r;
if (r < 0)
return r;
- if (cg_unified(controller))
+ unified = cg_unified(controller);
+ if (unified < 0)
+ return unified;
+ if (unified)
return 0;
/* Compatibility, Always keep values for "tasks" in sync with
return 0;
/* Compatibility, Always keep values for "tasks" in sync with
@@
-923,9
+931,9
@@
int cg_get_xattr(const char *controller, const char *path, const char *name, voi
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX];
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX];
- const char *fs
, *controller_str
;
+ const char *fs;
size_t cs = 0;
size_t cs = 0;
-
bool
unified;
+
int
unified;
assert(path);
assert(pid >= 0);
assert(path);
assert(pid >= 0);
@@
-937,14
+945,10
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
controller = SYSTEMD_CGROUP_CONTROLLER;
unified = cg_unified(controller);
controller = SYSTEMD_CGROUP_CONTROLLER;
unified = cg_unified(controller);
- if (!unified) {
- if (streq(controller, SYSTEMD_CGROUP_CONTROLLER))
- controller_str = SYSTEMD_CGROUP_CONTROLLER_LEGACY;
- else
- controller_str = controller;
-
- cs = strlen(controller_str);
- }
+ if (unified < 0)
+ return unified;
+ if (unified == 0)
+ cs = strlen(controller);
fs = procfs_file_alloca(pid, "cgroup");
log_debug_elogind("Searching for PID %u in \"%s\" (controller \"%s\")",
fs = procfs_file_alloca(pid, "cgroup");
log_debug_elogind("Searching for PID %u in \"%s\" (controller \"%s\")",
@@
-983,7
+987,7
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
*e = 0;
FOREACH_WORD_SEPARATOR(word, k, l, ",", state) {
*e = 0;
FOREACH_WORD_SEPARATOR(word, k, l, ",", state) {
- if (k == cs && memcmp(word, controller
_str
, cs) == 0) {
+ if (k == cs && memcmp(word, controller, cs) == 0) {
found = true;
break;
}
found = true;
break;
}
@@
-1008,11
+1012,14
@@
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
int cg_install_release_agent(const char *controller, const char *agent) {
_cleanup_free_ char *fs = NULL, *contents = NULL;
const char *sc;
int cg_install_release_agent(const char *controller, const char *agent) {
_cleanup_free_ char *fs = NULL, *contents = NULL;
const char *sc;
- int r;
+ int r
, unified
;
assert(agent);
assert(agent);
- if (cg_unified(controller)) /* doesn't apply to unified hierarchy */
+ unified = cg_unified(controller);
+ if (unified < 0)
+ return unified;
+ if (unified) /* doesn't apply to unified hierarchy */
return -EOPNOTSUPP;
r = cg_get_path(controller, NULL, "release_agent", &fs);
return -EOPNOTSUPP;
r = cg_get_path(controller, NULL, "release_agent", &fs);
@@
-1058,9
+1065,12
@@
int cg_install_release_agent(const char *controller, const char *agent) {
int cg_uninstall_release_agent(const char *controller) {
_cleanup_free_ char *fs = NULL;
int cg_uninstall_release_agent(const char *controller) {
_cleanup_free_ char *fs = NULL;
- int r;
+ int r
, unified
;
- if (cg_unified(controller)) /* Doesn't apply to unified hierarchy */
+ unified = cg_unified(controller);
+ if (unified < 0)
+ return unified;
+ if (unified) /* Doesn't apply to unified hierarchy */
return -EOPNOTSUPP;
r = cg_get_path(controller, NULL, "notify_on_release", &fs);
return -EOPNOTSUPP;
r = cg_get_path(controller, NULL, "notify_on_release", &fs);
@@
-1105,7
+1115,7
@@
int cg_is_empty(const char *controller, const char *path) {
}
int cg_is_empty_recursive(const char *controller, const char *path) {
}
int cg_is_empty_recursive(const char *controller, const char *path) {
- int r;
+ int
unified,
r;
assert(path);
assert(path);
@@
-1113,7
+1123,11
@@
int cg_is_empty_recursive(const char *controller, const char *path) {
if (controller && (isempty(path) || path_equal(path, "/")))
return false;
if (controller && (isempty(path) || path_equal(path, "/")))
return false;
- if (cg_unified(controller)) {
+ unified = cg_unified(controller);
+ if (unified < 0)
+ return unified;
+
+ if (unified > 0) {
_cleanup_free_ char *t = NULL;
/* On the unified hierarchy we can check empty state
_cleanup_free_ char *t = NULL;
/* On the unified hierarchy we can check empty state
@@
-1869,9
+1883,6
@@
bool cg_controller_is_valid(const char *p) {
if (!p)
return false;
if (!p)
return false;
- if (streq(p, SYSTEMD_CGROUP_CONTROLLER))
- return true;
-
s = startswith(p, "name=");
if (s)
p = s;
s = startswith(p, "name=");
if (s)
p = s;
@@
-2028,7
+2039,7
@@
int cg_get_keyed_attribute(const char *controller, const char *path, const char
int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path) {
CGroupController c;
int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path) {
CGroupController c;
- int r;
+ int r
, unified
;
/* This one will create a cgroup in our private tree, but also
* duplicate it in the trees specified in mask, and remove it
/* This one will create a cgroup in our private tree, but also
* duplicate it in the trees specified in mask, and remove it
@@
-2040,7
+2051,10
@@
int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
return r;
/* If we are in the unified hierarchy, we are done now */
return r;
/* If we are in the unified hierarchy, we are done now */
- if (cg_all_unified())
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (unified > 0)
return 0;
/* Otherwise, do the same in the other hierarchies */
return 0;
/* Otherwise, do the same in the other hierarchies */
@@
-2061,13
+2075,16
@@
int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
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;
- int r;
+ int r
, unified
;
r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, path, pid);
if (r < 0)
return r;
r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, path, pid);
if (r < 0)
return r;
- if (cg_all_unified())
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (unified > 0)
return 0;
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
return 0;
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
@@
-2108,7
+2125,7
@@
int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids,
int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to, cg_migrate_callback_t to_callback, void *userdata) {
CGroupController c;
int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to, cg_migrate_callback_t to_callback, void *userdata) {
CGroupController c;
- int r = 0;
+ int r = 0
, unified
;
if (!path_equal(from, to)) {
r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, CGROUP_REMOVE);
if (!path_equal(from, to)) {
r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, CGROUP_REMOVE);
@@
-2116,7
+2133,10
@@
int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
return r;
}
return r;
}
- if (cg_all_unified())
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (unified > 0)
return r;
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
return r;
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
@@
-2140,13
+2160,16
@@
int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root) {
CGroupController c;
int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root) {
CGroupController c;
- int r;
+ int r
, unified
;
r = cg_trim(SYSTEMD_CGROUP_CONTROLLER, path, delete_root);
if (r < 0)
return r;
r = cg_trim(SYSTEMD_CGROUP_CONTROLLER, path, delete_root);
if (r < 0)
return r;
- if (cg_all_unified())
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (unified > 0)
return r;
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
return r;
for (c = 0; c < _CGROUP_CONTROLLER_MAX; c++) {
@@
-2164,13
+2187,16
@@
int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root)
int cg_mask_supported(CGroupMask *ret) {
CGroupMask mask = 0;
int cg_mask_supported(CGroupMask *ret) {
CGroupMask mask = 0;
- int r;
+ int r
, unified
;
/* Determines the mask of supported cgroup controllers. Only
* includes controllers we can make sense of and that are
* actually accessible. */
/* Determines the mask of supported cgroup controllers. Only
* includes controllers we can make sense of and that are
* actually accessible. */
- if (cg_all_unified()) {
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (unified > 0) {
_cleanup_free_ char *root = NULL, *controllers = NULL, *path = NULL;
const char *c;
_cleanup_free_ char *root = NULL, *controllers = NULL, *path = NULL;
const char *c;
@@
-2330,9
+2356,13
@@
static int cg_update_unified(void) {
return 0;
}
return 0;
}
-
bool
cg_unified(const char *controller) {
+
int
cg_unified(const char *controller) {
- assert(cg_update_unified() >= 0);
+ int r;
+
+ r = cg_update_unified();
+ if (r < 0)
+ return r;
if (streq_ptr(controller, SYSTEMD_CGROUP_CONTROLLER))
return unified_cache >= CGROUP_UNIFIED_SYSTEMD;
if (streq_ptr(controller, SYSTEMD_CGROUP_CONTROLLER))
return unified_cache >= CGROUP_UNIFIED_SYSTEMD;
@@
-2340,29
+2370,30
@@
bool cg_unified(const char *controller) {
return unified_cache >= CGROUP_UNIFIED_ALL;
}
return unified_cache >= CGROUP_UNIFIED_ALL;
}
-
bool
cg_all_unified(void) {
+
int
cg_all_unified(void) {
return cg_unified(NULL);
}
#if 0 /// UNNEEDED by elogind
return cg_unified(NULL);
}
#if 0 /// UNNEEDED by elogind
-
int
cg_unified_flush(void) {
+
void
cg_unified_flush(void) {
unified_cache = CGROUP_UNIFIED_UNKNOWN;
unified_cache = CGROUP_UNIFIED_UNKNOWN;
-
- return cg_update_unified();
}
int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
_cleanup_free_ char *fs = NULL;
CGroupController c;
}
int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
_cleanup_free_ char *fs = NULL;
CGroupController c;
- int r;
+ int r
, unified
;
assert(p);
if (supported == 0)
return 0;
assert(p);
if (supported == 0)
return 0;
- if (!cg_all_unified()) /* on the legacy hiearchy there's no joining of controllers defined */
+ unified = cg_all_unified();
+ if (unified < 0)
+ return unified;
+ if (!unified) /* on the legacy hiearchy there's no joining of controllers defined */
return 0;
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs);
return 0;
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs);
@@
-2394,13
+2425,14
@@
int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
bool cg_is_unified_wanted(void) {
static thread_local int wanted = -1;
bool cg_is_unified_wanted(void) {
static thread_local int wanted = -1;
- int r;
+ int r
, unified
;
bool b;
/* If the hierarchy is already mounted, then follow whatever
* was chosen for it. */
bool b;
/* If the hierarchy is already mounted, then follow whatever
* was chosen for it. */
- if (cg_unified_flush() >= 0)
- return cg_all_unified();
+ unified = cg_all_unified();
+ if (unified >= 0)
+ return unified;
/* Otherwise, let's see what the kernel command line has to
* say. Since checking that is expensive, let's cache the
/* Otherwise, let's see what the kernel command line has to
* say. Since checking that is expensive, let's cache the
@@
-2421,7
+2453,7
@@
bool cg_is_legacy_wanted(void) {
bool cg_is_unified_systemd_controller_wanted(void) {
static thread_local int wanted = -1;
bool cg_is_unified_systemd_controller_wanted(void) {
static thread_local int wanted = -1;
- int r;
+ int r
, unified
;
bool b;
/* If the unified hierarchy is requested in full, no need to
bool b;
/* If the unified hierarchy is requested in full, no need to
@@
-2431,8
+2463,9
@@
bool cg_is_unified_systemd_controller_wanted(void) {
/* If the hierarchy is already mounted, then follow whatever
* was chosen for it. */
/* If the hierarchy is already mounted, then follow whatever
* was chosen for it. */
- if (cg_unified_flush() >= 0)
- return cg_unified(SYSTEMD_CGROUP_CONTROLLER);
+ unified = cg_unified(SYSTEMD_CGROUP_CONTROLLER);
+ if (unified >= 0)
+ return unified;
/* Otherwise, let's see what the kernel command line has to
* say. Since checking that is expensive, let's cache the
/* Otherwise, let's see what the kernel command line has to
* say. Since checking that is expensive, let's cache the