Skip to content
Snippets Groups Projects
Commit 6075c17e authored by Reiner Jung's avatar Reiner Jung
Browse files

Updated moobench

parent 1ec2bdae
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,9 @@ pipeline { ...@@ -5,6 +5,9 @@ pipeline {
agent { label "build-node8" } agent { label "build-node8" }
environment { environment {
KEYSTORE = credentials('kieker-irl-key')
UPDATE_SITE_URL = "sftp://repo@repo.se.internal/var/www/html/moobench"
DOCKER_ARGS = '' DOCKER_ARGS = ''
} }
...@@ -34,7 +37,7 @@ pipeline { ...@@ -34,7 +37,7 @@ pipeline {
stage('Run Benchmark') { stage('Run Benchmark') {
steps { steps {
sh 'frameworks/Kieker/scripts/run-benchmark.sh' sh 'frameworks/Kieker/scripts/run-benchmark.sh ${KEYSTORE} ${UPDATE_SITE_URL}'
} }
post { post {
cleanup { cleanup {
......
...@@ -17,10 +17,10 @@ BATCH_MODE="yes" ...@@ -17,10 +17,10 @@ BATCH_MODE="yes"
AOP="kieker.aop.xml" AOP="kieker.aop.xml"
# execution parameter # execution parameter
SLEEP_TIME=10 ## 30 SLEEP_TIME=1 ## 30
NUM_OF_LOOPS=10 ## 10 NUM_OF_LOOPS=1 #0 ## 10
RECURSION_DEPTH=10 ## 10 RECURSION_DEPTH=1 #0 ## 10
TOTAL_NUM_OF_CALLS=20000 ## 2 000 000 TOTAL_NUM_OF_CALLS=20 #000 ## 2 000 000
METHOD_TIME=5 #00 ## 500000 METHOD_TIME=5 #00 ## 500000
# end # end
...@@ -16,7 +16,24 @@ else ...@@ -16,7 +16,24 @@ else
exit 1 exit 1
fi fi
NUM_OF_REPEATS=1 # parse parameters
if [ -f "$1" ] ; then
KEYSTORE="$1"
else
echo "Missing key"
exit 1
fi
if [ "$2" != "" ] ; then
URL="$2"
else
echo "Missing URL"
exit 1
fi
## setup
export RESULT_FILE="${BASE_DIR}/results-kieker/results-text.csv" export RESULT_FILE="${BASE_DIR}/results-kieker/results-text.csv"
COLLECTED_DATA_FILE="${BASE_DIR}/results.csv" COLLECTED_DATA_FILE="${BASE_DIR}/results.csv"
BENCHMARK="${BASE_DIR}/benchmark.sh" BENCHMARK="${BASE_DIR}/benchmark.sh"
...@@ -31,25 +48,28 @@ tar -xvpf ${BASE_DIR}/../../../benchmark/build/distributions/benchmark.tar ...@@ -31,25 +48,28 @@ tar -xvpf ${BASE_DIR}/../../../benchmark/build/distributions/benchmark.tar
curl "https://oss.sonatype.org/service/local/repositories/snapshots/content/net/kieker-monitoring/kieker/1.15-SNAPSHOT/kieker-1.15-20201102.131525-117-aspectj.jar" > "${AGENT}" curl "https://oss.sonatype.org/service/local/repositories/snapshots/content/net/kieker-monitoring/kieker/1.15-SNAPSHOT/kieker-1.15-20201102.131525-117-aspectj.jar" > "${AGENT}"
# copy receiver # copy receiver
tar -xvpf ${BASE_DIR}/../../../tools/receiver/build/distributions/receiver.tar tar -xvpf ${BASE_DIR}/../../../tools/receiver/build/distributions/receiver.tar
# copy result compiler
tar -xvpf ${BASE_DIR}/../../../tools/compile-results/build/distributions/compile-results.tar
# Create benchmark results
mkdir -p ${BASE_DIR}/results-kieker mkdir -p ${BASE_DIR}/results-kieker
rm -f ${COLLECTED_DATA_FILE} rm -f ${COLLECTED_DATA_FILE}
## run loop ## running the benchmark
for ((v=1;v<=${NUM_OF_REPEATS};v+=1)); do
echo "++++++++++++++++++++++++++"
echo "Rerun $v"
echo "++++++++++++++++++++++++++"
${BENCHMARK} # > /dev/null 2>&1 ${BENCHMARK} # > /dev/null 2>&1
HEAD=`head -1 $RESULT_FILE` HEAD=`head -1 $RESULT_FILE`
VALUE=`tail -1 $RESULT_FILE` VALUE=`tail -1 $RESULT_FILE`
if [ -f "${COLLECTED_DATA_FILE}" ] ; then
echo "$VALUE" >> ${COLLECTED_DATA_FILE} ## summary results
else
echo "$HEAD" > ${COLLECTED_DATA_FILE} ## fetch old results
echo "$VALUE" >> ${COLLECTED_DATA_FILE} sftp -i "${KEYSTORE}" "${URL}/all-results.json"
fi
done ## compile results into json
${BASE_DIR}/compile-results/bin/compile-results "${BASE_DIR}/results-kieker/results-text.csv" "${BASE_DIR}/all-results.json"
## push results
sftp -i "${KEYSTORE}" "${URL}/all-results.json" <<< $'put all-results.json'
# end # end
...@@ -11,6 +11,7 @@ rootProject.name = 'moobench' ...@@ -11,6 +11,7 @@ rootProject.name = 'moobench'
include 'benchmark' include 'benchmark'
include 'tools:receiver' include 'tools:receiver'
include 'tools:compile-results'
include 'frameworks:inspectIT' include 'frameworks:inspectIT'
include 'frameworks:Kieker' include 'frameworks:Kieker'
include 'frameworks:SPASSmeter' include 'frameworks:SPASSmeter'
......
...@@ -4,7 +4,7 @@ plugins { ...@@ -4,7 +4,7 @@ plugins {
} }
application { application {
mainClass = 'moobench.tools.receiver.RecordReceiver' mainClass = 'moobench.tools.receiver.RecordReceiverMain'
} }
dependencies { dependencies {
......
...@@ -6,12 +6,12 @@ package moobench.tools.receiver; ...@@ -6,12 +6,12 @@ package moobench.tools.receiver;
import teetime.framework.Execution; import teetime.framework.Execution;
/** /**
* @author reiner * @author Reiner Jung
* *
*/ */
public class RecordReceiver { public class RecordReceiverMain {
private RecordReceiver() {} private RecordReceiverMain() {}
public static void main(final String[] args) { public static void main(final String[] args) {
ReceiverConfiguration config = new ReceiverConfiguration(Integer.parseInt(args[0]), 8192); ReceiverConfiguration config = new ReceiverConfiguration(Integer.parseInt(args[0]), 8192);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment