Use more lightweight timer mechanism in test

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 076d2473976da65fc0fad262aa409e9fc8f8177f..078e6594a19faeddd068a9f49e545992b1553505 100644 (file)
--- a/test_perthreadlock.c
+++ b/test_perthreadlock.c
@@ -65,39 +65,25 @@ struct per_thread_lock {
 
 static struct per_thread_lock *per_thread_lock;
 
-static volatile int test_go;
+static volatile int test_go, test_stop;
 
 static int wdelay;
 
 static 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;
@@ -285,10 +271,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)

diff --git a/test_qsbr.c b/test_qsbr.c
index 3d906cc4bc54d39f503b6bd4ae1f2082a05aff8e..ff55f8b8515f62185d1241056a1cfc8668bce010 100644 (file)
--- a/test_qsbr.c
+++ b/test_qsbr.c
@@ -55,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;
@@ -178,7 +164,8 @@ 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 ((nr_reads & ((1 << 10) - 1)) == 0)
                        _rcu_quiescent_state();
                if (!test_duration_read())
                        break;
@@ -321,10 +308,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)

diff --git a/test_rwlock.c b/test_rwlock.c
index b54aed9a8555492686cd0dcb8e7afb1f1d2c42eb..76156cb01064e335b729be9458f0fdd9a0720c16 100644 (file)
--- 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 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;
@@ -270,10 +256,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)

diff --git a/test_urcu.c b/test_urcu.c
index 47f69559f1df993edbc19e9c5262d39e6afabc47..d300610e049dc907147228e40d1c2b34245942b4 100644 (file)
--- a/test_urcu.c
+++ b/test_urcu.c
@@ -59,39 +59,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;
@@ -323,10 +309,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)