some more tiny optims for the smpirun generation

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index ff70781..ad8aabe 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -68,6 +68,8 @@ EXTOPT=""
 WRAPPER=""
 HOSTFILE=""
 HOSTFILETMP=0
 WRAPPER=""
 HOSTFILE=""
 HOSTFILETMP=0

+MAPOPT=0
+REPLAY=0

 
 unset pid
 
 
 unset pid
 


@@ -166,7 +168,7 @@ while true; do
            shift 1
            ;;
         "-map")
            shift 1
            ;;
         "-map")

-           MAPOPT="true"
+           MAPOPT=1

             shift 1
             ;;
         "-trace")
             shift 1
             ;;
         "-trace")


@@ -382,6 +384,7 @@ if [ "${EXTOPT}" = "smpi_replay" ]; then
     if [ -n "${APP_TRACES}" ] && [ -f "${APP_TRACES}" ]; then
         hosttraces=$(cat ${APP_TRACES} | tr '\n\r' '  ' )
         NUMTRACES=$(cat ${APP_TRACES} | wc -l)
     if [ -n "${APP_TRACES}" ] && [ -f "${APP_TRACES}" ]; then
         hosttraces=$(cat ${APP_TRACES} | tr '\n\r' '  ' )
         NUMTRACES=$(cat ${APP_TRACES} | wc -l)

+        REPLAY=1

     else
         printf "File not found: %s\n" "${APP_TRACES:-\${APP_TRACES\}}" >&2
         exit 1
     else
         printf "File not found: %s\n" "${APP_TRACES:-\${APP_TRACES\}}" >&2
         exit 1


@@ -407,36 +410,35 @@ else
 fi
 
 set -- $hostnames
 fi
 
 set -- $hostnames

+

 ##---- generate <process> tags------------------------------
 ##---- generate <process> tags------------------------------

+#prepare arguments at once
+for ARG in $PROC_ARGS; do
+  ARGS="$ARGS""<argument value=\"${ARG}\"/>
+"
+done
+

 for i in ${SEQ}
 do
 for i in ${SEQ}
 do

-    if [ -n "${HOSTFILE}" ]; then
-      j=$(( $i % ${NUMHOSTS} + 1 ))
-    fi
-
+    j=$(( $i % ${NUMHOSTS} + 1 ))

     host=$(eval "echo \${$j}")
 
     host=$(eval "echo \${$j}")
 

-    if [ -z $host ]; then
-      host="host"$($j)
-    fi

     ##---- optional display of ranks to process mapping
     ##---- optional display of ranks to process mapping

-    if [ -n "${MAPOPT}" ]; then
+    if [ ${MAPOPT} = 1 ]; then

       echo "[rank $i] -> $host"
     fi
 
       echo "[rank $i] -> $host"
     fi
 

-    echo "  <process host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->" >> ${APPLICATIONTMP}
-    echo "    <argument value=\"1\"/> <!-- instance -->" >> ${APPLICATIONTMP}
-    echo "    <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
-    if [ "${EXTOPT}" = "smpi_replay" ]; then
+    echo "  <process host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->
+    <argument value=\"1\"/> <!-- instance -->
+    <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
+    if [ ${REPLAY} = 1 ]; then

         if  [ ${NUMTRACES} -gt 1 ]; then
             echo "    <argument value=\"$(echo $hosttraces|cut -d' ' -f$j)\"/>" >> ${APPLICATIONTMP}
         else
             echo "    <argument value=\"$(echo $hosttraces|cut -d' ' -f1)\"/>" >> ${APPLICATIONTMP}
         fi
     else 
         if  [ ${NUMTRACES} -gt 1 ]; then
             echo "    <argument value=\"$(echo $hosttraces|cut -d' ' -f$j)\"/>" >> ${APPLICATIONTMP}
         else
             echo "    <argument value=\"$(echo $hosttraces|cut -d' ' -f1)\"/>" >> ${APPLICATIONTMP}
         fi
     else 

-        for ARG in $PROC_ARGS; do
-            echo "    <argument value=\"${ARG}\"/>" >> ${APPLICATIONTMP}
-        done
+    echo ${ARGS} >> ${APPLICATIONTMP}

     fi
     echo "  </process>" >> ${APPLICATIONTMP}
 done
     fi
     echo "  </process>" >> ${APPLICATIONTMP}
 done