projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test_urcu_lfs: remove rcu_defer_register_thread() from test_urcu_lfs
[userspace-rcu.git]
/
tests
/
test_urcu_lfs.c
diff --git
a/tests/test_urcu_lfs.c
b/tests/test_urcu_lfs.c
index 8249ebaeb05295cb43435cf3869a6ebfc74d9457..61abaad4567cf2c79a080d98e5eec99947f2162b 100644
(file)
--- a/
tests/test_urcu_lfs.c
+++ b/
tests/test_urcu_lfs.c
@@
-34,11
+34,15
@@
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
-#include <sys/syscall.h>
#include <sched.h>
#include <errno.h>
#include <urcu/arch.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
/* hardcoded number of CPUs */
#define NR_CPUS 16384
@@
-62,8
+66,7
@@
static inline pid_t gettid(void)
#define _LGPL_SOURCE
#endif
#include <urcu.h>
#define _LGPL_SOURCE
#endif
#include <urcu.h>
-#include <urcu/rculfstack.h>
-#include <urcu-defer.h>
+#include <urcu/cds.h>
static volatile int test_go, test_stop;
static volatile int test_go, test_stop;
@@
-74,10
+77,10
@@
static unsigned long duration;
/* read-side C.S. duration, in loops */
static unsigned long wdelay;
/* 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 l
oops
)
{
{
- while
(l
-- != 0)
- cpu_relax();
+ while
(loops
-- != 0)
+ c
aa_c
pu_relax();
}
static int verbose_mode;
}
static int verbose_mode;
@@
-145,16
+148,21
@@
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;
-static struct rcu_lfs_stack s;
+struct test {
+ struct cds_lfs_node_rcu list;
+ struct rcu_head rcu;
+};
+
+static struct cds_lfs_stack_rcu s;
void *thr_enqueuer(void *_count)
{
void *thr_enqueuer(void *_count)
{
@@
-173,33
+181,42
@@
void *thr_enqueuer(void *_count)
cmm_smp_mb();
for (;;) {
cmm_smp_mb();
for (;;) {
- struct
rcu_lfs_node
*node = malloc(sizeof(*node));
+ struct
test
*node = malloc(sizeof(*node));
if (!node)
goto fail;
if (!node)
goto fail;
- rcu_lfs_node_init(node);
- rcu_lfs_push(&s, node);
- nr_successful_enqueues++;
+ cds_lfs_node_init_rcu(&node->list);
+ /* No rcu read-side is needed for push */
+ cds_lfs_push_rcu(&s, &node->list);
+ 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 free_node_cb(struct rcu_head *head)
+{
+ struct test *node =
+ caa_container_of(head, struct test, rcu);
+ free(node);
+}
+
void *thr_dequeuer(void *_count)
{
unsigned long long *count = _count;
void *thr_dequeuer(void *_count)
{
unsigned long long *count = _count;
@@
-209,7
+226,6
@@
void *thr_dequeuer(void *_count)
set_affinity();
set_affinity();
- rcu_defer_register_thread();
rcu_register_thread();
while (!test_go)
rcu_register_thread();
while (!test_go)
@@
-218,43
+234,50
@@
void *thr_dequeuer(void *_count)
cmm_smp_mb();
for (;;) {
cmm_smp_mb();
for (;;) {
- struct
rcu_lfs_node *node = rcu_lfs_pop(&s)
;
+ struct
cds_lfs_node_rcu *snode
;
- if (node) {
- defer_rcu(free, node);
- nr_successful_dequeues++;
- }
+ rcu_read_lock();
+ snode = cds_lfs_pop_rcu(&s);
+ rcu_read_unlock();
+ if (snode) {
+ struct test *node;
- nr_dequeues++;
- if (unlikely(!test_duration_dequeue()))
+ node = caa_container_of(snode, struct test, list);
+ call_rcu(&node->rcu, free_node_cb);
+ URCU_TLS(nr_successful_dequeues)++;
+ }
+ 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);
}
-void test_end(struct
rcu_lfs_stack
*s, unsigned long long *nr_dequeues)
+void test_end(struct
cds_lfs_stack_rcu
*s, unsigned long long *nr_dequeues)
{
{
- struct
rcu_lfs_node *
node;
+ struct
cds_lfs_node_rcu *s
node;
do {
do {
- node = rcu_lfs_pop(s);
- if (node) {
+ snode = cds_lfs_pop_rcu(s);
+ if (snode) {
+ struct test *node;
+
+ node = caa_container_of(snode, struct test, list);
free(node);
(*nr_dequeues)++;
}
free(node);
(*nr_dequeues)++;
}
- } while (node);
+ } while (
s
node);
}
void show_usage(int argc, char **argv)
}
void show_usage(int argc, char **argv)
@@
-348,7
+371,11
@@
int main(int argc, char **argv)
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_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_lfs_init(&s);
+ cds_lfs_init_rcu(&s);
+ 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;
@@
-415,6
+442,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.02851 seconds
and
4
git commands to generate.