luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-28 05:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

win32: make g_cond_wait_until() wait at least until end_time before returning with a timeout. See #1371

Browse Source 
The tests in test_async_queue_timed() assume that g_async_queue_timeout_pop()
and in turn g_cond_wait_until() wait at least until end_time
before returning, i.e. calling g_get_monotonic_time() after the timeout should result
in a value equal or larger than the timeout end time.

For the win32 implementation of g_cond_wait_until() this isn't the case which
makes those tests fail.

There are three reasons why the function returns early:

1) The underlying API works with milliseconds and the timeout gets rounded
   down, resulting in a too small timeout value.
2) In case the timeout is too large to be passed to the API it gets limited
   (there is also a bug because it converts INFINITE to milliseconds while
   they already are, but using INFINITE would be wrong as well, as passing
   a large timeout is not the same as blocking forever really)
3) Even with the rounding changed the underlying API still returns a bit early
   sometimes on my machine (relative to g_get_monotonic_time())

This changes the implementation to round up to the next millisecond (fixing 1)
and to wait again in case a timeout occurs but the end time hasn't been
reached yet (fixing 2 and 3).

This makes the test_async_queue_timed() tests pass.

https://bugzilla.gnome.org/show_bug.cgi?id=795569
This commit is contained in:
Christoph Reiter 2018-05-10 13:28:49 +02:00
parent ab116c3111
commit 583fb1a397
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glib/gthread-win32.c
View File

@ -305,17 +305,38 @@ g_cond_wait_until (GCond *cond,
GMutex *entered_mutex, GMutex *entered_mutex,
gint64 end_time) gint64 end_time)
{ {
gint64 span; gint64 span, start_time;
DWORD span_millis;
gboolean signalled;
span = end_time - g_get_monotonic_time (); start_time = g_get_monotonic_time ();
do
{
span = end_time - start_time;
if G_UNLIKELY (span < 0) if G_UNLIKELY (span < 0)
span = 0; span_millis = 0;
else if G_UNLIKELY (span > G_GINT64_CONSTANT (1000) * (DWORD) INFINITE)
span_millis = INFINITE;
else
/* Round up so we don't time out too early */
span_millis = (span + 1000 - 1) / 1000;
if G_UNLIKELY (span > G_GINT64_CONSTANT (1000) * G_MAXINT32) /* We never want to wait infinitely */
span = INFINITE; if (span_millis >= INFINITE)
span_millis = INFINITE - 1;
return g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, span / 1000, 0); signalled = g_thread_impl_vtable.SleepConditionVariableSRW (cond, entered_mutex, span_millis, 0);
if (signalled)
break;
/* In case we didn't wait long enough after a timeout, wait again for the
* remaining time */
start_time = g_get_monotonic_time ();
}
while (start_time < end_time);
return signalled;
} }
/* {{{1 GPrivate */ /* {{{1 GPrivate */