X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=unit.c;h=036c01648c6e017ee4d832e67d74a20e1c359fe9;hb=5af98f828476716954f327c479c4cf6321ae3fe4;hp=839e542e1e96b34cda55214238e435d09a1bc901;hpb=f3bff0eb3bc65de3b74286415a996af9556333af;p=elogind.git
diff --git a/unit.c b/unit.c
index 839e542e1..036c01648 100644
--- a/unit.c
+++ b/unit.c
@@ -1,5 +1,24 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include
#include
@@ -155,6 +174,7 @@ int unit_add_name(Unit *u, const char *text) {
if (!u->meta.id)
u->meta.id = s;
+ unit_add_to_dbus_queue(u);
return 0;
}
@@ -170,6 +190,8 @@ int unit_choose_id(Unit *u, const char *name) {
return -ENOENT;
u->meta.id = s;
+
+ unit_add_to_dbus_queue(u);
return 0;
}
@@ -183,6 +205,8 @@ int unit_set_description(Unit *u, const char *description) {
free(u->meta.description);
u->meta.description = s;
+
+ unit_add_to_dbus_queue(u);
return 0;
}
@@ -196,6 +220,16 @@ void unit_add_to_load_queue(Unit *u) {
u->meta.in_load_queue = true;
}
+void unit_add_to_dbus_queue(Unit *u) {
+ assert(u);
+
+ if (u->meta.load_state == UNIT_STUB || u->meta.in_dbus_queue || set_isempty(u->meta.manager->subscribed))
+ return;
+
+ LIST_PREPEND(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
+ u->meta.in_dbus_queue = true;
+}
+
static void bidi_set_free(Unit *u, Set *s) {
Iterator i;
Unit *other;
@@ -222,8 +256,12 @@ void unit_free(Unit *u) {
assert(u);
+ bus_unit_send_removed_signal(u);
+
/* Detach from next 'bigger' objects */
+ cgroup_bonding_free_list(u->meta.cgroup_bondings);
+
SET_FOREACH(t, u->meta.names, i)
hashmap_remove_value(u->meta.manager->units, t, u);
@@ -233,6 +271,9 @@ void unit_free(Unit *u) {
if (u->meta.in_load_queue)
LIST_REMOVE(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
+ if (u->meta.in_dbus_queue)
+ LIST_REMOVE(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
+
if (u->meta.load_state == UNIT_LOADED)
if (UNIT_VTABLE(u)->done)
UNIT_VTABLE(u)->done(u);
@@ -245,7 +286,7 @@ void unit_free(Unit *u) {
bidi_set_free(u, u->meta.dependencies[d]);
free(u->meta.description);
- free(u->meta.load_path);
+ free(u->meta.fragment_path);
while ((t = set_steal_first(u->meta.names)))
free(t);
@@ -306,6 +347,8 @@ int unit_merge(Unit *u, Unit *other) {
if ((r = ensure_merge(&u->meta.dependencies[d], other->meta.dependencies[d])) < 0)
return r;
+ unit_add_to_dbus_queue(u);
+
return 0;
}
@@ -328,63 +371,36 @@ const char *unit_description(Unit *u) {
}
void unit_dump(Unit *u, FILE *f, const char *prefix) {
-
- static const char* const load_state_table[_UNIT_LOAD_STATE_MAX] = {
- [UNIT_STUB] = "stub",
- [UNIT_LOADED] = "loaded",
- [UNIT_FAILED] = "failed"
- };
-
- static const char* const active_state_table[_UNIT_ACTIVE_STATE_MAX] = {
- [UNIT_ACTIVE] = "active",
- [UNIT_INACTIVE] = "inactive",
- [UNIT_ACTIVATING] = "activating",
- [UNIT_DEACTIVATING] = "deactivating"
- };
-
- static const char* const dependency_table[_UNIT_DEPENDENCY_MAX] = {
- [UNIT_REQUIRES] = "Requires",
- [UNIT_SOFT_REQUIRES] = "SoftRequires",
- [UNIT_WANTS] = "Wants",
- [UNIT_REQUISITE] = "Requisite",
- [UNIT_SOFT_REQUISITE] = "SoftRequisite",
- [UNIT_REQUIRED_BY] = "RequiredBy",
- [UNIT_SOFT_REQUIRED_BY] = "SoftRequiredBy",
- [UNIT_WANTED_BY] = "WantedBy",
- [UNIT_CONFLICTS] = "Conflicts",
- [UNIT_BEFORE] = "Before",
- [UNIT_AFTER] = "After",
- };
-
char *t;
UnitDependency d;
Iterator i;
- char *prefix2;
+ char *p2;
+ const char *prefix2;
+ CGroupBonding *b;
assert(u);
if (!prefix)
prefix = "";
- prefix2 = strappend(prefix, "\t");
- if (!prefix2)
- prefix2 = "";
+ p2 = strappend(prefix, "\t");
+ prefix2 = p2 ? p2 : prefix;
fprintf(f,
"%sâ Unit %s:\n"
"%s\tDescription: %s\n"
"%s\tUnit Load State: %s\n"
"%s\tUnit Active State: %s\n"
- "%s\tRecursive Deactivate: %s\n"
+ "%s\tRecursive Stop: %s\n"
"%s\tStop When Unneeded: %s\n",
prefix, unit_id(u),
prefix, unit_description(u),
- prefix, load_state_table[u->meta.load_state],
- prefix, active_state_table[unit_active_state(u)],
+ prefix, unit_load_state_to_string(u->meta.load_state),
+ prefix, unit_active_state_to_string(unit_active_state(u)),
prefix, yes_no(u->meta.recursive_stop),
prefix, yes_no(u->meta.stop_when_unneeded));
- if (u->meta.load_path)
- fprintf(f, "%s\tLoad Path: %s\n", prefix, u->meta.load_path);
+ if (u->meta.fragment_path)
+ fprintf(f, "%s\tFragment Path: %s\n", prefix, u->meta.fragment_path);
SET_FOREACH(t, u->meta.names, i)
fprintf(f, "%s\tName: %s\n", prefix, t);
@@ -396,16 +412,20 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
continue;
SET_FOREACH(other, u->meta.dependencies[d], i)
- fprintf(f, "%s\t%s: %s\n", prefix, dependency_table[d], unit_id(other));
+ fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), unit_id(other));
}
+ LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings)
+ fprintf(f, "%s\tControlGroup: %s:%s\n",
+ prefix, b->controller, b->path);
+
if (UNIT_VTABLE(u)->dump)
UNIT_VTABLE(u)->dump(u, f, prefix2);
if (u->meta.job)
job_dump(u->meta.job, f, prefix2);
- free(prefix2);
+ free(p2);
}
/* Common implementation for multiple backends */
@@ -445,10 +465,12 @@ int unit_load(Unit *u) {
goto fail;
u->meta.load_state = UNIT_LOADED;
+ unit_add_to_dbus_queue(u);
return 0;
fail:
u->meta.load_state = UNIT_FAILED;
+ unit_add_to_dbus_queue(u);
return r;
}
@@ -462,19 +484,25 @@ int unit_start(Unit *u) {
assert(u);
- if (!UNIT_VTABLE(u)->start)
- return -EBADR;
-
+ /* If this is already (being) started, then this will
+ * succeed. Note that this will even succeed if this unit is
+ * not startable by the user. This is relied on to detect when
+ * we need to wait for units and when waiting is finished. */
state = unit_active_state(u);
if (UNIT_IS_ACTIVE_OR_RELOADING(state))
return -EALREADY;
+ /* If it is stopped, but we cannot start it, then fail */
+ if (!UNIT_VTABLE(u)->start)
+ return -EBADR;
+
/* We don't suppress calls to ->start() here when we are
* already starting, to allow this request to be used as a
* "hurry up" call, for example when the unit is in some "auto
* restart" state where it waits for a holdoff timer to elapse
* before it will start again. */
+ unit_add_to_dbus_queue(u);
return UNIT_VTABLE(u)->start(u);
}
@@ -494,16 +522,17 @@ int unit_stop(Unit *u) {
assert(u);
- if (!UNIT_VTABLE(u)->stop)
- return -EBADR;
-
state = unit_active_state(u);
if (state == UNIT_INACTIVE)
return -EALREADY;
+ if (!UNIT_VTABLE(u)->stop)
+ return -EBADR;
+
if (state == UNIT_DEACTIVATING)
return 0;
+ unit_add_to_dbus_queue(u);
return UNIT_VTABLE(u)->stop(u);
}
@@ -527,6 +556,7 @@ int unit_reload(Unit *u) {
if (unit_active_state(u) != UNIT_ACTIVE)
return -ENOEXEC;
+ unit_add_to_dbus_queue(u);
return UNIT_VTABLE(u)->reload(u);
}
@@ -657,7 +687,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
/* So we reached a different state for this
* job. Let's see if we can run it now if it
* failed previously due to EAGAIN. */
- job_schedule_run(u->meta.job);
+ job_add_to_run_queue(u->meta.job);
else {
assert(u->meta.job->state == JOB_RUNNING);
@@ -726,6 +756,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) {
/* Maybe we finished startup and are now ready for being
* stopped because unneeded? */
unit_check_uneeded(u);
+
+ unit_add_to_dbus_queue(u);
}
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) {
@@ -734,7 +766,7 @@ int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) {
assert(u);
assert(fd >= 0);
assert(w);
- assert(w->type == WATCH_INVALID || (w->type == WATCH_FD && w->fd == fd && w->unit == u));
+ assert(w->type == WATCH_INVALID || (w->type == WATCH_FD && w->fd == fd && w->data.unit == u));
zero(ev);
ev.data.ptr = w;
@@ -748,7 +780,7 @@ int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) {
w->fd = fd;
w->type = WATCH_FD;
- w->unit = u;
+ w->data.unit = u;
return 0;
}
@@ -760,12 +792,13 @@ void unit_unwatch_fd(Unit *u, Watch *w) {
if (w->type == WATCH_INVALID)
return;
- assert(w->type == WATCH_FD && w->unit == u);
+ assert(w->type == WATCH_FD);
+ assert(w->data.unit == u);
assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
w->fd = -1;
w->type = WATCH_INVALID;
- w->unit = NULL;
+ w->data.unit = NULL;
}
int unit_watch_pid(Unit *u, pid_t pid) {
@@ -789,7 +822,7 @@ int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
assert(u);
assert(w);
- assert(w->type == WATCH_INVALID || (w->type == WATCH_TIMER && w->unit == u));
+ assert(w->type == WATCH_INVALID || (w->type == WATCH_TIMER && w->data.unit == u));
/* This will try to reuse the old timer if there is one */
@@ -833,13 +866,13 @@ int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
w->fd = fd;
w->type = WATCH_TIMER;
- w->unit = u;
+ w->data.unit = u;
return 0;
fail:
if (ours)
- assert_se(close_nointr(fd) == 0);
+ close_nointr_nofail(fd);
return -errno;
}
@@ -851,14 +884,14 @@ void unit_unwatch_timer(Unit *u, Watch *w) {
if (w->type == WATCH_INVALID)
return;
- assert(w->type == WATCH_TIMER && w->unit == u);
+ assert(w->type == WATCH_TIMER && w->data.unit == u);
assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
assert_se(close_nointr(w->fd) == 0);
w->fd = -1;
w->type = WATCH_INVALID;
- w->unit = NULL;
+ w->data.unit = NULL;
}
bool unit_job_is_applicable(Unit *u, JobType j) {
@@ -928,6 +961,7 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other) {
return r;
}
+ unit_add_to_dbus_queue(u);
return 0;
}
@@ -944,14 +978,17 @@ int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name) {
return 0;
}
-const char *unit_path(void) {
- char *e;
+int unit_add_dependency_by_name_inverse(Unit *u, UnitDependency d, const char *name) {
+ Unit *other;
+ int r;
- if ((e = getenv("UNIT_PATH")))
- if (path_is_absolute(e))
- return e;
+ if ((r = manager_load_unit(u->meta.manager, name, &other)) < 0)
+ return r;
+
+ if ((r = unit_add_dependency(other, d, u)) < 0)
+ return r;
- return UNIT_PATH;
+ return 0;
}
int set_unit_path(const char *p) {
@@ -974,7 +1011,7 @@ int set_unit_path(const char *p) {
return -ENOMEM;
}
- if (setenv("UNIT_PATH", c, 0) < 0) {
+ if (setenv("SYSTEMD_UNIT_PATH", c, 0) < 0) {
r = -errno;
free(c);
return r;
@@ -983,10 +1020,10 @@ int set_unit_path(const char *p) {
return 0;
}
-char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix) {
+char *unit_name_escape_path(const char *path, const char *suffix) {
char *r, *t;
const char *f;
- size_t a, b, c;
+ size_t a, b;
assert(path);
@@ -999,22 +1036,16 @@ char *unit_name_escape_path(const char *prefix, const char *path, const char *su
* escaping is hence reversible.
*/
- if (!prefix)
- prefix = "";
-
if (!suffix)
suffix = "";
- a = strlen(prefix);
- b = strlen(path);
- c = strlen(suffix);
+ a = strlen(path);
+ b = strlen(suffix);
- if (!(r = new(char, a+b*4+c+1)))
+ if (!(r = new(char, a*4+b+1)))
return NULL;
- memcpy(r, prefix, a);
-
- for (f = path, t = r+a; *f; f++) {
+ for (f = path, t = r; *f; f++) {
if (*f == '/')
*(t++) = '.';
else if (*f == '.' || *f == '\\' || !strchr(VALID_CHARS, *f)) {
@@ -1026,7 +1057,202 @@ char *unit_name_escape_path(const char *prefix, const char *path, const char *su
*(t++) = *f;
}
- memcpy(t, suffix, c+1);
+ memcpy(t, suffix, b+1);
+
+ return r;
+}
+
+char *unit_dbus_path(Unit *u) {
+ char *p, *e;
+
+ assert(u);
+
+ if (!(e = bus_path_escape(unit_id(u))))
+ return NULL;
+
+ if (asprintf(&p, "/org/freedesktop/systemd1/unit/%s", e) < 0) {
+ free(e);
+ return NULL;
+ }
+
+ free(e);
+ return p;
+}
+
+int unit_add_cgroup(Unit *u, CGroupBonding *b) {
+ CGroupBonding *l;
+ int r;
+
+ assert(u);
+ assert(b);
+ assert(b->path);
+
+ /* Ensure this hasn't been added yet */
+ assert(!b->unit);
+
+ l = hashmap_get(u->meta.manager->cgroup_bondings, b->path);
+ LIST_PREPEND(CGroupBonding, by_path, l, b);
+
+ if ((r = hashmap_replace(u->meta.manager->cgroup_bondings, b->path, l)) < 0) {
+ LIST_REMOVE(CGroupBonding, by_path, l, b);
+ return r;
+ }
+
+ LIST_PREPEND(CGroupBonding, by_unit, u->meta.cgroup_bondings, b);
+ b->unit = u;
+
+ return 0;
+}
+
+int unit_add_cgroup_from_text(Unit *u, const char *name) {
+ size_t n;
+ const char *p;
+ char *controller;
+ CGroupBonding *b;
+ int r;
+
+ assert(u);
+ assert(name);
+
+ /* Detect controller name */
+ n = strcspn(name, ":/");
+
+ /* Only controller name, no path? No path? */
+ if (name[n] == 0)
+ return -EINVAL;
+
+ if (n > 0) {
+ if (name[n] != ':')
+ return -EINVAL;
+
+ p = name+n+1;
+ } else
+ p = name;
+
+ /* Insist in absolute paths */
+ if (p[0] != '/')
+ return -EINVAL;
+
+ if (!(controller = strndup(name, n)))
+ return -ENOMEM;
+
+ if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) {
+ free(controller);
+ return -EEXIST;
+ }
+
+ if (!(b = new0(CGroupBonding, 1))) {
+ free(controller);
+ return -ENOMEM;
+ }
+
+ b->controller = controller;
+
+ if (!(b->path = strdup(p))) {
+ r = -ENOMEM;
+ goto fail;
+ }
+
+ b->only_us = false;
+ b->clean_up = false;
+
+ if ((r = unit_add_cgroup(u, b)) < 0)
+ goto fail;
+
+ return 0;
+
+fail:
+ free(b->path);
+ free(b->controller);
+ free(b);
+
+ return r;
+}
+
+int unit_add_default_cgroup(Unit *u) {
+ CGroupBonding *b;
+ int r = -ENOMEM;
+
+ assert(u);
+
+ /* Adds in the default cgroup data, if it wasn't specified yet */
+
+ if (unit_get_default_cgroup(u))
+ return 0;
+
+ if (!(b = new0(CGroupBonding, 1)))
+ return -ENOMEM;
+
+ if (!(b->controller = strdup(u->meta.manager->cgroup_controller)))
+ goto fail;
+
+ if (asprintf(&b->path, "%s/%s", u->meta.manager->cgroup_hierarchy, unit_id(u)) < 0)
+ goto fail;
+
+ b->clean_up = true;
+ b->only_us = true;
+
+ if ((r = unit_add_cgroup(u, b)) < 0)
+ goto fail;
+
+ return 0;
+
+fail:
+ free(b->path);
+ free(b->controller);
+ free(b);
return r;
}
+
+CGroupBonding* unit_get_default_cgroup(Unit *u) {
+ assert(u);
+
+ return cgroup_bonding_find_list(u->meta.cgroup_bondings, u->meta.manager->cgroup_controller);
+}
+
+static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
+ [UNIT_SERVICE] = "service",
+ [UNIT_TIMER] = "timer",
+ [UNIT_SOCKET] = "socket",
+ [UNIT_TARGET] = "target",
+ [UNIT_DEVICE] = "device",
+ [UNIT_MOUNT] = "mount",
+ [UNIT_AUTOMOUNT] = "automount",
+ [UNIT_SNAPSHOT] = "snapshot"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
+
+static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
+ [UNIT_STUB] = "stub",
+ [UNIT_LOADED] = "loaded",
+ [UNIT_FAILED] = "failed"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState);
+
+static const char* const unit_active_state_table[_UNIT_ACTIVE_STATE_MAX] = {
+ [UNIT_ACTIVE] = "active",
+ [UNIT_INACTIVE] = "inactive",
+ [UNIT_ACTIVATING] = "activating",
+ [UNIT_DEACTIVATING] = "deactivating"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(unit_active_state, UnitActiveState);
+
+static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = {
+ [UNIT_REQUIRES] = "Requires",
+ [UNIT_SOFT_REQUIRES] = "SoftRequires",
+ [UNIT_WANTS] = "Wants",
+ [UNIT_REQUISITE] = "Requisite",
+ [UNIT_SOFT_REQUISITE] = "SoftRequisite",
+ [UNIT_REQUIRED_BY] = "RequiredBy",
+ [UNIT_SOFT_REQUIRED_BY] = "SoftRequiredBy",
+ [UNIT_WANTED_BY] = "WantedBy",
+ [UNIT_CONFLICTS] = "Conflicts",
+ [UNIT_BEFORE] = "Before",
+ [UNIT_AFTER] = "After",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(unit_dependency, UnitDependency);