Changeset 917

Timestamp:

08/12/13 17:44:05 (11 years ago)

Author:

sdipsl

Message:

Adapt for diffenrent cases : copy to a file, copy to a directory, and rename during copy.

File:

• trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh (modified) (7 diffs)

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -88 +88 @@
 function IGCM_debug_sizeOfTabContent
 {
-  typeset dm_liste sizeFile sizeKo sizeMo
+  typeset dm_liste ifile sizeFile sizeKo sizeMo
   eval set +A dm_liste \${${1}}
   sizeKo=0
   for ((i = 0; i < ${#dm_liste[*]}; i += 1)) ; do
     # echo "dm_liste[$i]=${dm_liste[$i]}"
+    # we want to compute the size from local path (not from archive ...)
     # remove path /home/login/../ from dm_liste elements
-    sizeFile=$( du --apparent-size -k ${dm_liste[$i]##/*/} )
+    if [ -f ${dm_liste[$i]##/*/} ] ; then
+      ifile=${dm_liste[$i]##/*/}
+    elif [ -f ${2} ] ; then
+      ifile=${2}
+    elif [ -f $2/${dm_liste[$i]##/*/} ] ; then
+      ifile=${2}/${dm_liste[$i]##/*/}
+    fi
+    sizeFile=$( du --apparent-size -k ${ifile} | awk {'print $1'} )
     sizeKo=$(( $sizeKo + $sizeFile ))
   done
@@ -226 +234 @@
   if ( $DEBUG_debug ) ; then
     typeset decal command arguments startTime_ms endTime_ms
-    typeset instrumentation fileList source dest
+    typeset instrumentation source dest
 
     # INTRODUCE SIMPLE ERROR GENERATOR TO TEST SUPERVISOR
@@ -282 +290 @@
         dest=${arguments[1]}
         # Size of file whose name are stored in a variable
-        entitySize=$( IGCM_debug_sizeOfTabContent source )
+        entitySize=$( IGCM_debug_sizeOfTabContent source ${dest} )
       elif ( [ ${#arguments[*]} -eq 3 ] && [ ${arguments[0]} = '/l' ] ) ; then
         # Keep the array name hosting the all list
@@ -290 +298 @@
         dest=${arguments[1]}
         # Size of file whose name are stored in an array
-        entitySize=$( IGCM_debug_sizeOfTabContent fileList[*] )
+        entitySize=$( IGCM_debug_sizeOfTabContent fileList[*] ${dest} )
       elif [ [ ${#arguments[*]} -ge 3 ] ; then
        # All but the latest
@@ -299 +307 @@
         dest=${arguments[${#arguments[*]}-1]}
         # Size of file whose name are stored in a list
-        entitySize=$( IGCM_debug_sizeOfTabContent fileList )
+        entitySize=$( IGCM_debug_sizeOfTabContent fileList ${dest} )
       fi
       ;;
@@ -313 +321 @@
       dest=${arguments[${#arguments[*]}-1]}
       # Size of file whose name are stored in a list
-      entitySize=$( IGCM_debug_sizeOfTabContent fileList )
+      entitySize=$( IGCM_debug_sizeOfTabContent fileList $dest )
       ;;
 
@@ -337 +345 @@
       dest=${arguments[0]}
       # Size of file whose name are stored in a list
-      entitySize=$( IGCM_debug_sizeOfTabContent fileList )
+      entitySize=$( IGCM_debug_sizeOfTabContent fileList ${dest} )
       ;;
     esac