#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>
+#include "cpuset.h"
+#include "thread-id.h"
/* hardcoded number of CPUs */
#define NR_CPUS 16384
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
- return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
- return getpid();
-}
-#endif
-
#ifndef DYNAMIC_LINK_TEST
#define _LGPL_SOURCE
#else
/* 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)
+ while (loops-- != 0)
caa_cpu_relax();
}
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;
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(CAA_CACHE_LINE_SIZE))) *tot_nr_writes;
{
unsigned long tidx = (unsigned long)data;
- printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
- "reader", pthread_self(), (unsigned long)gettid());
+ printf_verbose("thread_begin %s, tid %lu\n",
+ "reader", urcu_get_thread_id());
set_affinity();
for (;;) {
pthread_mutex_lock(&lock);
assert(test_array.a == 8);
- if (unlikely(rduration))
+ if (caa_unlikely(rduration))
loop_sleep(rduration);
pthread_mutex_unlock(&lock);
- nr_reads++;
- if (unlikely(!test_duration_read()))
+ URCU_TLS(nr_reads)++;
+ if (caa_unlikely(!test_duration_read()))
break;
}
- tot_nr_reads[tidx] = nr_reads;
- printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
- "reader", pthread_self(), (unsigned long)gettid());
+ tot_nr_reads[tidx] = URCU_TLS(nr_reads);
+ printf_verbose("thread_end %s, tid %lu\n",
+ "reader", urcu_get_thread_id());
return ((void*)1);
}
{
unsigned long wtidx = (unsigned long)data;
- printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
- "writer", pthread_self(), (unsigned long)gettid());
+ printf_verbose("thread_begin %s, tid %lu\n",
+ "writer", urcu_get_thread_id());
set_affinity();
pthread_mutex_lock(&lock);
test_array.a = 0;
test_array.a = 8;
- if (unlikely(wduration))
+ if (caa_unlikely(wduration))
loop_sleep(wduration);
pthread_mutex_unlock(&lock);
- 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;
+ printf_verbose("thread_end %s, tid %lu\n",
+ "writer", urcu_get_thread_id());
+ tot_nr_writes[wtidx] = URCU_TLS(nr_writes);
return ((void*)2);
}
void show_usage(int argc, char **argv)
{
- printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
+ printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
+ argv[0]);
+ printf("OPTIONS:\n");
#ifdef DEBUG_YIELD
- printf(" [-r] [-w] (yield reader and/or writer)");
+ printf(" [-r] [-w] (yield reader and/or writer)\n");
#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(" [-d delay] (writer period (us))\n");
+ printf(" [-c duration] (reader C.S. duration (in loops))\n");
+ printf(" [-e duration] (writer C.S. duration (in loops))\n");
+ printf(" [-v] (verbose output)\n");
+ printf(" [-a cpu#] [-a cpu#]... (affinity)\n");
printf("\n");
}
duration, nr_readers, nr_writers);
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());
-
- tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
- tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
- count_reader = malloc(sizeof(*count_reader) * nr_readers);
- count_writer = malloc(sizeof(*count_writer) * nr_writers);
- tot_nr_reads = malloc(sizeof(*tot_nr_reads) * nr_readers);
- tot_nr_writes = malloc(sizeof(*tot_nr_writes) * nr_writers);
+ printf_verbose("thread %-6s, tid %lu\n",
+ "main", urcu_get_thread_id());
+
+ tid_reader = calloc(nr_readers, sizeof(*tid_reader));
+ tid_writer = calloc(nr_writers, sizeof(*tid_writer));
+ count_reader = calloc(nr_readers, sizeof(*count_reader));
+ count_writer = calloc(nr_writers, sizeof(*count_writer));
+ tot_nr_reads = calloc(nr_readers, sizeof(*tot_nr_reads));
+ tot_nr_writes = calloc(nr_writers, sizeof(*tot_nr_writes));
next_aff = 0;
projects / urcu.git / blobdiff