chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix cgroups-agent match for kdbus
[elogind.git]
/
src
/
core
/
slice.c
diff --git
a/src/core/slice.c
b/src/core/slice.c
index a31e629370e0b68b98349537b8471c30b9520805..0285c49aebfde7096463447ee6b7aa68167b09b8 100644
(file)
--- a/
src/core/slice.c
+++ b/
src/core/slice.c
@@
-20,12
+20,9
@@
***/
#include <errno.h>
***/
#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
#include "unit.h"
#include "slice.h"
#include "unit.h"
#include "slice.h"
-#include "load-fragment.h"
#include "log.h"
#include "dbus-slice.h"
#include "special.h"
#include "log.h"
#include "dbus-slice.h"
#include "special.h"
@@
-153,7
+150,7
@@
static int slice_load(Unit *u) {
return slice_verify(s);
}
return slice_verify(s);
}
-static int slice_coldplug(Unit *u) {
+static int slice_coldplug(Unit *u
, Hashmap *deferred_work
) {
Slice *t = SLICE(u);
assert(t);
Slice *t = SLICE(u);
assert(t);
@@
-184,10
+181,11
@@
static int slice_start(Unit *u) {
assert(t);
assert(t->state == SLICE_DEAD);
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);
slice_set_state(t, SLICE_ACTIVE);
- return
0
;
+ return
1
;
}
static int slice_stop(Unit *u) {
}
static int slice_stop(Unit *u) {
@@
-200,7
+198,7
@@
static int slice_stop(Unit *u) {
* unit_notify() will do that for us anyway. */
slice_set_state(t, SLICE_DEAD);
* 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) {
}
static int slice_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {