X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=test_rwlock.c;h=1c29d73839adaec693c53a2315c8e0cd8a2a1be0;hb=59d5a40624428364374c306409979155beddfaac;hp=b54aed9a8555492686cd0dcb8e7afb1f1d2c42eb;hpb=7685d9639221a1dc5c0eeba54a60d633618b242a;p=urcu.git

diff --git a/test_rwlock.c b/test_rwlock.c
index b54aed9..1c29d73 100644
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -61,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;
@@ -141,7 +127,7 @@ void *thr_reader(void *_count)
 		assert(test_array.a == 8);
 		pthread_rwlock_unlock(&lock);
 		nr_reads++;
-		if (!test_duration_read())
+		if (unlikely(!test_duration_read()))
 			break;
 	}
 
@@ -166,12 +152,13 @@ void *thr_writer(void *_count)
 
 	for (;;) {
 		pthread_rwlock_wrlock(&lock);
+		test_array.a = 0;
 		test_array.a = 8;
 		pthread_rwlock_unlock(&lock);
 		nr_writes++;
-		if (!test_duration_write())
+		if (unlikely(!test_duration_write()))
 			break;
-		if (wdelay)
+		if (unlikely(wdelay))
 			usleep(wdelay);
 	}
 
@@ -270,10 +257,14 @@ int main(int argc, char **argv)
 			exit(1);
 	}
 
-	start_time = time(NULL);
-	test_go = 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)