Update makefile

[urcu.git] / test_urcu.c

diff --git a/test_urcu.c b/test_urcu.c
index fe469284ef1122f864ed9bb467ef49997cbb1afa..fc9e8b539a9b3a9f21eb05702230602dd760b6d0 100644 (file)
--- a/test_urcu.c
+++ b/test_urcu.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,7 +66,7 @@ struct test_array {
 
 static volatile int test_go, test_stop;
 
-static int wdelay;
+static unsigned long wdelay;
 
 static struct test_array *test_rcu_pointer;
 
@@ -78,6 +81,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.
  */
@@ -161,7 +172,7 @@ void *thr_reader(void *_count)
        unsigned long long *count = _count;
        struct test_array *local_ptr;
 
-       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());
 
        rcu_register_thread();
@@ -188,7 +199,7 @@ void *thr_reader(void *_count)
        rcu_unregister_thread();
 
        *count = 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);
 
@@ -199,7 +210,7 @@ void *thr_writer(void *_count)
        unsigned long long *count = _count;
        struct test_array *new, *old;
 
-       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)
@@ -224,10 +235,10 @@ void *thr_writer(void *_count)
                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());
        *count = nr_writes;
        return ((void*)2);
@@ -241,6 +252,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");
 }
@@ -302,29 +314,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
@@ -373,8 +389,14 @@ int main(int argc, char **argv)
                tot_writes += count_writer[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);
        test_array_free(test_rcu_pointer);
        free(test_array);
        free(tid_reader);