Merge remote-tracking branch 'davids/davids/v2.0' into v2.0

2 files changed, 9 insertions, 4 deletions

diff --git a/rteval/modules/loads/hackbench.py b/rteval/modules/loads/hackbench.py
index b9e306c..12acbe7 100644
--- a/rteval/modules/loads/hackbench.py
+++ b/rteval/modules/loads/hackbench.py
@@ -26,7 +26,7 @@
 #
 
 import sys, os, time, glob, subprocess, errno
-from signal import SIGTERM, SIGKILL
+from signal import SIGKILL
 from rteval.modules.loads import CommandLineLoad
 from rteval.Log import Log
 
@@ -89,6 +89,8 @@ class Hackbench(CommandLineLoad):
                                              stdin=self.__nullfp,
                                              stdout=self.__out,
                                              stderr=self.__err)
+            self.__hbproc.wait()
+
         except OSError, e:
             if e.errno != errno.ENOMEM:
                 raise e
@@ -111,8 +113,11 @@ class Hackbench(CommandLineLoad):
         if self._donotrun:
             return
 
-        if self.__hbproc.poll() == None:
-            os.kill(self.__hbproc.pid, SIGKILL)
+        while self.__hbproc.poll() == None:
+            self._log(Log.DEBUG, "Forcing it to stop")
+            self.__hbproc.send_signal(SIGKILL)
+            if self.__hbproc.poll() == None:
+                time.sleep(2)
         self.__hbproc.wait()
 
         os.close(self.__nullfp)
diff --git a/server/parser/xmlparser.xsl b/server/parser/xmlparser.xsl
index 987cdf6..9f00123 100644
--- a/server/parser/xmlparser.xsl
+++ b/server/parser/xmlparser.xsl
@@ -462,7 +462,7 @@
         <field fid="12">variance</field>
       </fields>
       <records>
-        <xsl:for-each select="core/statistics|system/statistics">
+        <xsl:for-each select="core/statistics[samples > 0]|system/statistics[samples > 0]">
           <record>
             <value fid="0"><xsl:value-of select="$rterid"/></value>
             <value fid="1"><xsl:choose>