[EDF29150] : WIP

diff --git a/src/Container/SALOME_ContainerHelper.py b/src/Container/SALOME_ContainerHelper.py
index 340746fd28d97e41eecc5d36c4b61978f26c5a50..9cbc000899f2af64cb3082057e1f04b02227d44d 100644 (file)
--- a/src/Container/SALOME_ContainerHelper.py
+++ b/src/Container/SALOME_ContainerHelper.py
@@ -199,6 +199,10 @@ class ScriptExecInfo:
     @property
     def execTime(self):
       return self.endExecTime - self.startExecTime
+    
+    @property
+    def fullExecTime(self):
+      return self.endOutputTime - self.startInputTime
 
     @property
     def startOutputTime(self):
@@ -231,7 +235,7 @@ class ScriptExecInfo:
     def __str__(self):
       CPUMemDuringExecForStr = self.CPUMemDuringExecStr
       if len( CPUMemDuringExecForStr ) > 30:
-         CPUMemDuringExecForStr = "{} ...".format( str(CPUMemDuringExecForStr) )
+         CPUMemDuringExecForStr = "{} ...".format( str(CPUMemDuringExecForStr[:30]) )
       else:
          CPUMemDuringExecForStr = str( CPUMemDuringExecForStr )
       return """start exec time = {self.startExecTime}
@@ -327,6 +331,10 @@ class ScriptExecInfoDeco:
   @property
   def execTime(self):
     return self.get().execTime
+  
+  @property
+  def fullExecTime(self):
+     return self.get().fullExecTime
 
   @property
   def startOutputTime(self):
@@ -623,7 +631,7 @@ def unserializeLogManager(structData):
 def ListAllExecContainIn( listOfContainerLogInfo ):
     """
     For all ContainerLogInfo contained in listOfContainerLogInfo extract all ScriptExecInfo contained recursively
-    in it.
+    in it. This method filters all "side" executions like those positionning environment for exemple.
 
     Args:
     -----
@@ -636,7 +644,8 @@ def ListAllExecContainIn( listOfContainerLogInfo ):
     list<ScriptExecInfoDeco> : all ScriptExecInfoDeco instance contained recursively in all input ContainerLogInfo instances
 
     """
-    return sum( [sum( [[myexec for myexec in ps] for ps in cont],[] ) for cont in listOfContainerLogInfo], [] )
+    allexecs = sum( [sum( [[myexec for myexec in ps] for ps in cont],[] ) for cont in listOfContainerLogInfo], [] )
+    return [elt for elt in allexecs if elt.get() is not None]
 
 def IsExecTimeHigherThan( execInstDeco, limitDuration ):
     """