[jboss-svn-commits] JBL Code SVN: r34446 - labs/jbosstm/workspace/whitingjr/trunk/performance.

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

Author: whitingjr
Date: 2010-08-02 04:57:34 -0400 (Mon, 02 Aug 2010)
New Revision: 34446

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Added copyright license.
Added profiling to disk.

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-08-02 08:56:33 UTC (rev 34445)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-08-02 08:57:34 UTC (rev 34446)
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Copyright 2009 Red Hat, Inc.
+ Red Hat licenses this file to you under the Apache License, version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.  See the License for the specific language governing
+ permissions and limitations under the License.
+  -->
+
 <project name="JBoss TM performance comparison project" default="htm">
 	<!--
 	This project executes the Hibernate sample application Caveat Emptor. There are two versions
@@ -45,6 +58,7 @@
 	  The CPU metrics can be viewed using the generated chart of the Dstat process. A
 	  browser ready htm file is generated.
     -->
+	
 	<property name="build.classes.dir" value="build/classes" />
 	<property name="test.output.dir" value="target" />
 	<property name="log.output.dir" value="/home/whitingjr/tsperf/profiling" />
@@ -58,7 +72,12 @@
 
 	<property name="driver.home" value="lib/dbdrivers" />
 	<property name="properties.home" value="src/main/resources/properties" />
-
+	<loadproperties srcfile="src/main/resources/properties/profiler/${profiler}/configuration.properties">
+      <filterchain>
+         <expandproperties />
+      </filterchain>
+   </loadproperties>		
+	
 	<path id="database.driver">
 		<fileset dir="${driver.home}/${resource.A.db.vendor}">
 			<include name="*.jar" />
@@ -128,8 +147,13 @@
 		<include name="*.properties" />
 	   <exclude name="build.properties"/>
 	</fileset>
-
+	
+	<tstamp>
+      <format property="time-stamp" pattern="kkmmss"  />
+   </tstamp>
+	
 	<taskdef resource="testngtasks" classpathref="test.classpath" />
+	<import file="src/main/resources/properties/profiler/${profiler}/ant-profiler.xml"/>
 
 	<target name="check-arguments">
 
@@ -305,16 +329,11 @@
 
 		<copy file="src/main/resources/log4j.xml" todir="build/classes" />
 		<copy file="src/main/resources/arjunajta-properties.xml" todir="build/classes" />
-		
 
 		<delete dir="${test.output.dir}" />
 		<mkdir dir="${test.output.dir}" />
-
-		<loadproperties srcfile="src/main/resources/properties/profiler/${profiler}/configuration.properties">
-			<filterchain>
-				<expandproperties />
-			</filterchain>
-		</loadproperties>
+			
+		
 		<copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml">
 			<filterchain>
 				<expandproperties />
@@ -367,9 +386,7 @@
 	</target>
 	
 	<target name="copy-logs" depends="profile">
-		<tstamp>
-         <format property="time-stamp" pattern="kkmmss"  />
-      </tstamp>
+		
 		<mkdir dir="${log.output.dir}/tx-type" />
 		<mkdir dir="${log.output.dir}/tx-type/${resource.A.jdbc-datasource}" />
 		<property name="installation-location" value="${resource.A.db.installation}-${resource.B.db.installation}"/>
@@ -414,9 +431,10 @@
 		<copy todir="${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}" file="${profile-file}"/>
 		<copy todir="${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}" file="${dstat-file}"/>
 		
+      <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">
+	<target name="htm" depends="copy-logs,process-profiling-data">
 		<java classname="org.jboss.jbossts.chart.ChartDstat">
 		   <classpath>
 		      <path refid="test.classpath" />