projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: cast pthread_self() return value to unsigned long
[userspace-rcu.git]
/
tests
/
test_urcu_lfq.c
diff --git
a/tests/test_urcu_lfq.c
b/tests/test_urcu_lfq.c
index cb50586ec3176ea6b4e3b100c8ba156d97295c38..a2b1ef62a4373dca181b5e5bd5212cd640c6562d 100644
(file)
--- a/
tests/test_urcu_lfq.c
+++ b/
tests/test_urcu_lfq.c
@@
-38,6
+38,7
@@
#include <errno.h>
#include <urcu/arch.h>
#include <errno.h>
#include <urcu/arch.h>
+#include <urcu/tls-compat.h>
#ifdef __linux__
#include <syscall.h>
#ifdef __linux__
#include <syscall.h>
@@
-66,6
+67,7
@@
static inline pid_t gettid(void)
#endif
#include <urcu.h>
#include <urcu/cds.h>
#endif
#include <urcu.h>
#include <urcu/cds.h>
+#include <urcu-defer.h>
static volatile int test_go, test_stop;
static volatile int test_go, test_stop;
@@
-147,15
+149,20
@@
static int test_duration_enqueue(void)
return !test_stop;
}
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 unsigned int nr_enqueuers;
static unsigned int nr_dequeuers;
+struct test {
+ struct cds_lfq_node_rcu list;
+ struct rcu_head rcu;
+};
+
static struct cds_lfq_queue_rcu q;
void *thr_enqueuer(void *_count)
static struct cds_lfq_queue_rcu q;
void *thr_enqueuer(void *_count)
@@
-163,7
+170,8
@@
void *thr_enqueuer(void *_count)
unsigned long long *count = _count;
printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
unsigned long long *count = _count;
printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
- "enqueuer", pthread_self(), (unsigned long)gettid());
+ "enqueuer", (unsigned long) pthread_self(),
+ (unsigned long) gettid());
set_affinity();
set_affinity();
@@
-175,59
+183,60
@@
void *thr_enqueuer(void *_count)
cmm_smp_mb();
for (;;) {
cmm_smp_mb();
for (;;) {
- struct
cds_lfq_node_rcu
*node = malloc(sizeof(*node));
+ struct
test
*node = malloc(sizeof(*node));
if (!node)
goto fail;
if (!node)
goto fail;
- cds_lfq_node_init_rcu(
node
);
+ cds_lfq_node_init_rcu(
&node->list
);
rcu_read_lock();
rcu_read_lock();
- cds_lfq_enqueue_rcu(&q,
node
);
+ cds_lfq_enqueue_rcu(&q,
&node->list
);
rcu_read_unlock();
rcu_read_unlock();
-
nr_successful_enqueues
++;
+
URCU_TLS(nr_successful_enqueues)
++;
- if (unlikely(wdelay))
+ if (
caa_
unlikely(wdelay))
loop_sleep(wdelay);
fail:
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();
break;
}
rcu_unregister_thread();
- count[0] =
nr_enqueues
;
- count[1] =
nr_successful_enqueues
;
+ count[0] =
URCU_TLS(nr_enqueues)
;
+ count[1] =
URCU_TLS(nr_successful_enqueues)
;
printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
"enqueues %llu successful_enqueues %llu\n",
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);
+ pthread_self(),
+ (unsigned long) gettid(),
+ URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues));
return ((void*)1);
}
return ((void*)1);
}
-static void rcu_free_node(struct rcu_head *head)
+static
+void free_node_cb(struct rcu_head *head)
{
{
- struct
cds_lfq_node_rcu
*node =
- caa_container_of(head, struct
cds_lfq_node_rcu, rcu_head
);
+ struct
test
*node =
+ caa_container_of(head, struct
test, rcu
);
free(node);
}
free(node);
}
-static void ref_release_node(struct urcu_ref *ref)
-{
- struct cds_lfq_node_rcu *node =
- caa_container_of(ref, struct cds_lfq_node_rcu, ref);
- call_rcu(&node->rcu_head, rcu_free_node);
-}
-
void *thr_dequeuer(void *_count)
{
unsigned long long *count = _count;
int ret;
printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
void *thr_dequeuer(void *_count)
{
unsigned long long *count = _count;
int ret;
printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
- "dequeuer", pthread_self(), (unsigned long)gettid());
+ "dequeuer", (unsigned long) pthread_self(),
+ (unsigned long) gettid());
set_affinity();
set_affinity();
+ ret = rcu_defer_register_thread();
+ if (ret) {
+ printf("Error in rcu_defer_register_thread\n");
+ exit(-1);
+ }
rcu_register_thread();
while (!test_go)
rcu_register_thread();
while (!test_go)
@@
-236,53
+245,52
@@
void *thr_dequeuer(void *_count)
cmm_smp_mb();
for (;;) {
cmm_smp_mb();
for (;;) {
- struct cds_lfq_node_rcu *node;
+ struct cds_lfq_node_rcu *qnode;
+ struct test *node;
rcu_read_lock();
rcu_read_lock();
- node = cds_lfq_dequeue_rcu(&q);
+ qnode = cds_lfq_dequeue_rcu(&q);
+ node = caa_container_of(qnode, struct test, list);
rcu_read_unlock();
if (node) {
rcu_read_unlock();
if (node) {
-
urcu_ref_put(&node->ref, ref_release_node
);
-
nr_successful_dequeues
++;
+
call_rcu(&node->rcu, free_node_cb
);
+
URCU_TLS(nr_successful_dequeues)
++;
}
}
-
nr_dequeues
++;
- if (unlikely(!test_duration_dequeue()))
+
URCU_TLS(nr_dequeues)
++;
+ if (
caa_
unlikely(!test_duration_dequeue()))
break;
break;
- if (unlikely(rduration))
+ if (
caa_
unlikely(rduration))
loop_sleep(rduration);
}
rcu_unregister_thread();
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",
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;
+ pthread_self(),
+ (unsigned long) gettid(),
+ 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);
}
return ((void*)2);
}
-static void release_node(struct urcu_ref *ref)
-{
- struct cds_lfq_node_rcu *node = caa_container_of(ref, struct cds_lfq_node_rcu, ref);
- free(node);
-}
-
void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
{
void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
{
- struct cds_lfq_node_rcu *node;
+ struct cds_lfq_node_rcu *
s
node;
do {
do {
- rcu_read_lock();
- node = cds_lfq_dequeue_rcu(q);
- rcu_read_unlock();
- if (node) {
- urcu_ref_put(&node->ref, release_node);
+ snode = cds_lfq_dequeue_rcu(q);
+ if (snode) {
+ struct test *node;
+
+ node = caa_container_of(snode, struct test, list);
+ free(node); /* no more concurrent access */
(*nr_dequeues)++;
}
(*nr_dequeues)++;
}
- } while (node);
+ } while (
s
node);
}
void show_usage(int argc, char **argv)
}
void show_usage(int argc, char **argv)
@@
-370,13
+378,18
@@
int main(int argc, char **argv)
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",
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());
+ "main", (unsigned long) pthread_self(),
+ (unsigned long) gettid());
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);
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);
- cds_lfq_init_rcu(&q, ref_release_node);
+ cds_lfq_init_rcu(&q, call_rcu);
+ err = create_all_cpu_call_rcu_data(0);
+ if (err) {
+ printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");
+ }
next_aff = 0;
next_aff = 0;
@@
-421,6
+434,8
@@
int main(int argc, char **argv)
}
test_end(&q, &end_dequeues);
}
test_end(&q, &end_dequeues);
+ err = cds_lfq_destroy_rcu(&q);
+ assert(!err);
printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
tot_enqueues, tot_dequeues);
printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
tot_enqueues, tot_dequeues);
@@
-443,6
+458,7
@@
int main(int argc, char **argv)
tot_successful_enqueues,
tot_successful_dequeues + end_dequeues);
tot_successful_enqueues,
tot_successful_dequeues + end_dequeues);
+ free_all_cpu_call_rcu_data();
free(count_enqueuer);
free(count_dequeuer);
free(tid_enqueuer);
free(count_enqueuer);
free(count_dequeuer);
free(tid_enqueuer);
This page took
0.027959 seconds
and
4
git commands to generate.