From f1ff216ea912ec321ea0faee49f0bfee0c18dfeb Mon Sep 17 00:00:00 2001 From: Reiner Jung <reiner.jung@email.uni-kiel.de> Date: Fri, 12 Aug 2022 18:47:21 +0200 Subject: [PATCH] minor fix in benchmark to correct the exit code. --- frameworks/OpenTelemetry/benchmark.sh | 1 + frameworks/common-functions.sh | 7 ++++++- test.rc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh index 2e67169..96f4de1 100755 --- a/frameworks/OpenTelemetry/benchmark.sh +++ b/frameworks/OpenTelemetry/benchmark.sh @@ -122,4 +122,5 @@ mv "${BASE_DIR}/OpenTelemetry.log" "${RESULTS_DIR}/OpenTelemetry.log" [ -f "${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log" ] && grep "<task " "${RESULTS_DIR}/"hotspot-*.log > "${RESULTS_DIR}/OpenTelemetry.log" [ -f "${BASE_DIR}/errorlog.txt" ] && mv "${BASE_DIR}/errorlog.txt" "${RESULTS_DIR}" +exit 0 # end diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index 9f520f3..e49f8a2 100755 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -43,6 +43,11 @@ function createRLabels() { ## Generate Results file function runStatistics() { +if [ "${TOTAL_NUM_OF_CALLS}" == 1 ] ; then + export SKIP=0 +else + export SKIP=${TOTAL_NUM_OF_CALLS}/2 +fi R --vanilla --silent << EOF results_fn="${RAWFN}" out_yaml_fn="${RESULTS_DIR}/results.yaml" @@ -51,7 +56,7 @@ configs.recursion=${RECURSION_DEPTH} configs.labels=c($LABELS) configs.framework_name="${FRAMEWORK_NAME}" results.count=${TOTAL_NUM_OF_CALLS} -results.skip=${TOTAL_NUM_OF_CALLS}/2 +results.skip=${SKIP} source("${RSCRIPT_PATH}") EOF } diff --git a/test.rc b/test.rc index 7ae5867..87bfb6d 100644 --- a/test.rc +++ b/test.rc @@ -3,6 +3,6 @@ export NUM_OF_LOOPS=1 export THREADS=1 export RECURSION_DEPTH=1 export TOTAL_NUM_OF_CALLS=1 -export METHOD_TIME=1 +export METHOD_TIME=0 export DEBUG=false -- GitLab