pixman: Branch 'master'

[Andrea Canciani]

 test/thread-test.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 54be1a52f710b8b4abb05c074c066c389d8f89a8
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Oct 9 18:23:27 2013 +0200

    Fix thread-test on non-OpenMP systems
    
    The non-reentrant versions of prng_* functions are thread-safe only in
    OpenMP-enabled builds.
    
    Fixes thread-test failing when compiled with Clang (both on Linux and
    on MacOS).

diff --git a/test/thread-test.c b/test/thread-test.c
index f24c31d..088033e 100644
--- a/test/thread-test.c
+++ b/test/thread-test.c
@@ -18,6 +18,7 @@ typedef struct
 {
     int       thread_no;
     uint32_t *dst_buf;
+    prng_t    prng_state;
 } info_t;
 
 static const pixman_op_t operators[] = 
@@ -90,7 +91,7 @@ static const pixman_format_code_t formats[] =
 #define N_ROUNDS 8192
 
 #define RAND_ELT(arr)							\
-    arr[prng_rand() % ARRAY_LENGTH (arr)]
+    arr[prng_rand_r(&info->prng_state) % ARRAY_LENGTH (arr)]
 
 #define DEST_WIDTH (7)
 
@@ -103,15 +104,17 @@ thread (void *data)
     pixman_image_t *dst_img, *src_img;
     int i;
 
-    prng_srand (info->thread_no);
+    prng_srand_r (&info->prng_state, info->thread_no);
 
     for (i = 0; i < N_ROUNDS; ++i)
     {
 	pixman_op_t op;
 	int rand1, rand2;
 
-	prng_randmemset (info->dst_buf, DEST_WIDTH * sizeof (uint32_t), 0);
-	prng_randmemset (src_buf, sizeof (src_buf), 0);
+	prng_randmemset_r (&info->prng_state, info->dst_buf,
+			   DEST_WIDTH * sizeof (uint32_t), 0);
+	prng_randmemset_r (&info->prng_state, src_buf,
+			   sizeof (src_buf), 0);
 
 	src_img = pixman_image_create_bits (
 	    RAND_ELT (formats), 4, 4, src_buf, 16);
@@ -122,8 +125,8 @@ thread (void *data)
 	image_endian_swap (src_img);
 	image_endian_swap (dst_img);
 	
-	rand2 = prng_rand() % 4;
-	rand1 = prng_rand() % 4;
+	rand2 = prng_rand_r (&info->prng_state) % 4;
+	rand1 = prng_rand_r (&info->prng_state) % 4;
 	op = RAND_ELT (operators);
 
 	pixman_image_composite32 (