#include <unistd.h>
#include <stdio.h>
#include <assert.h>
-#include <sys/syscall.h>
#include <sched.h>
#include <errno.h>
#include <urcu/arch.h>
+#include <urcu/tls-compat.h>
+
+#ifdef __linux__
+#include <syscall.h>
+#endif
/* hardcoded number of CPUs */
#define NR_CPUS 16384
#ifndef DYNAMIC_LINK_TEST
#define _LGPL_SOURCE
#else
-#define debug_yield_read()
+#define rcu_debug_yield_read()
#endif
#include <urcu.h>
/* write-side C.S. duration, in loops */
static unsigned long wduration;
-static inline void loop_sleep(unsigned long l)
+static inline void loop_sleep(unsigned long loops)
{
- while(l-- != 0)
- cpu_relax();
+ while (loops-- != 0)
+ caa_cpu_relax();
}
static int verbose_mode;
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;
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;
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();
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);
}
*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;
#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();
new->a = 8;
old = rcu_xchg_pointer(&test_rcu_pointer, new);
#endif
- if (unlikely(wduration))
+ 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);
}
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':
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);
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,