From c49c162a1d375c31716a11a80b1b82d3cbd13b39 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Thu, 11 Aug 2022 21:06:08 +0200
Subject: [PATCH] Updated setup
---
frameworks/Kieker/java/functions.sh | 4 ++--
frameworks/OpenTelemetry/benchmark.sh | 4 +---
frameworks/OpenTelemetry/functions.sh | 7 ++++---
frameworks/common-functions.sh | 6 +++++-
frameworks/inspectIT/benchmark.sh | 4 +---
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/frameworks/Kieker/java/functions.sh b/frameworks/Kieker/java/functions.sh
index 39c56b7..a02f0d6 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 d40550c..2e67169 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 0cebbf5..10e7cae 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 c87afe7..9f520f3 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 3a668ef..3bc29f6 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"
--
GitLab