X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Ftest_urcu_gc.c;h=ca8c45b0e0bfaf4d2ddd3d0059868efc5f577348;hp=162fae0490e3748decc57d04dd53909b05ad91a2;hb=ffa11a1830c532f3b052146eb9f0dd450cb2a0f2;hpb=b4e52e3e9e563d38607a8e0ab0aa72e7ab2b47b4 diff --git a/tests/test_urcu_gc.c b/tests/test_urcu_gc.c index 162fae0..ca8c45b 100644 --- a/tests/test_urcu_gc.c +++ b/tests/test_urcu_gc.c @@ -1,9 +1,9 @@ /* * test_urcu_gc.c * - * Userspace RCU library - test program (with baatch reclamation) + * Userspace RCU library - test program (with batch reclamation) * - * Copyright February 2009 - Mathieu Desnoyers + * Copyright February 2009 - Mathieu Desnoyers * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ */ #define _GNU_SOURCE +#include "../config.h" #include #include #include @@ -30,10 +31,15 @@ #include #include #include -#include #include +#include #include +#include + +#ifdef __linux__ +#include +#endif /* hardcoded number of CPUs */ #define NR_CPUS 16384 @@ -56,7 +62,7 @@ static inline pid_t gettid(void) #ifndef DYNAMIC_LINK_TEST #define _LGPL_SOURCE #else -#define debug_yield_read() +#define rcu_debug_yield_read() #endif #include @@ -84,10 +90,13 @@ static unsigned long duration; /* read-side C.S. duration, in loops */ static unsigned long rduration; -static inline void loop_sleep(unsigned long l) +/* write-side C.S. duration, in loops */ +static unsigned long wduration; + +static inline void loop_sleep(unsigned long loops) { - while(l-- != 0) - cpu_relax(); + while (loops-- != 0) + caa_cpu_relax(); } static int verbose_mode; @@ -104,15 +113,23 @@ static int use_affinity = 0; pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER; +#ifndef HAVE_CPU_SET_T +typedef unsigned long cpu_set_t; +# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0) +# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0) +#endif + static void set_affinity(void) { +#if HAVE_SCHED_SETAFFINITY cpu_set_t mask; - int cpu; - int ret; + int cpu, ret; +#endif /* HAVE_SCHED_SETAFFINITY */ if (!use_affinity) return; +#if HAVE_SCHED_SETAFFINITY ret = pthread_mutex_lock(&affinity_mutex); if (ret) { perror("Error in pthread mutex lock"); @@ -124,9 +141,15 @@ static void set_affinity(void) perror("Error in pthread mutex unlock"); exit(-1); } + CPU_ZERO(&mask); CPU_SET(cpu, &mask); +#if SCHED_SETAFFINITY_ARGS == 2 + sched_setaffinity(0, &mask); +#else sched_setaffinity(0, sizeof(mask), &mask); +#endif +#endif /* HAVE_SCHED_SETAFFINITY */ } /* @@ -142,11 +165,11 @@ static int test_duration_read(void) return !test_stop; } -static unsigned long long __thread nr_writes; -static unsigned long long __thread nr_reads; +static DEFINE_URCU_TLS(unsigned long long, nr_writes); +static DEFINE_URCU_TLS(unsigned long long, nr_reads); static -unsigned long long __attribute__((aligned(CACHE_LINE_SIZE))) *tot_nr_writes; +unsigned long long __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *tot_nr_writes; static unsigned int nr_readers; static unsigned int nr_writers; @@ -180,7 +203,8 @@ void *thr_reader(void *_count) struct test_array *local_ptr; printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "reader", pthread_self(), (unsigned long)gettid()); + "reader", (unsigned long) pthread_self(), + (unsigned long) gettid()); set_affinity(); @@ -189,27 +213,28 @@ void *thr_reader(void *_count) while (!test_go) { } - smp_mb(); + cmm_smp_mb(); for (;;) { rcu_read_lock(); local_ptr = rcu_dereference(test_rcu_pointer); - debug_yield_read(); + rcu_debug_yield_read(); if (local_ptr) assert(local_ptr->a == 8); - if (unlikely(rduration)) + if (caa_unlikely(rduration)) loop_sleep(rduration); rcu_read_unlock(); - nr_reads++; - if (unlikely(!test_duration_read())) + URCU_TLS(nr_reads)++; + if (caa_unlikely(!test_duration_read())) break; } rcu_unregister_thread(); - *count = nr_reads; + *count = URCU_TLS(nr_reads); printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "reader", pthread_self(), (unsigned long)gettid()); + "reader", (unsigned long) pthread_self(), + (unsigned long) gettid()); return ((void*)1); } @@ -238,7 +263,7 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old) *pending_reclaims[wtidx].head = old; pending_reclaims[wtidx].head++; - if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue + if (caa_likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue < reclaim_batch)) return; @@ -255,14 +280,15 @@ void *thr_writer(void *data) #endif printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n", - "writer", pthread_self(), (unsigned long)gettid()); + "writer", (unsigned long) pthread_self(), + (unsigned long) gettid()); set_affinity(); while (!test_go) { } - smp_mb(); + cmm_smp_mb(); for (;;) { #ifndef TEST_LOCAL_GC @@ -270,17 +296,20 @@ void *thr_writer(void *data) new->a = 8; old = rcu_xchg_pointer(&test_rcu_pointer, new); #endif + if (caa_unlikely(wduration)) + loop_sleep(wduration); rcu_gc_reclaim(wtidx, old); - nr_writes++; - if (unlikely(!test_duration_write())) + URCU_TLS(nr_writes)++; + if (caa_unlikely(!test_duration_write())) break; - if (unlikely(wdelay)) + if (caa_unlikely(wdelay)) loop_sleep(wdelay); } printf_verbose("thread_end %s, thread id : %lx, tid %lu\n", - "writer", pthread_self(), (unsigned long)gettid()); - tot_nr_writes[wtidx] = nr_writes; + "writer", (unsigned long) pthread_self(), + (unsigned long) gettid()); + tot_nr_writes[wtidx] = URCU_TLS(nr_writes); return ((void*)2); } @@ -292,6 +321,7 @@ void show_usage(int argc, char **argv) #endif printf(" [-d delay] (writer period (us))"); printf(" [-c duration] (reader C.S. duration (in loops))"); + printf(" [-e duration] (writer C.S. duration (in loops))"); printf(" [-v] (verbose output)"); printf(" [-a cpu#] [-a cpu#]... (affinity)"); printf("\n"); @@ -335,10 +365,10 @@ int main(int argc, char **argv) switch (argv[i][1]) { #ifdef DEBUG_YIELD case 'r': - yield_active |= YIELD_READ; + rcu_yield_active |= RCU_YIELD_READ; break; case 'w': - yield_active |= YIELD_WRITE; + rcu_yield_active |= RCU_YIELD_WRITE; break; #endif case 'a': @@ -372,6 +402,13 @@ int main(int argc, char **argv) } wdelay = atol(argv[++i]); break; + case 'e': + if (argc < i + 2) { + show_usage(argc, argv); + return -1; + } + wduration = atol(argv[++i]); + break; case 'v': verbose_mode = 1; break; @@ -383,7 +420,8 @@ int main(int argc, char **argv) printf_verbose("Writer delay : %lu loops.\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()); + "main", (unsigned long) pthread_self(), + (unsigned long) gettid()); tid_reader = malloc(sizeof(*tid_reader) * nr_readers); tid_writer = malloc(sizeof(*tid_writer) * nr_writers); @@ -391,9 +429,9 @@ int main(int argc, char **argv) tot_nr_writes = malloc(sizeof(*tot_nr_writes) * nr_writers); pending_reclaims = malloc(sizeof(*pending_reclaims) * nr_writers); if (reclaim_batch * sizeof(*pending_reclaims[i].queue) - < CACHE_LINE_SIZE) + < CAA_CACHE_LINE_SIZE) for (i = 0; i < nr_writers; i++) - pending_reclaims[i].queue = calloc(1, CACHE_LINE_SIZE); + pending_reclaims[i].queue = calloc(1, CAA_CACHE_LINE_SIZE); else for (i = 0; i < nr_writers; i++) pending_reclaims[i].queue = calloc(reclaim_batch, @@ -416,7 +454,7 @@ int main(int argc, char **argv) exit(1); } - smp_mb(); + cmm_smp_mb(); test_go = 1; @@ -440,11 +478,11 @@ int main(int argc, char **argv) printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads, tot_writes); - printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu " + printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu wdur %6lu " "nr_writers %3u " "wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu " "batch %u\n", - argv[0], duration, nr_readers, rduration, + argv[0], duration, nr_readers, rduration, wduration, nr_writers, wdelay, tot_reads, tot_writes, tot_reads + tot_writes, reclaim_batch); free(tid_reader);