X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e55187b3483204da82352c769fee9522e87eadc..3c072dea92bbf0e4df46b1d8d56cd62e68883b33:/src/smpi/smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index a57e61aa4a..ce3b1c5396 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -43,13 +43,30 @@ while true; do
       fi
 	shift 2
     ;;
+   
+   "-map")
+	MAPOPT="true"
+      shift 1
+   ;;
+
+   "-keep-temps")
+	KEEP="true"
+      shift 1
+   ;;
 
    "-help" | "--help" | "-h") 
       echo "usage:"
-      echo "$0 [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] [-platform <xmldesc>] [-hostfile <hostfile>] program [program-options]"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] program [program-options]"
+      echo "or (deprecated usage):"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
       echo
       exit
    ;;
+   
+   "--cfg="*|"--log="*)
+     SIMOPTS="$SIMOPTS $1"
+     shift 1
+   ;;
     *)
       break
     ;;
@@ -113,6 +130,7 @@ APPLICATIONHEAD
 ##---- cache hostnames of hostfile---------------
 if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then
 	hostnames=(`cat ${HOSTFILE} | tr \\\n " "`)
+      NUMHOSTS=`cat ${HOSTFILE} | wc -l`
 fi
 
 ##----------------------------------------------------------
@@ -121,40 +139,58 @@ fi
 ##  in hostfile (where -hostfile hostfile), or "host$i" if
 ##  hostfile has less than i lines.
 ##----------------------------------------------------------
-for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
-  j=$(( $i-1 ))
+
+HAVE_SEQ="`which seq`"
+HAVE_JOT="`which jot`"
+
+if [ -n "${HAVE_SEQ}" ]; then
+	SEQ=`${HAVE_SEQ} 0 $((${NUMPROCS}-1))`
+else
+      cnt=0
+	while (( $cnt < ${NUMPROCS} )) ; do
+	    SEQ="$SEQ $cnt"
+	    cnt=$((cnt + 1));
+	done
+fi
+
+##---- generate <process> tags------------------------------
+
+for i in ${SEQ} 
+do
+  if [ -n "${HOSTFILE}" ]; then
+	j=$(( $i % ${NUMHOSTS} ))
+  fi 
+  ##---- optional display of ranks to process mapping
+  if [ -n "${MAPOPT}" ]; then
+	echo "[rank $i] -> ${hostnames[$j]}"  
+  fi
+
   if [ -z "${hostnames[$j]}" ]; then
-	host="host"$i
+	host="host"$(($j+1))
   else
 	host="${hostnames[$j]}"
   fi
   echo "  <process host=\"${host}\" function=\"smpi_simulated_main\">" >> ${APPLICATIONTMP}
-    echo "    <argument value=\"$j\"/> <!-- rank -->" >> ${APPLICATIONTMP}
+  echo "    <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
   for ARG in $*; do
     echo "    <argument value=\"${ARG}\"/>" >> ${APPLICATIONTMP}
   done
   echo "  </process>" >> ${APPLICATIONTMP}
 done
 
-for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
-  j=$(( $i-1 ))
-  if [ -z "${hostnames[$j]}" ]; then
-	host="host"$i
-  else
-	host="${hostnames[$j]}"
-  fi
-done
-
 cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
 </platform>
 APPLICATIONFOOT
 ##-------------------------------- end DEFAULT APPLICATION --------------------------------------
 
-echo ${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
-${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
+if [ -n "${KEEP}" ] ; then
+  echo ${EXEC} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
+fi
+${EXEC} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
 
-echo "[$0] cleaning up temp files"
-if [ -z "${PLATFORM}" ]; then
+if [ -z "${KEEP}" ] ; then
+   if [ -z "${PLATFORM}" ]; then
 	rm ${PLATFORMTMP} 
+   fi
+   rm ${APPLICATIONTMP}
 fi
-#rm ${APPLICATIONTMP}