From: Mathieu Desnoyers Date: Mon, 8 Jun 2009 17:37:39 +0000 (-0400) Subject: Add per thread lock test case X-Git-Tag: v0.1~193 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=102d1d236ae6c788bb543dce3de410531aca346f;p=userspace-rcu.git Add per thread lock test case Signed-off-by: Mathieu Desnoyers --- diff --git a/Makefile b/Makefile index 079a9e3..c022522 100644 --- a/Makefile +++ b/Makefile @@ -9,10 +9,10 @@ LDFLAGS=-lpthread #Changing the signal number used by the library. SIGUSR1 by default. #CFLAGS+=-DSIGURCU=SIGUSR2 -SRC_DEP=`echo $^ | sed 's/[^ ]*.h//g'` +SRC_DEP=`echo $^ | sed 's/[^ ]*\.h//g'` all: arch-api test_urcu test_urcu_dynamic_link test_urcu_timing \ - test_rwlock_timing test_urcu_yield urcu-asm.S \ + test_rwlock_timing test_perthreadlock_timing test_urcu_yield urcu-asm.S \ urcu-asm.o urcutorture urcutorture-yield liburcu.so arch-api: api.h arch.h @@ -45,6 +45,9 @@ test_urcu_timing: urcu.o test_urcu_timing.c urcu.h test_rwlock_timing: urcu.o test_rwlock_timing.c urcu.h $(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP) +test_perthreadlock_timing: urcu.o test_perthreadlock_timing.c urcu.h + $(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP) + urcu.o: urcu.c urcu.h $(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP) diff --git a/test_perthreadlock_timing.c b/test_perthreadlock_timing.c new file mode 100644 index 0000000..5369796 --- /dev/null +++ b/test_perthreadlock_timing.c @@ -0,0 +1,190 @@ +/* + * test_perthreadloc_timing.c + * + * Per thread locks - test program + * + * Copyright February 2009 - Mathieu Desnoyers + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 "urcu.h" + +struct test_array { + int a; +}; + +static struct test_array test_array = { 8 }; + +struct per_thread_lock { + pthread_mutex_t lock; +} __attribute__((aligned(128))); /* cache-line aligned */ + +static struct per_thread_lock *per_thread_lock; + +#define OUTER_READ_LOOP 200U +#define INNER_READ_LOOP 100000U +#define READ_LOOP ((unsigned long long)OUTER_READ_LOOP * INNER_READ_LOOP) + +#define OUTER_WRITE_LOOP 10U +#define INNER_WRITE_LOOP 200U +#define WRITE_LOOP ((unsigned long long)OUTER_WRITE_LOOP * INNER_WRITE_LOOP) + +#define NR_READ 10 +#define NR_WRITE 9 + +static cycles_t reader_time[NR_READ] __attribute__((aligned(128))); +static cycles_t writer_time[NR_WRITE] __attribute__((aligned(128))); + +void *thr_reader(void *arg) +{ + int i, j; + cycles_t time1, time2; + long tidx = (long)arg; + + printf("thread_begin %s, thread id : %lx, tid %lu\n", + "reader", pthread_self(), (unsigned long)gettid()); + sleep(2); + + time1 = get_cycles(); + for (i = 0; i < OUTER_READ_LOOP; i++) { + for (j = 0; j < INNER_READ_LOOP; j++) { + pthread_mutex_lock(&per_thread_lock[tidx].lock); + assert(test_array.a == 8); + pthread_mutex_unlock(&per_thread_lock[tidx].lock); + } + } + time2 = get_cycles(); + + reader_time[tidx] = time2 - time1; + + sleep(2); + printf("thread_end %s, thread id : %lx, tid %lu\n", + "reader", pthread_self(), (unsigned long)gettid()); + return ((void*)1); + +} + +void *thr_writer(void *arg) +{ + int i, j; + long tidx; + cycles_t time1, time2; + + printf("thread_begin %s, thread id : %lx, tid %lu\n", + "writer", pthread_self(), (unsigned long)gettid()); + sleep(2); + + for (i = 0; i < OUTER_WRITE_LOOP; i++) { + for (j = 0; j < INNER_WRITE_LOOP; j++) { + time1 = get_cycles(); + for (tidx = 0; tidx < NR_READ; tidx++) { + pthread_mutex_lock(&per_thread_lock[tidx].lock); + } + test_array.a = 8; + for (tidx = NR_READ - 1; tidx >= 0; tidx--) { + pthread_mutex_unlock(&per_thread_lock[tidx].lock); + } + time2 = get_cycles(); + writer_time[(unsigned long)arg] += time2 - time1; + } + usleep(1); + } + + printf("thread_end %s, thread id : %lx, tid %lu\n", + "writer", pthread_self(), (unsigned long)gettid()); + return ((void*)2); +} + +int main() +{ + int err; + pthread_t tid_reader[NR_READ], tid_writer[NR_WRITE]; + void *tret; + int i; + cycles_t tot_rtime = 0; + cycles_t tot_wtime = 0; + + printf("thread %-6s, thread id : %lx, tid %lu\n", + "main", pthread_self(), (unsigned long)gettid()); + + per_thread_lock = malloc(sizeof(struct per_thread_lock) * NR_READ); + + for (i = 0; i < NR_READ; i++) { + pthread_mutex_init(&per_thread_lock[i].lock, NULL); + } + for (i = 0; i < NR_READ; i++) { + err = pthread_create(&tid_reader[i], NULL, thr_reader, + (void *)(long)i); + if (err != 0) + exit(1); + } + for (i = 0; i < NR_WRITE; i++) { + err = pthread_create(&tid_writer[i], NULL, thr_writer, + (void *)(long)i); + if (err != 0) + exit(1); + } + + sleep(10); + + for (i = 0; i < NR_READ; i++) { + err = pthread_join(tid_reader[i], &tret); + if (err != 0) + exit(1); + tot_rtime += reader_time[i]; + } + for (i = 0; i < NR_WRITE; i++) { + err = pthread_join(tid_writer[i], &tret); + if (err != 0) + exit(1); + tot_wtime += writer_time[i]; + } + printf("Time per read : %g cycles\n", + (double)tot_rtime / ((double)NR_READ * (double)READ_LOOP)); + printf("Time per write : %g cycles\n", + (double)tot_wtime / ((double)NR_WRITE * (double)WRITE_LOOP)); + free(per_thread_lock); + + return 0; +} diff --git a/test_rwlock_timing.c b/test_rwlock_timing.c index 2c45658..3f0b0c9 100644 --- a/test_rwlock_timing.c +++ b/test_rwlock_timing.c @@ -62,12 +62,15 @@ static struct test_array test_array = { 8 }; #define INNER_READ_LOOP 100000U #define READ_LOOP ((unsigned long long)OUTER_READ_LOOP * INNER_READ_LOOP) -#define WRITE_LOOP 2000U +#define OUTER_WRITE_LOOP 10U +#define INNER_WRITE_LOOP 200U +#define WRITE_LOOP ((unsigned long long)OUTER_WRITE_LOOP * INNER_WRITE_LOOP) #define NR_READ 10 #define NR_WRITE 9 static cycles_t reader_time[NR_READ] __attribute__((aligned(128))); +static cycles_t writer_time[NR_WRITE] __attribute__((aligned(128))); void *thr_reader(void *arg) { @@ -99,17 +102,23 @@ void *thr_reader(void *arg) void *thr_writer(void *arg) { - int i; + int i, j; + cycles_t time1, time2; printf("thread_begin %s, thread id : %lx, tid %lu\n", "writer", pthread_self(), (unsigned long)gettid()); sleep(2); - for (i = 0; i < WRITE_LOOP; i++) { - pthread_rwlock_wrlock(&lock); - test_array.a = 8; - pthread_rwlock_unlock(&lock); - usleep(1); + for (i = 0; i < OUTER_WRITE_LOOP; i++) { + for (j = 0; j < INNER_WRITE_LOOP; j++) { + time1 = get_cycles(); + pthread_rwlock_wrlock(&lock); + test_array.a = 8; + pthread_rwlock_unlock(&lock); + time2 = get_cycles(); + writer_time[(unsigned long)arg] += time2 - time1; + usleep(1); + } } printf("thread_end %s, thread id : %lx, tid %lu\n", @@ -123,7 +132,8 @@ int main() pthread_t tid_reader[NR_READ], tid_writer[NR_WRITE]; void *tret; int i; - cycles_t tot_time = 0; + cycles_t tot_rtime = 0; + cycles_t tot_wtime = 0; printf("thread %-6s, thread id : %lx, tid %lu\n", "main", pthread_self(), (unsigned long)gettid()); @@ -135,7 +145,8 @@ int main() exit(1); } for (i = 0; i < NR_WRITE; i++) { - err = pthread_create(&tid_writer[i], NULL, thr_writer, NULL); + err = pthread_create(&tid_writer[i], NULL, thr_writer, + (void *)(long)i); if (err != 0) exit(1); } @@ -146,15 +157,18 @@ int main() err = pthread_join(tid_reader[i], &tret); if (err != 0) exit(1); - tot_time += reader_time[i]; + tot_rtime += reader_time[i]; } for (i = 0; i < NR_WRITE; i++) { err = pthread_join(tid_writer[i], &tret); if (err != 0) exit(1); + tot_wtime += writer_time[i]; } printf("Time per read : %g cycles\n", - (double)tot_time / ((double)NR_READ * (double)READ_LOOP)); + (double)tot_rtime / ((double)NR_READ * (double)READ_LOOP)); + printf("Time per write : %g cycles\n", + (double)tot_wtime / ((double)NR_WRITE * (double)WRITE_LOOP)); return 0; } diff --git a/test_urcu_timing.c b/test_urcu_timing.c index cf70709..5065891 100644 --- a/test_urcu_timing.c +++ b/test_urcu_timing.c @@ -83,12 +83,15 @@ static struct test_array *test_rcu_pointer; #define INNER_READ_LOOP 100000U #define READ_LOOP ((unsigned long long)OUTER_READ_LOOP * INNER_READ_LOOP) -#define WRITE_LOOP 2000U +#define OUTER_WRITE_LOOP 10U +#define INNER_WRITE_LOOP 200U +#define WRITE_LOOP ((unsigned long long)OUTER_WRITE_LOOP * INNER_WRITE_LOOP) #define NR_READ 10 #define NR_WRITE 9 static cycles_t reader_time[NR_READ] __attribute__((aligned(128))); +static cycles_t writer_time[NR_WRITE] __attribute__((aligned(128))); void *thr_reader(void *arg) { @@ -128,28 +131,34 @@ void *thr_reader(void *arg) void *thr_writer(void *arg) { - int i; + int i, j; struct test_array *new, *old; + cycles_t time1, time2; printf("thread_begin %s, thread id : %lx, tid %lu\n", "writer", pthread_self(), (unsigned long)gettid()); sleep(2); - for (i = 0; i < WRITE_LOOP; i++) { - new = malloc(sizeof(struct test_array)); - rcu_copy_mutex_lock(); - old = test_rcu_pointer; - if (old) { - assert(old->a == 8); - } - new->a = 8; - old = rcu_publish_content(&test_rcu_pointer, new); - rcu_copy_mutex_unlock(); - /* can be done after unlock */ - if (old) { - old->a = 0; + for (i = 0; i < OUTER_WRITE_LOOP; i++) { + time1 = get_cycles(); + for (j = 0; j < INNER_WRITE_LOOP; j++) { + new = malloc(sizeof(struct test_array)); + rcu_copy_mutex_lock(); + old = test_rcu_pointer; + if (old) { + assert(old->a == 8); + } + new->a = 8; + old = rcu_publish_content(&test_rcu_pointer, new); + rcu_copy_mutex_unlock(); + /* can be done after unlock */ + if (old) { + old->a = 0; + } + free(old); } - free(old); + time2 = get_cycles(); + writer_time[(unsigned long)arg] += time2 - time1; usleep(1); } @@ -164,7 +173,8 @@ int main() pthread_t tid_reader[NR_READ], tid_writer[NR_WRITE]; void *tret; int i; - cycles_t tot_time = 0; + cycles_t tot_rtime = 0; + cycles_t tot_wtime = 0; printf("thread %-6s, thread id : %lx, tid %lu\n", "main", pthread_self(), (unsigned long)gettid()); @@ -176,7 +186,8 @@ int main() exit(1); } for (i = 0; i < NR_WRITE; i++) { - err = pthread_create(&tid_writer[i], NULL, thr_writer, NULL); + err = pthread_create(&tid_writer[i], NULL, thr_writer, + (void *)(long)i); if (err != 0) exit(1); } @@ -187,16 +198,19 @@ int main() err = pthread_join(tid_reader[i], &tret); if (err != 0) exit(1); - tot_time += reader_time[i]; + tot_rtime += reader_time[i]; } for (i = 0; i < NR_WRITE; i++) { err = pthread_join(tid_writer[i], &tret); if (err != 0) exit(1); + tot_wtime += writer_time[i]; } free(test_rcu_pointer); printf("Time per read : %g cycles\n", - (double)tot_time / ((double)NR_READ * (double)READ_LOOP)); + (double)tot_rtime / ((double)NR_READ * (double)READ_LOOP)); + printf("Time per write : %g cycles\n", + (double)tot_wtime / ((double)NR_WRITE * (double)WRITE_LOOP)); return 0; }