Changeset 1862 for TOOLS/PACK_IPSL/showPackProgress.sh

Timestamp:

09/03/12 19:18:22 (12 years ago)

Author:

gpincka

Message:

simplification mesure du temps de calcul

File:

• TOOLS/PACK_IPSL/showPackProgress.sh (modified) (4 diffs)

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -16 +16 @@
 
 export timeHandlingFile="${USER_OUTPUT_PROGRESS}/timeHandlingFile.txt"
+export timeLaunchStartFile="${USER_OUTPUT_PROGRESS}/timeLaunchStartFile.txt"
+export timeEndFile="${USER_OUTPUT_PROGRESS}/timeEndFile.txt"
 
 
@@ -183 +185 @@
 }
 
+function getTimeSinceLaunchStart
+{
+    timeNow_=$1
+    stillWaiting_=1
+    
+    launchTimeString=`cat $timeLaunchStartFile | grep -e 'launch time:[[:digit:].]*$' `
+    if [ "x${launchTimeString}" == "x" ]
+    then
+        echo "no launch time"
+        return
+    fi
+    launchTime_=`echo $launchTimeString | awk -F":" '{print $2}' `
+    
+    
+    endTimeString=`cat $timeEndFile | grep -e 'end time:[[:digit:].]*$' `
+    if [ "x${endTimeString}" == "x" ]
+    then
+        endTime_=${timeNow_}
+    else
+        endTime_=`echo $endTimeString | awk -F":" '{print $2}' `
+        stillWaiting_=0
+    fi
+    
+    timeSinceLaunch_=$( awk 'BEGIN { print '${endTime_}'-'${launchTime_}' }' )
+    timeSinceLaunch_=$( awk 'BEGIN { print '${timeSinceLaunch_}'/'1000' }' )
+    if [ "x$stillWaiting_" == "x1" ]
+    then
+       timeSinceLaunch_="${timeSinceLaunch_}, still executing..."
+    fi
+    
+    echo $timeSinceLaunch_
+
+}
 
 
@@ -274 +309 @@
 
 # Recuperation des temps d'attente et ecoule depuis de demarrage des traitements en batch
-if [ -e $timeHandlingFile ]
+if [ -e $timeLaunchStartFile ]
 then
     timeNow=$( getDateMilliSeconds )
-    waitingTime=$( getWaitingTime $timeNow )
-    timeSinceExecutionStart=$( getTimeSinceExecutionStart $timeNow )
+    # waitingTime=$( getWaitingTime $timeNow ) # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    # timeSinceExecutionStart=$( getTimeSinceExecutionStart $timeNow ) # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    timeSinceLaunchStart=$( getTimeSinceLaunchStart $timeNow ) # added
 else
-    waitingTime="no handling time file available."
-    timeFromExecutionStart="no handling time file available."
+    # waitingTime="no handling time file available." # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    # timeFromExecutionStart="no handling time file available." # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+    timeSinceLaunchStart="no launch time file available."
 fi
 
@@ -399 +436 @@
 echo "nb inode before : $NbInodeBefore"
 echo "nb inode after : $NbInodeAfter"
-echo "Total time for elementary operations : $totalTime  (sum of times on several proc)" 
-echo "waiting time : $waitingTime"
-echo "Time since execution start : $timeSinceExecutionStart" 
-
-
-
-
+echo "Total time for elementary operations : $totalTime" 
+# echo "waiting time : $waitingTime" # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+# echo "Time since execution start : $timeSinceExecutionStart" # supprime pour le moment : pb si +sieurs instances ==> on simplifie
+echo "Time since launch start : $timeSinceLaunchStart"
+
+
+