chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: unify how we iterate over inotify events
[elogind.git]
/
src
/
core
/
path.c
diff --git
a/src/core/path.c
b/src/core/path.c
index 20e454d96f4c1ba04a463c7ac92d920303e12948..656ed6941d9037f7aa3acae08fc7740e6ad7da1d 100644
(file)
--- a/
src/core/path.c
+++ b/
src/core/path.c
@@
-99,7
+99,8
@@
int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) {
break;
}
break;
}
- log_warning("Failed to add watch on %s: %m", s->path);
+ log_warning("Failed to add watch on %s: %s", s->path,
+ errno == ENOSPC ? "too many watches" : strerror(-r));
r = -errno;
if (cut)
*cut = tmp;
r = -errno;
if (cut)
*cut = tmp;
@@
-135,7
+136,7
@@
int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) {
}
if (!exists) {
}
if (!exists) {
- log_error
(
"Failed to add watch on any of the components of %s: %m",
+ log_error
_errno(errno,
"Failed to add watch on any of the components of %s: %m",
s->path);
r = -errno; /* either EACCESS or ENOENT */
goto fail;
s->path);
r = -errno; /* either EACCESS or ENOENT */
goto fail;
@@
-156,10
+157,9
@@
void path_spec_unwatch(PathSpec *s) {
}
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
}
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
-
_cleanup_free_ uint8_t *buf = NULL
;
+
uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event)
;
struct inotify_event *e;
struct inotify_event *e;
- ssize_t k;
- int l;
+ ssize_t l;
int r = 0;
if (revents != EPOLLIN) {
int r = 0;
if (revents != EPOLLIN) {
@@
-167,37
+167,18
@@
int path_spec_fd_event(PathSpec *s, uint32_t revents) {
return -EINVAL;
}
return -EINVAL;
}
- if (ioctl(s->inotify_fd, FIONREAD, &l) < 0) {
- log_error("FIONREAD failed: %m");
- return -errno;
- }
-
- assert(l > 0);
+ l = read(s->inotify_fd, buffer, sizeof(buffer));
+ if (l < 0) {
+ if (errno == EAGAIN || errno == EINTR)
+ return 0;
- buf = malloc(l);
- if (!buf)
- return log_oom();
-
- k = read(s->inotify_fd, buf, l);
- if (k < 0) {
- log_error("Failed to read inotify event: %m");
- return -errno;
+ return log_error_errno(errno, "Failed to read inotify event: %m");
}
}
- e = (struct inotify_event*) buf;
-
- while (k > 0) {
- size_t step;
-
+ FOREACH_INOTIFY_EVENT(e, buffer, l) {
if ((s->type == PATH_CHANGED || s->type == PATH_MODIFIED) &&
s->primary_wd == e->wd)
r = 1;
if ((s->type == PATH_CHANGED || s->type == PATH_MODIFIED) &&
s->primary_wd == e->wd)
r = 1;
-
- step = sizeof(struct inotify_event) + e->len;
- assert(step <= (size_t) k);
-
- e = (struct inotify_event*) ((uint8_t*) e + step);
- k -= step;
}
return r;
}
return r;
@@
-249,7
+230,7
@@
static void path_spec_mkdir(PathSpec *s, mode_t mode) {
r = mkdir_p_label(s->path, mode);
if (r < 0)
r = mkdir_p_label(s->path, mode);
if (r < 0)
- log_warning
("mkdir(%s) failed: %s", s->path, strerror(-r)
);
+ log_warning
_errno(r, "mkdir(%s) failed: %m", s->path
);
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
@@
-319,7
+300,7
@@
static int path_verify(Path *p) {
return 0;
if (!p->specs) {
return 0;
if (!p->specs) {
- log_
error_unit
(UNIT(p)->id,
+ log_
unit_error
(UNIT(p)->id,
"%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
"%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
@@
-561,8
+542,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
return;
fail:
return;
fail:
- log_warning("%s failed to enter waiting state: %s",
- UNIT(p)->id, strerror(-r));
+ log_warning_errno(r, "%s failed to enter waiting state: %m", UNIT(p)->id);
path_enter_dead(p, PATH_FAILURE_RESOURCES);
}
path_enter_dead(p, PATH_FAILURE_RESOURCES);
}
@@
-723,7
+703,7
@@
static void path_trigger_notify(Unit *u, Unit *other) {
if (p->state == PATH_RUNNING &&
UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
if (p->state == PATH_RUNNING &&
UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
- log_
debug_unit
(UNIT(p)->id,
+ log_
unit_debug
(UNIT(p)->id,
"%s got notified about unit deactivation.",
UNIT(p)->id);
"%s got notified about unit deactivation.",
UNIT(p)->id);