X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4eb19719e894c33eeba5df8cd3af77d217fbbaf0..841493f1159e95a32f05ae19760ab669279d647e:/src/smpi/smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index d5dbcdee2d..5211e87020 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -27,6 +27,12 @@ while true; do
       NETWORK_LATENCY="$2"
       shift 2
     ;;
+   "-help")
+      echo "usage:"
+      echo "$0 [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
+      echo
+      exit
+   ;;
     *)
       break
     ;;
@@ -36,42 +42,42 @@ done
 EXEC="$1"
 shift
 
-#PLATFORMTMP="$(mktemp tmpXXXXXX)"
-PLATFORMTMP="pla.xml"
+PLATFORMTMP="$(mktemp tmpXXXXXX)"
+#PLATFORMTMP="pla.xml"
 
 cat > ${PLATFORMTMP} <<PLATFORMHEAD
 <?xml version='1.0'?>
-<!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="1">
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
 PLATFORMHEAD
 
 for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
-  echo "  <cpu name=\"host$i\" power=\"${POWER}\"/>" >> ${PLATFORMTMP}
-  echo "  <network_link name=\"loop$i\" bandwidth=\"${LOOPBACK_BANDWIDTH}\" latency=\"${LOOPBACK_LATENCY}\"/>" >> ${PLATFORMTMP}
-  echo "  <network_link name=\"link$i\" bandwidth=\"${NETWORK_BANDWIDTH}\" latency=\"${NETWORK_LATENCY}\"/>" >> ${PLATFORMTMP}
+  echo "  <host id=\"host$i\" power=\"${POWER}\"/>" >> ${PLATFORMTMP}
+  echo "  <link id=\"loop$i\" bandwidth=\"${LOOPBACK_BANDWIDTH}\" latency=\"${LOOPBACK_LATENCY}\"/>" >> ${PLATFORMTMP}
+  echo "  <link id=\"link$i\" bandwidth=\"${NETWORK_BANDWIDTH}\" latency=\"${NETWORK_LATENCY}\"/>" >> ${PLATFORMTMP}
 done
 
 for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
   for (( j=${NUMPROCS}; $j ; j=$j-1 )) do
     if [ $i -eq $j ]; then
-      echo "  <route src=\"host$i\" dst=\"host$j\"><route_element name=\"loop$i\"/></route>" >> ${PLATFORMTMP}
+      echo "  <route src=\"host$i\" dst=\"host$j\"><link:ctn id=\"loop$i\"/></route>" >> ${PLATFORMTMP}
     else
-      echo "  <route src=\"host$i\" dst=\"host$j\"><route_element name=\"link$i\"/><route_element name=\"link$j\"/></route>" >> ${PLATFORMTMP}
+      echo "  <route src=\"host$i\" dst=\"host$j\"><link:ctn id=\"link$i\"/><link:ctn id=\"link$j\"/></route>" >> ${PLATFORMTMP}
     fi
   done
 done
 
 cat >> ${PLATFORMTMP} <<PLATFORMFOOT
-</platform_description>
+</platform>
 PLATFORMFOOT
 
-#APPLICATIONTMP="$(mktemp tmpXXXXXX)"
-APPLICATIONTMP="app.xml"
+APPLICATIONTMP="$(mktemp tmpXXXXXX)"
+#APPLICATIONTMP="app.xml"
 
 cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
 <?xml version='1.0'?>
-<!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="1">
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2">
 APPLICATIONHEAD
 
 for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
@@ -88,8 +94,8 @@ for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
 done
 
 cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
-</platform_description>
+</platform>
 APPLICATIONFOOT
 
 ${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
-#rm ${PLATFORMTMP} ${APPLICATIONTMP}
+rm ${PLATFORMTMP} ${APPLICATIONTMP}