shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

core: rename unit_destroy_cgroup() to unit_destroy_cgroup_if_empty() since it's not quite as destructive as it sounds nowadays

Browse Source
This commit is contained in:
Lennart Poettering 2014-12-09 02:31:42 +01:00
parent dab5bf8599
commit b1491eba40
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/cgroup.c
View File

@ -782,7 +782,7 @@ int unit_realize_cgroup(Unit *u) {
return unit_realize_cgroup_now(u, manager_state(u->manager)); return unit_realize_cgroup_now(u, manager_state(u->manager));
} }
void unit_destroy_cgroup(Unit *u) { void unit_destroy_cgroup_if_empty(Unit *u) {
int r; int r;
assert(u); assert(u);
@ -802,7 +802,6 @@ void unit_destroy_cgroup(Unit *u) {
u->cgroup_path = NULL; u->cgroup_path = NULL;
u->cgroup_realized = false; u->cgroup_realized = false;
u->cgroup_realized_mask = 0; u->cgroup_realized_mask = 0;
} }
pid_t unit_search_main_pid(Unit *u) { pid_t unit_search_main_pid(Unit *u) {

2
src/core/cgroup.h
View File

@ -109,7 +109,7 @@ CGroupControllerMask unit_get_target_mask(Unit *u);
void unit_update_cgroup_members_masks(Unit *u); void unit_update_cgroup_members_masks(Unit *u);
int unit_realize_cgroup(Unit *u); int unit_realize_cgroup(Unit *u);
void unit_destroy_cgroup(Unit *u); void unit_destroy_cgroup_if_empty(Unit *u);
int manager_setup_cgroup(Manager *m); int manager_setup_cgroup(Manager *m);
void manager_shutdown_cgroup(Manager *m, bool delete); void manager_shutdown_cgroup(Manager *m, bool delete);

2
src/core/service.c
View File

@ -703,7 +703,7 @@ static void service_set_state(Service *s, ServiceState state) {
/* For the inactive states unit_notify() will trim the cgroup, /* For the inactive states unit_notify() will trim the cgroup,
* but for exit we have to do that ourselves... */ * but for exit we have to do that ourselves... */
if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0) if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0)
unit_destroy_cgroup(UNIT(s)); unit_destroy_cgroup_if_empty(UNIT(s));
/* For remain_after_exit services, let's see if we can "release" the /* For remain_after_exit services, let's see if we can "release" the
* hold on the console, since unit_notify() only does that in case of * hold on the console, since unit_notify() only does that in case of

2
src/core/unit.c
View File

@ -1783,7 +1783,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
/* Make sure the cgroup is always removed when we become inactive */ /* Make sure the cgroup is always removed when we become inactive */
if (UNIT_IS_INACTIVE_OR_FAILED(ns)) if (UNIT_IS_INACTIVE_OR_FAILED(ns))
unit_destroy_cgroup(u); unit_destroy_cgroup_if_empty(u);
/* Note that this doesn't apply to RemainAfterExit services exiting /* Note that this doesn't apply to RemainAfterExit services exiting
* successfully, since there's no change of state in that case. Which is * successfully, since there's no change of state in that case. Which is