luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated atomic functions from tests

Browse Source
This commit is contained in:
Matthias Clasen 2011-06-06 00:30:02 -04:00
parent 059fa31ad1
commit 1f022a88d4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/atomic-test.c
View File

@ -23,10 +23,10 @@ main (int argc,
g_assert (g_atomic_int_dec_and_test (&atomic)); g_assert (g_atomic_int_dec_and_test (&atomic));
g_assert (atomic == 0); g_assert (atomic == 0);
g_assert (g_atomic_int_exchange_and_add (&atomic, 5) == 0); g_assert (g_atomic_int_add (&atomic, 5) == 0);
g_assert (atomic == 5); g_assert (atomic == 5);
g_assert (g_atomic_int_exchange_and_add (&atomic, -10) == 5); g_assert (g_atomic_int_add (&atomic, -10) == 5);
g_assert (atomic == -5); g_assert (atomic == -5);
g_atomic_int_add (&atomic, 20); g_atomic_int_add (&atomic, 20);

10
tests/onceinit.c
View File

@ -32,7 +32,7 @@ static void
assert_singleton_execution1 (void) assert_singleton_execution1 (void)
{ {
static volatile int seen_execution = 0; static volatile int seen_execution = 0;
int old_seen_execution = g_atomic_int_exchange_and_add (&seen_execution, 1); int old_seen_execution = g_atomic_int_add (&seen_execution, 1);
if (old_seen_execution != 0) if (old_seen_execution != 0)
g_error ("%s: function executed more than once", G_STRFUNC); g_error ("%s: function executed more than once", G_STRFUNC);
} }
@ -41,7 +41,7 @@ static void
assert_singleton_execution2 (void) assert_singleton_execution2 (void)
{ {
static volatile int seen_execution = 0; static volatile int seen_execution = 0;
int old_seen_execution = g_atomic_int_exchange_and_add (&seen_execution, 1); int old_seen_execution = g_atomic_int_add (&seen_execution, 1);
if (old_seen_execution != 0) if (old_seen_execution != 0)
g_error ("%s: function executed more than once", G_STRFUNC); g_error ("%s: function executed more than once", G_STRFUNC);
} }
@ -50,7 +50,7 @@ static void
assert_singleton_execution3 (void) assert_singleton_execution3 (void)
{ {
static volatile int seen_execution = 0; static volatile int seen_execution = 0;
int old_seen_execution = g_atomic_int_exchange_and_add (&seen_execution, 1); int old_seen_execution = g_atomic_int_add (&seen_execution, 1);
if (old_seen_execution != 0) if (old_seen_execution != 0)
g_error ("%s: function executed more than once", G_STRFUNC); g_error ("%s: function executed more than once", G_STRFUNC);
} }
@ -102,7 +102,7 @@ tmain_call_initializer3 (gpointer user_data)
//g_printf ("["); //g_printf ("[");
initializer3(); initializer3();
//g_printf ("]\n"); //g_printf ("]\n");
g_atomic_int_exchange_and_add (&thread_call_count, 1); g_atomic_int_add (&thread_call_count, 1);
return NULL; return NULL;
} }
@ -268,7 +268,7 @@ stress_concurrent_initializers (void *user_data)
for (i = 0; i < G_N_ELEMENTS (initializers); i++) for (i = 0; i < G_N_ELEMENTS (initializers); i++)
{ {
initializers[i](); initializers[i]();
g_atomic_int_exchange_and_add (&thread_call_count, 1); g_atomic_int_add (&thread_call_count, 1);
} }
return NULL; return NULL;
} }