From 47433f7099bd0a62fc558ec42bc72a369b936bde Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Wed, 22 Jun 2022 15:53:21 +0200
Subject: [PATCH] Unified RESULTS_DIR and BIN_DIR
---
analysis/getExponential.sh | 0
analysis/getFileAverages.sh | 0
bin/2012-msept/run-benchmark-cycle-async.sh | 2 +-
bin/2012-msept/run-benchmark-cycle-sync.sh | 2 +-
bin/2012-msept/run-benchmark-recursive-jmx.sh | 2 +-
.../run-benchmark-recursive-linear.sh | 2 +-
bin/2012-msept/run-benchmark-recursive.sh | 2 +-
bin/2014-icpe/benchmark-disk-writer-slow.sh | 104 +++++++++---------
bin/2014-icpe/benchmark-tcp-ffi.sh | 98 ++++++++---------
bin/2014-icpe/benchmark-tcp-kieker.sh | 96 ++++++++--------
.../executeRemoteMicroBenchmark.sh | 0
.../rerun-benchmark.sh | 0
frameworks/Kieker/benchmark.sh | 0
frameworks/Kieker/run-benchmark.sh | 4 +-
frameworks/Kieker/runExponentialSizes.sh | 0
frameworks/OpenTelemetry/benchmark.sh | 0
.../OpenTelemetry/runExponentialSizes.sh | 0
frameworks/SPASSmeter/benchmark-causes.sh | 66 +++++------
frameworks/SPASSmeter/benchmark-tcp.sh | 60 +++++-----
frameworks/SPASSmeter/benchmark.sh | 60 +++++-----
frameworks/inspectIT/benchmark.sh | 0
frameworks/inspectIT/runExponentialSizes.sh | 0
frameworks/runAll.sh | 0
frameworks/runR.sh | 0
.../getConfidenceIntervalTable.sh | 0
25 files changed, 249 insertions(+), 249 deletions(-)
mode change 100755 => 100644 analysis/getExponential.sh
mode change 100755 => 100644 analysis/getFileAverages.sh
mode change 100755 => 100644 frameworks/Kieker/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
mode change 100755 => 100644 frameworks/Kieker/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
mode change 100755 => 100644 frameworks/Kieker/benchmark.sh
mode change 100755 => 100644 frameworks/Kieker/run-benchmark.sh
mode change 100755 => 100644 frameworks/Kieker/runExponentialSizes.sh
mode change 100755 => 100644 frameworks/OpenTelemetry/benchmark.sh
mode change 100755 => 100644 frameworks/OpenTelemetry/runExponentialSizes.sh
mode change 100755 => 100644 frameworks/SPASSmeter/benchmark.sh
mode change 100755 => 100644 frameworks/inspectIT/benchmark.sh
mode change 100755 => 100644 frameworks/inspectIT/runExponentialSizes.sh
mode change 100755 => 100644 frameworks/runAll.sh
mode change 100755 => 100644 frameworks/runR.sh
mode change 100755 => 100644 tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh
diff --git a/analysis/getExponential.sh b/analysis/getExponential.sh
old mode 100755
new mode 100644
diff --git a/analysis/getFileAverages.sh b/analysis/getFileAverages.sh
old mode 100755
new mode 100644
diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh
index 8a549a5..a750faa 100644
--- a/bin/2012-msept/run-benchmark-cycle-async.sh
+++ b/bin/2012-msept/run-benchmark-cycle-async.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-BINDIR=bin/
+BIN_DIR=bin/
BASEDIR=
# determine correct classpath separator
diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh
index 1300113..0d119de 100644
--- a/bin/2012-msept/run-benchmark-cycle-sync.sh
+++ b/bin/2012-msept/run-benchmark-cycle-sync.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-BINDIR=bin/
+BIN_DIR=bin/
BASEDIR=
# determine correct classpath separator
diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh
index 3ec8a17..c46370e 100644
--- a/bin/2012-msept/run-benchmark-recursive-jmx.sh
+++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh
@@ -5,7 +5,7 @@ SUDOCMD=""
#BINDJAVA="${SUDOCMD} psrset -e 1"
BINDJAVA=""
-BINDIR=bin/
+BIN_DIR=bin/
BASEDIR=
SLEEPTIME=30 ## 30
diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh
index f671c8f..24c4c48 100644
--- a/bin/2012-msept/run-benchmark-recursive-linear.sh
+++ b/bin/2012-msept/run-benchmark-recursive-linear.sh
@@ -5,7 +5,7 @@ SUDOCMD=""
#BINDJAVA="${SUDOCMD} psrset -e 1"
BINDJAVA=""
-BINDIR=bin/
+BIN_DIR=bin/
BASEDIR=
SLEEPTIME=30 ## 30
diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh
index 53754ff..dda529e 100644
--- a/bin/2012-msept/run-benchmark-recursive.sh
+++ b/bin/2012-msept/run-benchmark-recursive.sh
@@ -5,7 +5,7 @@ SUDOCMD=""
#BINDJAVA="${SUDOCMD} psrset -e 1"
BINDJAVA=""
-BINDIR=bin/
+BIN_DIR=bin/
BASEDIR=
SLEEPTIME=30 ## 30
diff --git a/bin/2014-icpe/benchmark-disk-writer-slow.sh b/bin/2014-icpe/benchmark-disk-writer-slow.sh
index a325038..498df6f 100644
--- a/bin/2014-icpe/benchmark-disk-writer-slow.sh
+++ b/bin/2014-icpe/benchmark-disk-writer-slow.sh
@@ -20,14 +20,14 @@ TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEP
echo "Experiment will take circa ${TIME} seconds."
echo "Removing and recreating '$RESULTSDIR'"
-(rm -rf ${RESULT_DIR}/) && mkdir ${RESULT_DIR}/
-mkdir ${RESULT_DIR}/stat/
+(rm -rf ${RESULTS_DIR}/) && mkdir ${RESULTS_DIR}/
+mkdir ${RESULTS_DIR}/stat/
# Clear kieker.log and initialize logging
rm -f ${BASE_DIR}/kieker.log
touch ${BASE_DIR}/kieker.log
-RAWFN="${RESULT_DIR}/raw"
+RAWFN="${RESULTS_DIR}/raw"
JAVA_ARGS="-server"
JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -47,18 +47,18 @@ JAVA_ARGS_KIEKER_LOGGING2="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.mo
JAVA_ARGS_KIEKER_LOGGING3="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASE_DIR}/tmp -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.QueueFullBehavior=0"
## Write configuration
-uname -a >${RESULT_DIR}/configuration.txt
-${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULT_DIR}/configuration.txt"
-echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "Runtime: circa ${TIME} seconds" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULT_DIR}/configuration.txt"
-echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULT_DIR}/configuration.txt"
-echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "THREADS=${THREADS}" >> "${RESULT_DIR}/configuration.txt"
-echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULT_DIR}/configuration.txt"
+uname -a >${RESULTS_DIR}/configuration.txt
+${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULTS_DIR}/configuration.txt"
+echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
sync
## Execute Benchmark
@@ -72,9 +72,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No instrumentation"
echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--totalcalls ${TOTAL_CALLS} \
@@ -85,7 +85,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -95,9 +95,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Deactivated probe"
echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -108,7 +108,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -118,9 +118,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No logging (null writer)"
echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -131,7 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -141,9 +141,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Logging 1"
echo " # ${i}.${j}.${k} Logging 1" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_LOGGING1} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -155,7 +155,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %vmstat
kill %iostat
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -165,9 +165,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Logging 2"
echo " # ${i}.${j}.${k} Logging 2" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_LOGGING2} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -179,7 +179,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %vmstat
kill %iostat
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -189,9 +189,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Logging 3"
echo " # ${i}.${j}.${k} Logging 3" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_LOGGING3} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -203,24 +203,24 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %vmstat
kill %iostat
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
sleep ${SLEEP_TIME}
done
-zip -jqr ${RESULT_DIR}/stat.zip ${RESULT_DIR}/stat
-rm -rf ${RESULT_DIR}/stat/
-mv ${BASE_DIR}/kieker.log ${RESULT_DIR}/kieker.log
-[ -f ${RESULT_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULT_DIR}/hotspot-*.log >${RESULT_DIR}/log.log
-[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULT_DIR}/
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
## Generate Results file
# Timeseries
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -233,7 +233,7 @@ EOF
# Timeseries-Average
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -246,7 +246,7 @@ EOF
# Throughput
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -257,7 +257,7 @@ EOF
# Throughput-Average
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -268,8 +268,8 @@ EOF
# Bars
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-bars.pdf"
-outtxt_fn="${RESULT_DIR}/results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
@@ -281,8 +281,8 @@ source("${R_SCRIPT_DIR}bar.r")
EOF
## Clean up raw results
-zip -jqr ${RESULT_DIR}/results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
rm -f ${RAWFN}*
-[ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out ${RESULT_DIR}
+[ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out ${RESULTS_DIR}
# end
diff --git a/bin/2014-icpe/benchmark-tcp-ffi.sh b/bin/2014-icpe/benchmark-tcp-ffi.sh
index ea94268..7c9cd1e 100644
--- a/bin/2014-icpe/benchmark-tcp-ffi.sh
+++ b/bin/2014-icpe/benchmark-tcp-ffi.sh
@@ -4,7 +4,7 @@ JAVA_BIN="/localhome/ffi/jdk1.7.0_25/bin/java"
R_SCRIPT_DIR=bin/icpe/r
BASE_DIR=.
-RESULT_DIR="${BASE_DIR}/tmp/results-benchmark-tcp-ffi/"
+RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-tcp-ffi/"
SLEEP_TIME=30 ## 30
NUM_LOOPS=10 ## 10
@@ -20,10 +20,10 @@ TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEP
echo "Experiment will take circa ${TIME} seconds."
echo "Removing and recreating '$RESULTSDIR'"
-(rm -rf "${RESULT_DIR}") && mkdir "${RESULT_DIR}"
-mkdir "${RESULT_DIR}/stat"
+(rm -rf "${RESULTS_DIR}") && mkdir "${RESULTS_DIR}"
+mkdir "${RESULTS_DIR}/stat"
-RAWFN="${RESULT_DIR}/raw"
+RAWFN="${RESULTS_DIR}/raw"
JAVA_ARGS="-server"
JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -41,18 +41,18 @@ JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
## Write configuration
-uname -a >${RESULT_DIR}/configuration.txt
-${JAVA_BIN} ${JAVA_ARGS} -version 2 >> "${RESULT_DIR}/configuration.txt"
-echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "Runtime: circa ${TIME} seconds" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULT_DIR}/configuration.txt"
-echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULT_DIR}/configuration.txt"
-echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "THREADS=${THREADS}" >> "${RESULT_DIR}/configuration.txt"
-echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULT_DIR}/configuration.txt"
+uname -a >${RESULTS_DIR}/configuration.txt
+${JAVA_BIN} ${JAVA_ARGS} -version 2 >> "${RESULTS_DIR}/configuration.txt"
+echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
sync
## Execute Benchmark
@@ -65,9 +65,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
# No instrumentation
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No instrumentation"
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -78,17 +78,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
sync
sleep ${SLEEP_TIME}
# Deactivated Probe
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Deactivated Probe"
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
- ${JAVA_BIN} -jar dist/explorviz_worker.jar >${RESULT_DIR}/worker-${i}-${j}-${k}.log &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ ${JAVA_BIN} -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
sleep 5
${JAVA_BIN} ${JAVA_ARGS_LTW} ${JARDeactived} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -102,17 +102,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %iostat
pkill -f 'java -jar'
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
sync
sleep ${SLEEP_TIME}
# Collecting
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Collecting"
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
- ${JAVA_BIN} -jar dist/explorviz_worker.jar >${RESULT_DIR}/worker-${i}-${j}-${k}.log &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ ${JAVA_BIN} -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
sleep 5
${JAVA_BIN} ${JAVA_ARGS_LTW} ${JARCollecting} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -126,17 +126,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %iostat
pkill -f 'java -jar'
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
sync
sleep ${SLEEP_TIME}
# Logging
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Logging"
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
- ${JAVA_BIN} -jar dist/explorviz_worker.jar >${RESULT_DIR}/worker-${i}-${j}-${k}.log &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ ${JAVA_BIN} -jar dist/explorviz_worker.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
sleep 5
${JAVA_BIN} ${JAVA_ARGS_LTW} ${JARNORMAL} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -150,21 +150,21 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %iostat
pkill -f 'java -jar'
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
sync
sleep ${SLEEP_TIME}
done
-zip -jqr ${RESULT_DIR}/stat.zip ${RESULT_DIR}/stat
-rm -rf ${RESULT_DIR}/stat/
-[ -f ${RESULT_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULT_DIR}/hotspot-*.log >${RESULT_DIR}/log.log
-[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULT_DIR}/
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
## Generate Results file
# Timeseries
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -177,7 +177,7 @@ EOF
# Timeseries-Average
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -190,7 +190,7 @@ EOF
# Throughput
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -201,7 +201,7 @@ EOF
# Throughput-Average
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -212,8 +212,8 @@ EOF
# Bars
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-bars.pdf"
-outtxt_fn="${RESULT_DIR}/results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -225,8 +225,8 @@ source("${R_SCRIPT_DIR}bar.r")
EOF
## Clean up raw results
-zip -jqr ${RESULT_DIR}/results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
rm -f ${RAWFN}*
-zip -jqr ${RESULT_DIR}/worker.zip ${RESULT_DIR}/worker*.log
-rm -f ${RESULT_DIR}/worker*.log
-[ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out ${RESULT_DIR}/
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
+[ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out ${RESULTS_DIR}/
diff --git a/bin/2014-icpe/benchmark-tcp-kieker.sh b/bin/2014-icpe/benchmark-tcp-kieker.sh
index 7805e38..bac06d9 100644
--- a/bin/2014-icpe/benchmark-tcp-kieker.sh
+++ b/bin/2014-icpe/benchmark-tcp-kieker.sh
@@ -19,15 +19,15 @@ MORE_PARAMS=""
TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
echo "Experiment will take circa ${TIME} seconds."
-echo "Removing and recreating '${RESULT_DIR}'"
-(rm -rf "${RESULT_DIR}") && "mkdir ${RESULT_DIR}"
-mkdir -p "${RESULT_DIR}/stat"
+echo "Removing and recreating '${RESULTS_DIR}'"
+(rm -rf "${RESULTS_DIR}") && "mkdir ${RESULTS_DIR}"
+mkdir -p "${RESULTS_DIR}/stat"
# Clear kieker.log and initialize logging
rm -f ${BASE_DIR}/kieker.log
touch ${BASE_DIR}/kieker.log
-RAWFN="${RESULT_DIR}/raw"
+RAWFN="${RESULTS_DIR}/raw"
JAVA_ARGS="-server"
JAVA_ARGS="${JAVA_ARGS} -d64"
@@ -45,18 +45,18 @@ JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.m
JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueSize=100000 -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1"
## Write configuration
-uname -a >${RESULT_DIR}/configuration.txt
-${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULT_DIR}/configuration.txt"
-echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "Runtime: circa ${TIME} seconds" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULT_DIR}/configuration.txt"
-echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULT_DIR}/configuration.txt"
-echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "THREADS=${THREADS}" >> "${RESULT_DIR}/configuration.txt"
-echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULT_DIR}/configuration.txt"
+uname -a >${RESULTS_DIR}/configuration.txt
+${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULTS_DIR}/configuration.txt"
+echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
sync
## Execute Benchmark
@@ -70,9 +70,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No instrumentation"
echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--totalcalls ${TOTAL_CALLS} \
@@ -83,7 +83,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -93,9 +93,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Deactivated probe"
echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -106,7 +106,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
@@ -116,9 +116,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No logging (null writer)"
echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}/kieker.log
- mpstat 1 > ${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ mpstat 1 > ${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
${JAVA_BIN} ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -129,7 +129,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %mpstat
kill %vmstat
kill %iostat
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >> "${BASE_DIR}/kieker.log"
echo >> "${BASE_DIR}/kieker.log"
sync
@@ -139,10 +139,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} Logging"
echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}/kieker.log
- mpstat 1 > "${RESULT_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
- vmstat 1 > ${RESULT_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
- iostat -xn 10 > ${RESULT_DIR}/stat/iostat-${i}-${j}-${k}.txt &
- ${JAVA_BIN} -jar dist/KiekerTCPReader.jar >${RESULT_DIR}/worker-${i}-${j}-${k}.log &
+ mpstat 1 > "${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+ vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
+ iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
+ ${JAVA_BIN} -jar dist/KiekerTCPReader.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
sleep 5
${JAVA_BIN} ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -156,24 +156,24 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
kill %iostat
pkill -f 'java -jar'
rm -rf ${BASE_DIR}/tmp/kieker-*
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/kieker.log
echo >>${BASE_DIR}/kieker.log
sync
sleep ${SLEEP_TIME}
done
-zip -jqr ${RESULT_DIR}/stat.zip ${RESULT_DIR}/stat
-rm -rf ${RESULT_DIR}/stat/
-mv ${BASE_DIR}/kieker.log ${RESULT_DIR}/kieker.log
-[ -f ${RESULT_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULT_DIR}/hotspot-*.log >${RESULT_DIR}/log.log
-[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULT_DIR}/
+zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
## Generate Results file
# Timeseries
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-timeseries.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -186,7 +186,7 @@ EOF
# Timeseries-Average
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-timeseries-average.pdf"
+output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -199,7 +199,7 @@ EOF
# Throughput
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-throughput.pdf"
+output_fn="${RESULTS_DIR}/results-throughput.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -210,7 +210,7 @@ EOF
# Throughput-Average
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-throughput-average.pdf"
+output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -221,8 +221,8 @@ EOF
# Bars
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
-output_fn="${RESULT_DIR}/results-bars.pdf"
-outtxt_fn="${RESULT_DIR}/results-text.txt"
+output_fn="${RESULTS_DIR}/results-bars.pdf"
+outtxt_fn="${RESULTS_DIR}/results-text.txt"
configs.loop=${NUM_LOOPS}
configs.recursion=c(${RECURSION_DEPTH})
configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer")
@@ -234,10 +234,10 @@ source("${RSCRIPTDIR}bar.r")
EOF
## Clean up raw results
-zip -jqr ${RESULT_DIR}/results.zip ${RAWFN}*
+zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
rm -f ${RAWFN}*
-zip -jqr ${RESULT_DIR}/worker.zip ${RESULT_DIR}/worker*.log
-rm -f ${RESULT_DIR}/worker*.log
-[ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out "${RESULT_DIR}"
+zip -jqr ${RESULTS_DIR}/worker.zip ${RESULTS_DIR}/worker*.log
+rm -f ${RESULTS_DIR}/worker*.log
+[ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out "${RESULTS_DIR}"
# end
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh b/frameworks/Kieker/OverheadEvaluationMicrobenchmark/executeRemoteMicroBenchmark.sh
old mode 100755
new mode 100644
diff --git a/frameworks/Kieker/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh b/frameworks/Kieker/OverheadEvaluationMicrobenchmark/rerun-benchmark.sh
old mode 100755
new mode 100644
diff --git a/frameworks/Kieker/benchmark.sh b/frameworks/Kieker/benchmark.sh
old mode 100755
new mode 100644
diff --git a/frameworks/Kieker/run-benchmark.sh b/frameworks/Kieker/run-benchmark.sh
old mode 100755
new mode 100644
index cb3aaf1..5090d91
--- a/frameworks/Kieker/run-benchmark.sh
+++ b/frameworks/Kieker/run-benchmark.sh
@@ -24,7 +24,7 @@ fi
## setup
-export RESULT_FILE="${RESULT_DIR}/results-text.csv"
+export RESULT_FILE="${RESULTS_DIR}/results-text.csv"
COLLECTED_DATA_FILE="${BASE_DIR}/results.csv"
BENCHMARK="${BASE_DIR}/benchmark.sh"
@@ -40,7 +40,7 @@ tar -xvpf ${BASE_DIR}/../../../tools/receiver/build/distributions/receiver.tar
tar -xvpf ${BASE_DIR}/../../../tools/compile-results/build/distributions/compile-results.tar
# Create benchmark results
-mkdir -p ${RESULT_DIR}
+mkdir -p ${RESULTS_DIR}
rm -f ${COLLECTED_DATA_FILE}
diff --git a/frameworks/Kieker/runExponentialSizes.sh b/frameworks/Kieker/runExponentialSizes.sh
old mode 100755
new mode 100644
diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh
old mode 100755
new mode 100644
diff --git a/frameworks/OpenTelemetry/runExponentialSizes.sh b/frameworks/OpenTelemetry/runExponentialSizes.sh
old mode 100755
new mode 100644
diff --git a/frameworks/SPASSmeter/benchmark-causes.sh b/frameworks/SPASSmeter/benchmark-causes.sh
index fdc1e03..e2efe8d 100644
--- a/frameworks/SPASSmeter/benchmark-causes.sh
+++ b/frameworks/SPASSmeter/benchmark-causes.sh
@@ -5,7 +5,7 @@ JAVA_BIN=""
RSCRIPT_DIR=r
BASE_DIR=.
-RESULT_DIR="${BASE_DIR}/tmp/results-spassmeter"
+RESULTS_DIR="${BASE_DIR}/tmp/results-spassmeter"
## TODO this should be moved to a config file
SLEEP_TIME=30 ## 30
@@ -21,9 +21,9 @@ MORE_PARAMS="--application mooBench.monitoredApplication.MonitoredClassSimple ${
TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
echo "Experiment will take circa ${TIME} seconds."
-echo "Removing and recreating '${RESULT_DIR}'"
-(rm -rf "${RESULT_DIR}") && mkdir -p "${RESULT_DIR}"
-#mkdir ${RESULT_DIR}/stat
+echo "Removing and recreating '${RESULTS_DIR}'"
+(rm -rf "${RESULTS_DIR}") && mkdir -p "${RESULTS_DIR}"
+#mkdir ${RESULTS_DIR}/stat
# Clear spassmeter.log and initialize logging
rm -f "${BASE_DIR}/spassmeter.log"
@@ -41,23 +41,23 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
JAR="-jar MooBench.jar"
JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/lib/linux/spass-meter-ia.jar=xmlconfig=${BASE_DIR}/lib/config.xml,out=${RESULT_DIR}/spassmeter.txt,tcp=localhost:6002"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/lib/linux/spass-meter-ia.jar=xmlconfig=${BASE_DIR}/lib/config.xml,out=${RESULTS_DIR}/spassmeter.txt,tcp=localhost:6002"
SERVER="-server -d64 -Xms1G -Xmx4G -classpath ${BASE_DIR}/lib/linux/spass-meter-ant.jar de.uni_hildesheim.sse.monitoring.runtime.recordingServer.TCPRecordingServer baseDir=. port=6002"
## Write configuration
-uname -a > "${RESULT_DIR}/configuration.txt"
-${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULT_DIR}/configuration.txt"
-echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "Runtime: circa ${TIME} seconds" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "SLEEPTIME=${SLEEP_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULT_DIR}/configuration.txt"
-echo "TOTALCALLS=${TOTAL_CALLS}" >> "${RESULT_DIR}/configuration.txt"
-echo "METHODTIME=${METHOD_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "THREADS=${THREADS}" >> "${RESULT_DIR}/configuration.txt"
-echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULT_DIR}/configuration.txt"
+uname -a > "${RESULTS_DIR}/configuration.txt"
+${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULTS_DIR}/configuration.txt"
+echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "SLEEPTIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTALCALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "METHODTIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
sync
## Execute Benchmark
@@ -71,7 +71,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No instrumentation"
echo " # ${i}.${j}.${k} No instrumentation" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--totalcalls ${TOTAL_CALLS} \
@@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursiondepth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULT_DIR}/hotspot-${i}-${j}-${k}.log"
+ [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log"
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
@@ -90,7 +90,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter Javassist Instrumentation"
echo " # ${i}.${j}.${k} SPASSmeter Javassist Instrumentation" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${SERVER} 1>>server.out 2>&1 &
${JAVA_BIN} ${JAVA_ARGS_LTW},mainDefault=NONE -DSpassmeterNoWriter=true ${JAR} -f \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -101,7 +101,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
${MORE_PARAMS}
kill -9 $!
#kill %sar
- [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULT_DIR}/hotspot-${i}-${j}-${k}.log"
+ [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log"
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
@@ -111,7 +111,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter Javassist Collecting"
echo " # ${i}.${j}.${k} SPASSmeter Javassist Collecting" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${SERVER} 1>>server.out 2>&1 &
${JAVA_BIN} ${JAVA_ARGS_LTW} -DSpassmeterNoWriter=true ${JAR} -f \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -122,7 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
${MORE_PARAMS}
kill -9 $!
#kill %sar
- [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULT_DIR}/hotspot-${i}-${j}-${k}.log"
+ [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log"
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
@@ -132,7 +132,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter Javassist Writing"
echo " # ${i}.${j}.${k} SPASSmeter Javassist Writing" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${SERVER} 1>>server.out 2>&1 &
${JAVA_BIN} ${JAVA_ARGS_LTW} -DSpassmeterNoWriter=fals ${JAR} -f \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -143,7 +143,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
${MORE_PARAMS}
kill -9 $!
#kill %sar
- [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULT_DIR}/hotspot-${i}-${j}-${k}.log"
+ [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log"
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
@@ -151,17 +151,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
done
-#zip -jqr ${RESULT_DIR}/stat.zip ${RESULT_DIR}/stat
-#rm -rf ${RESULT_DIR}/stat/
-mv "${BASE_DIR}/spassmeter.log" "${RESULT_DIR}/spassmeter.log"
-[ -f "${RESULT_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log" ] && grep "<task " ${RESULT_DIR}/hotspot-*.log > "${RESULT_DIR}/log.log"
-[ -f "${BASE_DIR}/errorlog.txt" ] && mv "${BASE_DIR}/errorlog.txt" "${RESULT_DIR}/"
+#zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+#rm -rf ${RESULTS_DIR}/stat/
+mv "${BASE_DIR}/spassmeter.log" "${RESULTS_DIR}/spassmeter.log"
+[ -f "${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log" ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log > "${RESULTS_DIR}/log.log"
+[ -f "${BASE_DIR}/errorlog.txt" ] && mv "${BASE_DIR}/errorlog.txt" "${RESULTS_DIR}/"
## Clean up raw results
-#gzip -qr "${RESULT_DIR}/results.zip" ${RAWFN}*
+#gzip -qr "${RESULTS_DIR}/results.zip" ${RAWFN}*
#rm -f ${RAWFN}*
-[ -f "${BASE_DIR}/nohup.out" ] && cp "${BASE_DIR}/nohup.out" "${RESULT_DIR}/"
-[ -f "${BASE_DIR}/server.out" ] && mv "${BASE_DIR}/server.out" "${RESULT_DIR}/"
+[ -f "${BASE_DIR}/nohup.out" ] && cp "${BASE_DIR}/nohup.out" "${RESULTS_DIR}/"
+[ -f "${BASE_DIR}/server.out" ] && mv "${BASE_DIR}/server.out" "${RESULTS_DIR}/"
[ -f "${BASE_DIR}/nohup.out" ] && > "${BASE_DIR}/nohup.out"
# end
diff --git a/frameworks/SPASSmeter/benchmark-tcp.sh b/frameworks/SPASSmeter/benchmark-tcp.sh
index 1804126..e475e40 100644
--- a/frameworks/SPASSmeter/benchmark-tcp.sh
+++ b/frameworks/SPASSmeter/benchmark-tcp.sh
@@ -21,14 +21,14 @@ TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPT
echo "Experiment will take circa ${TIME} seconds."
echo "Removing and recreating '$RESULTSDIR'"
-(rm -rf ${RESULT_DIR}/) && mkdir ${RESULT_DIR}/
-#mkdir ${RESULT_DIR}/stat/
+(rm -rf ${RESULTS_DIR}/) && mkdir ${RESULTS_DIR}/
+#mkdir ${RESULTS_DIR}/stat/
# Clear spassmeter.log and initialize logging
rm -f ${BASE_DIR}/spassmeter.log
touch ${BASE_DIR}/spassmeter.log
-RAWFN="${RESULT_DIR}/raw"
+RAWFN="${RESULTS_DIR}/raw"
JAVAARGS="-server"
JAVAARGS="${JAVAARGS} -d64"
@@ -40,24 +40,24 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
JAR="-jar MooBench.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
-JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASE_DIR}/lib/linux/spass-meter-ia.jar=xmlconfig=${BASE_DIR}/lib/config.xml,out=${RESULT_DIR}/spassmeter.txt,tcp=localhost:6002"
+JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASE_DIR}/lib/linux/spass-meter-ia.jar=xmlconfig=${BASE_DIR}/lib/config.xml,out=${RESULTS_DIR}/spassmeter.txt,tcp=localhost:6002"
JAVAARGS_LTW_ASM="${JAVAARGS_LTW} -Dspass-meter.iFactory=de.uni_hildesheim.sse.monitoring.runtime.instrumentation.asmTree.Factory"
SERVER="${JAVAARGS} -classpath ${BASE_DIR}/lib/linux/spass-meter-ant.jar de.uni_hildesheim.sse.monitoring.runtime.recordingServer.TCPRecordingServer baseDir=. port=6002"
## Write configuration
-uname -a >${RESULT_DIR}/configuration.txt
-${JAVA_BIN} ${JAVAARGS} -version 2>>${RESULT_DIR}/configuration.txt
-echo "JAVAARGS: ${JAVAARGS}" >>${RESULT_DIR}/configuration.txt
-echo "" >>${RESULT_DIR}/configuration.txt
-echo "Runtime: circa ${TIME} seconds" >>${RESULT_DIR}/configuration.txt
-echo "" >>${RESULT_DIR}/configuration.txt
-echo "SLEEPTIME=${SLEEP_TIME}" >>${RESULT_DIR}/configuration.txt
-echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULT_DIR}/configuration.txt
-echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULT_DIR}/configuration.txt
-echo "METHOD_TIME=${METHOD_TIME}" >>${RESULT_DIR}/configuration.txt
-echo "THREADS=${THREADS}" >>${RESULT_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULT_DIR}/configuration.txt
+uname -a >${RESULTS_DIR}/configuration.txt
+${JAVA_BIN} ${JAVAARGS} -version 2>>${RESULTS_DIR}/configuration.txt
+echo "JAVAARGS: ${JAVAARGS}" >>${RESULTS_DIR}/configuration.txt
+echo "" >>${RESULTS_DIR}/configuration.txt
+echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}/configuration.txt
+echo "" >>${RESULTS_DIR}/configuration.txt
+echo "SLEEPTIME=${SLEEP_TIME}" >>${RESULTS_DIR}/configuration.txt
+echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
+echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
+echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
sync
## Execute Benchmark
@@ -71,7 +71,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No instrumentation"
echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}/spassmeter.log
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${JAVAARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--totalcalls ${TOTAL_CALLS} \
@@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursiondepth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/spassmeter.log
echo >>${BASE_DIR}/spassmeter.log
sync
@@ -90,7 +90,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter Javassist"
echo " # ${i}.${j}.${k} SPASSmeter Javassist" >>${BASE_DIR}/spassmeter.log
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${SERVER} 1>>server.out 2>&1 &
${JAVA_BIN} ${JAVAARGS_LTW} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -100,7 +100,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursiondepth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/spassmeter.log
echo >>${BASE_DIR}/spassmeter.log
sync
@@ -110,7 +110,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter ASM"
echo " # ${i}.${j}.${k} SPASSmeter ASM" >>${BASE_DIR}/spassmeter.log
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${SERVER} 1>>server.out 2>&1 &
${JAVA_BIN} ${JAVAARGS_LTW_ASM} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -120,22 +120,22 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursiondepth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >>${BASE_DIR}/spassmeter.log
echo >>${BASE_DIR}/spassmeter.log
sync
sleep ${SLEEP_TIME}
done
-#zip -jqr ${RESULT_DIR}/stat.zip ${RESULT_DIR}/stat
-#rm -rf ${RESULT_DIR}/stat/
-mv ${BASE_DIR}/spassmeter.log ${RESULT_DIR}/spassmeter.log
-[ -f ${RESULT_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULT_DIR}/hotspot-*.log >${RESULT_DIR}/log.log
-[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULT_DIR}/
+#zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+#rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}/spassmeter.log ${RESULTS_DIR}/spassmeter.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
## Clean up raw results
-#gzip -qr ${RESULT_DIR}/results.zip ${RAWFN}*
+#gzip -qr ${RESULTS_DIR}/results.zip ${RAWFN}*
#rm -f ${RAWFN}*
-[ -f ${BASE_DIR}/nohup.out ] && cp ${BASE_DIR}/nohup.out ${RESULT_DIR}/
-[ -f ${BASE_DIR}/server.out ] && mv ${BASE_DIR}/server.out ${RESULT_DIR}/
+[ -f ${BASE_DIR}/nohup.out ] && cp ${BASE_DIR}/nohup.out ${RESULTS_DIR}/
+[ -f ${BASE_DIR}/server.out ] && mv ${BASE_DIR}/server.out ${RESULTS_DIR}/
[ -f ${BASE_DIR}/nohup.out ] && > ${BASE_DIR}/nohup.out
diff --git a/frameworks/SPASSmeter/benchmark.sh b/frameworks/SPASSmeter/benchmark.sh
old mode 100755
new mode 100644
index 148896e..3d0a3df
--- a/frameworks/SPASSmeter/benchmark.sh
+++ b/frameworks/SPASSmeter/benchmark.sh
@@ -5,7 +5,7 @@ JAVA_BIN=""
RSCRIPT_DIR=r
BASE_DIR=.
-RESULT_DIR="${BASE_DIR}/tmp/results-spassmeter"
+RESULTS_DIR="${BASE_DIR}/tmp/results-spassmeter"
## TODO this should be moved to a config file
SLEEP_TIME=30 ## 30
@@ -21,9 +21,9 @@ MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MORE_PARA
TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
echo "Experiment will take circa ${TIME} seconds."
-echo "Removing and recreating '${RESULT_DIR}'"
-(rm -rf "${RESULT_DIR}") && mkdir -p "${RESULT_DIR}"
-#mkdir ${RESULT_DIR}/stat
+echo "Removing and recreating '${RESULTS_DIR}'"
+(rm -rf "${RESULTS_DIR}") && mkdir -p "${RESULTS_DIR}"
+#mkdir ${RESULTS_DIR}/stat
# Clear spassmeter.log and initialize logging
rm -f "${BASE_DIR}/spassmeter.log"
@@ -41,23 +41,23 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
JAR="-jar MooBench.jar"
JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/lib/linux/spass-meter-ia.jar=xmlconfig=${BASE_DIR}/lib/config.xml,out=${RESULT_DIR}/spassmeter.txt"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}/lib/linux/spass-meter-ia.jar=xmlconfig=${BASE_DIR}/lib/config.xml,out=${RESULTS_DIR}/spassmeter.txt"
JAVAARGS_LTW_ASM="${JAVAARGS_LTW} -Dspass-meter.iFactory=de.uni_hildesheim.sse.monitoring.runtime.instrumentation.asmTree.Factory"
## Write configuration
-uname -a > "${RESULT_DIR}/configuration.txt"
-${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULT_DIR}/configuration.txt"
-echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "Runtime: circa ${TIME} seconds" >> "${RESULT_DIR}/configuration.txt"
-echo "" >> "${RESULT_DIR}/configuration.txt"
-echo "SLEEPTIME=${SLEEP_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULT_DIR}/configuration.txt"
-echo "TOTALCALLS=${TOTAL_CALLS}" >> "${RESULT_DIR}/configuration.txt"
-echo "METHODTIME=${METHOD_TIME}" >> "${RESULT_DIR}/configuration.txt"
-echo "THREADS=${THREADS}" >> "${RESULT_DIR}/configuration.txt"
-echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULT_DIR}/configuration.txt"
+uname -a > "${RESULTS_DIR}/configuration.txt"
+${JAVA_BIN} ${JAVA_ARGS} -version 2>> "${RESULTS_DIR}/configuration.txt"
+echo "JAVA_ARGS: ${JAVA_ARGS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
+echo "" >> "${RESULTS_DIR}/configuration.txt"
+echo "SLEEPTIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTALCALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "METHODTIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
+echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
sync
## Execute Benchmark
@@ -71,7 +71,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} No instrumentation"
echo " # ${i}.${j}.${k} No instrumentation" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursion-depth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULT_DIR}/hotspot-${i}-${j}-${k}.log"
+ [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log"
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
@@ -90,7 +90,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter Javassist"
echo " # ${i}.${j}.${k} SPASSmeter Javassist" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${JAVAARGS_LTW} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTAL_CALLS} \
@@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursion-depth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULT_DIR}/hotspot-${i}-${j}-${k}.log"
+ [ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log"
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
@@ -109,7 +109,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
k=`expr ${k} + 1`
echo " # ${i}.${j}.${k} SPASSmeter ASM"
echo " # ${i}.${j}.${k} SPASSmeter ASM" >> "${BASE_DIR}/spassmeter.log"
- #sar -o ${RESULT_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
+ #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
${JAVA_BIN} ${JAVAARGS_LTW_ASM} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
--total-calls ${TOTALCALLS} \
@@ -118,21 +118,21 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--recursion-depth ${j} \
${MORE_PARAMS}
#kill %sar
- [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULT_DIR}/hotspot-${i}-${j}-${k}.log
+ [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
echo >> "${BASE_DIR}/spassmeter.log"
echo >> "${BASE_DIR}/spassmeter.log"
sync
sleep ${SLEEPTIME}
done
-#zip -jqr ${RESULT_DIR}/stat.zip ${RESULT_DIR}/stat
-#rm -rf ${RESULT_DIR}/stat/
-mv ${BASE_DIR}/spassmeter.log ${RESULT_DIR}/spassmeter.log
-[ -f ${RESULT_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULT_DIR}/hotspot-*.log >${RESULT_DIR}/log.log
-[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULT_DIR}/
+#zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
+#rm -rf ${RESULTS_DIR}/stat/
+mv ${BASE_DIR}/spassmeter.log ${RESULTS_DIR}/spassmeter.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
## Clean up raw results
-#gzip -qr ${RESULT_DIR}/results.zip ${RAWFN}*
+#gzip -qr ${RESULTS_DIR}/results.zip ${RAWFN}*
#rm -f ${RAWFN}*
-[ -f ${BASE_DIR}/nohup.out ] && cp ${BASE_DIR}/nohup.out ${RESULT_DIR}/
+[ -f ${BASE_DIR}/nohup.out ] && cp ${BASE_DIR}/nohup.out ${RESULTS_DIR}/
[ -f ${BASE_DIR}/nohup.out ] && > ${BASE_DIR}/nohup.out
diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh
old mode 100755
new mode 100644
diff --git a/frameworks/inspectIT/runExponentialSizes.sh b/frameworks/inspectIT/runExponentialSizes.sh
old mode 100755
new mode 100644
diff --git a/frameworks/runAll.sh b/frameworks/runAll.sh
old mode 100755
new mode 100644
diff --git a/frameworks/runR.sh b/frameworks/runR.sh
old mode 100755
new mode 100644
diff --git a/tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh b/tools/getConfidenceIntervalTable/getConfidenceIntervalTable.sh
old mode 100755
new mode 100644
--
GitLab