luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

grand: restructure a bit

Browse Source 
Instead of having lots of 'if NULL then allocate' code segments for the
global GRand instance, move it to a single getter function that everyone
calls.
This commit is contained in:
Ryan Lortie 2013-03-24 21:25:26 -04:00 committed by Stef Walter
parent 70410b322c
commit eef0d3c0b8
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
glib/grand.c
View File

@ -123,7 +123,6 @@
**/ **/
G_LOCK_DEFINE_STATIC (global_random); G_LOCK_DEFINE_STATIC (global_random);
static GRand* global_random = NULL;
/* Period parameters */ /* Period parameters */
#define N 624 #define N 624
@ -597,6 +596,18 @@ g_rand_double_range (GRand* rand, gdouble begin, gdouble end)
return r * end - (r - 1) * begin; return r * end - (r - 1) * begin;
} }
static GRand *
get_global_random (void)
{
static GRand *global_random;
/* called while locked */
if (!global_random)
global_random = g_rand_new ();
return global_random;
}
/** /**
* g_random_boolean: * g_random_boolean:
* *
@ -617,10 +628,7 @@ g_random_int (void)
{ {
guint32 result; guint32 result;
G_LOCK (global_random); G_LOCK (global_random);
if (!global_random) result = g_rand_int (get_global_random ());
global_random = g_rand_new ();
result = g_rand_int (global_random);
G_UNLOCK (global_random); G_UNLOCK (global_random);
return result; return result;
} }
@ -640,10 +648,7 @@ g_random_int_range (gint32 begin, gint32 end)
{ {
gint32 result; gint32 result;
G_LOCK (global_random); G_LOCK (global_random);
if (!global_random) result = g_rand_int_range (get_global_random (), begin, end);
global_random = g_rand_new ();
result = g_rand_int_range (global_random, begin, end);
G_UNLOCK (global_random); G_UNLOCK (global_random);
return result; return result;
} }
@ -660,10 +665,7 @@ g_random_double (void)
{ {
double result; double result;
G_LOCK (global_random); G_LOCK (global_random);
if (!global_random) result = g_rand_double (get_global_random ());
global_random = g_rand_new ();
result = g_rand_double (global_random);
G_UNLOCK (global_random); G_UNLOCK (global_random);
return result; return result;
} }
@ -682,10 +684,7 @@ g_random_double_range (gdouble begin, gdouble end)
{ {
double result; double result;
G_LOCK (global_random); G_LOCK (global_random);
if (!global_random) result = g_rand_double_range (get_global_random (), begin, end);
global_random = g_rand_new ();
result = g_rand_double_range (global_random, begin, end);
G_UNLOCK (global_random); G_UNLOCK (global_random);
return result; return result;
} }
@ -701,9 +700,6 @@ void
g_random_set_seed (guint32 seed) g_random_set_seed (guint32 seed)
{ {
G_LOCK (global_random); G_LOCK (global_random);
if (!global_random) g_rand_set_seed (get_global_random (), seed);
global_random = g_rand_new_with_seed (seed);
else
g_rand_set_seed (global_random, seed);
G_UNLOCK (global_random); G_UNLOCK (global_random);
} }