diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-04-01 10:21:35 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-04-01 10:21:35 +0200 |
| commit | f92bf74507b669109a2dacb1b8470a4eb04cfba3 (patch) | |
| tree | 8635cb24fd165572f8fb2abf41c5fbd9cc92c096 /server | |
| parent | e5d01f24e6fb6883e6a7099c3546d9f6c83c5ff6 (diff) | |
| download | rteval-f92bf74507b669109a2dacb1b8470a4eb04cfba3.tar.gz rteval-f92bf74507b669109a2dacb1b8470a4eb04cfba3.tar.xz rteval-f92bf74507b669109a2dacb1b8470a4eb04cfba3.zip | |
Added support for num_cpu_sockets and improved num_cpu_cores extraction
This change will support both the new <cpu_topology/> tag and the old
<cpu_cores/> tag. Added extraction of data for the
rtevalruns_details.num_cpu_sockets field as well.
Diffstat (limited to 'server')
| -rw-r--r-- | server/parser/xmlparser.xsl | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/server/parser/xmlparser.xsl b/server/parser/xmlparser.xsl index 419042d..0b0df19 100644 --- a/server/parser/xmlparser.xsl +++ b/server/parser/xmlparser.xsl @@ -137,14 +137,27 @@ <field fid="0">rterid</field> <field fid="1">numa_nodes</field> <field fid="2">num_cpu_cores</field> - <field fid="3">xmldata</field> + <field fid="3">num_cpu_sockets</field> + <field fid="4">xmldata</field> </fields> <records> <record> <value fid="0"><xsl:value-of select="$rterid"/></value> <value fid="1"><xsl:value-of select="hardware/numa_nodes"/></value> - <value fid="2"><xsl:value-of select="hardware/cpu_cores"/></value> - <value fid="3" type="xmlblob"> + <value fid="2"> + <xsl:choose> + <xsl:when test="hardware/cpu_topology"> + <xsl:value-of select="hardware/cpu_topology/@num_cpu_cores"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="hardware/cpu_cores"/> + </xsl:otherwise> + </xsl:choose> + </value> + <value fid="3"> + <xsl:value-of select="hardware/cpu_topology/@num_cpu_sockets"/> + </value> + <value fid="4" type="xmlblob"> <rteval_details> <xsl:copy-of select="clocksource|services|kthreads|network_config|loads|cyclictest/command_line"/> <hardware> |