X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=test_rwlock.c;h=ef3ce2c73bb49c14571703c9d9d6eb94e5ba164a;hp=9a818ffe5b2fba416d27eec87773178d7088ea09;hb=2b4e41252ca7ad279d2aa91f2a011b36aa56b224;hpb=10c48e148fb55e862295fcd635fa68aa399e7362

diff --git a/test_rwlock.c b/test_rwlock.c
index 9a818ff..ef3ce2c 100644
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -31,6 +31,8 @@
 #include <assert.h>
 #include <sys/syscall.h>
 
+#include "arch.h"
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -59,39 +61,25 @@ struct test_array {
 
 pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER;
 
-static volatile int test_go;
+static volatile int test_go, test_stop;
 
 static int wdelay;
 
-static struct test_array test_array = { 8 };
+static volatile struct test_array test_array = { 8 };
 
 static unsigned long duration;
-static time_t start_time;
-static unsigned long __thread duration_interval;
-#define DURATION_TEST_DELAY_WRITE 4
-#define DURATION_TEST_DELAY_READ 100
 
 /*
  * returns 0 if test should end.
  */
 static int test_duration_write(void)
 {
-	if (duration_interval++ >= DURATION_TEST_DELAY_WRITE) {
-		duration_interval = 0;
-		if (time(NULL) - start_time >= duration)
-			return 0;
-	}
-	return 1;
+	return !test_stop;
 }
 
 static int test_duration_read(void)
 {
-	if (duration_interval++ >= DURATION_TEST_DELAY_READ) {
-		duration_interval = 0;
-		if (time(NULL) - start_time >= duration)
-			return 0;
-	}
-	return 1;
+	return !test_stop;
 }
 
 static unsigned long long __thread nr_writes;
@@ -160,9 +148,11 @@ void *thr_writer(void *_count)
 	while (!test_go)
 	{
 	}
+	smp_mb();
 
 	for (;;) {
 		pthread_rwlock_wrlock(&lock);
+		test_array.a = 0;
 		test_array.a = 8;
 		pthread_rwlock_unlock(&lock);
 		nr_writes++;
@@ -184,7 +174,7 @@ void show_usage(int argc, char **argv)
 #ifdef DEBUG_YIELD
 	printf(" [-r] [-w] (yield reader and/or writer)");
 #endif
-	printf(" [-d delay] (writer period)");
+	printf(" [-d delay] (writer period (us))");
 	printf("\n");
 }
 
@@ -201,6 +191,7 @@ int main(int argc, char **argv)
 		show_usage(argc, argv);
 		return -1;
 	}
+	smp_mb();
 
 	err = sscanf(argv[1], "%u", &nr_readers);
 	if (err != 1) {
@@ -245,7 +236,6 @@ int main(int argc, char **argv)
 	printf("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
 	printf("Writer delay : %u us.\n", wdelay);
-	start_time = time(NULL);
 	printf("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
@@ -267,8 +257,14 @@ int main(int argc, char **argv)
 			exit(1);
 	}
 
+	smp_mb();
+
 	test_go = 1;
 
+	sleep(duration);
+
+	test_stop = 1;
+
 	for (i = 0; i < nr_readers; i++) {
 		err = pthread_join(tid_reader[i], &tret);
 		if (err != 0)