From b7f831aa5087a8ee886b7be7f7708088defb3635 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Wed, 3 Aug 2022 11:24:02 +0200
Subject: [PATCH] Updated directory structure.
---
frameworks/Kieker/build.gradle | 2 +-
frameworks/OpenTelemetry/config.rc | 2 ++
frameworks/OpenTelemetry/functions.sh | 14 +++++++-------
settings.gradle | 2 +-
{benchmark => tools/benchmark}/build.gradle | 0
.../java/moobench/application/MonitoredClass.java | 0
.../moobench/application/MonitoredClassSimple.java | 0
.../application/MonitoredClassThreaded.java | 0
.../java/moobench/benchmark/BenchmarkMain.java | 0
.../moobench/benchmark/BenchmarkParameter.java | 0
.../moobench/benchmark/BenchmarkingThread.java | 0
.../benchmark/BenchmarkingThreadMilli.java | 0
.../moobench/benchmark/BenchmarkingThreadNano.java | 0
13 files changed, 11 insertions(+), 9 deletions(-)
rename {benchmark => tools/benchmark}/build.gradle (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/application/MonitoredClass.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/application/MonitoredClassSimple.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/application/MonitoredClassThreaded.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/benchmark/BenchmarkMain.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/benchmark/BenchmarkParameter.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/benchmark/BenchmarkingThread.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java (100%)
rename {benchmark => tools/benchmark}/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java (100%)
diff --git a/frameworks/Kieker/build.gradle b/frameworks/Kieker/build.gradle
index aa2bbd2..f706ba4 100644
--- a/frameworks/Kieker/build.gradle
+++ b/frameworks/Kieker/build.gradle
@@ -4,7 +4,7 @@ plugins {
}
dependencies {
- implementation project(':benchmark')
+ implementation project(':tools:benchmark')
implementation 'net.kieker-monitoring:kieker:1.14'
implementation 'net.sourceforge.teetime:teetime:3.0'
implementation 'org.slf4j:slf4j-api:1.7.+'
diff --git a/frameworks/OpenTelemetry/config.rc b/frameworks/OpenTelemetry/config.rc
index ded519d..0b46b37 100644
--- a/frameworks/OpenTelemetry/config.rc
+++ b/frameworks/OpenTelemetry/config.rc
@@ -9,4 +9,6 @@ AGENT_JAR="${BASE_DIR}/lib/opentelemetry-javaagent.jar"
#MORE_PARAMS="--quickstart"
MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MORE_PARAMS}"
+MOOBENCH_BIN="${BASE_DIR}/../../benchmark/bin/benchmark"
+
diff --git a/frameworks/OpenTelemetry/functions.sh b/frameworks/OpenTelemetry/functions.sh
index 5fb41be..ed6ddc2 100644
--- a/frameworks/OpenTelemetry/functions.sh
+++ b/frameworks/OpenTelemetry/functions.sh
@@ -42,13 +42,13 @@ function runNoInstrumentation {
# No instrumentation
info " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}"
echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}" >> "${BASE_DIR}/OpenTelemetry.log"
- ${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
- --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
- --total-calls ${TOTAL_NUM_OF_CALLS} \
- --method-time ${METHOD_TIME} \
- --total-threads ${THREADS} \
- --recursion-depth $RECURSION_DEPTH \
- ${MORE_PARAMS} &> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
+ export BENCHMARK_OPTS="${JAVA_ARGS_NOINSTR}"
+ "${MOOBENCH_BIN}" --output-filename "${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv" \
+ --total-calls "${TOTAL_NUM_OF_CALLS}" \
+ --method-time "${METHOD_TIME}" \
+ --total-threads "${THREADS}" \
+ --recursion-depth "${RECURSION_DEPTH}" \
+ ${MORE_PARAMS} #&> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
}
function runOpenTelemetryNoLogging {
diff --git a/settings.gradle b/settings.gradle
index 98876b3..498031c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,7 @@
rootProject.name = 'moobench'
-include 'benchmark'
+include 'tools:benchmark'
include 'tools:receiver'
include 'tools:compile-results'
include 'frameworks:inspectIT'
diff --git a/benchmark/build.gradle b/tools/benchmark/build.gradle
similarity index 100%
rename from benchmark/build.gradle
rename to tools/benchmark/build.gradle
diff --git a/benchmark/src/main/java/moobench/application/MonitoredClass.java b/tools/benchmark/src/main/java/moobench/application/MonitoredClass.java
similarity index 100%
rename from benchmark/src/main/java/moobench/application/MonitoredClass.java
rename to tools/benchmark/src/main/java/moobench/application/MonitoredClass.java
diff --git a/benchmark/src/main/java/moobench/application/MonitoredClassSimple.java b/tools/benchmark/src/main/java/moobench/application/MonitoredClassSimple.java
similarity index 100%
rename from benchmark/src/main/java/moobench/application/MonitoredClassSimple.java
rename to tools/benchmark/src/main/java/moobench/application/MonitoredClassSimple.java
diff --git a/benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java b/tools/benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java
similarity index 100%
rename from benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java
rename to tools/benchmark/src/main/java/moobench/application/MonitoredClassThreaded.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkMain.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkParameter.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThread.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadMilli.java
diff --git a/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java b/tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java
similarity index 100%
rename from benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java
rename to tools/benchmark/src/main/java/moobench/benchmark/BenchmarkingThreadNano.java
--
GitLab