[jboss-cvs] JBossAS SVN: r107076 - in projects/jboss-jca/branches/performance: servers and 1 other directories.

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

Author: jeff.zhang
Date: 2010-07-25 22:34:48 -0400 (Sun, 25 Jul 2010)
New Revision: 107076

Modified:
   projects/jboss-jca/branches/performance/build.xml
   projects/jboss-jca/branches/performance/servers/build.xml
   projects/jboss-jca/branches/performance/servers/src/main/resources/run_number.properties
Log:
[JBJCA-386] profiler save and regression

Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml	2010-07-25 19:55:55 UTC (rev 107075)
+++ projects/jboss-jca/branches/performance/build.xml	2010-07-26 02:34:48 UTC (rev 107076)
@@ -167,6 +167,13 @@
   </target>
   
   <!-- ================================= 
+       Target: regression
+       ================================= -->
+  <target name="regression">
+    <ant dir="servers" inheritRefs="true" target="regression"/>
+  </target>
+
+  <!-- ================================= 
        Target: prepare test
        ================================= -->
   <target name="prepare-test" depends="jars">

Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml	2010-07-25 19:55:55 UTC (rev 107075)
+++ projects/jboss-jca/branches/performance/servers/build.xml	2010-07-26 02:34:48 UTC (rev 107076)
@@ -30,6 +30,7 @@
   <property name="snapshot.location" value="${build.dir}/snapshots" />
   <property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
   <property name="jboss.profiler.file" value="${build.dir}/${jboss.profiler}.zip" />
+  <property name="rar.name" value="wm_JBJCA_NoTransaction_100000.rar" />
 
   <condition property="is.unix">
     <os family="unix"/>
@@ -128,6 +129,9 @@
     <taskdef name="save" classname="org.jboss.profiler.ant.SaveTask">
       <classpath refid="profiler.taskdef.classpath"/>
     </taskdef>
+    <taskdef name="regression" classname="org.jboss.profiler.ant.RegressionTask">
+      <classpath refid="profiler.taskdef.classpath"/>
+    </taskdef>
   </target>
 
   <target name="profiler-prepare-jbjca" depends="profiler-get" if="jbjca.home">
@@ -216,28 +220,31 @@
     <antcall target="profiler-jbas"/>
   </target>
 
-  <target name="profiler-jbjca" if="jbjca.home">
-    <echo message="Starting server..."/>
-    <exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
-      <arg line="run_profiler.${ext}"/>
-    </exec>
-    <sleep seconds="5"/>
-
+  <target name="doProfiler">
     <echo message="Start Profiler"/>
     <startprofiler/>
-    <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${deployer.dir}"/>
+    <copy file="${target.dir}/${rar.name}" todir="${deployer.dir}"/>
     <echo message="Wait for a while"/>
     <sleep seconds="10"/>
+    <echo message="Stop Profiler"/>
+    <stopprofiler/>
 
     <echo message="Saving snapshot"/>
     <antcall target="inc-num"/>
     <property file="${build.dir}/run_number.properties"/>
-    <mkdir dir="${snapshot.location}/${run.number}"/>
-    <save snapshot="${run.number}" destination="${snapshot.location}/${run.number}"/>
+    <mkdir dir="${snapshot.location}/${rar.name}"/>
+    <save snapshot="1" destination="${snapshot.location}/${rar.name}/${run.number}.jps"/>
+  </target>
 
-    <echo message="Stop Profiler"/>
-    <stopprofiler/>
+  <target name="profiler-jbjca" if="jbjca.home">
+    <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"/>
+
     <echo message="Stoping server..."/>
     <exec dir="${jbjca.home}/bin" executable="${exec}">
       <arg line="shutdown_profiler.${ext}"/>
@@ -249,23 +256,25 @@
     <server:start name="default"/>
     <sleep seconds="2"/>
 
-    <echo message="Start Profiler"/>
-    <startprofiler/>
-    <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${deployer.dir}"/>
-    <echo message="Wait for a while"/>
-    <sleep seconds="10"/>
+    <antcall target="doProfiler"/>
 
-    <echo message="Saving snapshot"/>
-    <antcall target="inc-num"/>
-    <property file="${build.dir}/run_number.properties"/>
-    <mkdir dir="${snapshot.location}/${run.number}"/>
-    <save snapshot="${run.number}" destination="${snapshot.location}/${run.number}"/>
-
-    <echo message="Stop Profiler"/>
-    <stopprofiler/>
-
     <echo message="Stoping server..."/>
     <server:stop name="default"/>
   </target>
 
+  <!-- ================================= 
+       Target: regression
+       ================================= -->
+  <target name="regression" depends="profiler-prepare">
+    <regression oldsnapshot="${snapshot.location}/${rar.name}/${old}.jps"
+                newsnapshot="${snapshot.location}/${rar.name}/${new}.jps"
+                difference="3"/>
+  </target>
+
+  <!-- ================================= 
+       Target: profiler-report
+       ================================= -->
+  <target name="profiler-report">
+  </target>
+
 </project>

Modified: projects/jboss-jca/branches/performance/servers/src/main/resources/run_number.properties
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/run_number.properties	2010-07-25 19:55:55 UTC (rev 107075)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/run_number.properties	2010-07-26 02:34:48 UTC (rev 107076)
@@ -1,2 +1,2 @@
-run.number=1
+run.number=0