From d886ba79c733a78444d40e6a484ad0c3ff03c38b Mon Sep 17 00:00:00 2001
From: Jan Waller <jwa@informatik.uni-kiel.de>
Date: Tue, 4 Mar 2014 17:11:53 +0100
Subject: [PATCH] update build structure
---
README | 8 ++++----
build.xml | 7 +++++--
.../Kieker/{ => bin}/benchmark-disk-writer-0.91-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-0.95a-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.0-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.1-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.2-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.3-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.4-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.5-event.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.5-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.6-event.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.6-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.7-event.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.7-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.8-event.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.8-oer.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.9-event.sh | 4 ++--
.../Kieker/{ => bin}/benchmark-disk-writer-1.9-oer.sh | 4 ++--
bin/Kieker.sh => frameworks/Kieker/bin/benchmark.sh | 4 ++--
frameworks/Kieker/{ => bin}/run-benchmark-all.sh | 0
tmp/.gitignore | 4 ----
22 files changed, 45 insertions(+), 46 deletions(-)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-0.91-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-0.95a-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.0-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.1-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.2-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.3-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.4-oer.sh (98%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.5-event.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.5-oer.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.6-event.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.6-oer.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.7-event.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.7-oer.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.8-event.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.8-oer.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.9-event.sh (99%)
rename frameworks/Kieker/{ => bin}/benchmark-disk-writer-1.9-oer.sh (99%)
rename bin/Kieker.sh => frameworks/Kieker/bin/benchmark.sh (98%)
rename frameworks/Kieker/{ => bin}/run-benchmark-all.sh (100%)
delete mode 100644 tmp/.gitignore
diff --git a/README b/README
index d33110a..8450f12 100644
--- a/README
+++ b/README
@@ -19,8 +19,8 @@ For instance, the target "build-kieker" prepares a jar for Kieker
benchmarking experiments.
All experiments are started with the provided "External Controller"
-scripts. These scripts are available inside the bin/ directory.
-Currently only shell (.sh) scripts are provided.
+scripts. These scripts are available inside the respective bin/
+directory. Currently only shell (.sh) scripts are provided.
The default execution of the benchmark requires a 64Bit JVM!
This can be changed in the respective .sh scripts.
@@ -46,7 +46,7 @@ The top of the files include some configuration parameters, such as
Furthermore some JVM arguments can be adjusted:
* JAVAARGS JVM Arguments
-Experiments:
+Experiments (outdated):
Different recursion depth (with MAXRECURSIONDEPTH=1 without recursion)
-> bin/run-benchmark-recursive.sh
@@ -64,6 +64,6 @@ environments and require pfexec permissions to assign subsets of cores
to the benchmarking system.
Analyzing the data:
-in the folder /bin/r-scripts are some R scripts provided to generate
+in the folder /bin/r are some R scripts provided to generate
graphs to visualize the results. In the top the files, one can configure
the required paths and the configuration used to analyze the data.
diff --git a/build.xml b/build.xml
index 0abe5e1..b1099a6 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
<mkdir dir="build" />
<mkdir dir="dist" />
<mkdir dir="dist/lib" />
- <mkdir dir="tmp" />
+ <mkdir dir="dist/tmp" />
</target>
<target name="compile" depends="init">
@@ -43,6 +43,7 @@
<path refid="compile-classpath"/>
</path>
</copy>
+ <copy file="frameworks/Kieker/bin/benchmark.sh" todir="dist" />
</target>
<target name="jar" depends="compile">
@@ -62,10 +63,12 @@
</manifest>
<zipfileset src="lib/commons-cli-1.2.jar" />
</jar>
+ <copy todir="dist/r">
+ <fileset dir="bin/r" />
+ </copy>
</target>
<target name="clean">
- <!--<delete dir="tmp"/>-->
<delete dir="build" />
<delete dir="dist" />
</target>
diff --git a/frameworks/Kieker/benchmark-disk-writer-0.91-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-0.91-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-0.91-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-0.91-oer.sh
index aabc6e6..9796acc 100644
--- a/frameworks/Kieker/benchmark-disk-writer-0.91-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-0.91-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-0.91-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-0.91_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-0.95a-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-0.95a-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-0.95a-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-0.95a-oer.sh
index 13a5a5c..fb8d0de 100644
--- a/frameworks/Kieker/benchmark-disk-writer-0.95a-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-0.95a-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-0.95a-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-0.95a_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.0-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.0-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.0-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.0-oer.sh
index 34f4ac7..4c02391 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.0-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.0-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.0-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.0_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.1-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.1-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.1-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.1-oer.sh
index b664712..756acd7 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.1-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.1-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.1-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.1_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.2-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.2-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.2-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.2-oer.sh
index c881347..f8b9294 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.2-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.2-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.2-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.2_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.3-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.3-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.3-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.3-oer.sh
index 18cab9e..e5e5feb 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.3-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.3-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.3-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.3_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.4-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.4-oer.sh
similarity index 98%
rename from frameworks/Kieker/benchmark-disk-writer-1.4-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.4-oer.sh
index 91d21d0..0474618 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.4-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.4-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.4-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.4_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.5-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.5-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.5-event.sh
index d28db41..563f83a 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.5-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-event.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.5-event/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.5_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.5-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.5-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.5-oer.sh
index b82c5fc..1a0bbdd 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.5-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.5-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.5-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.5_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.6-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.6-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.6-event.sh
index da7ead1..407b2af 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.6-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-event.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.6-event/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.6_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.6-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.6-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.6-oer.sh
index a8f1eca..d3ae283 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.6-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.6-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.6-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.6_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.7-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.7-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.7-event.sh
index 4123578..0df9a61 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.7-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-event.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.7-event/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.7_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.7-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.7-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.7-oer.sh
index 127bb9c..69782eb 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.7-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.7-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.7-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.7_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.8-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.8-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.8-event.sh
index b078a17..da27f96 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.8-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-event.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.8-event/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.8_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.8-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.8-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.8-oer.sh
index 3c4e29e..25aa206 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.8-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.8-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.8-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.8_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.9-event.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-event.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.9-event.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.9-event.sh
index e5f11a4..1e868be 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.9-event.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-event.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.9-event/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/benchmark-disk-writer-1.9-oer.sh b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-oer.sh
similarity index 99%
rename from frameworks/Kieker/benchmark-disk-writer-1.9-oer.sh
rename to frameworks/Kieker/bin/benchmark-disk-writer-1.9-oer.sh
index ea5c04b..f7972fd 100644
--- a/frameworks/Kieker/benchmark-disk-writer-1.9-oer.sh
+++ b/frameworks/Kieker/bin/benchmark-disk-writer-1.9-oer.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-benchmark-kieker-disk-1.9-oer/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.legacy.aop.xml"
diff --git a/bin/Kieker.sh b/frameworks/Kieker/bin/benchmark.sh
similarity index 98%
rename from bin/Kieker.sh
rename to frameworks/Kieker/bin/benchmark.sh
index 1702726..4830d49 100644
--- a/bin/Kieker.sh
+++ b/frameworks/Kieker/bin/benchmark.sh
@@ -2,7 +2,7 @@
JAVABIN=""
-RSCRIPTDIR=bin/r/
+RSCRIPTDIR=r/
BASEDIR=./
RESULTSDIR="${BASEDIR}tmp/results-kieker/"
@@ -36,7 +36,7 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar dist/OverheadEvaluationMicrobenchmark.jar"
+JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}lib/kieker-1.9_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
diff --git a/frameworks/Kieker/run-benchmark-all.sh b/frameworks/Kieker/bin/run-benchmark-all.sh
similarity index 100%
rename from frameworks/Kieker/run-benchmark-all.sh
rename to frameworks/Kieker/bin/run-benchmark-all.sh
diff --git a/tmp/.gitignore b/tmp/.gitignore
deleted file mode 100644
index 5e7d273..0000000
--- a/tmp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
--
GitLab