X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_rwlock_timing.c;h=4884e4dc2a4840ad7db45311684d87f673a32e02;hp=6e0523ce0614a5f3e6890460d480774c08974f7a;hb=ec817b748bf0004a2948937b7d04cd26c106598a;hpb=5fa9dfe40762818f355720a66b62700af5aafc28

diff --git a/test_rwlock_timing.c b/test_rwlock_timing.c
index 6e0523c..4884e4d 100644
--- a/test_rwlock_timing.c
+++ b/test_rwlock_timing.c
@@ -5,7 +5,19 @@
  *
  * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
  *
- * Distributed under GPLv2
+ * 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 <stdio.h>
@@ -19,6 +31,10 @@
 #include <assert.h>
 #include <sys/syscall.h>
 #include <pthread.h>
+#include <arch.h>
+
+/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
+#define CACHE_LINE_SIZE 4096
 
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
@@ -35,22 +51,6 @@ static inline pid_t gettid(void)
 }
 #endif
 
-#define rdtscll(val) do { \
-     unsigned int __a,__d; \
-     asm volatile("rdtsc" : "=a" (__a), "=d" (__d)); \
-     (val) = ((unsigned long long)__a) | (((unsigned long long)__d)<<32); \
-} while(0)
-
-typedef unsigned long long cycles_t;
-
-static inline cycles_t get_cycles (void)
-{
-        unsigned long long ret = 0;
-
-        rdtscll(ret);
-        return ret;
-}
-
 #include "urcu.h"
 
 struct test_array {
@@ -65,12 +65,18 @@ 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)
+
+static int num_read;
+static int num_write;
 
-#define NR_READ 10
-#define NR_WRITE 9
+#define NR_READ num_read
+#define NR_WRITE num_write
 
-static cycles_t reader_time[NR_READ] __attribute__((aligned(128)));
+static cycles_t __attribute__((aligned(CACHE_LINE_SIZE))) *reader_time;
+static cycles_t __attribute__((aligned(CACHE_LINE_SIZE))) *writer_time;
 
 void *thr_reader(void *arg)
 {
@@ -102,17 +108,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",
@@ -120,13 +132,26 @@ void *thr_writer(void *arg)
 	return ((void*)2);
 }
 
-int main()
+int main(int argc, char **argv)
 {
 	int err;
-	pthread_t tid_reader[NR_READ], tid_writer[NR_WRITE];
+	pthread_t *tid_reader, *tid_writer;
 	void *tret;
 	int i;
-	cycles_t tot_time = 0;
+	cycles_t tot_rtime = 0;
+	cycles_t tot_wtime = 0;
+
+	if (argc < 2) {
+		printf("Usage : %s nr_readers nr_writers\n", argv[0]);
+		exit(-1);
+	}
+	num_read = atoi(argv[1]);
+	num_write = atoi(argv[2]);
+
+	reader_time = malloc(sizeof(*reader_time) * num_read);
+	writer_time = malloc(sizeof(*writer_time) * num_write);
+	tid_reader = malloc(sizeof(*tid_reader) * num_read);
+	tid_writer = malloc(sizeof(*tid_writer) * num_write);
 
 	printf("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
@@ -138,7 +163,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);
 	}
@@ -149,15 +175,23 @@ 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));
+
+	free(reader_time);
+	free(writer_time);
+	free(tid_reader);
+	free(tid_writer);
 
 	return 0;
 }