Author: manik.surtani(a)jboss.com Date: 2009-04-27 11:06:37 -0400 (Mon, 27 Apr 2009) New Revision: 8000 Added: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC-FIFO.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml Modified: benchmarks/benchmark-fwk/trunk/build.xml benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/config.sh benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/src/org/cachebench/cachewrappers/InfinispanWrapper.java benchmarks/benchmark-fwk/trunk/conf/log4j.xml benchmarks/benchmark-fwk/trunk/runAllLocal.sh Log: * removed Horizon * fixed Infinispan plugin * added more configs to test local mode + eviction Modified: benchmarks/benchmark-fwk/trunk/build.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/build.xml 2009-04-27 14:44:18 UTC (rev 7999) +++ benchmarks/benchmark-fwk/trunk/build.xml 2009-04-27 15:06:37 UTC (rev 8000) @@ -248,12 +248,27 @@ </javac> </target> + <target name="compile.module.infinispan400" depends="fwk" + description="Compile module infinispan-4.0.0"> + <mkdir dir="./classes/production/infinispan-4.0.0"/> + <javac destdir="./classes/production/infinispan-4.0.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/infinispan-4.0.0/lib" includes="*.jar"/> + <fileset dir="./lib/common" includes="*.jar"/> + <pathelement location="./lib/commons-logging.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/infinispan-4.0.0/src"/> + </javac> + </target> + <target name="clean" description="cleanup all"> <delete dir="./classes"/> </target> <target name="all" - depends="clean, fwk, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.pojocache220, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache150, compile.module.ehcache160, compile.module.whirlycache101, compile.module.jbosscache300, compile.module.coherence331" + depends="clean, fwk, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.pojocache220, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache150, compile.module.ehcache160, compile.module.whirlycache101, compile.module.jbosscache300, compile.module.coherence331, compile.module.infinispan400" description="build all"/> <target name="checkClusterAddresses" depends="fwk" Copied: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml (from rev 7999, benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC.xml) =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RC-FIFO.xml 2009-04-27 15:06:37 UTC (rev 8000) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0"> + <default> + <locking concurrencyLevel="10000" isolationLevel="READ_COMMITTED" /> + <eviction wakeUpInterval="1000" maxEntries="10000" strategy="FIFO"/> + </default> +</infinispan> Copied: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml (from rev 7999, benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR.xml) =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/conf/local-RR-FIFO.xml 2009-04-27 15:06:37 UTC (rev 8000) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0"> + <default> + <locking concurrencyLevel="10000" isolationLevel="REPEATABLE_READ" /> + <eviction wakeUpInterval="1000" maxEntries="10000" strategy="FIFO"/> + </default> +</infinispan> Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/config.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/config.sh 2009-04-27 14:44:18 UTC (rev 7999) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/config.sh 2009-04-27 15:06:37 UTC (rev 8000) @@ -10,7 +10,7 @@ CLASSPATH=$CLASSPATH:$JAR done -CLASSPATH="$CLASSPATH:./classes/production/infinispan" +CLASSPATH="$CLASSPATH:./classes/production/infinispan-4.0.0" CLASSPATH="$CLASSPATH:$THIS_DIR/conf" #--classpath was set Modified: benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/src/org/cachebench/cachewrappers/InfinispanWrapper.java =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/src/org/cachebench/cachewrappers/InfinispanWrapper.java 2009-04-27 14:44:18 UTC (rev 7999) +++ benchmarks/benchmark-fwk/trunk/cache-products/infinispan-4.0.0/src/org/cachebench/cachewrappers/InfinispanWrapper.java 2009-04-27 15:06:37 UTC (rev 8000) @@ -2,13 +2,12 @@ import org.cachebench.CacheWrapper; import org.infinispan.Cache; -import org.infinispan.factories.DefaultCacheFactory; import org.infinispan.manager.CacheManager; import org.infinispan.manager.DefaultCacheManager; import javax.transaction.TransactionManager; -import java.util.Map; import java.util.List; +import java.util.Map; public class InfinispanWrapper implements CacheWrapper { @@ -31,7 +30,7 @@ cacheManager = new DefaultCacheManager(config); // use the default cache cache = cacheManager.getCache(); - started = true; + started = true; } } Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC-FIFO.xml (from rev 7999, benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC.xml) =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC-FIFO.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RC-FIFO.xml 2009-04-27 15:06:37 UTC (rev 8000) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> + <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="600000" nodeLockingScheme="mvcc" + concurrencyLevel="10000" + lockParentForChildInsertRemove="false"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <eviction wakeUpInterval="1000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="2000000"> + <property name="maxNodes" value="10000" /> + </default> + </eviction> +</jbosscache> Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml (from rev 7999, benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR.xml) =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/mvcc-local-RR-FIFO.xml 2009-04-27 15:06:37 UTC (rev 8000) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="600000" nodeLockingScheme="mvcc" + concurrencyLevel="10000" + lockParentForChildInsertRemove="false"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <eviction wakeUpInterval="1000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="2000000"> + <property name="maxNodes" value="10000" /> + </default> + </eviction> +</jbosscache> Modified: benchmarks/benchmark-fwk/trunk/conf/log4j.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2009-04-27 14:44:18 UTC (rev 7999) +++ benchmarks/benchmark-fwk/trunk/conf/log4j.xml 2009-04-27 15:06:37 UTC (rev 8000) @@ -86,7 +86,7 @@ <priority value="ERROR"/> </category> - <category name="org.horizon"> + <category name="org.infinispan"> <priority value="ERROR"/> </category> Modified: benchmarks/benchmark-fwk/trunk/runAllLocal.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2009-04-27 14:44:18 UTC (rev 7999) +++ benchmarks/benchmark-fwk/trunk/runAllLocal.sh 2009-04-27 15:06:37 UTC (rev 8000) @@ -4,22 +4,28 @@ # source ${jdk} jdk=java5 rm -rf ./output/* + export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g" unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" ./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC.xml unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" ./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS}" -./runLocalNode.sh ehcache-1.5.0 ehcache-local.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(1.6.0.Beta3)" -./runLocalNode.sh ehcache-1.6.0 ehcache-local.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS}" -./runLocalNode.sh whirlycache-1.0.1 -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(1.0.0.M1)" -./runLocalNode.sh Horizon-1.0.0 local-RC.xml -unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(1.0.0.M1)" -./runLocalNode.sh Horizon-1.0.0 local-RR.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RC.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RR.xml +export PLAIN_JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.fwkCfgFile=cachebench-local.xml -Xms2g -Xmx2g" +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" +./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RC-FIFO.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(3.0.3.GA)" +./runLocalNode.sh jbosscache-3.0.0 mvcc-local-RR-FIFO.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RC-FIFO.xml +unset JVM_OPTIONS && export JVM_OPTIONS="${PLAIN_JVM_OPTIONS} -DcacheBenchFwk.productSuffix=(4.0.0.ALPHA2)" +./runLocalNode.sh infinispan-4.0.0 local-RR-FIFO.xml + + mkdir output mv data* ./output