Update makefile

[urcu.git] / test_perthreadlock.c

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 3d1d9ec1e46581d62d22614223672d9f2cc914d7..3fc4a537f89c98f9556fe706ddb9eb65b85da675 100644 (file)
--- 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 };
 
@@ -108,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;
@@ -160,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);
 
@@ -185,14 +190,14 @@ 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_verbose("thread_end %s, thread id : %lx, tid %lu\n",
@@ -279,14 +284,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;
@@ -296,7 +301,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());
@@ -351,8 +356,9 @@ int main(int argc, char **argv)
 
        printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
               tot_writes);
-       printf("SUMMARY %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
-               "wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\n",
+       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);