Changeset 1090

Timestamp:

10/16/14 15:08:05 (10 years ago)

Author:

sdipsl

Message:

Minimize instrumentation content message size
Use meaningful attribute name for instrumentation
and cosmetics

File:

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

trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

@@ -235 +235 @@
   done
   # Log to stack file using human readable format
-  echo sendAMQPMsg -h localhost -p 5672 ${additionnalOption} -b "${Body}"      >> ${StackFileLocation}/${StackFileName}
+  echo "${Body}" >> ${StackFileLocation}/${StackFileName}
 
   # Log separately encoded AMQP message command for reuse in a mock up
-  echo sendAMQPMsg -h localhost -p 5672 ${additionnalOption} -b ${encodedBody} >> /tmp/send.AMQP.${config_UserChoices_JobName}.${config_UserChoices_ExperimentName}.${config_UserChoices_SpaceName}.${config_UserChoices_TagName}.${CumulPeriod}.history.txt
+  #echo sendAMQPMsg -h localhost -p 5672 ${additionnalOption} -b ${encodedBody} >> /tmp/send.AMQP.${config_UserChoices_JobName}.${config_UserChoices_ExperimentName}.${config_UserChoices_SpaceName}.${config_UserChoices_TagName}.${CumulPeriod}.history.txt
 
   # Send the message
@@ -252 +252 @@
     IGCM_debug_Print 2 "IGCM_debug_Push/PopStack/ActivateBigBro : command sendAMQPMsg failed error code ${status}"
     echo sendAMQPMsg -h localhost -p 5672 -b "${Body}"
-    exit
+    exit 1
   fi
 }
@@ -752 +752 @@
 
   typeset diff_ms entitySizeKo entitySizeMo flux_Ko_ms flux_Ko_s flux_Mo_s
-  typeset name dirOut dirSource
-
-  name="doNotKnow"
+  typeset dirFrom dirTo
 
   diff_ms=$(( $end_ms - $start_ms ))
@@ -776 +774 @@
 
   if [ -d $dest ] ; then
-    dirOut=$( readlink -f ${dest} )
+    dirTo=$( readlink -f ${dest} )
   else
-    dirOut=$( readlink -f $( dirname ${dest} ) )
+    dirTo=$( readlink -f $( dirname ${dest} ) )
   fi
 
   if [ -d $source ] ; then
-    dirSource=$( readlink -f ${source} )
+    dirFrom=$( readlink -f ${source} )
   else
-    dirSource=$( readlink -f $( dirname ${source} ) )
-  fi
-
-  instrumentationContent=$( echo "\"act\":\"${actionType}\",\"sz\":\"${entitySizeMo}\",\"ms\":\"${diff_ms}\",\"fx(ko)\":\"${flux_Ko_s}\",\"fx(mo)\":\"${flux_Mo_s}\",\"nm\":\"${name}\",\"dirSource\":\"${dirSource}\",\"dirOut\":\"${dirOut}\"" )
-
-  #echo "==>act:${actionType}|sz:${entitySizeMo}|ms:${diff_ms}|fx(ko):${flux_Ko_s}|fx(mo):${flux_Mo_s}|nm:${name}|dirSource:${dirSource}|dirOut:${dirOut}"
+    dirFrom=$( readlink -f $( dirname ${source} ) )
+  fi
+
+  #instrumentationContent=$( echo "\"act\":\"${actionType}\",\"sz\":\"${entitySizeMo}\",\"ms\":\"${diff_ms}\",\"fx(ko)\":\"${flux_Ko_s}\",\"fx(mo)\":\"${flux_Mo_s}\",\"nm\":\"${name}\",\"dirSource\":\"${dirFrom}\",\"dirOut\":\"${dirTo}\"" )
+
+  instrumentationContent=$( echo "\"actionName\":\"${actionType}\",\"size\":\"${entitySizeMo}\",\"duration\":\"${diff_ms}\",\"dirFrom\":\"${dirFrom}\",\"dirTo\":\"${dirTo}\"" )
+
+  #echo "==>act:${actionType}|sz:${entitySizeMo}|ms:${diff_ms}|fx(ko):${flux_Ko_s}|fx(mo):${flux_Mo_s}|nm:${name}|dirSource:${dirFrom}|dirOut:${dirTo}"
 
   echo ${instrumentationContent}