#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
#endif
+
+/* Remove deprecation warnings from test build. */
+#define CDS_WFQ_DEPRECATED
+
#include <urcu.h>
-#include <urcu/rcuwfqueue.h>
-#include <urcu-defer.h>
+#include <urcu/wfqueue.h>
static volatile int test_go, test_stop;
/* read-side C.S. duration, in loops */
static unsigned long wdelay;
-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;
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_dequeues;
-static unsigned long long __thread nr_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_enqueues);
-static unsigned long long __thread nr_successful_dequeues;
-static unsigned long long __thread nr_successful_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_enqueues);
static unsigned int nr_enqueuers;
static unsigned int nr_dequeuers;
-static struct rcu_wfq_queue q;
+static struct cds_wfq_queue q;
void *thr_enqueuer(void *_count)
{
unsigned long long *count = _count;
- printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
- "enqueuer", pthread_self(), (unsigned long)gettid());
+ printf_verbose("thread_begin %s, tid %lu\n",
+ "enqueuer", urcu_get_thread_id());
set_affinity();
- rcu_register_thread();
-
while (!test_go)
{
}
- smp_mb();
+ cmm_smp_mb();
for (;;) {
- struct rcu_wfq_node *node = malloc(sizeof(*node));
+ struct cds_wfq_node *node = malloc(sizeof(*node));
if (!node)
goto fail;
- rcu_wfq_node_init(node);
- rcu_wfq_enqueue(&q, node);
- nr_successful_enqueues++;
+ cds_wfq_node_init(node);
+ cds_wfq_enqueue(&q, node);
+ URCU_TLS(nr_successful_enqueues)++;
- if (unlikely(wdelay))
+ if (caa_unlikely(wdelay))
loop_sleep(wdelay);
fail:
- nr_enqueues++;
- if (unlikely(!test_duration_enqueue()))
+ URCU_TLS(nr_enqueues)++;
+ if (caa_unlikely(!test_duration_enqueue()))
break;
}
- rcu_unregister_thread();
-
- count[0] = nr_enqueues;
- count[1] = nr_successful_enqueues;
- printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
- "enqueues %llu successful_enqueues %llu\n",
- pthread_self(), (unsigned long)gettid(), nr_enqueues,
- nr_successful_enqueues);
+ count[0] = URCU_TLS(nr_enqueues);
+ count[1] = URCU_TLS(nr_successful_enqueues);
+ printf_verbose("enqueuer thread_end, tid %lu, "
+ "enqueues %llu successful_enqueues %llu\n",
+ urcu_get_thread_id(),
+ URCU_TLS(nr_enqueues),
+ URCU_TLS(nr_successful_enqueues));
return ((void*)1);
}
-static void rcu_release_node(struct urcu_ref *ref)
-{
- struct rcu_wfq_node *node = container_of(ref, struct rcu_wfq_node, ref);
- defer_rcu(free, node);
- //synchronize_rcu();
- //free(node);
-}
-
void *thr_dequeuer(void *_count)
{
unsigned long long *count = _count;
- printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
- "dequeuer", pthread_self(), (unsigned long)gettid());
+ printf_verbose("thread_begin %s, tid %lu\n",
+ "dequeuer", urcu_get_thread_id());
set_affinity();
- rcu_defer_register_thread();
- rcu_register_thread();
-
while (!test_go)
{
}
- smp_mb();
+ cmm_smp_mb();
for (;;) {
- struct rcu_wfq_node *node =
- rcu_wfq_dequeue_blocking(&q, rcu_release_node);
+ struct cds_wfq_node *node = cds_wfq_dequeue_blocking(&q);
if (node) {
- urcu_ref_put(&node->ref, rcu_release_node);
- nr_successful_dequeues++;
+ free(node);
+ URCU_TLS(nr_successful_dequeues)++;
}
- nr_dequeues++;
- if (unlikely(!test_duration_dequeue()))
+ URCU_TLS(nr_dequeues)++;
+ if (caa_unlikely(!test_duration_dequeue()))
break;
- if (unlikely(rduration))
+ if (caa_unlikely(rduration))
loop_sleep(rduration);
}
- rcu_unregister_thread();
- rcu_defer_unregister_thread();
-
- printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
- "dequeues %llu, successful_dequeues %llu\n",
- pthread_self(), (unsigned long)gettid(), nr_dequeues,
- nr_successful_dequeues);
- count[0] = nr_dequeues;
- count[1] = nr_successful_dequeues;
+ printf_verbose("dequeuer thread_end, tid %lu, "
+ "dequeues %llu, successful_dequeues %llu\n",
+ urcu_get_thread_id(),
+ URCU_TLS(nr_dequeues),
+ URCU_TLS(nr_successful_dequeues));
+ count[0] = URCU_TLS(nr_dequeues);
+ count[1] = URCU_TLS(nr_successful_dequeues);
return ((void*)2);
}
-static void release_node(struct urcu_ref *ref)
-{
- struct rcu_wfq_node *node = container_of(ref, struct rcu_wfq_node, ref);
- free(node);
-}
-
-void test_end(struct rcu_wfq_queue *q, unsigned long long *nr_dequeues)
+void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues)
{
- struct rcu_wfq_node *node;
+ struct cds_wfq_node *node;
do {
- node = rcu_wfq_dequeue_blocking(q, release_node);
+ node = cds_wfq_dequeue_blocking(q);
if (node) {
- urcu_ref_put(&node->ref, release_node);
+ free(node);
(*nr_dequeues)++;
}
} while (node);
void show_usage(int argc, char **argv)
{
- printf("Usage : %s nr_dequeuers nr_enqueuers duration (s)", argv[0]);
- printf(" [-d delay] (enqueuer period (in loops))");
- printf(" [-c duration] (dequeuer period (in loops))");
- printf(" [-v] (verbose output)");
- printf(" [-a cpu#] [-a cpu#]... (affinity)");
+ printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
+ argv[0]);
+ printf("OPTIONS:\n");
+ printf(" [-d delay] (enqueuer period (in loops))\n");
+ printf(" [-c duration] (dequeuer period (in loops))\n");
+ printf(" [-v] (verbose output)\n");
+ printf(" [-a cpu#] [-a cpu#]... (affinity)\n");
printf("\n");
}
duration, nr_enqueuers, nr_dequeuers);
printf_verbose("Writer delay : %lu loops.\n", rduration);
printf_verbose("Reader duration : %lu loops.\n", wdelay);
- printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
- "main", pthread_self(), (unsigned long)gettid());
+ printf_verbose("thread %-6s, tid %lu\n",
+ "main", urcu_get_thread_id());
- tid_enqueuer = malloc(sizeof(*tid_enqueuer) * nr_enqueuers);
- tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);
- count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers);
- count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers);
- rcu_wfq_init(&q);
+ tid_enqueuer = calloc(nr_enqueuers, sizeof(*tid_enqueuer));
+ tid_dequeuer = calloc(nr_dequeuers, sizeof(*tid_dequeuer));
+ count_enqueuer = calloc(nr_enqueuers, 2 * sizeof(*count_enqueuer));
+ count_dequeuer = calloc(nr_dequeuers, 2 * sizeof(*count_dequeuer));
+ cds_wfq_init(&q);
next_aff = 0;
exit(1);
}
- smp_mb();
+ cmm_smp_mb();
test_go = 1;
projects / urcu.git / blobdiff