[PATH_DEAD] = UNIT_INACTIVE,
[PATH_WAITING] = UNIT_ACTIVE,
[PATH_RUNNING] = UNIT_ACTIVE,
- [PATH_MAINTENANCE] = UNIT_MAINTENANCE
+ [PATH_FAILED] = UNIT_FAILED
};
static void path_done(Unit *u) {
if (!success)
p->failure = true;
- path_set_state(p, p->failure ? PATH_MAINTENANCE : PATH_DEAD);
+ path_set_state(p, p->failure ? PATH_FAILED : PATH_DEAD);
}
static void path_enter_running(Path *p) {
Path *p = PATH(u);
assert(p);
- assert(p->state == PATH_DEAD || p->state == PATH_MAINTENANCE);
+ assert(p->state == PATH_DEAD || p->state == PATH_FAILED);
if (p->unit->meta.load_state != UNIT_LOADED)
return -ENOENT;
p->failure = false;
-path_enter_waiting(p, true);
+ path_enter_waiting(p, true);
+
return 0;
}
Path *p = PATH(u);
int l;
ssize_t k;
- struct inotify_event *buf = NULL;
+ uint8_t *buf = NULL;
+ struct inotify_event *e;
PathSpec *s;
assert(p);
goto fail;
}
- if ((size_t) k < sizeof(struct inotify_event) ||
- (size_t) k < sizeof(struct inotify_event) + buf->len) {
- log_error("inotify event too small.");
- goto fail;
- }
+ e = (struct inotify_event*) buf;
- if (s->type == PATH_CHANGED && s->primary_wd == buf->wd)
- path_enter_running(p);
- else
- path_enter_waiting(p, 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);
+
+ step = sizeof(struct inotify_event) + e->len;
+ assert(step <= (size_t) k);
+
+ e = (struct inotify_event*) ((uint8_t*) e + step);
+ k -= step;
+ }
free(buf);
log_error("Failed find path unit: %s", strerror(-r));
}
-static void path_reset_maintenance(Unit *u) {
+static void path_reset_failed(Unit *u) {
Path *p = PATH(u);
assert(p);
- if (p->state == PATH_MAINTENANCE)
+ if (p->state == PATH_FAILED)
path_set_state(p, PATH_DEAD);
p->failure = false;
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
[PATH_RUNNING] = "running",
- [PATH_MAINTENANCE] = "maintenance"
+ [PATH_FAILED] = "failed"
};
DEFINE_STRING_TABLE_LOOKUP(path_state, PathState);
.fd_event = path_fd_event,
- .reset_maintenance = path_reset_maintenance,
+ .reset_failed = path_reset_failed,
.bus_interface = "org.freedesktop.systemd1.Path",
.bus_message_handler = bus_path_message_handler