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

Merge branch 'g-test-rand-int-range-race' into 'master'

Browse Source 
tests: Avoid multithreaded use of g_test_rand_int_range

See merge request GNOME/glib!443
This commit is contained in:
Philip Withnall
2018-11-02 10:21:20 +00:00
parent d3f5559780 aed3c0083b
commit 7d4fb4df78
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
glib/gtestutils.c
View File

@@ -809,6 +809,7 @@ static gboolean test_mode_fatal = TRUE;
static gboolean g_test_run_once = TRUE; static gboolean g_test_run_once = TRUE;
static gboolean test_run_list = FALSE; static gboolean test_run_list = FALSE;
static gchar *test_run_seedstr = NULL; static gchar *test_run_seedstr = NULL;
G_LOCK_DEFINE_STATIC (test_run_rand);
static GRand *test_run_rand = NULL; static GRand *test_run_rand = NULL;
static gchar *test_run_name = ""; static gchar *test_run_name = "";
static GSList **test_filename_free_list; static GSList **test_filename_free_list;
@@ -1437,7 +1438,13 @@ test_run_seed (const gchar *rseed)
gint32 gint32
g_test_rand_int (void) g_test_rand_int (void)
{ {
return g_rand_int (test_run_rand); gint32 r;
G_LOCK (test_run_rand);
r = g_rand_int (test_run_rand);
G_UNLOCK (test_run_rand);
return r;
} }
/** /**
@@ -1456,7 +1463,13 @@ gint32
g_test_rand_int_range (gint32 begin, g_test_rand_int_range (gint32 begin,
gint32 end) gint32 end)
{ {
return g_rand_int_range (test_run_rand, begin, end); gint32 r;
G_LOCK (test_run_rand);
r = g_rand_int_range (test_run_rand, begin, end);
G_UNLOCK (test_run_rand);
return r;
} }
/** /**
@@ -1472,7 +1485,13 @@ g_test_rand_int_range (gint32 begin,
double double
g_test_rand_double (void) g_test_rand_double (void)
{ {
return g_rand_double (test_run_rand); double r;
G_LOCK (test_run_rand);
r = g_rand_double (test_run_rand);
G_UNLOCK (test_run_rand);
return r;
} }
/** /**
@@ -1491,7 +1510,13 @@ double
g_test_rand_double_range (double range_start, g_test_rand_double_range (double range_start,
double range_end) double range_end)
{ {
return g_rand_double_range (test_run_rand, range_start, range_end); double r;
G_LOCK (test_run_rand);
r = g_rand_double_range (test_run_rand, range_start, range_end);
G_UNLOCK (test_run_rand);
return r;
} }
/** /**