[jboss-cvs] JBossAS SVN: r107261 - in projects/jboss-jca/branches/performance: extensions and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 2 08:41:39 EDT 2010
Author: jeff.zhang
Date: 2010-08-02 08:41:37 -0400 (Mon, 02 Aug 2010)
New Revision: 107261
Added:
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.bat
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.sh
Removed:
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/extensions/build.xml
projects/jboss-jca/branches/performance/extensions/src/main/java/org/jboss/jca/performance/ext/stdio/ExtWriterOutputStream.java
projects/jboss-jca/branches/performance/extensions/src/main/resources/stdio.xml
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/rars/src/main/resources/workmanager/META-INF/ra.xml
projects/jboss-jca/branches/performance/servers/build.xml
Log:
add block infomation in rar and running servers one by one
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/build.xml 2010-08-02 12:41:37 UTC (rev 107261)
@@ -288,8 +288,29 @@
<delete file="${name}-${major}.${minor}.${patch}.${type}.zip" />
<delete file="${name}-${major}.${minor}.${patch}.${type}.tar.gz" />
</target>
+
+ <!-- =================================
+ Target: clean-runs
+ ================================= -->
+ <target name="clean-runs">
+ <delete dir="${root.dir}/runs"/>
+ </target>
<!-- =================================
+ Target: clean-configuration
+ ================================= -->
+ <target name="clean-configuration">
+ <delete dir="${root.dir}/configuration"/>
+ </target>
+
+ <!-- =================================
+ Target: clean-performance
+ ================================= -->
+ <target name="clean-performance">
+ <delete dir="${root.dir}"/>
+ </target>
+
+ <!-- =================================
Target: clean-cache
================================= -->
<target name="clean-cache">
Modified: projects/jboss-jca/branches/performance/extensions/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/extensions/build.xml 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/extensions/build.xml 2010-08-02 12:41:37 UTC (rev 107261)
@@ -70,13 +70,15 @@
</target>
<!-- =================================
- Target: benchmark-prepare
+ Target: benchmark-prepare-jbjca
================================= -->
- <target name="benchmark-prepare">
+ <target name="benchmark-prepare-jbjca">
<copy todir="${jbjca.home}/config/bootstrap" overwrite="true">
<fileset dir="src/main/resources/" includes="stdio.xml"/>
<filterset>
- <filter token="JBJCA_DATA" value="${root.dir}/runs/${jbjca.version}/raw/${run.number}/data.txt"/>
+ <filter token="RUN_DIR" value="${root.dir}/runs"/>
+ <filter token="JBJCA_VER" value="${jbjca.version}"/>
+ <filter token="RUN_NUMBER" value="${run.number}"/>
</filterset>
</copy>
<copy todir="${jbjca.home}/lib" overwrite="true">
Modified: projects/jboss-jca/branches/performance/extensions/src/main/java/org/jboss/jca/performance/ext/stdio/ExtWriterOutputStream.java
===================================================================
--- projects/jboss-jca/branches/performance/extensions/src/main/java/org/jboss/jca/performance/ext/stdio/ExtWriterOutputStream.java 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/extensions/src/main/java/org/jboss/jca/performance/ext/stdio/ExtWriterOutputStream.java 2010-08-02 12:41:37 UTC (rev 107261)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.performance.ext.stdio;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
@@ -35,8 +36,13 @@
*/
public class ExtWriterOutputStream extends WriterOutputStream
{
- /** output data filename */
- private String dataFile;
+
+ /** directory od runs data */
+ private String runDir;
+ /** version */
+ private String jbjcaVer;
+ /** run number */
+ private String runNumber;
/** file to output data */
private FileWriter data = null;
@@ -65,18 +71,17 @@
{
super.write(b, off, len);
+
if (b[0] == '@' && b[1] == '@')
{
String str = new String(b, off, len);
- System.out.println();
if (data == null)
{
- if (dataFile != null && !dataFile.equals(""))
- {
- data = new FileWriter(dataFile);
- }
-
+ String dataFile = runDir + "/" + jbjcaVer + "/" +
+ "raw" + "/" + runNumber + "/" + "data.txt";
+
+ data = new FileWriter(dataFile);
if (data == null)
throw new IOException("Can't create file" + dataFile);
}
@@ -86,6 +91,7 @@
data.flush();
}
+
}
/**
@@ -96,31 +102,72 @@
@Override
public void close() throws IOException
{
- super.close();
if (data != null)
{
data.close();
}
+ super.close();
}
/**
- * Set the dataFile.
+ * Set the runDir.
*
- * @param dataFile The dataFile to set.
+ * @param runDir The runDir to set.
*/
- public void setDataFile(String dataFile)
+ public void setRunDir(String runDir)
{
- this.dataFile = dataFile;
+ this.runDir = runDir;
}
/**
- * Get the dataFile.
+ * Get the runDir.
*
- * @return the dataFile.
+ * @return the runDir.
*/
- public String getDataFile()
+ public String getRunDir()
{
- return dataFile;
+ return runDir;
}
+ /**
+ * Set the jbjcaVer.
+ *
+ * @param jbjcaVer The jbjcaVer to set.
+ */
+ public void setJbjcaVer(String jbjcaVer)
+ {
+ this.jbjcaVer = jbjcaVer;
+ }
+
+ /**
+ * Get the jbjcaVer.
+ *
+ * @return the jbjcaVer.
+ */
+ public String getJbjcaVer()
+ {
+ return jbjcaVer;
+ }
+
+ /**
+ * Set the runNumber.
+ *
+ * @param runNumber The runNumber to set.
+ */
+ public void setRunNumber(String runNumber)
+ {
+ this.runNumber = runNumber;
+ }
+
+ /**
+ * Get the runNumber.
+ *
+ * @return the runNumber.
+ */
+ public String getRunNumber()
+ {
+ return runNumber;
+ }
+
+
}
Modified: projects/jboss-jca/branches/performance/extensions/src/main/resources/stdio.xml
===================================================================
--- projects/jboss-jca/branches/performance/extensions/src/main/resources/stdio.xml 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/extensions/src/main/resources/stdio.xml 2010-08-02 12:41:37 UTC (rev 107261)
@@ -5,7 +5,9 @@
<parameter>STDOUT</parameter>
<parameter>INFO</parameter>
</constructor>
- <property name="DataFile">@JBJCA_DATA@</property>
+ <property name="RunDir">@RUN_DIR@</property>
+ <property name="JbjcaVer">@JBJCA_VER@</property>
+ <property name="RunNumber">@RUN_NUMBER@</property>
</bean>
<bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
Modified: projects/jboss-jca/branches/performance/rars/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/build.xml 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/rars/build.xml 2010-08-02 12:41:37 UTC (rev 107261)
@@ -45,34 +45,55 @@
</javac>
</target>
- <macrodef name="makerar">
+ <macrodef name="make-rar">
+ <attribute name="type"/>
<attribute name="count"/>
<attribute name="as"/>
- <attribute name="trans"/>
+ <attribute name="trans"/>
<sequential>
- <copy todir="${build.rars.dir}/jars/rars/@{as}/@{trans}/@{count}">
+ <copy todir="${build.rars.dir}/jars/rars/noblock/@{as}/@{trans}/@{count}">
<fileset dir="src/main/resources/" includes="**/ra.xml"/>
<filterset>
<filter token="COUNT" value="@{count}"/>
<filter token="AS" value="@{as}"/>
<filter token="TRANS" value="@{trans}"/>
+ <filter token="SLEEP" value="0"/>
</filterset>
</copy>
- <jar destfile="${target.dir}/wm_@{as}_@{trans}_@{count}.rar"
+ <jar destfile="${target.dir}/@{type}_@{as}_@{trans}_@{count}.rar"
manifest="src/main/resources/rar-manifest.mf">
<fileset dir="${build.rars.dir}/jars/rars"
- includes="org/jboss/jca/performance/rars/workmanager/*.class"/>
+ includes="org/jboss/jca/performance/rars/@{type}/*.class"/>
- <fileset dir="${build.rars.dir}/jars/rars/@{as}/@{trans}/@{count}/workmanager"
+ <fileset dir="${build.rars.dir}/jars/rars//noblock/@{as}/@{trans}/@{count}/@{type}"
includes="**/**"/>
</jar>
- <jar destfile="${target.dir}/conn_@{as}_@{trans}_@{count}.rar"
+ </sequential>
+ </macrodef>
+
+ <macrodef name="make-block-rar">
+ <attribute name="type"/>
+ <attribute name="count"/>
+ <attribute name="as"/>
+ <attribute name="trans"/>
+ <sequential>
+ <copy todir="${build.rars.dir}/jars/rars/block/@{as}/@{trans}/@{count}">
+ <fileset dir="src/main/resources/" includes="**/ra.xml"/>
+ <filterset>
+ <filter token="COUNT" value="@{count}"/>
+ <filter token="AS" value="@{as}"/>
+ <filter token="TRANS" value="@{trans}"/>
+ <filter token="SLEEP" value="10"/>
+ </filterset>
+ </copy>
+
+ <jar destfile="${target.dir}/@{type}-block_@{as}_@{trans}_@{count}.rar"
manifest="src/main/resources/rar-manifest.mf">
<fileset dir="${build.rars.dir}/jars/rars"
- includes="org/jboss/jca/performance/rars/connection/*.class"/>
+ includes="org/jboss/jca/performance/rars/@{type}/*.class"/>
- <fileset dir="${build.rars.dir}/jars/rars/@{as}/@{trans}/@{count}/connection"
+ <fileset dir="${build.rars.dir}/jars/rars/block/@{as}/@{trans}/@{count}/@{type}"
includes="**/**"/>
</jar>
</sequential>
@@ -92,19 +113,85 @@
includes="**"/>
</copy>
- <makerar count="1" as="JBJCA" trans="NoTransaction"/>
- <makerar count="1" as="JBJCA" trans="XATransaction"/>
- <makerar count="10" as="JBJCA" trans="NoTransaction"/>
- <makerar count="10" as="JBJCA" trans="XATransaction"/>
- <makerar count="100" as="JBJCA" trans="NoTransaction"/>
- <makerar count="100" as="JBJCA" trans="XATransaction"/>
- <makerar count="1000" as="JBJCA" trans="NoTransaction"/>
- <makerar count="1000" as="JBJCA" trans="XATransaction"/>
- <makerar count="10000" as="JBJCA" trans="NoTransaction"/>
- <makerar count="10000" as="JBJCA" trans="XATransaction"/>
- <makerar count="100000" as="JBJCA" trans="NoTransaction"/>
- <makerar count="100000" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="workmanager" count="1" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="1" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="workmanager" count="10" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="10" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="workmanager" count="100" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="100" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="workmanager" count="1000" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="1000" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="workmanager" count="10000" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="10000" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="workmanager" count="100000" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="100000" as="JBJCA" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="1" as="JBJCA" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="1" as="JBJCA" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="10" as="JBJCA" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="10" as="JBJCA" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="100" as="JBJCA" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="100" as="JBJCA" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="1000" as="JBJCA" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="1000" as="JBJCA" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="10000" as="JBJCA" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="10000" as="JBJCA" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="100000" as="JBJCA" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="100000" as="JBJCA" trans="XATransaction"/>
+
+ <make-rar type="connection" count="1" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="1" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="connection" count="10" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="10" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="connection" count="100" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="100" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="connection" count="1000" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="1000" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="connection" count="10000" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="10000" as="JBJCA" trans="XATransaction"/>
+ <make-rar type="connection" count="100000" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="100000" as="JBJCA" trans="XATransaction"/>
+
+
+ <make-rar type="workmanager" count="1" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="1" as="JBAS" trans="XATransaction"/>
+ <make-rar type="workmanager" count="10" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="10" as="JBAS" trans="XATransaction"/>
+ <make-rar type="workmanager" count="100" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="100" as="JBAS" trans="XATransaction"/>
+ <make-rar type="workmanager" count="1000" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="1000" as="JBAS" trans="XATransaction"/>
+ <make-rar type="workmanager" count="10000" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="10000" as="JBAS" trans="XATransaction"/>
+ <make-rar type="workmanager" count="100000" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="workmanager" count="100000" as="JBAS" trans="XATransaction"/>
+
+ <make-block-rar type="workmanager" count="1" as="JBAS" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="1" as="JBAS" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="10" as="JBAS" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="10" as="JBAS" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="100" as="JBAS" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="100" as="JBAS" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="1000" as="JBAS" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="1000" as="JBAS" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="10000" as="JBAS" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="10000" as="JBAS" trans="XATransaction"/>
+ <make-block-rar type="workmanager" count="100000" as="JBAS" trans="NoTransaction"/>
+ <make-block-rar type="workmanager" count="100000" as="JBAS" trans="XATransaction"/>
+
+ <make-rar type="connection" count="1" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="connection" count="1" as="JBAS" trans="XATransaction"/>
+ <make-rar type="connection" count="10" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="connection" count="10" as="JBAS" trans="XATransaction"/>
+ <make-rar type="connection" count="100" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="connection" count="100" as="JBAS" trans="XATransaction"/>
+ <make-rar type="connection" count="1000" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="connection" count="1000" as="JBAS" trans="XATransaction"/>
+ <make-rar type="connection" count="10000" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="connection" count="10000" as="JBAS" trans="XATransaction"/>
+ <make-rar type="connection" count="100000" as="JBAS" trans="NoTransaction"/>
+ <make-rar type="connection" count="100000" as="JBAS" 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-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java 2010-08-02 12:41:37 UTC (rev 107261)
@@ -212,7 +212,12 @@
long l2 = System.nanoTime();
long time = (l2 - l1) / 1000000;
- System.out.println("@@," + appserver + "," + trans + "," + count + "," + time);
+ String block;
+ if (sleepTime > 0)
+ block = "workmanager-block";
+ else
+ block = "workmanager";
+ System.out.println("@@," + block + "," + appserver + "," + trans + "," + count + "," + time);
}
/**
Modified: projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml 2010-08-02 12:41:37 UTC (rev 107261)
@@ -20,7 +20,7 @@
<config-property>
<config-property-name>sleepTime</config-property-name>
<config-property-type>java.lang.Long</config-property-type>
- <config-property-value>0</config-property-value>
+ <config-property-value>@SLEEP@</config-property-value>
</config-property>
<config-property>
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-08-02 12:41:37 UTC (rev 107261)
@@ -363,59 +363,48 @@
<!-- =================================
Macrodef: deploy-rar
================================= -->
- <macrodef name="deploy-rar">
+ <macrodef name="deploy-rar-jbjca">
+ <attribute name="type"/>
<attribute name="count"/>
<attribute name="as"/>
<attribute name="trans"/>
<attribute name="sleep"/>
<sequential>
- <echo message="Deploying wm_@{as}_@{trans}_@{count}.rar"/>
+ <echo message="Deploying @{type}_@{as}_@{trans}_@{count}.rar"/>
<copy todir="${jbjca.home}/deploy">
- <fileset dir="${target.dir}" includes="wm_@{as}_@{trans}_@{count}.rar"/>
+ <fileset dir="${target.dir}" includes="@{type}_@{as}_@{trans}_@{count}.rar"/>
</copy>
<sleep seconds="@{sleep}"/>
<delete>
- <fileset dir="${jbjca.home}/deploy" includes="wm_@{as}_@{trans}_@{count}.rar"/>
+ <fileset dir="${jbjca.home}/deploy" includes="@{type}_@{as}_@{trans}_@{count}.rar"/>
</delete>
- <echo message="Undeployed wm_@{as}_@{trans}_@{count}.rar"/>
+ <echo message="Undeployed @{type}_@{as}_@{trans}_@{count}.rar"/>
</sequential>
</macrodef>
<macrodef name="deploy-rar-jbas">
+ <attribute name="type"/>
<attribute name="count"/>
<attribute name="as"/>
<attribute name="trans"/>
<attribute name="sleep"/>
<sequential>
- <echo message="Deploying wm_@{as}_@{trans}_@{count}.rar"/>
+ <echo message="Deploying @{type}_@{as}_@{trans}_@{count}.rar"/>
<copy todir="${jbas.home}/server/default/deploy">
- <fileset dir="${target.dir}" includes="wm_@{as}_@{trans}_@{count}.rar"/>
+ <fileset dir="${target.dir}" includes="@{type}_@{as}_@{trans}_@{count}.rar"/>
</copy>
<sleep seconds="@{sleep}"/>
<delete>
- <fileset dir="${jbas.home}/server/default/deploy" includes="wm_@{as}_@{trans}_@{count}.rar"/>
+ <fileset dir="${jbas.home}/server/default/deploy" includes="@{type}_@{as}_@{trans}_@{count}.rar"/>
</delete>
- <echo message="Undeployed wm_@{as}_@{trans}_@{count}.rar"/>
+ <echo message="Undeployed @{type}_@{as}_@{trans}_@{count}.rar"/>
</sequential>
</macrodef>
<!-- =================================
Target: benchmark
================================= -->
- <target name="benchmark-prepare">
- <copy todir="${jbjca.home}/lib/profiler">
- <fileset dir="${lib.dir}/sjc" includes="fungal*.jar"/>
- </copy>
- <copy todir="${root.dir}/configuration/${jbjca.version}">
- <fileset dir="src/main/resources" includes="run_number.properties"/>
- </copy>
- <copy todir="${jbjca.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/jbjca" includes="shutdown*.sh"/>
- <fileset dir="src/main/resources/jbjca" includes="shutdown*.bat"/>
- </copy>
- <chmod file="${jbjca.home}/bin/*_profiler.sh" perm="775"/>
- </target>
<target name="copy-log4j-xml" unless="is.jbas6">
<copy file="src/main/resources/jbas/jboss-log4j-${jbas.kit}.xml"
@@ -449,77 +438,91 @@
<mkdir dir="${root.dir}/runs/${jbas.version}/raw/${run.number}"/>
<echo message="Start log socket server"/>
-<parallel>
+ <parallel>
<ant dir="../extensions" inheritRefs="true" target="log-socket-server">
<property name="jbas.data" value="${root.dir}/runs/${jbas.version}/raw/${run.number}/data.txt"/>
</ant>
- <sequential>
+ <sequential>
- <echo message="Starting jboss as server..."/>
- <server:start name="default"/>
- <sleep seconds="2"/>
+ <echo message="Starting jboss as server..."/>
+ <server:start name="default"/>
+ <sleep seconds="2"/>
- <deploy-rar-jbas count="1" as="JBJCA" trans="NoTransaction" sleep="5"/>
- <deploy-rar-jbas count="1" as="JBJCA" trans="XATransaction" sleep="5"/>
- <deploy-rar-jbas count="10" as="JBJCA" trans="NoTransaction" sleep="5"/>
- <deploy-rar-jbas count="10" as="JBJCA" trans="XATransaction" sleep="5"/>
+ <deploy-rar-jbas type="workmanager" count="1" as="JBJCA" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbas type="workmanager" count="1" as="JBJCA" trans="XATransaction" sleep="5"/>
+ <deploy-rar-jbas type="workmanager" count="10" as="JBJCA" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbas type="workmanager" count="10" as="JBJCA" trans="XATransaction" sleep="5"/>
- <echo message="Stoping server..."/>
- <server:stop name="default"/>
- </sequential>
-</parallel>
+ <echo message="Stoping server..."/>
+ <server:stop name="default"/>
+ </sequential>
+ </parallel>
</target>
- <target name="doBenchmark">
+ <target name="benchmark-prepare-jbjca">
<property name="jbjca.version" value="jbjca-${jbjca.kit}"/>
<property name="jbjca.home" value="${root.dir}/servers/${jbjca.version}/ironjacamar-${jbjca.kit}"/>
+ <copy todir="${jbjca.home}/lib/sjc">
+ <fileset dir="${lib.dir}/sjc" includes="fungal*.jar"/>
+ </copy>
- <antcall target="benchmark-prepare"/>
+ <copy todir="${root.dir}/configuration/${jbjca.version}">
+ <fileset dir="src/main/resources" includes="run_number.properties"/>
+ </copy>
+ <copy todir="${jbjca.home}/bin" overwrite="true">
+ <fileset dir="src/main/resources/jbjca" includes="shutdown.*"/>
+ </copy>
+ </target>
+
+ <target name="doBenchmark-jbjca" depends="benchmark-prepare-jbjca">
+
<propertyfile file="${root.dir}/configuration/${jbjca.version}/run_number.properties">
<entry key="run.number" type="int" operation="+" value="1"/>
</propertyfile>
<property file="${root.dir}/configuration/${jbjca.version}/run_number.properties"/>
<mkdir dir="${root.dir}/runs/${jbjca.version}/raw/${run.number}"/>
- <ant dir="../extensions" inheritRefs="true" target="benchmark-prepare"/>
+ <ant dir="../extensions" inheritRefs="true" target="benchmark-prepare-jbjca"/>
+
<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-jbjca type="workmanager" count="1" as="JBJCA" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbjca type="workmanager" count="1" as="JBJCA" trans="XATransaction" sleep="5"/>
+ <deploy-rar-jbjca type="workmanager" count="10" as="JBJCA" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbjca type="workmanager" 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"/>
+ <deploy-rar-jbjca type="workmanager" count="100" as="JBJCA" trans="NoTransaction" sleep="100"/>
+ <deploy-rar-jbjca type="workmanager" count="100" as="JBJCA" trans="XATransaction" sleep="100"/>
+ <deploy-rar-jbjca type="workmanager" count="1000" as="JBJCA" trans="NoTransaction" sleep="800"/>
+ <deploy-rar-jbjca type="workmanager" count="1000" as="JBJCA" trans="XATransaction" sleep="200"/>
+ <deploy-rar-jbjca type="workmanager" count="10000" as="JBJCA" trans="NoTransaction" sleep="6000"/>
+ <deploy-rar-jbjca type="workmanager" count="10000" as="JBJCA" trans="XATransaction" sleep="6000"/>
+ <deploy-rar-jbjca type="workmanager" count="100000" as="JBJCA" trans="NoTransaction" sleep="60000"/>
+ <deploy-rar-jbjca type="workmanager" 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}"/>
+ <arg line="shutdown.${ext}"/>
</exec>
</target>
<target name="benchmark" depends="os-check">
-<!--
- <antcall target="doBenchmark">
+
+
+ <antcall target="doBenchmark-jbjca">
<param name="jbjca.kit" value="${ironjacamar.daily}"/>
</antcall>
- <antcall target="doBenchmark">
+ <antcall target="doBenchmark-jbjca">
<param name="jbjca.kit" value="${ironjacamar.version}"/>
</antcall>
@@ -531,6 +534,7 @@
<param name="jbas.kit" value="${jbossas.5.version}"/>
</antcall>
+<!--
<antcall target="doBenchmark-jbas">
<param name="jbas.kit" value="${jbossas.6.version}"/>
<param name="jbas.home" value="${root.dir}/servers/jbas-${jbossas.6.version}/jboss-${jbossas.6.file}"/>
@@ -538,8 +542,6 @@
</antcall>
-->
- <antcall target="doBenchmark-jbas">
- <param name="jbas.kit" value="${jbossas.4.version}"/>
- </antcall>
+
</target>
</project>
Copied: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.bat (from rev 107226, projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat)
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.bat (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.bat 2010-08-02 12:41:37 UTC (rev 107261)
@@ -0,0 +1,9 @@
+ at echo off
+rem -------------------------------------------------------------------------
+rem IronJacamar Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id: $
+
+java -jar ..\lib\sjc\fungal-cli.jar shutdown
+
Copied: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.sh (from rev 107226, projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh)
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.sh (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown.sh 2010-08-02 12:41:37 UTC (rev 107261)
@@ -0,0 +1,10 @@
+#!/bin/sh
+### ====================================================================== ###
+## ##
+## IronJacamar Script ##
+## ##
+### ====================================================================== ###
+
+### $Id: $ ###
+
+java -jar ../lib/sjc/fungal-cli.jar shutdown
Deleted: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat 2010-08-02 12:41:37 UTC (rev 107261)
@@ -1,9 +0,0 @@
- at echo off
-rem -------------------------------------------------------------------------
-rem IronJacamar Script for Windows
-rem -------------------------------------------------------------------------
-
-rem $Id: $
-
-java -jar ..\lib\profiler\fungal-cli.jar shutdown
-
Deleted: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh 2010-08-02 12:37:57 UTC (rev 107260)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh 2010-08-02 12:41:37 UTC (rev 107261)
@@ -1,10 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## IronJacamar Script ##
-## ##
-### ====================================================================== ###
-
-### $Id: $ ###
-
-java -jar ../lib/profiler/fungal-cli.jar shutdown
More information about the jboss-cvs-commits
mailing list