From: Mathieu Desnoyers Date: Wed, 10 Jun 2009 15:31:46 +0000 (-0400) Subject: Use more lightweight timer mechanism in test X-Git-Tag: v0.1~179 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=78efb485e9baa0408e8d96932a68784bc19e59a5;p=urcu.git Use more lightweight timer mechanism in test Signed-off-by: Mathieu Desnoyers --- diff --git a/test_perthreadlock.c b/test_perthreadlock.c index 076d247..078e659 100644 --- 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 3d906cc..ff55f8b 100644 --- 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 b54aed9..76156cb 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 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 47f6955..d300610 100644 --- 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)