diff --git a/frameworks/inspectIT/benchmark-isequence-inner.sh b/frameworks/inspectIT/benchmark-isequence-inner.sh
index 277ed90c80219d3aa19b0132fbe43c3f69acf843..09c3afb7116a2bbe0b2d0dee1de662863525d068 100644
--- a/frameworks/inspectIT/benchmark-isequence-inner.sh
+++ b/frameworks/inspectIT/benchmark-isequence-inner.sh
@@ -11,7 +11,7 @@ NUM_LOOPS=10 ## 10
THREADS=1 ## 1
RECURSIONDEPTH=10 ## 10
TOTALCALLS=2000000 ## 2000000
-METHODTIME=0 ## 500000
+METHODTIME=0 ## 0
#MOREPARAMS="--quickstart"
MOREPARAMS="${MOREPARAMS}"
@@ -40,11 +40,13 @@ JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
JAR="-jar OverheadEvaluationMicrobenchmark.jar"
JAVAARGS_NOINSTR="${JAVAARGS}"
-JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-agent-mod.jar -Djava.util.logging.config.file=${BASEDIR}config/logging.properties -Dinspectit.config=${BASEDIR}config/isequence/"
+JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-agent-mod.jar -Djava.util.logging.config.file=${BASEDIR}config/logging.properties -Dinspectit.config=${BASEDIR}config/isequence/"
JAVAARGS_INSPECTIT_DISABLED="${JAVAARGS_LTW} -Dinspectit.disableProbe=true"
JAVAARGS_INSPECTIT_NOSTORAGE="${JAVAARGS_LTW} -Dinspectit.disableStorage=true"
JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW}"
+CMR_ARGS="-d64 -Xms16G -Xmx16G -Xmn5G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=config/logging-config.xml"
+
## Write configuration
uname -a >${RESULTSDIR}configuration.txt
${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
@@ -91,13 +93,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (disabled)"
echo " # ${i}.${j}.${k} InspectIT (disabled)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_DISABLED} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -106,6 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
@@ -125,13 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (no storage)"
echo " # ${i}.${j}.${k} InspectIT (no storage)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_NOSTORAGE} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -140,6 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
@@ -159,13 +151,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (full)"
echo " # ${i}.${j}.${k} InspectIT (full)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_FULL} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -174,6 +160,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
diff --git a/frameworks/inspectIT/benchmark-timer-inner.sh b/frameworks/inspectIT/benchmark-timer-inner.sh
index 4ab29a1cfd22e20f7fd4fd0ab7e9172a9a251de1..3343aa363590d0a94e3d244b04498f9189e6f624 100644
--- a/frameworks/inspectIT/benchmark-timer-inner.sh
+++ b/frameworks/inspectIT/benchmark-timer-inner.sh
@@ -11,7 +11,7 @@ NUM_LOOPS=10 ## 10
THREADS=1 ## 1
RECURSIONDEPTH=10 ## 10
TOTALCALLS=2000000 ## 2000000
-METHODTIME=0 ## 500000
+METHODTIME=0 ## 0
#MOREPARAMS="--quickstart"
MOREPARAMS="${MOREPARAMS}"
@@ -45,6 +45,8 @@ JAVAARGS_INSPECTIT_DISABLED="${JAVAARGS_LTW} -Dinspectit.disableProbe=true"
JAVAARGS_INSPECTIT_NOSTORAGE="${JAVAARGS_LTW} -Dinspectit.disableStorage=true"
JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW}"
+CMR_ARGS="-d64 -Xms16G -Xmx16G -Xmn5G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=config/logging-config.xml"
+
## Write configuration
uname -a >${RESULTSDIR}configuration.txt
${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
@@ -91,13 +93,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (disabled)"
echo " # ${i}.${j}.${k} InspectIT (disabled)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_DISABLED} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -106,6 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
@@ -125,13 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (no storage)"
echo " # ${i}.${j}.${k} InspectIT (no storage)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_NOSTORAGE} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -140,6 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
@@ -159,13 +151,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (full)"
echo " # ${i}.${j}.${k} InspectIT (full)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_FULL} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -174,6 +160,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh
index 0288baff7e51cec32ca5b8755eda650ee8999b92..8707c35cbe1ec39a6a97cfdcaf06f2931e75575e 100644
--- a/frameworks/inspectIT/benchmark.sh
+++ b/frameworks/inspectIT/benchmark.sh
@@ -44,6 +44,8 @@ JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-agent.jar -Djava.
JAVAARGS_INSPECTIT_MINIMAL="${JAVAARGS_LTW} -Dinspectit.config=${BASEDIR}config/minimal/"
JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW} -Dinspectit.config=${BASEDIR}config/timer/"
+CMR_ARGS="-d64 -Xms16G -Xmx16G -Xmn5G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=config/logging-config.xml"
+
## Write configuration
uname -a >${RESULTSDIR}configuration.txt
${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
@@ -90,13 +92,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (minimal)"
echo " # ${i}.${j}.${k} InspectIT (minimal)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_MINIMAL} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -105,6 +101,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
@@ -143,13 +140,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
echo " # ${i}.${j}.${k} InspectIT (with CMR)"
echo " # ${i}.${j}.${k} InspectIT (with CMR)" >>${BASEDIR}inspectit.log
sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
- ${JAVABIN}java \
- -Xms1024m -Xmx1024m -Xmn384M -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC \
- -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC \
- -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 \
- -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError \
- -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution \
- -Xloggc:${BASEDIR}logs/gc.log -Dinspectit.logging.config=CMR/logging-config.xml -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
+ ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr.jar 1>>${BASEDIR}logs/out.log 2>&1 &
sleep 10
${JAVABIN}java ${JAVAARGS_INSPECTIT_FULL} ${JAR} \
--output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -158,6 +149,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
--totalthreads ${THREADS} \
--recursiondepth ${j} \
${MOREPARAMS}
+ sleep 10
kill $!
sleep 10
rm -rf ${BASEDIR}storage/
@@ -175,8 +167,8 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
done
zip -jqr ${RESULTSDIR}stat.zip ${RESULTSDIR}stat
rm -rf ${RESULTSDIR}stat/
-mv ${BASEDIR}inspectit.log ${RESULTSDIR}inspectit.log
mv ${BASEDIR}logs/ ${RESULTSDIR}
+mv ${BASEDIR}inspectit.log ${RESULTSDIR}inspectit.log
[ -f ${RESULTSDIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTSDIR}hotspot-*.log >${RESULTSDIR}log.log
[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTSDIR}
diff --git a/frameworks/inspectIT/config/isequence/inspectit-agent.cfg b/frameworks/inspectIT/config/isequence/inspectit-agent.cfg
index d96e88f22152743f66d5c1bc687bac6c185ba6d6..93a2115025e4c18ad72082718a4586b36b4cf6e1 100644
--- a/frameworks/inspectIT/config/isequence/inspectit-agent.cfg
+++ b/frameworks/inspectIT/config/isequence/inspectit-agent.cfg
@@ -28,13 +28,13 @@ platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ThreadInformat
## send-strategy <fully-qualified-name>
#######################################
-send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=5000
-#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=1000
+send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=1000
+#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=10000
## buffer-strategy <fully-qualified-name>
#########################################
-buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
-#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
+#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
+buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
## Ignore classes settings
#########################################
@@ -49,4 +49,4 @@ exclude-class *[]
## INSTRUMENTATION
##################
sensor isequence mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
-#sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
+#sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true
diff --git a/frameworks/inspectIT/config/logging-config.xml b/frameworks/inspectIT/config/logging-config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c507dbc21ee72b4d0702a6f7acfeb9d955c7fa7
--- /dev/null
+++ b/frameworks/inspectIT/config/logging-config.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <!-- The appenders are defined at the top -->
+
+ <!-- Console output -->
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <Target>System.out</Target>
+ <encoder>
+ <pattern>%d{ISO8601}: %-6r [%15.15t] %-5p %30.30c - %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- Statistics -->
+ <appender name="statistics" class="ch.qos.logback.core.FileAppender">
+ <file>logs/statistics.log</file>
+ <encoder>
+ <pattern>%d{ISO8601}: %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- Enriched Sysout -->
+ <!-- Rollover every day or when file reaches 20MB -->
+ <appender name="file" class="ch.qos.logback.core.FileAppender">
+ <file>logs/cmr.log</file>
+ <encoder>
+ <pattern>%d{ISO8601}: %-6r [%15.15t] %-5p %30.30c - %m%n</pattern>
+ </encoder>
+ </appender>
+
+ <!-- Exceptions -->
+ <!-- Only warn & error levels-->
+ <appender name="exceptions" class="ch.qos.logback.core.FileAppender">
+ <file>logs/exceptions.log</file>
+ <encoder>
+ <pattern>%d{ISO8601}: %-6r [%15.15t] %-5p %30.30c - %m%n</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ </appender>
+
+ <!-- Loggers are defined from down here -->
+
+ <!-- set log levels - for more verbose logging change 'info' to 'debug' -->
+ <root level="info">
+ <appender-ref ref="stdout" />
+ <appender-ref ref="file" />
+ <appender-ref ref="exceptions" />
+ </root>
+
+ <!-- deactivate all other loggers, except for errors -->
+ <logger name="org" level="error" />
+ <logger name="com" level="error" />
+ <logger name="uk" level="error" />
+
+ <!-- service logging, set this to 'debug' to get additional information about: - Number of timer objects being stored - information about the exception sensor - information about the combined metric sensor -->
+ <logger name="info.novatec.inspectit.cmr.service" level="info" />
+
+ <!-- service logging, set this to 'debug' to get additional information about: - DAOs -->
+ <logger name="info.novatec.inspectit.cmr.dao" level="info" />
+
+ <!-- RMI Exporter Logging - this logger provides the information to which ip/port the RMI services are bound -->
+ <logger name="org.springframework.remoting.rmi" level="info" />
+
+ <!-- This service logs information about the health status of the CMR. By default this is only being logged into a specific file. Set additivity to true if you want to print this information in the default
+ appender, too. -->
+ <logger name="info.novatec.inspectit.cmr.util.HealthStatus" additivity="false" level="info">
+ <appender-ref ref="statistics" />
+ </logger>
+
+ <!-- Buffer information -->
+ <logger name="info.novatec.inspectit.cmr.cache.impl.AtomicBuffer" level="info" />
+
+ <!-- Storage, set this to debug for more information about: - storage and failed storage serializations -->
+ <logger name="info.novatec.inspectit.storage" level="info" />
+ <logger name="info.novatec.inspectit.cmr.storage" level="info" />
+
+ <!-- Set this to debug for more information about: - IO write/read -->
+ <logger name="info.novatec.inspectit.storage.nio" level="info" />
+ <logger name="info.novatec.inspectit.storage.write" level="info" />
+
+ <!-- Set this to debug for more information about: - serialization -->
+ <logger name="info.novatec.inspectit.storage.serializer" level="info" />
+
+ <!-- Set this to debug for more information about: - schema loading for serialization -->
+ <logger name="info.novatec.inspectit.storage.serializer.schema" level="info" />
+
+ <!-- Disabled loggers from down here -->
+
+ <!-- hibernate logging -->
+ <!-- logger name="org.hibernate" level="info" / -->
+
+ <!-- log HQL query parser activity -->
+ <!-- logger name="org.hibernate.hql.ast.AST" level="info" / -->
+
+ <!-- log just the SQL -->
+ <!-- logger name="org.hibernate.SQL" level="info" / -->
+
+ <!-- log JDBC bind parameters -->
+ <!-- logger name="org.hibernate.type" level="info" / -->
+
+ <!-- log schema export/update -->
+ <!-- logger name="org.hibernate.tool.hbm2ddl" level="info" / -->
+
+ <!-- log HQL parse trees -->
+ <!-- logger name="org.hibernate.hql" level="debug" / -->
+
+ <!-- log cache activity -->
+ <!-- logger name="org.hibernate.cache" level="info" / -->
+
+ <!-- log transaction activity -->
+ <!-- logger name="org.hibernate.transaction" level="debug" / -->
+
+ <!-- log JDBC resource acquisition -->
+ <!-- logger name="org.hibernate.jdbc" level="debug" / -->
+
+ <!-- enable the following line if you want to track down connection leakages when using DriverManagerConnectionProvider -->
+ <!-- logger name="org.hibernate.connection.DriverManagerConnectionProvider" level="trace" / -->
+
+ <!-- Log only the info level of the c3p0 connection pooling -->
+ <!-- logger name="com.mchange" level="info" / -->
+
+</configuration>
\ No newline at end of file
diff --git a/frameworks/inspectIT/config/minimal/inspectit-agent.cfg b/frameworks/inspectIT/config/minimal/inspectit-agent.cfg
index 851b5b38e01236a505136c3f4a399e3792e0a2af..86963d2f797a142a52a199008bde36569766c615 100644
--- a/frameworks/inspectIT/config/minimal/inspectit-agent.cfg
+++ b/frameworks/inspectIT/config/minimal/inspectit-agent.cfg
@@ -28,11 +28,13 @@ platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ThreadInformat
## send-strategy <fully-qualified-name>
#######################################
-send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=5000
+send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=1000
+#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=10000
## buffer-strategy <fully-qualified-name>
#########################################
-buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
+#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
+buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
## Ignore classes settings
#########################################
@@ -46,4 +48,5 @@ exclude-class *[]
## INSTRUMENTATION
##################
+#sensor isequence mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
#sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true
diff --git a/frameworks/inspectIT/config/timer/inspectit-agent.cfg b/frameworks/inspectIT/config/timer/inspectit-agent.cfg
index faa9aa324fa0d62b80d668a4bf41ddb8be0fd186..e4fdd28f259c7cad972dccd7df780997b7999f88 100644
--- a/frameworks/inspectIT/config/timer/inspectit-agent.cfg
+++ b/frameworks/inspectIT/config/timer/inspectit-agent.cfg
@@ -46,4 +46,5 @@ exclude-class *[]
## INSTRUMENTATION
##################
+#sensor isequence mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true