2012-03-14 20:47:40 +08:00
|
|
|
/*
|
|
|
|
* Copyright © 2012 Intel Corporation
|
2013-01-12 11:01:47 +08:00
|
|
|
* Copyright © 2012 Jason Ekstrand
|
2012-03-14 20:47:40 +08:00
|
|
|
*
|
2015-06-10 17:57:59 +08:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
|
|
* a copy of this software and associated documentation files (the
|
|
|
|
* "Software"), to deal in the Software without restriction, including
|
|
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
* the following conditions:
|
2012-03-14 20:47:40 +08:00
|
|
|
*
|
2015-06-10 17:57:59 +08:00
|
|
|
* The above copyright notice and this permission notice (including the
|
|
|
|
* next paragraph) shall be included in all copies or substantial
|
|
|
|
* portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
2012-03-14 20:47:40 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <assert.h>
|
2012-03-21 22:29:47 +08:00
|
|
|
#include <unistd.h>
|
2012-05-08 21:37:34 +08:00
|
|
|
#include <signal.h>
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
#include <sys/time.h>
|
2013-06-28 09:09:18 +08:00
|
|
|
|
2013-01-12 11:01:47 +08:00
|
|
|
#include "wayland-private.h"
|
2013-06-28 09:09:18 +08:00
|
|
|
#include "wayland-server.h"
|
2012-03-14 20:47:40 +08:00
|
|
|
#include "test-runner.h"
|
|
|
|
|
|
|
|
static int
|
|
|
|
fd_dispatch(int fd, uint32_t mask, void *data)
|
|
|
|
{
|
|
|
|
int *p = data;
|
|
|
|
|
2012-05-08 21:57:17 +08:00
|
|
|
assert(mask == 0);
|
2014-08-12 17:35:05 +08:00
|
|
|
++(*p);
|
2012-03-14 20:47:40 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-08 21:58:01 +08:00
|
|
|
TEST(event_loop_post_dispatch_check)
|
2012-03-14 20:47:40 +08:00
|
|
|
{
|
|
|
|
struct wl_event_loop *loop = wl_event_loop_create();
|
|
|
|
struct wl_event_source *source;
|
|
|
|
int dispatch_ran = 0;
|
2013-01-06 22:46:00 +08:00
|
|
|
int p[2];
|
2012-03-14 20:47:40 +08:00
|
|
|
|
2014-01-11 04:55:25 +08:00
|
|
|
assert(loop);
|
2013-01-06 22:46:00 +08:00
|
|
|
assert(pipe(p) == 0);
|
|
|
|
|
|
|
|
source = wl_event_loop_add_fd(loop, p[0], WL_EVENT_READABLE,
|
2012-03-14 20:47:40 +08:00
|
|
|
fd_dispatch, &dispatch_ran);
|
2014-01-11 04:55:25 +08:00
|
|
|
assert(source);
|
2012-03-14 20:47:40 +08:00
|
|
|
wl_event_source_check(source);
|
|
|
|
|
|
|
|
wl_event_loop_dispatch(loop, 0);
|
2014-08-12 17:35:05 +08:00
|
|
|
assert(dispatch_ran == 1);
|
2012-03-14 20:47:40 +08:00
|
|
|
|
2013-01-06 22:46:00 +08:00
|
|
|
assert(close(p[0]) == 0);
|
|
|
|
assert(close(p[1]) == 0);
|
2012-03-14 20:47:40 +08:00
|
|
|
wl_event_source_remove(source);
|
|
|
|
wl_event_loop_destroy(loop);
|
|
|
|
}
|
2012-03-21 22:29:47 +08:00
|
|
|
|
|
|
|
struct free_source_context {
|
|
|
|
struct wl_event_source *source1, *source2;
|
|
|
|
int p1[2], p2[2];
|
|
|
|
int count;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
free_source_callback(int fd, uint32_t mask, void *data)
|
|
|
|
{
|
|
|
|
struct free_source_context *context = data;
|
|
|
|
|
|
|
|
context->count++;
|
|
|
|
|
|
|
|
/* Remove other source */
|
|
|
|
if (fd == context->p1[0]) {
|
|
|
|
wl_event_source_remove(context->source2);
|
|
|
|
context->source2 = NULL;
|
|
|
|
} else if (fd == context->p2[0]) {
|
|
|
|
wl_event_source_remove(context->source1);
|
|
|
|
context->source1 = NULL;
|
|
|
|
} else {
|
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-05-08 21:58:01 +08:00
|
|
|
TEST(event_loop_free_source_with_data)
|
2012-03-21 22:29:47 +08:00
|
|
|
{
|
|
|
|
struct wl_event_loop *loop = wl_event_loop_create();
|
|
|
|
struct free_source_context context;
|
|
|
|
int data;
|
|
|
|
|
|
|
|
/* This test is a little tricky to get right, since we don't
|
|
|
|
* have any guarantee from the event loop (ie epoll) on the
|
|
|
|
* order of which it reports events. We want to have one
|
|
|
|
* source free the other, but we don't know which one is going
|
|
|
|
* to run first. So we add two fd sources with a callback
|
|
|
|
* that frees the other source and check that only one of them
|
|
|
|
* run (and that we don't crash, of course).
|
|
|
|
*/
|
|
|
|
|
2014-01-11 04:55:25 +08:00
|
|
|
assert(loop);
|
|
|
|
|
2012-03-21 22:29:47 +08:00
|
|
|
context.count = 0;
|
|
|
|
assert(pipe(context.p1) == 0);
|
|
|
|
assert(pipe(context.p2) == 0);
|
|
|
|
context.source1 =
|
|
|
|
wl_event_loop_add_fd(loop, context.p1[0], WL_EVENT_READABLE,
|
|
|
|
free_source_callback, &context);
|
|
|
|
assert(context.source1);
|
|
|
|
context.source2 =
|
|
|
|
wl_event_loop_add_fd(loop, context.p2[0], WL_EVENT_READABLE,
|
|
|
|
free_source_callback, &context);
|
|
|
|
assert(context.source2);
|
|
|
|
|
|
|
|
data = 5;
|
|
|
|
assert(write(context.p1[1], &data, sizeof data) == sizeof data);
|
|
|
|
assert(write(context.p2[1], &data, sizeof data) == sizeof data);
|
|
|
|
|
|
|
|
wl_event_loop_dispatch(loop, 0);
|
|
|
|
|
|
|
|
assert(context.count == 1);
|
|
|
|
|
|
|
|
if (context.source1)
|
|
|
|
wl_event_source_remove(context.source1);
|
|
|
|
if (context.source2)
|
|
|
|
wl_event_source_remove(context.source2);
|
|
|
|
wl_event_loop_destroy(loop);
|
2012-04-20 16:21:34 +08:00
|
|
|
|
|
|
|
assert(close(context.p1[0]) == 0);
|
|
|
|
assert(close(context.p1[1]) == 0);
|
|
|
|
assert(close(context.p2[0]) == 0);
|
|
|
|
assert(close(context.p2[1]) == 0);
|
2012-03-21 22:29:47 +08:00
|
|
|
}
|
2012-05-08 21:37:34 +08:00
|
|
|
|
|
|
|
static int
|
|
|
|
signal_callback(int signal_number, void *data)
|
|
|
|
{
|
|
|
|
int *got_it = data;
|
|
|
|
|
|
|
|
assert(signal_number == SIGUSR1);
|
2014-08-12 17:35:05 +08:00
|
|
|
++(*got_it);
|
2012-05-08 21:37:34 +08:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-05-08 21:55:55 +08:00
|
|
|
TEST(event_loop_signal)
|
2012-05-08 21:37:34 +08:00
|
|
|
{
|
|
|
|
struct wl_event_loop *loop = wl_event_loop_create();
|
|
|
|
struct wl_event_source *source;
|
|
|
|
int got_it = 0;
|
|
|
|
|
|
|
|
source = wl_event_loop_add_signal(loop, SIGUSR1,
|
|
|
|
signal_callback, &got_it);
|
2014-08-12 17:35:05 +08:00
|
|
|
assert(source);
|
|
|
|
|
2012-05-08 21:55:55 +08:00
|
|
|
wl_event_loop_dispatch(loop, 0);
|
|
|
|
assert(!got_it);
|
2012-05-08 21:37:34 +08:00
|
|
|
kill(getpid(), SIGUSR1);
|
|
|
|
wl_event_loop_dispatch(loop, 0);
|
2014-08-12 17:35:05 +08:00
|
|
|
assert(got_it == 1);
|
2012-05-08 21:37:34 +08:00
|
|
|
|
|
|
|
wl_event_source_remove(source);
|
|
|
|
wl_event_loop_destroy(loop);
|
|
|
|
}
|
2012-05-08 21:55:55 +08:00
|
|
|
|
2014-08-12 17:35:07 +08:00
|
|
|
TEST(event_loop_multiple_same_signals)
|
|
|
|
{
|
|
|
|
struct wl_event_loop *loop = wl_event_loop_create();
|
|
|
|
struct wl_event_source *s1, *s2;
|
|
|
|
int calls_no = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
s1 = wl_event_loop_add_signal(loop, SIGUSR1,
|
|
|
|
signal_callback, &calls_no);
|
|
|
|
assert(s1);
|
|
|
|
|
|
|
|
s2 = wl_event_loop_add_signal(loop, SIGUSR1,
|
|
|
|
signal_callback, &calls_no);
|
|
|
|
assert(s2);
|
|
|
|
|
|
|
|
assert(wl_event_loop_dispatch(loop, 0) == 0);
|
|
|
|
assert(!calls_no);
|
|
|
|
|
|
|
|
/* Try it more times */
|
|
|
|
for (i = 0; i < 5; ++i) {
|
|
|
|
calls_no = 0;
|
|
|
|
kill(getpid(), SIGUSR1);
|
|
|
|
assert(wl_event_loop_dispatch(loop, 0) == 0);
|
|
|
|
assert(calls_no == 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
wl_event_source_remove(s1);
|
|
|
|
|
|
|
|
/* Try it again with one source */
|
|
|
|
calls_no = 0;
|
|
|
|
kill(getpid(), SIGUSR1);
|
|
|
|
assert(wl_event_loop_dispatch(loop, 0) == 0);
|
|
|
|
assert(calls_no == 1);
|
|
|
|
|
|
|
|
wl_event_source_remove(s2);
|
|
|
|
|
|
|
|
wl_event_loop_destroy(loop);
|
|
|
|
}
|
2012-05-08 21:55:55 +08:00
|
|
|
|
|
|
|
static int
|
|
|
|
timer_callback(void *data)
|
|
|
|
{
|
|
|
|
int *got_it = data;
|
|
|
|
|
2014-08-12 17:35:05 +08:00
|
|
|
++(*got_it);
|
2012-05-08 21:55:55 +08:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(event_loop_timer)
|
|
|
|
{
|
|
|
|
struct wl_event_loop *loop = wl_event_loop_create();
|
|
|
|
struct wl_event_source *source;
|
|
|
|
int got_it = 0;
|
|
|
|
|
|
|
|
source = wl_event_loop_add_timer(loop, timer_callback, &got_it);
|
2014-01-11 04:55:25 +08:00
|
|
|
assert(source);
|
2012-05-08 21:55:55 +08:00
|
|
|
wl_event_source_timer_update(source, 10);
|
|
|
|
wl_event_loop_dispatch(loop, 0);
|
|
|
|
assert(!got_it);
|
|
|
|
wl_event_loop_dispatch(loop, 20);
|
2014-08-12 17:35:05 +08:00
|
|
|
assert(got_it == 1);
|
2012-05-08 21:55:55 +08:00
|
|
|
|
|
|
|
wl_event_source_remove(source);
|
|
|
|
wl_event_loop_destroy(loop);
|
|
|
|
}
|
2013-01-12 11:01:47 +08:00
|
|
|
|
2014-08-19 18:03:48 +08:00
|
|
|
#define MSEC_TO_USEC(msec) ((msec) * 1000)
|
|
|
|
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
struct timer_update_context {
|
|
|
|
struct wl_event_source *source1, *source2;
|
|
|
|
int count;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
timer_update_callback_1(void *data)
|
|
|
|
{
|
|
|
|
struct timer_update_context *context = data;
|
|
|
|
|
|
|
|
context->count++;
|
|
|
|
wl_event_source_timer_update(context->source2, 1000);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
timer_update_callback_2(void *data)
|
|
|
|
{
|
|
|
|
struct timer_update_context *context = data;
|
|
|
|
|
|
|
|
context->count++;
|
|
|
|
wl_event_source_timer_update(context->source1, 1000);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(event_loop_timer_updates)
|
|
|
|
{
|
|
|
|
struct wl_event_loop *loop = wl_event_loop_create();
|
|
|
|
struct timer_update_context context;
|
|
|
|
struct timeval start_time, end_time, interval;
|
|
|
|
|
|
|
|
/* Create two timers that should expire at the same time (after 10ms).
|
|
|
|
* The first timer to receive its expiry callback updates the other timer
|
|
|
|
* with a much larger timeout (1s). This highlights a bug where
|
|
|
|
* wl_event_source_timer_dispatch would block for this larger timeout
|
|
|
|
* when reading from the timer fd, before calling the second timer's
|
|
|
|
* callback.
|
|
|
|
*/
|
|
|
|
|
|
|
|
context.source1 = wl_event_loop_add_timer(loop, timer_update_callback_1,
|
2014-08-19 16:34:52 +08:00
|
|
|
&context);
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
assert(context.source1);
|
2014-08-19 16:34:52 +08:00
|
|
|
assert(wl_event_source_timer_update(context.source1, 10) == 0);
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
|
|
|
|
context.source2 = wl_event_loop_add_timer(loop, timer_update_callback_2,
|
2014-08-19 16:34:52 +08:00
|
|
|
&context);
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
assert(context.source2);
|
2014-08-19 16:34:52 +08:00
|
|
|
assert(wl_event_source_timer_update(context.source2, 10) == 0);
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
|
|
|
|
context.count = 0;
|
|
|
|
|
2014-08-19 18:03:48 +08:00
|
|
|
/* Since calling the functions between source2's update and
|
|
|
|
* wl_event_loop_dispatch() takes some time, it may happen
|
|
|
|
* that only one timer expires until we call epoll_wait.
|
|
|
|
* This naturally means that only one source is dispatched
|
|
|
|
* and the test fails. To fix that, sleep 15 ms before
|
|
|
|
* calling wl_event_loop_dispatch(). That should be enough
|
|
|
|
* for the second timer to expire.
|
|
|
|
*
|
|
|
|
* https://bugs.freedesktop.org/show_bug.cgi?id=80594
|
|
|
|
*/
|
|
|
|
usleep(MSEC_TO_USEC(15));
|
|
|
|
|
test: Add test showing blocking problem when updating timers
I've noticed a blocking problem in Wayland's event-loop code when updating
timer event sources. The problem occurs if you update the timer at a point
after is has expired, but before it has been dispatched, i.e. from an event
callback that happens during the same epoll wakeup.
When the timer is subsequently dispatched, wl_event_source_timer_dispatch
blocks for the duration of the new timeout in its call to read() from the
timer fd (which is the expected behaviour according to the man page for
timerfd_settime).
This isn't too uncommon a scenario - for example, a socket with an associated
timeout timer. You'd typically want to update the timer when reading from the
socket. This is how I noticed the issue, since I was setting a timeout of
1 minute, and saw my server blocking for this duration!
The following patch adds a (currently failing) test case to Wayland's
event-loop-test.c. It demonstrates the problem using two timers, which are
set to expire at the same time. The first timer to receive its expiry
callback updates the other timer with a much larger timeout, which then
causes the test to block for this timeout before calling the second timer's
callback.
As for a fix, I'm not so sure (which is why I thought I'd post the failing
test case first to show what I mean). I notice that it doesn't actually do
anything with the value read from the timerfd socket, which gives the number
of times the timer expired since the last read, or when the timer was last
updated (which blocks if the timer hasn't yet expired). I believe this value
should always read as 1 anyway, since we don't use periodic timers.
A simple fix would be to use the TFD_NONBLOCK option when creating the
timerfd, ensuring that the read call won't block. We'd then have to ignore
the case when the read returns EAGAIN.
2014-04-25 18:36:57 +08:00
|
|
|
gettimeofday(&start_time, NULL);
|
|
|
|
wl_event_loop_dispatch(loop, 20);
|
|
|
|
gettimeofday(&end_time, NULL);
|
|
|
|
|
|
|
|
assert(context.count == 2);
|
|
|
|
|
|
|
|
/* Dispatching the events should not have taken much more than 20ms,
|
|
|
|
* since this is the timeout passed to wl_event_loop_dispatch. If it
|
|
|
|
* blocked, then it will have taken over 1s.
|
|
|
|
* Of course, it could take over 1s anyway on a very slow or heavily
|
|
|
|
* loaded system, so this test isn't 100% perfect.
|
|
|
|
*/
|
|
|
|
|
|
|
|
timersub(&end_time, &start_time, &interval);
|
|
|
|
assert(interval.tv_sec < 1);
|
|
|
|
|
|
|
|
wl_event_source_remove(context.source1);
|
|
|
|
wl_event_source_remove(context.source2);
|
|
|
|
wl_event_loop_destroy(loop);
|
|
|
|
}
|
|
|
|
|
2013-01-12 11:01:47 +08:00
|
|
|
struct event_loop_destroy_listener {
|
|
|
|
struct wl_listener listener;
|
|
|
|
int done;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
event_loop_destroy_notify(struct wl_listener *l, void *data)
|
|
|
|
{
|
|
|
|
struct event_loop_destroy_listener *listener =
|
|
|
|
container_of(l, struct event_loop_destroy_listener, listener);
|
|
|
|
|
|
|
|
listener->done = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
TEST(event_loop_destroy)
|
|
|
|
{
|
|
|
|
struct wl_event_loop *loop;
|
|
|
|
struct wl_display * display;
|
|
|
|
struct event_loop_destroy_listener a, b;
|
|
|
|
|
|
|
|
loop = wl_event_loop_create();
|
|
|
|
assert(loop);
|
|
|
|
|
|
|
|
a.listener.notify = &event_loop_destroy_notify;
|
|
|
|
a.done = 0;
|
|
|
|
wl_event_loop_add_destroy_listener(loop, &a.listener);
|
|
|
|
|
|
|
|
assert(wl_event_loop_get_destroy_listener(loop,
|
|
|
|
event_loop_destroy_notify) == &a.listener);
|
|
|
|
|
|
|
|
b.listener.notify = &event_loop_destroy_notify;
|
|
|
|
b.done = 0;
|
|
|
|
wl_event_loop_add_destroy_listener(loop, &b.listener);
|
|
|
|
|
|
|
|
wl_list_remove(&a.listener.link);
|
|
|
|
wl_event_loop_destroy(loop);
|
|
|
|
|
|
|
|
assert(!a.done);
|
|
|
|
assert(b.done);
|
|
|
|
|
|
|
|
/* Test to make sure it gets fired on display destruction */
|
|
|
|
display = wl_display_create();
|
|
|
|
assert(display);
|
|
|
|
loop = wl_display_get_event_loop(display);
|
|
|
|
assert(loop);
|
|
|
|
|
|
|
|
a.done = 0;
|
|
|
|
wl_event_loop_add_destroy_listener(loop, &a.listener);
|
|
|
|
|
|
|
|
wl_display_destroy(display);
|
|
|
|
|
|
|
|
assert(a.done);
|
|
|
|
}
|
|
|
|
|