X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ae18e1909f3af1067c9f8ec7a4e6b7379997099..2604d800f6a2354637dc78255822c41e7d8a45b5:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index b8daa19e35..5fbc9b3511 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# Copyright (c) 2007-2016, The SimGrid Team. All rights reserved. +# Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. # This program is free software; you can redistribute it and/or modify it # under the terms of the license (GNU LGPL) which comes with this package. @@ -31,9 +31,13 @@ SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI" usage () { cat < -hostfile program [program-options] + $0 [OPTIONS] -platform -hostfile -replay [program] [program-options] Options: -keep-temps # don't remove the generated files after execution -wrapper # use command to run the program (e.g. "valgrind" or "gdb --args") + -gdb # run within GDB (-wrapper "gdb --args" -keep-temps) + -lldb # run within LLDB (-wrapper "lldb --" -keep-temps) + -vgdb # run within Valgrind+GDB (-wrapper "valgrind --vgdb=yes --vgdb-error=0" -keep-temps) -map # display the machine on which each process rank is mapped -np # use that amount of processes from the hostfile. # By default, all processes of the hostfile are used. @@ -45,7 +49,7 @@ Options: -trace-grouped # group MPI processes by location -trace-resource # trace resource utilization -trace-file # name of the tracefile (simgrid_smpi.trace) - -ext # additional parameter (reserved) + -replay # replays a trace instead of actually executing an application -version # Displays the SimGrid version (human readable) -git-version # Displays the git hash of SimGrid @@ -63,7 +67,6 @@ then exit fi -EXTOPT="" WRAPPER="" HOSTFILE="" HOSTFILETMP=0 @@ -153,8 +156,8 @@ while true; do fi shift 2 ;; - "-ext") - EXTOPT="$2" + "-replay") + APP_TRACES="$2" shift 2 ;; "-no-privatize") @@ -195,14 +198,32 @@ while true; do shift 1 ;; "-keep-temps") - KEEP="true" - SIMOPTS="$SIMOPTS --cfg=smpi/keep-temps:yes" + KEEP="true" + SIMOPTS="$SIMOPTS --cfg=smpi/keep-temps:yes" shift 1 ;; "-wrapper") WRAPPER="$2" shift 2 ;; + "-gdb") + WRAPPER="gdb --args" + KEEP="true" + SIMOPTS="$SIMOPTS --cfg=smpi/keep-temps:yes" + shift 1 + ;; + "-vgdb") + WRAPPER="valgrind --vgdb=yes --vgdb-error=0" + KEEP="true" + SIMOPTS="$SIMOPTS --cfg=smpi/keep-temps:yes" + shift 1 + ;; + "-lldb") + WRAPPER="lldb --" + KEEP="true" + SIMOPTS="$SIMOPTS --cfg=smpi/keep-temps:yes" + shift 1 + ;; "-help" | "--help" | "-h") usage exit 0 @@ -232,16 +253,25 @@ while true; do esac done -# check if we still have at least one parameter beyond options -if [ $# -eq 0 ] -then - echo "Error: no program to execute!" - usage - exit -fi +if [ -n "${APP_TRACES}" ] ; then + if [ $# -eq 0 ] ; then + EXEC="@SMPIREPLAYMAIN@" + else + EXEC="$1" + shift + fi +else + # check if we still have at least one parameter beyond options + if [ $# -eq 0 ] + then + echo "Error: no program to execute!" + usage + exit + fi -EXEC="$1" -shift + EXEC="$1" + shift +fi # steel --cfg and --logs options while [ $# -gt 0 ]; do @@ -255,7 +285,7 @@ while [ $# -gt 0 ]; do ;; *) PROC_ARGS="${PROC_ARGS:+$PROC_ARGS }$1" - shift + shift ;; esac done @@ -270,19 +300,21 @@ if [ -z "${HOSTFILE}" ] ; then HOSTFILETMP=1 HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)" perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE} - perl -ne 'if (/.*> ${HOSTFILE} fi UNROLLEDHOSTFILETMP=0 @@ -321,7 +353,7 @@ if [ -z "${PLATFORM}" ]; then cat > ${PLATFORMTMP} < - + PLATFORMHEAD @@ -363,7 +395,7 @@ APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)" cat > ${APPLICATIONTMP} < - + APPLICATIONHEAD @@ -372,9 +404,8 @@ if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then hostnames=$(cat ${HOSTFILE} | tr '\n\r' ' ') fi -if [ "${EXTOPT}" = "smpi_replay" ]; then - APP_TRACES=$PROC_ARGS - if [ -n "${APP_TRACES}" ] && [ -f "${APP_TRACES}" ]; then +if [ -n "${APP_TRACES}" ]; then + if [ -f "${APP_TRACES}" ]; then hosttraces=$(cat ${APP_TRACES} | tr '\n\r' ' ' ) NUMTRACES=$(cat ${APP_TRACES} | wc -l) REPLAY=1 @@ -386,7 +417,7 @@ fi ##---------------------------------------------------------- ## generate application.xml with hostnames from hostfile: -## the name of host_i (1<=i<=p, where -np p) is the line i in hostfile (where -hostfile hostfile), or "host$i" if +## the name of host_i (1<=i<=p, where -np p) is the line i in hostfile (where -hostfile hostfile), or "host$i" if ## hostfile has less than i lines. ##---------------------------------------------------------- @@ -422,15 +453,16 @@ do fi echo " - - " >> ${APPLICATIONTMP} + + " >> ${APPLICATIONTMP} if [ ${REPLAY} = 1 ]; then + echo " " >> ${APPLICATIONTMP} if [ ${NUMTRACES} -gt 1 ]; then echo " " >> ${APPLICATIONTMP} else echo " " >> ${APPLICATIONTMP} fi - else + else echo ${XML_ARGS} >> ${APPLICATIONTMP} fi echo " " >> ${APPLICATIONTMP} @@ -473,6 +505,7 @@ if [ -n "${TRACE_ACTIVE}" ]; then fi ##---------------------- end SMPI TRACING OPTIONS --------------------------------- +# Do not remove, this variable may be used by user code (e.g. StarPU) export SMPI_GLOBAL_SIZE=${NUMPROCS} if [ -n "${KEEP}" ] ; then echo ${EXEC} ${PRIVATIZE} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} @@ -480,7 +513,7 @@ if [ -n "${KEEP}" ] ; then echo "Generated hostfile ${HOSTFILE} kept." fi if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then - echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} kept." + echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} kept." fi fi @@ -500,6 +533,12 @@ pid=$! exec 3>&- wait $pid status=$? +# With dash on Windows WSL/Ubuntu, "wait" sometimes returns early with an exit +# status of 128. Try again. +while test $status -eq 128 && kill -0 $pid 2>/dev/null; do + wait $pid + status=$? +done pid="" # Keep temporary files on failures to help debugging