luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-11 11:44:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix non-atomic access to a shared variable

Browse Source 
And drop the `volatile` qualifier from the variable, as that doesn’t
help with thread safety.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #600
This commit is contained in:
Philip Withnall
2020-11-11 18:17:23 +00:00
parent a6ce0e742a
commit ea746c79fa
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glib/tests/mainloop.c
View File

@@ -918,7 +918,7 @@ test_mainloop_overflow (void)
g_main_context_unref (ctx); g_main_context_unref (ctx);
} }
static volatile gint ready_time_dispatched; static gint ready_time_dispatched; /* (atomic) */
static gboolean static gboolean
ready_time_dispatch (GSource *source, ready_time_dispatch (GSource *source,
@@ -964,7 +964,7 @@ test_ready_time (void)
/* A source with no ready time set should not fire */ /* A source with no ready time set should not fire */
g_assert_cmpint (g_source_get_ready_time (source), ==, -1); g_assert_cmpint (g_source_get_ready_time (source), ==, -1);
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_assert_false (ready_time_dispatched); g_assert_false (g_atomic_int_get (&ready_time_dispatched));
/* The ready time should not have been changed */ /* The ready time should not have been changed */
g_assert_cmpint (g_source_get_ready_time (source), ==, -1); g_assert_cmpint (g_source_get_ready_time (source), ==, -1);
@@ -978,37 +978,37 @@ test_ready_time (void)
*/ */
g_source_set_ready_time (source, g_get_monotonic_time () + G_TIME_SPAN_DAY); g_source_set_ready_time (source, g_get_monotonic_time () + G_TIME_SPAN_DAY);
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_assert_false (ready_time_dispatched); g_assert_false (g_atomic_int_get (&ready_time_dispatched));
/* Make sure it didn't get reset */ /* Make sure it didn't get reset */
g_assert_cmpint (g_source_get_ready_time (source), !=, -1); g_assert_cmpint (g_source_get_ready_time (source), !=, -1);
/* Ready time of -1 -> don't fire */ /* Ready time of -1 -> don't fire */
g_source_set_ready_time (source, -1); g_source_set_ready_time (source, -1);
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_assert_false (ready_time_dispatched); g_assert_false (g_atomic_int_get (&ready_time_dispatched));
/* Not reset, but should still be -1 from above */ /* Not reset, but should still be -1 from above */
g_assert_cmpint (g_source_get_ready_time (source), ==, -1); g_assert_cmpint (g_source_get_ready_time (source), ==, -1);
/* A ready time of the current time should fire immediately */ /* A ready time of the current time should fire immediately */
g_source_set_ready_time (source, g_get_monotonic_time ()); g_source_set_ready_time (source, g_get_monotonic_time ());
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_assert_true (ready_time_dispatched); g_assert_true (g_atomic_int_get (&ready_time_dispatched));
ready_time_dispatched = FALSE; g_atomic_int_set (&ready_time_dispatched, FALSE);
/* Should have gotten reset by the handler function */ /* Should have gotten reset by the handler function */
g_assert_cmpint (g_source_get_ready_time (source), ==, -1); g_assert_cmpint (g_source_get_ready_time (source), ==, -1);
/* As well as one in the recent past... */ /* As well as one in the recent past... */
g_source_set_ready_time (source, g_get_monotonic_time () - G_TIME_SPAN_SECOND); g_source_set_ready_time (source, g_get_monotonic_time () - G_TIME_SPAN_SECOND);
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_assert_true (ready_time_dispatched); g_assert_true (g_atomic_int_get (&ready_time_dispatched));
ready_time_dispatched = FALSE; g_atomic_int_set (&ready_time_dispatched, FALSE);
g_assert_cmpint (g_source_get_ready_time (source), ==, -1); g_assert_cmpint (g_source_get_ready_time (source), ==, -1);
/* Zero is the 'official' way to get a source to fire immediately */ /* Zero is the 'official' way to get a source to fire immediately */
g_source_set_ready_time (source, 0); g_source_set_ready_time (source, 0);
while (g_main_context_iteration (NULL, FALSE)); while (g_main_context_iteration (NULL, FALSE));
g_assert_true (ready_time_dispatched); g_assert_true (g_atomic_int_get (&ready_time_dispatched));
ready_time_dispatched = FALSE; g_atomic_int_set (&ready_time_dispatched, FALSE);
g_assert_cmpint (g_source_get_ready_time (source), ==, -1); g_assert_cmpint (g_source_get_ready_time (source), ==, -1);
/* Now do some tests of cross-thread wakeups. /* Now do some tests of cross-thread wakeups.