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_rwlock_timing.c
diff --git
a/tests/test_rwlock_timing.c
b/tests/test_rwlock_timing.c
index 5bc93d33d969e8a1cf1c74901d048f06652a68eb..3ff7ee42eb6d455063c3f766c35b221370356612 100644
(file)
--- a/
tests/test_rwlock_timing.c
+++ b/
tests/test_rwlock_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
@@
-20,6
+20,7
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#define _GNU_SOURCE
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <pthread.h>
#include <stdlib.h>
@@
-29,29
+30,14
@@
#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 <pthread.h>
-#include
"../arch.h"
+#include
<errno.h>
-/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
-#define CACHE_LINE_SIZE 4096
+#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>
struct test_array {
int a;
struct test_array {
int a;
@@
-75,19
+61,19
@@
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)
{
int i, j;
cycles_t time1, time2;
void *thr_reader(void *arg)
{
int i, j;
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);
sleep(2);
- time1 = get_cycles();
+ time1 =
caa_
get_cycles();
for (i = 0; i < OUTER_READ_LOOP; i++) {
for (j = 0; j < INNER_READ_LOOP; j++) {
pthread_rwlock_rdlock(&lock);
for (i = 0; i < OUTER_READ_LOOP; i++) {
for (j = 0; j < INNER_READ_LOOP; j++) {
pthread_rwlock_rdlock(&lock);
@@
-95,13
+81,13
@@
void *thr_reader(void *arg)
pthread_rwlock_unlock(&lock);
}
}
pthread_rwlock_unlock(&lock);
}
}
- time2 = get_cycles();
+ time2 =
caa_
get_cycles();
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);
}
@@
-111,24
+97,24
@@
void *thr_writer(void *arg)
int i, j;
cycles_t time1, time2;
int i, j;
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();
pthread_rwlock_wrlock(&lock);
test_array.a = 8;
pthread_rwlock_unlock(&lock);
pthread_rwlock_wrlock(&lock);
test_array.a = 8;
pthread_rwlock_unlock(&lock);
- 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);
}
@@
-153,8
+139,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.025924 seconds
and
4
git commands to generate.