Add verbose mode

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/runtests.sh b/runtests.sh
index 072aebfa71de0446d15d74049621110a29963837..05e55ee5dedcc9bff8455a2106221a2598ccea02 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -4,6 +4,32 @@
 
 for a in test_urcu test_urcu_mb test_qsbr test_rwlock test_perthreadlock \
                        test_mutex; do
-       echo Executing $a
        ./${a} $*
 done
+
+
+#Vary update fraction
+#x: vary update fraction from 0 to 0.0001
+  #fix number of readers, vary delay between updates
+#y: ops/s
+
+echo Execution update fraction test
+
+
+#Test scalability :
+# x: vary number of readers from 0 to num cpus
+# y: ops/s
+# 0 writer.
+
+echo Executing scalability test
+
+# x: Vary reader C.S. length from 0 to 10us
+# y: ops/s
+# 8 readers
+# 0 writers
+
+echo Executing reader C.S. length test
+
+
+
+

diff --git a/test_mutex.c b/test_mutex.c
index 82d11c555c146248bbad89683b0a3efb8abe37c4..97059baac67baf5b76e615d55b9688020c6d83d6 100644 (file)
--- a/test_mutex.c
+++ b/test_mutex.c
@@ -80,6 +80,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.
  */
@@ -129,7 +137,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)
@@ -158,7 +166,7 @@ void *thr_writer(void *data)
 {
        unsigned long wtidx = (unsigned long)data;
 
-       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)
@@ -178,7 +186,7 @@ void *thr_writer(void *data)
                        usleep(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);
@@ -192,6 +200,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");
 }
@@ -254,7 +263,7 @@ 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) {
@@ -270,14 +279,17 @@ int main(int argc, char **argv)
                        }
                        wdelay = atoi(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("Reader duration : %lu loops.\n", rduration);
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
+       printf_verbose("Writer delay : %u us.\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
@@ -326,9 +338,15 @@ 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 %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
+               "wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\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);

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 2c95590170dc63fdadcf0b493b88554582fa5aba..3d1d9ec1e46581d62d22614223672d9f2cc914d7 100644 (file)
--- a/test_perthreadlock.c
+++ b/test_perthreadlock.c
@@ -84,6 +84,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.
  */
@@ -133,7 +141,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)
@@ -163,7 +171,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)
@@ -187,7 +195,7 @@ void *thr_writer(void *data)
                        usleep(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 +209,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,7 +272,7 @@ 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) {
@@ -279,14 +288,17 @@ int main(int argc, char **argv)
                        }
                        wdelay = atoi(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("Reader duration : %lu loops.\n", rduration);
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
+       printf_verbose("Writer delay : %u us.\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
@@ -336,9 +348,15 @@ 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 %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
+               "wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\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);

diff --git a/test_qsbr.c b/test_qsbr.c
index 35294430eb8665b0f607cbab90f3f3681fcfb4bb..b65d9ca1093a524d9580547a665c0d5fc322b490 100644 (file)
--- a/test_qsbr.c
+++ b/test_qsbr.c
@@ -74,6 +74,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.
  */
@@ -157,7 +165,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();
@@ -187,7 +195,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);
 
@@ -198,7 +206,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)
@@ -226,7 +234,7 @@ void *thr_writer(void *_count)
                        usleep(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);
@@ -240,6 +248,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");
 }
@@ -301,7 +310,7 @@ 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) {
@@ -317,14 +326,17 @@ int main(int argc, char **argv)
                        }
                        wdelay = atoi(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("Reader duration : %lu loops.\n", rduration);
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
+       printf_verbose("Writer delay : %u us.\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 +385,13 @@ 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 %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
+               "wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\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);

diff --git a/test_rwlock.c b/test_rwlock.c
index ec2ca6e6a95c170026c5fd05e9eaf693947b83f2..1b4a56e85b21d69d9167f20e7a5337858932a609 100644 (file)
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -80,6 +80,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.
  */
@@ -126,7 +134,7 @@ void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
 
-       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)
@@ -145,7 +153,7 @@ void *thr_reader(void *_count)
        }
 
        *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);
 
@@ -155,7 +163,7 @@ void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
 
-       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)
@@ -175,7 +183,7 @@ void *thr_writer(void *_count)
                        usleep(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);
@@ -189,6 +197,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");
 }
@@ -251,7 +260,7 @@ 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) {
@@ -267,14 +276,17 @@ int main(int argc, char **argv)
                        }
                        wdelay = atoi(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("Reader duration : %lu loops.\n", rduration);
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
+       printf_verbose("Writer delay : %u us.\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
            && sched_setaffinity(0, sizeof(affinity), &affinity) < 0) {
@@ -320,9 +332,15 @@ int main(int argc, char **argv)
                        exit(1);
                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 %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
+               "wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\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);

diff --git a/test_urcu.c b/test_urcu.c
index fb39d42d1bb56c8e78ecc68ec75c5747026dc59c..9e3a093881037f67385b1d100addfef4493c84d1 100644 (file)
--- a/test_urcu.c
+++ b/test_urcu.c
@@ -78,6 +78,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 +169,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 +196,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 +207,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)
@@ -227,7 +235,7 @@ void *thr_writer(void *_count)
                        usleep(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 +249,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,7 +311,7 @@ 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) {
@@ -318,14 +327,17 @@ int main(int argc, char **argv)
                        }
                        wdelay = atoi(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("Reader duration : %lu loops.\n", rduration);
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
+       printf_verbose("Writer delay : %u us.\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
@@ -374,8 +386,13 @@ 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 %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
+               "wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\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);