diff --git a/frameworks/SPASSmeter/Benchmark (SPASSmeter).launch b/frameworks/SPASSmeter/Benchmark (SPASSmeter).launch index 0c030ffbaff9c507fc368fd318af89bb80a265c8..af56164f88c0ffcee7fce3cf6cbb1f5c9279c1df 100644 --- a/frameworks/SPASSmeter/Benchmark (SPASSmeter).launch +++ b/frameworks/SPASSmeter/Benchmark (SPASSmeter).launch @@ -16,7 +16,7 @@ <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 1000 -o tmp/test.txt -q"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 1000 -o tmp/test.txt -q --application mooBench.monitoredApplication.MonitoredClassSimple"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/SPASSmeter/lib/win/spass-meter-ia.jar=xmlconfig=frameworks/SPASSmeter/lib/config.xml,out=tmp/program.log,logLevel=ALL,debuglog=tmp/debug.log"/> </launchConfiguration> diff --git a/frameworks/SPASSmeter/benchmark.sh b/frameworks/SPASSmeter/benchmark.sh index 1a01d558c0729b91790112351a53923e33c5d4eb..60915c20797e987cf256b83a8ddce87a58b0875e 100644 --- a/frameworks/SPASSmeter/benchmark.sh +++ b/frameworks/SPASSmeter/benchmark.sh @@ -15,7 +15,7 @@ TOTALCALLS=2000000 ## 2000000 METHODTIME=0 ## 500000 #MOREPARAMS="--quickstart" -MOREPARAMS="${MOREPARAMS}" +MOREPARAMS="--application mooBench.monitoredApplication.MonitoredClassSimple ${MOREPARAMS}" TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS} \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} ` echo "Experiment will take circa ${TIME} seconds." @@ -42,6 +42,8 @@ JAR="-jar MooBench.jar" JAVAARGS_NOINSTR="${JAVAARGS}" CLASSPATH="-classpath ${BASEDIR}lib/linux/spass-meter-ia.jar:${BASEDIR}lib/linux/spass-meter-boot.jar:${BASEDIR}lib/linux/spass-meter-rt.jar" JAVAARGS_LTW="${JAVAARGS} ${CLASSPATH} -javaagent:${BASEDIR}lib/linux/spass-meter-ia.jar=xmlconfig=${BASEDIR}lib/config.xml,out=${RESULTSDIR}spassmeter.txt" +JAVAARGS_LTW_ASM="${JAVAARGS_LTW} -Dspass-meter.iFactory=de.uni_hildesheim.sse.monitoring.runtime.instrumentation.asmTree.Factory" + ## Write configuration uname -a >${RESULTSDIR}configuration.txt @@ -84,10 +86,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do sync sleep ${SLEEPTIME} - # SPASSmeter + # SPASSmeter Javassist k=`expr ${k} + 1` - echo " # ${i}.${j}.${k} SPASSmeter" - echo " # ${i}.${j}.${k} SPASSmeter" >>${BASEDIR}spassmeter.log + echo " # ${i}.${j}.${k} SPASSmeter Javassist" + echo " # ${i}.${j}.${k} SPASSmeter Javassist" >>${BASEDIR}spassmeter.log #sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 & ${JAVABIN}java ${JAVAARGS_LTW} ${JAR} \ --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ @@ -102,6 +104,25 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do echo >>${BASEDIR}spassmeter.log sync sleep ${SLEEPTIME} + + # SPASSmeter ASM + k=`expr ${k} + 1` + echo " # ${i}.${j}.${k} SPASSmeter ASM" + echo " # ${i}.${j}.${k} SPASSmeter ASM" >>${BASEDIR}spassmeter.log + #sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 & + ${JAVABIN}java ${JAVAARGS_LTW_ASM} ${JAR} \ + --output-filename ${RAWFN}-${i}-${j}-${k}.csv \ + --totalcalls ${TOTALCALLS} \ + --methodtime ${METHODTIME} \ + --totalthreads ${THREADS} \ + --recursiondepth ${j} \ + ${MOREPARAMS} + #kill %sar + [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log + echo >>${BASEDIR}spassmeter.log + echo >>${BASEDIR}spassmeter.log + sync + sleep ${SLEEPTIME} done #zip -jqr ${RESULTSDIR}stat.zip ${RESULTSDIR}stat