X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_perthreadlock.c;h=f02e00b43e8db6144911dd4512a3f49875c9ac41;hp=cc5f47dfa7345f530572e11e9b077154cbeed3ad;hb=d266df35815fc53c237c5cf96ff1a6391e2bbe6f;hpb=2650042a5405028da49bfcfb71053b78a56a9ed4

diff --git a/tests/benchmark/test_perthreadlock.c b/tests/benchmark/test_perthreadlock.c
index cc5f47d..f02e00b 100644
--- a/tests/benchmark/test_perthreadlock.c
+++ b/tests/benchmark/test_perthreadlock.c
@@ -20,8 +20,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-#include "config.h"
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -103,14 +101,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);
@@ -146,26 +146,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();
 	}
 }
 
@@ -183,11 +184,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;
@@ -216,15 +220,15 @@ void *thr_writer(void *data)
 	cmm_smp_mb();
 
 	for (;;) {
-		for (tidx = 0; tidx < nr_readers; tidx++) {
-			pthread_mutex_lock(&per_thread_lock[tidx].lock);
+		for (tidx = 0; tidx < (long)nr_readers; tidx++) {
+			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()))
@@ -259,6 +263,7 @@ int main(int argc, char **argv)
 	void *tret;
 	unsigned long long tot_reads = 0, tot_writes = 0;
 	int i, a;
+	unsigned int i_thr;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
@@ -277,7 +282,7 @@ int main(int argc, char **argv)
 		show_usage(argc, argv);
 		return -1;
 	}
-	
+
 	err = sscanf(argv[3], "%lu", &duration);
 	if (err != 1) {
 		show_usage(argc, argv);
@@ -337,23 +342,21 @@ int main(int argc, char **argv)
 	tot_nr_reads = calloc(nr_readers, sizeof(*tot_nr_reads));
 	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);
+	for (i_thr = 0; i_thr < nr_readers; i_thr++) {
+		pthread_mutex_init(&per_thread_lock[i_thr].lock, NULL);
 	}
 
 	next_aff = 0;
 
-	for (i = 0; i < nr_readers; i++) {
-		err = pthread_create(&tid_reader[i], NULL, thr_reader,
-				     (void *)(long)i);
+	for (i_thr = 0; i_thr < nr_readers; i_thr++) {
+		err = pthread_create(&tid_reader[i_thr], NULL, thr_reader,
+				     (void *)(long)i_thr);
 		if (err != 0)
 			exit(1);
 	}
-	for (i = 0; i < nr_writers; i++) {
-		err = pthread_create(&tid_writer[i], NULL, thr_writer,
-				     (void *)(long)i);
+	for (i_thr = 0; i_thr < nr_writers; i_thr++) {
+		err = pthread_create(&tid_writer[i_thr], NULL, thr_writer,
+				     (void *)(long)i_thr);
 		if (err != 0)
 			exit(1);
 	}
@@ -366,17 +369,17 @@ int main(int argc, char **argv)
 
 	test_stop = 1;
 
-	for (i = 0; i < nr_readers; i++) {
-		err = pthread_join(tid_reader[i], &tret);
+	for (i_thr = 0; i_thr < nr_readers; i_thr++) {
+		err = pthread_join(tid_reader[i_thr], &tret);
 		if (err != 0)
 			exit(1);
-		tot_reads += tot_nr_reads[i];
+		tot_reads += tot_nr_reads[i_thr];
 	}
-	for (i = 0; i < nr_writers; i++) {
-		err = pthread_join(tid_writer[i], &tret);
+	for (i_thr = 0; i_thr < nr_writers; i_thr++) {
+		err = pthread_join(tid_writer[i_thr], &tret);
 		if (err != 0)
 			exit(1);
-		tot_writes += tot_nr_writes[i];
+		tot_writes += tot_nr_writes[i_thr];
 	}
 
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,