morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23827 from yuwata/sd-event-process-buffered-inotify-data

Browse Source 
sd-event: process buffered inotify data
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-06-28 18:25:14 +02:00
committed by GitHub
parent aaec221660 c7b5a5a736
commit a4d60b3e1c
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-event/sd-event.c
View File

@@ -1799,7 +1799,7 @@ static void event_free_inode_data(
if (!d)
return;
assert(!d->event_sources);
assert(LIST_IS_EMPTY(d->event_sources));
if (d->fd >= 0) {
LIST_REMOVE(to_close, e->inode_data_to_close, d);
@@ -1862,7 +1862,7 @@ static void event_gc_inode_data(
if (!d)
return;
if (d->event_sources)
if (!LIST_IS_EMPTY(d->event_sources))
return;
inotify_data = d->inotify_data;
@@ -3874,7 +3874,7 @@ _public_ int sd_event_prepare(sd_event *e) {
event_close_inode_data_fds(e);
if (event_next_pending(e) || e->need_process_child)
if (event_next_pending(e) || e->need_process_child || !LIST_IS_EMPTY(e->inotify_data_buffered))
goto pending;
e->state = SD_EVENT_ARMED;
@@ -3954,7 +3954,7 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t
n_event_max = MALLOC_ELEMENTSOF(e->event_queue);
/* If we still have inotify data buffered, then query the other fds, but don't wait on it */
if (e->inotify_data_buffered)
if (!LIST_IS_EMPTY(e->inotify_data_buffered))
timeout = 0;
for (;;) {

52
src/libsystemd/sd-event/test-event.c
View File

@@ -757,4 +757,56 @@ TEST(inotify_self_destroy) {
assert_se(sd_event_loop(e) >= 0);
}
struct inotify_process_buffered_data_context {
const char *path[2];
unsigned i;
};
static int inotify_process_buffered_data_handler(sd_event_source *s, const struct inotify_event *ev, void *userdata) {
struct inotify_process_buffered_data_context *c = ASSERT_PTR(userdata);
const char *description;
assert_se(sd_event_source_get_description(s, &description) >= 0);
assert_se(c->i < 2);
assert_se(streq(c->path[c->i], description));
c->i++;
return 1;
}
TEST(inotify_process_buffered_data) {
_cleanup_(rm_rf_physical_and_freep) char *p = NULL, *q = NULL;
_cleanup_(sd_event_source_unrefp) sd_event_source *a = NULL, *b = NULL;
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_free_ char *z = NULL;
/* For issue #23826 */
assert_se(sd_event_default(&e) >= 0);
assert_se(mkdtemp_malloc("/tmp/test-inotify-XXXXXX", &p) >= 0);
assert_se(mkdtemp_malloc("/tmp/test-inotify-XXXXXX", &q) >= 0);
struct inotify_process_buffered_data_context context = {
.path = { p, q },
};
assert_se(sd_event_add_inotify(e, &a, p, IN_CREATE, inotify_process_buffered_data_handler, &context) >= 0);
assert_se(sd_event_add_inotify(e, &b, q, IN_CREATE, inotify_process_buffered_data_handler, &context) >= 0);
assert_se(z = path_join(p, "aaa"));
assert_se(touch(z) >= 0);
z = mfree(z);
assert_se(z = path_join(q, "bbb"));
assert_se(touch(z) >= 0);
z = mfree(z);
assert_se(sd_event_run(e, 10 * USEC_PER_SEC) > 0);
assert_se(sd_event_prepare(e) > 0); /* issue #23826: this was 0. */
assert_se(sd_event_dispatch(e) > 0);
assert_se(sd_event_prepare(e) == 0);
assert_se(sd_event_wait(e, 0) == 0);
}
DEFINE_TEST_MAIN(LOG_DEBUG);