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: save description/slice of transient units to /run
[elogind.git]
/
src
/
core
/
cgroup.c
diff --git
a/src/core/cgroup.c
b/src/core/cgroup.c
index 79467a82cea8ea4ac0c3a659017488067dded84f..b5d13478561831124abc69301c8094b2d373c1c4 100644
(file)
--- a/
src/core/cgroup.c
+++ b/
src/core/cgroup.c
@@
-389,6
+389,10
@@
static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) {
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
+ r = hashmap_put(u->manager->cgroup_unit, path, u);
+ if (r < 0)
+ return r;
+
/* First, create our own group */
r = cg_create_with_mask(mask, path);
if (r < 0)
/* First, create our own group */
r = cg_create_with_mask(mask, path);
if (r < 0)
@@
-410,7
+414,7
@@
static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) {
return 0;
}
return 0;
}
-static
void
unit_realize_cgroup_now(Unit *u) {
+static
int
unit_realize_cgroup_now(Unit *u) {
CGroupControllerMask mask;
assert(u);
CGroupControllerMask mask;
assert(u);
@@
-425,14
+429,14
@@
static void unit_realize_cgroup_now(Unit *u) {
if (u->cgroup_realized &&
u->cgroup_mask == mask)
if (u->cgroup_realized &&
u->cgroup_mask == mask)
- return;
+ return
0
;
/* First, realize parents */
if (UNIT_ISSET(u->slice))
unit_realize_cgroup_now(UNIT_DEREF(u->slice));
/* And then do the real work */
/* First, realize parents */
if (UNIT_ISSET(u->slice))
unit_realize_cgroup_now(UNIT_DEREF(u->slice));
/* And then do the real work */
- unit_create_cgroups(u, mask);
+
return
unit_create_cgroups(u, mask);
}
static void unit_add_to_cgroup_queue(Unit *u) {
}
static void unit_add_to_cgroup_queue(Unit *u) {
@@
-451,8
+455,9
@@
unsigned manager_dispatch_cgroup_queue(Manager *m) {
while ((i = m->cgroup_queue)) {
assert(i->in_cgroup_queue);
while ((i = m->cgroup_queue)) {
assert(i->in_cgroup_queue);
- unit_realize_cgroup_now(i);
- cgroup_context_apply(unit_get_cgroup_context(i), i->cgroup_mask, i->cgroup_path);
+ if (unit_realize_cgroup_now(i) >= 0)
+ cgroup_context_apply(unit_get_cgroup_context(i), i->cgroup_mask, i->cgroup_path);
+
n++;
}
n++;
}
@@
-484,14
+489,15
@@
static void unit_queue_siblings(Unit *u) {
}
}
}
}
-
void
unit_realize_cgroup(Unit *u) {
+
int
unit_realize_cgroup(Unit *u) {
CGroupContext *c;
CGroupContext *c;
+ int r;
assert(u);
c = unit_get_cgroup_context(u);
if (!c)
assert(u);
c = unit_get_cgroup_context(u);
if (!c)
- return;
+ return
0
;
/* So, here's the deal: when realizing the cgroups for this
* unit, we need to first create all parents, but there's more
/* So, here's the deal: when realizing the cgroups for this
* unit, we need to first create all parents, but there's more
@@
-508,10
+514,13
@@
void unit_realize_cgroup(Unit *u) {
unit_queue_siblings(u);
/* And realize this one now */
unit_queue_siblings(u);
/* And realize this one now */
- unit_realize_cgroup_now(u);
+
r =
unit_realize_cgroup_now(u);
/* And apply the values */
/* And apply the values */
- cgroup_context_apply(c, u->cgroup_mask, u->cgroup_path);
+ if (r >= 0)
+ cgroup_context_apply(c, u->cgroup_mask, u->cgroup_path);
+
+ return r;
}
void unit_destroy_cgroup(Unit *u) {
}
void unit_destroy_cgroup(Unit *u) {
@@
-524,12
+533,15
@@
void unit_destroy_cgroup(Unit *u) {
r = cg_trim_with_mask(u->cgroup_mask, u->cgroup_path, true);
if (r < 0)
r = cg_trim_with_mask(u->cgroup_mask, u->cgroup_path, true);
if (r < 0)
- log_error("Failed to destroy cgroup %s: %s", u->cgroup_path, strerror(-r));
+ log_debug("Failed to destroy cgroup %s: %s", u->cgroup_path, strerror(-r));
+
+ hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
free(u->cgroup_path);
u->cgroup_path = NULL;
u->cgroup_realized = false;
u->cgroup_mask = 0;
free(u->cgroup_path);
u->cgroup_path = NULL;
u->cgroup_realized = false;
u->cgroup_mask = 0;
+
}
pid_t unit_search_main_pid(Unit *u) {
}
pid_t unit_search_main_pid(Unit *u) {
@@
-716,13
+728,16
@@
int manager_notify_cgroup_empty(Manager *m, const char *cgroup) {
assert(m);
assert(cgroup);
assert(m);
assert(cgroup);
- r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, cgroup, true);
- if (r == 0)
- return 0;
-
u = manager_get_unit_by_cgroup(m, cgroup);
u = manager_get_unit_by_cgroup(m, cgroup);
- if (u && UNIT_VTABLE(u)->notify_cgroup_empty)
- UNIT_VTABLE(u)->notify_cgroup_empty(u);
+ if (u) {
+ r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
+ if (r > 0) {
+ if (UNIT_VTABLE(u)->notify_cgroup_empty)
+ UNIT_VTABLE(u)->notify_cgroup_empty(u);
+
+ unit_add_to_gc_queue(u);
+ }
+ }
return 0;
}
return 0;
}