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: issue error on oom we can do nothing about
[elogind.git]
/
src
/
core
/
scope.c
diff --git
a/src/core/scope.c
b/src/core/scope.c
index e0da6e4db7965739cd99ad5444b5816ebcc1599b..8b2bb29ed8a9f4807d2f518cff0894565387fa8d 100644
(file)
--- a/
src/core/scope.c
+++ b/
src/core/scope.c
@@
-20,12
+20,10
@@
***/
#include <errno.h>
***/
#include <errno.h>
-#include <signal.h>
#include <unistd.h>
#include "unit.h"
#include "scope.h"
#include <unistd.h>
#include "unit.h"
#include "scope.h"
-#include "load-fragment.h"
#include "log.h"
#include "dbus-scope.h"
#include "special.h"
#include "log.h"
#include "dbus-scope.h"
#include "special.h"
@@
-173,7
+171,7
@@
static int scope_load(Unit *u) {
return scope_verify(s);
}
return scope_verify(s);
}
-static int scope_coldplug(Unit *u) {
+static int scope_coldplug(Unit *u
, Hashmap *deferred_work
) {
Scope *s = SCOPE(u);
int r;
Scope *s = SCOPE(u);
int r;
@@
-288,6
+286,9
@@
static int scope_start(Unit *u) {
if (!u->transient && UNIT(s)->manager->n_reloading <= 0)
return -ENOENT;
if (!u->transient && UNIT(s)->manager->n_reloading <= 0)
return -ENOENT;
+ (void) unit_realize_cgroup(u);
+ (void) unit_reset_cpu_usage(u);
+
r = unit_attach_pids_to_cgroup(u);
if (r < 0)
return r;
r = unit_attach_pids_to_cgroup(u);
if (r < 0)
return r;
@@
-295,7
+296,7
@@
static int scope_start(Unit *u) {
s->result = SCOPE_SUCCESS;
scope_set_state(s, SCOPE_RUNNING);
s->result = SCOPE_SUCCESS;
scope_set_state(s, SCOPE_RUNNING);
- return
0
;
+ return
1
;
}
static int scope_stop(Unit *u) {
}
static int scope_stop(Unit *u) {
@@
-311,7
+312,7
@@
static int scope_stop(Unit *u) {
s->state == SCOPE_ABANDONED);
scope_enter_signal(s, SCOPE_STOP_SIGTERM, SCOPE_SUCCESS);
s->state == SCOPE_ABANDONED);
scope_enter_signal(s, SCOPE_STOP_SIGTERM, SCOPE_SUCCESS);
- return
0
;
+ return
1
;
}
static void scope_reset_failed(Unit *u) {
}
static void scope_reset_failed(Unit *u) {