projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc/examples: cds_list_replace_rcu
[userspace-rcu.git]
/
tests
/
test_urcu_timing.c
diff --git
a/tests/test_urcu_timing.c
b/tests/test_urcu_timing.c
index 79cd838f56084cd6aae287619206a42d777eab29..4fbdcca8f594f5681696609e75ce110d28e6e7e9 100644
(file)
--- a/
tests/test_urcu_timing.c
+++ b/
tests/test_urcu_timing.c
@@
-3,7
+3,7
@@
*
* Userspace RCU library - test program
*
*
* Userspace RCU library - test program
*
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@
polymtl.ca
>
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@
efficios.com
>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-29,23
+29,10
@@
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
-#include <
sys/syscall
.h>
+#include <
errno
.h>
#include <urcu/arch.h>
#include <urcu/arch.h>
-#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
+#include "thread-id.h"
#define _LGPL_SOURCE
#include <urcu.h>
#define _LGPL_SOURCE
#include <urcu.h>
@@
-93,8
+80,8
@@
static int num_write;
#define NR_READ num_read
#define NR_WRITE num_write
#define NR_READ num_read
#define NR_WRITE num_write
-static cycles_t __attribute__((aligned(CACHE_LINE_SIZE))) *reader_time;
-static cycles_t __attribute__((aligned(CACHE_LINE_SIZE))) *writer_time;
+static cycles_t __attribute__((aligned(CA
A_CA
CHE_LINE_SIZE))) *reader_time;
+static cycles_t __attribute__((aligned(CA
A_CA
CHE_LINE_SIZE))) *writer_time;
void *thr_reader(void *arg)
{
void *thr_reader(void *arg)
{
@@
-102,13
+89,13
@@
void *thr_reader(void *arg)
struct test_array *local_ptr;
cycles_t time1, time2;
struct test_array *local_ptr;
cycles_t time1, time2;
- printf("thread_begin %s, t
hread id : %lx, t
id %lu\n",
-
"reader", pthread_self(), (unsigned long)gett
id());
+ printf("thread_begin %s, tid %lu\n",
+
"reader", urcu_get_thread_
id());
sleep(2);
rcu_register_thread();
sleep(2);
rcu_register_thread();
- time1 = get_cycles();
+ time1 =
caa_
get_cycles();
for (i = 0; i < OUTER_READ_LOOP; i++) {
for (j = 0; j < INNER_READ_LOOP; j++) {
rcu_read_lock();
for (i = 0; i < OUTER_READ_LOOP; i++) {
for (j = 0; j < INNER_READ_LOOP; j++) {
rcu_read_lock();
@@
-119,15
+106,15
@@
void *thr_reader(void *arg)
rcu_read_unlock();
}
}
rcu_read_unlock();
}
}
- time2 = get_cycles();
+ time2 =
caa_
get_cycles();
rcu_unregister_thread();
reader_time[(unsigned long)arg] = time2 - time1;
sleep(2);
rcu_unregister_thread();
reader_time[(unsigned long)arg] = time2 - time1;
sleep(2);
- printf("thread_end %s, t
hread id : %lx, t
id %lu\n",
-
"reader", pthread_self(), (unsigned long)gett
id());
+ printf("thread_end %s, tid %lu\n",
+
"reader", urcu_get_thread_
id());
return ((void*)1);
}
return ((void*)1);
}
@@
-138,13
+125,13
@@
void *thr_writer(void *arg)
struct test_array *new, *old;
cycles_t time1, time2;
struct test_array *new, *old;
cycles_t time1, time2;
- printf("thread_begin %s, t
hread id : %lx, t
id %lu\n",
-
"writer", pthread_self(), (unsigned long)gett
id());
+ printf("thread_begin %s, tid %lu\n",
+
"writer", urcu_get_thread_
id());
sleep(2);
for (i = 0; i < OUTER_WRITE_LOOP; i++) {
for (j = 0; j < INNER_WRITE_LOOP; j++) {
sleep(2);
for (i = 0; i < OUTER_WRITE_LOOP; i++) {
for (j = 0; j < INNER_WRITE_LOOP; j++) {
- time1 = get_cycles();
+ time1 =
caa_
get_cycles();
new = malloc(sizeof(struct test_array));
rcu_copy_mutex_lock();
old = test_rcu_pointer;
new = malloc(sizeof(struct test_array));
rcu_copy_mutex_lock();
old = test_rcu_pointer;
@@
-160,14
+147,14
@@
void *thr_writer(void *arg)
old->a = 0;
}
free(old);
old->a = 0;
}
free(old);
- time2 = get_cycles();
+ time2 =
caa_
get_cycles();
writer_time[(unsigned long)arg] += time2 - time1;
usleep(1);
}
}
writer_time[(unsigned long)arg] += time2 - time1;
usleep(1);
}
}
- printf("thread_end %s, t
hread id : %lx, t
id %lu\n",
-
"writer", pthread_self(), (unsigned long)gett
id());
+ printf("thread_end %s, tid %lu\n",
+
"writer", urcu_get_thread_
id());
return ((void*)2);
}
return ((void*)2);
}
@@
-192,8
+179,8
@@
int main(int argc, char **argv)
tid_reader = malloc(sizeof(*tid_reader) * num_read);
tid_writer = malloc(sizeof(*tid_writer) * num_write);
tid_reader = malloc(sizeof(*tid_reader) * num_read);
tid_writer = malloc(sizeof(*tid_writer) * num_write);
- printf("thread %-6s, t
hread id : %lx, t
id %lu\n",
-
"main", pthread_self(), (unsigned long)gett
id());
+ printf("thread %-6s, tid %lu\n",
+
"main", urcu_get_thread_
id());
for (i = 0; i < NR_READ; i++) {
err = pthread_create(&tid_reader[i], NULL, thr_reader,
for (i = 0; i < NR_READ; i++) {
err = pthread_create(&tid_reader[i], NULL, thr_reader,
This page took
0.030811 seconds
and
4
git commands to generate.