[jboss-cvs] JBossAS SVN: r107144 - in projects/jboss-jca/branches/performance: rars and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 28 07:52:55 EDT 2010
Author: jeff.zhang
Date: 2010-07-28 07:52:54 -0400 (Wed, 28 Jul 2010)
New Revision: 107144
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/ivy.xml
projects/jboss-jca/branches/performance/rars/.project
projects/jboss-jca/branches/performance/rars/build.xml
projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java
projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-386] automaticlly deploy wm rars for connection performance data aginst sjc container
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-07-28 11:50:01 UTC (rev 107143)
+++ projects/jboss-jca/branches/performance/build.xml 2010-07-28 11:52:54 UTC (rev 107144)
@@ -60,7 +60,9 @@
<property name="tools.dir" value="${basedir}/tools" />
<property name="reports.dir" value="${basedir}/reports" />
<property name="test.dir" value="${reports.dir}" />
+ <property name="root.dir" value="${basedir}/root" />
+
<property name="javac.debug" value="on" />
<property name="javac.deprecation" value="on" />
<property name="javac.optimize" value="off" />
@@ -101,6 +103,7 @@
Versions
================================= -->
<property name="version.jboss.jca.api" value="1.5.0.GA"/>
+ <property name="version.jboss.stdio" value="1.0.0.CR3"/>
<property name="version.fungal" value="0.8.0.Beta6"/>
<property name="version.jboss.test" value="1.1.9.GA"/>
<property name="version.jboss.server.manager" value="1.0.3.GA"/>
@@ -129,6 +132,7 @@
<mkdir dir="${build.dir}" />
<mkdir dir="${target.dir}" />
+ <mkdir dir="${root.dir}"/>
</target>
<!-- =================================
@@ -150,6 +154,7 @@
================================= -->
<target name="jars" depends="resolve">
<ant dir="rars" inheritRefs="true" target="jars"/>
+ <ant dir="extensions" inheritRefs="true" target="jars"/>
</target>
<!-- =================================
@@ -160,6 +165,13 @@
</target>
<!-- =================================
+ Target: benchmark
+ ================================= -->
+ <target name="benchmark" depends="jars">
+ <ant dir="servers" inheritRefs="true" target="benchmark"/>
+ </target>
+
+ <!-- =================================
Target: profiler
================================= -->
<target name="profiler" depends="jars">
Modified: projects/jboss-jca/branches/performance/ivy.xml
===================================================================
--- projects/jboss-jca/branches/performance/ivy.xml 2010-07-28 11:50:01 UTC (rev 107143)
+++ projects/jboss-jca/branches/performance/ivy.xml 2010-07-28 11:52:54 UTC (rev 107144)
@@ -37,6 +37,7 @@
<dependencies>
<dependency org="org.jboss.javaee" name="jboss-jca-api" rev="${version.jboss.jca.api}" conf="common"/>
+ <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common"/>
<dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="sjc"/>
<dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="sjc"/>
<dependency org="jboss" name="jboss-serialization" rev="${version.jboss.serialization}" conf="sjc"/>
Modified: projects/jboss-jca/branches/performance/rars/.project
===================================================================
--- projects/jboss-jca/branches/performance/rars/.project 2010-07-28 11:50:01 UTC (rev 107143)
+++ projects/jboss-jca/branches/performance/rars/.project 2010-07-28 11:52:54 UTC (rev 107144)
@@ -1,6 +1,6 @@
<projectDescription>
- <name>jboss-jca-performance</name>
- <comment>JBoss JCA Performance</comment>
+ <name>jboss-jca-performance-rars</name>
+ <comment>JBoss JCA Performance rars module</comment>
<projects/>
<buildSpec>
<buildCommand>
Modified: projects/jboss-jca/branches/performance/rars/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/build.xml 2010-07-28 11:50:01 UTC (rev 107143)
+++ projects/jboss-jca/branches/performance/rars/build.xml 2010-07-28 11:52:54 UTC (rev 107144)
@@ -104,6 +104,7 @@
<makerar count="10000" as="JBJCA" trans="XATransaction"/>
<makerar count="100000" as="JBJCA" trans="NoTransaction"/>
<makerar count="100000" as="JBJCA" trans="XATransaction"/>
+
</target>
<!-- =================================
Modified: projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java 2010-07-28 11:50:01 UTC (rev 107143)
+++ projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java 2010-07-28 11:52:54 UTC (rev 107144)
@@ -212,8 +212,7 @@
long l2 = System.nanoTime();
long time = (l2 - l1) / 1000000;
- System.out.println("Stat: running " + trans + " " + count +
- " on as server " + appserver + " time: " + time + " ms" );
+ System.out.println("@," + appserver + "," + trans + "," + count + "," + time);
}
/**
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-07-28 11:50:01 UTC (rev 107143)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-07-28 11:52:54 UTC (rev 107144)
@@ -277,4 +277,57 @@
<target name="profiler-report">
</target>
+ <!-- =================================
+ Macrodef: deploy-rar
+ ================================= -->
+ <macrodef name="deploy-rar">
+ <attribute name="count"/>
+ <attribute name="as"/>
+ <attribute name="trans"/>
+ <attribute name="sleep"/>
+ <sequential>
+ <echo message="Deploying wm_@{as}_@{trans}_@{count}.rar"/>
+ <copy todir="${jbjca.home}/deploy">
+ <fileset dir="${target.dir}" includes="wm_@{as}_@{trans}_@{count}.rar"/>
+ </copy>
+ <sleep seconds="@{sleep}"/>
+ <delete>
+ <fileset dir="${jbjca.home}/deploy" includes="wm_@{as}_@{trans}_@{count}.rar"/>
+ </delete>
+ <echo message="Undeployed wm_@{as}_@{trans}_@{count}.rar"/>
+ </sequential>
+ </macrodef>
+
+ <!-- =================================
+ Target: benchmark
+ ================================= -->
+ <target name="benchmark" depends="os-check, profiler-prepare">
+ <echo message="Starting server..."/>
+ <exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
+ <arg line="run.${ext}"/>
+ </exec>
+ <sleep seconds="5"/>
+
+ <deploy-rar count="1" as="JBJCA" trans="NoTransaction" sleep="5"/>
+ <deploy-rar count="1" as="JBJCA" trans="XATransaction" sleep="5"/>
+ <deploy-rar count="10" as="JBJCA" trans="NoTransaction" sleep="5"/>
+ <deploy-rar count="10" as="JBJCA" trans="XATransaction" sleep="5"/>
+<!--
+ <deploy-rar count="100" as="JBJCA" trans="NoTransaction" sleep="100"/>
+ <deploy-rar count="100" as="JBJCA" trans="XATransaction" sleep="100"/>
+ <deploy-rar count="1000" as="JBJCA" trans="NoTransaction" sleep="800"/>
+ <deploy-rar count="1000" as="JBJCA" trans="XATransaction" sleep="200"/>
+ <deploy-rar count="10000" as="JBJCA" trans="NoTransaction" sleep="6000"/>
+ <deploy-rar count="10000" as="JBJCA" trans="XATransaction" sleep="6000"/>
+ <deploy-rar count="100000" as="JBJCA" trans="NoTransaction" sleep="60000"/>
+ <deploy-rar count="100000" as="JBJCA" trans="XATransaction" sleep="60000"/>
+-->
+ <echo message="Stoping server..."/>
+ <sleep seconds="5"/>
+ <exec dir="${jbjca.home}/bin" executable="${exec}">
+ <arg line="shutdown_profiler.${ext}"/>
+ </exec>
+
+ </target>
+
</project>
More information about the jboss-cvs-commits
mailing list