Changeset 924

Timestamp:

08/14/13 16:11:16 (11 years ago)

Author:

sdipsl

Message:

Enhance IGCM_debug_sizeOfTabContent prior to further work on #140

File:

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

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -86 +86 @@
 #D-function IGCM_debug_sizeOfTabContent
 #D- * Purpose: Give sumed size of a list of files
+#D- * Usage: IGCM_debug_sizeOfTabContent entityList destination
+#D- *        where entityList is a list of files or directory
+#D- *        where dest is either a directory or a file name
 function IGCM_debug_sizeOfTabContent
 {
-  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
-    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 ))
+  typeset entityListe destination iEntity sizeKo sumSizeKo sumSizeMo
+
+  eval set +A entityListe \${${1}}
+  destination=${2}  
+  sumSizeKo=0
+
+  # Here we will try to compute size (file or directory size) from local path and not from archive.
+  for ((i = 0; i < ${#entityListe[*]}; i += 1)) ; do  
+    if [ -f ${entityListe[$i]##/*/} ] ; then
+      # One file or a bunch of files has been copied without renaming
+      # remove path /home/login/../ from entityListe elements
+      iEntity=${entityListe[$i]##/*/}
+    elif [ -f ${destination} ] ; then
+      # a file has been copied and rename
+      iEntity=${destination}
+    elif [ -f ${destination}/${entityListe[$i]##/*/} ] ; then
+      # a copy in a directory but not in ${PWD}
+      iEntity=${destination}/${entityListe[$i]##/*/}
+    elif [ -d ${entityListe[$i]} ] ; then
+      # directory has been copied from non remote place
+      iEntity=${entityListe[$i]}
+    elif [ -d ${destination}/${entityListe[$i]##/*/} ] ; then
+      # directory has been copied from remote archive and not rename
+      iEntity=${destination}/${entityListe[$i]##/*/}
+    elif [ -d ${destination} ] ; then
+      # directory has been copied from remote archive and rename
+      iEntity=${destination}
+    fi
+    sizeKo=$( du --apparent-size -k ${iEntity} | awk {'print $1'} )
+    sumSizeKo=$(( $sumSizeKo + $sizeKo ))
   done
-  sizeMo=$( echo "scale=6;${sizeKo}/1024" | bc )
-  echo "${sizeKo}|${sizeMo}"
+  sumSizeMo=$( echo "scale=6;${sumSizeKo}/1024" | bc )
+  echo "${sumSizeKo}|${sumSizeMo}"
 }
 
@@ -313 +330 @@
     # Classical copy (only files are given to IGCM_sys_Cp as options)
     IGCM_sys_Cp)
-      instrumentation=true      
+      instrumentation=true
       # All but the latest
       fileList=${arguments[*]:0:${#arguments[*]}-1}
@@ -321 +338 @@
       dest=${arguments[${#arguments[*]}-1]}
       # Size of file whose name are stored in a list
-      entitySize=$( IGCM_debug_sizeOfTabContent fileList $dest )
+      entitySize=$( IGCM_debug_sizeOfTabContent fileList ${dest} )
       ;;
 
@@ -327 +344 @@
     IGCM_sys_Get_Master|IGCM_sys_Get_Dir)
       instrumentation=true
-      if [ ${#arguments[*]} -eq 2 ] ; then
-        source=${arguments[0]}
-        dest=${arguments[1]}
-        # Size of file whose name are stored in a variable
-        entitySize=$( IGCM_debug_sizeOfTabContent source )
-      fi
+      source=${arguments[0]}
+      dest=${arguments[1]}
+      # Size of file whose name are stored in a variable
+      entitySize=$( IGCM_debug_sizeOfTabContent source ${dest} )
       ;;