<div class="gmail_quote">On Fri, Feb 15, 2013 at 7:56 AM, Philip Withnall <<a href="mailto:philip@tecnocode.co.uk" target="_blank">philip@tecnocode.co.uk</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> There’s a bug in FreeBSD’s handling of timer events which means we have to be more relaxed about how we check when timer events have happened because FreeBSD can’t manage enough precision on scheduling the events. Signed-off-by: Philip Withnall <<a href="mailto:philip@tecnocode.co.uk">philip@tecnocode.co.uk</a>> --- tests/event-loop-test.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/event-loop-test.c b/tests/event-loop-test.c index c46d3b0..cf9dabe 100644 --- a/tests/event-loop-test.c +++ b/tests/event-loop-test.c @@ -155,10 +155,11 @@ TEST(event_loop_signal) source = wl_event_loop_add_signal(loop, SIGUSR1, signal_callback, &got_it); - wl_event_loop_dispatch(loop, 0); + assert(source); + assert(wl_event_loop_dispatch(loop, 0) == 0); </blockquote><div> </div><div>You shouldn't put code with side effects inside asserts, since it'll be compiled out in release mode.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> assert(!got_it); - kill(getpid(), SIGUSR1); - wl_event_loop_dispatch(loop, 0); + assert(kill(getpid(), SIGUSR1) == 0); + assert(wl_event_loop_dispatch(loop, 0) == 0); assert(got_it); wl_event_source_remove(source); @@ -183,12 +184,21 @@ TEST(event_loop_timer) int got_it = 0; source = wl_event_loop_add_timer(loop, timer_callback, &got_it); - wl_event_source_timer_update(source, 10); - wl_event_loop_dispatch(loop, 0); + assert(source); + assert(wl_event_source_timer_update(source, 10) == 0); + assert(wl_event_loop_dispatch(loop, 0) == 0); assert(!got_it); - wl_event_loop_dispatch(loop, 20); + /* FreeBSD has a bug where it converts ms_timeout to ticks; it always adds 1 to the tick count. + * Consequently, we need to grossly overcompensate here. + * See: <a href="http://unix.derkeiler.com/Mailing-Lists/FreeBSD/hackers/2012-07/msg00319.html" target="_blank">http://unix.derkeiler.com/Mailing-Lists/FreeBSD/hackers/2012-07/msg00319.html</a> */ + assert(wl_event_loop_dispatch(loop, 50) == 0); assert(got_it); + /* Check it doesn't fire again. */ + got_it = 0; + assert(wl_event_loop_dispatch(loop, 20) == 0); + assert(!got_it); + wl_event_source_remove(source); wl_event_loop_destroy(loop); } -- 1.7.11.7 _______________________________________________ wayland-devel mailing list <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a> </blockquote></div>