X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fpath.c;h=1a3e28f89f33fc962f271a29c63bfb509e977546;hb=4ac9236fa14696db3e8a650a083a238eca9b9ae9;hp=a8b10724495b6198d246d269122c44f1168f8304;hpb=36af55d99711e9accdf42d8a7df60e069f4086c0;p=elogind.git diff --git a/src/path.c b/src/path.c index a8b107244..1a3e28f89 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); } } @@ -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,17 +194,6 @@ 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, @@ -187,7 +202,7 @@ static int path_watch_one(Path *p, PathSpec *s) { }; bool exists = false; - char *k; + char *k, *slash; int r; assert(p); @@ -211,23 +226,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; @@ -277,10 +292,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, bool recheck); +static void path_enter_waiting(Path *p, bool initial, bool recheck, bool skip_watch); static int path_coldplug(Unit *u) { Path *p = PATH(u); @@ -292,7 +307,7 @@ static int path_coldplug(Unit *u) { if (p->deserialized_state == PATH_WAITING || p->deserialized_state == PATH_RUNNING) - path_enter_waiting(p, true, true); + path_enter_waiting(p, true, true, false); else path_set_state(p, p->deserialized_state); } @@ -339,7 +354,7 @@ fail: } -static void path_enter_waiting(Path *p, bool initial, bool recheck) { +static void path_enter_waiting(Path *p, bool initial, bool recheck, bool skip_watch) { PathSpec *s; int r; bool good = false; @@ -381,13 +396,22 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) { } if (good) { + log_debug("%s got triggered.", p->meta.id); path_enter_running(p); return; } waiting: - if ((r = path_watch(p)) < 0) - goto fail; + if (!skip_watch) { + 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 */ + path_enter_waiting(p, false, true, true); + return; + } path_set_state(p, PATH_WAITING); return; @@ -397,6 +421,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) + 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); @@ -406,8 +449,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, true); + path_enter_waiting(p, true, true, false); return 0; } @@ -483,7 +528,7 @@ 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->meta.id); */ if (events != EPOLLIN) { log_error("Got Invalid poll event on inotify."); @@ -538,7 +583,7 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { if (changed) path_enter_running(p); else - path_enter_waiting(p, false, true); + path_enter_waiting(p, false, true, false); free(buf); @@ -587,7 +632,7 @@ void path_unit_notify(Unit *u, UnitActiveState new_state) { /* 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); + path_enter_waiting(p, false, p->inotify_triggered, false); } } @@ -628,6 +673,7 @@ DEFINE_STRING_TABLE_LOOKUP(path_type, PathType); const UnitVTable path_vtable = { .suffix = ".path", + .init = path_init, .done = path_done, .load = path_load,