[jboss-svn-commits] JBL Code SVN: r31276 - in labs/jbosstm/workspace/whitingjr/trunk/performance: src/main/resources and 22 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 28 10:02:15 EST 2010
Author: whitingjr
Date: 2010-01-28 10:02:14 -0500 (Thu, 28 Jan 2010)
New Revision: 31276
Added:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/jboss-aop_1_0.dtd
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/connection.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/connection.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/as-csv.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes-02.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/flatten-frames.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/package-switch-compactor.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/sort-frames.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/connection.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/connection.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceA/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceB/resource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/MultiThreadedTest.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/WarmedUpTest.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeTask.java
labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml
Log:
Updated with configuration for datasources.
Added processing of profiling data.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath 2010-01-28 15:02:14 UTC (rev 31276)
@@ -11,5 +11,5 @@
<classpathentry kind="lib" path="lib/jboss-ejb3-all.jar"/>
<classpathentry kind="lib" path="lib/thirdparty-all.jar"/>
<classpathentry kind="lib" path="lib/caveatemptor-jpa.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt 2010-01-28 15:02:14 UTC (rev 31276)
@@ -4,27 +4,32 @@
This project integrates a profiling tool (JIP) with the sample Caveat Emptor application. The purpose
is quantifying the proportion of time necessary to use reliable state changes across multiple
- resources versus unreliable state changes (failure intollerant).
-
+ resources versus unreliable state changes (failure intollerant) which can lead to inconsistent
+ data.
+
The profiling tool out of the box is an open source project called Java Interactive Profiler (JIP).
Using JIP allows the freedom for distributing this project and trying the profiling framework
without proprietary software. The JIP profiler provides adequate functionality for capturing
data interactively and storing it in XML format for later analysis.
-
- Using the TestNG framework allowed configuring the testing framework to warmup the
- system being profiled without the profiler running. The framework uses multi-threading to run
- tests concurrently.
+ Using the TestNG framework provides the testing framework configuration. The testing
+ framework has been created with two iterations. The first is a warmup iteration to perform
+ class loading and JIT compilation. The second is the "steady state" iteration. It is the
+ second iteration which this is of interest and the focus of this project.
+ The framework uses multi-threading to run tests concurrently and concurrency classes to
+ co-ordinate the two iterations avoiding overlapping of asynchronous executions.
+
Each run produces a comma separated variable file. Which contains the average values for several
categories. Categories can be made up of particular methods. The main categories for this project
are category-0 which is the whole test method, category-B which is the read and write with
resource A, category-C is the read and write for resource B, category-D is the commit and category-A
is 0-(B+C+D) and is called 'other'.
-
+
Additional information.
The project uses a combination of Ant, JIP and TestNG for executing test cases. To analyse
- the profiling data XSL stylesheets are used to generate summary information.
+ the profiling data XSL stylesheets are used for processing XML and generating useful
+ summary information.
Some optimisations that change the behaviour of resources participating in transactions are
supported. Such as the Last Resource Commit Optimisation.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -3,20 +3,25 @@
# required
transaction.strategy=jta-managed
-resource.A.db.installation=remote-db
-resource.A.db.vendor=postgresql
+resource.A.db.installation=co-located-db
+resource.A.db.vendor=oracle
resource.A.jdbc-datasource=local-tx
-resource.B.db.installation=remote-db
-resource.B.db.vendor=mysql
+resource.B.db.installation=co-located-db
+resource.B.db.vendor=oracle
resource.B.jdbc-datasource=local-tx
-profiler=jprofiler
+profiler=jip
+
# optional
transaction.log.store=logs
+threads=45
+# y or n
+profiled=y
+
# does the profiled wait for a debugger to be attached ?
# y or n
-suspend=y
+suspend=n
-testcase.xpaths=auction.dao.ejb3.GenericEJB3DAO:makePersistent
+testcase.xpaths=
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2010-01-28 15:02:14 UTC (rev 31276)
@@ -54,7 +54,7 @@
<property file="build.properties" />
<property name="required-args" value="-Dtransaction.strategy=value -Dresource.A.db.installation=value -Dresource.A.db.vendor=value -Dresource.A.jdbc-datasource=value -Dprofiler=value" />
- <property name="optional-args" value="-Dtransaction.log.store=value -Dresource.B.db.installation=value -Dresource.B.db.vendor=value -Dresource.B.jdbc-datasource=value" />
+ <property name="optional-args" value="-Dtransaction.log.store=value -Dresource.B.db.installation=value -Dresource.B.db.vendor=value -Dresource.B.jdbc-datasource=value -Dthreads=value" />
<property name="driver.home" value="lib/dbdrivers" />
<property name="properties.home" value="src/main/resources/properties" />
@@ -115,6 +115,16 @@
<pathelement path="src/test/resources" />
</path>
+ <fileset dir="build/classes" id="configuration.path.1">
+ <include name="*.xml" />
+ <include name="*.properties" />
+ </fileset>
+
+ <fileset id="configuration.path.2" dir=".">
+ <include name="*.properties" />
+ </fileset>
+
+
<taskdef resource="testngtasks" classpathref="test.classpath" />
<target name="check-arguments">
@@ -253,12 +263,28 @@
<expandproperties />
</filterchain>
</copy>
-
- <property name="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}" />
+
+ <condition property="db-vendor-profiling" value="${db-vendor-profiling.A}">
+ <equals arg1="${db-vendor-profiling.A}" arg2="${db-vendor-profiling.B}"/>
+ </condition>
+ <condition property="db-vendor-profiling" value="${db-vendor-profiling.A},${db-vendor-profiling.B}">
+ <not>
+ <equals arg1="${db-vendor-profiling.A}" arg2="${db-vendor-profiling.B}"/>
+ </not>
+ </condition>
+
+ <condition property="profiling-classes" value="${db-vendor-profiling},${profiling.classes.test.framework}">
+ <equals arg1="${profiled}" arg2="y"/>
+ </condition>
+ <condition property="profiling-classes" value="dummy">
+ <equals arg1="${profiled}" arg2="n"/>
+ </condition>
+
<copy file="src/main/resources/profile-remote.properties" tofile="build/classes/profile.properties">
<filterchain>
<expandproperties />
<expandproperties />
+ <expandproperties />
</filterchain>
</copy>
@@ -284,10 +310,10 @@
<mkdir dir="${test.output.dir}" />
<loadproperties srcfile="src/main/resources/properties/profiler/${profiler}/configuration.properties">
- <filterchain>
- <expandproperties />
- </filterchain>
- </loadproperties>
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </loadproperties>
<copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
<filterchain>
<expandproperties />
@@ -305,8 +331,9 @@
</unzip>
<delete dir="logs/profiled" />
<mkdir dir="logs/profiled" />
- <property name="db-vendor-package.xpath" value="${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}"/>
- <loadproperties srcfile="src/main/resources/properties/categorise/categorise.properties"></loadproperties>
+ <property name="db-vendor-package.xpath" value="${db-vendor-package.xpath.A},${db-vendor-package.xpath.B}" />
+ <loadproperties srcfile="src/main/resources/properties/categorise/categorise.properties">
+ </loadproperties>
</target>
@@ -317,11 +344,12 @@
<target name="profile" depends="compile">
<testng outputDir="${test.output.dir}">
- <jvmarg value="${profiler.agent.argument}" /> <!-- property configuration allows agentlib, agentpath and javaagent support -->
+ <jvmarg value="${profiler.agent.argument}" />
+ <!-- property configuration allows agentlib, agentpath and javaagent support -->
<jvmarg value="${profiler.vm.arguments}" />
<jvmarg value="-Djboss.server.data.dir=${jboss.server.data.dir}" />
<jvmarg value="-Xms256m" />
- <jvmarg value="-Xmx756m" />
+ <jvmarg value="-Xmx756m" />
<jvmarg value="-Xdebug" />
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=8000" />
<classpath>
@@ -330,16 +358,26 @@
<xmlfileset file="build/classes/testsuite-integration.xml" />
</testng>
</target>
-
+
<target name="categorise" depends="profile">
-
+
<property name="xpaths-csv" value="${testcase.xpaths},${db-vendor.method.xpaths.A},${db-vendor.method.xpaths.B}" />
<tstamp />
<echo message="db vendor package[${db-vendor-package.xpath}]">
</echo>
- <property name="time-stamp" value="${TSTAMP}"/>
+ <property name="time-stamp" value="${TSTAMP}" />
+
+ <mkdir dir="logs/${DSTAMP}" />
- <xslt style="src/main/resources/xsl/analyseresults.xsl" in="logs/profiled/DATE-TIME-profile.xml" out="logs/${DSTAMP}-${time-stamp}-profile-analysis-01.xml">
+ <mkdir dir="logs/${DSTAMP}/${DSTAMP}-${time-stamp}" />
+ <mkdir dir="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/conf" />
+
+ <copy todir="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/conf">
+ <fileset refid="configuration.path.1"/>
+ <fileset refid="configuration.path.2"/>
+ </copy>
+
+ <xslt style="src/main/resources/xsl/analyseresults.xsl" in="logs/profiled/DATE-TIME-profile.xml" out="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-01.xml">
<outputproperty name="indent" value="yes" />
<param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
<param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
@@ -349,47 +387,89 @@
<param name="categoryD-method" expression="${categoryD.methods}" />
<param name="xpaths" expression="${xpaths-csv}" />
</xslt>
- <copy file="src/main/resources/xsl/merge-thread-results.xsl" tofile="logs/merge-thread-results.xsl">
+ <copy file="src/main/resources/xsl/merge-thread-results.xsl" tofile="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/merge-thread-results.xsl">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <xslt style="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/merge-thread-results.xsl" in="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-01.xml" out="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-02.xml" />
+
+ <copy file="src/main/resources/xsl/average-results.xsl" tofile="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/average-results.xsl">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <xslt style="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/average-results.xsl" in="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-02.xml" out="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-03.xml" />
+
+ <copy file="src/main/resources/xsl/agregate.xsl" tofile="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/agregate.xsl">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <xslt style="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/agregate.xsl" in="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-03.xml" out="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-04.xml" />
+
+ <xslt style="src/main/resources/xsl/convert-xml-to-csv.xsl" in="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis-04.xml" out="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${time-stamp}-profile-analysis.csv">
+ <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
+ <param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
+ </xslt>
+
+ <copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${DSTAMP}/${DSTAMP}-${time-stamp}/${DSTAMP}-${TSTAMP}-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" />
+
+ </target>
+
+ <target name="usage">
+ <echo>Usage: ant ${required-args} [${optional-args}]</echo>
+ </target>
+
+ <target name="transform">
+ <property name="db-vendor-package.A" value="com.mysql" />
+ <delete file="logs/agregate.xsl" />
+
+ </target>
+ <target name="transform-switch-package">
+ <xslt style="src/main/resources/xsl/package-switch-compactor.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml"></xslt>
+ <xslt style="src/main/resources/xsl/flatten-frames.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-compacted.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-flattened.xml"></xslt>
+ <xslt style="src/main/resources/xsl/sort-frames.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-flattened.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-sorted.xml"></xslt>
+ <xslt style="src/main/resources/xsl/distinct-classes.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-sorted.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-distinct.xml"></xslt>
+ <xslt style="src/main/resources/xsl/as-csv.xsl" in="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-distinct.xml" out="logs/20100125-0919/20100125-0919-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-csv.xml"></xslt>
+ </target>
+
+ <target name="distinct">
+ <xslt style="src/main/resources/xsl/sort-frames.xsl" in="logs/combined-test-framework-classes.xml" out="logs/combined-test-framework-classes-sorted.xml"></xslt>
+ <xslt style="src/main/resources/xsl/distinct-classes.xsl" in="logs/combined-test-framework-classes-sorted.xml" out="logs/combined-test-framework-classes-distinct.xml"></xslt>
+ <xslt style="src/main/resources/xsl/as-csv.xsl" in="logs/combined-test-framework-classes-distinct.xml" out="logs/combined-test-framework-classes.csv"></xslt>
+ </target>
+
+ <target name="process-data">
+ <copy file="src/main/resources/xsl/merge-thread-results.xsl" tofile="logs/${date}/${datetime}/merge-thread-results.xsl">
<filterchain>
<expandproperties />
</filterchain>
</copy>
- <xslt style="logs/merge-thread-results.xsl" in="logs/${DSTAMP}-${time-stamp}-profile-analysis-01.xml" out="logs/${DSTAMP}-${time-stamp}-profile-analysis-02.xml"/>
+ <xslt style="logs/${date}/${datetime}/merge-thread-results.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-01.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-02.xml" />
- <copy file="src/main/resources/xsl/average-results.xsl" tofile="logs/average-results.xsl">
+ <copy file="src/main/resources/xsl/average-results.xsl" tofile="logs/${date}/${datetime}/average-results.xsl">
<filterchain>
<expandproperties />
</filterchain>
</copy>
- <xslt style="logs/average-results.xsl" in="logs/${DSTAMP}-${time-stamp}-profile-analysis-02.xml" out="logs/${DSTAMP}-${time-stamp}-profile-analysis-03.xml"/>
-
- <copy file="src/main/resources/xsl/agregate.xsl" tofile="logs/agregate.xsl">
+ <xslt style="logs/${date}/${datetime}/average-results.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-02.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-03.xml" />
+
+ <copy file="src/main/resources/xsl/agregate.xsl" tofile="logs/${date}/${datetime}/agregate.xsl">
<filterchain>
<expandproperties />
</filterchain>
</copy>
- <xslt style="logs/agregate.xsl" in="logs/${DSTAMP}-${time-stamp}-profile-analysis-03.xml" out="logs/${DSTAMP}-${time-stamp}-profile-analysis-04.xml"/>
-
- <xslt style="src/main/resources/xsl/convert-xml-to-csv.xsl" in="logs/${DSTAMP}-${time-stamp}-profile-analysis-04.xml" out="logs/${DSTAMP}-${time-stamp}-profile-analysis.csv">
- <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
+ <xslt style="logs/${date}/${datetime}/agregate.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-03.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis-04.xml" />
+
+ <xslt style="src/main/resources/xsl/convert-xml-to-csv.xsl" in="logs/${date}/${datetime}/${datetime}-profile-analysis-04.xml" out="logs/${date}/${datetime}/${datetime}-profile-analysis.csv">
+ <param name="db-vendor-package.A" expression="${db-vendor-package.xpath.A}" />
<param name="db-vendor-package.B" expression="${db-vendor-package.xpath.B}" />
- </xslt>
-
-
-
- <copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${DSTAMP}-${TSTAMP}-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" />
-
- </target>
+ </xslt>
- <target name="usage">
- <echo>Usage: ant ${required-args} [${optional-args}]</echo>
+ <copy file="logs/profiled/DATE-TIME-profile.xml" tofile="logs/${date}/${datetime}/${DSTAMP}-${TSTAMP}-${resource.A.db.vendor}-${resource.B.db.vendor}-profile-raw.xml" />
+
</target>
-
- <target name="transform">
- <property name="db-vendor-package.A" value="com.mysql"/>
- <delete file="logs/agregate.xsl"/>
-
- </target>
</project>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml 2010-01-28 15:02:14 UTC (rev 31276)
@@ -17,6 +17,7 @@
<artifactId>testng</artifactId>
<version>5.10</version>
<classifier>jdk15</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.mentorgen.tools.profile</groupId>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/basedata.xml 2010-01-28 15:02:14 UTC (rev 31276)
@@ -6,7 +6,7 @@
-->
<dataset>
- <USERS
+<USERS
USER_ID ="1"
OBJ_VERSION ="0"
FIRSTNAME ="John"
@@ -953,6 +953,823 @@
HOME_CITY ="Foocity"
DEFAULT_BILLING_DETAILS_ID ="[NULL]"
/>
+<USERS
+ USER_ID ="60"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser60"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="61"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser61"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="62"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser62"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="63"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser63"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="64"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser64"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="65"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser65"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="66"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser66"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="67"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser67"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="68"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser68"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="69"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser69"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="70"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser70"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="71"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser71"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="72"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser72"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="73"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser73"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="74"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser74"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="75"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser75"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="76"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser76"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="77"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser77"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="78"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser78"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="79"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser79"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="80"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser80"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="81"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser81"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="82"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser82"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="83"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser83"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="84"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser84"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="85"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser85"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="86"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser86"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="87"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser87"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="88"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser88"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="89"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser89"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="90"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser90"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="91"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser91"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="92"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser92"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="93"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser93"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="94"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser94"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="95"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser95"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="96"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser96"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="97"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser97"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="98"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser98"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="99"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser99"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="100"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser100"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="101"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser101"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="102"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser102"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="103"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser103"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="104"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser104"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="105"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser105"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="106"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser106"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="107"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser107"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="108"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser108"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="109"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser109"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+<USERS
+ USER_ID ="110"
+ OBJ_VERSION ="0"
+ FIRSTNAME ="Another"
+ LASTNAME ="User"
+ USERNAME ="anotheruser110"
+ PASSWD ="secret"
+ EMAIL ="anotheruser at mail.tld"
+ RANK ="0"
+ IS_ADMIN ="false"
+ CREATED ="2006-09-23 13:45:00"
+ HOME_STREET ="Foostreet"
+ HOME_ZIPCODE ="22222"
+ HOME_CITY ="Foocity"
+ DEFAULT_BILLING_DETAILS_ID ="[NULL]"
+ />
+
<BILLING_DETAILS
BILLING_DETAILS_ID ="1"
BILLING_DETAILS_TYPE ="CC"
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/jboss-aop_1_0.dtd
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/jboss-aop_1_0.dtd (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/jboss-aop_1_0.dtd 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!ELEMENT aop (interceptor|introduction|metadata-loader|metadata|
+ stack|aspect|pointcut|pluggable-pointcut|bind|
+ prepare|cflow-stack|dynamic-cflow|annotation-introduction|annotation|typedef|domain)+>
+
+<!ELEMENT domain (interceptor|introduction|metadata-loader|metadata|
+ stack|aspect|pointcut|pluggable-pointcut|bind|
+ prepare|cflow-stack|dynamic-cflow|annotation|annotation-introduction|typedef)+>
+<!ATTLIST domain name CDATA #REQUIRED>
+<!ATTLIST domain extends CDATA #IMPLIED>
+<!ATTLIST domain inheritBindings CDATA #IMPLIED>
+<!ATTLIST domain parentFirst CDATA #IMPLIED>
+
+
+<!ELEMENT interceptor ANY>
+<!ATTLIST interceptor name CDATA #IMPLIED>
+<!ATTLIST interceptor class CDATA #IMPLIED>
+<!ATTLIST interceptor factory CDATA #IMPLIED>
+<!ATTLIST interceptor scope (PER_VM|PER_CLASS|PER_INSTANCE|PER_JOINPOINT|PER_CLASS_JOINPOINT) "PER_VM">
+
+<!ELEMENT aspect ANY>
+<!ATTLIST aspect name CDATA #IMPLIED>
+<!ATTLIST aspect class CDATA #IMPLIED>
+<!ATTLIST aspect factory CDATA #IMPLIED>
+<!ATTLIST aspect scope (PER_VM|PER_CLASS|PER_INSTANCE|PER_JOINPOINT|PER_CLASS_JOINPOINT) "PER_VM">
+
+<!ELEMENT introduction (mixin*,interfaces)>
+<!ATTLIST introduction class CDATA #IMPLIED>
+<!ATTLIST introduction expr CDATA #IMPLIED>
+<!ELEMENT mixin (interfaces, class, construction?)>
+<!ATTLIST mixin transient (true|false) "true">
+<!ELEMENT interfaces (#PCDATA)>
+<!ELEMENT class (#PCDATA)>
+<!ELEMENT construction (#PCDATA)>
+
+<!ELEMENT metadata-loader EMPTY>
+<!ATTLIST metadata-loader tag CDATA #REQUIRED>
+<!ATTLIST metadata-loader class CDATA #REQUIRED>
+
+<!ELEMENT metadata ANY>
+<!ATTLIST metadata tag CDATA #REQUIRED>
+<!ATTLIST metadata class CDATA #REQUIRED>
+
+<!ELEMENT stack (interceptor|interceptor-ref|stack-ref|advice)+>
+<!ATTLIST stack name CDATA #REQUIRED>
+
+<!ELEMENT interceptor-ref EMPTY>
+<!ATTLIST interceptor-ref name CDATA #REQUIRED>
+
+<!ELEMENT stack-ref EMPTY>
+<!ATTLIST stack-ref name CDATA #REQUIRED>
+
+<!ELEMENT advice EMPTY>
+<!ATTLIST advice name CDATA #REQUIRED>
+<!ATTLIST advice aspect CDATA #REQUIRED>
+
+<!ELEMENT pointcut EMPTY>
+<!ATTLIST pointcut name CDATA #REQUIRED>
+<!ATTLIST pointcut expr CDATA #REQUIRED>
+
+<!ELEMENT prepare EMPTY>
+<!ATTLIST prepare expr CDATA #REQUIRED>
+
+<!ELEMENT pluggable-pointcut ANY>
+<!ATTLIST pluggable-pointcut name CDATA #REQUIRED>
+<!ATTLIST pluggable-pointcut class CDATA #REQUIRED>
+
+<!ELEMENT bind (interceptor|interceptor-ref|stack-ref|advice)+>
+<!ATTLIST bind name CDATA #IMPLIED>
+<!ATTLIST bind pointcut CDATA #REQUIRED>
+<!ATTLIST bind cflow CDATA #IMPLIED>
+
+<!ELEMENT cflow-stack (called|not-called)+>
+<!ATTLIST cflow-stack name CDATA #REQUIRED>
+
+<!ELEMENT called EMPTY>
+<!ATTLIST called expr CDATA #REQUIRED>
+<!ELEMENT not-called EMPTY>
+<!ATTLIST not-called expr CDATA #REQUIRED>
+
+
+<!ELEMENT dynamic-cflow EMPTY>
+<!ATTLIST dynamic-cflow name CDATA #REQUIRED>
+<!ATTLIST dynamic-cflow class CDATA #REQUIRED>
+
+<!ELEMENT annotation-introduction (#PCDATA)>
+<!ATTLIST annotation-introduction expr CDATA #REQUIRED>
+<!ATTLIST annotation-introduction invisible (true|false) #REQUIRED>
+
+<!ELEMENT annotation (#PCDATA)>
+<!ATTLIST annotation expr CDATA #REQUIRED>
+
+<!ELEMENT typedef EMPTY>
+<!ATTLIST typedef name CDATA #REQUIRED>
+<!ATTLIST typedef expr CDATA #REQUIRED>
+
+
+
+
+
+
+
+
+
+
+
+
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/log4j.xml 2010-01-28 15:02:14 UTC (rev 31276)
@@ -12,11 +12,11 @@
<param name="maxFileSize" value="500KB" />
<param name="maxBackupIndex" value="4" />
- <param name="Threshold" value="DEBUG" />
+ <param name="Threshold" value="ERROR" />
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %x %m%n" />
</layout>
</appender>
@@ -27,7 +27,7 @@
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] [%x] %m%n" />
</layout>
</appender>
@@ -35,12 +35,19 @@
<level value="INFO" />
<appender-ref ref="FILE" />
</logger>
+ <!--
<logger name="com.arjuna">
<level value="DEBUG" />
<appender-ref ref="FILE" />
</logger>
+ -->
+ <logger name="org.jboss.jbossts.performance.MultiThreadedTest">
+ <level value="INFO" />
+ <appender-ref ref="CONSOLE" />
+ </logger>
+
<logger name="org.jboss.jbossts.performance.resource.SynchronizeTask">
- <level value="ERROR" />
+ <level value="INFO" />
<appender-ref ref="CONSOLE" />
</logger>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/profile-remote.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -31,7 +31,7 @@
# to show
# default = 10 (ms)
#
-thread.compact.threshold.ms=1
+thread.compact.threshold.ms=10
#
# What is the maximum number of methods to show in the method dump
# (-1 means no limit)
@@ -56,8 +56,9 @@
# Note: com.mentorgen.tools.profile is always excluded
#
exclude=org.testng,org.dbunit,com.mentorgen
-#include=ugg - use this to disable byte code manipulation, useful for debugging
-include=${db-vendor-profiling},org.jboss,org.hibernate,com.arjuna,org.apache.log4j,auction.dao.ejb3,auction.model,org.jboss.jbossts.performance
+include=${profiling-classes}
+
+#include=${db-vendor-profiling},org.hibernate,com.arjuna,auction.dao.ejb3,auction.model,org.jboss.jbossts.performance,org.apache.log4j,org.jboss
#
# Track Object Allocation (very expensive)
# values: on, off
@@ -74,3 +75,6 @@
debug=off
+
+#output-summary-only=yes
+
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceA/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceA/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,9 @@
db-vendor.method.xpaths.A=${mysql.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.A=${oracle.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.A=${oracle.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.A=${mysql.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.A=${mysql.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceB/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/co-located-db/resourceB/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -1,5 +1,4 @@
-
# Resource B
# specify which packages or classes are to be profiled. These will be identical across any database installation
@@ -9,6 +8,9 @@
db-vendor.method.xpaths.B=${mysql.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.B=${mysql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.B=${mysql.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.B=${mysql.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.B=${mysql.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceA/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceA/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,9 @@
db-vendor.method.xpaths.A=${mysql.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.A=${mysql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.A=${mysql.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.A=${mysql.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.A=${mysql.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceB/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/database-locations/remote-db/resourceB/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,9 @@
db-vendor.method.xpaths.B=${mysql.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.B=${mysql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.B=${mysql.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.B=${mysql.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.B=${mysql.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/mysql/db-profile.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -7,6 +7,9 @@
mysql.db-vendor-jdbc-same.driverClass=com.mysql.jdbc.jdbc2.optional.MysqlDataSource
mysql.db-vendor-jdbc-xa.driverClass=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
+mysql.db-vendor-jdbc-localtx.methods=com.mysql.jdbc.Connection,com.mysql.jdbc.PreparedStatement,com.mysql.jdbc.ResultSet,com.mysql.jdbc.Statement
+mysql.db-vendor-jdbc-xa.methods=com.mysql.jdbc.jdbc2.optional.ConnectionWrapper,com.mysql.jdbc.jdbc2.optional.MysqlXAConnection,com.mysql.jdbc.jdbc2.optional.PreparedStatementWrapper,com.mysql.jdbc.jdbc2.optional.StatementWrapper,com.mysql.jdbc.ResultSet
+
mysql.db-vendor-dbunit-datatype.factory=org.dbunit.ext.mysql.MySqlDataTypeFactory
# database dialect
@@ -20,7 +23,7 @@
mysql.db-vendor.method.xpaths=com.mysql.jdbc.Buffer:readByte,com.mysql.jdbc.Buffer:writeByte
mysql.db-pool-min.size=5
-mysql.db-pool-max.size=20
+mysql.db-pool-max.size=100
mysql.db-connection-blocking.timeout=1000
mysql.db-connection-idle.timeout=200000
mysql.db-connection-background.interval=1000
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/connection.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/connection.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/connection.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -5,5 +5,5 @@
db-vendor-jdbc-password.A=dtf11
# use filter chaining expandproperties to populate the connectionURL with the following host
-db-vendor-jdbc-serverName.A=localhost
+db-vendor-jdbc-serverName.A=burtha
db-vendor-jdbc-database.A=orcl
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceA/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -6,8 +6,11 @@
# inclusion xpaths
db-vendor-package.xpath.A=${oracle.db-vendor-package.xpath}
-db-vendor.method.xpaths.A=
+db-vendor.method.xpaths.A=${oracle.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.A=${oracle.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.A=${oracle.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.A=${oracle.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.A=${oracle.db-vendor-jdbc-xa.driverClass}
@@ -20,7 +23,7 @@
# class used to relax integrity constraint
db-vendor-constraint-class.A=${oracle.db-vendor-constraint-class}
-db-vendor-driver.configuration.xml.A=<entry><key>URL</key><value>${db-vendor-jdbc-connectionURL.A}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.A}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.A}</value></entry></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.A}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.A}</value></entry>
+db-vendor-driver.configuration.xml.A=<entry><key>URL</key><value>${db-vendor-jdbc-connectionURL.A}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.A}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.A}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.A}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.A}</value></entry>
db.supports.xa.A=${oracle.db.supports.xa}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/connection.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/connection.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/connection.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -4,5 +4,5 @@
db-vendor-jdbc-password.B=dtf11
# use filter chaining expandproperties to populate the connectionURL with the following host
-db-vendor-jdbc-serverName.B=larry.buildnet.ncl.jboss.com
+db-vendor-jdbc-serverName.B=burtha2
db-vendor-jdbc-database.B=orcl
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/co-located-db/resourceB/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -6,8 +6,11 @@
# inclusion xpaths
db-vendor-package.xpath.B=${oracle.db-vendor-package.xpath}
-db-vendor.method.xpaths.B=
+db-vendor.method.xpaths.B=${oracle.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.B=${oracle.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.B=${oracle.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.B=${oracle.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.B=${oracle.db-vendor-jdbc-xa.driverClass}
@@ -20,7 +23,7 @@
# class used to relax integrity constraint
db-vendor-constraint-class.B=${oracle.db-vendor-constraint-class}
-db-vendor-driver.configuration.xml.B=<entry><key>URL</key><value>${db-vendor-jdbc-connectionURL.B}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.B}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.B}</value></entry></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.B}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.B}</value></entry>
+db-vendor-driver.configuration.xml.B=<entry><key>URL</key><value>${db-vendor-jdbc-connectionURL.B}</value></entry><entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.B}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.B}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.B}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.B}</value></entry>
db.supports.xa.B=${oracle.db.supports.xa}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceA/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,8 @@
db-vendor.method.xpaths.A=${oracle.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.A=${oracle.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.A=${oracle.db-vendor-jdbc-xa.methods}
db-vendor-jdbc-same.driverClass.A=${oracle.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.A=${oracle.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/database-locations/remote-db/resourceB/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,8 @@
db-vendor.method.xpaths.B=${oracle.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.B=${oracle.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.B=${oracle.db-vendor-jdbc-xa.methods}
db-vendor-jdbc-same.driverClass.B=${oracle.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.B=${oracle.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/oracle/db-profile.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -7,6 +7,10 @@
oracle.db-vendor-jdbc-same.driverClass=oracle.jdbc.pool.OracleDataSource
oracle.db-vendor-jdbc-xa.driverClass=oracle.jdbc.xa.client.OracleXADataSource
+oracle.db-vendor-jdbc-localtx.methods=oracle.jdbc.driver.OraclePreparedStatementWrapper,oracle.jdbc.driver.OracleResultSet,oracle.jdbc.driver.OracleResultSetImpl,oracle.jdbc.driver.OracleStatementWrapper,oracle.jdbc.driver.PhysicalConnection,oracle.jdbc.driver.T4C8Oall,oracle.jdbc.driver.T4CConnection,oracle.jdbc.driver.T4CTTIfun,oracle.jdbc.driver.T4CVarcharAccessor,oracle.net.ns.NetOutputStream,oracle.sql.CharacterSet
+oracle.db-vendor-jdbc-xa.methods=oracle.jdbc.driver.OraclePreparedStatementWrapper,oracle.jdbc.driver.OracleResultSet,oracle.jdbc.driver.OracleResultSetImpl,oracle.jdbc.driver.OracleStatementWrapper,oracle.jdbc.driver.PhysicalConnection,oracle.jdbc.driver.T4C8Oall,oracle.jdbc.driver.T4CTTIfun,oracle.jdbc.driver.T4CTTIOtxen,oracle.jdbc.driver.T4CTTIOtxse,oracle.jdbc.driver.T4CVarcharAccessor,oracle.jdbc.driver.T4CXAResource,oracle.jdbc.OracleConnectionWrapper,oracle.jdbc.xa.client.OracleXAResource,oracle.jdbc.xa.OracleXAResource,oracle.jdbc.xa.OracleXAResource$XidListEntry,oracle.net.ns.NetOutputStream,oracle.sql.CharacterSet
+
+# dbunit vendor db factory for data types
oracle.db-vendor-dbunit-datatype.factory=org.dbunit.ext.oracle.OracleDataTypeFactory
# database dialect
@@ -20,7 +24,7 @@
oracle.db-vendor.method.xpaths=oracle.net.ns.DataPacket:send,oracle.net.ns.DataPacket:receive
oracle.db-pool-min.size=5
-oracle.db-pool-max.size=20
+oracle.db-pool-max.size=101
oracle.db-connection-blocking.timeout=1000
oracle.db-connection-idle.timeout=200000
oracle.db-connection-background.interval=1000
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/connection.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/connection.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/connection.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,9 @@
+# Resource A
+
+db-vendor-jdbc-connectionURL.A=jdbc:postgresql://${db-vendor-jdbc-serverName.A}/${db-vendor-jdbc-database.A}
+db-vendor-jdbc-userName.A=usrpg01
+db-vendor-jdbc-password.A=usrpg01
+
+# use filter chaining expandproperties to populate the connectionURL with the following host
+db-vendor-jdbc-serverName.A=localhost
+db-vendor-jdbc-database.A=dtf11
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/resource.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceA/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,42 @@
+
+# Resource A
+
+# specify which packages or classes are to be profiled. These will be identical across any database installation
+db-vendor-profiling.A=${postgresql.db-vendor-profiling}
+# inclusion xpaths
+db-vendor-package.xpath.A=${postgresql.db-vendor-package.xpath}
+
+db-vendor.method.xpaths.A=${postgresql.db-vendor.method.xpaths}
+
+db-vendor.profiling.localtx.classes.A=${postgresql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.A=${postgresql.db-vendor-jdbc-xa.methods}
+
+db-vendor-jdbc-same.driverClass.A=${postgresql.db-vendor-jdbc-same.driverClass}
+db-vendor-jdbc-xa.driverClass.A=${postgresql.db-vendor-jdbc-xa.driverClass}
+
+# dbunit vendor db factory for data types
+db-vendor-dbunit-datatype.factory.A=${postgresql.db-vendor-dbunit-datatype.factory}
+
+# database dialect
+db-vendor-hibernate.dialect.A=${postgresql.db-vendor-hibernate.dialect}
+
+# class used to relax integrity constraint
+db-vendor-constraint-class.A=${postgresql.db-vendor-constraint-class}
+
+db-vendor-driver.configuration.xml.A=<entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.A}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.A}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.A}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.A}</value></entry>
+
+db.supports.xa.A=${postgresql.db.supports.xa}
+
+# JBoss pool settings
+
+db-connection-share.prepared.statements.A=${postgresql.db-connection-share.prepared.statements}
+db-connection-prepared.statement.cache.size.A=${postgresql.db-connection-prepared.statement.cache.size}
+
+# JBoss managed connection factory settings
+
+db-pool-min.size.A=${postgresql.db-pool-min.size}
+db-pool-max.size.A=${postgresql.db-pool-max.size}
+db-connection-blocking.timeout.A=${postgresql.db-connection-blocking.timeout}
+db-connection-idle.timeout.A=${postgresql.db-connection-idle.timeout}
+db-connection-background.interval.A=${postgresql.db-connection-background.interval}
+db-connection-background.validation.A=${postgresql.db-connection-background.validation}
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/connection.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/connection.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/connection.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,9 @@
+# Resource A
+
+db-vendor-jdbc-connectionURL.B=jdbc:postgresql://${db-vendor-jdbc-serverName.B}/${db-vendor-jdbc-database.B}
+db-vendor-jdbc-userName.B=usrpg02
+db-vendor-jdbc-password.B=usrpg02
+
+# use filter chaining expandproperties to populate the connectionURL with the following host
+db-vendor-jdbc-serverName.B=localhost
+db-vendor-jdbc-database.B=dtf12
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/resource.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/co-located-db/resourceB/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,41 @@
+
+
+# Resource B
+
+# specify which packages or classes are to be profiled. These will be identical across any database installation
+db-vendor-profiling.B=${postgresql.db-vendor-profiling}
+# inclusion xpaths
+db-vendor-package.xpath.B=${postgresql.db-vendor-package.xpath}
+
+db-vendor.method.xpaths.B=${postgresql.db-vendor.method.xpaths}
+
+db-vendor.profiling.localtx.classes.B=${postgresql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.B=${postgresql.db-vendor-jdbc-xa.methods}
+
+db-vendor-jdbc-same.driverClass.B=${postgresql.db-vendor-jdbc-same.driverClass}
+db-vendor-jdbc-xa.driverClass.B=${postgresql.db-vendor-jdbc-xa.driverClass}
+
+# dbunit vendor db factory for data types
+db-vendor-dbunit-datatype.factory.B=${postgresql.db-vendor-dbunit-datatype.factory}
+
+# database dialect
+db-vendor-hibernate.dialect.B=${postgresql.db-vendor-hibernate.dialect}
+
+# class used to relax integrity constraint
+db-vendor-constraint-class.B=${postgresql.db-vendor-constraint-class}
+
+db-vendor-driver.configuration.xml.B=<entry><key>ServerName</key><value>${db-vendor-jdbc-serverName.B}</value></entry><entry><key>DatabaseName</key><value>${db-vendor-jdbc-database.B}</value></entry><entry><key>User</key><value>${db-vendor-jdbc-userName.B}</value></entry><entry><key>Password</key><value>${db-vendor-jdbc-password.B}</value></entry>
+
+db.supports.xa.B=${postgresql.db.supports.xa}
+
+# JBoss managed connection factory settings
+
+db-connection-share.prepared.statements.B=${postgresql.db-connection-share.prepared.statements}
+db-connection-prepared.statement.cache.size.B=${postgresql.db-connection-prepared.statement.cache.size}
+
+db-pool-min.size.B=${postgresql.db-pool-min.size}
+db-pool-max.size.B=${postgresql.db-pool-max.size}
+db-connection-blocking.timeout.B=${postgresql.db-connection-blocking.timeout}
+db-connection-idle.timeout.B=${postgresql.db-connection-idle.timeout}
+db-connection-background.interval.B=${postgresql.db-connection-background.interval}
+db-connection-background.validation.B=${postgresql.db-connection-background.validation}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceA/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceA/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceA/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,9 @@
db-vendor.method.xpaths.A=${postgresql.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.A=${postgresql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.A=${postgresql.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.A=${postgresql.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.A=${postgresql.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceB/resource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceB/resource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/database-locations/remote-db/resourceB/resource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -9,6 +9,9 @@
db-vendor.method.xpaths.B=${postgresql.db-vendor.method.xpaths}
+db-vendor.profiling.localtx.classes.B=${postgresql.db-vendor-jdbc-localtx.methods}
+db-vendor.profiling.xa.classes.B=${postgresql.db-vendor-jdbc-xa.methods}
+
db-vendor-jdbc-same.driverClass.B=${postgresql.db-vendor-jdbc-same.driverClass}
db-vendor-jdbc-xa.driverClass.B=${postgresql.db-vendor-jdbc-xa.driverClass}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/database/postgresql/db-profile.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -1,12 +1,15 @@
# report to profiling system vendor support for xa, used to verify command line parameters
-db.supports.xa=true
+postgresql.db.supports.xa=true
# needs 'user', 'password', 'serverName', 'databaseName'
postgresql.db-vendor-jdbc-same.driverClass=org.postgresql.ds.PGSimpleDataSource
postgresql.db-vendor-jdbc-xa.driverClass=org.postgresql.xa.PGXADataSource
+postgresql.db-vendor-jdbc-localtx.methods=org.postgresql.jdbc2.AbstractJdbc2Connection,org.postgresql.jdbc2.AbstractJdbc2ResultSet,org.postgresql.jdbc2.AbstractJdbc2Statement,org.postgresql.jdbc4.AbstractJdbc4Statement
+postgresql.db-vendor-jdbc-xa.methods=org.postgresql.ds.jdbc23.AbstractJdbc23PooledConnection$ConnectionHandler,org.postgresql.ds.jdbc23.AbstractJdbc23PooledConnection$StatementHandler,org.postgresql.jdbc2.AbstractJdbc2Connection,org.postgresql.jdbc2.AbstractJdbc2ResultSet,org.postgresql.jdbc2.AbstractJdbc2Statement,org.postgresql.util.Base64,org.postgresql.xa.PGXAConnection
+
# dbunit vendor db factory for data types
postgresql.db-vendor-dbunit-datatype.factory=org.dbunit.ext.postgresql.PostgresqlDataTypeFactory
@@ -21,7 +24,7 @@
postgresql.db-vendor.method.xpaths=org.postgresql.xa.PGXADataSource:getXAConnection
postgresql.db-pool-min.size=5
-postgresql.db-pool-max.size=20
+postgresql.db-pool-max.size=100
postgresql.db-connection-blocking.timeout=1000
postgresql.db-connection-idle.timeout=200000
postgresql.db-connection-background.interval=1000
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/local-tx/datasource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -1,2 +1,6 @@
local-tx.datasoure.xml.A=<bean name="caveatEmptorDatasourceFactoryA" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceA</property><property name="driverClass">${db-vendor-jdbc-same.driverClass.A}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL.A}</property><property name="userName">${db-vendor-jdbc-userName.A}</property><property name="password">${db-vendor-jdbc-password.A}</property><property name="minSize">${db-pool-min.size.A}</property><property name="maxSize">${db-pool-max.size.A}</property><property name="idleTimeout">${db-connection-idle.timeout.A}</property><property name="blockingTimeout">${db-connection-blocking.timeout.A}</property><!-- not supported property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property--><property name="preparedStatementCacheSize"!
>${db-connection-prepared.statement.cache.size.A}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.A}</property><property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryA" /></constructor></bean>
-local-tx.datasoure.xml.B=<bean name="caveatEmptorDatasourceFactoryB" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceB</property><property name="driverClass">${db-vendor-jdbc-same.driverClass.B}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL.B}</property><property name="userName">${db-vendor-jdbc-userName.B}</property><property name="password">${db-vendor-jdbc-password.B}</property><property name="minSize">${db-pool-min.size.B}</property><property name="maxSize">${db-pool-max.size.B}</property><property name="idleTimeout">${db-connection-idle.timeout.B}</property><property name="blockingTimeout">${db-connection-blocking.timeout.B}</property><!-- not supported property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property--><property name="preparedStatementCacheSize"!
>${db-connection-prepared.statement.cache.size.B}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.B}</property><property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property></bean><bean name="caveatemptorTestingDatasourceB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryB" /></constructor></bean>
\ No newline at end of file
+local-tx.datasoure.xml.B=<bean name="caveatEmptorDatasourceFactoryB" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource"><property name="jndiName">java:/caveatemptorTestingDatasourceB</property><property name="driverClass">${db-vendor-jdbc-same.driverClass.B}</property><property name="connectionURL">${db-vendor-jdbc-connectionURL.B}</property><property name="userName">${db-vendor-jdbc-userName.B}</property><property name="password">${db-vendor-jdbc-password.B}</property><property name="minSize">${db-pool-min.size.B}</property><property name="maxSize">${db-pool-max.size.B}</property><property name="idleTimeout">${db-connection-idle.timeout.B}</property><property name="blockingTimeout">${db-connection-blocking.timeout.B}</property><!-- not supported property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property--><property name="preparedStatementCacheSize"!
>${db-connection-prepared.statement.cache.size.B}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.B}</property><property name="transactionManager"><inject bean="TransactionManager"/></property> <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property></bean><bean name="caveatemptorTestingDatasourceB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="caveatEmptorDatasourceFactoryB" /></constructor></bean>
+
+#profiling.classes.test.framework=auction.dao.ejb3.GenericEJB3DAO,auction.dao.ejb3.persistence.UserDAOBeanMultiResource,auction.model.Address,auction.model.AddressEntity,auction.model.User,com.arjuna.ats.arjuna.AtomicAction,com.arjuna.ats.arjuna.coordinator.BasicAction,com.arjuna.ats.arjuna.StateManager,com.arjuna.ats.internal.arjuna.thread.ThreadActionData,com.arjuna.ats.internal.jta.resources.arjunacore.XAResourceRecord,com.arjuna.ats.internal.jta.transaction.arjunacore.BaseTransaction,com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple,com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple,com.arjuna.ats.jta.xa.XidImple,org.apache.log4j.Category,org.apache.log4j.Logger,org.apache.log4j.NDC,org.hibernate.ejb.AbstractEntityManagerImpl,org.hibernate.ejb.EntityManagerFactoryImpl,org.hibernate.ejb.EntityManagerImpl,org.hibernate.EmptyInterceptor,org.hibernate.engine.CascadingAction$9,org.hibernate.engine.CollectionEntry,org.hibernate.engine!
.CollectionKey,org.hibernate.engine.EntityEntry,org.hibernate.engine.QueryParameters,org.hibernate.engine.StatefulPersistenceContext,org.hibernate.engine.TwoPhaseLoad,org.hibernate.engine.Versioning,org.hibernate.event.AbstractEvent,org.hibernate.event.def.AbstractFlushingEventListener,org.hibernate.event.def.DefaultLoadEventListener,org.hibernate.event.def.DefaultPersistEventListener,org.hibernate.event.EventListeners,org.hibernate.event.FlushEntityEvent,org.hibernate.event.LoadEvent,org.hibernate.event.LoadEventListener$LoadType,org.hibernate.impl.AbstractSessionImpl,org.hibernate.impl.SessionFactoryImpl,org.hibernate.impl.SessionImpl,org.hibernate.jdbc.AbstractBatcher,org.hibernate.jdbc.ConnectionManager,org.hibernate.jdbc.JDBCContext,org.hibernate.loader.Loader,org.hibernate.persister.entity.AbstractEntityPersister,org.hibernate.persister.entity.SingleTableEntityPersister,org.hibernate.transaction.CacheSynchronization,org.hibernate.transaction.JTATransaction,org.hiberna!
te.transaction.JTATransactionFactory,org.hibernate.tuple.entit!
y.Abstra
ctEntityTuplizer,org.hibernate.tuple.entity.EntityMetamodel,org.hibernate.tuple.EntityModeToTuplizerMapping,org.hibernate.type.BooleanType,org.hibernate.type.CollectionType,org.hibernate.type.ComponentType,org.hibernate.type.IntegerType,org.hibernate.type.LongType,org.hibernate.type.ManyToOneType,org.hibernate.type.OneToOneType,org.hibernate.type.StringType,org.hibernate.type.TimestampType,org.hibernate.util.ArrayHelper,org.hibernate.util.JDBCExceptionReporter,org.hibernate.util.JTAHelper,org.jboss.ejb3.NonSerializableFactory,org.jboss.jbossts.performance.MultiThreadedTest,org.jboss.jbossts.performance.profiler.implementation.JavaInteractiveProfiler,org.jboss.jbossts.performance.resource.SynchronizeResourcesTest,org.jboss.jbossts.performance.resource.SynchronizeTask,org.jboss.jbossts.performance.resource.SynchronizeTask$SessionSynchronization,org.jboss.logging.Logger,org.jboss.resource.adapter.jdbc.WrappedConnection,org.jboss.resource.adapter.jdbc.WrappedPreparedStatement,or!
g.jboss.resource.adapter.jdbc.WrappedResultSet,org.jboss.resource.adapter.jdbc.WrappedStatement,org.jboss.resource.adapter.jdbc.WrapperDataSource,org.jboss.resource.connectionmanager.BaseConnectionManager2,org.jboss.resource.connectionmanager.BaseConnectionManager2$BaseConnectionEventListener,org.jboss.resource.connectionmanager.TransactionSynchronizer,org.jboss.resource.connectionmanager.TxConnectionManager$LocalXAResource,org.jboss.tm.TransactionLocal,org.jboss.tm.TransactionLocalDelegateImpl$TransactionLocalSynchronization,org.jboss.tm.TxUtils
+profiling.classes.test.framework=com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore,org.jboss.jbossts.performance.resource.SynchronizeTask,com.arjuna.ats.internal.jta.transaction.arjunacore.BaseTransaction
+
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/jdbc-resource/xa/datasource.properties 2010-01-28 15:02:14 UTC (rev 31276)
@@ -1,2 +1,5 @@
xa.datasoure.xml.A=<bean name="TransactionalResourceFactoryA" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasourceA</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String">${db-vendor-driver.configuration.xml.A}</map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass.A}</property><property name="minSize">${db-pool-min.size.A}</property><property name="maxSize">${db-pool-max.size.A}</property><property name="idleTimeout">${db-connection-idle.timeout.A}</property><property name="blockingTimeout">${db-connection-blocking.timeout.A}</property><property name="backgroundInterval">${db-connection-background.interval.A}</property><property name="backgroundValidation">${db-connection-background.validation.A}</property><property name="preparedStatementCacheSize">${db-connection-prepared.statement.ca!
che.size.A}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.A}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="TransactionManager"/></property></bean><bean name="caveatemptorTestingDatasourceA" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactoryA" /></constructor></bean><bean name="DataSourceBindingA" class="org.jboss.ejb3.embedded.JndiBinder"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasourceA"/></property><property name="bindTo">java:/caveatemptorTestingDatasourceA</property><property name="serializable">false</property></bean>
xa.datasoure.xml.B=<bean name="TransactionalResourceFactoryB" class="org.jboss.jbossts.performance.TransactionXADataSourceFactory"><constructor><parameter class="java.lang.String">java:/caveatemptorTestingDatasourceB</parameter><parameter class="java.util.Map"><map keyClass="java.lang.String" valueClass="java.lang.String">${db-vendor-driver.configuration.xml.B}</map></parameter></constructor><property name="driverClass">${db-vendor-jdbc-xa.driverClass.B}</property><property name="minSize">${db-pool-min.size.B}</property><property name="maxSize">${db-pool-max.size.B}</property><property name="idleTimeout">${db-connection-idle.timeout.B}</property><property name="blockingTimeout">${db-connection-blocking.timeout.B}</property><property name="backgroundInterval">${db-connection-background.interval.B}</property><property name="backgroundValidation">${db-connection-background.validation.B}</property><property name="preparedStatementCacheSize">${db-connection-prepared.statement.ca!
che.size.B}</property><property name="sharePreparedStatements">${db-connection-share.prepared.statements.B}</property><property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property><property name="initialContextProperties"><inject bean="InitialContextProperties"/></property><property name="transactionManager"><inject bean="TransactionManager"/></property></bean><bean name="caveatemptorTestingDatasourceB" class="java.lang.Object"><constructor factoryMethod="getDatasource"><factory bean="TransactionalResourceFactoryB" /></constructor></bean><bean name="DataSourceBindingB" class="org.jboss.ejb3.embedded.JndiBinder"><property name="jndiProperties"><inject bean="InitialContextProperties"/></property><property name="target"><inject bean="caveatemptorTestingDatasourceB"/></property><property name="bindTo">java:/caveatemptorTestingDatasourceB</property><property name="serializable">false</property></bean>
+
+#profiling.classes.test.framework=auction.dao.ejb3.persistence.UserDAOBeanMultiResource,auction.model.Address,auction.model.AddressEntity,auction.model.User,com.arjuna.ats.arjuna.AtomicAction,com.arjuna.ats.arjuna.coordinator.BasicAction,com.arjuna.ats.arjuna.coordinator.TxControl,com.arjuna.ats.arjuna.StateManager,com.arjuna.ats.internal.arjuna.thread.ThreadActionData,com.arjuna.ats.internal.jta.resources.arjunacore.XAResourceRecord,com.arjuna.ats.internal.jta.transaction.arjunacore.BaseTransaction,com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionImple,com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple,com.arjuna.ats.jta.xa.XidImple,org.apache.log4j.Category,org.apache.log4j.Logger,org.apache.log4j.NDC,org.hibernate.ejb.AbstractEntityManagerImpl,org.hibernate.ejb.EntityManagerFactoryImpl,org.hibernate.ejb.EntityManagerImpl,org.hibernate.EmptyInterceptor,org.hibernate.engine.CascadingAction$9,org.hibernate.engine.CollectionEntry,org.hibe!
rnate.engine.CollectionKey,org.hibernate.engine.EntityEntry,org.hibernate.engine.QueryParameters,org.hibernate.engine.StatefulPersistenceContext,org.hibernate.engine.TwoPhaseLoad,org.hibernate.engine.Versioning,org.hibernate.event.AbstractEvent,org.hibernate.event.def.AbstractFlushingEventListener,org.hibernate.event.def.DefaultLoadEventListener,org.hibernate.event.def.DefaultPersistEventListener,org.hibernate.event.EventListeners,org.hibernate.event.FlushEntityEvent,org.hibernate.event.LoadEvent,org.hibernate.event.LoadEventListener$LoadType,org.hibernate.impl.AbstractSessionImpl,org.hibernate.impl.SessionFactoryImpl,org.hibernate.impl.SessionImpl,org.hibernate.jdbc.AbstractBatcher,org.hibernate.jdbc.ConnectionManager,org.hibernate.jdbc.JDBCContext,org.hibernate.loader.Loader,org.hibernate.persister.entity.AbstractEntityPersister,org.hibernate.persister.entity.SingleTableEntityPersister,org.hibernate.transaction.CacheSynchronization,org.hibernate.transaction.JTATransaction!
,org.hibernate.transaction.JTATransactionFactory,org.hibernate!
.tuple.e
ntity.AbstractEntityTuplizer,org.hibernate.tuple.entity.EntityMetamodel,org.hibernate.tuple.EntityModeToTuplizerMapping,org.hibernate.type.BooleanType,org.hibernate.type.CollectionType,org.hibernate.type.ComponentType,org.hibernate.type.IntegerType,org.hibernate.type.LongType,org.hibernate.type.ManyToOneType,org.hibernate.type.OneToOneType,org.hibernate.type.StringType,org.hibernate.type.TimestampType,org.hibernate.util.ArrayHelper,org.hibernate.util.JDBCExceptionReporter,org.hibernate.util.JTAHelper,org.jboss.ejb3.NonSerializableFactory,org.jboss.jbossts.performance.MultiThreadedTest,org.jboss.jbossts.performance.profiler.implementation.JavaInteractiveProfiler,org.jboss.jbossts.performance.resource.SynchronizeResourcesTest,org.jboss.jbossts.performance.resource.SynchronizeTask,org.jboss.jbossts.performance.resource.SynchronizeTask$SessionSynchronization,org.jboss.logging.Logger,org.jboss.resource.adapter.jdbc.WrappedConnection,org.jboss.resource.adapter.jdbc.WrappedPrepared!
Statement,org.jboss.resource.adapter.jdbc.WrappedResultSet,org.jboss.resource.adapter.jdbc.WrappedStatement,org.jboss.resource.adapter.jdbc.WrapperDataSource,org.jboss.resource.adapter.jdbc.xa.XAManagedConnection,org.jboss.resource.connectionmanager.BaseConnectionManager2,org.jboss.resource.connectionmanager.TransactionSynchronizer,org.jboss.tm.TransactionLocal,org.jboss.tm.TransactionLocalDelegateImpl$TransactionLocalSynchronization,org.jboss.tm.TxUtils
+profiling.classes.test.framework=com.arjuna.ats.internal.arjuna.objectstore.FileSystemStore,org.jboss.jbossts.performance.resource.SynchronizeTask,com.arjuna.ats.internal.jta.transaction.arjunacore.BaseTransaction
\ No newline at end of file
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/as-csv.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/as-csv.xsl (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/as-csv.xsl 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output omit-xml-declaration="yes"/>
+ <!--
+ This stylesheet identifies each class and gives a discinct frame.
+ -->
+ <xsl:template match="/">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="profile">
+ <xsl:for-each select="frame">
+ <xsl:value-of select="@mn"/><xsl:text>,</xsl:text>
+ </xsl:for-each>
+ </xsl:template>
+
+</xsl:stylesheet>
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes-02.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes-02.xsl (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes-02.xsl 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <!--
+ This stylesheet identifies each class and gives a discinct frame.
+ Performs the same task as distinct-classes.xsl with a stab at better
+ performance. Unproven.
+ -->
+ <xsl:template match="/">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="profile">
+ <xsl:copy>
+ <xsl:for-each select="frame">
+ <xsl:variable name="method-name" select="@mn"/>
+ <xsl:if test="preceding-sibling::frame[1][not(@mn=$method-name)]">
+ <xsl:copy-of select="."/>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes.xsl (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/distinct-classes.xsl 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <!--
+ This stylesheet identifies each class and gives a discinct frame.
+ -->
+ <xsl:template match="/">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="profile">
+ <xsl:copy>
+ <xsl:for-each select="frame">
+ <xsl:variable name="method-name" select="@mn"/>
+ <xsl:if test="0 = count(preceding-sibling::frame[@mn=$method-name])">
+ <xsl:copy-of select="."/>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/flatten-frames.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/flatten-frames.xsl (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/flatten-frames.xsl 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <!--
+ This stylesheet goes through the call stack and emits a node when the
+ object package changes.
+ Note: preceding-sibling axis count node positions from the context node not
+ top down order.
+ -->
+ <xsl:template match="/">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="profile">
+ <xsl:copy>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="thread">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="interaction">
+ <xsl:for-each select="descendant::frame">
+ <xsl:element name="frame">
+ <xsl:attribute name="mn">
+ <xsl:value-of select="substring-before(@mn, ':')"/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:for-each>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/package-switch-compactor.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/package-switch-compactor.xsl (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/package-switch-compactor.xsl 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <!--
+ This stylesheet goes through the call stack and emits a node when the
+ object package changes.
+ Note: preceding-sibling axis count node positions from the context node not
+ top down order.
+ -->
+ <xsl:template match="/">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="profile">
+ <xsl:copy>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="thread">
+ <xsl:copy>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="interaction">
+ <xsl:copy>
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="frame">
+ <!-- Context node //frame -->
+ <xsl:choose>
+ <xsl:when test="0 != count(preceding-sibling::frame)">
+ <!--
+ <xsl:comment>preceding sibling count != 0<xsl:value-of select="substring(./@mn, 1, 10)" />- <xsl:value-of select="substring(preceding-sibling::frame[position()=last()]/descendant::frame[position()=last()]/@mn , 1, 10)" /></xsl:comment>
+ -->
+ <xsl:choose>
+ <xsl:when test="0 = count(preceding-sibling::frame[1]/descendant::frame)">
+ <!--
+ <xsl:comment>previous frame has 0 decendants</xsl:comment>
+ <xsl:comment>previous frame has <xsl:value-of select="preceding-sibling::frame[1]/@mn"/> <xsl:value-of select="count(preceding-sibling::frame)"/> </xsl:comment>
+ -->
+ <xsl:choose>
+ <xsl:when
+ test="not (starts-with (preceding-sibling::frame[1]/descendant-or-self::frame[position()=last()]/@mn, substring(./@mn, 1, 10)))">
+ <!--
+ <xsl:comment>the preceding decendant does not match current</xsl:comment>
+ -->
+ <xsl:copy>
+ <xsl:copy-of select="@*" />
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:when>
+ <xsl:otherwise>
+ <!--
+ <xsl:comment>the preceding decendant does match current</xsl:comment>
+ -->
+ <xsl:apply-templates />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <!--
+ <xsl:comment>previous frame has >0 decendents</xsl:comment>
+ -->
+ <xsl:choose>
+ <xsl:when
+ test="not (starts-with (preceding-sibling::frame[1]/descendant::frame[position()=last()]/@mn, substring(./@mn, 1, 10)))">
+ <xsl:copy>
+ <xsl:copy-of select="@*" />
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:when>
+ <xsl:otherwise>
+ <!--
+ <xsl:comment>preceding sibling count = 0</xsl:comment>
+ -->
+ <xsl:choose>
+ <xsl:when
+ test="not (contains (parent::frame/@mn, substring(./@mn, 1, 10)))">
+ <xsl:copy>
+ <xsl:copy-of select="@*" />
+ <xsl:apply-templates />
+ </xsl:copy>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/sort-frames.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/sort-frames.xsl (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/sort-frames.xsl 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <!--
+ This stylesheet goes through the call stack and emits a node when the
+ object package changes.
+ Note: preceding-sibling axis count node positions from the context node not
+ top down order.
+ -->
+ <xsl:template match="/">
+ <xsl:apply-templates />
+ </xsl:template>
+
+ <xsl:template match="profile">
+ <xsl:copy>
+ <xsl:for-each select="./frame">
+ <xsl:sort select="@mn"/>
+ <xsl:copy-of select="."/>
+ </xsl:for-each>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/MultiThreadedTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/MultiThreadedTest.java 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/MultiThreadedTest.java 2010-01-28 15:02:14 UTC (rev 31276)
@@ -17,19 +17,25 @@
* the test case tasks and the monitor thread. This method should not complete
* until all workers have finished. The barrier is triggered and all fall out
* of method frame.
- * This thread (monitor) is included in the barrier to ensure this thread
- * remains active during all demon threads do processing.
+ * This thread is included in the barrier to ensure this thread
+ * remains active during all demon threads during processing.
*/
CyclicBarrier completionBarrier = new CyclicBarrier(1 + threadCount);
+
for (int count = 1; count <= threadCount; count += 1)
{
+
Executor executor = new ThreadPerTestWorkerExecutor();
executor.execute(getTask( recurseCount, completionBarrier, count));
}
completionBarrier.await();// start all the threads processing
+
+ logger.info("All threads have started warmup.");
if (!completionBarrier.isBroken())
{
completionBarrier.await();// all threads fall out of method frame
+ // wait for all to finish profiled run
+ logger.info("All threads have completed warmup run.");
}
else
{
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/WarmedUpTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/WarmedUpTest.java 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/WarmedUpTest.java 2010-01-28 15:02:14 UTC (rev 31276)
@@ -27,6 +27,7 @@
import java.util.concurrent.Executor;
import org.apache.log4j.Logger;
+import org.apache.log4j.NDC;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
@@ -50,7 +51,9 @@
public void warmupTest(final String warmupCountConfig, final String threadCountConfig)
throws Exception
{
+ NDC.push("warmup");
startConcurrentExecutions(Integer.parseInt(warmupCountConfig), Integer.parseInt(threadCountConfig));
+ NDC.remove();
}
@Test(groups = "integration-persistence", dependsOnGroups = "integration-warmup")
@@ -60,6 +63,7 @@
final String concurrentCountConfig)
throws Exception
{
+ NDC.push("profiled");
try
{
getProfiler().start();
@@ -75,6 +79,7 @@
{
logger.warn(e.getMessage());
}
+ NDC.remove();
}
/**
Added: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/jdbc/JDBCTest.java 2010-01-28 15:02:14 UTC (rev 31276)
@@ -0,0 +1,93 @@
+ /*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jbossts.performance.jdbc;
+
+import java.util.Stack;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
+
+import javax.persistence.EntityManagerFactory;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.NDC;
+import org.jboss.jbossts.performance.MultiThreadedTest;
+import org.jboss.jbossts.performance.resource.SynchronizeTask;
+
+public class JDBCTest extends MultiThreadedTest
+{
+ @Override
+ public Runnable getTask(int recurseCount, CyclicBarrier completionBarrier, int threadId) throws Exception
+ {
+ return new JDBCTask(getEntityManagerFactory(), getEntityManagerFactoryB(), recurseCount, completionBarrier, threadId, this.isOptionalWriteEnabled, NDC.cloneStack());
+ }
+ @Override
+ protected boolean isMultiResourceTest()
+ {
+ return true;
+ }
+
+ public class JDBCTask implements Runnable
+ {
+ private final EntityManagerFactory emfA;
+ private final EntityManagerFactory emfB;
+ private final boolean isOptionalWriteEnabled;
+ private final int recurseCount;
+ private final Logger logger = Logger.getLogger(JDBCTask.class);
+ private final CyclicBarrier completionBarrier;
+ private final Long threadId;
+ private final CountDownLatch latch;
+ private final Stack parentNDC;
+ public JDBCTask(final EntityManagerFactory factoryA, final EntityManagerFactory factoryB, final int count, final CyclicBarrier barrier, final int id, final boolean isWEnabled, Stack stack)
+ {
+ this.emfA = factoryA;
+ this.emfB = factoryB;
+ this.recurseCount = count;
+ this.completionBarrier = barrier;
+ this.threadId = new Long(id);
+ this.isOptionalWriteEnabled = isWEnabled;
+ this.latch = null;
+ this.parentNDC = stack;
+ }
+
+ public JDBCTask(final EntityManagerFactory factoryA, final EntityManagerFactory factoryB, final int count, final CyclicBarrier barrier, final int id, final boolean isWEnabled, final CountDownLatch countDown, Stack stack)
+ {
+ this.emfA = factoryA;
+ this.emfB = factoryB;
+ this.recurseCount = count;
+ this.completionBarrier = barrier;
+ this.threadId = new Long(id);
+ this.isOptionalWriteEnabled = isWEnabled;
+ this.latch = countDown;
+ this.parentNDC = stack;
+ }
+
+
+ @Override
+ public void run()
+ {
+ // FIXME run
+
+ }
+
+ }
+}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeResourcesTest.java 2010-01-28 15:02:14 UTC (rev 31276)
@@ -24,6 +24,7 @@
import java.util.concurrent.CyclicBarrier;
+import org.apache.log4j.NDC;
import org.jboss.jbossts.performance.MultiThreadedTest;
public class SynchronizeResourcesTest extends MultiThreadedTest
@@ -32,7 +33,7 @@
public Runnable getTask(final int recurseCount, final CyclicBarrier completionBarrier, final int id)
throws Exception
{
- return new SynchronizeTask(getEntityManagerFactory(), getEntityManagerFactoryB(), recurseCount, completionBarrier, id, this.isOptionalWriteEnabled);
+ return new SynchronizeTask(getEntityManagerFactory(), getEntityManagerFactoryB(), recurseCount, completionBarrier, id, this.isOptionalWriteEnabled, NDC.cloneStack());
}
@Override
protected boolean isMultiResourceTest()
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeTask.java
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeTask.java 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/java/org/jboss/jbossts/performance/resource/SynchronizeTask.java 2010-01-28 15:02:14 UTC (rev 31276)
@@ -1,15 +1,15 @@
package org.jboss.jbossts.performance.resource;
- import java.util.concurrent.CountDownLatch;
+import java.util.Stack;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceException;
import javax.transaction.Synchronization;
import org.apache.log4j.Logger;
-import org.hibernate.HibernateException;
+import org.apache.log4j.NDC;
import org.hibernate.Transaction;
import org.hibernate.ejb.EntityManagerImpl;
import org.jboss.tm.TransactionLocal;
@@ -18,6 +18,7 @@
import auction.dao.ejb3.persistence.UserDAOBeanMultiResource;
import auction.model.User;
+
/**
* This is the task that will.
* A SynchronizeTask.
@@ -35,7 +36,8 @@
private final CyclicBarrier completionBarrier;
private final Long threadId;
private final CountDownLatch latch;
- public SynchronizeTask(final EntityManagerFactory factoryA, final EntityManagerFactory factoryB, final int count, final CyclicBarrier barrier, final int id, final boolean isWEnabled)
+ private final Stack parentNDC;
+ public SynchronizeTask(final EntityManagerFactory factoryA, final EntityManagerFactory factoryB, final int count, final CyclicBarrier barrier, final int id, final boolean isWEnabled, Stack stack)
{
this.emfA = factoryA;
this.emfB = factoryB;
@@ -44,9 +46,10 @@
this.threadId = new Long(id);
this.isOptionalWriteEnabled = isWEnabled;
this.latch = null;
+ this.parentNDC = stack;
}
- public SynchronizeTask(final EntityManagerFactory factoryA, final EntityManagerFactory factoryB, final int count, final CyclicBarrier barrier, final int id, final boolean isWEnabled, final CountDownLatch countDown)
+ public SynchronizeTask(final EntityManagerFactory factoryA, final EntityManagerFactory factoryB, final int count, final CyclicBarrier barrier, final int id, final boolean isWEnabled, final CountDownLatch countDown, Stack stack)
{
this.emfA = factoryA;
this.emfB = factoryB;
@@ -55,6 +58,7 @@
this.threadId = new Long(id);
this.isOptionalWriteEnabled = isWEnabled;
this.latch = countDown;
+ this.parentNDC = stack;
}
@Override
public void run()
@@ -63,8 +67,12 @@
{/* use the barrier to wait for all concurrent threads, when finished decrement the latch and fall out of
method. Means the profiler does not
*/
+ NDC.inherit(this.parentNDC);
+ NDC.push(this.threadId.toString());
this.completionBarrier.await();// await all threads ready to start
recurse(this.recurseCount);
+ logger.info("Finished recursing. Awaiting on synch point.");
+
if (!this.completionBarrier.isBroken())
{// fall out of thread without waiting.
this.completionBarrier.await();// await all threads have finished
@@ -78,8 +86,7 @@
}
finally
{
-
- //this.latch.countDown();
+ NDC.clear();
}
}
@@ -96,11 +103,10 @@
transaction.registerSynchronization(new SessionSynchronization(emA, transaction, true));
transaction.registerSynchronization(new SessionSynchronization( emB, transaction, true ) );
- //emB.joinTransaction();
-
/**
* A read
* A [write]
+ * B read
* B write
*/
UserDAOBeanMultiResource userDAO_A = new UserDAOBeanMultiResource();
@@ -121,12 +127,11 @@
session.set(emB);
// Don't forget to take the return value, this is basically a merge()
User userB = findUsingResourceB(userDAO_B);
+ Assert.assertNotNull(userB);
userB.setFirstname("Ben"+time);
resourceAFlush(emA);
resourceBFlush(emB);
- //emA.flush();
- //emB.flush();
-
+ //emA.getSession().setReadOnly(user, true);
emA.getSession().getTransaction().commit();
}
/**
@@ -141,13 +146,12 @@
try
{
task();
- if (logger.isInfoEnabled())
- {
- logger.info("Executed profiled run of testbody.");
- }
+ logger.debug("Completed profiled run of testbody for thread ["+this.threadId.toString()+"] count ["+i+"].");
+
} catch (Exception e)
{
this.completionBarrier.reset();
+ logger.error("Failed profiled run of testbody for thread ["+this.threadId.toString()+"] count ["+i+"].");
Assert.fail(e.getMessage(), e);
}
}
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml 2010-01-28 13:27:10 UTC (rev 31275)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/test/resources/testsuite-integration-ejb3.xml 2010-01-28 15:02:14 UTC (rev 31276)
@@ -42,10 +42,10 @@
<parameter name="session_jndi_A" value="java:/persistence/HibernateSessionFactoryA"/>
<parameter name="session_jndi_B" value="java:/persistence/HibernateSessionFactoryB"/>
- <parameter name="warmup_count" value="10"/>
- <parameter name="test_count" value="2000"/>
+ <parameter name="warmup_count" value="200"/>
+ <parameter name="test_count" value="200"/>
- <parameter name="concurrency_count" value="1"/>
+ <parameter name="concurrency_count" value="${threads}"/>
<parameter name="profiler_fqcn" value="${profiler.controller}"/>
@@ -58,7 +58,7 @@
<parameter name="invoke_optional_write" value="false"/>
<!-- This flag controls the last resource commit optimisation. true|false -->
- <parameter name="use_lrco" value="true"/>
+ <parameter name="use_lrco" value="false"/>
<test name="Integration JPA">
<groups>
@@ -78,5 +78,20 @@
</classes>
</test>
+ <!--
+ transaction.strategy=${transaction.strategy}
+ resource.A.db.installation=${resource.A.db.installation}
+ resource.A.db.vendor=${resource.A.db.vendor}
+ resource.A.jdbc-datasource=${resource.A.jdbc-datasource}
+ resource.B.db.installation=${resource.B.db.installation}
+ resource.B.db.vendor=${resource.B.db.vendor}
+ resource.B.jdbc-datasource=${resource.B.jdbc-datasource}
+ profiler=${profiler}
+ transaction.log.store=${transaction.log.store}
+ threads=${threads}
+ profiled=${profiled}
+ suspend=${suspend}
+ testcase.xpaths=${testcase.xpaths}
+ -->
</suite>
More information about the jboss-svn-commits
mailing list