chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: document systemctl --force
[elogind.git]
/
src
/
cgroup.c
diff --git
a/src/cgroup.c
b/src/cgroup.c
index 7397b5298119d156f36dfe2e0724ae7914441861..d64ab63bea7cedcd73e2c701e325e3925a9f9c0b 100644
(file)
--- a/
src/cgroup.c
+++ b/
src/cgroup.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-138,7
+138,7
@@
int cgroup_bonding_install_list(CGroupBonding *first, pid_t pid) {
return 0;
}
return 0;
}
-int cgroup_bonding_kill(CGroupBonding *b, int sig) {
+int cgroup_bonding_kill(CGroupBonding *b, int sig
, Set *s
) {
int r;
assert(b);
int r;
assert(b);
@@
-149,25
+149,36
@@
int cgroup_bonding_kill(CGroupBonding *b, int sig) {
assert(b->realized);
assert(b->realized);
- return cg_kill_recursive(b->controller, b->path, sig, true);
+ return cg_kill_recursive(b->controller, b->path, sig, true
, false, s
);
}
}
-int cgroup_bonding_kill_list(CGroupBonding *first, int sig) {
+int cgroup_bonding_kill_list(CGroupBonding *first, int sig
, Set *s
) {
CGroupBonding *b;
CGroupBonding *b;
- int r = -EAGAIN;
+ Set *allocated_set = NULL;
+ int ret = -EAGAIN, r;
+
+ if (!s)
+ if (!(s = allocated_set = set_new(trivial_hash_func, trivial_compare_func)))
+ return -ENOMEM;
LIST_FOREACH(by_unit, b, first) {
LIST_FOREACH(by_unit, b, first) {
- if ((r = cgroup_bonding_kill(b, sig)) < 0) {
+ if ((r = cgroup_bonding_kill(b, sig
, s
)) < 0) {
if (r == -EAGAIN || r == -ESRCH)
continue;
if (r == -EAGAIN || r == -ESRCH)
continue;
- return r;
+ ret = r;
+ goto finish;
}
}
- return 0;
+ if (ret < 0 || r > 0)
+ ret = r;
}
}
- return r;
+finish:
+ if (allocated_set)
+ set_free(allocated_set);
+
+ return ret;
}
/* Returns 1 if the group is empty, 0 if it is not, -EAGAIN if we
}
/* Returns 1 if the group is empty, 0 if it is not, -EAGAIN if we
@@
-215,13
+226,7
@@
int manager_setup_cgroup(Manager *m) {
assert(m);
assert(m);
- /* 1. Initialize libcg */
- if ((r = cg_init()) < 0) {
- log_error("Failed to initialize libcg: %s", strerror(-r));
- goto finish;
- }
-
- /* 2. Determine hierarchy */
+ /* 1. Determine hierarchy */
if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, ¤t)) < 0)
goto finish;
if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 0, ¤t)) < 0)
goto finish;
@@
-237,19
+242,19
@@
int manager_setup_cgroup(Manager *m) {
} else {
/* We need a new root cgroup */
m->cgroup_hierarchy = NULL;
} else {
/* We need a new root cgroup */
m->cgroup_hierarchy = NULL;
- if (
(r = asprintf(&m->cgroup_hierarchy, "%s%s", streq(current, "/") ? "" : current, suffix)
) < 0) {
+ if (
asprintf(&m->cgroup_hierarchy, "%s%s", streq(current, "/") ? "" : current, suffix
) < 0) {
r = -ENOMEM;
goto finish;
}
}
r = -ENOMEM;
goto finish;
}
}
- /*
3
. Show data */
+ /*
2
. Show data */
if ((r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_hierarchy, NULL, &path)) < 0)
goto finish;
log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
if ((r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_hierarchy, NULL, &path)) < 0)
goto finish;
log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path);
- /*
4
. Install agent */
+ /*
3
. Install agent */
if ((r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, CGROUP_AGENT_PATH)) < 0)
log_warning("Failed to install release agent, ignoring: %s", strerror(-r));
else if (r > 0)
if ((r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, CGROUP_AGENT_PATH)) < 0)
log_warning("Failed to install release agent, ignoring: %s", strerror(-r));
else if (r > 0)
@@
-257,13
+262,13
@@
int manager_setup_cgroup(Manager *m) {
else
log_debug("Release agent already installed.");
else
log_debug("Release agent already installed.");
- /*
5
. Realize the group */
+ /*
4
. Realize the group */
if ((r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_hierarchy, 0)) < 0) {
log_error("Failed to create root cgroup hierarchy: %s", strerror(-r));
goto finish;
}
if ((r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_hierarchy, 0)) < 0) {
log_error("Failed to create root cgroup hierarchy: %s", strerror(-r));
goto finish;
}
- /*
6
. And pin it, so that it cannot be unmounted */
+ /*
5
. And pin it, so that it cannot be unmounted */
if (m->pin_cgroupfs_fd >= 0)
close_nointr_nofail(m->pin_cgroupfs_fd);
if (m->pin_cgroupfs_fd >= 0)
close_nointr_nofail(m->pin_cgroupfs_fd);
@@
-331,17
+336,31
@@
int cgroup_notify_empty(Manager *m, const char *group) {
Unit* cgroup_unit_by_pid(Manager *m, pid_t pid) {
CGroupBonding *l, *b;
char *group = NULL;
Unit* cgroup_unit_by_pid(Manager *m, pid_t pid) {
CGroupBonding *l, *b;
char *group = NULL;
- int r;
assert(m);
if (pid <= 1)
return NULL;
assert(m);
if (pid <= 1)
return NULL;
- if (
(r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &group))
)
+ if (
cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &group) < 0
)
return NULL;
l = hashmap_get(m->cgroup_bondings, group);
return NULL;
l = hashmap_get(m->cgroup_bondings, group);
+
+ if (!l) {
+ char *slash;
+
+ while ((slash = strrchr(group, '/'))) {
+ if (slash == group)
+ break;
+
+ *slash = 0;
+
+ if ((l = hashmap_get(m->cgroup_bondings, group)))
+ break;
+ }
+ }
+
free(group);
LIST_FOREACH(by_path, b, l) {
free(group);
LIST_FOREACH(by_path, b, l) {