From e0ffb7a716f27a2e1621a8b32829262c58ac3eb3 Mon Sep 17 00:00:00 2001
From: David Sommerseth <davids@redhat.com>
Date: Fri, 18 Jan 2013 20:20:43 +0100
Subject: cyclictest: Only log and show statistic data when samples are
 collected

Avoids saving misinformation in the report, by just reporting the latency
statistics when samples have been collected.  In addition also avoid
displaying these empty fields in the summary report.

Signed-off-by: David Sommerseth <davids@redhat.com>
---
 rteval/modules/measurement/cyclictest.py | 53 +++++++++++-----------
 rteval/rteval_text.xsl                   | 76 ++++++++++++++++----------------
 2 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py
index efdf221..cdac13a 100644
--- a/rteval/modules/measurement/cyclictest.py
+++ b/rteval/modules/measurement/cyclictest.py
@@ -134,41 +134,42 @@ class RunData(object):
 
         stat_n.newTextChild(None, 'samples', str(self.numsamples))
 
-        n = stat_n.newTextChild(None, 'minimum', str(self.min))
-        n.newProp('unit', 'us')
+        if self.numsamples > 0:
+            n = stat_n.newTextChild(None, 'minimum', str(self.min))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'maximum', str(self.max))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'maximum', str(self.max))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'median', str(self.median))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'median', str(self.median))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'mode', str(self.mode))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'mode', str(self.mode))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'range', str(self.range))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'range', str(self.range))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'mean', str(self.mean))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'mean', str(self.mean))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'mean_absolute_deviation', str(self.mad))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'mean_absolute_deviation', str(self.mad))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'variance', str(self.variance))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'variance', str(self.variance))
+            n.newProp('unit', 'us')
 
-        n = stat_n.newTextChild(None, 'standard_deviation', str(self.stddev))
-        n.newProp('unit', 'us')
+            n = stat_n.newTextChild(None, 'standard_deviation', str(self.stddev))
+            n.newProp('unit', 'us')
 
-        hist_n = rep_n.newChild(None, 'histogram', None)
-        hist_n.newProp('nbuckets', str(len(self.samples)))
-        keys = self.samples.keys()
-        keys.sort()
-        for k in keys:
-            b_n = hist_n.newChild(None, 'bucket', None)
-            b_n.newProp('index', str(k))
-            b_n.newProp('value', str(self.samples[k]))
+            hist_n = rep_n.newChild(None, 'histogram', None)
+            hist_n.newProp('nbuckets', str(len(self.samples)))
+            keys = self.samples.keys()
+            keys.sort()
+            for k in keys:
+                b_n = hist_n.newChild(None, 'bucket', None)
+                b_n.newProp('index', str(k))
+                b_n.newProp('value', str(self.samples[k]))
 
         return rep_n
 
diff --git a/rteval/rteval_text.xsl b/rteval/rteval_text.xsl
index 8433150..92c72af 100644
--- a/rteval/rteval_text.xsl
+++ b/rteval/rteval_text.xsl
@@ -230,51 +230,53 @@
     <xsl:value-of select="samples"/>
     <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Mean:              </xsl:text>
-    <xsl:value-of select="mean"/>
-    <xsl:value-of select="mean/@unit"/>
-    <xsl:text>&#10;</xsl:text>
-
-    <xsl:text>            Median:            </xsl:text>
-    <xsl:value-of select="median"/>
-    <xsl:value-of select="median/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+    <xsl:if test="samples > 0">
+      <xsl:text>            Mean:              </xsl:text>
+      <xsl:value-of select="mean"/>
+      <xsl:value-of select="mean/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Mode:              </xsl:text>
-    <xsl:value-of select="mode"/>
-    <xsl:value-of select="mode/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+      <xsl:text>            Median:            </xsl:text>
+      <xsl:value-of select="median"/>
+      <xsl:value-of select="median/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Range:             </xsl:text>
-    <xsl:value-of select="range"/>
-    <xsl:value-of select="range/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+      <xsl:text>            Mode:              </xsl:text>
+      <xsl:value-of select="mode"/>
+      <xsl:value-of select="mode/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Min:               </xsl:text>
-    <xsl:value-of select="minimum"/>
-    <xsl:value-of select="minimum/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+      <xsl:text>            Range:             </xsl:text>
+      <xsl:value-of select="range"/>
+      <xsl:value-of select="range/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Max:               </xsl:text>
-    <xsl:value-of select="maximum"/>
-    <xsl:value-of select="maximum/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+      <xsl:text>            Min:               </xsl:text>
+      <xsl:value-of select="minimum"/>
+      <xsl:value-of select="minimum/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Mean Absolute Dev: </xsl:text>
-    <xsl:value-of select="mean_absolute_deviation"/>
-    <xsl:value-of select="mean_absolute_deviation/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+      <xsl:text>            Max:               </xsl:text>
+      <xsl:value-of select="maximum"/>
+      <xsl:value-of select="maximum/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Variance:          </xsl:text>
-    <xsl:value-of select="variance"/>
-    <xsl:value-of select="variance/@unit"/>
-    <xsl:text>&#10;</xsl:text>
+      <xsl:text>            Mean Absolute Dev: </xsl:text>
+      <xsl:value-of select="mean_absolute_deviation"/>
+      <xsl:value-of select="mean_absolute_deviation/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
-    <xsl:text>            Std.dev:           </xsl:text>
-    <xsl:value-of select="standard_deviation"/>
-    <xsl:value-of select="standard_deviation/@unit"/>
-    <xsl:text>&#10;&#10;</xsl:text>
+      <xsl:text>            Variance:          </xsl:text>
+      <xsl:value-of select="variance"/>
+      <xsl:value-of select="variance/@unit"/>
+      <xsl:text>&#10;</xsl:text>
 
+      <xsl:text>            Std.dev:           </xsl:text>
+      <xsl:value-of select="standard_deviation"/>
+      <xsl:value-of select="standard_deviation/@unit"/>
+      <xsl:text>&#10;</xsl:text>
+    </xsl:if>
+    <xsl:text>&#10;</xsl:text>
   </xsl:template>
 
 
-- 
cgit