X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu.c;h=884d77c472ae28b3a79059d303559932f544b41d;hp=e6a648981ed8b6b5a0abb679771d98d5e695dd9b;hb=6d5c0ca90ae4e999cdf4366ff615a6c619e7257e;hpb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be

diff --git a/tests/test_urcu.c b/tests/test_urcu.c
index e6a6489..884d77c 100644
--- a/tests/test_urcu.c
+++ b/tests/test_urcu.c
@@ -31,12 +31,15 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
@@ -183,7 +186,8 @@ void rcu_copy_mutex_unlock(void)
 /*
  * malloc/free are reusing memory areas too quickly, which does not let us
  * test races appropriately. Use a large circular array for allocations.
- * ARRAY_SIZE is larger than nr_writers, which insures we never run over our tail.
+ * ARRAY_SIZE is larger than nr_writers, and we keep the mutex across
+ * both alloc and free, which insures we never run over our tail.
  */
 #define ARRAY_SIZE (1048576 * nr_writers)
 #define ARRAY_POISON 0xDEADBEEF
@@ -195,7 +199,6 @@ static struct test_array *test_array_alloc(void)
 	struct test_array *ret;
 	int index;
 
-	rcu_copy_mutex_lock();
 	index = array_index % ARRAY_SIZE;
 	assert(test_array[index].a == ARRAY_POISON ||
 		test_array[index].a == 0);
@@ -203,7 +206,6 @@ static struct test_array *test_array_alloc(void)
 	array_index++;
 	if (array_index == ARRAY_SIZE)
 		array_index = 0;
-	rcu_copy_mutex_unlock();
 	return ret;
 }
 
@@ -211,9 +213,7 @@ static void test_array_free(struct test_array *ptr)
 {
 	if (!ptr)
 		return;
-	rcu_copy_mutex_lock();
 	ptr->a = ARRAY_POISON;
-	rcu_copy_mutex_unlock();
 }
 
 void *thr_reader(void *_count)
@@ -276,6 +276,7 @@ void *thr_writer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
+		rcu_copy_mutex_lock();
 		new = test_array_alloc();
 		new->a = 8;
 		old = rcu_xchg_pointer(&test_rcu_pointer, new);
@@ -285,6 +286,7 @@ void *thr_writer(void *_count)
 		if (old)
 			old->a = 0;
 		test_array_free(old);
+		rcu_copy_mutex_unlock();
 		nr_writes++;
 		if (unlikely(!test_duration_write()))
 			break;
@@ -400,7 +402,7 @@ int main(int argc, char **argv)
 	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
-	test_array = malloc(sizeof(*test_array) * ARRAY_SIZE);
+	test_array = calloc(1, sizeof(*test_array) * ARRAY_SIZE);
 	tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
 	tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
 	count_reader = malloc(sizeof(*count_reader) * nr_readers);