X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpath.c;h=e97cd0981097a51255fd70055f824a9d32e10c58;hp=db6f873dca408a189350a5bd132ee2ff29b37db0;hb=a26c9cc60477acacf3a147009894bd837353ed6c;hpb=4b562198c79e4ebfc3d84b69a1dae374bc6cf9f5 diff --git a/src/path.c b/src/path.c index db6f873dc..e97cd0981 100644 --- a/src/path.c +++ b/src/path.c @@ -39,11 +39,13 @@ static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = { [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, [PATH_CHANGED] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_MOVED_FROM|IN_MOVED_TO, + [PATH_MODIFIED] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_MOVED_FROM|IN_MOVED_TO|IN_MODIFY, [PATH_DIRECTORY_NOT_EMPTY] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CREATE|IN_MOVED_TO }; @@ -54,7 +56,7 @@ int pathspec_watch(PathSpec *s, Unit *u) { assert(u); assert(s); - pathspec_unwatch(s, u); + path_spec_unwatch(s, u); if (!(k = strdup(s->path))) return -ENOMEM; @@ -95,11 +97,11 @@ int pathspec_watch(PathSpec *s, Unit *u) { 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; @@ -110,7 +112,7 @@ void pathspec_unwatch(PathSpec *s, Unit *u) { 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; @@ -148,7 +150,8 @@ int pathspec_fd_event(PathSpec *s, uint32_t events) { while (k > 0) { size_t step; - if (s->type == PATH_CHANGED && s->primary_wd == e->wd) + if ((s->type == PATH_CHANGED || s->type == PATH_MODIFIED) && + s->primary_wd == e->wd) r = 1; step = sizeof(struct inotify_event) + e->len; @@ -162,7 +165,7 @@ out: 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) { @@ -183,7 +186,8 @@ static bool pathspec_check_good(PathSpec *s, bool initial) { break; } - case PATH_CHANGED: { + case PATH_CHANGED: + case PATH_MODIFIED: { bool b; b = access(s->path, F_OK) >= 0; @@ -199,11 +203,11 @@ static bool pathspec_check_good(PathSpec *s, bool initial) { 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) @@ -213,7 +217,7 @@ static void pathspec_mkdir(PathSpec *s, mode_t mode) { 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, @@ -221,8 +225,10 @@ static void pathspec_dump(PathSpec *s, FILE *f, const char *prefix) { s->path); } -void pathspec_done(PathSpec *s) { +void path_spec_done(PathSpec *s) { + assert(s); assert(s->inotify_fd == -1); + free(s->path); } @@ -230,7 +236,7 @@ static void path_init(Unit *u) { Path *p = PATH(u); assert(u); - assert(u->meta.load_state == UNIT_STUB); + assert(u->load_state == UNIT_STUB); p->directory_mode = 0755; } @@ -241,10 +247,12 @@ static void path_done(Unit *u) { 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); } } @@ -256,13 +264,13 @@ int path_add_one_mount_link(Path *p, Mount *m) { 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) @@ -273,13 +281,13 @@ int path_add_one_mount_link(Path *p, Mount *m) { } 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]) - if ((r = path_add_one_mount_link(p, (Mount*) other)) < 0) + 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; return 0; @@ -288,11 +296,11 @@ static int path_add_mount_links(Path *p) { 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; } @@ -304,7 +312,7 @@ static int path_add_default_dependencies(Path *p) { 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; @@ -320,24 +328,31 @@ static int path_load(Unit *u) { 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; } @@ -354,16 +369,18 @@ static void path_dump(Unit *u, FILE *f, const char *prefix) { fprintf(f, "%sPath State: %s\n" + "%sResult: %s\n" "%sUnit: %s\n" "%sMakeDirectory: %s\n" "%sDirectoryMode: %04o\n", prefix, path_state_to_string(p->state), - prefix, p->unit->meta.id, + prefix, path_result_to_string(p->result), + 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) { @@ -372,7 +389,7 @@ 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) { @@ -382,7 +399,7 @@ 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; @@ -401,7 +418,7 @@ static void path_set_state(Path *p, PathState state) { 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)); @@ -428,13 +445,13 @@ static int path_coldplug(Unit *u) { return 0; } -static void path_enter_dead(Path *p, bool success) { +static void path_enter_dead(Path *p, PathResult f) { assert(p); - if (!success) - p->failure = true; + if (f != PATH_SUCCESS) + p->result = f; - path_set_state(p, p->failure ? PATH_FAILED : PATH_DEAD); + path_set_state(p, p->result != PATH_SUCCESS ? PATH_FAILED : PATH_DEAD); } static void path_enter_running(Path *p) { @@ -445,10 +462,10 @@ static void path_enter_running(Path *p) { 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; @@ -460,8 +477,8 @@ static void path_enter_running(Path *p) { return; fail: - log_warning("%s failed to queue unit startup job: %s", p->meta.id, bus_error(&error, r)); - path_enter_dead(p, false); + log_warning("%s failed to queue unit startup job: %s", UNIT(p)->id, bus_error(&error, r)); + path_enter_dead(p, PATH_FAILURE_RESOURCES); dbus_error_free(&error); } @@ -473,7 +490,7 @@ static bool path_check_good(Path *p, bool initial) { assert(p); LIST_FOREACH(spec, s, p->specs) { - good = pathspec_check_good(s, initial); + good = path_spec_check_good(s, initial); if (good) break; @@ -487,7 +504,7 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) { 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; } @@ -501,7 +518,7 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) { 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; } @@ -510,8 +527,8 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) { return; fail: - log_warning("%s failed to enter waiting state: %s", p->meta.id, strerror(-r)); - path_enter_dead(p, false); + log_warning("%s failed to enter waiting state: %s", UNIT(p)->id, strerror(-r)); + path_enter_dead(p, PATH_FAILURE_RESOURCES); } static void path_mkdir(Path *p) { @@ -523,7 +540,7 @@ static void path_mkdir(Path *p) { 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) { @@ -532,12 +549,12 @@ 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->failure = false; + p->result = PATH_SUCCESS; path_enter_waiting(p, true, true); return 0; @@ -549,7 +566,7 @@ static int path_stop(Unit *u) { assert(p); assert(p->state == PATH_WAITING || p->state == PATH_RUNNING); - path_enter_dead(p, true); + path_enter_dead(p, PATH_SUCCESS); return 0; } @@ -561,6 +578,7 @@ static int path_serialize(Unit *u, FILE *f, FDSet *fds) { assert(fds); unit_serialize_item(u, f, "state", path_state_to_string(p->state)); + unit_serialize_item(u, f, "result", path_result_to_string(p->result)); return 0; } @@ -580,6 +598,16 @@ static int path_deserialize_item(Unit *u, const char *key, const char *value, FD log_debug("Failed to parse state value %s", value); else p->deserialized_state = state; + + } else if (streq(key, "result")) { + PathResult f; + + f = path_result_from_string(value); + if (f < 0) + log_debug("Failed to parse result value %s", value); + else if (f != PATH_SUCCESS) + p->result = f; + } else log_debug("Unknown serialization key '%s'", key); @@ -610,10 +638,10 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { 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) { @@ -621,7 +649,7 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { goto fail; } - changed = pathspec_fd_event(s, events); + changed = path_spec_fd_event(s, events); if (changed < 0) goto fail; @@ -638,43 +666,29 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { return; fail: - path_enter_dead(p, false); + path_enter_dead(p, PATH_FAILURE_RESOURCES); } 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 @@ -682,11 +696,6 @@ void path_unit_notify(Unit *u, UnitActiveState new_state) { 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) { @@ -697,7 +706,7 @@ static void path_reset_failed(Unit *u) { if (p->state == PATH_FAILED) path_set_state(p, PATH_DEAD); - p->failure = false; + p->result = PATH_SUCCESS; } static const char* const path_state_table[_PATH_STATE_MAX] = { @@ -713,13 +722,22 @@ static const char* const path_type_table[_PATH_TYPE_MAX] = { [PATH_EXISTS] = "PathExists", [PATH_EXISTS_GLOB] = "PathExistsGlob", [PATH_CHANGED] = "PathChanged", + [PATH_MODIFIED] = "PathModified", [PATH_DIRECTORY_NOT_EMPTY] = "DirectoryNotEmpty" }; DEFINE_STRING_TABLE_LOOKUP(path_type, PathType); +static const char* const path_result_table[_PATH_RESULT_MAX] = { + [PATH_SUCCESS] = "success", + [PATH_FAILURE_RESOURCES] = "resources" +}; + +DEFINE_STRING_TABLE_LOOKUP(path_result, PathResult); + const UnitVTable path_vtable = { .suffix = ".path", + .object_size = sizeof(Path), .sections = "Unit\0" "Path\0" @@ -747,5 +765,6 @@ const UnitVTable path_vtable = { .reset_failed = path_reset_failed, .bus_interface = "org.freedesktop.systemd1.Path", - .bus_message_handler = bus_path_message_handler + .bus_message_handler = bus_path_message_handler, + .bus_invalidating_properties = bus_path_invalidating_properties };