diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh index 549ca4b7938efd4b529bf25ac32ab73f96692501..3f1790ac8dd4b4812b9e614ffa063fe781820f82 100644 --- a/bin/2012-msept/run-benchmark-cycle-async.sh +++ b/bin/2012-msept/run-benchmark-cycle-async.sh @@ -9,7 +9,7 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi # echo "Classpath separator: '${CPSEPCHAR}'" RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/" -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh index 2a153a8fe9c319b83b95f66dc54ca2c6f030e382..8ff6931e20ad7de5cb2dc541f3e0864abddf2f98 100644 --- a/bin/2012-msept/run-benchmark-cycle-sync.sh +++ b/bin/2012-msept/run-benchmark-cycle-sync.sh @@ -9,7 +9,7 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi # echo "Classpath separator: '${CPSEPCHAR}'" RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/" -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh index a082cfb3defd7bf725772e7f0257f2aa4a2248af..bef23d5db1ba3617b1c899290f29a97ec0cffd57 100644 --- a/bin/2012-msept/run-benchmark-recursive-jmx.sh +++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh @@ -24,7 +24,7 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi # echo "Classpath separator: '${CPSEPCHAR}'" RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/" -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh index 0a617dea276ab9b4a13529bad4f38734cc1d6a9e..bdd5b050dfd50777fc02fb4104dde15fbeb26d7c 100644 --- a/bin/2012-msept/run-benchmark-recursive-linear.sh +++ b/bin/2012-msept/run-benchmark-recursive-linear.sh @@ -24,7 +24,7 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi # echo "Classpath separator: '${CPSEPCHAR}'" RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive-linear/" -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh index efc13d6f5a78164a82e7901f75a722bae360c6db..c48f6fd8f8f0662ca0a30ec31accafa0c8b4d355 100644 --- a/bin/2012-msept/run-benchmark-recursive.sh +++ b/bin/2012-msept/run-benchmark-recursive.sh @@ -24,7 +24,7 @@ if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi # echo "Classpath separator: '${CPSEPCHAR}'" RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/" -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ 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 31dd2d6d1aaf1e232fb2f880f477ef3f3cd76af3..ce74a0fc62c13a95b6df3e239c4c2bbb50db2146 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 @@ -22,7 +22,7 @@ MOREPARAMS="--quickstart" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ 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 7214ff8b5104eea6085a2bc8bf521ec5a7b232d6..de179e7fddab543f6556ee4222d2de0e780a40fb 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh @@ -19,7 +19,7 @@ MOREPARAMS="" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ 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 aa4109488820063ba36e028abfa10e78f6819dcc..fe9e142adcee5fa89d4292dda26d18c96cc8059d 100644 --- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh +++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh @@ -19,7 +19,7 @@ MOREPARAMS="--quickstart" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ 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 41dc5596b6bde11f073f63b256185c21810ecfa5..2713e7b6eb3686bcde498439596b4731967e1d17 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh @@ -22,7 +22,7 @@ MOREPARAMS="" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh index 7214ff8b5104eea6085a2bc8bf521ec5a7b232d6..de179e7fddab543f6556ee4222d2de0e780a40fb 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh @@ -19,7 +19,7 @@ MOREPARAMS="" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ 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 7285831f3ae3ea0e7fbf4923fe66c35aaa9cebc3..805739d71aeda23e74b8d46b54abd2cf8656136f 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh @@ -22,7 +22,7 @@ MOREPARAMS="" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh index aa4109488820063ba36e028abfa10e78f6819dcc..fe9e142adcee5fa89d4292dda26d18c96cc8059d 100644 --- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh +++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh @@ -19,7 +19,7 @@ MOREPARAMS="--quickstart" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2014-icpe/benchmark-disk-writer-slow.sh b/bin/2014-icpe/benchmark-disk-writer-slow.sh index 775b3523d8997b951cb453116207a43eba4e103d..07671a18cf6cc4f74e788949ab3c4b98a46c2f83 100644 --- a/bin/2014-icpe/benchmark-disk-writer-slow.sh +++ b/bin/2014-icpe/benchmark-disk-writer-slow.sh @@ -19,7 +19,7 @@ MORE_PARAMS="" TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}/) && mkdir ${RESULTS_DIR}/ mkdir ${RESULTS_DIR}/stat/ diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh index 9c89823984772a29f681900cc22dec416aba629d..6127a94ffdd823847f5680d047ae2f4be638c5cd 100644 --- a/bin/2014-icpe/benchmark-disk-writer.sh +++ b/bin/2014-icpe/benchmark-disk-writer.sh @@ -19,7 +19,7 @@ MOREPARAMS="" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR} mkdir ${RESULTS_DIR}stat/ diff --git a/bin/2014-icpe/benchmark-tcp-ffi.sh b/bin/2014-icpe/benchmark-tcp-ffi.sh index 11bb291c6f8b2a1916f47b89496da532ffdf1b78..8621a81ba84b87f76d32e22ac5793e12d53ec571 100644 --- a/bin/2014-icpe/benchmark-tcp-ffi.sh +++ b/bin/2014-icpe/benchmark-tcp-ffi.sh @@ -19,7 +19,7 @@ MORE_PARAMS="" TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf "${RESULTS_DIR}") && mkdir "${RESULTS_DIR}" mkdir "${RESULTS_DIR}/stat" diff --git a/frameworks/Kieker/benchmark.sh b/frameworks/Kieker/benchmark.sh index c90f325b2b44a9278d04c6af8db58db8ed0753c8..1aefa6288e73a0380a478514a8c6ca014c250f0e 100644 --- a/frameworks/Kieker/benchmark.sh +++ b/frameworks/Kieker/benchmark.sh @@ -65,7 +65,7 @@ information "----------------------------------" TIME=`expr ${METHOD_TIME} \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_OF_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} ` information "Experiment will take circa ${TIME} seconds." -information "Removing and recreating '$RESULTS_DIR'" +information "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}/*csv) && mkdir -p ${RESULTS_DIR} # Clear kieker.log and initialize logging diff --git a/frameworks/Kieker/runExponentialSizes.sh b/frameworks/Kieker/runExponentialSizes.sh index f08d60347cb4122fa7fccc0f0dde8d2cbd696231..c7732f78870cd46a799586d85ad2b3f4e68ce664 100644 --- a/frameworks/Kieker/runExponentialSizes.sh +++ b/frameworks/Kieker/runExponentialSizes.sh @@ -1,12 +1,12 @@ #!/bin/bash RESULTS_DIR=results-Kieker/ -mkdir -p $RESULTS_DIR +mkdir -p ${RESULTS_DIR} for depth in 2 4 8 16 32 64 128 do export RECURSION_DEPTH=$depth echo "Running $depth" - ./benchmark.sh &> $RESULTS_DIR/$depth.txt - mv $RESULTS_DIR/results.zip $RESULTS_DIR/results-$RECURSION_DEPTH.zip + ./benchmark.sh &> ${RESULTS_DIR}/$depth.txt + mv ${RESULTS_DIR}/results.zip ${RESULTS_DIR}/results-$RECURSION_DEPTH.zip done diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh index c3ae59d58524495404b576c3fec60dcd2ef834e5..0ecd2ee796494b1ea22217060f0fbc826cf5249b 100644 --- a/frameworks/OpenTelemetry/benchmark.sh +++ b/frameworks/OpenTelemetry/benchmark.sh @@ -131,7 +131,7 @@ MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MOREPARAM TIME=`expr ${METHOD_TIME} \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_OF_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Cleaning and recreating '$RESULTS_DIR'" +echo "Cleaning and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}/**csv) && mkdir -p ${RESULTS_DIR} #mkdir ${RESULTS_DIR}stat/ diff --git a/frameworks/OpenTelemetry/runExponentialSizes.sh b/frameworks/OpenTelemetry/runExponentialSizes.sh index 904e77a978c632b79f0e34bb978c44a384e1cb9a..90a6beea223486421d96bc5dbaded0d6a9b5159b 100644 --- a/frameworks/OpenTelemetry/runExponentialSizes.sh +++ b/frameworks/OpenTelemetry/runExponentialSizes.sh @@ -1,12 +1,12 @@ #!/bin/bash RESULTS_DIR=results-OpenTelemetry/ -mkdir -p $RESULTS_DIR +mkdir -p ${RESULTS_DIR} for depth in 2 4 8 16 32 64 128 do export RECURSION_DEPTH=$depth echo "Running $depth" - ./benchmark.sh &> $RESULTS_DIR/$depth.txt - mv $RESULTS_DIR/results.zip $RESULTS_DIR/results-$RECURSION_DEPTH.zip + ./benchmark.sh &> ${RESULTS_DIR}/$depth.txt + mv ${RESULTS_DIR}/results.zip ${RESULTS_DIR}/results-$RECURSION_DEPTH.zip done diff --git a/frameworks/SPASSmeter/benchmark-tcp.sh b/frameworks/SPASSmeter/benchmark-tcp.sh index 47b99bf02a7d0c98e98dea67f8ba26578a1d759a..9169cd8554e31cf78ff9916124a17856a2ed7b3b 100644 --- a/frameworks/SPASSmeter/benchmark-tcp.sh +++ b/frameworks/SPASSmeter/benchmark-tcp.sh @@ -20,7 +20,7 @@ MORE_PARAMS="--application mooBench.monitoredApplication.MonitoredClassSimple ${ 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'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf ${RESULTS_DIR}/) && mkdir ${RESULTS_DIR}/ #mkdir ${RESULTS_DIR}/stat/ diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index f0796a6ea0fb700667ffbefc44ab22307ed95c49..a7fbb6b9ad9443a2d189a0aa3b70aff2a47747d0 100644 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -131,7 +131,7 @@ function writeConfiguration() { function printIntermediaryResults { for ((index=0;index<${#TITLE[@]};index+=1)); do echo -n "Intermediary results "${TITLE[$index]}" " - cat $RESULTS_DIR/raw-*-${RECURSION_DEPTH}-${index}.csv | awk -F';' '{print $2}' | getSum + cat ${RESULTS_DIR}/raw-*-${RECURSION_DEPTH}-${index}.csv | awk -F';' '{print $2}' | getSum done } diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh index 65b860ed0bb49b2e3669363c03d1258ebf032e48..0ae145955aa614aed34148209b03de350e2ef00c 100644 --- a/frameworks/inspectIT/benchmark.sh +++ b/frameworks/inspectIT/benchmark.sh @@ -114,7 +114,7 @@ MORE_PARAMS="${MORE_PARAMS}" TIME=`expr ${METHOD_TIME} \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_OF_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." -echo "Removing and recreating '$RESULTS_DIR'" +echo "Removing and recreating '${RESULTS_DIR}'" (rm -rf "${RESULTS_DIR}/"**csv) && mkdir -p "${RESULTS_DIR}" # Clear inspectit.log and initialize logging @@ -133,7 +133,7 @@ JAVA_ARGS_INSPECTIT_NULLWRITER="${JAVA_ARGS_LTW} -Dinspectit.service-name=mooben JAVA_ARGS_INSPECTIT_ZIPKIN="${JAVA_ARGS_LTW} -Dinspectit.service-name=moobench-inspectit -Dinspectit.exporters.metrics.prometheus.enabled=false -Dinspectit.exporters.tracing.zipkin.url=http://127.0.0.1:9411/api/v2/spans -Dinspectit.config.file-based.path=${BASE_DIR}/config/zipkin/" JAVA_ARGS_INSPECTIT_PROMETHEUS="${JAVA_ARGS_LTW} -Dinspectit.service-name=moobench-inspectit -Dinspectit.exporters.metrics.zipkin.enabled=false -Dinspectit.exporters.metrics.prometheus.enabled=true -Dinspectit.config.file-based.path=${BASE_DIR}/config/prometheus/" -echo "RESULTS_DIR: $RESULTS_DIR" +echo "RESULTS_DIR: ${RESULTS_DIR}" echo "RAWFN: $RAWFN" writeConfiguration diff --git a/frameworks/inspectIT/runExponentialSizes.sh b/frameworks/inspectIT/runExponentialSizes.sh index d30fc2cb3ed7a9933110de78cf66ae5c8cc768ad..042113eba23d67fcb751786b5c414834d5737d07 100644 --- a/frameworks/inspectIT/runExponentialSizes.sh +++ b/frameworks/inspectIT/runExponentialSizes.sh @@ -1,12 +1,12 @@ #!/bin/bash RESULTS_DIR=results-inspectIT/ -mkdir -p $RESULTS_DIR +mkdir -p ${RESULTS_DIR} for depth in 2 4 8 16 32 64 128 do export RECURSION_DEPTH=$depth echo "Running $depth" - ./benchmark.sh &> $RESULTS_DIR/$depth.txt - mv $RESULTS_DIR/results.zip $RESULTS_DIR/results-$RECURSION_DEPTH.zip + ./benchmark.sh &> ${RESULTS_DIR}/$depth.txt + mv ${RESULTS_DIR}/results.zip ${RESULTS_DIR}/results-$RECURSION_DEPTH.zip done diff --git a/frameworks/runR.sh b/frameworks/runR.sh index 46a1c0431640341a5b207fa4c738797e78862992..f9ccaa7801d4470167c1c4d3220566a77fe32024 100644 --- a/frameworks/runR.sh +++ b/frameworks/runR.sh @@ -16,7 +16,7 @@ source common-functions.sh source $1/labels.sh -echo "RESULTS_DIR: $RESULTS_DIR" +echo "RESULTS_DIR: ${RESULTS_DIR}" echo "Rawfn: $RAWFN" RSCRIPT_PATH=stats.csv.r diff --git a/tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh b/tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh index cbdef3b8c139d2ddd0d7cf83db6c0475ec7b3d21..f30ee5de83366cd3b94cade8da4e87125e69f8b5 100644 --- a/tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh +++ b/tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh @@ -17,7 +17,7 @@ EOF function createVariantsString { local LABELS="" - local variants=$(ls $RESULTS_DIR | grep ".csv" | awk -F'[.-]' '{print $4}' | sort | uniq | sed '/^[[:space:]]*$/d') + local variants=$(ls ${RESULTS_DIR} | grep ".csv" | awk -F'[.-]' '{print $4}' | sort | uniq | sed '/^[[:space:]]*$/d') for variant in $variants do if [ -z "$LABELS" ] @@ -31,7 +31,7 @@ function createVariantsString { } function createLatexTable { - cat $RESULTS_DIR/results-text.txt | tail -n 8 > transposeMe.csv + cat ${RESULTS_DIR}/results-text.txt | tail -n 8 > transposeMe.csv awk ' { for (i=1; i<=NF; i++) { @@ -61,7 +61,7 @@ fi RESULTS_DIR=$1 -RAWFN=$RESULTS_DIR/raw +RAWFN=${RESULTS_DIR}/raw NUM_OF_LOOPS=10 RECURSION_DEPTH=10 TOTAL_NUM_OF_CALLS=2000000