X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10a7f95aedfe591594bf993e663e28956bdbaeee..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/smpi/smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index e9660c2300..8966eb9d2f 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -45,18 +45,31 @@ while true; do
     ;;
 
    "-map")
-	MAPOPT="on"
+	MAPOPT="true"
       shift 1
    ;;
 
-   "-help" | "--help" | "-h") 
+   "-keep-temps")
+	KEEP="true"
+      shift 1
+   ;;
+
+   "-help" | "--help" | "-h")
       echo "usage:"
-      echo "$0 [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] program [program-options]"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] program [program-options]"
       echo "or (deprecated usage):"
-      echo "$0 [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
       echo
       exit
    ;;
+
+   "--cfg="*|"--log="*)
+     for OPT in ${1#*=}
+     do
+       SIMOPTS="$SIMOPTS ${1%%=*}=$OPT"
+     done
+     shift 1
+   ;;
     *)
       break
     ;;
@@ -72,7 +85,7 @@ shift
 
 
 ##-------------------------------- DEFAULT or SPECIFIED PLATFORM --------------------------------------
-if [ -z "${PLATFORM}" ]; then  
+if [ -z "${PLATFORM}" ]; then
 	PLATFORMTMP="$(mktemp tmpXXXXXX)"
 
 	cat > ${PLATFORMTMP} <<PLATFORMHEAD
@@ -130,16 +143,28 @@ fi
 ##  hostfile has less than i lines.
 ##----------------------------------------------------------
 
+HAVE_SEQ="`which seq 2>/dev/null`"
+
+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 0 $((${NUMPROCS}-1))` 
+for i in ${SEQ}
 do
   if [ -n "${HOSTFILE}" ]; then
 	j=$(( $i % ${NUMHOSTS} ))
-  fi 
+  fi
   ##---- optional display of ranks to process mapping
-  if [ -n ${MAPOPT} ]; then
-	echo "[rank $j] -> ${hostnames[$j]}"  
+  if [ -n "${MAPOPT}" ]; then
+	echo "[rank $i] -> ${hostnames[$j]}"
   fi
 
   if [ -z "${hostnames[$j]}" ]; then
@@ -160,11 +185,14 @@ cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
 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
-	rm ${PLATFORMTMP} 
+if [ -z "${KEEP}" ] ; then
+   if [ -z "${PLATFORM}" ]; then
+	rm ${PLATFORMTMP}
+   fi
+   rm ${APPLICATIONTMP}
 fi
-#rm ${APPLICATIONTMP}