X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=test_qsbr.c;h=82521efcf83a9babbf743f7741ad05a473efabb6;hb=59d5a40624428364374c306409979155beddfaac;hp=a8cb79946a8db0ee5160efc8bd78ab58fd10b663;hpb=061159a0c1aba841cdaea0164afd4e67f7a1a43e;p=urcu.git

diff --git a/test_qsbr.c b/test_qsbr.c
index a8cb799..82521ef 100644
--- a/test_qsbr.c
+++ b/test_qsbr.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)
@@ -53,39 +55,25 @@ struct test_array {
 	int a;
 };
 
-static volatile int test_go;
+static volatile int test_go, test_stop;
 
 static int wdelay;
 
 static struct test_array *test_rcu_pointer;
 
 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;
@@ -166,6 +154,7 @@ void *thr_reader(void *_count)
 	while (!test_go)
 	{
 	}
+	smp_mb();
 
 	for (;;) {
 		_rcu_read_lock();
@@ -175,9 +164,10 @@ void *thr_reader(void *_count)
 			assert(local_ptr->a == 8);
 		_rcu_read_unlock();
 		nr_reads++;
-		if (duration_interval >= DURATION_TEST_DELAY_READ - 1)
+		/* QS each 1024 reads */
+		if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
 			_rcu_quiescent_state();
-		if (!test_duration_read())
+		if (unlikely(!test_duration_read()))
 			break;
 	}
 
@@ -201,6 +191,7 @@ void *thr_writer(void *_count)
 	while (!test_go)
 	{
 	}
+	smp_mb();
 
 	for (;;) {
 		new = test_array_alloc();
@@ -216,9 +207,9 @@ void *thr_writer(void *_count)
 			old->a = 0;
 		test_array_free(old);
 		nr_writes++;
-		if (!test_duration_write())
+		if (unlikely(!test_duration_write()))
 			break;
-		if (wdelay)
+		if (unlikely(wdelay))
 			usleep(wdelay);
 	}
 
@@ -234,7 +225,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");
 }
 
@@ -295,7 +286,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());
 
@@ -318,8 +308,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)