X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_rwlock.c;h=827c117eb9a7c792e09274fd8169de25b2580050;hp=32e3c39d99d25b5819339f4b2a4c8336ca6929eb;hb=aae4fe1d704c7e366395750b60688cab83a7d6a9;hpb=f5ab766ee2c8300cb00ca5878b1cb464f960a66d

diff --git a/tests/benchmark/test_rwlock.c b/tests/benchmark/test_rwlock.c
index 32e3c39..827c117 100644
--- a/tests/benchmark/test_rwlock.c
+++ b/tests/benchmark/test_rwlock.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>
@@ -43,8 +41,6 @@
 
 #ifndef DYNAMIC_LINK_TEST
 #define _LGPL_SOURCE
-#else
-#define debug_yield_read()
 #endif
 #include <urcu.h>
 
@@ -52,7 +48,11 @@ struct test_array {
 	int a;
 };
 
-pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER;
+/*
+ * static rwlock initializer is broken on Cygwin. Use runtime
+ * initialization.
+ */
+pthread_rwlock_t lock;
 
 static volatile int test_go, test_stop;
 
@@ -177,19 +177,34 @@ void *thr_reader(void *_count)
 	}
 
 	for (;;) {
-		pthread_rwlock_rdlock(&lock);
-		assert(test_array.a == 8);
+		int a, ret;
+
+		ret = pthread_rwlock_rdlock(&lock);
+		if (ret) {
+			fprintf(stderr, "reader pthread_rwlock_rdlock: %s\n", strerror(ret));
+			abort();
+		}
+
+		a = test_array.a;
+		assert(a == 8);
 		if (caa_unlikely(rduration))
 			loop_sleep(rduration);
-		pthread_rwlock_unlock(&lock);
+
+		ret = pthread_rwlock_unlock(&lock);
+		if (ret) {
+			fprintf(stderr, "reader pthread_rwlock_unlock: %s\n", strerror(ret));
+			abort();
+		}
+
 		URCU_TLS(nr_reads)++;
 		if (caa_unlikely(!test_duration_read()))
 			break;
 	}
 
 	*count = URCU_TLS(nr_reads);
-	printf_verbose("thread_end %s, tid %lu\n",
-			"reader", urcu_get_thread_id());
+
+	printf_verbose("thread_end %s, tid %lu, count %llu\n",
+			"reader", urcu_get_thread_id(), *count);
 	return ((void*)1);
 
 }
@@ -209,22 +224,35 @@ void *thr_writer(void *_count)
 	cmm_smp_mb();
 
 	for (;;) {
-		pthread_rwlock_wrlock(&lock);
+		int ret;
+
+		ret = pthread_rwlock_wrlock(&lock);
+		if (ret) {
+			fprintf(stderr, "writer pthread_rwlock_wrlock: %s\n", strerror(ret));
+			abort();
+		}
+
 		test_array.a = 0;
 		test_array.a = 8;
 		if (caa_unlikely(wduration))
 			loop_sleep(wduration);
-		pthread_rwlock_unlock(&lock);
+
+		ret = pthread_rwlock_unlock(&lock);
+		if (ret) {
+			fprintf(stderr, "writer pthread_rwlock_unlock: %s\n", strerror(ret));
+			abort();
+		}
+
 		URCU_TLS(nr_writes)++;
 		if (caa_unlikely(!test_duration_write()))
 			break;
 		if (caa_unlikely(wdelay))
 			loop_sleep(wdelay);
 	}
-
-	printf_verbose("thread_end %s, tid %lu\n",
-			"writer", urcu_get_thread_id());
 	*count = URCU_TLS(nr_writes);
+
+	printf_verbose("thread_end %s, tid %lu, count %llu\n",
+			"writer", urcu_get_thread_id(), *count);
 	return ((void*)2);
 }
 
@@ -233,9 +261,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");
@@ -281,14 +306,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);
@@ -329,10 +346,17 @@ int main(int argc, char **argv)
 	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
 	printf_verbose("Writer delay : %lu loops.\n", wdelay);
+	printf_verbose("Writer duration : %lu loops.\n", wduration);
 	printf_verbose("Reader duration : %lu loops.\n", rduration);
 	printf_verbose("thread %-6s, tid %lu\n",
 			"main", urcu_get_thread_id());
 
+	err = pthread_rwlock_init(&lock, NULL);
+	if (err != 0) {
+		fprintf(stderr, "pthread_rwlock_init: (%d) %s\n", err, strerror(err));
+		exit(1);
+	}
+
 	tid_reader = calloc(nr_readers, sizeof(*tid_reader));
 	tid_writer = calloc(nr_writers, sizeof(*tid_writer));
 	count_reader = calloc(nr_readers, sizeof(*count_reader));
@@ -383,6 +407,11 @@ int main(int argc, char **argv)
 		nr_writers, wdelay, tot_reads, tot_writes,
 		tot_reads + tot_writes);
 
+	err = pthread_rwlock_destroy(&lock);
+	if (err != 0) {
+		fprintf(stderr, "pthread_rwlock_destroy: (%d) %s\n", err, strerror(err));
+		exit(1);
+	}
 	free(tid_reader);
 	free(tid_writer);
 	free(count_reader);