diff --git a/frameworks/Kieker/scripts/benchmark.sh b/frameworks/Kieker/scripts/benchmark.sh index fbd1883354c08bd2994c6b14e3ea68df5c3058a5..ed17d1c7c4dbccda098776f3dbfe5d0729218edb 100755 --- a/frameworks/Kieker/scripts/benchmark.sh +++ b/frameworks/Kieker/scripts/benchmark.sh @@ -15,6 +15,9 @@ else echo "Missing configuration: ${BASE_DIR}/config" exit 1 fi + +source ../../common-functions.sh + if [ -f "${BASE_DIR}/common-functions" ] ; then . ${BASE_DIR}/common-functions else @@ -190,10 +193,6 @@ function execute-benchmark-body() { fi } -function getSum { - awk '{sum += $1; square += $1^2} END {print "Average: "sum/NR" Standard Deviation: "sqrt(square / NR - (sum/NR)^2)" Count: "NR}' -} - function printIntermediaryResults { for ((index=0;index<${#WRITER_CONFIG[@]};index+=1)); do echo -n "Intermediary results "$TITLE[$index]" " @@ -236,14 +235,6 @@ source("${RSCRIPT_PATH}") EOF } -## Clean up raw results -function cleanup-results() { - zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}* - rm -f ${RAWFN}* - [ -f ${DATA_DIR}/nohup.out ] && cp ${DATA_DIR}/nohup.out ${RESULTS_DIR} - [ -f ${DATA_DIR}/nohup.out ] && > ${DATA_DIR}/nohup.out -} - ## Execute benchmark if [ "$MODE" == "execute" ] ; then if [ "$OPTION" == "" ] ; then diff --git a/frameworks/Kieker/scripts/config b/frameworks/Kieker/scripts/config index eacf4b0b1b88b9615e9920fbb780c9c74748c42a..d499e03a3f4fe87c2e7fed6af4ce4562f156b64a 100644 --- a/frameworks/Kieker/scripts/config +++ b/frameworks/Kieker/scripts/config @@ -16,11 +16,4 @@ BATCH_MODE="yes" # in-jar locations AOP="file:"$(pwd)"/../src/META-INF/kieker.aop.xml" -# execution parameter -SLEEP_TIME=30 ## 30 -NUM_OF_LOOPS=10 ## 10 -RECURSION_DEPTH=10 ## 10 -TOTAL_NUM_OF_CALLS=2000000 ## 2 000 000 -METHOD_TIME=0 #00 ## 500000 - # end