projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: use thread-id.h wrapper
[userspace-rcu.git]
/
tests
/
test_urcu_timing.c
diff --git
a/tests/test_urcu_timing.c
b/tests/test_urcu_timing.c
index 8e1a8104f6ee649409537edbfc9cab7f97798d00..4fbdcca8f594f5681696609e75ce110d28e6e7e9 100644
(file)
--- a/
tests/test_urcu_timing.c
+++ b/
tests/test_urcu_timing.c
@@
-29,24
+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 <errno.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>
@@
-103,8
+89,8
@@
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();
@@
-127,8
+113,8
@@
void *thr_reader(void *arg)
reader_time[(unsigned long)arg] = time2 - time1;
sleep(2);
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);
}
@@
-139,8
+125,8
@@
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++) {
sleep(2);
for (i = 0; i < OUTER_WRITE_LOOP; i++) {
@@
-167,8
+153,8
@@
void *thr_writer(void *arg)
}
}
}
}
- 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);
}
@@
-193,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.024405 seconds
and
4
git commands to generate.