X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_mutex.c;h=8b480403fcabdd4adccfe0774c51a9d8a45cb42d;hp=54d83cc025976a91b5df10207854ceab47d8dd79;hb=1050892f30b28680a92f7d6966656d688201037b;hpb=cda3c71d5a0aca557840ae7744fa1c23ba43944e

diff --git a/test_mutex.c b/test_mutex.c
index 54d83cc..8b48040 100644
--- a/test_mutex.c
+++ b/test_mutex.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)
@@ -65,7 +68,7 @@ static pthread_mutex_t lock;
 
 static volatile int test_go, test_stop;
 
-static int wdelay;
+static unsigned long wdelay;
 
 static volatile struct test_array test_array = { 8 };
 
@@ -104,8 +107,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;
@@ -183,7 +188,7 @@ void *thr_writer(void *data)
 		if (unlikely(!test_duration_write()))
 			break;
 		if (unlikely(wdelay))
-			usleep(wdelay);
+			loop_sleep(wdelay);
 	}
 
 	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
@@ -270,14 +275,14 @@ int main(int argc, char **argv)
 				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;
@@ -287,7 +292,7 @@ int main(int argc, char **argv)
 
 	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
-	printf_verbose("Writer delay : %u us.\n", wdelay);
+	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());
@@ -341,9 +346,9 @@ int main(int argc, char **argv)
 
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
 	       tot_writes);
-	printf("SUMMARY %-15s testdur %4lu nr_readers %3u rdur %6lu "
+	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
 		"nr_writers %3u "
-		"wdelay %4u nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
+		"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);