chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: rely only on isolate to remove running services when entering rescue/emergency...
[elogind.git]
/
src
/
unit.c
diff --git
a/src/unit.c
b/src/unit.c
index a5f8712ae6d1101b358ad092095b4bfa6c002ea5..f786359fac3eb1e182a4fb44d5a9a99f5156db04 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-39,6
+39,7
@@
#include "specifier.h"
#include "dbus-unit.h"
#include "special.h"
#include "specifier.h"
#include "dbus-unit.h"
#include "special.h"
+#include "cgroup-util.h"
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = &service_vtable,
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
[UNIT_SERVICE] = &service_vtable,
@@
-625,11
+626,13
@@
void unit_dump(Unit *u, FILE *f, const char *prefix) {
"%s\tRecursive Stop: %s\n"
"%s\tStopWhenUnneeded: %s\n"
"%s\tOnlyByDependency: %s\n"
"%s\tRecursive Stop: %s\n"
"%s\tStopWhenUnneeded: %s\n"
"%s\tOnlyByDependency: %s\n"
- "%s\tDefaultDependencies: %s\n",
+ "%s\tDefaultDependencies: %s\n"
+ "%s\tIgnoreDependencyFailure: %s\n",
prefix, yes_no(u->meta.recursive_stop),
prefix, yes_no(u->meta.stop_when_unneeded),
prefix, yes_no(u->meta.only_by_dependency),
prefix, yes_no(u->meta.recursive_stop),
prefix, yes_no(u->meta.stop_when_unneeded),
prefix, yes_no(u->meta.only_by_dependency),
- prefix, yes_no(u->meta.default_dependencies));
+ prefix, yes_no(u->meta.default_dependencies),
+ prefix, yes_no(u->meta.ignore_dependency_failure));
LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings)
fprintf(f, "%s\tControlGroup: %s:%s\n",
LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings)
fprintf(f, "%s\tControlGroup: %s:%s\n",
@@
-970,6
+973,12
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
else if (UNIT_IS_ACTIVE_OR_RELOADING(os) && !UNIT_IS_ACTIVE_OR_RELOADING(ns))
u->meta.active_exit_timestamp = ts;
else if (UNIT_IS_ACTIVE_OR_RELOADING(os) && !UNIT_IS_ACTIVE_OR_RELOADING(ns))
u->meta.active_exit_timestamp = ts;
+ if (ns != os && ns == UNIT_MAINTENANCE)
+ log_notice("Unit %s entered maintenance state.", u->meta.id);
+
+ if (UNIT_IS_INACTIVE_OR_MAINTENANCE(ns))
+ cgroup_bonding_trim_list(u->meta.cgroup_bondings, true);
+
timer_unit_notify(u, ns);
path_unit_notify(u, ns);
timer_unit_notify(u, ns);
path_unit_notify(u, ns);
@@
-1138,14
+1147,14
@@
int unit_watch_pid(Unit *u, pid_t pid) {
/* Watch a specific PID. We only support one unit watching
* each PID for now. */
/* Watch a specific PID. We only support one unit watching
* each PID for now. */
- return hashmap_put(u->meta.manager->watch_pids,
UINT32
_TO_PTR(pid), u);
+ return hashmap_put(u->meta.manager->watch_pids,
LONG
_TO_PTR(pid), u);
}
void unit_unwatch_pid(Unit *u, pid_t pid) {
assert(u);
assert(pid >= 1);
}
void unit_unwatch_pid(Unit *u, pid_t pid) {
assert(u);
assert(pid >= 1);
- hashmap_remove_value(u->meta.manager->watch_pids,
UINT32
_TO_PTR(pid), u);
+ hashmap_remove_value(u->meta.manager->watch_pids,
LONG
_TO_PTR(pid), u);
}
int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
}
int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
@@
-1502,12
+1511,9
@@
char *unit_dbus_path(Unit *u) {
if (!(e = bus_path_escape(u->meta.id)))
return NULL;
if (!(e = bus_path_escape(u->meta.id)))
return NULL;
- if (asprintf(&p, "/org/freedesktop/systemd1/unit/%s", e) < 0) {
- free(e);
- return NULL;
- }
-
+ p = strappend("/org/freedesktop/systemd1/unit/", e);
free(e);
free(e);
+
return p;
}
return p;
}
@@
-1517,8
+1523,13
@@
int unit_add_cgroup(Unit *u, CGroupBonding *b) {
assert(u);
assert(b);
assert(u);
assert(b);
+
assert(b->path);
assert(b->path);
+ if (!b->controller)
+ if (!(b->controller = strdup(SYSTEMD_CGROUP_CONTROLLER)))
+ return -ENOMEM;
+
/* Ensure this hasn't been added yet */
assert(!b->unit);
/* Ensure this hasn't been added yet */
assert(!b->unit);
@@
-1557,7
+1568,6
@@
static char *default_cgroup_path(Unit *u) {
}
int unit_add_cgroup_from_text(Unit *u, const char *name) {
}
int unit_add_cgroup_from_text(Unit *u, const char *name) {
- size_t n;
char *controller = NULL, *path = NULL;
CGroupBonding *b = NULL;
int r;
char *controller = NULL, *path = NULL;
CGroupBonding *b = NULL;
int r;
@@
-1565,38
+1575,20
@@
int unit_add_cgroup_from_text(Unit *u, const char *name) {
assert(u);
assert(name);
assert(u);
assert(name);
- /* Detect controller name */
- n = strcspn(name, ":");
-
- if (name[n] == 0 ||
- (name[n] == ':' && name[n+1] == 0)) {
-
- /* Only controller name, no path? */
-
- if (!(path = default_cgroup_path(u)))
- return -ENOMEM;
+ if ((r = cg_split_spec(name, &controller, &path)) < 0)
+ return r;
- } else {
-
const char *p
;
+ if (!path)
+
path = default_cgroup_path(u)
;
- /* Controller name, and path. */
-
p = name+n+1
;
+ if (!controller)
+
controller = strdup(SYSTEMD_CGROUP_CONTROLLER)
;
- if (!path_is_absolute(p))
- return -EINVAL;
+ if (!path || !controller) {
+ free(path);
+ free(controller);
- if (!(path = strdup(p)))
- return -ENOMEM;
- }
-
- if (n > 0)
- controller = strndup(name, n);
- else
- controller = strdup(u->meta.manager->cgroup_controller);
-
- if (!controller) {
- r = -ENOMEM;
- goto fail;
+ return -ENOMEM;
}
if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) {
}
if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) {
@@
-1641,9
+1633,6
@@
int unit_add_default_cgroup(Unit *u) {
if (!(b = new0(CGroupBonding, 1)))
return -ENOMEM;
if (!(b = new0(CGroupBonding, 1)))
return -ENOMEM;
- if (!(b->controller = strdup(u->meta.manager->cgroup_controller)))
- goto fail;
-
if (!(b->path = default_cgroup_path(u)))
goto fail;
if (!(b->path = default_cgroup_path(u)))
goto fail;
@@
-1666,7
+1655,7
@@
fail:
CGroupBonding* unit_get_default_cgroup(Unit *u) {
assert(u);
CGroupBonding* unit_get_default_cgroup(Unit *u) {
assert(u);
- return cgroup_bonding_find_list(u->meta.cgroup_bondings,
u->meta.manager->cgroup_controller
);
+ return cgroup_bonding_find_list(u->meta.cgroup_bondings,
SYSTEMD_CGROUP_CONTROLLER
);
}
int unit_load_related_unit(Unit *u, const char *type, Unit **_found) {
}
int unit_load_related_unit(Unit *u, const char *type, Unit **_found) {