[jboss-cvs] JBossAS SVN: r108218 - projects/jboss-jca/branches/performance/servers.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2010-09-20 08:34:11 -0400 (Mon, 20 Sep 2010)
New Revision: 108218

Modified:
   projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-424] performance report include profiler data

Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml	2010-09-20 10:27:10 UTC (rev 108217)
+++ projects/jboss-jca/branches/performance/servers/build.xml	2010-09-20 12:34:11 UTC (rev 108218)
@@ -185,6 +185,7 @@
   <target name="profiler-get">
     <get src="http://download.jboss.org/jbossprofiler/${jboss.profiler}.zip" 
          dest="${build.dir}" skipexisting="true"/>
+    <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${target.dir}"/>
   </target>
 
   <!-- ================================= 
@@ -331,6 +332,9 @@
 
     <save snapshot="1" destination="${run.dir}/${rar.name}.jps"/>
     <delete file="${deployer.dir}/${rar.name}"/>
+
+    <antcall target="profiler-report-single"/>
+
   </target>
 
 
@@ -341,27 +345,59 @@
     <property file="${root.dir}/configuration/${jbjca.version}/profiler/run_number.properties"/>
     <property name="run.dir" value="${root.dir}/runs/${jbjca.version}/profiler/${run.number}"/>
     <mkdir dir="${run.dir}"/>
+    <property name="profiler.report.dir" value="${root.dir}/reports/${jbjca.version}/profiler/${run.number}"/>
 
     <echo message="Starting server..."/>
     <exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
       <arg line="run_profiler.${ext}"/>
     </exec>
     <sleep seconds="5"/>
+<!--
+    <antcall target="doProfiler">
+      <param name="rar.name" value="workmanager_JBJCA_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
 
     <antcall target="doProfiler">
-      <param name="rar.name" value="workmanager_JBJCA_NoTransaction_100.rar"/>
-      <param name="sleep.time" value="3"/>
+      <param name="rar.name" value="workmanager_JBJCA_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
     </antcall>
 
     <antcall target="doProfiler">
-      <param name="rar.name" value="workmanager_JBJCA_NoTransaction_10.rar"/>
-      <param name="sleep.time" value="3"/>
+      <param name="rar.name" value="workmanager-block_JBJCA_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
     </antcall>
 
+    <antcall target="doProfiler">
+      <param name="rar.name" value="workmanager-block_JBJCA_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_ABQ_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+-->
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_ABQ_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
     <echo message="Stoping server..."/>
     <exec dir="${jbjca.home}/bin" executable="${exec}">
       <arg line="shutdown.${ext}"/>
     </exec>
+
   </target>
 
   <target name="profiler-jbas" depends="profiler-prepare-jbas, profiler-prepare, jbas-config-profiler">
@@ -371,21 +407,53 @@
     <property file="${root.dir}/configuration/${jbas.version}/profiler/run_number.properties"/>
     <property name="run.dir" value="${root.dir}/runs/${jbas.version}/profiler/${run.number}"/>
     <mkdir dir="${run.dir}"/>
+    <property name="profiler.report.dir" value="${root.dir}/reports/${jbas.version}/profiler/${run.number}"/>
 
     <echo message="Starting server..."/>
     <server:start name="default"/>
     <sleep seconds="2"/>
 
+<!--
     <antcall target="doProfiler">
-      <param name="rar.name" value="workmanager_JBAS_NoTransaction_100.rar"/>
-      <param name="sleep.time" value="3"/>
+      <param name="rar.name" value="workmanager_JBJCA_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
     </antcall>
 
     <antcall target="doProfiler">
-      <param name="rar.name" value="workmanager_JBAS_NoTransaction_10.rar"/>
-      <param name="sleep.time" value="3"/>
+      <param name="rar.name" value="workmanager_JBJCA_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
     </antcall>
 
+    <antcall target="doProfiler">
+      <param name="rar.name" value="workmanager-block_JBJCA_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="workmanager-block_JBJCA_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_ABQ_NoTransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+-->
+    <antcall target="doProfiler">
+      <param name="rar.name" value="connection_JBJCA_ABQ_XATransaction_10000.rar"/>
+      <param name="sleep.time" value="15"/>
+    </antcall>
+
     <echo message="Stoping server..."/>
     <server:stop name="default"/>
   </target>
@@ -402,9 +470,23 @@
   </target>
 
   <!-- ================================= 
+       Target: profiler-report-single
+       ================================= -->
+  <target name="profiler-report-single">
+      <java jar="${target.dir}/${jboss.profiler}/jboss-profiler-client.jar" dir="${target.dir}/${jboss.profiler}" fork="true">
+        <jvmarg value="-Djboss-profiler-client.properties=${target.dir}/${jboss.profiler}/jboss-profiler-client.properties"/>
+        <jvmarg value="-Xmx512m"/>
+        <arg value="load"/>
+        <arg value="${run.dir}/${rar.name}.jps"/>
+        <arg value="${profiler.report.dir}/${rar.name}"/>
+      </java>
+  </target>
+
+  <!-- ================================= 
        Target: profiler-report
        ================================= -->
   <target name="profiler-report">
+
   </target>
 
   <!-- =================================