X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_perthreadlock.c;h=3fc4a537f89c98f9556fe706ddb9eb65b85da675;hp=0fc45d9e3b82e0ce1fb76046917ebce8174a2d8f;hb=1050892f30b28680a92f7d6966656d688201037b;hpb=daddf5b0bf1ec7aeaa56c278cf4c1dd1094c174a

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 0fc45d9..3fc4a53 100644
--- a/test_perthreadlock.c
+++ b/test_perthreadlock.c
@@ -35,6 +35,9 @@
 
 #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)
 #elif defined(__NR_gettid)
@@ -63,13 +66,13 @@ struct test_array {
 
 struct per_thread_lock {
 	pthread_mutex_t lock;
-} __attribute__((aligned(128)));	/* cache-line aligned */
+} __attribute__((aligned(CACHE_LINE_SIZE)));	/* cache-line aligned */
 
 static struct per_thread_lock *per_thread_lock;
 
 static volatile int test_go, test_stop;
 
-static int wdelay;
+static unsigned long wdelay;
 
 static volatile struct test_array test_array = { 8 };
 
@@ -84,6 +87,14 @@ static inline void loop_sleep(unsigned long l)
 		cpu_relax();
 }
 
+static int verbose_mode;
+
+#define printf_verbose(fmt, args...)		\
+	do {					\
+		if (verbose_mode)		\
+			printf(fmt, args);	\
+	} while (0)
+
 /*
  * returns 0 if test should end.
  */
@@ -100,8 +111,10 @@ static int test_duration_read(void)
 static unsigned long long __thread nr_writes;
 static unsigned long long __thread nr_reads;
 
-static unsigned long long __attribute__((aligned(128))) *tot_nr_writes;
-static unsigned long long __attribute__((aligned(128))) *tot_nr_reads;
+static
+unsigned long long __attribute__((aligned(CACHE_LINE_SIZE))) *tot_nr_writes;
+static
+unsigned long long __attribute__((aligned(CACHE_LINE_SIZE))) *tot_nr_reads;
 
 static unsigned int nr_readers;
 static unsigned int nr_writers;
@@ -133,7 +146,7 @@ void *thr_reader(void *data)
 {
 	unsigned long tidx = (unsigned long)data;
 
-	printf("thread_begin %s, thread id : %lx, tid %lu\n",
+	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long)gettid());
 
 	while (!test_go)
@@ -152,7 +165,7 @@ void *thr_reader(void *data)
 	}
 
 	tot_nr_reads[tidx] = nr_reads;
-	printf("thread_end %s, thread id : %lx, tid %lu\n",
+	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long)gettid());
 	return ((void*)1);
 
@@ -163,7 +176,7 @@ void *thr_writer(void *data)
 	unsigned long wtidx = (unsigned long)data;
 	long tidx;
 
-	printf("thread_begin %s, thread id : %lx, tid %lu\n",
+	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"writer", pthread_self(), (unsigned long)gettid());
 
 	while (!test_go)
@@ -177,17 +190,17 @@ void *thr_writer(void *data)
 		}
 		test_array.a = 0;
 		test_array.a = 8;
-		for (tidx = nr_readers - 1; tidx >= 0; tidx--) {
+		for (tidx = (long)nr_readers - 1; tidx >= 0; tidx--) {
 			pthread_mutex_unlock(&per_thread_lock[tidx].lock);
 		}
 		nr_writes++;
 		if (unlikely(!test_duration_write()))
 			break;
 		if (unlikely(wdelay))
-			usleep(wdelay);
+			loop_sleep(wdelay);
 	}
 
-	printf("thread_end %s, thread id : %lx, tid %lu\n",
+	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
 			"writer", pthread_self(), (unsigned long)gettid());
 	tot_nr_writes[wtidx] = nr_writes;
 	return ((void*)2);
@@ -201,6 +214,7 @@ void show_usage(int argc, char **argv)
 #endif
 	printf(" [-d delay] (writer period (us))");
 	printf(" [-c duration] (reader C.S. duration (in loops))");
+	printf(" [-v] (verbose output)");
 	printf(" [-a cpu#] [-a cpu#]... (affinity)");
 	printf("\n");
 }
@@ -263,29 +277,33 @@ int main(int argc, char **argv)
 			a = atoi(argv[++i]);
 			CPU_SET(a, &affinity);
 			use_affinity = 1;
-			printf("Adding CPU %d affinity\n", a);
+			printf_verbose("Adding CPU %d affinity\n", a);
 			break;
 		case 'c':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
 				return -1;
 			}
-			rduration = atoi(argv[++i]);
+			rduration = atol(argv[++i]);
 			break;
 		case 'd':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
 				return -1;
 			}
-			wdelay = atoi(argv[++i]);
+			wdelay = atol(argv[++i]);
+			break;
+		case 'v':
+			verbose_mode = 1;
 			break;
 		}
 	}
 
-	printf("running test for %lu seconds, %u readers, %u writers.\n",
+	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
-	printf("Writer delay : %u us.\n", wdelay);
-	printf("thread %-6s, thread id : %lx, tid %lu\n",
+	printf_verbose("Writer delay : %lu loops.\n", wdelay);
+	printf_verbose("Reader duration : %lu loops.\n", rduration);
+	printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
 			"main", pthread_self(), (unsigned long)gettid());
 
 	if (use_affinity
@@ -335,9 +353,16 @@ int main(int argc, char **argv)
 			exit(1);
 		tot_writes += tot_nr_writes[i];
 	}
-	
-	printf("total number of reads : %llu, writes %llu\n", tot_reads,
+
+	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
 	       tot_writes);
+	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
+		"nr_writers %3u "
+		"wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
+		argv[0], duration, nr_readers, rduration,
+		nr_writers, wdelay, tot_reads, tot_writes,
+		tot_reads + tot_writes);
+
 	free(tid_reader);
 	free(tid_writer);
 	free(count_reader);