[jboss-cvs] JBossAS SVN: r108214 - in projects/jboss-jca/branches/performance: extensions/src/main/java/org/jboss/jca/performance/ext/stdio and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Sep 19 23:32:35 EDT 2010
Author: jeff.zhang
Date: 2010-09-19 23:32:35 -0400 (Sun, 19 Sep 2010)
New Revision: 108214
Modified:
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/TxtBenchmarkReport.java
projects/jboss-jca/branches/performance/extensions/src/main/java/org/jboss/jca/performance/ext/stdio/ExtWriterOutputStream.java
projects/jboss-jca/branches/performance/rars/build.xml
projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-423] add separate Abq mcp performance report
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java 2010-09-18 12:33:27 UTC (rev 108213)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java 2010-09-20 03:32:35 UTC (rev 108214)
@@ -42,6 +42,8 @@
List<Data> workmanagerBlockData = new ArrayList<Data>();
/** connectionData */
List<Data> connectionData = new ArrayList<Data>();
+ /** connectionData */
+ List<Data> connectionAbqMcpData = new ArrayList<Data>();
/** serverVersion */
String serverVersion;
@@ -125,10 +127,14 @@
{
workmanagerBlockData.add(new Data(part[2], part[3], part[4]));
}
- if (part[0].equals("connection"))
+ if (part[0].equals("connection") && part[1].equals("JBJCA"))
{
connectionData.add(new Data(part[2], part[3], part[4]));
}
+ else if (part[0].equals("connection") && part[1].equals("JBJCA_ABQ"))
+ {
+ connectionAbqMcpData.add(new Data(part[2], part[3], part[4]));
+ }
}
}
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java 2010-09-18 12:33:27 UTC (rev 108213)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java 2010-09-20 03:32:35 UTC (rev 108214)
@@ -138,7 +138,8 @@
{
writeListData(fw, workmanagerData, "WorkManager test cases");
writeListData(fw, workmanagerBlockData, "WorkManager with block test cases");
- writeListData(fw, connectionData, "Connection test cases");
+ writeListData(fw, connectionData, "Connection test cases with default(SemaphoreArrayList) managed connection pool");
+ writeListData(fw, connectionAbqMcpData, "Connection test cases with ArrayBlockingQueue managed connection pool");
}
/**
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/TxtBenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/TxtBenchmarkReport.java 2010-09-18 12:33:27 UTC (rev 108213)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/TxtBenchmarkReport.java 2010-09-20 03:32:35 UTC (rev 108214)
@@ -156,6 +156,16 @@
writeHeader(fw);
writeData(fw, connectionData);
}
+ writeEol(fw);
+ if (connectionAbqMcpData.size() > 0)
+ {
+ fw.write("Connection test cases with ArrayBlockingQueue mcp");
+ writeEol(fw);
+ writeEol(fw);
+
+ writeHeader(fw);
+ writeData(fw, connectionAbqMcpData);
+ }
}
/**
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-09-18 12:33:27 UTC (rev 108213)
+++ projects/jboss-jca/branches/performance/extensions/src/main/java/org/jboss/jca/performance/ext/stdio/ExtWriterOutputStream.java 2010-09-20 03:32:35 UTC (rev 108214)
@@ -80,7 +80,7 @@
String dataFile = runDir + "/" + jbjcaVer + "/" +
"raw" + "/" + runNumber + "/" + "data.txt";
- data = new FileWriter(dataFile);
+ data = new FileWriter(dataFile, true);
if (data == null)
throw new IOException("Can't create file" + dataFile);
}
Modified: projects/jboss-jca/branches/performance/rars/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/build.xml 2010-09-18 12:33:27 UTC (rev 108213)
+++ projects/jboss-jca/branches/performance/rars/build.xml 2010-09-20 03:32:35 UTC (rev 108214)
@@ -174,6 +174,20 @@
<make-rar type="connection" count="100000" as="JBJCA" trans="XATransaction"/>
<make-rar type="connection" count="99" as="JBJCA" trans="NoTransaction"/>
+ <make-rar type="connection" count="1" as="JBJCA_ABQ" trans="NoTransaction"/>
+ <make-rar type="connection" count="1" as="JBJCA_ABQ" trans="XATransaction"/>
+ <make-rar type="connection" count="10" as="JBJCA_ABQ" trans="NoTransaction"/>
+ <make-rar type="connection" count="10" as="JBJCA_ABQ" trans="XATransaction"/>
+ <make-rar type="connection" count="100" as="JBJCA_ABQ" trans="NoTransaction"/>
+ <make-rar type="connection" count="100" as="JBJCA_ABQ" trans="XATransaction"/>
+ <make-rar type="connection" count="1000" as="JBJCA_ABQ" trans="NoTransaction"/>
+ <make-rar type="connection" count="1000" as="JBJCA_ABQ" trans="XATransaction"/>
+ <make-rar type="connection" count="10000" as="JBJCA_ABQ" trans="NoTransaction"/>
+ <make-rar type="connection" count="10000" as="JBJCA_ABQ" trans="XATransaction"/>
+ <make-rar type="connection" count="100000" as="JBJCA_ABQ" trans="NoTransaction"/>
+ <make-rar type="connection" count="100000" as="JBJCA_ABQ" trans="XATransaction"/>
+ <make-rar type="connection" count="99" as="JBJCA_ABQ" trans="NoTransaction"/>
+
<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"/>
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-09-18 12:33:27 UTC (rev 108213)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-09-20 03:32:35 UTC (rev 108214)
@@ -609,8 +609,10 @@
</copy>
<copy todir="${jbjca.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/jbjca" includes="shutdown.*"/>
+ <fileset dir="src/main/resources/jbjca" includes="*.sh"/>
+ <fileset dir="src/main/resources/jbjca" includes="*.bat"/>
</copy>
+ <chmod file="${jbjca.home}/bin/*.sh" perm="775"/>
</target>
<target name="doBenchmark-jbjca" depends="benchmark-prepare-jbjca">
@@ -623,12 +625,23 @@
<ant dir="../extensions" inheritRefs="true" target="benchmark-prepare-jbjca"/>
+ <antcall target="launch-deploy-jbjca"/>
+ <antcall target="launch-deploy-jbjca-mcp"/>
+
+ <ant dir="../apps" inheritRefs="true" target="benchmark-report">
+ <property name="kit.version" value="${jbjca.version}"/>
+ <property name="report.num" value="${run.number}"/>
+ </ant>
+
+ </target>
+
+ <target name="launch-deploy-jbjca">
<echo message="Starting server..."/>
<exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
<arg line="run.${ext}"/>
</exec>
<sleep seconds="5"/>
-
+<!--
<deploy-rar-jbjca type="workmanager" count="100000" as="JBJCA" trans="NoTransaction" sleep="15"/>
<deploy-rar-jbjca type="workmanager" count="100000" as="JBJCA" trans="XATransaction" sleep="15"/>
<deploy-rar-jbjca type="workmanager" count="10000" as="JBJCA" trans="NoTransaction" sleep="6"/>
@@ -663,6 +676,7 @@
<deploy-rar-jbjca type="connection" count="1000" as="JBJCA" trans="XATransaction" sleep="6"/>
<deploy-rar-jbjca type="connection" count="100" as="JBJCA" trans="NoTransaction" sleep="5"/>
<deploy-rar-jbjca type="connection" count="100" as="JBJCA" trans="XATransaction" sleep="5"/>
+-->
<deploy-rar-jbjca type="connection" count="10" as="JBJCA" trans="NoTransaction" sleep="5"/>
<deploy-rar-jbjca type="connection" count="10" as="JBJCA" trans="XATransaction" sleep="5"/>
<deploy-rar-jbjca type="connection" count="1" as="JBJCA" trans="NoTransaction" sleep="5"/>
@@ -673,12 +687,34 @@
<exec dir="${jbjca.home}/bin" executable="${exec}">
<arg line="shutdown.${ext}"/>
</exec>
+ </target>
- <ant dir="../apps" inheritRefs="true" target="benchmark-report">
- <property name="kit.version" value="${jbjca.version}"/>
- <property name="report.num" value="${run.number}"/>
- </ant>
+ <target name="launch-deploy-jbjca-mcp" if="run.jbjca.d">
+ <echo message="Starting jbjca server with mcp..."/>
+ <exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
+ <arg line="run_abq_mcp.${ext}"/>
+ </exec>
+ <sleep seconds="5"/>
+<!--
+ <deploy-rar-jbjca type="connection" count="100000" as="JBJCA_ABQ" trans="NoTransaction" sleep="6"/>
+ <deploy-rar-jbjca type="connection" count="100000" as="JBJCA_ABQ" trans="XATransaction" sleep="6"/>
+ <deploy-rar-jbjca type="connection" count="10000" as="JBJCA_ABQ" trans="NoTransaction" sleep="6"/>
+ <deploy-rar-jbjca type="connection" count="10000" as="JBJCA_ABQ" trans="XATransaction" sleep="6"/>
+ <deploy-rar-jbjca type="connection" count="1000" as="JBJCA_ABQ" trans="NoTransaction" sleep="6"/>
+ <deploy-rar-jbjca type="connection" count="1000" as="JBJCA_ABQ" trans="XATransaction" sleep="6"/>
+ <deploy-rar-jbjca type="connection" count="100" as="JBJCA_ABQ" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbjca type="connection" count="100" as="JBJCA_ABQ" trans="XATransaction" sleep="5"/>
+-->
+ <deploy-rar-jbjca type="connection" count="10" as="JBJCA_ABQ" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbjca type="connection" count="10" as="JBJCA_ABQ" trans="XATransaction" sleep="5"/>
+ <deploy-rar-jbjca type="connection" count="1" as="JBJCA_ABQ" trans="NoTransaction" sleep="5"/>
+ <deploy-rar-jbjca type="connection" count="1" as="JBJCA_ABQ" trans="XATransaction" sleep="5"/>
+ <echo message="Stoping jbjca server with mcp..."/>
+ <sleep seconds="5"/>
+ <exec dir="${jbjca.home}/bin" executable="${exec}">
+ <arg line="shutdown.${ext}"/>
+ </exec>
</target>
<target name="benchmark" depends="os-check">
@@ -688,7 +724,7 @@
<antcall target="doBenchmark-jbjca">
<param name="jbjca.kit" value="${ironjacamar.version}"/>
</antcall>
-
+<!--
<antcall target="doBenchmark-jbas">
<param name="jbas.kit" value="${jbossas.4.version}"/>
</antcall>
@@ -696,7 +732,7 @@
<antcall target="doBenchmark-jbas">
<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}"/>
@@ -708,6 +744,7 @@
<target name="benchmark-daily" depends="os-check, exist-servers" if="exist.jca.d">
<antcall target="doBenchmark-jbjca">
<param name="jbjca.kit" value="${ironjacamar.daily}"/>
+ <param name="run.jbjca.d" value="true"/>
</antcall>
</target>
More information about the jboss-cvs-commits
mailing list