summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2010-07-16 16:38:48 +0200
committerDavid Sommerseth <davids@redhat.com>2010-07-26 19:04:23 +0200
commit51720cce16fafe4332149b66d5dbf708cb2c0b46 (patch)
tree7f46ea9777ad22748f2255236a855645339cbd3f
parentf7ffce610f2643848381c44718fb943c5c631427 (diff)
downloadrteval-51720cce16fafe4332149b66d5dbf708cb2c0b46.tar.gz
rteval-51720cce16fafe4332149b66d5dbf708cb2c0b46.tar.xz
rteval-51720cce16fafe4332149b66d5dbf708cb2c0b46.zip
Show CPU cores properly
This is is a feature regression going back to commit e5d01f24e6fb6883 where CPU topology was introduced. The displaying itself was never updated. Signed-off-by: David Sommerseth <davids@redhat.com>
-rw-r--r--rteval/rteval_text.xsl13
1 files changed, 12 insertions, 1 deletions
diff --git a/rteval/rteval_text.xsl b/rteval/rteval_text.xsl
index 2e4d385..92788c2 100644
--- a/rteval/rteval_text.xsl
+++ b/rteval/rteval_text.xsl
@@ -46,7 +46,18 @@
<xsl:text>&#10;&#10;</xsl:text>
<xsl:text> CPU cores: </xsl:text>
- <xsl:value-of select="hardware/cpu_cores"/>
+ <xsl:choose>
+ <xsl:when test="hardware/cpu_topology">
+ <xsl:value-of select="hardware/cpu_topology/@num_cpu_cores"/>
+ <xsl:text> (online: </xsl:text>
+ <xsl:value-of select="hardware/cpu_topology/@num_cpu_cores_online"/>
+ <xsl:text>)</xsl:text>
+ </xsl:when>
+ <xsl:when test="hardware/cpu_cores">
+ <xsl:value-of select="hardware/cpu_cores"/>
+ </xsl:when>
+ <xsl:otherwise>(unknown)</xsl:otherwise>
+ </xsl:choose>
<xsl:text>&#10;</xsl:text>
<xsl:text> NUMA Nodes: </xsl:text>