X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpath.c;h=f15c9214efb35c73fd5cdea904dc802d5fc783cd;hp=3e2856920338d1db3216f2ee98b079a4e9a48200;hb=8ea913b2eaadbd92e069ea6b71cc5f5df409decf;hpb=782195a3c31a79428874a32e0264c0aa97a664f7 diff --git a/src/path.c b/src/path.c index 3e2856920..f15c9214e 100644 --- a/src/path.c +++ b/src/path.c @@ -39,6 +39,26 @@ static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = { [PATH_FAILED] = UNIT_FAILED }; +static void path_init(Unit *u) { + Path *p = PATH(u); + + assert(u); + assert(u->meta.load_state == UNIT_STUB); + + p->directory_mode = 0755; +} + +static void path_unwatch_one(Path *p, PathSpec *s) { + + if (s->inotify_fd < 0) + return; + + unit_unwatch_fd(UNIT(p), &s->watch); + + close_nointr_nofail(s->inotify_fd); + s->inotify_fd = -1; +} + static void path_done(Unit *u) { Path *p = PATH(u); PathSpec *s; @@ -46,7 +66,9 @@ static void path_done(Unit *u) { assert(p); while ((s = p->specs)) { + path_unwatch_one(p, s); LIST_REMOVE(PathSpec, spec, p->specs, s); + free(s->path); free(s); } } @@ -80,7 +102,7 @@ static int path_add_mount_links(Path *p) { assert(p); - LIST_FOREACH(units_per_type, other, p->meta.manager->units_per_type[UNIT_MOUNT]) + 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) return r; @@ -156,9 +178,13 @@ static void path_dump(Unit *u, FILE *f, const char *prefix) { fprintf(f, "%sPath State: %s\n" - "%sUnit: %s\n", + "%sUnit: %s\n" + "%sMakeDirectory: %s\n" + "%sDirectoryMode: %04o\n", prefix, path_state_to_string(p->state), - prefix, p->unit->meta.id); + prefix, p->unit->meta.id, + prefix, yes_no(p->make_directory), + prefix, p->directory_mode); LIST_FOREACH(spec, s, p->specs) fprintf(f, @@ -168,26 +194,16 @@ static void path_dump(Unit *u, FILE *f, const char *prefix) { s->path); } -static void path_unwatch_one(Path *p, PathSpec *s) { - - if (s->inotify_fd < 0) - return; - - unit_unwatch_fd(UNIT(p), &s->watch); - - close_nointr_nofail(s->inotify_fd); - s->inotify_fd = -1; -} - static int path_watch_one(Path *p, PathSpec *s) { 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_DIRECTORY_NOT_EMPTY] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CREATE|IN_MOVED_TO }; bool exists = false; - char *k; + char *k, *slash; int r; assert(p); @@ -211,23 +227,23 @@ static int path_watch_one(Path *p, PathSpec *s) { if ((s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type])) >= 0) exists = true; - for (;;) { + do { int flags; - char *slash; /* This assumes the path was passed through path_kill_slashes()! */ if (!(slash = strrchr(k, '/'))) break; - *slash = 0; + /* Trim the path at the last slash. Keep the slash if it's the root dir. */ + slash[slash == k] = 0; - flags = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB; + flags = IN_MOVE_SELF; if (!exists) - flags |= IN_CREATE | IN_MOVED_TO; + flags |= IN_DELETE_SELF | IN_ATTRIB | IN_CREATE | IN_MOVED_TO; if (inotify_add_watch(s->inotify_fd, k, flags) >= 0) exists = true; - } + } while (slash != k); return 0; @@ -267,7 +283,8 @@ static void path_set_state(Path *p, PathState state) { old_state = p->state; p->state = state; - if (state != PATH_WAITING) + if (state != PATH_WAITING && + (state != PATH_RUNNING || p->inotify_triggered)) path_unwatch(p); if (state != old_state) @@ -276,10 +293,10 @@ static void path_set_state(Path *p, PathState state) { path_state_to_string(old_state), path_state_to_string(state)); - unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state]); + unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state], true); } -static void path_enter_waiting(Path *p, bool initial); +static void path_enter_waiting(Path *p, bool initial, bool recheck); static int path_coldplug(Unit *u) { Path *p = PATH(u); @@ -291,7 +308,7 @@ static int path_coldplug(Unit *u) { if (p->deserialized_state == PATH_WAITING || p->deserialized_state == PATH_RUNNING) - path_enter_waiting(p, true); + path_enter_waiting(p, true, true); else path_set_state(p, p->deserialized_state); } @@ -322,6 +339,11 @@ static void path_enter_running(Path *p) { if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0) goto fail; + p->inotify_triggered = false; + + if ((r = path_watch(p)) < 0) + goto fail; + path_set_state(p, PATH_RUNNING); return; @@ -332,12 +354,12 @@ fail: dbus_error_free(&error); } - -static void path_enter_waiting(Path *p, bool initial) { +static bool path_check_good(Path *p, bool initial) { PathSpec *s; - int r; bool good = false; + assert(p); + LIST_FOREACH(spec, s, p->specs) { switch (s->type) { @@ -346,10 +368,18 @@ static void path_enter_waiting(Path *p, bool initial) { good = access(s->path, F_OK) >= 0; break; - case PATH_DIRECTORY_NOT_EMPTY: - good = dir_is_empty(s->path) == 0; + case PATH_EXISTS_GLOB: + good = glob_exists(s->path) > 0; break; + case PATH_DIRECTORY_NOT_EMPTY: { + int k; + + k = dir_is_empty(s->path); + good = !(k == -ENOENT || k > 0); + break; + } + case PATH_CHANGED: { bool b; @@ -367,14 +397,33 @@ static void path_enter_waiting(Path *p, bool initial) { break; } - if (good) { - path_enter_running(p); - return; - } + return good; +} + +static void path_enter_waiting(Path *p, bool initial, bool recheck) { + int r; + + if (recheck) + if (path_check_good(p, initial)) { + log_debug("%s got triggered.", p->meta.id); + path_enter_running(p); + return; + } if ((r = path_watch(p)) < 0) goto fail; + /* Hmm, so now we have created inotify watches, but the file + * might have appeared/been removed by now, so we must + * recheck */ + + if (recheck) + if (path_check_good(p, false)) { + log_debug("%s got triggered.", p->meta.id); + path_enter_running(p); + return; + } + path_set_state(p, PATH_WAITING); return; @@ -383,6 +432,25 @@ fail: path_enter_dead(p, false); } +static void path_mkdir(Path *p) { + PathSpec *s; + + assert(p); + + if (!p->make_directory) + return; + + LIST_FOREACH(spec, s, p->specs) { + int r; + + if (s->type == PATH_EXISTS || s->type == PATH_EXISTS_GLOB) + continue; + + if ((r = mkdir_p(s->path, p->directory_mode)) < 0) + log_warning("mkdir(%s) failed: %s", s->path, strerror(-r)); + } +} + static int path_start(Unit *u) { Path *p = PATH(u); @@ -392,8 +460,10 @@ static int path_start(Unit *u) { if (p->unit->meta.load_state != UNIT_LOADED) return -ENOENT; + path_mkdir(p); + p->failure = false; - path_enter_waiting(p, true); + path_enter_waiting(p, true, true); return 0; } @@ -460,14 +530,16 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { uint8_t *buf = NULL; struct inotify_event *e; PathSpec *s; + bool changed; assert(p); assert(fd >= 0); - if (p->state != PATH_WAITING) + if (p->state != PATH_WAITING && + p->state != PATH_RUNNING) return; - log_debug("inotify wakeup on %s.", u->meta.id); + /* log_debug("inotify wakeup on %s.", u->meta.id); */ if (events != EPOLLIN) { log_error("Got Invalid poll event on inotify."); @@ -488,8 +560,10 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { goto fail; } + assert(l > 0); + if (!(buf = malloc(l))) { - log_error("Failed to allocate buffer: %s", strerror(-ENOMEM)); + log_error("Failed to allocate buffer: %s", strerror(ENOMEM)); goto fail; } @@ -498,15 +572,19 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { goto fail; } + /* If we are already running, then remember that one event was + * dispatched so that we restart the service only if something + * actually changed on disk */ + p->inotify_triggered = true; + e = (struct inotify_event*) buf; + changed = false; while (k > 0) { size_t step; if (s->type == PATH_CHANGED && s->primary_wd == e->wd) - path_enter_running(p); - else - path_enter_waiting(p, false); + changed = true; step = sizeof(struct inotify_event) + e->len; assert(step <= (size_t) k); @@ -515,6 +593,11 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { k -= step; } + if (changed) + path_enter_running(p); + else + path_enter_waiting(p, false, true); + free(buf); return; @@ -558,7 +641,11 @@ void path_unit_notify(Unit *u, UnitActiveState new_state) { if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) { log_debug("%s got notified about unit deactivation.", p->meta.id); - path_enter_waiting(p, false); + + /* Hmm, so inotify was triggered since the + * last activation, so I guess we need to + * recheck what is going on. */ + path_enter_waiting(p, false, p->inotify_triggered); } } @@ -590,6 +677,7 @@ DEFINE_STRING_TABLE_LOOKUP(path_state, PathState); static const char* const path_type_table[_PATH_TYPE_MAX] = { [PATH_EXISTS] = "PathExists", + [PATH_EXISTS_GLOB] = "PathExistsGlob", [PATH_CHANGED] = "PathChanged", [PATH_DIRECTORY_NOT_EMPTY] = "DirectoryNotEmpty" }; @@ -598,7 +686,12 @@ DEFINE_STRING_TABLE_LOOKUP(path_type, PathType); const UnitVTable path_vtable = { .suffix = ".path", + .sections = + "Unit\0" + "Path\0" + "Install\0", + .init = path_init, .done = path_done, .load = path_load,