projects
/
urcu.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
[urcu.git]
/
tests
/
test_perthreadlock_timing.c
diff --git
a/tests/test_perthreadlock_timing.c
b/tests/test_perthreadlock_timing.c
index 26b642af1cbca9a17b012ea57ac852c360243aa3..9321f034f1221882c0dfc307033c3fc514d90473 100644
(file)
--- a/
tests/test_perthreadlock_timing.c
+++ b/
tests/test_perthreadlock_timing.c
@@
-29,26
+29,12
@@
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
#include <unistd.h>
#include <stdio.h>
#include <assert.h>
-#include <sys/syscall.h>
#include <pthread.h>
#include <errno.h>
#include <urcu/arch.h>
#include <pthread.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"
#include <urcu.h>
#include <urcu.h>
@@
-87,8
+73,8
@@
void *thr_reader(void *arg)
cycles_t time1, time2;
long tidx = (long)arg;
cycles_t time1, time2;
long tidx = (long)arg;
- 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);
time1 = caa_get_cycles();
sleep(2);
time1 = caa_get_cycles();
@@
-104,8
+90,8
@@
void *thr_reader(void *arg)
reader_time[tidx] = time2 - time1;
sleep(2);
reader_time[tidx] = 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);
}
@@
-116,8
+102,8
@@
void *thr_writer(void *arg)
long tidx;
cycles_t time1, time2;
long tidx;
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++) {
@@
-136,8
+122,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);
}
@@
-162,8
+148,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());
per_thread_lock = malloc(sizeof(struct per_thread_lock) * NR_READ);
per_thread_lock = malloc(sizeof(struct per_thread_lock) * NR_READ);
This page took
0.024504 seconds
and
4
git commands to generate.