From 54527b9bcf3aa5b14333d9eeb408e18f01649e36 Mon Sep 17 00:00:00 2001
From: Jan Waller <jwa@informatik.uni-kiel.de>
Date: Wed, 5 Mar 2014 13:17:52 +0100
Subject: [PATCH] fixed small bug in default Kieker script
---
.gitignore | 1 +
README | 3 +++
frameworks/Kieker/bin/benchmark.sh | 28 +++++++++++++++++++++++++++-
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 0aeb918..9119436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/build-eclipse/
/build/
/dist/
+/tmp/
diff --git a/README b/README
index 8450f12..10448f9 100644
--- a/README
+++ b/README
@@ -46,6 +46,9 @@ The top of the files include some configuration parameters, such as
Furthermore some JVM arguments can be adjusted:
* JAVAARGS JVM Arguments
+Typical call:
+$ nohup ./benchmark.sh & sleep 1;tail +0cf nohup.out
+
Experiments (outdated):
Different recursion depth (with MAXRECURSIONDEPTH=1 without recursion)
-> bin/run-benchmark-recursive.sh
diff --git a/frameworks/Kieker/bin/benchmark.sh b/frameworks/Kieker/bin/benchmark.sh
index 4830d49..22e7ec2 100644
--- a/frameworks/Kieker/bin/benchmark.sh
+++ b/frameworks/Kieker/bin/benchmark.sh
@@ -11,7 +11,7 @@ NUM_LOOPS=10 ## 10
THREADS=1 ## 1
RECURSIONDEPTH=10 ## 10
TOTALCALLS=2000000 ## 2000000
-METHODTIME=500 ## 500
+METHODTIME=500000 ## 500000
#MOREPARAMS="--quickstart"
MOREPARAMS="${MOREPARAMS} -r kieker.Logger"
@@ -151,6 +151,32 @@ mv ${BASEDIR}kieker.log ${RESULTSDIR}kieker.log
[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTSDIR}
## Generate Results file
+# Timeseries
+R --vanilla --silent <<EOF
+results_fn="${RAWFN}"
+output_fn="${RESULTSDIR}results-timeseries.pdf"
+configs.loop=${NUM_LOOPS}
+configs.recursion=c(${RECURSIONDEPTH})
+configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer")
+configs.colors=c("black","red","blue","green")
+results.count=${TOTALCALLS}
+tsconf.min=(${METHODTIME}/1000)
+tsconf.max=(${METHODTIME}/1000)+200
+source("${RSCRIPTDIR}timeseries.r")
+EOF
+# Timeseries-Average
+R --vanilla --silent <<EOF
+results_fn="${RAWFN}"
+output_fn="${RESULTSDIR}results-timeseries-average.pdf"
+configs.loop=${NUM_LOOPS}
+configs.recursion=c(${RECURSIONDEPTH})
+configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer")
+configs.colors=c("black","red","blue","green")
+results.count=${TOTALCALLS}
+tsconf.min=(${METHODTIME}/1000)
+tsconf.max=(${METHODTIME}/1000)+200
+source("${RSCRIPTDIR}timeseries-average.r")
+EOF
# Bars
R --vanilla --silent <<EOF
results_fn="${RAWFN}"
--
GitLab