diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-11 18:21:53 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-11 18:31:50 +0200 |
| commit | e7ab4d1ac9f8d99eecd5e2d22eb482a1fb0fbf23 (patch) | |
| tree | 527c03ee340021bfa54cb554a5d6d81b7720838b /src/core/manager.c | |
| parent | 1afaa7e8d29c0fd70a621d96a59487ab54b157fc (diff) | |
cgroup: unify how we invalidate cgroup controller settings
Let's make sure that we follow the same codepaths when adjusting a
cgroup property via the dbus SetProperty() call, and when we execute the
StartupCPUShares= effect.
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 3b64d524da..8e518fbaaf 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2667,9 +2667,6 @@ static void manager_notify_finished(Manager *m) { } void manager_check_finished(Manager *m) { - Unit *u = NULL; - Iterator i; - assert(m); if (m->n_reloading > 0) @@ -2682,11 +2679,9 @@ void manager_check_finished(Manager *m) { return; if (hashmap_size(m->jobs) > 0) { - if (m->jobs_in_progress_event_source) /* Ignore any failure, this is only for feedback */ - (void) sd_event_source_set_time(m->jobs_in_progress_event_source, - now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC); + (void) sd_event_source_set_time(m->jobs_in_progress_event_source, now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC); return; } @@ -2712,9 +2707,7 @@ void manager_check_finished(Manager *m) { manager_notify_finished(m); - SET_FOREACH(u, m->startup_units, i) - if (u->cgroup_path) - cgroup_context_apply(unit_get_cgroup_context(u), unit_get_own_mask(u), u->cgroup_path, manager_state(m)); + manager_invalidate_startup_units(m); } static int create_generator_dir(Manager *m, char **generator, const char *name) { |