Changeset 941 for trunk

Timestamp:

08/26/13 12:26:57 (11 years ago)

Author:

sdipsl

Message:

Adapt instrumentation for this kind of syntax:
# IGCM_sys_ncrcat -p ${dir} ${liste_file_tmp} --output ${output}
# IGCM_sys_ncrcat -x -v ${list_var} -p ${dir} ${liste_file_tmp} --output ${output}

File:

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

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -106 +106 @@
 
   eval set +A entityListe \${${1}}
-  destination=${2}  
+  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
+  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 from a visible filesystem
+      iEntity=${entityListe[$i]}
+    elif [ -f ${entityListe[$i]##/*/} ] ; then
+      # One file or a bunch of files has been copied without renaming from an non visible filesystem
       # remove path /home/login/../ from entityListe elements
       iEntity=${entityListe[$i]##/*/}
     elif [ -f ${destination} ] ; then
-      # a file has been copied and rename
+      # a file has been copied and renamed
       iEntity=${destination}
     elif [ -f ${destination}/${entityListe[$i]##/*/} ] ; then
@@ -122 +125 @@
       iEntity=${destination}/${entityListe[$i]##/*/}
     elif [ -d ${entityListe[$i]} ] ; then
-      # directory has been copied from non remote place
+      # a directory has been copied from a non remote place
       iEntity=${entityListe[$i]}
     elif [ -d ${destination}/${entityListe[$i]##/*/} ] ; then
-      # directory has been copied from remote archive and not rename
+      # a directory has been copied from a remote archive and not renamed
       iEntity=${destination}/${entityListe[$i]##/*/}
     elif [ -d ${destination} ] ; then
-      # directory has been copied from remote archive and rename
+      # a directory has been copied from a remote archive and renamed
       iEntity=${destination}
     fi
-    sizeKo=$( du --apparent-size -sk ${iEntity} | awk {'print $1'} )
+    sizeKo=$( du --apparent-size -sk ${iEntity} | gawk '{print $1}' )
     sumSizeKo=$(( $sumSizeKo + $sizeKo ))
   done
   sumSizeMo=$( echo "scale=6;${sumSizeKo}/1024" | bc )
   echo "${sumSizeKo}|${sumSizeMo}"
-
 }
 
@@ -264 +266 @@
   if ( $DEBUG_debug ) ; then
     typeset i decal command arguments startTime_ms endTime_ms
-    typeset instrumentation dest
+    typeset instrumentation dest prefix
     # they are not typeset because they are send "by adress" to son functions
     # we unset them to avoid "memory effect"
@@ -379 +381 @@
       entitySize=$( IGCM_debug_sizeOfTabContent fileList ${dest} )
       ;;
-    
+
     # NCO commands
     IGCM_sys_ncrcat|IGCM_sys_ncecat|IGCM_sys_ncra|IGCM_sys_ncks|IGCM_sys_cdo)
@@ -388 +390 @@
       # IGCM_sys_ncrcat -x -v ${list_var} -p ${dir} ${liste_file_tmp} --output ${output}
       instrumentation=true
-      # All files that are not the latest argument (only input files)
+      keepGoing=true
+      prefix=.
       i=0
-      keepGoing=true
       while ( ${keepGoing} ) ; do
-        if [ -f ${arguments[${#arguments[*]}-2-${i}]} ] ; then
-          fileList="${fileList} ${arguments[${#arguments[*]}-2-${i}]}"
+        # the last one is not interesting
+        if [ ${i} -eq ${#arguments[*]}-1 ] ; then
+          keepGoing=false
+        # look after "-p" option. Path prefix is the following arguments
+        elif [ ${arguments[${i}]} = "-p" ] ; then
           ((i = i + 1))
-        elif [ ${i} -ge 1 ] ; then
+          prefix=${arguments[${i}]}
+          ((i = i + 1))
+        elif [ ${i} -eq ${#arguments[*]}-1 ] ; then
           keepGoing=false
+        # looking for files
+        elif [ -f ${prefix}/${arguments[${i}]} ] ; then
+          fileList="${fileList} ${prefix}/${arguments[${i}]}"
+          ((i = i + 1))
+        # other options are not interesting
         else
           ((i = i + 1))
         fi
       done
+
       # i value is at least 1
       # just need one file to get the directory
-      source=${arguments[${#arguments[*]}-1-${i}]}
+      source=$( echo ${fileList} | gawk '{print $1}' )
       # Nothing but the latest
       dest=${arguments[${#arguments[*]}-1]}