***/
#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
#include "unit.h"
#include "slice.h"
-#include "load-fragment.h"
#include "log.h"
#include "dbus-slice.h"
#include "special.h"
[SLICE_ACTIVE] = UNIT_ACTIVE
};
-static void slice_init(Unit *u) {
- Slice *s = SLICE(u);
-
- assert(u);
- assert(u->load_state == UNIT_STUB);
-
- cgroup_context_init(&s->cgroup_context);
- unit_cgroup_context_init_defaults(u, &s->cgroup_context);
-}
-
-static void slice_done(Unit *u) {
- Slice *s = SLICE(u);
-
- assert(u);
-
- cgroup_context_done(&s->cgroup_context);
-}
-
static void slice_set_state(Slice *t, SliceState state) {
SliceState old_state;
assert(t);
a = (char*) SPECIAL_ROOT_SLICE;
if (!unit_has_name(UNIT_DEREF(UNIT(s)->slice), a)) {
- log_error_unit(UNIT(s)->id,
+ log_unit_error(UNIT(s)->id,
"%s located outside its parent slice. Refusing.", UNIT(s)->id);
return -EINVAL;
}
/* This is a new unit? Then let's add in some extras */
if (u->load_state == UNIT_LOADED) {
+ r = unit_patch_contexts(u);
+ if (r < 0)
+ return r;
+
r = slice_add_parent_slice(s);
if (r < 0)
return r;
assert(t);
assert(t->state == SLICE_DEAD);
- unit_realize_cgroup(u);
+ (void) unit_realize_cgroup(u);
+ (void) unit_reset_cpu_usage(u);
slice_set_state(t, SLICE_ACTIVE);
- return 0;
+ return 1;
}
static int slice_stop(Unit *u) {
* unit_notify() will do that for us anyway. */
slice_set_state(t, SLICE_DEAD);
- return 0;
+ return 1;
}
static int slice_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {
.no_alias = true,
.no_instances = true,
- .init = slice_init,
.load = slice_load,
- .done = slice_done,
.coldplug = slice_coldplug,