diff --git a/doc/API.md b/doc/API.md index c024c66..9f1c76c 100644 --- a/doc/API.md +++ b/doc/API.md @@ -168,8 +168,8 @@ result = uev_run(&ctx, UEV_NONE); ``` With `flags` set to `UEV_ONCE` the event loop returns as soon as it has -served the first event. If `flags` is set to `UEV_ONCE | UEV_NONBLOCK` -the event loop returns immediately if no event is available. +served the first event. With `UEV_NONBLOCK` the event loop returns as +soon as no event is available, also when combined with `UEV_ONCE`. Timers are started by the first call to `uev_run()` and keep their deadline between calls. Use `uev_timer_set()` to restart a timer. diff --git a/src/uev.c b/src/uev.c index fbdbc7b..7e2af19 100644 --- a/src/uev.c +++ b/src/uev.c @@ -290,9 +290,9 @@ int uev_exit(uev_ctx_t *ctx) * * With @p flags set to ::UEV_ONCE the event loop returns after the first * event has been served, useful for instance to set a timeout on a file - * descriptor. If @p flags also has the ::UEV_NONBLOCK flag set the event - * loop will return immediately if no event is pending, useful when run - * inside another event loop. + * descriptor. With the ::UEV_NONBLOCK flag set the event loop returns + * as soon as no event is pending, useful when run inside another event + * loop. * * Timers are started by the first call and keep their deadline between * calls. Use uev_timer_set() to restart a timer. @@ -369,6 +369,9 @@ int uev_run(uev_ctx_t *ctx, int flags) return -2; } + if (!nfds && (flags & UEV_NONBLOCK)) + break; + for (i = 0; ctx->running && i < nfds; i++) { struct signalfd_siginfo fdsi; ssize_t sz = sizeof(fdsi); diff --git a/test/.gitignore b/test/.gitignore index efe7bc9..725c86d 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -7,6 +7,7 @@ cronrun cronstart error io +nonblock resume signal stdin diff --git a/test/Makefile.am b/test/Makefile.am index d001ac1..15c37d1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -12,6 +12,7 @@ TESTS += cronrun TESTS += cronstart TESTS += error TESTS += io +TESTS += nonblock TESTS += resume TESTS += signal TESTS += stdin diff --git a/test/nonblock.c b/test/nonblock.c new file mode 100644 index 0000000..47d639c --- /dev/null +++ b/test/nonblock.c @@ -0,0 +1,35 @@ +/* Verifies that UEV_NONBLOCK returns when no event is pending */ +#include "check.h" + +static int fired; + +static void cb(uev_t *w, void *arg, int events) +{ + fired++; +} + +int main(void) +{ + uev_ctx_t ctx; + uev_t w; + + fail_unless(uev_init(&ctx) == 0); + fail_unless(uev_event_init(&ctx, &w, cb, NULL) == 0); + + alarm(2); + fail_unless(uev_run(&ctx, UEV_NONBLOCK) == 0); + fail_unless(fired == 0); + + fail_unless(uev_event_post(&w) == 0); + fail_unless(uev_run(&ctx, UEV_NONBLOCK) == 0); + fail_unless(fired == 1); + + return uev_exit(&ctx); +} + +/** + * Local Variables: + * indent-tabs-mode: t + * c-file-style: "linux" + * End: + */