[jbosscache-commits] JBoss Cache SVN: r5159 - in benchmarks/benchmark-fwk/trunk: cache-products and 5 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Jan 17 08:34:52 EST 2008
Author: mircea.markus
Date: 2008-01-17 08:34:52 -0500 (Thu, 17 Jan 2008)
New Revision: 5159
Modified:
benchmarks/benchmark-fwk/trunk/build.xml
benchmarks/benchmark-fwk/trunk/cache-products/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-client-config.xml
benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java
benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
Log:
updated terracotta config
Modified: benchmarks/benchmark-fwk/trunk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/build.xml 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/build.xml 2008-01-17 13:34:52 UTC (rev 5159)
@@ -494,7 +494,7 @@
<delete dir="${module.framework.basedir}/classes"/>
</target>
- <target name="all" depends="init, clean, compile.module.framework, compile.module.ehcache124-plugin, compile.module.coherence322-plugin,compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.production, compile.module.terracotta-plugin" description="build all"/>
+ <target name="all" depends="init, clean, compile.module.framework,compile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.production, compile.module.terracotta-plugin" description="build all"/>
<target name="checkClusterAddresses" depends="compile.module.framework.production"
description="Check whether the cluster config is a valid one">
Modified: benchmarks/benchmark-fwk/trunk/cache-products/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/config.sh 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/config.sh 2008-01-17 13:34:52 UTC (rev 5159)
@@ -8,35 +8,8 @@
#Uncomment and append values to the variables below, as needed by a specific product
#CLASSPATH=$CLASSPATH:<some other needed values>
-#JVM_OPTIONS=JVM_OPTIONS:-DsomeSysProp=value1:-Xprop=value2
+#JVM_OPTIONS="$JVM_OPTIONS -DsomeSysProp=value1 -Xprop=value2"
-java -DcurrentIndex=0 -DclusterSize=3 -Xmx1024m -DpreferIPv4Stack=true -cp :./lib/commons-beanutils.jar:
-./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.0.jar:
-./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/Framework:
-./cache-products/jbosscache-2.1.0CR2/lib/jboss-common-core-2.0.4.GA.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jboss-javaee-5.0.0.Beta3.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jbosscache-core.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jcip-annotations-1.0.jar:
-./cache-products/jbosscache-2.1.0CR2/lib/jgroups-2.6.0.GA.jar:
-./classes/production/jbosscache-2.1.0CR2:
-./cache-products/jbosscache-2.1.0CR2/conf
-org.cachebench.CacheBenchmarkRunner
+#specify the fqn of the class wrapper for specific cache products
+JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=<fqn cache wrapper>"
-org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
-org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
-org.cachebench.cachewrappers.JBossCache210Cr2Wrapper
-
-java -DcurrentIndex=0 -DclusterSize=3 -Xmx1024m -DpreferIPv4Stack=true -cp :./lib/commons-beanutils.jar:
-./lib/commons-digester.jar:./lib/commons-logging.jar:./lib/commons-math-1.0.jar:
-./lib/log4j.jar:./lib/smartfrog-3.12.014.jar:./conf:./classes/production/Framework:
-./cache-products/jbosscache-2.0.0/lib/concurrent.jar:
-./cache-products/jbosscache-2.0.0/lib/jboss-common-core.jar:
-./cache-products/jbosscache-2.0.0/lib/jboss-j2ee.jar:
-./cache-products/jbosscache-2.0.0/lib/jbosscache.jar:
-./cache-products/jbosscache-2.0.0/lib/jcip-annotations.jar:
-./cache-products/jbosscache-2.0.0/lib/jgroups-2.6.1.jar:
-./cache-products/jbosscache-2.0.0/lib/jgroups.jar:
-./cache-products/jbosscache-2.0.0/lib/trove.jar:
-./classes/production/jbosscache-2.0.0:
-./cache-products/jbosscache-2.0.0/conf
-org.cachebench.CacheBenchmarkRunner
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/config.sh 2008-01-17 13:34:52 UTC (rev 5159)
@@ -15,4 +15,5 @@
#--classpath was set
#additional JVM options
-JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true"
\ No newline at end of file
+JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true"
+JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache210Wrapper"
\ No newline at end of file
Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/config.sh 2008-01-17 13:34:52 UTC (rev 5159)
@@ -11,4 +11,5 @@
#other specific JVM options
JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -DpreferIPv4Stack=true -Dtc.config=$THIS_DIR/tc-client-config.xml -Dtc.install-root=${TC_HOME}"
JVM_OPTIONS="$JVM_OPTIONS -Xbootclasspath/p:${TC_HOME}/lib/dso-boot/dso-boot-hotspot_linux_150_11.jar"
+JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.TerracottaWrapper"
Modified: benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-client-config.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-client-config.xml 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/cache-products/terracotta-2.5.0/tc-client-config.xml 2008-01-17 13:34:52 UTC (rev 5159)
@@ -9,9 +9,13 @@
</roots>
<locks>
<autolock>
- <method-expression>* org.cachebench.cachewrappers.TerracottaWrapper*.*(..)</method-expression>
+ <method-expression>* org.cachebench.cachewrappers.TerracottaWrapper.*(..)</method-expression>
<lock-level>write</lock-level>
</autolock>
+ <autolock>
+ <method-expression>* org.cachebench.cachewrappers.TerracottaWrapper.get(..)</method-expression>
+ <lock-level>read</lock-level>
+ </autolock>
</locks>
<instrumented-classes>
<include><class-expression>org.cachebench.cachewrappers..*</class-expression></include>
Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2008-01-17 13:34:52 UTC (rev 5159)
@@ -1,7 +1,8 @@
<!--
Configures and controls the behaviour of the cache benchmarking framework.
- sampleSize - this is the number of putsgets to be performed, an average is used in metrics.
+ TODO - sample size is test specific, moove it to the test that use it rather than having it here
+ sampleSize - this is the number of putsgets to be performed, an average is used in metrics.
gcBetweenTestsEnabled - if true, the framework pauses between each test and requests System.gc() - use this if you find yourself running out of mem!
sleepBetweenTests - ms to sleep between tests. useful to allow the JVM some time to do a gc
emptyCacheBetweenTests - again, use if you're running out of mem.
@@ -20,33 +21,22 @@
checkClusterAddresses ant target
-->
<cluster bindAddress="127.0.0.1">
- <member host="127.0.0.1" port="7800"/>
- <member host="127.0.0.1" port="7801"/>
- <member host="127.0.0.1" port="7802"/>
+ <member host="127.0.0.1" port="7900"/>
+ <member host="127.0.0.1" port="7901"/>
+ <member host="127.0.0.1" port="7902"/>
</cluster>
<!-- Each testcase represents either a single configuration or a cacheing product.
For example, WhirlyCache would be one test case. JBossCache-standalone could be another, JBossCache-replicated could be yet another
testcase::stopOnFailure if set to true and one test in this testcase fails then the process will exit
- See the javadoc for org.cachebench.CacheWrapper for the cacheWrapper property
-->
- <!-- Make SURE you read the docs - especially when using Terracotta as this involves some additional setup -->
+ <testcase name="WebSessionReplicationTest" stopOnFailure="true">
- <!-- Legacy stuff -->
- <!--<testcase name="JBossCache140-Pessimistic-REPL_SYNC" cacheWrapper="org.cachebench.cachewrappers.JBossCacheWrapper">-->
- <!--<testcase name="EHCache124-replicated" cacheWrapper="org.cachebench.cachewrappers.EHCacheWrapper">-->
- <!--<testcase name="Terracotta230" cacheWrapper="org.cachebench.cachewrappers.TerracottaWrapper">-->
-
-
- <!--<testcase name="JBossCache2x-Pessimistic-REPL_SYNC_BR" cacheWrapper="org.cachebench.cachewrappers.JBossCache200Wrapper">-->
- <testcase name="JBossCache2x-Pessimistic-REPL_ASYNC" cacheWrapper="org.cachebench.cachewrappers.JBossCache200Wrapper" stopOnFailure="true">
- <!--<testcase name="JBossCache2.0" cacheWrapper="org.cachebench.cachewrappers.TerracottaWrapper" stopOnFailure="true">-->
-
- <!-- warms up the cache by doing operation on it; simulates a real-world environment. If no warmup is needed use
- org.cachebench.warmup.NoCacheWarmup
+ <!-- org.cachebench.warmup.PutGetCacheWarmup warms up the cache by doing operation on it; simulates a real-world environment.
+ If no warmup is needed use org.cachebench.warmup.NoCacheWarmup
-->
- <warmup warmupClass="org.cachebench.warmup.PutGetCacheWarmup">
+ <warmup warmupClass="org.cachebench.warmup.NoCacheWarmup">
<param name="operationCount" value="10000"/>
</warmup>
@@ -83,7 +73,7 @@
<!-- arbitrary params may be passed into the cacheWrapper implementation, typically used to pass in config files for the cache product. -->
<!-- JBoss Cache 1.4.x and 2.x -->
- <param name="config" value="pess-repl-sync-br.xml" />
+ <param name="config" value="jbc210-br_tcp_mping.xml" />
<!--<param name="config" value="pess-repl-async.xml" />-->
<!-- EHCache -->
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/config/TestCase.java 2008-01-17 13:34:52 UTC (rev 5159)
@@ -41,6 +41,15 @@
*/
public String getCacheWrapper()
{
+ if (cacheWrapper == null)
+ {
+ cacheWrapper = System.getProperty("cacheBenchFwk.cacheWrapperClassName");
+ }
+ if (cacheWrapper == null)
+ {
+ throw new IllegalStateException("Null cache wrapper, it was not specified in neither in 'cachebench.xml' " +
+ " nor as sys prop 'cacheBenchFwk.cacheWrapperClassName'");
+ }
return cacheWrapper;
}
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java 2008-01-17 00:17:07 UTC (rev 5158)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/warmup/CacheWarmup.java 2008-01-17 13:34:52 UTC (rev 5159)
@@ -49,7 +49,7 @@
cacheWrapper.empty();
} catch (Exception e)
{
- log.warn("Received exception durring cache warmup");
+ log.warn("Received exception durring cache warmup", e);
}
}
More information about the jbosscache-commits
mailing list