diff --git a/frameworks/Kieker/scripts/benchmark.sh b/frameworks/Kieker/scripts/benchmark.sh index be20816f47ba768c0e738e18b9ade8abf7e6b50e..40748a8bdc92fe937118a6b00d23a21baedb45a1 100755 --- a/frameworks/Kieker/scripts/benchmark.sh +++ b/frameworks/Kieker/scripts/benchmark.sh @@ -105,9 +105,6 @@ WRITER_CONFIG[5]="-Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.Single RECEIVER[5]="${BASE_DIR}/collector-2.0/bin/collector -p 2345" RECEIVER[5]="${BASE_DIR}/receiver/bin/receiver 2345" -# Create R labels -LABELS=$(createRLabels) - ## Write configuration uname -a >${RESULTS_DIR}/configuration.txt ${JAVA_BIN} ${JAVA_ARGS} -version 2>>${RESULTS_DIR}/configuration.txt @@ -214,21 +211,6 @@ function execute-benchmark() { [ -f ${DATA_DIR}/errorlog.txt ] && mv ${DATA_DIR}/errorlog.txt ${RESULTS_DIR} } -## Generate Results file -function run-r() { -R --vanilla --silent << EOF -results_fn="${RAWFN}" -outtxt_fn="${RESULTS_DIR}/results-text.txt" -outcsv_fn="${RESULTS_DIR}/results-text.csv" -configs.loop=${NUM_OF_LOOPS} -configs.recursion=${RECURSION_DEPTH} -configs.labels=c($LABELS) -results.count=${TOTAL_NUM_OF_CALLS} -results.skip=${TOTAL_NUM_OF_CALLS}/2 -source("${RSCRIPT_PATH}") -EOF -} - ## Execute benchmark if [ "$MODE" == "execute" ] ; then if [ "$OPTION" == "" ] ; then @@ -236,7 +218,11 @@ if [ "$MODE" == "execute" ] ; then else execute-benchmark-body $OPTION 1 1 fi + + # Create R labels + LABELS=$(createRLabels) run-r + cleanup-results else execute-benchmark-body $OPTION 1 1 diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index 20d483ed69e801c475b6c41f94c777a139ce02a9..43909b470d59c8aa9f3a8e67087ff0ffa6902d45 100644 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -64,6 +64,21 @@ function createRLabels() { echo $LABELS } +## Generate Results file +function run-r() { +R --vanilla --silent << EOF +results_fn="${RAWFN}" +outtxt_fn="${RESULTS_DIR}/results-text.txt" +outcsv_fn="${RESULTS_DIR}/results-text.csv" +configs.loop=${NUM_OF_LOOPS} +configs.recursion=${RECURSION_DEPTH} +configs.labels=c($LABELS) +results.count=${TOTAL_NUM_OF_CALLS} +results.skip=${TOTAL_NUM_OF_CALLS}/2 +source("${RSCRIPT_PATH}") +EOF +} + function startZipkin { if [ ! -d zipkin ] then