From 50bb2578555d4f20f411b41f6309c286d7aa9ac4 Mon Sep 17 00:00:00 2001
From: David Georg Reichelt <davidgeorg_reichelt@dagere.de>
Date: Fri, 20 Aug 2021 12:02:41 +0200
Subject: [PATCH] Also use regular jar for Kieker execution
---
benchmark/build.gradle | 5 +++++
frameworks/Kieker/scripts/benchmark.sh | 7 +++----
frameworks/Kieker/scripts/config | 1 -
frameworks/inspectIT/benchmark.sh | 4 +---
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index 4019edb..5f1ab66 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -37,5 +37,10 @@ jar {
into "../frameworks/inspectIT/"
rename('benchmark.jar', 'MooBench.jar')
}
+ copy {
+ from jar
+ into "../frameworks/Kieker/"
+ rename('benchmark.jar', 'MooBench.jar')
+ }
}
}
diff --git a/frameworks/Kieker/scripts/benchmark.sh b/frameworks/Kieker/scripts/benchmark.sh
index 02eb06a..5fedaa4 100755
--- a/frameworks/Kieker/scripts/benchmark.sh
+++ b/frameworks/Kieker/scripts/benchmark.sh
@@ -51,7 +51,6 @@ checkDirectory DATA_DIR "${DATA_DIR}" create
PARENT=`dirname "${RESULTS_DIR}"`
checkDirectory result-base "$PARENT"
checkFile ApsectJ-Agent "${AGENT}"
-checkFile moobench "${BENCHMARK}"
information "----------------------------------"
information "Running benchmark..."
@@ -138,10 +137,10 @@ function execute-experiment() {
BENCHMARK_OPTS="${JAVA_ARGS} ${LTW_ARGS} ${KIEKER_ARGS} ${kieker_parameters}"
fi
- echo ${BENCHMARK}" "${BENCHMARK_OPTS}" moobench.benchmark.BenchmarkMain"
+ echo ${BENCHMARK_OPTS}" -jar benchmark/build/libs/benchmark.jar"
- ${BENCHMARK} ${BENCHMARK_OPTS} moobench.benchmark.BenchmarkMain \
- --application moobench.application.MonitoredClassSimple \
+ ${JAVABIN}java ${BENCHMARK_OPTS} -jar benchmark/build/libs/benchmark.jar \
+ --application moobench.application.MonitoredClassSimple \
--output-filename ${RAWFN}-${loop}-${recursion}-${index}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
--method-time ${METHOD_TIME} \
diff --git a/frameworks/Kieker/scripts/config b/frameworks/Kieker/scripts/config
index 6486f0f..927b736 100644
--- a/frameworks/Kieker/scripts/config
+++ b/frameworks/Kieker/scripts/config
@@ -8,7 +8,6 @@ RSCRIPT_PATH="../../stats.csv.r"
DATA_DIR="${BASE_DIR}/data"
AGENT="${BASE_DIR}/kieker-1.15-SNAPSHOT-aspectj.jar"
-BENCHMARK="${BASE_DIR}/benchmark/bin/benchmark"
BATCH_MODE="yes"
diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh
index 83e1e50..f790a10 100755
--- a/frameworks/inspectIT/benchmark.sh
+++ b/frameworks/inspectIT/benchmark.sh
@@ -151,6 +151,4 @@ run-r
## Clean up raw results
zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
-rm -f ${RAWFN}*
-[ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR}
-[ -f ${BASE_DIR}nohup.out ] && > ${BASE_DIR}nohup.out
+rm ${RAWFN}*
--
GitLab