Merge branch 'master' of lttng.org:/home/git/userspace-rcu

diff --git a/runall.sh b/runall.sh
index 5a1096a41eab2aa9db78d8e4e09423cb7849ded2..6a1baa22641b557b67cf594f9c5eef215a6a27bf 100755 (executable)
--- a/runall.sh
+++ b/runall.sh
@@ -8,12 +8,25 @@ NUM_CPUS=8
 #extra options, e.g. for setting affinity on even CPUs :
 #EXTRA_OPTS=$(for a in $(seq 0 2 127); do echo -n "-a ${a} "; done)
 
+#ppc64 striding, use with NUM_CPUS=8
+
+#stride 1
+#EXTRA_OPTS=$(for a in $(seq 0 2 15); do echo -n "-a ${a} "; done)
+#stride 2
+#EXTRA_OPTS=$(for a in $(seq 0 4 31); do echo -n "-a ${a} "; done)
+#stride 4
+#EXTRA_OPTS=$(for a in $(seq 0 8 63); do echo -n "-a ${a} "; done)
+#stride 8
+#EXTRA_OPTS=$(for a in $(seq 0 16 127); do echo -n "-a ${a} "; done)
 
 #Vary update fraction
 #x: vary update fraction from 0 to 0.0001
   #fix number of readers and reader C.S. length, vary delay between updates
 #y: ops/s
 
+rm -f runall.log
+rm -fr runall.detail.log
+
 echo Executing update fraction test
 
 DURATION=10
@@ -26,6 +39,7 @@ rm -f update-fraction.log
 
 NR_READERS=$((${NUM_CPUS} - ${NR_WRITERS}))
 for WDELAY in ${WDELAY_ARRAY}; do
+       echo "./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} -d ${WDELAY} ${EXTRA_OPTS} | tee -a update-fraction.log" >> runall.log
        ./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} -d ${WDELAY} ${EXTRA_OPTS} | tee -a update-fraction.log
 done
 
@@ -42,6 +56,7 @@ DURATION=10
 rm -f scalability.log
 
 for NR_READERS in $(seq 1 ${NUM_CPUS}); do
+       echo "./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} ${EXTRA_OPTS}| tee -a scalability.log" >> runall.log
        ./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} ${EXTRA_OPTS}| tee -a scalability.log
 done
 
@@ -62,5 +77,6 @@ READERCSLEN_ARRAY="0 1 2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 3276
 rm -f readercslen.log
 
 for READERCSLEN in ${READERCSLEN_ARRAY}; do
+       echo "./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} ${EXTRA_OPTS} -c ${READERCSLEN} | tee -a readercslen.log" >> runall.log
        ./runtests.sh ${NR_READERS} ${NR_WRITERS} ${DURATION} ${EXTRA_OPTS} -c ${READERCSLEN} | tee -a readercslen.log
 done

diff --git a/runtests.sh b/runtests.sh
index d7f9c883033ab2a679f9bf7c45404969a4d7992a..9dbf16823489572a34c87901e3c891fe0fbac8fc 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -2,6 +2,7 @@
 
 for a in test_urcu test_urcu_mb test_qsbr test_rwlock test_perthreadlock \
                        test_mutex; do
-       ./${a} $*
+       echo "./${a} $*" | tee -a runall.detail.log
+       /usr/bin/time --append --output runall.detail.log ./${a} $*
 done