X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbenchmark%2Ftest_urcu_timing.c;h=35b0e80e2b1ce66b28bf95c10ca4a54e98c84f50;hb=014775106c60f02818ca755b331f887030bd440f;hp=e31b676ca506adf3dac9d20bdee7c6fba01a47fb;hpb=f5ab766ee2c8300cb00ca5878b1cb464f960a66d;p=urcu.git

diff --git a/tests/benchmark/test_urcu_timing.c b/tests/benchmark/test_urcu_timing.c
index e31b676..35b0e80 100644
--- a/tests/benchmark/test_urcu_timing.c
+++ b/tests/benchmark/test_urcu_timing.c
@@ -28,9 +28,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <assert.h>
 #include <errno.h>
+
 #include <urcu/arch.h>
+#include <urcu/assert.h>
 
 #include "thread-id.h"
 
@@ -39,6 +40,7 @@
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+static
 void rcu_copy_mutex_lock(void)
 {
 	int ret;
@@ -49,6 +51,7 @@ void rcu_copy_mutex_lock(void)
 	}
 }
 
+static
 void rcu_copy_mutex_unlock(void)
 {
 	int ret;
@@ -80,14 +83,15 @@ static int num_write;
 #define NR_READ num_read
 #define NR_WRITE num_write
 
-static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
-static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
+static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
+static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
+static
 void *thr_reader(void *arg)
 {
-	int i, j;
+	unsigned int i, j;
 	struct test_array *local_ptr;
-	cycles_t time1, time2;
+	caa_cycles_t time1, time2;
 
 	printf("thread_begin %s, tid %lu\n",
 		"reader", urcu_get_thread_id());
@@ -101,7 +105,7 @@ void *thr_reader(void *arg)
 			rcu_read_lock();
 			local_ptr = rcu_dereference(test_rcu_pointer);
 			if (local_ptr) {
-				assert(local_ptr->a == 8);
+				urcu_posix_assert(local_ptr->a == 8);
 			}
 			rcu_read_unlock();
 		}
@@ -119,11 +123,12 @@ void *thr_reader(void *arg)
 
 }
 
+static
 void *thr_writer(void *arg)
 {
-	int i, j;
+	unsigned int i, j;
 	struct test_array *new, *old;
-	cycles_t time1, time2;
+	caa_cycles_t time1, time2;
 
 	printf("thread_begin %s, tid %lu\n",
 		"writer", urcu_get_thread_id());
@@ -136,7 +141,7 @@ void *thr_writer(void *arg)
 			rcu_copy_mutex_lock();
 			old = test_rcu_pointer;
 			if (old) {
-				assert(old->a == 8);
+				urcu_posix_assert(old->a == 8);
 			}
 			new->a = 8;
 			old = rcu_xchg_pointer(&test_rcu_pointer, new);
@@ -164,8 +169,8 @@ int main(int argc, char **argv)
 	pthread_t *tid_reader, *tid_writer;
 	void *tret;
 	int i;
-	cycles_t tot_rtime = 0;
-	cycles_t tot_wtime = 0;
+	caa_cycles_t tot_rtime = 0;
+	caa_cycles_t tot_wtime = 0;
 
 	if (argc < 2) {
 		printf("Usage : %s nr_readers nr_writers\n", argv[0]);