[jboss-cvs] JBossAS SVN: r107348 - in projects/jboss-jca/branches/performance: servers and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 3 06:20:40 EDT 2010
Author: jeff.zhang
Date: 2010-08-03 06:20:40 -0400 (Tue, 03 Aug 2010)
New Revision: 107348
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-386] run profiler one by one
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-08-03 06:21:43 UTC (rev 107347)
+++ projects/jboss-jca/branches/performance/build.xml 2010-08-03 10:20:40 UTC (rev 107348)
@@ -303,10 +303,18 @@
<delete dir="${root.dir}/configuration"/>
</target>
+
<!-- =================================
- Target: clean-performance
+ Target: clean-servers
================================= -->
- <target name="clean-performance">
+ <target name="clean-servers">
+ <delete dir="${root.dir}/servers"/>
+ </target>
+
+ <!-- =================================
+ Target: clean-performance-data
+ ================================= -->
+ <target name="clean-performance-data">
<delete dir="${root.dir}"/>
</target>
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-08-03 06:21:43 UTC (rev 107347)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-08-03 10:20:40 UTC (rev 107348)
@@ -34,10 +34,8 @@
<property name="ironjacamar.version" value="1.0.0.Beta1" />
<property name="ironjacamar.daily" value="daily" />
- <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"/>
@@ -59,11 +57,6 @@
<property name="ext" value="bat" />
</target>
- <target name="inc-num">
- <propertyfile file="${build.dir}/run_number.properties">
- <entry key="run.number" type="int" operation="+" value="1"/>
- </propertyfile>
- </target>
<!-- =================================
Target: download-servers
@@ -81,6 +74,9 @@
dest="${root.dir}/down/ironjacamar-${ironjacamar.version}.zip" skipexisting="true"/>
</target>
+ <!-- =================================
+ Target: unzip-servers
+ ================================= -->
<target name="exist-servers">
<available file="${root.dir}/servers/jbas-${jbossas.6.version}/jboss-${jbossas.6.file}/bin" type="dir" property="exist.as6" value="true"/>
<available file="${root.dir}/servers/jbas-${jbossas.5.version}/jboss-${jbossas.5.version}/bin" type="dir" property="exist.as5" value="true"/>
@@ -126,18 +122,6 @@
</target>
<!-- =================================
- Target: profiler check
- ================================= -->
- <target name="profiler-check">
- <available file="${build.dir}/${jboss.profiler}.zip" type="file" property="profiler.exist" value="true"/>
- </target>
-
- <target name="profiler-get" unless="profiler.exist" depends="profiler-check">
- <get src="http://download.jboss.org/jbossprofiler/${jboss.profiler}.zip"
- dest="${build.dir}"/>
- </target>
-
- <!-- =================================
Target: jbossas server config
================================= -->
<target name="jbas-config" unless="server-config.target.complete" if="jbas.home">
@@ -195,13 +179,17 @@
</target>
<!-- =================================
+ Target: profiler-get
+ ================================= -->
+ <target name="profiler-get">
+ <get src="http://download.jboss.org/jbossprofiler/${jboss.profiler}.zip"
+ dest="${build.dir}" skipexisting="true"/>
+ </target>
+
+ <!-- =================================
Target: profiler-prepare
================================= -->
- <target name="profiler-prepare" depends="profiler-prepare-jbjca, profiler-prepare-jbas">
- <mkdir dir="${snapshot.location}"/>
- <copy todir="${build.dir}">
- <fileset dir="src/main/resources" includes="*.properties"/>
- </copy>
+ <target name="profiler-prepare">
<taskdef name="startprofiler" classname="org.jboss.profiler.ant.StartProfilerTask">
<classpath refid="profiler.taskdef.classpath"/>
@@ -217,8 +205,15 @@
</taskdef>
</target>
- <target name="profiler-prepare-jbjca" depends="profiler-get" if="jbjca.home">
+ <target name="profiler-prepare-jbjca" depends="profiler-get">
+ <property name="jbjca.version" value="jbjca-${jbjca.kit}"/>
+ <property name="jbjca.home" value="${root.dir}/servers/${jbjca.version}/ironjacamar-${jbjca.kit}"/>
<property name="deployer.dir" value="${jbjca.home}/deploy"/>
+
+ <copy todir="${root.dir}/configuration/${jbjca.version}/profiler">
+ <fileset dir="src/main/resources" includes="run_number.properties"/>
+ </copy>
+
<unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbjca.home}/bin">
<patternset>
<include name="${jboss.profiler}/jboss-profiler.jar"/>
@@ -235,12 +230,13 @@
</unzip>
<move file="${jbjca.home}/lib/profiler/jboss-profiler.sar" tofile="${jbjca.home}/lib/profiler/jboss-profiler.sar.jar"/>
- <copy todir="${jbjca.home}/lib/profiler">
+ <copy todir="${jbjca.home}/lib/sjc">
<fileset dir="${lib.dir}/sjc" includes="*.jar"/>
</copy>
+
<path id="profiler.taskdef.classpath">
<fileset dir="${jbjca.home}/lib/profiler" includes="jboss-profiler-ant.jar"/>
- <fileset dir="${jbjca.home}/lib/profiler" includes="jboss-remoting.jar"/>
+ <fileset dir="${jbjca.home}/lib/sjc" includes="jboss-remoting.jar"/>
<fileset dir="${jbjca.home}/lib" includes="*.jar"/>
</path>
@@ -257,13 +253,17 @@
<copy todir="${jbjca.home}/config/bootstrap" overwrite="true">
<fileset dir="src/main/resources/jbjca" includes="profiler.xml"/>
</copy>
- <delete>
- <fileset dir="${deployer.dir}" includes="wm*.rar"/>
- </delete>
</target>
- <target name="profiler-prepare-jbas" depends="profiler-get" if="jbas.home">
+ <target name="profiler-prepare-jbas" depends="profiler-get">
+ <property name="jbas.version" value="jbas-${jbas.kit}"/>
+ <property name="jbas.home" value="${root.dir}/servers/${jbas.version}/jboss-${jbas.kit}"/>
<property name="deployer.dir" value="${jbas.home}/server/default/deploy"/>
+
+ <copy todir="${root.dir}/configuration/${jbas.version}/profiler">
+ <fileset dir="src/main/resources" includes="run_number.properties"/>
+ </copy>
+
<unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbas.home}/bin/profiler">
<patternset>
<include name="${jboss.profiler}/jboss-profiler.jar"/>
@@ -286,21 +286,31 @@
</path>
<copy todir="${jbas.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/jbas" includes="**/*"/>
+ <fileset dir="src/main/resources/jbas" includes="jboss-profiler.properties"/>
</copy>
- <chmod file="${jbas.home}/bin/*_profiler.sh" perm="775"/>
- <delete>
- <fileset dir="${deployer.dir}" includes="wm*.rar"/>
- </delete>
-
</target>
<!-- =================================
Target: profiler
================================= -->
- <target name="profiler" depends="os-check, profiler-prepare">
- <antcall target="profiler-jbjca"/>
- <antcall target="profiler-jbas"/>
+ <target name="profiler" depends="os-check">
+
+ <antcall target="profiler-jbjca">
+ <param name="jbjca.kit" value="${ironjacamar.daily}"/>
+ </antcall>
+
+ <antcall target="profiler-jbjca">
+ <param name="jbjca.kit" value="${ironjacamar.version}"/>
+ </antcall>
+
+ <antcall target="profiler-jbas">
+ <param name="jbas.kit" value="${jbossas.4.version}"/>
+ </antcall>
+
+ <antcall target="profiler-jbas">
+ <param name="jbas.kit" value="${jbossas.5.version}"/>
+ </antcall>
+
</target>
<target name="doProfiler">
@@ -308,39 +318,69 @@
<startprofiler/>
<copy file="${target.dir}/${rar.name}" todir="${deployer.dir}"/>
<echo message="Wait for a while"/>
- <sleep seconds="10"/>
+ <sleep seconds="${sleep.time}"/>
<echo message="Stop Profiler"/>
<stopprofiler/>
<echo message="Saving snapshot"/>
- <antcall target="inc-num"/>
- <property file="${build.dir}/run_number.properties"/>
- <mkdir dir="${snapshot.location}/${rar.name}"/>
- <save snapshot="1" destination="${snapshot.location}/${rar.name}/${run.number}.jps"/>
+
+ <save snapshot="1" destination="${run.dir}/${rar.name}.jps"/>
+ <delete file="${deployer.dir}/${rar.name}"/>
</target>
- <target name="profiler-jbjca" if="jbjca.home">
+
+ <target name="profiler-jbjca" depends="profiler-prepare-jbjca, profiler-prepare">
+ <propertyfile file="${root.dir}/configuration/${jbjca.version}/profiler/run_number.properties">
+ <entry key="run.number" type="int" operation="+" value="1"/>
+ </propertyfile>
+ <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}"/>
+
<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"/>
+ <antcall target="doProfiler">
+ <param name="rar.name" value="workmanager_JBJCA_NoTransaction_100.rar"/>
+ <param name="sleep.time" value="3"/>
+ </antcall>
+ <antcall target="doProfiler">
+ <param name="rar.name" value="workmanager_JBJCA_NoTransaction_10.rar"/>
+ <param name="sleep.time" value="3"/>
+ </antcall>
+
<echo message="Stoping server..."/>
<exec dir="${jbjca.home}/bin" executable="${exec}">
- <arg line="shutdown_profiler.${ext}"/>
+ <arg line="shutdown.${ext}"/>
</exec>
</target>
- <target name="profiler-jbas" depends="jbas-config, jbas-config-profiler" if="jbas.home">
+ <target name="profiler-jbas" depends="profiler-prepare-jbas, profiler-prepare, jbas-config-profiler">
+ <propertyfile file="${root.dir}/configuration/${jbas.version}/profiler/run_number.properties">
+ <entry key="run.number" type="int" operation="+" value="1"/>
+ </propertyfile>
+ <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}"/>
+
<echo message="Starting server..."/>
<server:start name="default"/>
<sleep seconds="2"/>
- <antcall target="doProfiler"/>
+ <antcall target="doProfiler">
+ <param name="rar.name" value="workmanager_JBAS_NoTransaction_100.rar"/>
+ <param name="sleep.time" value="3"/>
+ </antcall>
+ <antcall target="doProfiler">
+ <param name="rar.name" value="workmanager_JBAS_NoTransaction_10.rar"/>
+ <param name="sleep.time" value="3"/>
+ </antcall>
+
<echo message="Stoping server..."/>
<server:stop name="default"/>
</target>
@@ -349,9 +389,11 @@
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>
<!-- =================================
@@ -404,8 +446,6 @@
<!-- =================================
Target: benchmark
================================= -->
-
-
<target name="copy-log4j-xml" unless="is.jbas6">
<copy file="src/main/resources/jbas/jboss-log4j-${jbas.kit}.xml"
tofile="${jbas.home}/server/default/conf/jboss-log4j.xml"
@@ -422,7 +462,7 @@
<property name="jbas.home" value="${root.dir}/servers/${jbas.version}/jboss-${jbas.kit}"/>
<echo message="JBAS home ${jbas.home}"/>
- <copy todir="${root.dir}/configuration/${jbas.version}">
+ <copy todir="${root.dir}/configuration/${jbas.version}/benchmark">
<fileset dir="src/main/resources" includes="run_number.properties"/>
</copy>
@@ -431,10 +471,10 @@
</target>
<target name="doBenchmark-jbas" depends="benchmark-prepare-jbas, jbas-config-benchmark">
- <propertyfile file="${root.dir}/configuration/${jbas.version}/run_number.properties">
+ <propertyfile file="${root.dir}/configuration/${jbas.version}/benchmark/run_number.properties">
<entry key="run.number" type="int" operation="+" value="1"/>
</propertyfile>
- <property file="${root.dir}/configuration/${jbas.version}/run_number.properties"/>
+ <property file="${root.dir}/configuration/${jbas.version}/benchmark/run_number.properties"/>
<mkdir dir="${root.dir}/runs/${jbas.version}/raw/${run.number}"/>
<echo message="Start log socket server"/>
@@ -468,7 +508,7 @@
<fileset dir="${lib.dir}/sjc" includes="fungal*.jar"/>
</copy>
- <copy todir="${root.dir}/configuration/${jbjca.version}">
+ <copy todir="${root.dir}/configuration/${jbjca.version}/benchmark">
<fileset dir="src/main/resources" includes="run_number.properties"/>
</copy>
@@ -479,10 +519,10 @@
<target name="doBenchmark-jbjca" depends="benchmark-prepare-jbjca">
- <propertyfile file="${root.dir}/configuration/${jbjca.version}/run_number.properties">
+ <propertyfile file="${root.dir}/configuration/${jbjca.version}/benchmark/run_number.properties">
<entry key="run.number" type="int" operation="+" value="1"/>
</propertyfile>
- <property file="${root.dir}/configuration/${jbjca.version}/run_number.properties"/>
+ <property file="${root.dir}/configuration/${jbjca.version}/benchmark/run_number.properties"/>
<mkdir dir="${root.dir}/runs/${jbjca.version}/raw/${run.number}"/>
<ant dir="../extensions" inheritRefs="true" target="benchmark-prepare-jbjca"/>
@@ -517,7 +557,6 @@
<target name="benchmark" depends="os-check">
-
<antcall target="doBenchmark-jbjca">
<param name="jbjca.kit" value="${ironjacamar.daily}"/>
</antcall>
@@ -541,7 +580,6 @@
<param name="is.jbas6" value="true"/>
</antcall>
-->
+ </target>
-
- </target>
</project>
More information about the jboss-cvs-commits
mailing list