[jboss-svn-commits] JBL Code SVN: r36332 - labs/jbosstm/workspace/whitingjr/trunk/performance.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Dec 9 14:09:16 EST 2010
Author: whitingjr
Date: 2010-12-09 14:09:16 -0500 (Thu, 09 Dec 2010)
New Revision: 36332
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Added library for submitting results.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties 2010-12-09 19:08:46 UTC (rev 36331)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties 2010-12-09 19:09:16 UTC (rev 36332)
@@ -5,24 +5,24 @@
transaction.strategy=jta-managed
-resource.A.db.installation=remote-db
-resource.A.db.vendor=oracle
-resource.A.jdbc-datasource=xa
+resource.A.db.installation=embedded-db
+resource.A.db.vendor=derby
+resource.A.jdbc-datasource=local-tx
-resource.B.db.installation=remote-db
-resource.B.db.vendor=oracle
-resource.B.jdbc-datasource=xa
+resource.B.db.installation=embedded-db
+resource.B.db.vendor=derby
+resource.B.jdbc-datasource=local-tx
profiler=none
#profiler=jip
#profiler=jprofiler
#profiler=jbossprofiler
-threads=40
-warmup-count=1
-profiled-count=3
+threads=2
+warmup-count=2
+profiled-count=2
# y or n
-profiled=y
+profiled=n
# does the profiled wait for a debugger to be attached ?
# y or n
@@ -36,9 +36,9 @@
optional.write.enabled=true
# test case
-#fqcn.test.case=org.jboss.jbossts.performance.resource.SynchronizeResourcesTest
+fqcn.test.case=org.jboss.jbossts.performance.resource.SynchronizeResourcesTest
#fqcn.test.case=org.jboss.jbossts.performance.jdbc.JDBCTest
-fqcn.test.case=org.jboss.jbossts.performance.comparrison.ComparrisonTest
+#fqcn.test.case=org.jboss.jbossts.performance.comparrison.ComparrisonTest
# object store
#action.store.fqcn=com.arjuna.ats.internal.arjuna.objectstore.HashedActionStore
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2010-12-09 19:08:46 UTC (rev 36331)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2010-12-09 19:09:16 UTC (rev 36332)
@@ -12,7 +12,7 @@
permissions and limitations under the License.
-->
-<project name="JBoss TM performance comparison project" default="htm">
+<project name="JBoss TM performance comparison project" default="update-results-db">
<!--
This project executes the Hibernate sample application Caveat Emptor. There are two versions
and this project uses the version based on JPA. By running the sample test case and additional
@@ -137,6 +137,14 @@
<path refid="run.classpath" />
<pathelement path="src/test/resources" />
</path>
+
+ <path id="results.db.classpath">
+ <pathelement path="build/classes" />
+ <fileset dir="lib/dbdrivers/postgresql">
+ <include name="postgresql*.jar"/>
+ </fileset>
+ <path refid="run.classpath"/>
+ </path>
<fileset dir="build/classes" id="configuration.path.1">
<include name="*.xml" />
@@ -262,20 +270,23 @@
</filterchain>
</loadproperties>
</target>
-
- <target name="prepare" depends="check-arguments, check-setup, second-resource">
- <delete dir="build" />
+
+ <target name="clean">
+ <delete dir="build" />
<delete file="${profile-file}" />
<delete file="${dstat-file}" />
- <exec executable="rm">
+ <mkdir dir="build" />
+ <mkdir dir="build/classes" />
+ <mkdir dir="build/classes/META-INF" />
+ </target>
+
+ <target name="prepare" depends="clean,check-arguments, check-setup, second-resource">
+ <exec executable="rm">
<arg value="-R"/>
<arg value="${profiler.data.jps.dir}"/>
</exec>
<!--delete dir="${profiler.data.jps.dir}"/-->
- <mkdir dir="build" />
- <mkdir dir="build/classes" />
- <mkdir dir="build/classes/META-INF" />
<mkdir dir="${profiler.data.jps.dir}" />
<!-- load properties, specific first then general -->
@@ -356,7 +367,11 @@
<copy file="${properties.home}/transaction-management/${transaction.strategy}/default.persistence.properties" todir="build/classes" />
<unzip dest="build/classes" src="lib/caveatemptor-jpa.jar">
<patternset>
- <include name="**/*.class" />
+ <!--include name="**/*.class" /-->
+ <include name="auction/dao/ejb3/*.class" />
+ <include name="auction/model/*.class" />
+ <include name="auction/dao/*.class" />
+ <include name="auction/test/persistence/*.class" />
</patternset>
</unzip>
<delete dir="logs/profiled" />
@@ -369,7 +384,9 @@
</target>
<target name="compile" depends="prepare,check-xa-support">
- <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="compile.classpath" debug="true" />
+ <javac srcdir="src/main/java" destdir="${build.classes.dir}"
+ classpathref="compile.classpath" debug="true"
+ excludes="org/jboss/jbossts/performance/results/**" />
<javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="run.classpath" debug="true" />
</target>
@@ -393,8 +410,8 @@
<jvmarg value="-XX:-PrintTenuringDistribution" />
<jvmarg value="-XX:-HeapDumpOnOutOfMemoryError" />
<jvmarg value="-Xloggc:/tmp/verbose-gc.txt" />
- <jvmarg value="-Xdebug" />
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=8000" />
+ <!--jvmarg value="-Xdebug" />
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=8000" /-->
<classpath>
<path refid="test.classpath" />
</classpath>
@@ -451,7 +468,7 @@
<property name="output.directory" value="${log.output.dir}/tx-type/${resource.A.jdbc-datasource}/installation/${installation-location}/profiler/${profiler}/${vendor-count}/${db-vendor-mix}/thread-count/${threads}/${DSTAMP}/${DSTAMP}-${time-stamp}"/>
</target>
- <target name="htm" depends="copy-logs,process-profiling-data">
+ <target name="htm" depends="copy-logs,process-profiling-data,extract-timings">
<java classname="org.jboss.jbossts.chart.ChartDstat" fork="true">
<classpath>
<path refid="test.classpath" />
@@ -462,6 +479,124 @@
<arg value="${DSTAMP}-${time-stamp}"/>
</java>
</target>
+
+ <target name="init-results-db" depends="clean">
+ <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="results.db.classpath" debug="true" includes="org/jboss/jbossts/performance/results/**" includeantruntime="no"/>
+ <copy todir="${build.classes.dir}/META-INF">
+ <fileset dir="src/main/resources/results">
+ <include name="results-beans.xml"/>
+ </fileset>
+ </copy>
+ <xslt in="src/main/resources/results/persistence.xml" out="${build.classes.dir}/META-INF/persistence.xml" style="src/main/resources/xsl/results/change-hbm2ddl.xsl">
+ <param name="hibernate.hbm2ddl.auto" expression="create" />
+ </xslt>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="src/main/resources">
+ <include name="log4j.xml"/>
+ <include name="arjunajta-properties.xml"/>
+ <include name="ejb3-interceptors-aop.xml"/>
+ <include name="jndi.properties"/>
+ </fileset>
+ <fileset dir="src/main/resources/results">
+ <include name="embedded-jboss-beans.xml"/>
+ </fileset>
+ <fileset dir="src/main/resources/properties/transaction-management/jta-managed">
+ <include name="default.persistence.properties"/>
+ </fileset>
+ </copy>
+ <java classname="org.jboss.jbossts.performance.results.submit.ORMInitialiseDB" classpathref="results.db.classpath" fork="true">
+ <arg value="META-INF/results-beans.xml"/>
+ <arg value="build/classes"/>
+ <!--jvmarg value="-Xdebug" />
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=${suspend},address=8000" /-->
+ </java>
+ </target>
+
+ <target name="update-results-db" >
+ <antcall target="clean"/>
+ <xmlproperty file="${output.directory}/timings.xml" collapseattributes="true" keeproot="false"/>
+ <echo message="[${begin}] [${findUsingResourceA}] [${findUsingResourceB}] [${writeUsingResourceA}] [${writeUsingResourceB}] [${commit}]"/>
+
+ <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="results.db.classpath" debug="true" includes="org/jboss/jbossts/performance/results/**" includeantruntime="no"/>
+ <!--unzip dest="build/classes" src="lib/caveatemptor-jpa.jar">
+ <patternset>
+ <include name="auction/dao/ejb3/GenericEJB3DAO.class" />
+ <include name="auction/dao/GenericDAO.class" />
+ <include name="auction/test/persistence/*.class" />
+ <include name="auction/dao/ejb3/UserDAOBean.class" />
+ <include name="auction/dao/UserDAOBean.class" />
+ <include name="auction/model/UserDAO.class" />
+ <include name="auction/dao/UserDAO.class" />
+ <include name="auction/model/*.class" />
+ </patternset>
+ </unzip-->
+
+ <copy todir="${build.classes.dir}/META-INF">
+ <fileset dir="src/main/resources/results">
+ <include name="results-beans.xml"/>
+ </fileset>
+ </copy>
+ <xslt in="src/main/resources/results/persistence.xml" out="${build.classes.dir}/META-INF/persistence.xml" style="src/main/resources/xsl/results/change-hbm2ddl.xsl">
+ <param name="hibernate.hbm2ddl.auto" expression="update" />
+ </xslt>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="src/main/resources">
+
+ <include name="arjunajta-properties.xml"/>
+ <include name="ejb3-interceptors-aop.xml"/>
+ <include name="jndi.properties"/>
+ </fileset>
+ <fileset dir="src/main/resources/results">
+ <include name="embedded-jboss-beans.xml"/>
+ <include name="log4j.xml"/>
+ </fileset>
+ <fileset dir="src/main/resources/properties/transaction-management/jta-managed">
+ <include name="default.persistence.properties"/>
+ </fileset>
+ </copy>
+ <!--loadfile srcfile="${output.directory}/profile.csv" property="profile.csv"-->
+ <loadfile srcfile="/home/whitingjr/tsperf/profiling/tx-type/local-tx/installation/embedded-db-embedded-db/profiler/none/single-vendor/derby/thread-count/5/20101122/20101122-190313/profile.csv" property="profile.csv">
+ <filterchain>
+ <striplinecomments>
+ <comment value="#"/>
+ </striplinecomments>
+ </filterchain>
+ </loadfile>
+ <hostinfo/>
+ <echo message="[${transaction.strategy}] [${resource.A.jdbc-datasource}] [${action.store.fqcn}] [${threads}] [${warmup-count}] [${profiled-count}] [${profile.csv}] [${output.directory}}][${resource.A.db.installation}][${resource.B.db.installation}][${resource.A.db.vendor}][${resource.B.db.vendor}] [${NAME}] [${ADDR4}][${DSTAMP}${time-stamp}][${profiler}][${begin}][${findUsingResourceA}][${findUsingResourceB}][${writeUsingResourceA}][${writeUsingResourceB}][${commit}]"/>
+ <java classname="org.jboss.jbossts.performance.results.submit.Submitter" classpathref="results.db.classpath" fork="true">
+ <jvmarg value="-Xdebug" />
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" />
+ <arg value="${transaction.strategy}"/>
+ <arg value="${resource.A.jdbc-datasource}"/>
+ <arg value="${action.store.fqcn}"/>
+ <arg value="${threads}"/>
+ <arg value="${warmup-count}"/>
+ <arg value="${profiled-count}"/>
+ <arg value="${profile.csv}"/>
+ <arg value="${output.directory}"/>
+ <arg value="${resource.A.db.installation}"/>
+ <arg value="${resource.B.db.installation}"/>
+ <arg value="${resource.A.db.vendor}"/>
+ <arg value="${resource.B.db.vendor}"/>
+ <arg value="${NAME}"/>
+ <arg value="${ADDR4}"/>
+ <arg value="${DSTAMP}${time-stamp}"/>
+ <arg value="${profiler}"/>
+ <arg value="${begin}"/>
+ <arg value="${findUsingResourceA}"/>
+ <arg value="${findUsingResourceB}"/>
+ <arg value="${writeUsingResourceA}"/>
+ <arg value="${writeUsingResourceB}"/>
+ <arg value="${commit}"/>
+ <arg value="META-INF/results-beans.xml"/>
+ <arg value="build/classes"/>
+ </java>
+ </target>
+
+ <target name="archive">
+ <!-- move directory to new backup dir, compress everything, move sequence version file, delete backup directory -->
+ </target>
<target name="usage">
<echo>Usage: ant ${required-args} [${optional-args}]</echo>
More information about the jboss-svn-commits
mailing list