[jboss-cvs] JBossAS SVN: r108346 - 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
Fri Sep 24 21:36:38 EDT 2010
Author: jeff.zhang
Date: 2010-09-24 21:36:38 -0400 (Fri, 24 Sep 2010)
New Revision: 108346
Modified:
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java
projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-423] include Abq mcp in the summary report
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java 2010-09-24 21:03:01 UTC (rev 108345)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java 2010-09-25 01:36:38 UTC (rev 108346)
@@ -32,7 +32,7 @@
public class ChartGraphics
{
- final static Color[] COLORS = {Color.red, Color.green, Color.blue, Color.yellow};
+ final static Color[] COLORS = {Color.red, Color.green, Color.blue, Color.yellow, Color.orange};
private BufferedImage image;
public void createImage(String fileLocation)
@@ -81,7 +81,11 @@
columnHeight - h, columnWidth, h, true);
}
graphics.fill3DRect(X, H + i * (columnWidth + barDistance), 100, columnWidth, true);
- graphics.drawString(CompareHtmlBenchmarkReport.servers[i], X + 105, H + i * (columnWidth + barDistance) + 10);
+ if (i < CompareHtmlBenchmarkReport.servers.length)
+ graphics.drawString(CompareHtmlBenchmarkReport.servers[i], X + 105, H + i * (columnWidth + barDistance) + 10);
+ else
+ graphics.drawString(CompareHtmlBenchmarkReport.servers[CompareHtmlBenchmarkReport.servers.length - 1] + " with abq mcp",
+ X + 105, H + i * (columnWidth + barDistance) + 10);
}
graphics.setColor(Color.black);
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java 2010-09-24 21:03:01 UTC (rev 108345)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java 2010-09-25 01:36:38 UTC (rev 108346)
@@ -42,7 +42,7 @@
int[][] workManagerArray = new int[units.length * 2][servers.length];
int[][] workManagerBlockArray = new int[units.length * 2][servers.length];
- int[][] connectionArray = new int[units.length * 2][servers.length];
+ int[][] connectionArray = new int[units.length * 2][servers.length + 1]; // +1 for Abq MCP
String runNumber;
@@ -172,7 +172,10 @@
if (serverVersion.equals(servers[i]))
server = i;
}
- dataArray[unit * 2 + tran][server] = Integer.parseInt(part[4]);
+ if (part[1].equals("JBJCA_ABQ"))
+ dataArray[unit * 2 + tran][server + 1] = Integer.parseInt(part[4]); //abq mcp
+ else
+ dataArray[unit * 2 + tran][server] = Integer.parseInt(part[4]);
}
/**
@@ -231,7 +234,7 @@
writeArrayData(fw, workManagerBlockArray, "wmblock", "WorkManager with block test cases");
fw.write("<image src=\"wmb.jpg\" alt=\"work manager with block\"/>");
writeEol(fw);
- writeArrayData(fw, connectionArray, "cm", "ConnectionManager test cases");
+ writeArrayDataCol(fw, connectionArray, "cm", "ConnectionManager test cases", true);
fw.write("<image src=\"conn.jpg\" alt=\"connection manager\"/>");
writeEol(fw);
}
@@ -247,26 +250,41 @@
*/
private void writeArrayData(FileWriter fw, int[][] data, String tag, String text) throws IOException
{
+ writeArrayDataCol(fw, data, tag, text, false);
+ }
+
+ /**
+ * write array data
+ *
+ * @param fw
+ * @param data list of data
+ * @param tag tag
+ * @param text description
+ * @param isConn is connection test case
+ * @throws IOException
+ */
+ private void writeArrayDataCol(FileWriter fw, int[][] data, String tag, String text, boolean isConn) throws IOException
+ {
fw.write("<p><a name=\"" + tag + "\"><h2>");
fw.write(text);
fw.write("</h2></a></p>");
writeEol(fw);
fw.write("<table border=\"1\">");
writeEol(fw);
- writeHeader(fw);
- writeData(fw, data);
+ writeHeader(fw, isConn);
+ writeData(fw, data, isConn);
fw.write("</table>");
writeEol(fw);
}
-
/**
* write data table header
*
* @param fw writer
+ * @param isConn is connection test case
* @throws IOException
*/
- void writeHeader(FileWriter fw) throws IOException
+ void writeHeader(FileWriter fw, boolean isConn) throws IOException
{
fw.write("<theader><td>Units</td><td>Transaction</td>");
for (int i = 0; i < servers.length; i++)
@@ -274,6 +292,11 @@
fw.write("<td><a href=\"../../" + servers[i] + "/benchmark/" + this.runNumber + "/report.html\">" +
servers[i] + "</a></td>");
}
+ if (isConn)
+ {
+ fw.write("<td><a href=\"../../" + servers[servers.length - 1] + "/benchmark/" + this.runNumber + "/report.html\">" +
+ servers[servers.length - 1] + "</a></td>");
+ }
fw.write("</theader>");
writeEol(fw);
}
@@ -284,17 +307,23 @@
*
* @param fw writer
* @param data list of data
+ * @param isConn is connection test case
* @throws IOException
*/
- void writeData(FileWriter fw, int[][] data) throws IOException
+ void writeData(FileWriter fw, int[][] data, boolean isConn) throws IOException
{
+ int serverCol;
+ if (isConn)
+ serverCol = servers.length + 1;
+ else
+ serverCol = servers.length;
for (int i = 0; i < units.length; i++)
{
for (int j = 0; j < transactions.length; j++)
{
fw.write("<tr><td>" + units[i] + "</td><td>" + transactions[j] + "</td>");
- for (int k = 0; k < servers.length; k ++)
+ for (int k = 0; k < serverCol; k ++)
{
fw.write("<td>" + data[i * transactions.length + j][k] + "</td>");
}
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-09-24 21:03:01 UTC (rev 108345)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-09-25 01:36:38 UTC (rev 108346)
@@ -352,7 +352,7 @@
<arg line="run_profiler.${ext}"/>
</exec>
<sleep seconds="5"/>
-<!--
+
<antcall target="doProfiler">
<param name="rar.name" value="workmanager_JBJCA_NoTransaction_10000.rar"/>
<param name="sleep.time" value="15"/>
@@ -387,7 +387,7 @@
<param name="rar.name" value="connection_JBJCA_ABQ_NoTransaction_10000.rar"/>
<param name="sleep.time" value="15"/>
</antcall>
--->
+
<antcall target="doProfiler">
<param name="rar.name" value="connection_JBJCA_ABQ_XATransaction_10000.rar"/>
<param name="sleep.time" value="15"/>
@@ -413,7 +413,6 @@
<server:start name="default"/>
<sleep seconds="2"/>
-<!--
<antcall target="doProfiler">
<param name="rar.name" value="workmanager_JBJCA_NoTransaction_10000.rar"/>
<param name="sleep.time" value="15"/>
@@ -448,7 +447,7 @@
<param name="rar.name" value="connection_JBJCA_ABQ_NoTransaction_10000.rar"/>
<param name="sleep.time" value="15"/>
</antcall>
--->
+
<antcall target="doProfiler">
<param name="rar.name" value="connection_JBJCA_ABQ_XATransaction_10000.rar"/>
<param name="sleep.time" value="15"/>
@@ -723,7 +722,7 @@
<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"/>
@@ -758,7 +757,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"/>
@@ -777,7 +776,7 @@
<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"/>
@@ -786,7 +785,7 @@
<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"/>
@@ -806,7 +805,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>
@@ -814,7 +813,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}"/>
More information about the jboss-cvs-commits
mailing list