luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-2659' into 'main'

Browse Source 
Fix  /maincontext/timeout-once randomly fails

Closes #2659

See merge request GNOME/glib!2780
This commit is contained in:
Philip Withnall 2022-07-07 12:34:45 +00:00
commit a7efce14e0
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gmain.c
View File

@ -4653,7 +4653,8 @@ g_main_context_add_poll_unlocked (GMainContext *context,
context->poll_changed = TRUE;
/* Now wake up the main loop if it is waiting in the poll() */
g_wakeup_signal (context->wakeup);
if (fd != &context->wake_up_rec)
g_wakeup_signal (context->wakeup);
}
/**

9
glib/tests/mainloop.c
View File

@ -2349,6 +2349,7 @@ test_maincontext_timeout_once (void)
{
guint counter = 0, check_counter = 0;
guint source_id;
gint64 t;
GSource *source;
g_test_summary ("Test g_timeout_add_once() works");
@ -2360,14 +2361,18 @@ test_maincontext_timeout_once (void)
/* Iterating the main context should dispatch the source, though we have to block. */
g_assert_cmpuint (counter, ==, 0);
g_main_context_iteration (NULL, TRUE);
t = g_get_monotonic_time ();
while (g_get_monotonic_time () - t < 50 * 1000 && counter == 0)
g_main_context_iteration (NULL, TRUE);
g_assert_cmpuint (counter, ==, 1);
/* Iterating it again should not dispatch the source again. We add a second
* timeout and block until that is dispatched. Given the ordering guarantees,
* we should then know whether the first one would have re-dispatched by then. */
g_timeout_add_once (30 /* ms */, once_cb, &check_counter);
g_main_context_iteration (NULL, TRUE);
t = g_get_monotonic_time ();
while (g_get_monotonic_time () - t < 50 * 1000 && check_counter == 0)
g_main_context_iteration (NULL, TRUE);
g_assert_cmpuint (check_counter, ==, 1);
g_assert_cmpuint (counter, ==, 1);
g_assert_true (g_source_is_destroyed (source));

4
glib/tests/spawn-singlethread.c
View File

@ -295,10 +295,12 @@ test_spawn_async_with_fds (void)
if (test_pipe[1][0] >= 0)
{
gchar *tmp = g_strdup_printf ("# thread %d" LINEEND, tnum);
/* Check for echo on stdout */
g_assert_true (data.stdout_done);
g_assert_cmpstr (data.stdout_buf->str, ==, arg);
g_assert_cmpstr (data.stdout_buf->str, ==, tmp);
g_io_channel_unref (channel);
g_free (tmp);
}
g_string_free (data.stdout_buf, TRUE);