chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: remove union Unit
[elogind.git]
/
src
/
cgroup.c
diff --git
a/src/cgroup.c
b/src/cgroup.c
index 4aa01f18981b5c7a84e7ba2b66c78855201f344d..e141b4153ddb86292b603814ed9fdc71e951df47 100644
(file)
--- a/
src/cgroup.c
+++ b/
src/cgroup.c
@@
-38,11
+38,11
@@
int cgroup_bonding_realize(CGroupBonding *b) {
assert(b->path);
assert(b->controller);
assert(b->path);
assert(b->controller);
- if (b->realized)
- return 0;
-
- if ((r = cg_create(b->controller, b->path)) < 0)
+ r = cg_create(b->controller, b->path);
+ if (r < 0) {
+ log_warning("Failed to create cgroup %s:%s: %s", b->controller, b->path, strerror(-r));
return r;
return r;
+ }
b->realized = true;
b->realized = true;
@@
-66,16
+66,16
@@
void cgroup_bonding_free(CGroupBonding *b, bool remove_or_trim) {
if (b->unit) {
CGroupBonding *f;
if (b->unit) {
CGroupBonding *f;
- LIST_REMOVE(CGroupBonding, by_unit, b->unit->
meta.
cgroup_bondings, b);
+ LIST_REMOVE(CGroupBonding, by_unit, b->unit->cgroup_bondings, b);
if (streq(b->controller, SYSTEMD_CGROUP_CONTROLLER)) {
if (streq(b->controller, SYSTEMD_CGROUP_CONTROLLER)) {
- assert_se(f = hashmap_get(b->unit->m
eta.m
anager->cgroup_bondings, b->path));
+ assert_se(f = hashmap_get(b->unit->manager->cgroup_bondings, b->path));
LIST_REMOVE(CGroupBonding, by_path, f, b);
if (f)
LIST_REMOVE(CGroupBonding, by_path, f, b);
if (f)
- hashmap_replace(b->unit->m
eta.m
anager->cgroup_bondings, b->path, f);
+ hashmap_replace(b->unit->manager->cgroup_bondings, b->path, f);
else
else
- hashmap_remove(b->unit->m
eta.m
anager->cgroup_bondings, b->path);
+ hashmap_remove(b->unit->manager->cgroup_bondings, b->path);
}
}
}
}
@@
-197,6
+197,9
@@
int cgroup_bonding_kill_list(CGroupBonding *first, int sig, bool sigcont, Set *s
Set *allocated_set = NULL;
int ret = -EAGAIN, r;
Set *allocated_set = NULL;
int ret = -EAGAIN, r;
+ if (!first)
+ return 0;
+
if (!s)
if (!(s = allocated_set = set_new(trivial_hash_func, trivial_compare_func)))
return -ENOMEM;
if (!s)
if (!(s = allocated_set = set_new(trivial_hash_func, trivial_compare_func)))
return -ENOMEM;
@@
-267,7
+270,7
@@
int manager_setup_cgroup(Manager *m) {
assert(m);
/* 0. Be nice to Ingo Molnar #628004 */
assert(m);
/* 0. Be nice to Ingo Molnar #628004 */
- if (path_is_mount_point("/sys/fs/cgroup/systemd") <= 0) {
+ if (path_is_mount_point("/sys/fs/cgroup/systemd"
, false
) <= 0) {
log_warning("No control group support available, not creating root group.");
return 0;
}
log_warning("No control group support available, not creating root group.");
return 0;
}
@@
-363,7
+366,8
@@
int cgroup_notify_empty(Manager *m, const char *group) {
assert(m);
assert(group);
assert(m);
assert(group);
- if (!(l = hashmap_get(m->cgroup_bondings, group)))
+ l = hashmap_get(m->cgroup_bondings, group);
+ if (!l)
return 0;
LIST_FOREACH(by_path, b, l) {
return 0;
LIST_FOREACH(by_path, b, l) {
@@
-372,7
+376,8
@@
int cgroup_notify_empty(Manager *m, const char *group) {
if (!b->unit)
continue;
if (!b->unit)
continue;
- if ((t = cgroup_bonding_is_empty_list(b)) < 0) {
+ t = cgroup_bonding_is_empty_list(b);
+ if (t < 0) {
/* If we don't know, we don't know */
if (t != -EAGAIN)
/* If we don't know, we don't know */
if (t != -EAGAIN)
@@
-381,9
+386,13
@@
int cgroup_notify_empty(Manager *m, const char *group) {
continue;
}
continue;
}
- if (t > 0)
+ if (t > 0) {
+ /* If it is empty, let's delete it */
+ cgroup_bonding_trim_list(b->unit->cgroup_bondings, true);
+
if (UNIT_VTABLE(b->unit)->cgroup_notify_empty)
UNIT_VTABLE(b->unit)->cgroup_notify_empty(b->unit);
if (UNIT_VTABLE(b->unit)->cgroup_notify_empty)
UNIT_VTABLE(b->unit)->cgroup_notify_empty(b->unit);
+ }
}
return 0;
}
return 0;