picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: rename cg_unified() to cg_all_unified()

Browse source 
A following patch will update cgroup handling so that the systemd controller
(/sys/fs/cgroup/systemd) can use the unified hierarchy even if the kernel
resource controllers are on the legacy hierarchies.  This would require
distinguishing whether all controllers are on cgroup v2 or only the systemd
controller is.  In preparation, this patch renames cg_unified() to
cg_all_unified().

This patch doesn't cause any functional changes.
This commit is contained in:
Tejun Heo 2016-08-15 18:13:36 -04:00 committed by Tejun Heo
parent 5f9a610ad2
commit ca2f6384aa
13 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/basic/cgroup-util.c
View file

@ -623,7 +623,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
if (!cg_controller_is_valid(controller))
return -EINVAL;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
@ -651,7 +651,7 @@ static int controller_is_accessible(const char *controller) {
if (!cg_controller_is_valid(controller))
return -EINVAL;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified > 0) {
@ -869,7 +869,7 @@ int cg_set_task_access(
if (r < 0)
return r;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified)
@ -893,7 +893,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
assert(path);
assert(pid >= 0);
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified == 0) {
@ -969,7 +969,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
assert(agent);
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified) /* doesn't apply to unified hierarchy */
@ -1020,7 +1020,7 @@ int cg_uninstall_release_agent(const char *controller) {
_cleanup_free_ char *fs = NULL;
int r, unified;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified) /* Doesn't apply to unified hierarchy */
@ -1076,7 +1076,7 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
if (controller && (isempty(path) || path_equal(path, "/")))
return false;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
@ -1962,7 +1962,7 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
return r;
/* If we are in the unified hierarchy, we are done now */
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified > 0)
@ -1992,7 +1992,7 @@ int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m
if (r < 0)
return r;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified > 0)
@ -2044,7 +2044,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to
return r;
}
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified > 0)
@ -2077,7 +2077,7 @@ int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root)
if (r < 0)
return r;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified > 0)
@ -2103,7 +2103,7 @@ int cg_mask_supported(CGroupMask *ret) {
* includes controllers we can make sense of and that are
* actually accessible. */
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (unified > 0) {
@ -2226,7 +2226,7 @@ int cg_kernel_controllers(Set *controllers) {
static thread_local int unified_cache = -1;
int cg_unified(void) {
int cg_all_unified(void) {
struct statfs fs;
/* Checks if we support the unified hierarchy. Returns an
@ -2264,7 +2264,7 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
if (supported == 0)
return 0;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return unified;
if (!unified) /* on the legacy hiearchy there's no joining of controllers defined */
@ -2303,7 +2303,7 @@ bool cg_is_unified_wanted(void) {
/* If the hierarchy is already mounted, then follow whatever
* was chosen for it. */
unified = cg_unified();
unified = cg_all_unified();
if (unified >= 0)
return unified;

2
src/basic/cgroup-util.h
View file

@ -225,7 +225,7 @@ int cg_kernel_controllers(Set *controllers);
bool cg_ns_supported(void);
int cg_unified(void);
int cg_all_unified(void);
void cg_unified_flush(void);
bool cg_is_unified_wanted(void);

2
src/cgls/cgls.c
View file

@ -166,7 +166,7 @@ static int get_cgroup_root(char **ret) {
static void show_cg_info(const char *controller, const char *path) {
if (cg_unified() <= 0 && controller && !streq(controller, SYSTEMD_CGROUP_CONTROLLER))
if (cg_all_unified() <= 0 && controller && !streq(controller, SYSTEMD_CGROUP_CONTROLLER))
printf("Controller %s; ", controller);
printf("Control group %s:\n", isempty(path) ? "/" : path);

10
src/cgtop/cgtop.c
View file

@ -213,7 +213,7 @@ static int process(
uint64_t new_usage;
nsec_t timestamp;
if (cg_unified() > 0) {
if (cg_all_unified() > 0) {
const char *keys[] = { "usage_usec", NULL };
_cleanup_free_ char *val = NULL;
@ -273,7 +273,7 @@ static int process(
} else if (streq(controller, "memory")) {
_cleanup_free_ char *p = NULL, *v = NULL;
if (cg_unified() <= 0)
if (cg_all_unified() <= 0)
r = cg_get_path(controller, path, "memory.usage_in_bytes", &p);
else
r = cg_get_path(controller, path, "memory.current", &p);
@ -293,11 +293,11 @@ static int process(
if (g->memory > 0)
g->memory_valid = true;
} else if ((streq(controller, "io") && cg_unified() > 0) ||
(streq(controller, "blkio") && cg_unified() <= 0)) {
} else if ((streq(controller, "io") && cg_all_unified() > 0) ||
(streq(controller, "blkio") && cg_all_unified() <= 0)) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *p = NULL;
bool unified = cg_unified() > 0;
bool unified = cg_all_unified() > 0;
uint64_t wr = 0, rd = 0;
nsec_t timestamp;

16
src/core/cgroup.c
View file

@ -665,7 +665,7 @@ static void cgroup_context_apply(Unit *u, CGroupMask mask, ManagerState state) {
bool has_weight = cgroup_context_has_cpu_weight(c);
bool has_shares = cgroup_context_has_cpu_shares(c);
if (cg_unified() > 0) {
if (cg_all_unified() > 0) {
uint64_t weight;
if (has_weight)
@ -846,7 +846,7 @@ static void cgroup_context_apply(Unit *u, CGroupMask mask, ManagerState state) {
}
if ((mask & CGROUP_MASK_MEMORY) && !is_root) {
if (cg_unified() > 0) {
if (cg_all_unified() > 0) {
uint64_t max = c->memory_max;
if (cgroup_context_has_unified_memory_config(c))
@ -1019,7 +1019,7 @@ CGroupMask unit_get_own_mask(Unit *u) {
e = unit_get_exec_context(u);
if (!e ||
exec_context_maintains_privileges(e) ||
cg_unified() > 0)
cg_all_unified() > 0)
return _CGROUP_MASK_ALL;
}
@ -1245,7 +1245,7 @@ int unit_watch_cgroup(Unit *u) {
return 0;
/* Only applies to the unified hierarchy */
r = cg_unified();
r = cg_all_unified();
if (r < 0)
return log_unit_error_errno(u, r, "Failed detect whether the unified hierarchy is used: %m");
if (r == 0)
@ -1645,7 +1645,7 @@ int unit_watch_all_pids(Unit *u) {
if (!u->cgroup_path)
return -ENOENT;
if (cg_unified() > 0) /* On unified we can use proper notifications */
if (cg_all_unified() > 0) /* On unified we can use proper notifications */
return 0;
return unit_watch_pids_in_path(u, u->cgroup_path);
@ -1755,7 +1755,7 @@ int manager_setup_cgroup(Manager *m) {
if (r < 0)
return log_error_errno(r, "Cannot find cgroup mount point: %m");
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return log_error_errno(r, "Couldn't determine if we are running in the unified hierarchy: %m");
if (unified > 0)
@ -1953,7 +1953,7 @@ int unit_get_memory_current(Unit *u, uint64_t *ret) {
if ((u->cgroup_realized_mask & CGROUP_MASK_MEMORY) == 0)
return -ENODATA;
if (cg_unified() <= 0)
if (cg_all_unified() <= 0)
r = cg_get_attribute("memory", u->cgroup_path, "memory.usage_in_bytes", &v);
else
r = cg_get_attribute("memory", u->cgroup_path, "memory.current", &v);
@ -1998,7 +1998,7 @@ static int unit_get_cpu_usage_raw(Unit *u, nsec_t *ret) {
if (!u->cgroup_path)
return -ENODATA;
if (cg_unified() > 0) {
if (cg_all_unified() > 0) {
const char *keys[] = { "usage_usec", NULL };
_cleanup_free_ char *val = NULL;
uint64_t us;

2
src/core/manager.c
View file

@ -766,7 +766,7 @@ static int manager_setup_cgroups_agent(Manager *m) {
if (!MANAGER_IS_SYSTEM(m))
return 0;
if (cg_unified() > 0) /* We don't need this anymore on the unified hierarchy */
if (cg_all_unified() > 0) /* We don't need this anymore on the unified hierarchy */
return 0;
if (m->cgroups_agent_fd < 0) {

2
src/core/scope.c
View file

@ -441,7 +441,7 @@ static void scope_sigchld_event(Unit *u, pid_t pid, int code, int status) {
/* If the PID set is empty now, then let's finish this off
(On unified we use proper notifications) */
if (cg_unified() <= 0 && set_isempty(u->pids))
if (cg_all_unified() <= 0 && set_isempty(u->pids))
scope_notify_cgroup_empty_event(u);
}

2
src/core/service.c
View file

@ -2866,7 +2866,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
/* If the PID set is empty now, then let's finish this off
(On unified we use proper notifications) */
if (cg_unified() <= 0 && set_isempty(u->pids))
if (cg_all_unified() <= 0 && set_isempty(u->pids))
service_notify_cgroup_empty_event(u);
}

2
src/core/unit.c
View file

@ -3695,7 +3695,7 @@ int unit_kill_context(
* there we get proper events. Hence rely on
* them.*/
if (cg_unified() > 0 ||
if (cg_all_unified() > 0 ||
(detect_container() == 0 && !unit_cgroup_delegate(u)))
wait_for_exit = true;

2
src/libsystemd/sd-bus/test-bus-creds.c
View file

@ -27,7 +27,7 @@ int main(int argc, char *argv[]) {
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
int r;
if (cg_unified() == -ENOMEDIUM) {
if (cg_all_unified() == -ENOMEDIUM) {
puts("Skipping test: /sys/fs/cgroup/ not available");
return EXIT_TEST_SKIP;
}

4
src/nspawn/nspawn-cgroup.c
View file

@ -70,7 +70,7 @@ int sync_cgroup(pid_t pid, bool unified_requested) {
const char *fn;
int unified, r;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return log_error_errno(unified, "Failed to determine whether the unified hierarchy is used: %m");
@ -132,7 +132,7 @@ int create_subcgroup(pid_t pid, bool unified_requested) {
if (!unified_requested)
return 0;
unified = cg_unified();
unified = cg_all_unified();
if (unified < 0)
return log_error_errno(unified, "Failed to determine whether the unified hierarchy is used: %m");
if (unified == 0)

4
src/nspawn/nspawn-mount.c
View file

@ -721,7 +721,7 @@ static int mount_legacy_cgns_supported(
return log_error_errno(errno, "Failed to mount /sys/fs/cgroup: %m");
}
if (cg_unified() > 0)
if (cg_all_unified() > 0)
goto skip_controllers;
controllers = set_new(&string_hash_ops);
@ -813,7 +813,7 @@ static int mount_legacy_cgns_unsupported(
return log_error_errno(errno, "Failed to mount /sys/fs/cgroup: %m");
}
if (cg_unified() > 0)
if (cg_all_unified() > 0)
goto skip_controllers;
controllers = set_new(&string_hash_ops);

2
src/nspawn/nspawn.c
View file

@ -332,7 +332,7 @@ static int detect_unified_cgroup_hierarchy(void) {
}
/* Otherwise inherit the default from the host system */
r = cg_unified();
r = cg_all_unified();
if (r < 0)
return log_error_errno(r, "Failed to determine whether the unified cgroups hierarchy is used: %m");