X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=test_perthreadlock.c;h=078e6594a19faeddd068a9f49e545992b1553505;hp=076d2473976da65fc0fad262aa409e9fc8f8177f;hb=78efb485e9baa0408e8d96932a68784bc19e59a5;hpb=656c6da75f7ee119bfc49e026f52d695d0d1aea2 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)