diff --git a/frameworks/Kieker/java/functions.sh b/frameworks/Kieker/java/functions.sh index 39c56b7d60a1677d92ec33e45a6a78ca8e3b2dc9..a02f0d687a9ec2ce1dd938175525585a72022e02 100644 --- a/frameworks/Kieker/java/functions.sh +++ b/frameworks/Kieker/java/functions.sh @@ -72,10 +72,10 @@ function executeBenchmarkBody() { loop="$2" recursion="$3" if [[ "${RECEIVER[$index]}" ]] ; then - echo "receiver ${RECEIVER[$index]}" + debug "receiver ${RECEIVER[$index]}" ${RECEIVER[$index]} >> "${DATA_DIR}/kieker.receiver-${loop}-${index}.log" & RECEIVER_PID=$! - echo "PID $RECEIVER_PID" + debug "PID ${RECEIVER_PID}" fi executeExperiment "$loop" "$recursion" "$index" "${TITLE[$index]}" "${WRITER_CONFIG[$index]}" diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh index d40550c7af54f62fc88056b4f4468c61b6acd972..2e671693ab8a14736695ef865afbb2aa2a64194d 100755 --- a/frameworks/OpenTelemetry/benchmark.sh +++ b/frameworks/OpenTelemetry/benchmark.sh @@ -68,9 +68,7 @@ showParameter 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} ` info "Experiment will take circa ${TIME} seconds." -JAVA_ARGS="-server" -JAVA_ARGS="${JAVA_ARGS} -Xms1G -Xmx2G" -JAVA_ARGS="${JAVA_ARGS} -verbose:gc " +JAVA_ARGS="-Xms1G -Xmx2G -verbose:gc" JAVA_ARGS_NOINSTR="${JAVA_ARGS}" JAVA_ARGS_OPENTELEMETRY_BASIC="${JAVA_ARGS} -javaagent:${AGENT_JAR} -Dotel.resource.attributes=service.name=moobench -Dotel.instrumentation.methods.include=moobench.application.MonitoredClassSimple[monitoredMethod];moobench.application.MonitoredClassThreaded[monitoredMethod]" diff --git a/frameworks/OpenTelemetry/functions.sh b/frameworks/OpenTelemetry/functions.sh index 0cebbf59c3b12b1eb3d5ccc19d749163b7cc320b..10e7caee4f13377794925ccde41cda4b3d33a604 100644 --- a/frameworks/OpenTelemetry/functions.sh +++ b/frameworks/OpenTelemetry/functions.sh @@ -24,7 +24,7 @@ function startJaeger { tar -xvf jaeger-1.24.0-linux-amd64.tar.gz rm jaeger-1.24.0-linux-amd64.tar.gz fi - + cd "${BASE_DIR}/jaeger-1.24.0-linux-amd64" "${BASE_DIR}/jaeger-1.24.0-linux-amd64/jaeger-all-in-one" &> "${BASE_DIR}/jaeger-1.24.0-linux-amd64/jaeger.log" & cd "${BASE_DIR}" @@ -81,8 +81,9 @@ function runOpenTelemetryLogging { ${MORE_PARAMS} &> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt" if [ ! "$DEBUG" = true ] then - echo "DEBUG is $DEBUG, deleting opentelemetry logging file" - rm ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt + rm "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt" + else + debug "Keeping opentelemetry logging file" fi } diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index c87afe7a72ee6026b8f1d30435392076ba335a58..9f520f3f4227088234f7d09e1ba476e35c415156 100755 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -107,7 +107,7 @@ function writeConfiguration() { function printIntermediaryResults { for ((index=0;index<${#TITLE[@]};index+=1)); do - echo -n "Intermediary results "${TITLE[$index]}" " + info_n "Intermediary results "${TITLE[$index]}" " cat ${RAWFN}-*-${RECURSION_DEPTH}-${index}.csv | awk -F';' '{print $2}' | getSum done } @@ -145,6 +145,10 @@ function info() { echo -e "${INFO} $@" } +function info_n() { + echo -n -e "${INFO} $@" +} + function debug() { if [ "${DEBUG}" == "yes" ] ; then echo -e "${DEBUG_INFO} $@" diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh index 3a668efdd8f28a3dc26517a9059d0441eedadef9..3bc29f603574ac2359a9b81e95d19d395519e8e7 100755 --- a/frameworks/inspectIT/benchmark.sh +++ b/frameworks/inspectIT/benchmark.sh @@ -67,9 +67,7 @@ showParameter 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} ` info "Experiment will take circa ${TIME} seconds." -JAVA_ARGS="-server" -JAVA_ARGS="${JAVA_ARGS} -Xms1G -Xmx2G" -JAVA_ARGS="${JAVA_ARGS} -verbose:gc " +JAVA_ARGS="-Xms1G -Xmx2G -verbose:gc" JAVA_ARGS_NOINSTR="${JAVA_ARGS}" JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/agent/inspectit-ocelot-agent-1.11.1.jar -Djava.util.logging.config.file=${BASE_DIR}/config/logging.properties"