From 1acfc5be0ab47da8eba8c3c2dbb7fe65d0211eb7 Mon Sep 17 00:00:00 2001 From: Reiner Jung <reiner.jung@email.uni-kiel.de> Date: Wed, 22 Jun 2022 16:07:40 +0200 Subject: [PATCH] Fixed METHOD_TIME --- bin/2012-msept/run-benchmark-cycle-async.sh | 10 +++---- bin/2012-msept/run-benchmark-cycle-sync.sh | 10 +++---- bin/2012-msept/run-benchmark-recursive-jmx.sh | 10 +++---- .../run-benchmark-recursive-linear.sh | 14 ++++----- bin/2012-msept/run-benchmark-recursive.sh | 14 ++++----- .../run-cycle-experiment-singlethreaded.sh | 4 +-- bin/2012-msept/run-cycle.sh | 4 +-- .../benchmark-kieker-days-ffi-remote.sh | 30 +++++++++---------- .../benchmark-kieker-days-ffi.sh | 30 +++++++++---------- .../benchmark-kieker-days-kieker.sh | 30 +++++++++---------- .../benchmark-kieker-days-ffi-remote.sh | 18 +++++------ .../benchmark-kieker-days-ffi.sh | 30 +++++++++---------- .../benchmark-kieker-days-kieker-remote.sh | 18 +++++------ .../benchmark-kieker-days-kieker.sh | 30 +++++++++---------- bin/2013-kieker-days/only_r.sh | 2 +- bin/2014-icpe/benchmark-disk-writer.sh | 30 +++++++++---------- frameworks/SPASSmeter/benchmark-causes.sh | 2 +- frameworks/SPASSmeter/benchmark.sh | 4 +-- frameworks/common-functions.sh | 2 +- 19 files changed, 146 insertions(+), 146 deletions(-) diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh index 125eee2..934e69d 100644 --- a/bin/2012-msept/run-benchmark-cycle-async.sh +++ b/bin/2012-msept/run-benchmark-cycle-async.sh @@ -44,7 +44,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -65,7 +65,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-1.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -83,7 +83,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-2.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -103,7 +103,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-3.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -123,7 +123,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-4.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh index 8d9eac3..be98f98 100644 --- a/bin/2012-msept/run-benchmark-cycle-sync.sh +++ b/bin/2012-msept/run-benchmark-cycle-sync.sh @@ -44,7 +44,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -65,7 +65,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do # ${BINDJAVA} java ${JAVA_ARGS_NOINSTR} ${JAR} \ # --output-filename ${RESULTSFN}-${i}-${j}-1.csv \ # --totalcalls ${TOTAL_CALLS} \ -# --methodtime ${METHODTIME} \ +# --methodtime ${METHOD_TIME} \ # --totalthreads ${THREADS} \ # --recursiondepth ${j} # kill %mpstat @@ -83,7 +83,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do # ${BINDJAVA} java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ # --output-filename ${RESULTSFN}-${i}-${j}-2.csv \ # --totalcalls ${TOTAL_CALLS} \ -# --methodtime ${METHODTIME} \ +# --methodtime ${METHOD_TIME} \ # --totalthreads ${THREADS} \ # --recursiondepth ${j} # kill %mpstat @@ -103,7 +103,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do # ${BINDJAVA} java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ # --output-filename ${RESULTSFN}-${i}-${j}-3.csv \ # --totalcalls ${TOTAL_CALLS} \ -# --methodtime ${METHODTIME} \ +# --methodtime ${METHOD_TIME} \ # --totalthreads ${THREADS} \ # --recursiondepth ${j} # kill %mpstat @@ -123,7 +123,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-4.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh index 83189ee..caee69f 100644 --- a/bin/2012-msept/run-benchmark-recursive-jmx.sh +++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh @@ -13,9 +13,9 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSION_DEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 2000000 -METHODTIME=500000 ## 500000 +METHOD_TIME=500000 ## 500000 -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 2 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 2 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 2 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 2 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` echo "Experiment will take circa ${TIME} seconds." # determine correct classpath separator @@ -59,7 +59,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-1.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -100,7 +100,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-2.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh index 9e8bb79..acbeced 100644 --- a/bin/2012-msept/run-benchmark-recursive-linear.sh +++ b/bin/2012-msept/run-benchmark-recursive-linear.sh @@ -13,9 +13,9 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSION_DEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 2000000 -METHODTIME=500000 ## 500000 +METHOD_TIME=500000 ## 500000 -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` echo "Experiment will take circa ${TIME} seconds." # determine correct classpath separator @@ -60,7 +60,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -82,7 +82,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-1.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${RECDEPTH} kill %mpstat @@ -100,7 +100,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-2.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${RECDEPTH} kill %mpstat @@ -120,7 +120,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-3.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${RECDEPTH} kill %mpstat @@ -140,7 +140,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-4.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${RECDEPTH} kill %mpstat diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh index 1b1be03..a92e760 100644 --- a/bin/2012-msept/run-benchmark-recursive.sh +++ b/bin/2012-msept/run-benchmark-recursive.sh @@ -13,9 +13,9 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSION_DEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 2000000 -METHODTIME=500000 ## 500000 +METHOD_TIME=500000 ## 500000 -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` echo "Experiment will take circa ${TIME} seconds." # determine correct classpath separator @@ -60,7 +60,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -81,7 +81,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-1.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-2.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -119,7 +119,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-3.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat @@ -139,7 +139,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${BINDJAVA} java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RESULTSFN}-${i}-${j}-4.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} kill %mpstat diff --git a/bin/2012-msept/run-cycle-experiment-singlethreaded.sh b/bin/2012-msept/run-cycle-experiment-singlethreaded.sh index 409ac80..77b596a 100644 --- a/bin/2012-msept/run-cycle-experiment-singlethreaded.sh +++ b/bin/2012-msept/run-cycle-experiment-singlethreaded.sh @@ -7,9 +7,9 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSION_DEPTH=1 ## 10 TOTAL_CALLS=2000000 ## 200000 -METHODTIME=500000 ## 500000 +METHOD_TIME=500000 ## 500000 -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` echo "Each experiment will take circa ${TIME} seconds." diff --git a/bin/2012-msept/run-cycle.sh b/bin/2012-msept/run-cycle.sh index dc7ab97..7122bd3 100644 --- a/bin/2012-msept/run-cycle.sh +++ b/bin/2012-msept/run-cycle.sh @@ -6,9 +6,9 @@ SLEEP_TIME=30 ## 30 NUM_LOOPS=10 ## 10 RECURSION_DEPTH=1 ## 10 TOTAL_CALLS=2000000 ## 2000000 -METHODTIME=500000 ## 500000 +METHOD_TIME=500000 ## 500000 -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH}` echo "Each experiment will take circa ${TIME} seconds." ${SUDOCMD} psrset -c -F 0 1 2 3 # one chip no hyperthreading diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh index f4c5f0a..933c232 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh @@ -14,12 +14,12 @@ NUM_LOOPS=1 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 #MOREPARAMS="" MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -56,7 +56,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -75,7 +75,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -93,7 +93,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARDeactived} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -113,7 +113,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARCollecting} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -133,7 +133,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -153,7 +153,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -173,7 +173,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -200,8 +200,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average @@ -213,8 +213,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput @@ -249,8 +249,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 -bars.minval=(${METHODTIME}/1000) -bars.maxval=(${METHODTIME}/1000)+40 +bars.minval=(${METHOD_TIME}/1000) +bars.maxval=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}bar.r") EOF diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh index 1414edb..2a3e880 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh @@ -11,12 +11,12 @@ NUM_LOOPS=1 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=20000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 MOREPARAMS="" #MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -50,7 +50,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -69,7 +69,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -87,7 +87,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARDeactived} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -106,7 +106,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARCollecting} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -125,7 +125,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -144,7 +144,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -163,7 +163,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -189,8 +189,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average @@ -202,8 +202,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput @@ -238,8 +238,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 -bars.minval=(${METHODTIME}/1000) -bars.maxval=(${METHODTIME}/1000)+40 +bars.minval=(${METHOD_TIME}/1000) +bars.maxval=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}bar.r") EOF diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh index b73e552..6d86f77 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh @@ -11,12 +11,12 @@ NUM_LOOPS=1 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 #MOREPARAMS="" MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -54,7 +54,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -76,7 +76,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -122,7 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -174,7 +174,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -201,7 +201,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -233,8 +233,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average @@ -246,8 +246,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput @@ -282,8 +282,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 -bars.minval=(${METHODTIME}/1000) -bars.maxval=(${METHODTIME}/1000)+40 +bars.minval=(${METHOD_TIME}/1000) +bars.maxval=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}bar.r") EOF diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh index c83407f..04274ae 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh @@ -14,12 +14,12 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=100000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 MOREPARAMS="" #MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -56,7 +56,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -74,7 +74,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -92,7 +92,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARDeactived} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -112,7 +112,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARCollecting} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -132,7 +132,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -152,7 +152,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -172,7 +172,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh index 1414edb..2a3e880 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh @@ -11,12 +11,12 @@ NUM_LOOPS=1 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=20000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 MOREPARAMS="" #MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -50,7 +50,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -69,7 +69,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -87,7 +87,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARDeactived} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -106,7 +106,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARCollecting} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -125,7 +125,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -144,7 +144,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -163,7 +163,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_LTW} ${JARNORMAL} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -189,8 +189,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average @@ -202,8 +202,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput @@ -238,8 +238,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 -bars.minval=(${METHODTIME}/1000) -bars.maxval=(${METHODTIME}/1000)+40 +bars.minval=(${METHOD_TIME}/1000) +bars.maxval=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}bar.r") EOF diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh index 3cb4b50..a0b5d0d 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh @@ -14,12 +14,12 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=4000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 MOREPARAMS="" #MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -60,7 +60,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -118,7 +118,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -139,7 +139,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -163,7 +163,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -187,7 +187,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh index b73e552..6d86f77 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh @@ -11,12 +11,12 @@ NUM_LOOPS=1 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 #MOREPARAMS="" MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -54,7 +54,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -76,7 +76,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -122,7 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -174,7 +174,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -201,7 +201,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -233,8 +233,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average @@ -246,8 +246,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") configs.colors=c("black","red","blue","green","yellow","purple") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+40 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput @@ -282,8 +282,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction") results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 -bars.minval=(${METHODTIME}/1000) -bars.maxval=(${METHODTIME}/1000)+40 +bars.minval=(${METHOD_TIME}/1000) +bars.maxval=(${METHOD_TIME}/1000)+40 source("${R_SCRIPT_DIR}bar.r") EOF diff --git a/bin/2013-kieker-days/only_r.sh b/bin/2013-kieker-days/only_r.sh index 750fa60..e98be1b 100644 --- a/bin/2013-kieker-days/only_r.sh +++ b/bin/2013-kieker-days/only_r.sh @@ -11,7 +11,7 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=20000000 ## 20000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 RAWFN="${RESULTS_DIR}raw" diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh index 69fca7e..b82a511 100644 --- a/bin/2014-icpe/benchmark-disk-writer.sh +++ b/bin/2014-icpe/benchmark-disk-writer.sh @@ -11,12 +11,12 @@ NUM_LOOPS=10 ## 10 THREADS=1 ## 1 RECURSIONDEPTH=10 ## 10 TOTAL_CALLS=2000000 ## 2000000 -METHODTIME=0 ## 0 +METHOD_TIME=0 ## 0 MOREPARAMS="" #MOREPARAMS="--quickstart" -TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` +TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." echo "Removing and recreating '${RESULTS_DIR}'" @@ -56,7 +56,7 @@ echo "" >>${RESULTS_DIR}configuration.txt echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt -echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt +echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt sync @@ -78,7 +78,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_NOINSTR} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -101,7 +101,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -124,7 +124,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING1} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -171,7 +171,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING2} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -195,7 +195,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVABIN}java ${JAVA_ARGS_KIEKER_LOGGING3} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --totalcalls ${TOTAL_CALLS} \ - --methodtime ${METHODTIME} \ + --methodtime ${METHOD_TIME} \ --totalthreads ${THREADS} \ --recursiondepth ${j} \ ${MOREPARAMS} @@ -226,8 +226,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3") configs.colors=c("black","red","blue","green","purple","pink") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+200 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+200 source("${R_SCRIPT_DIR}timeseries.r") EOF # Timeseries-Average @@ -239,8 +239,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3") configs.colors=c("black","red","blue","green","purple","pink") results.count=${TOTAL_CALLS} -tsconf.min=(${METHODTIME}/1000) -tsconf.max=(${METHODTIME}/1000)+200 +tsconf.min=(${METHOD_TIME}/1000) +tsconf.max=(${METHOD_TIME}/1000)+200 source("${R_SCRIPT_DIR}timeseries-average.r") EOF # Throughput @@ -275,8 +275,8 @@ configs.recursion=c(${RECURSIONDEPTH}) configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3") results.count=${TOTAL_CALLS} results.skip=${TOTAL_CALLS}/2 -bars.minval=(${METHODTIME}/1000) -bars.maxval=(${METHODTIME}/1000)+200 +bars.minval=(${METHOD_TIME}/1000) +bars.maxval=(${METHOD_TIME}/1000)+200 source("${R_SCRIPT_DIR}bar.r") EOF diff --git a/frameworks/SPASSmeter/benchmark-causes.sh b/frameworks/SPASSmeter/benchmark-causes.sh index 7803ce9..f8b487e 100644 --- a/frameworks/SPASSmeter/benchmark-causes.sh +++ b/frameworks/SPASSmeter/benchmark-causes.sh @@ -55,7 +55,7 @@ echo "" >> "${RESULTS_DIR}/configuration.txt" echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt" echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt" echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt" -echo "METHODTIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt" +echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt" echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt" echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt" sync diff --git a/frameworks/SPASSmeter/benchmark.sh b/frameworks/SPASSmeter/benchmark.sh index 963e83f..09d1b43 100644 --- a/frameworks/SPASSmeter/benchmark.sh +++ b/frameworks/SPASSmeter/benchmark.sh @@ -55,7 +55,7 @@ echo "" >> "${RESULTS_DIR}/configuration.txt" echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt" echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt" echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt" -echo "METHODTIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt" +echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt" echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt" echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt" sync @@ -113,7 +113,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do ${JAVA_BIN} ${JAVA_ARGS_LTW_ASM} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ --total-calls ${TOTAL_CALLS} \ - --method-time ${METHODTIME} \ + --method-time ${METHOD_TIME} \ --total-threads ${THREADS} \ --recursion-depth ${j} \ ${MORE_PARAMS} diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index 426b4f1..851ed67 100644 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -122,7 +122,7 @@ function writeConfiguration() { echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}/configuration.txt echo "NUM_OF_LOOPS=${NUM_OF_LOOPS}" >>${RESULTS_DIR}/configuration.txt echo "TOTAL_NUM_OF_CALLS=${TOTAL_NUM_OF_CALLS}" >>${RESULTS_DIR}/configuration.txt - echo "METHODTIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt + echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt sync -- GitLab