luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix non-atomic access to some shared variables

Browse Source 
And drop the `volatile` qualifier from the variables, 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:31:01 +00:00
parent 7cdb68713c
commit 1a7f0002a0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/refcount/objects.c
View File

@ -26,7 +26,7 @@ struct _GTestClass
}; };
static GType my_test_get_type (void); static GType my_test_get_type (void);
static volatile gboolean stopping; static gint stopping; /* (atomic) */
static void my_test_class_init (GTestClass * klass); static void my_test_class_init (GTestClass * klass);
static void my_test_init (GTest * test); static void my_test_init (GTest * test);
@ -101,7 +101,7 @@ run_thread (GTest * test)
{ {
gint i = 1; gint i = 1;
while (!stopping) { while (!g_atomic_int_get (&stopping)) {
my_test_do_refcount (test); my_test_do_refcount (test);
if ((i++ % 10000) == 0) { if ((i++ % 10000) == 0) {
g_print ("."); g_print (".");
@ -128,7 +128,7 @@ main (int argc, char **argv)
test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *)); test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
stopping = FALSE; g_atomic_int_set (&stopping, 0);
for (i = 0; i < n_threads; i++) { for (i = 0; i < n_threads; i++) {
GThread *thread; GThread *thread;
@ -141,7 +141,7 @@ main (int argc, char **argv)
} }
g_usleep (5000000); g_usleep (5000000);
stopping = TRUE; g_atomic_int_set (&stopping, 1);
g_print ("\nstopping\n"); g_print ("\nstopping\n");

8
tests/refcount/properties3.c
View File

@ -34,7 +34,7 @@ struct _GTestClass
static GType my_test_get_type (void); static GType my_test_get_type (void);
G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT) G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT)
static volatile gboolean stopping; static gint stopping; /* (atomic) */
static void my_test_get_property (GObject *object, static void my_test_get_property (GObject *object,
guint prop_id, guint prop_id,
@ -140,7 +140,7 @@ run_thread (GTest * test)
{ {
gint i = 1; gint i = 1;
while (!stopping) { while (!g_atomic_int_get (&stopping)) {
my_test_do_property (test); my_test_do_property (test);
if ((i++ % 10000) == 0) if ((i++ % 10000) == 0)
{ {
@ -170,7 +170,7 @@ main (int argc, char **argv)
test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *)); test_threads = g_array_new (FALSE, FALSE, sizeof (GThread *));
stopping = FALSE; g_atomic_int_set (&stopping, 0);
for (i = 0; i < n_threads; i++) { for (i = 0; i < n_threads; i++) {
GThread *thread; GThread *thread;
@ -180,7 +180,7 @@ main (int argc, char **argv)
} }
g_usleep (30000000); g_usleep (30000000);
stopping = TRUE; g_atomic_int_set (&stopping, 1);
g_print ("\nstopping\n"); g_print ("\nstopping\n");
/* join all threads */ /* join all threads */