[jboss-svn-commits] JBL Code SVN: r31093 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 14 12:40:12 EST 2010
Author: whitingjr
Date: 2010-01-14 12:40:11 -0500 (Thu, 14 Jan 2010)
New Revision: 31093
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/agregate.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/analyseresults.xsl
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/convert-xml-to-csv.xsl
Log:
Updated stylesheets to correct agregation and csv error.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/agregate.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/agregate.xsl 2010-01-14 16:57:51 UTC (rev 31092)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/agregate.xsl 2010-01-14 17:40:11 UTC (rev 31093)
@@ -56,14 +56,23 @@
<xsl:value-of select="preceding::*/frame/*/org.apache.log4j - sum(following::*/frame/*/org.apache.log4j)"/>
</xsl:element>
<!-- This uses Ant to escape these package paths. -->
- <xsl:element name="${db-vendor-package.xpath.A}">
- <xsl:value-of select="preceding::*/frame/*/${db-vendor-package.xpath.A} - sum(following::*/frame/*/${db-vendor-package.xpath.A})"/>
- </xsl:element>
- <!--
<xsl:choose>
-
+ <xsl:when test="'${db-vendor-package.xpath.A}' = '${db-vendor-package.xpath.B}'">
+ <!-- Both database vendors are the same -->
+ <xsl:element name="${db-vendor-package.xpath.A}">
+ <xsl:value-of select="preceding::*/frame/*[not(name='methodDuration')]/${db-vendor-package.xpath.A} - sum(following::*/frame/*[not(name()='methodDuration')]/${db-vendor-package.xpath.A})"/>
+ </xsl:element>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- Different database vendors -->
+ <xsl:element name="${db-vendor-package.xpath.A}">
+ <xsl:value-of select="preceding::*/frame/*[not(name='methodDuration')]/${db-vendor-package.xpath.A} - sum(following::*/frame/*[not(name()='methodDuration')]/${db-vendor-package.xpath.A})"/>
+ </xsl:element>
+ <xsl:element name="${db-vendor-package.xpath.B}">
+ <xsl:value-of select="preceding::*/frame/*[not(name='methodDuration')]/${db-vendor-package.xpath.B} - sum(following::*/frame/*[not(name()='methodDuration')]/${db-vendor-package.xpath.B})"/>
+ </xsl:element>
+ </xsl:otherwise>
</xsl:choose>
- -->
</xsl:element>
</xsl:element>
</xsl:copy>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/analyseresults.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/analyseresults.xsl 2010-01-14 16:57:51 UTC (rev 31092)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/analyseresults.xsl 2010-01-14 17:40:11 UTC (rev 31093)
@@ -249,7 +249,6 @@
<xsl:call-template name="package-total"><xsl:with-param name="package-name" select="$log4j"/></xsl:call-template>
<xsl:choose>
<xsl:when test="$db-vendor-package.A != $db-vendor-package.B"><!-- different resource vendors-->
- <xsl:comment>Not identical database vendors</xsl:comment>
<!--
<xsl:element name="{string($db-vendor-package.A)}">
<xsl:value-of
@@ -262,9 +261,9 @@
-->
<xsl:call-template name="package-total"><xsl:with-param name="package-name" select="$db-vendor-package.A"/></xsl:call-template>
<xsl:call-template name="package-total"><xsl:with-param name="package-name" select="$db-vendor-package.B"/></xsl:call-template>
+
</xsl:when>
<xsl:otherwise><!-- resource vendors are identical -->
- <xsl:comment>Identical database vendors</xsl:comment>
<!--
<xsl:variable name="identical-vendor-duration"
select="round( sum( descendant::frame[starts-with(@mn, $db-vendor-package.B)]/@t) - sum( descendant::frame[starts-with(@mn, $db-vendor-package.B)]/frame/@t ) div 2 )" />
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/convert-xml-to-csv.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/convert-xml-to-csv.xsl 2010-01-14 16:57:51 UTC (rev 31092)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/convert-xml-to-csv.xsl 2010-01-14 17:40:11 UTC (rev 31093)
@@ -6,7 +6,15 @@
<xsl:param name="db-vendor-package.B" />
<xsl:template match="/">
- <xsl:text>category,gross,net,gross-average,net-average,hibernate,arjuna,caveat-emptor,jboss,log4j,db-vendor-A[,db-vendor-B]</xsl:text>
+ <xsl:text>category,gross,net,gross-average,net-average,hibernate,arjuna,caveat-emptor,jboss,log4j</xsl:text>
+ <xsl:choose>
+ <xsl:when test="contains( $db-vendor-package.A, $db-vendor-package.B)">
+ <xsl:text>,db-vendor</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>,db-vendor.A,db-vendor.B</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:for-each select="/analysis/summary-analysis/*/frame/methodDuration">
<xsl:text>
</xsl:text>
@@ -31,15 +39,15 @@
<xsl:text><xsl:value-of select="../*/org.apache.log4j"/></xsl:text>
<xsl:choose>
- <xsl:when test="6 = count(../*/*)">
+ <xsl:when test="contains( $db-vendor-package.A, $db-vendor-package.B)">
<xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="../*/*[position()=last()]"/></xsl:text>
+ <xsl:text><xsl:value-of select="../*['methodDuration' != name()]/*[position()=last()]"/></xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="../*/*[position()=(last()-1)]"/></xsl:text>
+ <xsl:text><xsl:value-of select="../*['methodDuration' != name()]/*[position()=(last()-1)]"/></xsl:text>
<xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="../*/*[position()=last()]"/></xsl:text>
+ <xsl:text><xsl:value-of select="../*['methodDuration' != name()]/*[position()=last()]"/></xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
More information about the jboss-svn-commits
mailing list