X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_perthreadlock.c;h=d76b45655ab13f1a94eb07d6519b870a8f80bda0;hb=6a00c945d10d68e174c9fe96b2a98eb124b0d77e;hp=01c4fb03f8e62add0e93d725a7472028b4128fd9;hpb=f5ab766ee2c8300cb00ca5878b1cb464f960a66d;p=urcu.git

diff --git a/tests/benchmark/test_perthreadlock.c b/tests/benchmark/test_perthreadlock.c
index 01c4fb0..d76b456 100644
--- a/tests/benchmark/test_perthreadlock.c
+++ b/tests/benchmark/test_perthreadlock.c
@@ -43,8 +43,6 @@
 
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
-#else
-#define debug_yield_read()
 #endif
 #include <urcu.h>
 
@@ -105,14 +103,16 @@ static void set_affinity(void)
 #if HAVE_SCHED_SETAFFINITY
 	ret = pthread_mutex_lock(&affinity_mutex);
 	if (ret) {
+		errno = ret;
 		perror("Error in pthread mutex lock");
-		exit(-1);
+		abort();
 	}
 	cpu = cpu_affinities[next_aff++];
 	ret = pthread_mutex_unlock(&affinity_mutex);
 	if (ret) {
+		errno = ret;
 		perror("Error in pthread mutex unlock");
-		exit(-1);
+		abort();
 	}
 	CPU_ZERO(&mask);
 	CPU_SET(cpu, &mask);
@@ -148,26 +148,27 @@ unsigned long long __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *tot_nr_reads;
 static unsigned int nr_readers;
 static unsigned int nr_writers;
 
-pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void rcu_copy_mutex_lock(void)
+static void urcu_mutex_lock(pthread_mutex_t *lock)
 {
 	int ret;
-	ret = pthread_mutex_lock(&rcu_copy_mutex);
+
+	ret = pthread_mutex_lock(lock);
 	if (ret) {
+		errno = ret;
 		perror("Error in pthread mutex lock");
-		exit(-1);
+		abort();
 	}
 }
 
-void rcu_copy_mutex_unlock(void)
+static void urcu_mutex_unlock(pthread_mutex_t *lock)
 {
 	int ret;
 
-	ret = pthread_mutex_unlock(&rcu_copy_mutex);
+	ret = pthread_mutex_unlock(lock);
 	if (ret) {
+		errno = ret;
 		perror("Error in pthread mutex unlock");
-		exit(-1);
+		abort();
 	}
 }
 
@@ -185,11 +186,14 @@ void *thr_reader(void *data)
 	}
 
 	for (;;) {
-		pthread_mutex_lock(&per_thread_lock[tidx].lock);
-		assert(test_array.a == 8);
+		int v;
+
+		urcu_mutex_lock(&per_thread_lock[tidx].lock);
+		v = test_array.a;
+		assert(v == 8);
 		if (caa_unlikely(rduration))
 			loop_sleep(rduration);
-		pthread_mutex_unlock(&per_thread_lock[tidx].lock);
+		urcu_mutex_unlock(&per_thread_lock[tidx].lock);
 		URCU_TLS(nr_reads)++;
 		if (caa_unlikely(!test_duration_read()))
 			break;
@@ -219,14 +223,14 @@ void *thr_writer(void *data)
 
 	for (;;) {
 		for (tidx = 0; tidx < nr_readers; tidx++) {
-			pthread_mutex_lock(&per_thread_lock[tidx].lock);
+			urcu_mutex_lock(&per_thread_lock[tidx].lock);
 		}
 		test_array.a = 0;
 		test_array.a = 8;
 		if (caa_unlikely(wduration))
 			loop_sleep(wduration);
 		for (tidx = (long)nr_readers - 1; tidx >= 0; tidx--) {
-			pthread_mutex_unlock(&per_thread_lock[tidx].lock);
+			urcu_mutex_unlock(&per_thread_lock[tidx].lock);
 		}
 		URCU_TLS(nr_writes)++;
 		if (caa_unlikely(!test_duration_write()))
@@ -246,9 +250,6 @@ void show_usage(int argc, char **argv)
 	printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
 		argv[0]);
 	printf("OPTIONS:\n");
-#ifdef DEBUG_YIELD
-	printf("	[-r] [-w] (yield reader and/or writer)\n");
-#endif
 	printf("	[-d delay] (writer period (us))\n");
 	printf("	[-c duration] (reader C.S. duration (in loops))\n");
 	printf("	[-e duration] (writer C.S. duration (in loops))\n");
@@ -293,14 +294,6 @@ int main(int argc, char **argv)
 		if (argv[i][0] != '-')
 			continue;
 		switch (argv[i][1]) {
-#ifdef DEBUG_YIELD
-		case 'r':
-			yield_active |= YIELD_READ;
-			break;
-		case 'w':
-			yield_active |= YIELD_WRITE;
-			break;
-#endif
 		case 'a':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
@@ -351,9 +344,7 @@ int main(int argc, char **argv)
 	tot_nr_writes = calloc(nr_writers, sizeof(*tot_nr_writes));
 	per_thread_lock = calloc(nr_readers, sizeof(*per_thread_lock));
 	for (i = 0; i < nr_readers; i++) {
-		err = pthread_mutex_init(&per_thread_lock[i].lock, NULL);
-		if (err != 0)
-			exit(1);
+		pthread_mutex_init(&per_thread_lock[i].lock, NULL);
 	}
 
 	next_aff = 0;