July 2008 - jbosscache-commits - Jboss List Archives

JBoss Cache SVN: r6293 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-07-16 08:13:33 -0400 (Wed, 16 Jul 2008) New Revision: 6293 Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh Log: allows execution Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-16 12:08:10 UTC (rev 6292) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-16 12:13:33 UTC (rev 6293) @@ -1,18 +1,18 @@ -#!/bin/bash - -#see "$CACHE_ROOT/cache-products/cache.sh" for details - -THIS_DIR="./cache-products/jbosscache-3.0.0" - -#setting up classpath -for JAR in $THIS_DIR/lib/* -do - CLASSPATH=$CLASSPATH:$JAR -done - -CLASSPATH="$CLASSPATH:./classes/production/jbosscache-3.0.0" -CLASSPATH="$CLASSPATH:$THIS_DIR/conf" -#--classpath was set - -#additional JVM options +#!/bin/bash + +#see "$CACHE_ROOT/cache-products/cache.sh" for details + +THIS_DIR="./cache-products/jbosscache-3.0.0" + +#setting up classpath +for JAR in $THIS_DIR/lib/* +do + CLASSPATH=$CLASSPATH:$JAR +done + +CLASSPATH="$CLASSPATH:./classes/production/jbosscache-3.0.0" +CLASSPATH="$CLASSPATH:$THIS_DIR/conf" +#--classpath was set + +#additional JVM options JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache220Wrapper" \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6292 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-07-16 08:08:10 -0400 (Wed, 16 Jul 2008) New Revision: 6292 Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml Log: switched to mvcc locking Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"/> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2008-07-16 12:04:48 UTC (rev 6291) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2008-07-16 12:08:10 UTC (rev 6292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster">

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6291 - in benchmarks/benchmark-fwk/trunk: cache-products and 7 other directories.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-07-16 08:04:48 -0400 (Wed, 16 Jul 2008) New Revision: 6291 Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/commons-codec.jar benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-common-core.jar benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-logging-spi.jar benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jcip-annotations.jar benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jgroups.jar benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java Modified: benchmarks/benchmark-fwk/trunk/build.xml Log: added support for jbc3x and simplified the build file Modified: benchmarks/benchmark-fwk/trunk/build.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/build.xml 2008-07-16 09:28:37 UTC (rev 6290) +++ benchmarks/benchmark-fwk/trunk/build.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="cachebenchfwk" default="help"> +<project name="cachebenchfwk" default="help" basedir="."> <property file="build.properties"/> @@ -12,68 +12,17 @@ <property name="compiler.debug" value="on"/> <property name="compiler.generate.no.warnings" value="off"/> - <property name="compiler.args" value=""/> - <property name="compiler.max.memory" value="128m"/> - <patternset id="ignored.files"> - <exclude name="**/CVS/**"/> - <exclude name="**/SCCS/**"/> - <exclude name="**/RCS/**"/> - <exclude name="**/rcs/**"/> - <exclude name="**/.DS_Store/**"/> - <exclude name="**/.svn/**"/> - <exclude name="**/.sbas/**"/> - <exclude name="**/.IJI.*/**"/> - </patternset> - <patternset id="compiler.resources"> - <include name="**/?*.properties"/> - <include name="**/?*.xml"/> - <include name="**/?*.gif"/> - <include name="**/?*.png"/> - <include name="**/?*.jpeg"/> - <include name="**/?*.jpg"/> - <include name="**/?*.html"/> - <include name="**/?*.dtd"/> - <include name="**/?*.tld"/> - </patternset> -  - - -  - - <dirname property="module.framework.basedir" file="${ant.file}"/> - <property environment="env"/> - <property name="compiler.args.framework" value="${compiler.args}"/> + <property name="framework.output.dir" value="./classes/production/Framework"/> - <property name="framework.output.dir" value="${module.framework.basedir}/classes/production/Framework"/> - <property name="framework.testoutput.dir" value="${module.framework.basedir}/classes/test/Framework"/> - - <path id="framework.module.bootclasspath"> -  - </path> - <path id="framework.module.classpath"> - <fileset dir="${module.framework.basedir}/lib" includes="**/*.jar"/> - <pathelement location="${module.framework.basedir}/conf"/> + <fileset dir="./lib" includes="**/*.jar"/> + <pathelement location="./conf"/> </path> - <patternset id="excluded.from.module.framework"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.framework"> - <patternset refid="excluded.from.module.framework"/> - </patternset> - - <path id="framework.module.sourcepath"> - <dirset dir="${module.framework.basedir}"> - <include name="src"/> - </dirset> - </path> - <target name="help" description="Dumps usage information"> <echo> This script has the purpose of building the CacheBenchFwk. @@ -121,509 +70,158 @@ </target> - <target name="compile.module.framework" depends="compile.module.framework.production,compile.module.framework.tests" - description="Compile module Framework"/> - - <target name="compile.module.framework.production" description="Compile module Framework; production classes"> + <target name="compile.module.framework" description="Compile module Framework"> <mkdir dir="${framework.output.dir}"/> <javac destdir="${framework.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" - memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.framework}"/> - <bootclasspath refid="framework.module.bootclasspath"/> + fork="true"> <classpath refid="framework.module.classpath"/> - <src refid="framework.module.sourcepath"/> - <patternset refid="excluded.from.compilation.framework"/> + <src path="./src"/> </javac> - - <copy todir="${framework.output.dir}"> - <fileset dir="${module.framework.basedir}/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> </target> - <target name="compile.module.framework.tests" depends="compile.module.framework.production" - description="compile module Framework; test classes" unless="skip.tests"/> - - -  - - <dirname property="module.ehcache141-plugin.basedir" file="${ant.file}"/> - - - <property name="compiler.args.ehcache141-plugin" value="${compiler.args}"/> - - <property name="ehcache141-plugin.output.dir" - value="${module.ehcache141-plugin.basedir}/classes/production/ehcache-1.4.1"/> - <property name="ehcache141-plugin.testoutput.dir" - value="${module.ehcache141-plugin.basedir}/classes/test/ehcache-1.4.1"/> - - <path id="ehcache141-plugin.module.bootclasspath"> -  - </path> - - <path id="ehcache141-plugin.module.classpath"> - <fileset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/lib" includes="*.jar"/> - <pathelement location="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${ehcache141-plugin.output.dir}"/> - </path> - - - <patternset id="excluded.from.module.ehcache141-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.ehcache141-plugin"> - <patternset refid="excluded.from.module.ehcache141-plugin"/> - </patternset> - - <path id="ehcache141-plugin.module.sourcepath"> - <dirset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.ehcache141-plugin" - depends="compile.module.ehcache141-plugin.production,compile.module.ehcache141-plugin.tests" - description="Compile module ehcache-1.4.1"/> - - <target name="compile.module.ehcache141-plugin.production" depends="compile.module.framework" + <target name="compile.module.ehcache141" depends="compile.module.framework" description="Compile module ehcache-1.4.1; production classes"> - <mkdir dir="${ehcache141-plugin.output.dir}"/> - <javac destdir="${ehcache141-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.ehcache141-plugin}"/> - <bootclasspath refid="ehcache141-plugin.module.bootclasspath"/> - <classpath refid="ehcache141-plugin.module.classpath"/> - <src refid="ehcache141-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.ehcache141-plugin"/> + <mkdir dir="./classes/production/ehcache-1.4.1"/> + <javac destdir="./classes/production/ehcache-1.4.1" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/ehcache-1.4.1/lib" includes="*.jar"/> + <pathelement location="./cache-products/ehcache-1.4.1/conf"/> + <pathelement location="${framework.output.dir}"/> + <pathelement location="./classes/production/ehcache-1.4.1"/> + </classpath> + <src path="./cache-products/ehcache-1.4.1/src"/> </javac> - - <copy todir="${ehcache141-plugin.output.dir}"> - <fileset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> </target> - <target name="compile.module.ehcache141-plugin.tests" depends="compile.module.ehcache141-plugin.production" - description="compile module ehcache-1.4.1; test classes" unless="skip.tests"/> - - -  - - <dirname property="module.coherence322-plugin.basedir" file="${ant.file}"/> - - - <property name="compiler.args.coherence322-plugin" value="${compiler.args}"/> - - <property name="coherence322-plugin.output.dir" - value="${module.coherence322-plugin.basedir}/classes/production/coherence-3.2.2"/> - <property name="coherence322-plugin.testoutput.dir" - value="${module.coherence322-plugin.basedir}/classes/test/coherence-3.2.2"/> - - <path id="coherence322-plugin.module.bootclasspath"> -  - </path> - - <path id="coherence322-plugin.module.classpath"> - <fileset dir="${module.coherence322-plugin.basedir}/cache-products/coherence-3.2.2/lib" includes="*.jar"/> - <pathelement location="${module.coherence322-plugin.basedir}/cache-products/coherence-3.2.2/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${coherence322-plugin.output.dir}"/> - </path> - - - <patternset id="excluded.from.module.coherence322-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.coherence322-plugin"> - <patternset refid="excluded.from.module.coherence322-plugin"/> - </patternset> - - <path id="coherence322-plugin.module.sourcepath"> - <dirset dir="${module.ehcache141-plugin.basedir}/cache-products/coherence-3.2.2"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.coherence322-plugin" - depends="compile.module.coherence322-plugin.production, compile.module.coherence322-plugin.tests" - description="Compile module coherence322"/> - - <target name="compile.module.coherence322-plugin.production" depends="compile.module.framework" + <target name="compile.module.coherence322" depends="compile.module.framework" description="Compile module coherence322; production classes"> - <mkdir dir="${coherence322-plugin.output.dir}"/> - <javac destdir="${coherence322-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.coherence322-plugin}"/> - <bootclasspath refid="coherence322-plugin.module.bootclasspath"/> - <classpath refid="coherence322-plugin.module.classpath"/> - <src refid="coherence322-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.coherence322-plugin"/> + <mkdir dir="./classes/production/coherence-3.2.2"/> + <javac destdir="./classes/production/coherence-3.2.2" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/coherence-3.2.2/lib" includes="*.jar"/> + <pathelement location="./cache-products/coherence-3.2.2/conf"/> + <pathelement location="${framework.output.dir}"/> + <pathelement location="./classes/production/coherence-3.2.2"/> + </classpath> + <src path="./cache-products/coherence-3.2.2"/> </javac> - - <copy todir="${coherence322-plugin.output.dir}"> - <fileset dir="${module.coherence322-plugin.basedir}/cache-products/coherence-3.2.2/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> </target> - <target name="compile.module.coherence322-plugin.tests" depends="compile.module.coherence322-plugin.production" - description="compile module coherence322; test classes" unless="skip.tests"/> - - <target name="clean.module.coherence322-plugin" description="cleanup module"> - <delete dir="${coherence322-plugin.output.dir}"/> - <delete dir="${coherence322-plugin.testoutput.dir}"/> - </target> - -  - - <dirname property="module.terracotta-plugin.basedir" file="${ant.file}"/> - - - <property name="compiler.args.terracotta-plugin" value="${compiler.args}"/> - - <property name="terracotta-plugin.output.dir" - value="${module.terracotta-plugin.basedir}/classes/production/terracotta-2.5.0"/> - <property name="terracotta-plugin.testoutput.dir" - value="${module.terracotta-plugin.basedir}/classes/test/terracotta-2.5.0"/> - - <path id="terracotta-plugin.module.bootclasspath"> -  - </path> - - <path id="terracotta-plugin.module.classpath"> - <pathelement location="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${terracotta-plugin.output.dir}"/> - </path> - - - <patternset id="excluded.from.module.terracotta-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.terracotta-plugin"> - <patternset refid="excluded.from.module.terracotta-plugin"/> - </patternset> - - <path id="terracotta-plugin.module.sourcepath"> - <dirset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.terracotta-plugin" - depends="compile.module.terracotta-plugin.production,compile.module.terracotta-plugin.tests" - description="Compile module terracotta-2.5.0"/> - - <target name="compile.module.terracotta-plugin.production" depends="compile.module.framework" + <target name="compile.module.terracotta250" depends="compile.module.framework" description="Compile module terracotta-2.5.0; production classes"> - <mkdir dir="${terracotta-plugin.output.dir}"/> - <javac destdir="${terracotta-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.terracotta-plugin}"/> - <bootclasspath refid="terracotta-plugin.module.bootclasspath"/> - <classpath refid="terracotta-plugin.module.classpath"/> - <src refid="terracotta-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.terracotta-plugin"/> + <mkdir dir="./classes/production/terracotta-2.5.0"/> + <javac destdir="./classes/production/terracotta-2.5.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <pathelement location="./cache-products/terracotta-2.5.0/conf"/> + <pathelement location="${framework.output.dir}"/> + <pathelement location="./classes/production/terracotta-2.5.0"/> + </classpath> + <src path="./cache-products/terracotta-2.5.0/src"/> </javac> - - <copy todir="${terracotta-plugin.output.dir}"> - <fileset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> </target> - <target name="compile.module.terracotta-plugin.tests" depends="compile.module.terracotta-plugin.production" - description="compile module terracotta-2.5.0; test classes" unless="skip.tests"/> - - <target name="clean.module.terracotta-plugin" description="cleanup module"> - <delete dir="${terracotta-plugin.output.dir}"/> - <delete dir="${terracotta-plugin.testoutput.dir}"/> - </target> - - -  - - <dirname property="module.whirlycache101-plugin.basedir" file="${ant.file}"/> - - - <property name="compiler.args.whirlycache101-plugin" value="${compiler.args}"/> - - <property name="whirlycache101-plugin.output.dir" - value="${module.whirlycache101-plugin.basedir}/classes/production/whirlycache-1.0.1"/> - <property name="whirlycache101-plugin.testoutput.dir" - value="${module.whirlycache101-plugin.basedir}/classes/test/whirlycache-1.0.1"/> - - <path id="whirlycache101-plugin.module.bootclasspath"> -  - </path> - - <path id="whirlycache101-plugin.module.classpath"> - <fileset dir="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1/lib" includes="**/*.jar"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${whirlycache101-plugin.output.dir}"/> - <pathelement location="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1/conf"/> - </path> - - - <patternset id="excluded.from.module.whirlycache101-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.whirlycache101-plugin"> - <patternset refid="excluded.from.module.whirlycache101-plugin"/> - </patternset> - - <path id="whirlycache101-plugin.module.sourcepath"> - <dirset dir="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.whirlycache101-plugin" - depends="compile.module.whirlycache101-plugin.production,compile.module.whirlycache101-plugin.tests" - description="Compile module whirlycache-1.0.1"/> - - <target name="compile.module.whirlycache101-plugin.production" depends="compile.module.framework" - description="Compile module whirlycache-1.0.1; production classes"> - <mkdir dir="${whirlycache101-plugin.output.dir}"/> - <javac destdir="${whirlycache101-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.whirlycache101-plugin}"/> - <bootclasspath refid="whirlycache101-plugin.module.bootclasspath"/> - <classpath refid="whirlycache101-plugin.module.classpath"/> - <src refid="whirlycache101-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.whirlycache101-plugin"/> - </javac> - - <copy todir="${whirlycache101-plugin.output.dir}"> - <fileset dir="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> - </target> - - <target name="compile.module.whirlycache101-plugin.tests" depends="compile.module.whirlycache101-plugin.production" - description="compile module whirlycache-1.0.1; test classes" unless="skip.tests"/> - -  - - <dirname property="module.jbosscache140-plugin.basedir" file="${ant.file}"/> - - - <property name="compiler.args.jbosscache140-plugin" value="${compiler.args}"/> - - <property name="jbosscache140-plugin.output.dir" - value="${module.jbosscache140-plugin.basedir}/classes/production/jbosscache-1.4.1"/> - <property name="jbosscache140-plugin.testoutput.dir" - value="${module.jbosscache140-plugin.basedir}/classes/test/jbosscache-1.4.1"/> - - <path id="jbosscache140-plugin.module.bootclasspath"> -  - </path> - - <path id="jbosscache140-plugin.module.classpath"> - <fileset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib" includes="**/*.jar"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${jbosscache140-plugin.output.dir}"/> - <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/conf"/> - </path> - - - <patternset id="excluded.from.module.jbosscache140-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.jbosscache140-plugin"> - <patternset refid="excluded.from.module.jbosscache140-plugin"/> - </patternset> - - <path id="jbosscache140-plugin.module.sourcepath"> - <dirset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.jbosscache140-plugin" - depends="compile.module.jbosscache140-plugin.production,compile.module.jbosscache140-plugin.tests" - description="Compile module jbosscache-1.4.1"/> - - <target name="compile.module.jbosscache140-plugin.production" depends="compile.module.framework" + <target name="compile.module.jbosscache140" depends="compile.module.framework" description="Compile module jbosscache-1.4.1; production classes"> - <mkdir dir="${jbosscache140-plugin.output.dir}"/> - <javac destdir="${jbosscache140-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.jbosscache140-plugin}"/> - <bootclasspath refid="jbosscache140-plugin.module.bootclasspath"/> - <classpath refid="jbosscache140-plugin.module.classpath"/> - <src refid="jbosscache140-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.jbosscache140-plugin"/> + <mkdir dir="./classes/production/jbosscache-1.4.1"/> + <javac destdir="./classes/production/jbosscache-1.4.1" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/jbosscache-1.4.1/lib" includes="**/*.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src> + <dirset dir="./cache-products/jbosscache-1.4.1"> + <include name="src"/> + </dirset> + </src> </javac> - - <copy todir="${jbosscache140-plugin.output.dir}"> - <fileset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> </target> - <target name="compile.module.jbosscache140-plugin.tests" depends="compile.module.jbosscache140-plugin.production" - description="compile module jbosscache-1.4.1; test classes" unless="skip.tests"/> - -  - - <dirname property="module.jbosscache200-plugin.basedir" file="${ant.file}"/> - <dirname property="module.jbosscache210-plugin.basedir" file="${ant.file}"/> - <dirname property="module.jbosscache220-plugin.basedir" file="${ant.file}"/> - - - <property name="compiler.args.jbosscache200-plugin" value="${compiler.args}"/> - - <property name="jbosscache200-plugin.output.dir" - value="${module.jbosscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/> - <property name="jbosscache210-plugin.output.dir" - value="${module.jbosscache210-plugin.basedir}/classes/production/jbosscache-2.1.0"/> - <property name="jbosscache220-plugin.output.dir" - value="${module.jbosscache220-plugin.basedir}/classes/production/jbosscache-2.2.0"/> - <property name="jbosscache200-plugin.testoutput.dir" - value="${module.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/> - - <path id="jbosscache200-plugin.module.bootclasspath"> -  - </path> - - <path id="jbosscache200-plugin.module.classpath"> - <fileset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib" includes="*.jar"/> - <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/conf"/> - <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${jbosscache200-plugin.output.dir}"/> - </path> - - <path id="jbosscache210-plugin.module.classpath"> - <fileset dir="${module.jbosscache210-plugin.basedir}/cache-products/jbosscache-2.1.0/lib" includes="*.jar"/> - <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${jbosscache210-plugin.output.dir}"/> - </path> - - <path id="jbosscache220-plugin.module.classpath"> - <fileset dir="${module.jbosscache220-plugin.basedir}/cache-products/jbosscache-2.2.0/lib" includes="*.jar"/> - <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${jbosscache220-plugin.output.dir}"/> - </path> - - - <patternset id="excluded.from.module.jbosscache200-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.jbosscache200-plugin"> - <patternset refid="excluded.from.module.jbosscache200-plugin"/> - </patternset> - - <path id="jbosscache200-plugin.module.sourcepath"> - <dirset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.jbosscache200-plugin" - depends="compile.module.jbosscache200-plugin.production,compile.module.jbosscache200-plugin.tests" - description="Compile module jbosscache-2.0.0"/> - - <target name="compile.module.jbosscache200-plugin.production" depends="compile.module.framework" - description="Compile module jbosscache-2.0.0; production classes"> - <mkdir dir="${jbosscache200-plugin.output.dir}"/> - <javac destdir="${jbosscache200-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args}"/> - <bootclasspath refid="jbosscache200-plugin.module.bootclasspath"/> - <classpath refid="jbosscache200-plugin.module.classpath"/> - <src refid="jbosscache200-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.jbosscache200-plugin"/> + <target name="compile.module.jbosscache200" depends="compile.module.framework" + description="Compile module jbosscache-2.0.0"> + <mkdir dir="./classes/production/jbosscache-2.0.0"/> + <javac destdir="./classes/production/jbosscache-2.0.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/jbosscache-2.0.0/lib" includes="*.jar"/> + <pathelement location="./lib/commons-logging.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/jbosscache-2.0.0/src"/> </javac> - - <copy todir="${jbosscache200-plugin.output.dir}"> - <fileset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> </target> - <target name="compile.module.jbosscache210-plugin.production" depends="compile.module.framework" + <target name="compile.module.jbosscache210" depends="compile.module.framework" description="Compile module jbosscache-2.1.0cr2; production classes"> - <mkdir dir="${jbosscache210-plugin.output.dir}"/> - <javac destdir="${jbosscache210-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args}"/> - <classpath refid="jbosscache210-plugin.module.classpath"/> - <src path="${module.jbosscache210-plugin.basedir}/cache-products/jbosscache-2.1.0"/> + <mkdir dir="./classes/production/jbosscache-2.1.0"/> + <javac destdir="./classes/production/jbosscache-2.1.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/jbosscache-2.1.0/lib" includes="*.jar"/> + <pathelement location="./lib/commons-logging.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/jbosscache-2.1.0/src"/> </javac> </target> - <target name="compile.module.jbosscache220-plugin.production" depends="compile.module.framework" + <target name="compile.module.jbosscache220" depends="compile.module.framework" description="Compile module jbosscache-2.2.0; production classes"> - <mkdir dir="${jbosscache220-plugin.output.dir}"/> - <javac destdir="${jbosscache220-plugin.output.dir}" debug="${compiler.debug}" - nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args}"/> - <classpath refid="jbosscache220-plugin.module.classpath"/> - <src path="${module.jbosscache220-plugin.basedir}/cache-products/jbosscache-2.2.0"/> + <mkdir dir="./classes/production/jbosscache-2.2.0"/> + <javac destdir="./classes/production/jbosscache-2.2.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/jbosscache-2.2.0/lib" includes="*.jar"/> + <pathelement location="./lib/commons-logging.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/jbosscache-2.2.0/src"/> </javac> </target> - <target name="compile.module.jbosscache200-plugin.tests" depends="compile.module.jbosscache200-plugin.production" - description="compile module jbosscache-2.0.0; test classes" unless="skip.tests"/> + <target name="compile.module.whirlycache101" depends="compile.module.framework" + description="Compile module whirlycache-1.0.1; production classes"> + <mkdir dir="./classes/production/whirlycache-1.0.1"/> + <javac destdir="./classes/production/whirlycache-1.0.1" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/whirlycache-1.0.1/lib" includes="**/*.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/whirlycache-1.0.1/src"/> + </javac> + </target> - - <target name="init" description="Build initialization"> -  + <target name="compile.module.jbosscache300" depends="compile.module.framework" + description="Compile module jbosscache-3.0.0"> + <mkdir dir="./classes/production/jbosscache-3.0.0"/> + <javac destdir="./classes/production/jbosscache-3.0.0" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" fork="true"> + <classpath> + <fileset dir="./cache-products/jbosscache-3.0.0/lib" includes="*.jar"/> + <pathelement location="./lib/commons-logging.jar"/> + <pathelement location="${framework.output.dir}"/> + </classpath> + <src path="./cache-products/jbosscache-3.0.0/src"/> + </javac> </target> <target name="clean" description="cleanup all"> - <delete dir="${module.framework.basedir}/classes"/> + <delete dir="./classes"/> </target> <target name="all" - depends="init, clean, compile.module.framework, compile.module.whirlycache101-plugin.production, compile.module.ehcache141-plugin.production, compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.production, compile.module.jbosscache220-plugin.production, compile.module.terracotta-plugin" + depends="clean, compile.module.framework, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache141, compile.module.whirlycache101, compile.module.jbosscache300" description="build all"/> - <target name="checkClusterAddresses" depends="compile.module.framework.production" + <target name="checkClusterAddresses" depends="compile.module.framework" description="Check whether the cluster config is a valid one"> <java classname="org.cachebench.ClusterConfigurationCheck" clonevm="true" fork="true"> <classpath> <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> </classpath> <classpath refid="framework.module.classpath"/> </java> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" + enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" + thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" + thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000" + thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true" + use_send_queues="false"/> + <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false" + view_ack_collection_timeout="5000" view_bundling="true"/> + <FC max_credits="5000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <async/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true"/> + <PING num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <async/> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" + enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" + thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" + thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000" + thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true" + use_send_queues="false"/> + <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false" + view_ack_collection_timeout="5000" view_bundling="true"/> + <FC max_credits="5000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <sync replTimeout="15000"/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true"/> + <PING num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <sync replTimeout="15000"/> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"/> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" + enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" + thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" + thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000" + thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true" + use_send_queues="false"/> + <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false" + view_ack_collection_timeout="5000" view_bundling="true"/> + <FC max_credits="5000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <async/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true"/> + <PING num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <async/> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" + enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" + thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" + thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000" + thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true" + use_send_queues="false"/> + <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false" + view_ack_collection_timeout="5000" view_bundling="true"/> + <FC max_credits="5000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <sync replTimeout="15000"/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <stateRetrieval timeout="20000"/> + <transport clusterName="JBossCache-Cluster"> + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true"/> + <PING num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </transport> + <replication> + <sync replTimeout="15000"/> + </replication> +</jbosscache> Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,18 @@ +#!/bin/bash + +#see "$CACHE_ROOT/cache-products/cache.sh" for details + +THIS_DIR="./cache-products/jbosscache-3.0.0" + +#setting up classpath +for JAR in $THIS_DIR/lib/* +do + CLASSPATH=$CLASSPATH:$JAR +done + +CLASSPATH="$CLASSPATH:./classes/production/jbosscache-3.0.0" +CLASSPATH="$CLASSPATH:$THIS_DIR/conf" +#--classpath was set + +#additional JVM options +JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache220Wrapper" \ No newline at end of file Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/commons-codec.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/commons-codec.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-common-core.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-common-core.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-logging-spi.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-logging-spi.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jcip-annotations.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jcip-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jgroups.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jgroups.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java (from rev 5777, benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/cachebench/cachewrappers/JBossCache210Wrapper.java) =================================================================== --- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java (rev 0) +++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java 2008-07-16 12:04:48 UTC (rev 6291) @@ -0,0 +1,78 @@ +package org.cachebench.cachewrappers; + +import org.jboss.cache.Cache; +import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.Fqn; +import org.jboss.cache.CacheSPI; +import org.jboss.cache.config.Option; +import org.jboss.cache.marshall.NodeData; +import org.jboss.cache.buddyreplication.GravitateResult; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.cachebench.CacheWrapper; + +import java.util.Map; + +/** + * @author Mircea.Markus(a)jboss.com + */ +public class JBossCache300Wrapper implements CacheWrapper +{ + private Cache cache; + private Log log = LogFactory.getLog(JBossCache300Wrapper.class); + + public void init(Map parameters) throws Exception + { + log.info("Creating cache with the following configuration: " + parameters); + cache = new DefaultCacheFactory().createCache((String)parameters.get("config")); + log.info("Running cache with following config: " + cache.getConfiguration()); + log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Version.version); + log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.Version.codename); + } + + public void setUp() throws Exception + { + } + + public void tearDown() throws Exception + { + cache.stop(); + } + + public void put(Object key, Object value) throws Exception + { + // make sure the threads don't conflict! + Fqn f = Fqn.fromElements("test", key); + cache.put(f, key, value); + } + + public Object get(Object key) throws Exception + { + Fqn f = Fqn.fromElements("test", key); + return cache.get(f, key); + } + + public void empty() throws Exception + { + //not removing root because there it fails with buddy replication: http://jira.jboss.com/jira/browse/JBCACHE-1241 + cache.removeNode(Fqn.fromElements("test")); + } + + public int getNumMembers() + { + return cache.getMembers().size(); + } + + public String getInfo() + { + return "Num direct children: " + cache.getRoot().getChildren().size(); + } + + public Object getReplicatedData(String key) throws Exception + { + Option option = cache.getInvocationContext().getOptionOverrides(); + option.setForceDataGravitation(true); + Fqn<String> fqn = Fqn.fromElements("test", key); + return cache.get(fqn, key); + } +}

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6290 - core/trunk/src/test/java/org/jboss/cache/lock.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-07-16 05:28:37 -0400 (Wed, 16 Jul 2008) New Revision: 6290 Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java Log: Added test Modified: core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java 2008-07-16 09:20:10 UTC (rev 6289) +++ core/trunk/src/test/java/org/jboss/cache/lock/MVCCLockManagerTest.java 2008-07-16 09:28:37 UTC (rev 6290) @@ -15,6 +15,8 @@ import org.testng.annotations.Test; import javax.transaction.TransactionManager; +import java.util.ArrayList; +import java.util.List; @Test(groups = {"unit", "mvcc"}) public class MVCCLockManagerTest @@ -82,4 +84,25 @@ assert !lm.isLocked(node) : "Should not be locked"; } + + public void testSpreadingOfLocks() + { + List<Fqn> fqns = new ArrayList<Fqn>(11); + fqns.add(Fqn.fromString("/")); + fqns.add(Fqn.fromString("/a")); + fqns.add(Fqn.fromString("/a/b")); + fqns.add(Fqn.fromString("/a/b/c")); + fqns.add(Fqn.fromString("/a/b/c/d")); + fqns.add(Fqn.fromString("/a/b/c/e")); + fqns.add(Fqn.fromString("/A")); + fqns.add(Fqn.fromString("/A/B")); + fqns.add(Fqn.fromString("/A/B/C")); + fqns.add(Fqn.fromString("/A/B/C/D")); + fqns.add(Fqn.fromString("/A/B/C/E")); + + for (Fqn f : fqns) + { + System.out.println("Fqn: " + f + " bucket: " + lm.lockContainer.hashToIndex(f)); + } + } }

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6289 - in core/trunk/src/main/java/org/jboss/cache: lock and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-07-16 05:20:10 -0400 (Wed, 16 Jul 2008) New Revision: 6289 Added: core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java core/trunk/src/main/java/org/jboss/cache/VersionedNode.java core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java Log: Reduced synchronization Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-16 08:34:15 UTC (rev 6288) +++ core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-16 09:20:10 UTC (rev 6289) @@ -7,7 +7,7 @@ import static org.jboss.cache.AbstractNode.NodeFlags.RESIDENT; import java.util.EnumSet; -import java.util.Map; +import java.util.concurrent.ConcurrentMap; /** * Base class for {@link UnversionedNode}. @@ -16,7 +16,7 @@ */ public abstract class AbstractNode<K, V> { - protected Map<Object, Node<K, V>> children; + protected volatile ConcurrentMap<Object, Node<K, V>> children; protected Fqn fqn; /** * Flags placed on the node. Replaces older 'boolean' flags. Modified: core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java 2008-07-16 08:34:15 UTC (rev 6288) +++ core/trunk/src/main/java/org/jboss/cache/PessimisticNodeFactory.java 2008-07-16 09:20:10 UTC (rev 6289) @@ -13,7 +13,7 @@ @Override protected UnversionedNode<K, V> createInternalNode(Object childName, Fqn fqn, NodeSPI<K, V> parent, Map<K, V> data, boolean mapSafe) { - UnversionedNode<K, V> internal = new UnversionedNode<K, V>(childName, fqn, data, cache); + PessimisticUnversionedNode<K, V> internal = new PessimisticUnversionedNode<K, V>(childName, fqn, data, cache); internal.injectDependencies(cache, commandsFactory, lockStrategyFactory, this); return internal; } Added: core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java (rev 0) +++ core/trunk/src/main/java/org/jboss/cache/PessimisticUnversionedNode.java 2008-07-16 09:20:10 UTC (rev 6289) @@ -0,0 +1,131 @@ +package org.jboss.cache; + +import org.jboss.cache.commands.write.CreateNodeCommand; +import org.jboss.cache.invocation.InvocationContext; +import org.jboss.cache.lock.IdentityLock; +import org.jboss.cache.transaction.GlobalTransaction; + +import java.util.Map; + +/** + * UnversionedNode specific to pessimistic locking, with legacy code. + * + * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) + * @since 3.0 + */ +@SuppressWarnings("deprecation") +public class PessimisticUnversionedNode<K, V> extends UnversionedNode<K, V> +{ + /** + * Lock manager that manages locks to be acquired when accessing the node inside a transaction. Lazy set just in case + * locking is not needed. + */ + protected transient IdentityLock lock = null; + + public PessimisticUnversionedNode(Object name, Fqn fqn, Map data, CacheSPI<K, V> cache) + { + super(name, fqn, data, cache); + } + + // ------ lock-per-node paradigm + + protected synchronized void initLock() + { + if (lock == null) + { + lock = new IdentityLock(lockStrategyFactory, delegate); + } + } + + @Override + public IdentityLock getLock() + { + initLock(); + return lock; + } + + @Override + public String toString() + { + StringBuilder sb = new StringBuilder(super.toString()); + if (lock != null) + { + if (lock.isReadLocked()) + { + sb.append(" RL"); + } + if (lock.isWriteLocked()) + { + sb.append(" WL"); + } + } + return sb.toString(); + } + + // ------ legacy addChild methods that used a lot of implicit locks. + + @Override + public void addChildDirect(NodeSPI<K, V> child) + { + if (child.getFqn().getParent().equals(getFqn())) + { + synchronized (this) + { + children().put(child.getFqn().getLastElement(), child); + } + } + else + throw new CacheException("Attempting to add a child [" + child.getFqn() + "] to [" + getFqn() + "]. Can only add direct children."); + } + + @Override + protected NodeSPI<K, V> getOrCreateChild(Object childName, GlobalTransaction gtx, boolean createIfNotExists, boolean notify) + { + NodeSPI<K, V> child; + if (childName == null) + { + throw new IllegalArgumentException("null child name"); + } + + child = (NodeSPI<K, V>) children().get(childName); + InvocationContext ctx = cache.getInvocationContext(); + if (createIfNotExists && child == null) + { + // construct the new child outside the synchronized block to avoid + // spending any more time than necessary in the synchronized section + Fqn childFqn = Fqn.fromRelativeElements(fqn, childName); + NodeSPI<K, V> newChild = nodeFactory.createNode(childName, childFqn, delegate, null, true); + if (newChild == null) + { + throw new IllegalStateException(); + } + synchronized (this) + { + // check again to see if the child exists + // after acquiring exclusive lock + child = (NodeSPI<K, V>) children().get(childName); + if (child == null) + { + if (notify) cache.getNotifier().notifyNodeCreated(childFqn, true, ctx); + child = newChild; + children.put(childName, child); + } + } + + // notify if we actually created a new child + if (newChild == child) + { + if (trace) log.trace("created child: fqn=" + childFqn); + + if (gtx != null) + { + CreateNodeCommand createNodeCommand = commandsFactory.buildCreateNodeCommand(childFqn); + ctx.getTransactionContext().addModification(createNodeCommand); + } + if (notify) cache.getNotifier().notifyNodeCreated(childFqn, false, ctx); + } + } + return child; + + } +} Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-16 08:34:15 UTC (rev 6288) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-16 09:20:10 UTC (rev 6289) @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; /** * Basic data node class. Throws {@link UnsupportedOperationException} for version-specific methods like {@link #getVersion()} and @@ -33,7 +34,6 @@ * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 2.0.0 */ -@SuppressWarnings("deprecation") public class UnversionedNode<K, V> extends AbstractNode<K, V> implements InternalNode<K, V> { /** @@ -43,12 +43,6 @@ protected static final boolean trace = log.isTraceEnabled(); /** - * Lock manager that manages locks to be acquired when accessing the node inside a transaction. Lazy set just in case - * locking is not needed. - */ - protected transient IdentityLock lock = null; - - /** * A reference of the CacheImpl instance. */ transient CacheSPI<K, V> cache; @@ -61,7 +55,7 @@ protected NodeSPI<K, V> delegate; CommandsFactory commandsFactory; protected LockStrategyFactory lockStrategyFactory; - private NodeFactory<K, V> nodeFactory; + protected NodeFactory<K, V> nodeFactory; /** * Constructs a new node with an FQN of Root. @@ -91,6 +85,7 @@ * @param data data to add to node * @param cache cache reference */ + @SuppressWarnings("unchecked") public UnversionedNode(Object name, Fqn fqn, Map data, CacheSPI<K, V> cache) { if (cache == null) @@ -108,6 +103,12 @@ init(); if (data != null && !data.isEmpty()) setInternalState(data); + + // if this is a root node, create the child map. + if (fqn.isRoot()) + { + children = new ConcurrentHashMap<Object, Node<K, V>>(64, .5f, 16); + } } /** @@ -160,29 +161,19 @@ return cache.peek(fqn.getParent(), true); } - protected synchronized void initLock() + protected final ConcurrentMap<Object, Node<K, V>> children() { - if (lock == null) - { - lock = new IdentityLock(lockStrategyFactory, delegate); - } + if (children == null) initChildMap(); + return children; } - private synchronized Map<Object, Node<K, V>> children() + private synchronized void initChildMap() { if (children == null) { - if (getFqn().isRoot()) - { - children = new ConcurrentHashMap<Object, Node<K, V>>(64, .5f, 16); - } - else - { - // Less segments to save memory - children = new ConcurrentHashMap<Object, Node<K, V>>(4, .75f, 4); - } + // Fewer segments to save memory + children = new ConcurrentHashMap<Object, Node<K, V>>(4, .75f, 4); } - return children; } public CacheSPI<K, V> getCache() @@ -217,21 +208,10 @@ return data.get(key); } - - private boolean isReadLocked() - { - return lock != null && lock.isReadLocked(); - } - - private boolean isWriteLocked() - { - return lock != null && lock.isWriteLocked(); - } - + @SuppressWarnings("deprecation") public IdentityLock getLock() { - initLock(); - return lock; + throw new UnsupportedOperationException("Not supported in this implementation!"); } public Map<K, V> getDataDirect() @@ -251,12 +231,12 @@ return data.put(key, value); } - public NodeSPI<K, V> getOrCreateChild(Object child_name, GlobalTransaction gtx, boolean notify) + public NodeSPI<K, V> getOrCreateChild(Object childName, GlobalTransaction gtx, boolean notify) { - return getOrCreateChild(child_name, gtx, true, notify); + return getOrCreateChild(childName, gtx, true, notify); } - private NodeSPI<K, V> getOrCreateChild(Object childName, GlobalTransaction gtx, boolean createIfNotExists, boolean notify) + protected NodeSPI<K, V> getOrCreateChild(Object childName, GlobalTransaction gtx, boolean createIfNotExists, boolean notify) { NodeSPI<K, V> child; if (childName == null) @@ -268,30 +248,16 @@ InvocationContext ctx = cache.getInvocationContext(); if (createIfNotExists && child == null) { - // construct the new child outside the synchronized block to avoid - // spending any more time than necessary in the synchronized section Fqn childFqn = Fqn.fromRelativeElements(fqn, childName); NodeSPI<K, V> newChild = nodeFactory.createNode(childName, childFqn, delegate, null, true); - if (newChild == null) - { - throw new IllegalStateException(); - } - synchronized (this) - { - // check again to see if the child exists - // after acquiring exclusive lock - child = (NodeSPI<K, V>) children().get(childName); - if (child == null) - { - if (notify) cache.getNotifier().notifyNodeCreated(childFqn, true, ctx); - child = newChild; - children.put(childName, child); - } - } - // notify if we actually created a new child - if (newChild == child) + child = (NodeSPI<K, V>) children().putIfAbsent(childName, newChild); + + if (child == null) { + // addChild actually succeeded! + child = newChild; + if (trace) log.trace("created child: fqn=" + childFqn); if (gtx != null) @@ -299,11 +265,16 @@ CreateNodeCommand createNodeCommand = commandsFactory.buildCreateNodeCommand(childFqn); ctx.getTransactionContext().addModification(createNodeCommand); } - if (notify) cache.getNotifier().notifyNodeCreated(childFqn, false, ctx); + + // notify if we actually created a new child + if (notify) + { + cache.getNotifier().notifyNodeCreated(childFqn, true, ctx); + cache.getNotifier().notifyNodeCreated(childFqn, false, ctx); + } } } return child; - } public V remove(K key) @@ -417,32 +388,22 @@ sb.append("]"); } } - if (lock != null) - { - if (isReadLocked()) - { - sb.append(" RL"); - } - if (isWriteLocked()) - { - sb.append(" WL"); - } - } sb.append("]"); return sb.toString(); } public void addChildDirect(NodeSPI<K, V> child) { - if (child.getFqn().getParent().equals(getFqn())) + Fqn childFqn = child.getFqn(); + Fqn parentFqn = childFqn.getParent(); + if (parentFqn.equals(fqn)) { - synchronized (this) - { - children().put(child.getFqn().getLastElement(), child); - } + children().put(childFqn.getLastElement(), child); } else - throw new CacheException("Attempting to add a child [" + child.getFqn() + "] to [" + getFqn() + "]. Can only add direct children."); + { + throw new CacheException("Attempting to add a child [" + childFqn + "] to [" + fqn + "]. Can only add direct children."); + } } public NodeSPI<K, V> addChildDirect(Fqn f) Modified: core/trunk/src/main/java/org/jboss/cache/VersionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-07-16 08:34:15 UTC (rev 6288) +++ core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-07-16 09:20:10 UTC (rev 6289) @@ -24,7 +24,7 @@ * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> * @since 2.0.0 */ -public class VersionedNode<K, V> extends UnversionedNode<K, V> +public class VersionedNode<K, V> extends PessimisticUnversionedNode<K, V> { private static final String DATA_VERSION_INTERNAL_KEY = "_JBOSS_INTERNAL_OPTIMISTIC_DATA_VERSION"; private DataVersion version; // make sure this is NOT initialized to anything, even a null! Since the UnversionedNode constructor may set this value based on a data version passed along in the data map. Modified: core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java 2008-07-16 08:34:15 UTC (rev 6288) +++ core/trunk/src/main/java/org/jboss/cache/lock/MVCCLockManager.java 2008-07-16 09:20:10 UTC (rev 6289) @@ -320,7 +320,8 @@ */ final int hash(Fqn fqn) { - int h = fqn.hashCode(); + // TODO: 3.0.0: Find an efficient algorithm to ensure a proper spread of locks across Fqns. + int h = fqn.toString().hashCode(); h += ~(h << 9); h ^= (h >>> 14); h += (h << 4);

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6288 - in core/trunk/src/test/java/org/jboss/cache: config/parsing and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-07-16 04:34:15 -0400 (Wed, 16 Jul 2008) New Revision: 6288 Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java Log: allowWriteSkew -> writeSkewCheck : updated tests Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java 2008-07-16 08:31:16 UTC (rev 6287) +++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/WriteSkewTest.java 2008-07-16 08:34:15 UTC (rev 6288) @@ -65,17 +65,17 @@ LockAssert.assertNoLocks(lockManager, icc); } - public void testAllowWriteSkew() throws Exception + public void testDontCheckWriteSkew() throws Exception { - cache.getConfiguration().setAllowWriteSkew(true); + cache.getConfiguration().setWriteSkewCheck(false); cache.start(); postStart(); doTest(true); } - public void testDontAllowWriteSkew() throws Exception + public void testCheckWriteSkew() throws Exception { - cache.getConfiguration().setAllowWriteSkew(false); + cache.getConfiguration().setWriteSkewCheck(true); cache.start(); postStart(); doTest(false); Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-07-16 08:31:16 UTC (rev 6287) +++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-07-16 08:34:15 UTC (rev 6288) @@ -1,6 +1,12 @@ package org.jboss.cache.config.parsing; -import org.jboss.cache.config.*; +import org.jboss.cache.config.BuddyReplicationConfig; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.CustomInterceptorConfig; +import org.jboss.cache.config.EvictionConfig; +import org.jboss.cache.config.EvictionRegionConfig; +import org.jboss.cache.config.OldFileFormatException; import org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor; import org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor; import org.jboss.cache.eviction.LRUConfiguration; @@ -37,7 +43,8 @@ { parser.parseFile("configs/conf2x/pess-local.xml"); assert false : "exception expected"; - } catch (OldFileFormatException e) + } + catch (OldFileFormatException e) { //expectd } @@ -254,7 +261,7 @@ public void testMvccAttributes() { - assert config.isAllowWriteSkew(); + assert !config.isWriteSkewCheck(); assert config.getConcurrencyLevel() == 21; } }

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6287 - in core/trunk/src: main/java/org/jboss/cache/config and 5 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-07-16 04:31:16 -0400 (Wed, 16 Jul 2008) New Revision: 6287 Modified: core/trunk/src/main/java/org/jboss/cache/InternalNode.java core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java core/trunk/src/main/java/org/jboss/cache/config/Configuration.java core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java core/trunk/src/main/resources/jbosscache-config-3.0.xsd core/trunk/src/test/resources/configs/parser-test.xml Log: allowWriteSkew -> writeSkewCheck Modified: core/trunk/src/main/java/org/jboss/cache/InternalNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/InternalNode.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/InternalNode.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -121,12 +121,4 @@ void addChild(Object nodeName, Node<K, V> nodeToAdd); void printDetails(StringBuilder sb, int indent); - - /** - * Very similar to getChildrenMapDirect() except that if the internal map is null, it initialises the map if init is true. - * - * @param init if true, will init internal data structures. - * @return a Map or null. - */ - Map<Object, Node<K, V>> getChildrenMapDirect(boolean init); } Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -531,11 +531,6 @@ return children; } - public Map<Object, Node<K, V>> getChildrenMapDirect(boolean init) - { - return init ? children() : children; - } - public void setChildrenMapDirect(Map<Object, Node<K, V>> children) { if (children == null) Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -203,7 +203,7 @@ private int objectInputStreamPoolSize = 50; private int objectOutputStreamPoolSize = 50; private List<CustomInterceptorConfig> customInterceptors = Collections.emptyList(); - private boolean allowWriteSkew = false; + private boolean writeSkewCheck = false; private int concurrencyLevel = 50; @Start(priority = 1) @@ -216,7 +216,6 @@ { case NONE: case READ_UNCOMMITTED: - System.out.println("Upgrading!"); isolationLevel = IsolationLevel.READ_COMMITTED; break; case SERIALIZABLE: @@ -240,15 +239,15 @@ return marshaller; } - public boolean isAllowWriteSkew() + public boolean isWriteSkewCheck() { - return allowWriteSkew; + return writeSkewCheck; } - public void setAllowWriteSkew(boolean allowWriteSkew) + public void setWriteSkewCheck(boolean writeSkewCheck) { - testImmutability("allowWriteSkew"); - this.allowWriteSkew = allowWriteSkew; + testImmutability("writeSkewCheck"); + this.writeSkewCheck = writeSkewCheck; } public int getConcurrencyLevel() Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -23,16 +23,20 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.cache.config.*; +import org.jboss.cache.config.BuddyReplicationConfig; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.Configuration; +import org.jboss.cache.config.ConfigurationException; +import org.jboss.cache.config.CustomInterceptorConfig; +import org.jboss.cache.config.OldFileFormatException; import org.jboss.cache.config.parsing.element.BuddyElementParser; +import org.jboss.cache.config.parsing.element.CustomInterceptorsElementParser; import org.jboss.cache.config.parsing.element.EvictionElementParser; import org.jboss.cache.config.parsing.element.LoadersElementParser; -import org.jboss.cache.config.parsing.element.CustomInterceptorsElementParser; import org.jboss.cache.lock.IsolationLevel; import org.jboss.cache.util.FileLookup; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.NodeList; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -40,9 +44,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.io.InputStream; -import java.util.ArrayList; import java.util.List; -import java.util.Properties; /** * Reads in XMLconfiguration files and spits out a {@link org.jboss.cache.config.Configuration} object. @@ -173,7 +175,8 @@ configureEviction(getSingleElement("eviction")); configureCacheLoaders(getSingleElement("loaders")); configureCustomInterceptors(getSingleElement("customInterceptors")); - } catch (Exception e) + } + catch (Exception e) { throw new ConfigurationException("Unexpected excetion while parsing the configuration file", e); } @@ -353,8 +356,8 @@ if (existsAttribute(lockAcquisitionTimeout)) config.setLockAcquisitionTimeout(getLong(lockAcquisitionTimeout)); String nodeLockingScheme = getAttributeValue(element, "nodeLockingScheme"); if (existsAttribute(nodeLockingScheme)) config.setNodeLockingScheme(nodeLockingScheme); - String allowWriteSkew = getAttributeValue(element, "allowWriteSkew"); - if (existsAttribute(allowWriteSkew)) config.setAllowWriteSkew(getBoolean(allowWriteSkew)); + String writeSkewCheck = getAttributeValue(element, "writeSkewCheck"); + if (existsAttribute(writeSkewCheck)) config.setWriteSkewCheck(getBoolean(writeSkewCheck)); String concurrencyLevel = getAttributeValue(element, "concurrencyLevel"); if (existsAttribute(concurrencyLevel)) config.setConcurrencyLevel(getInt(concurrencyLevel)); } @@ -380,7 +383,8 @@ Document doc = parser.parse(config); root = doc.getDocumentElement(); root.normalize(); - } catch (Exception e) + } + catch (Exception e) { log.error(e); throw new ConfigurationException("Could not parse the config file"); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/MVCCLockingInterceptor.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -26,7 +26,6 @@ import org.jboss.cache.commands.write.RemoveKeyCommand; import org.jboss.cache.commands.write.RemoveNodeCommand; import org.jboss.cache.factories.annotations.Inject; -import org.jboss.cache.factories.annotations.Start; import org.jboss.cache.interceptors.base.PrePostProcessingCommandInterceptor; import org.jboss.cache.invocation.InvocationContext; import org.jboss.cache.lock.LockManager; @@ -47,7 +46,6 @@ */ public class MVCCLockingInterceptor extends PrePostProcessingCommandInterceptor { - boolean allowWriteSkew; LockManager lockManager; DataContainer dataContainer; NodeFactory nodeFactory; @@ -62,12 +60,6 @@ this.helper = helper; } - @Start - public void start() - { - allowWriteSkew = configuration.isAllowWriteSkew(); - } - @Override protected boolean doBeforeCall(InvocationContext ctx, VisitableCommand command) { Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -41,7 +41,7 @@ private long defaultLockAcquisitionTimeout; private LockManager lockManager; private Configuration configuration; - private boolean allowWriteSkew; + private boolean writeSkewCheck; private boolean lockParentForChildInsertRemove; @Inject @@ -57,7 +57,7 @@ public void start() { defaultLockAcquisitionTimeout = configuration.getLockAcquisitionTimeout(); - allowWriteSkew = configuration.isAllowWriteSkew(); + writeSkewCheck = configuration.isWriteSkewCheck(); lockParentForChildInsertRemove = configuration.isLockParentForChildInsertRemove(); } @@ -176,7 +176,7 @@ if (lockForWriting && acquireLock(context, fqn)) { // create a copy of the underlying node - n.markForUpdate(context, dataContainer, nodeFactory, allowWriteSkew); + n.markForUpdate(context, dataContainer, nodeFactory, writeSkewCheck); } if (trace) log.trace("Retrieving wrapped node " + fqn); if (n.isDeleted() && createIfAbsent) @@ -201,7 +201,7 @@ } n = nodeFactory.createWrappedNode(in); context.putLookedUpNode(fqn, n); - if (needToCopy) n.markForUpdate(context, dataContainer, nodeFactory, allowWriteSkew); + if (needToCopy) n.markForUpdate(context, dataContainer, nodeFactory, writeSkewCheck); } else if (createIfAbsent) // else, do we need to create one? { @@ -213,7 +213,7 @@ if (parentLockNeeded && acquireLock(context, parentFqn)) { ReadCommittedNode parentRCN = (ReadCommittedNode) context.lookUpNode(parentFqn); - parentRCN.markForUpdate(context, dataContainer, nodeFactory, allowWriteSkew); + parentRCN.markForUpdate(context, dataContainer, nodeFactory, writeSkewCheck); } // now to lock and create the node. @@ -227,7 +227,7 @@ n = nodeFactory.createWrappedNode(in); n.setCreated(true); context.putLookedUpNode(fqn, n); - n.markForUpdate(context, dataContainer, nodeFactory, allowWriteSkew); + n.markForUpdate(context, dataContainer, nodeFactory, writeSkewCheck); } } @@ -308,7 +308,7 @@ ReadCommittedNode rcn = wrapNodeForWriting(ctx, fqn, true, false, true, false, false); if (rcn != null) { - rcn.markForUpdate(ctx, dataContainer, nodeFactory, allowWriteSkew); + rcn.markForUpdate(ctx, dataContainer, nodeFactory, writeSkewCheck); ReadCommittedNode parent = (ReadCommittedNode) ctx.lookUpNode(fqn.getParent()); parent.addChildDirect(nodeFactory.createNodeInvocationDelegate(rcn.getDelegationTarget(), configuration.getIsolationLevel() == IsolationLevel.READ_COMMITTED)); @@ -335,7 +335,7 @@ if (needToCopyNode && node != null && !node.isChanged()) // node could be null if using read-committed { - node.markForUpdate(ctx, dataContainer, nodeFactory, allowWriteSkew); + node.markForUpdate(ctx, dataContainer, nodeFactory, writeSkewCheck); } } Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/mvcc/NodeReference.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -155,11 +155,6 @@ return delegate.getChildrenMapDirect(); } - public Map<Object, Node<K, V>> getChildrenMapDirect(boolean b) - { - return delegate.getChildrenMapDirect(b); - } - public void setChildrenMapDirect(Map<Object, Node<K, V>> children) { delegate.setChildrenMapDirect(children); Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -44,9 +44,9 @@ * @param ctx invocation context * @param container data container * @param nodeFactory node factory for creating new nodes/copies. - * @param allowWriteSkew if true, write skews are allowed. Only makes sense with repeatable read. + * @param writeSkewCheck if true, and the node supports write skew checking, nodes are tested for write skews. */ - public void markForUpdate(InvocationContext ctx, DataContainer container, NodeFactory nodeFactory, boolean allowWriteSkew) + public void markForUpdate(InvocationContext ctx, DataContainer container, NodeFactory nodeFactory, boolean writeSkewCheck) { if (changed) return; // already copied Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/java/org/jboss/cache/mvcc/RepeatableReadNode.java 2008-07-16 08:31:16 UTC (rev 6287) @@ -27,7 +27,7 @@ } @Override - public void markForUpdate(InvocationContext ctx, DataContainer container, NodeFactory nodeFactory, boolean allowWriteSkew) + public void markForUpdate(InvocationContext ctx, DataContainer container, NodeFactory nodeFactory, boolean writeSkewCheck) { if (changed) return; // already copied @@ -36,14 +36,17 @@ // mark node as changed. changed = true; - // check for write skew. - NodeInvocationDelegate underlyingNode = (NodeInvocationDelegate) container.peek(fqn, false, true); // even check for invalid nodes. we should check tombstones too. + if (writeSkewCheck) + { + // check for write skew. + NodeInvocationDelegate underlyingNode = (NodeInvocationDelegate) container.peek(fqn, false, true); // even check for invalid nodes. we should check tombstones too. - if (!allowWriteSkew && underlyingNode != null && underlyingNode.getDelegationTarget() != node) - { - String errormsg = new StringBuilder().append("Detected write skew on Fqn [").append(fqn).append("]. Another process has changed the node since we last read it!").toString(); - if (log.isWarnEnabled()) log.warn(errormsg + ". Unable to copy node for update."); - throw new DataVersioningException(errormsg); + if (underlyingNode != null && underlyingNode.getDelegationTarget() != node) + { + String errormsg = new StringBuilder().append("Detected write skew on Fqn [").append(fqn).append("]. Another process has changed the node since we last read it!").toString(); + if (log.isWarnEnabled()) log.warn(errormsg + ". Unable to copy node for update."); + throw new DataVersioningException(errormsg); + } } // make a backup copy Modified: core/trunk/src/main/resources/jbosscache-config-3.0.xsd =================================================================== --- core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-16 08:31:16 UTC (rev 6287) @@ -38,7 +38,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="allowWriteSkew" type="booleanType"/> + <xs:attribute name="writeSkewCheck" type="booleanType"/> <xs:attribute name="concurrencyLevel" type="xs:integer"/> </xs:complexType> Modified: core/trunk/src/test/resources/configs/parser-test.xml =================================================================== --- core/trunk/src/test/resources/configs/parser-test.xml 2008-07-16 01:12:42 UTC (rev 6286) +++ core/trunk/src/test/resources/configs/parser-test.xml 2008-07-16 08:31:16 UTC (rev 6287) @@ -7,7 +7,7 @@ <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234" - nodeLockingScheme="mvcc" allowWriteSkew="true" concurrencyLevel="21"/> + nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>

17 years, 5 months

1
0
0 / 0

JBoss Cache SVN: r6286 - core/trunk/src/main/java/org/jboss/cache.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-07-15 21:12:42 -0400 (Tue, 15 Jul 2008) New Revision: 6286 Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java Log: Broken cast Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-15 19:16:25 UTC (rev 6285) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-16 01:12:42 UTC (rev 6286) @@ -18,6 +18,7 @@ import org.jboss.cache.optimistic.DataVersion; import org.jboss.cache.transaction.GlobalTransaction; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -670,7 +671,7 @@ { if (children != null && !children.isEmpty()) { - return Collections.unmodifiableSet(new HashSet<NodeSPI<K, V>>((Set) children.values())); + return Collections.unmodifiableSet(new HashSet<NodeSPI<K, V>>((Collection) children.values())); } else {

17 years, 5 months

1
0
0 / 0

Hudson build completed: jboss-cache-core-2.2.X-jdk1.6 » JBoss Cache - Core Edition #6

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-2.2.X-jdk1.6/org.j...

17 years, 5 months

1
0
0 / 0

Hudson build is still unstable: jbosscache-core-trunk-code-coverage » JBoss Cache - Core Edition #4

by jboss-qa-internal＠redhat.com

See http://hudson.qa.jboss.com/hudson/job/jbosscache-core-trunk-code-coverage...

17 years, 5 months

1
11
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits July 2008