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
/
scope.c
diff --git
a/src/core/scope.c
b/src/core/scope.c
index a2b9265061afc5b0ce1b4458cca2b317831b665b..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,20
+286,17
@@
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;
- r = unit_realize_cgroup(u);
- if (r < 0) {
- log_error("Failed to realize cgroup: %s", strerror(-r));
- return r;
- }
+ (void) unit_realize_cgroup(u);
+ (void) unit_reset_cpu_usage(u);
- r =
cg_attach_many_everywhere(u->manager->cgroup_supported, u->cgroup_path, UNIT(s)->pids
);
+ r =
unit_attach_pids_to_cgroup(u
);
if (r < 0)
return r;
s->result = SCOPE_SUCCESS;
scope_set_state(s, SCOPE_RUNNING);
if (r < 0)
return r;
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) {
@@
-317,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) {
@@
-384,15
+379,14
@@
static int scope_deserialize_item(Unit *u, const char *key, const char *value, F
}
static bool scope_check_gc(Unit *u) {
}
static bool scope_check_gc(Unit *u) {
- Scope *s = SCOPE(u);
- int r;
-
- assert(s);
+ assert(u);
/* Never clean up scopes that still have a process around,
* even if the scope is formally dead. */
if (u->cgroup_path) {
/* Never clean up scopes that still have a process around,
* even if the scope is formally dead. */
if (u->cgroup_path) {
+ int r;
+
r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
if (r <= 0)
return true;
r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true);
if (r <= 0)
return true;