[PATH_FAILED] = UNIT_FAILED
};
-int pathspec_watch(PathSpec *s, Unit *u) {
+int path_spec_watch(PathSpec *s, Unit *u) {
+
static const int flags_table[_PATH_TYPE_MAX] = {
[PATH_EXISTS] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB,
[PATH_EXISTS_GLOB] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB,
assert(u);
assert(s);
- pathspec_unwatch(s, u);
+ path_spec_unwatch(s, u);
if (!(k = strdup(s->path)))
return -ENOMEM;
fail:
free(k);
- pathspec_unwatch(s, u);
+ path_spec_unwatch(s, u);
return r;
}
-void pathspec_unwatch(PathSpec *s, Unit *u) {
+void path_spec_unwatch(PathSpec *s, Unit *u) {
if (s->inotify_fd < 0)
return;
s->inotify_fd = -1;
}
-int pathspec_fd_event(PathSpec *s, uint32_t events) {
+int path_spec_fd_event(PathSpec *s, uint32_t events) {
uint8_t *buf = NULL;
struct inotify_event *e;
ssize_t k;
return r;
}
-static bool pathspec_check_good(PathSpec *s, bool initial) {
+static bool path_spec_check_good(PathSpec *s, bool initial) {
bool good = false;
switch (s->type) {
return good;
}
-static bool pathspec_startswith(PathSpec *s, const char *what) {
+static bool path_spec_startswith(PathSpec *s, const char *what) {
return path_startswith(s->path, what);
}
-static void pathspec_mkdir(PathSpec *s, mode_t mode) {
+static void path_spec_mkdir(PathSpec *s, mode_t mode) {
int r;
if (s->type == PATH_EXISTS || s->type == PATH_EXISTS_GLOB)
log_warning("mkdir(%s) failed: %s", s->path, strerror(-r));
}
-static void pathspec_dump(PathSpec *s, FILE *f, const char *prefix) {
+static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
fprintf(f,
"%s%s: %s\n",
prefix,
s->path);
}
-void pathspec_done(PathSpec *s) {
+void path_spec_done(PathSpec *s) {
+ assert(s);
assert(s->inotify_fd == -1);
+
free(s->path);
}
Path *p = PATH(u);
assert(u);
- assert(u->meta.load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
p->directory_mode = 0755;
}
assert(p);
+ unit_ref_unset(&p->unit);
+
while ((s = p->specs)) {
- pathspec_unwatch(s, u);
+ path_spec_unwatch(s, u);
LIST_REMOVE(PathSpec, spec, p->specs, s);
- pathspec_done(s);
+ path_spec_done(s);
free(s);
}
}
assert(p);
assert(m);
- if (p->meta.load_state != UNIT_LOADED ||
- m->meta.load_state != UNIT_LOADED)
+ if (UNIT(p)->load_state != UNIT_LOADED ||
+ UNIT(m)->load_state != UNIT_LOADED)
return 0;
LIST_FOREACH(spec, s, p->specs) {
- if (!pathspec_startswith(s, m->where))
+ if (!path_spec_startswith(s, m->where))
continue;
if ((r = unit_add_two_dependencies(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0)
}
static int path_add_mount_links(Path *p) {
- Meta *other;
+ Unit *other;
int r;
assert(p);
- LIST_FOREACH(units_by_type, other, p->meta.manager->units_by_type[UNIT_MOUNT])
+ LIST_FOREACH(units_by_type, other, UNIT(p)->manager->units_by_type[UNIT_MOUNT])
if ((r = path_add_one_mount_link(p, (Mount*) other)) < 0)
return r;
static int path_verify(Path *p) {
assert(p);
- if (p->meta.load_state != UNIT_LOADED)
+ if (UNIT(p)->load_state != UNIT_LOADED)
return 0;
if (!p->specs) {
- log_error("%s lacks path setting. Refusing.", p->meta.id);
+ log_error("%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
assert(p);
- if (p->meta.manager->running_as == MANAGER_SYSTEM) {
+ if (UNIT(p)->manager->running_as == MANAGER_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
int r;
assert(u);
- assert(u->meta.load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
if ((r = unit_load_fragment_and_dropin(u)) < 0)
return r;
- if (u->meta.load_state == UNIT_LOADED) {
+ if (u->load_state == UNIT_LOADED) {
+
+ if (!UNIT_DEREF(p->unit)) {
+ Unit *x;
- if (!p->unit)
- if ((r = unit_load_related_unit(u, ".service", &p->unit)))
+ r = unit_load_related_unit(u, ".service", &x);
+ if (r < 0)
return r;
- if ((r = unit_add_dependency(u, UNIT_BEFORE, p->unit, true)) < 0)
+ unit_ref_set(&p->unit, x);
+ }
+
+ r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(p->unit), true);
+ if (r < 0)
return r;
if ((r = path_add_mount_links(p)) < 0)
return r;
- if (p->meta.default_dependencies)
+ if (UNIT(p)->default_dependencies)
if ((r = path_add_default_dependencies(p)) < 0)
return r;
}
"%sMakeDirectory: %s\n"
"%sDirectoryMode: %04o\n",
prefix, path_state_to_string(p->state),
- prefix, p->unit->meta.id,
+ prefix, UNIT_DEREF(p->unit)->id,
prefix, yes_no(p->make_directory),
prefix, p->directory_mode);
LIST_FOREACH(spec, s, p->specs)
- pathspec_dump(s, f, prefix);
+ path_spec_dump(s, f, prefix);
}
static void path_unwatch(Path *p) {
assert(p);
LIST_FOREACH(spec, s, p->specs)
- pathspec_unwatch(s, UNIT(p));
+ path_spec_unwatch(s, UNIT(p));
}
static int path_watch(Path *p) {
assert(p);
LIST_FOREACH(spec, s, p->specs)
- if ((r = pathspec_watch(s, UNIT(p))) < 0)
+ if ((r = path_spec_watch(s, UNIT(p))) < 0)
return r;
return 0;
if (state != old_state)
log_debug("%s changed %s -> %s",
- p->meta.id,
+ UNIT(p)->id,
path_state_to_string(old_state),
path_state_to_string(state));
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
- if (p->meta.job && p->meta.job->type == JOB_STOP)
+ if (UNIT(p)->job && UNIT(p)->job->type == JOB_STOP)
return;
- if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0)
+ if ((r = manager_add_job(UNIT(p)->manager, JOB_START, UNIT_DEREF(p->unit), JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;
p->inotify_triggered = false;
return;
fail:
- log_warning("%s failed to queue unit startup job: %s", p->meta.id, bus_error(&error, r));
+ log_warning("%s failed to queue unit startup job: %s", UNIT(p)->id, bus_error(&error, r));
path_enter_dead(p, false);
dbus_error_free(&error);
assert(p);
LIST_FOREACH(spec, s, p->specs) {
- good = pathspec_check_good(s, initial);
+ good = path_spec_check_good(s, initial);
if (good)
break;
if (recheck)
if (path_check_good(p, initial)) {
- log_debug("%s got triggered.", p->meta.id);
+ log_debug("%s got triggered.", UNIT(p)->id);
path_enter_running(p);
return;
}
if (recheck)
if (path_check_good(p, false)) {
- log_debug("%s got triggered.", p->meta.id);
+ log_debug("%s got triggered.", UNIT(p)->id);
path_enter_running(p);
return;
}
return;
fail:
- log_warning("%s failed to enter waiting state: %s", p->meta.id, strerror(-r));
+ log_warning("%s failed to enter waiting state: %s", UNIT(p)->id, strerror(-r));
path_enter_dead(p, false);
}
return;
LIST_FOREACH(spec, s, p->specs)
- pathspec_mkdir(s, p->directory_mode);
+ path_spec_mkdir(s, p->directory_mode);
}
static int path_start(Unit *u) {
assert(p);
assert(p->state == PATH_DEAD || p->state == PATH_FAILED);
- if (p->unit->meta.load_state != UNIT_LOADED)
+ if (UNIT_DEREF(p->unit)->load_state != UNIT_LOADED)
return -ENOENT;
path_mkdir(p);
p->state != PATH_RUNNING)
return;
- /* log_debug("inotify wakeup on %s.", u->meta.id); */
+ /* log_debug("inotify wakeup on %s.", u->id); */
LIST_FOREACH(spec, s, p->specs)
- if (pathspec_owns_inotify_fd(s, fd))
+ if (path_spec_owns_inotify_fd(s, fd))
break;
if (!s) {
goto fail;
}
- changed = pathspec_fd_event(s, events);
+ changed = path_spec_fd_event(s, events);
if (changed < 0)
goto fail;
}
void path_unit_notify(Unit *u, UnitActiveState new_state) {
- char *n;
- int r;
Iterator i;
+ Unit *k;
- if (u->meta.type == UNIT_PATH)
+ if (u->type == UNIT_PATH)
return;
- SET_FOREACH(n, u->meta.names, i) {
- char *k;
- Unit *t;
+ SET_FOREACH(k, u->dependencies[UNIT_TRIGGERED_BY], i) {
Path *p;
- if (!(k = unit_name_change_suffix(n, ".path"))) {
- r = -ENOMEM;
- goto fail;
- }
-
- t = manager_get_unit(u->meta.manager, k);
- free(k);
-
- if (!t)
+ if (k->type != UNIT_PATH)
continue;
- if (t->meta.load_state != UNIT_LOADED)
+ if (k->load_state != UNIT_LOADED)
continue;
- p = PATH(t);
-
- if (p->unit != u)
- continue;
+ p = PATH(k);
if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) {
- log_debug("%s got notified about unit deactivation.", p->meta.id);
+ log_debug("%s got notified about unit deactivation.", UNIT(p)->id);
/* Hmm, so inotify was triggered since the
* last activation, so I guess we need to
path_enter_waiting(p, false, p->inotify_triggered);
}
}
-
- return;
-
-fail:
- log_error("Failed find path unit: %s", strerror(-r));
}
static void path_reset_failed(Unit *u) {
const UnitVTable path_vtable = {
.suffix = ".path",
+ .object_size = sizeof(Path),
.sections =
"Unit\0"
"Path\0"
~ianmdlvl / elogind.git / blobdiff