X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_rwlock.c;h=e7797638e0571053b4f62dd4b8d0171a6c266531;hp=b54aed9a8555492686cd0dcb8e7afb1f1d2c42eb;hb=cda3c71d5a0aca557840ae7744fa1c23ba43944e;hpb=7685d9639221a1dc5c0eeba54a60d633618b242a diff --git a/test_rwlock.c b/test_rwlock.c index b54aed9..e779763 100644 --- a/test_rwlock.c +++ b/test_rwlock.c @@ -20,6 +20,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define _GNU_SOURCE #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#include #include "arch.h" @@ -61,39 +63,42 @@ 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 + +/* read-side C.S. duration, in loops */ +static unsigned long rduration; + +static inline void loop_sleep(unsigned long l) +{ + while(l-- != 0) + cpu_relax(); +} + +static int verbose_mode; + +#define printf_verbose(fmt, args...) \ + do { \ + if (verbose_mode) \ + printf(fmt, args); \ + } while (0) /* * 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; @@ -129,7 +134,7 @@ void *thr_reader(void *_count) { unsigned long long *count = _count; - printf("thread_begin %s, thread id : %lx, tid %lu\n", + printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", "reader", pthread_self(), (unsigned long)gettid()); while (!test_go) @@ -139,14 +144,16 @@ void *thr_reader(void *_count) for (;;) { pthread_rwlock_rdlock(&lock); assert(test_array.a == 8); + if (unlikely(rduration)) + loop_sleep(rduration); pthread_rwlock_unlock(&lock); nr_reads++; - if (!test_duration_read()) + if (unlikely(!test_duration_read())) break; } *count = nr_reads; - printf("thread_end %s, thread id : %lx, tid %lu\n", + printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", "reader", pthread_self(), (unsigned long)gettid()); return ((void*)1); @@ -156,7 +163,7 @@ void *thr_writer(void *_count) { unsigned long long *count = _count; - printf("thread_begin %s, thread id : %lx, tid %lu\n", + printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", "writer", pthread_self(), (unsigned long)gettid()); while (!test_go) @@ -166,16 +173,17 @@ 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); } - printf("thread_end %s, thread id : %lx, tid %lu\n", + printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", "writer", pthread_self(), (unsigned long)gettid()); *count = nr_writes; return ((void*)2); @@ -188,9 +196,14 @@ void show_usage(int argc, char **argv) printf(" [-r] [-w] (yield reader and/or writer)"); #endif printf(" [-d delay] (writer period (us))"); + printf(" [-c duration] (reader C.S. duration (in loops))"); + printf(" [-v] (verbose output)"); + printf(" [-a cpu#] [-a cpu#]... (affinity)"); printf("\n"); } +cpu_set_t affinity; + int main(int argc, char **argv) { int err; @@ -198,7 +211,8 @@ int main(int argc, char **argv) void *tret; unsigned long long *count_reader, *count_writer; unsigned long long tot_reads = 0, tot_writes = 0; - int i; + int i, a; + int use_affinity = 0; if (argc < 4) { show_usage(argc, argv); @@ -224,6 +238,8 @@ int main(int argc, char **argv) return -1; } + CPU_ZERO(&affinity); + for (i = 4; i < argc; i++) { if (argv[i][0] != '-') continue; @@ -236,6 +252,23 @@ int main(int argc, char **argv) yield_active |= YIELD_WRITE; break; #endif + case 'a': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + a = atoi(argv[++i]); + CPU_SET(a, &affinity); + use_affinity = 1; + printf_verbose("Adding CPU %d affinity\n", a); + break; + case 'c': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + rduration = atoi(argv[++i]); + break; case 'd': if (argc < i + 2) { show_usage(argc, argv); @@ -243,14 +276,23 @@ int main(int argc, char **argv) } wdelay = atoi(argv[++i]); break; + case 'v': + verbose_mode = 1; + break; } } - printf("running test for %lu seconds, %u readers, %u writers.\n", + printf_verbose("running test for %lu seconds, %u readers, %u writers.\n", duration, nr_readers, nr_writers); - printf("Writer delay : %u us.\n", wdelay); - printf("thread %-6s, thread id : %lx, tid %lu\n", + printf_verbose("Writer delay : %u us.\n", wdelay); + printf_verbose("Reader duration : %lu loops.\n", rduration); + printf_verbose("thread %-6s, thread id : %lx, tid %lu\n", "main", pthread_self(), (unsigned long)gettid()); + if (use_affinity + && sched_setaffinity(0, sizeof(affinity), &affinity) < 0) { + perror("sched_setaffinity"); + exit(-1); + } tid_reader = malloc(sizeof(*tid_reader) * nr_readers); tid_writer = malloc(sizeof(*tid_writer) * nr_writers); @@ -270,10 +312,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) @@ -286,9 +332,16 @@ int main(int argc, char **argv) exit(1); tot_writes += count_writer[i]; } - - printf("total number of reads : %llu, writes %llu\n", tot_reads, + + printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads, tot_writes); + printf("SUMMARY %-15s testdur %4lu nr_readers %3u rdur %6lu " + "nr_writers %3u " + "wdelay %4u nr_reads %12llu nr_writes %12llu nr_ops %12llu\n", + argv[0], duration, nr_readers, rduration, + nr_writers, wdelay, tot_reads, tot_writes, + tot_reads + tot_writes); + free(tid_reader); free(tid_writer); free(count_reader);