[jboss-svn-commits] JBL Code SVN: r31106 - labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 15 11:37:07 EST 2010
Author: whitingjr
Date: 2010-01-15 11:37:07 -0500 (Fri, 15 Jan 2010)
New Revision: 31106
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 create xml.
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-15 16:36:35 UTC (rev 31105)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/agregate.xsl 2010-01-15 16:37:07 UTC (rev 31106)
@@ -5,7 +5,10 @@
<xsl:param name="caveat-emptor">auction</xsl:param>
<xsl:param name="jboss">org.jboss</xsl:param>
<xsl:param name="log4j">org.apache.log4j</xsl:param>
+ <xsl:param name="db-vendor-package.A" />
+ <xsl:param name="db-vendor-package.B" />
+
<xsl:template match="/">
<xsl:apply-templates select="/*"/>
</xsl:template>
@@ -17,14 +20,16 @@
<xsl:template match="summary-analysis">
<xsl:copy>
<xsl:copy-of select="./category-0"/>
- <xsl:apply-templates select="./category-A"/>
+ <xsl:element name="category-A">
+ <xsl:call-template name="category-A"/>
+ </xsl:element>
<xsl:copy-of select="./category-B"/>
<xsl:copy-of select="./category-C"/>
<xsl:copy-of select="./category-D"/>
</xsl:copy>
</xsl:template>
- <xsl:template match="category-A">
- <!-- context node: category-A -->
+ <xsl:template name="category-A">
+ <!-- context node: /analysis/summary-analysis -->
<xsl:variable name="category0"
select="/analysis/summary-analysis/category-0" />
@@ -35,47 +40,55 @@
<xsl:variable name="categoryD"
select="/analysis/summary-analysis/category-D" />
- <xsl:copy>
+
<xsl:element name="frame">
- <xsl:copy-of select="./frame/methodDuration"/>
+ <xsl:attribute name="mn"><xsl:text>other</xsl:text> </xsl:attribute>
+ <xsl:element name="methodDuration">
+ <xsl:element name="average-gross">
+ <xsl:value-of select="$category0/frame/methodDuration/average-gross - sum(//frame[@mn!=$category0/frame/@mn]/methodDuration/average-gross)"/>
+ </xsl:element>
+ <xsl:element name="average-net">
+ <xsl:value-of select="$category0/frame/methodDuration/average-net - sum(//frame[@mn!=$category0/frame/@mn]/methodDuration/average-net)"/>
+ </xsl:element>
+ </xsl:element>
- <xsl:element name="everything.else">
- <xsl:element name="{string($hibernate)}">
- <xsl:value-of select="preceding::*/frame/*/org.hibernate - sum(following::*/frame/*/org.hibernate)"/>
+ <xsl:element name="other">
+ <xsl:element name="{$hibernate}">
+ <xsl:value-of select="$category0/frame/*[name()!='methodDuration']/org.hibernate - sum(//frame[@mn!=$category0/frame/@mn]/*[name()!='methodDuration']/org.hibernate)"/>
</xsl:element>
- <xsl:element name="{string($arjuna)}">
- <xsl:value-of select="preceding::*/frame/*/com.arjuna - sum(following::*/frame/*/com.arjuna)"/>
+ <xsl:element name="{$arjuna}">
+ <xsl:value-of select="$category0/frame/*[name()!='methodDuration']/com.arjuna - sum(//frame[@mn!=$category0/frame/@mn]/*[name()!='methodDuration']/com.arjuna)"/>
</xsl:element>
- <xsl:element name="{string($caveat-emptor)}">
- <xsl:value-of select="preceding::*/frame/*/auction - sum(following::*/frame/*/auction)"/>
+ <xsl:element name="{$caveat-emptor}">
+ <xsl:value-of select="$category0/frame/*[name()!='methodDuration']/auction - sum(//frame[@mn!=$category0/frame/@mn]/*[name()!='methodDuration']/auction)"/>
</xsl:element>
- <xsl:element name="{string($jboss)}">
- <xsl:value-of select="preceding::*/frame/*/org.jboss - sum(following::*/frame/*/org.jboss)"/>
+ <xsl:element name="{$jboss}">
+ <xsl:value-of select="$category0/frame/*[name()!='methodDuration']/org.jboss - sum(//frame[@mn!=$category0/frame/@mn]/*[name()!='methodDuration']/org.jboss)"/>
</xsl:element>
- <xsl:element name="{string($log4j)}">
- <xsl:value-of select="preceding::*/frame/*/org.apache.log4j - sum(following::*/frame/*/org.apache.log4j)"/>
+ <xsl:element name="{$log4j}">
+ <xsl:value-of select="$category0/frame/*[name()!='methodDuration']/org.apache.log4j - sum(//frame[@mn!=$category0/frame/@mn]/*[name()!='methodDuration']/org.apache.log4j)"/>
</xsl:element>
- <!-- This uses Ant to escape these package paths. -->
+ <!-- Uses Ant to escape these package paths. -->
<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:value-of select="$category0/frame/*[name()!='methodDuration']/${db-vendor-package.xpath.A} - sum(//frame[@mn!=$category0/frame/@mn]/*[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:value-of select="$category0/frame/*[name()!='methodDuration']/${db-vendor-package.xpath.A} - sum(//frame[@mn!=$category0/frame/@mn]/*[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:value-of select="$category0/frame/*[name()!='methodDuration']/${db-vendor-package.xpath.B} - sum(//frame[@mn!=$category0/frame/@mn]/*[name()!='methodDuration']/${db-vendor-package.xpath.B})"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:element>
</xsl:element>
- </xsl:copy>
+
</xsl:template>
</xsl:stylesheet>
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-15 16:36:35 UTC (rev 31105)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/analyseresults.xsl 2010-01-15 16:37:07 UTC (rev 31106)
@@ -83,12 +83,14 @@
<xsl:element name="net">
<xsl:value-of select="$categoryA-net" />
</xsl:element>
+ <!--
<xsl:element name="gross-average">
<xsl:value-of select="round($categoryA-gross div $category0-nodes/@c)" />
</xsl:element>
<xsl:element name="net-average">
<xsl:value-of select="round($categoryA-net div $category0-nodes/@c)" />
</xsl:element>
+ -->
</xsl:element>
</xsl:element>
</xsl:element>
@@ -205,12 +207,14 @@
<xsl:element name="net">
<xsl:value-of select="$netTime" />
</xsl:element>
+ <!--
<xsl:element name="gross-average">
<xsl:value-of select="round( @t div number(@c) )" />
</xsl:element>
<xsl:element name="net-average">
<xsl:value-of select="round( $netTime div number(@c) )" />
</xsl:element>
+ -->
</xsl:element>
</xsl:template>
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-15 16:36:35 UTC (rev 31105)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/convert-xml-to-csv.xsl 2010-01-15 16:37:07 UTC (rev 31106)
@@ -6,7 +6,7 @@
<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</xsl:text>
+ <xsl:text>category,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>
@@ -20,14 +20,10 @@
</xsl:text>
<xsl:text><xsl:value-of select="name(../..)"/> </xsl:text>
<xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="./gross"/></xsl:text>
+ <xsl:text><xsl:value-of select="./average-gross"/></xsl:text>
<xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="net"/></xsl:text>
+ <xsl:text><xsl:value-of select="./average-net"/></xsl:text>
<xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="gross-average"/></xsl:text>
- <xsl:text>,</xsl:text>
- <xsl:text><xsl:value-of select="net-average"/></xsl:text>
- <xsl:text>,</xsl:text>
<xsl:text><xsl:value-of select="../*/org.hibernate"/></xsl:text>
<xsl:text>,</xsl:text>
<xsl:text><xsl:value-of select="../*/com.arjuna"/></xsl:text>
More information about the jboss-svn-commits
mailing list