X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/685c8123e59fe955db78afc0cbd0917f07e1ad0b..e9f0018b823e34405847177b25a85d3facc30ae1:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 2cd37fc5af..fb1754a32b 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (c) 2007-2014. The SimGrid Team. +# Copyright (c) 2007-2015. The SimGrid Team. # All rights reserved. # This program is free software; you can redistribute it and/or modify it @@ -8,6 +8,9 @@ @CMAKE_SMPI_COMMAND@ +SIMGRID_VERSION="@SIMGRID_VERSION_STRING@" +SIMGRID_GITHASH="@SIMGRID_GITHASH@" + DEFAULT_LOOPBACK_BANDWIDTH="498000000" DEFAULT_LOOPBACK_LATENCY="0.000004" DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))" @@ -21,7 +24,7 @@ NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}" NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}" POWER="${DEFAULT_POWER}" -SIMOPTS="--cfg=maxmin/precision:1e-3 --cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304" +SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304" #usage to print the way this script should be called usage () { @@ -42,6 +45,13 @@ Options: -trace-viva # generate configuration for Viva's GraphView -trace-file # name of the tracefile (simgrid_smpi.trace) -ext # additional parameter (reserved) + -foreground # run the child process in the foreground: + # - it can access the terminal; + # - but we cannot stop it when we receive a signal. + # This is useful with -wrapper "gdb --args". + + -version # Displays the SimGrid version (human readable) + -git-version # Displays the git hash of SimGrid or (deprecated usage): $0 [-keep-temps] [-np ] [-bandwidth ] [-latency ] program [program-options] @@ -59,6 +69,58 @@ fi EXTOPT="" WRAPPER="" HOSTFILE="" +HOSTFILETMP=0 + +unset pid +unset foreground ; foreground=0 + +trapped_signals="HUP INT QUIT ILL ABRT SEGV FPE ALRM TERM USR1 USR2 BUS" + +smpirun_cleanup() +{ + if [ -z "${KEEP}" ] ; then + if [ -z "${PLATFORM}" -a -n "$PLATFORMTMP" ]; then + rm -f ${PLATFORMTMP} + PLATFORMTMP="" + fi + if [ ${HOSTFILETMP} = 1 -a -n "$HOSTFILE" ] ; then + rm -f ${HOSTFILE} + HOSTFILE="" + fi + if [ ${UNROLLEDHOSTFILETMP} = 1 -a -n "$UNROLLEDHOSTFILE" ] ; then + rm -f ${UNROLLEDHOSTFILE} + UNROLLEDHOSTFILE="" + fi + if [ -n ${APPLICATIONTMP} ]; then + rm -f ${APPLICATIONTMP} + APPLICATIONTMP="" + fi + fi +} + +smpirun_trap() { + local sig + sig="$1" + + # Cleanup and kill the child process: + smpirun_cleanup + if ! [ -z "$pid" ]; then + kill -TERM $pid + fi + unset pid + + # Raise the same signal again (remove the traps first): + trap - $trapped_signals + kill -$sig $$ + + # This should never happen: + kill -ABRT $$ + kill -TERM $$ +} + +for s in $trapped_signals; do + trap "smpirun_trap $s" $s +done while true; do case "$1" in @@ -77,7 +139,7 @@ while true; do "-platform") PLATFORM="$2" if [ ! -f "${PLATFORM}" ]; then - echo "[$0] ** error: the file '${PLATFORM}' does not exist. Aborting." + echo "[`basename $0`] ** error: the file '${PLATFORM}' does not exist. Aborting." exit 1 fi shift 2 @@ -85,7 +147,7 @@ while true; do "-hostfile") HOSTFILE="$2" if [ ! -f "${HOSTFILE}" ]; then - echo "[$0] ** error: the file '${HOSTFILE}' does not exist. Aborting." + echo "[`basename $0`] ** error: the file '${HOSTFILE}' does not exist. Aborting." exit 1 fi shift 2 @@ -94,7 +156,7 @@ while true; do "-machinefile") HOSTFILE="$2" if [ ! -f "${HOSTFILE}" ]; then - echo "[$0] ** error: the file '${HOSTFILE}' does not exist. Aborting." + echo "[`basename $0`] ** error: the file '${HOSTFILE}' does not exist. Aborting." exit 1 fi shift 2 @@ -163,7 +225,17 @@ while true; do "-help" | "--help" | "-h") usage - exit + exit 0 + ;; + + "-version" | "--version" | "-v") + printf '%b\n' "$SIMGRID_VERSION" + exit 0 + ;; + + "-git-version" | "--git-version") + printf '%b\n' "$SIMGRID_GITHASH" + exit 0 ;; "--cfg="*|"--log="*) @@ -173,6 +245,10 @@ while true; do done shift 1 ;; + "-foreground") + foreground=1 + shift 1 + ;; *) break ;; @@ -213,11 +289,24 @@ if [ -z "${HOSTFILE}" ] && [ -z "${PLATFORM}" ] ; then exit 1 fi -HOSTFILETMP=0 if [ -z "${HOSTFILE}" ] ; then HOSTFILETMP=1 - HOSTFILE="$(mktemp tmphostXXXXXX)" + HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)" perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE} + perl -ne 'if (/.*> ${HOSTFILE} fi UNROLLEDHOSTFILETMP=0 @@ -225,7 +314,7 @@ UNROLLEDHOSTFILETMP=0 multiple_processes=`grep -c ":" $HOSTFILE` if [ "${multiple_processes}" -gt 0 ] ; then UNROLLEDHOSTFILETMP=1 - UNROLLEDHOSTFILE="$(mktemp tmphostXXXXXX)" + UNROLLEDHOSTFILE="$(mktemp smpitmp-hostfXXXXXX)" perl -ne ' do{ for ( 1 .. $2 ) { print "$1\n" } } if /(.*?):(\d+).*/' ${HOSTFILE} > ${UNROLLEDHOSTFILE} if [ ${HOSTFILETMP} = 1 ] ; then rm ${HOSTFILE} @@ -237,6 +326,10 @@ fi # Don't use wc -l to compute it to avoid issues with trailing \n at EOF hostfile_procs=`grep -c "[a-zA-Z0-9]" $HOSTFILE` +if [ ${hostfile_procs} = 0 ] ; then + echo "[`basename $0`] ** error: the hostfile '${HOSTFILE}' is empty. Aborting." >&2 + exit 1 +fi if [ -z "${NUMPROCS}" ] ; then # Use the amount of processes in the hostfile as default value for the -np parameter @@ -250,7 +343,7 @@ fi ##-------------------------------- DEFAULT or SPECIFIED PLATFORM -------------------------------------- if [ -z "${PLATFORM}" ]; then - PLATFORMTMP="$(mktemp tmpXXXXXX)" + PLATFORMTMP="$(mktemp smpitmp-platfXXXXXX)" cat > ${PLATFORMTMP} < @@ -292,7 +385,7 @@ fi ##-------------------------------- end DEFAULT or SPECIFIED PLATFORM -------------------------------------- ##-------------------------------- DEFAULT APPLICATION -------------------------------------- -APPLICATIONTMP="$(mktemp tmpXXXXXX)" +APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)" #APPLICATIONTMP="app.xml" @@ -314,7 +407,7 @@ if [ "${EXTOPT}" = "smpi_replay" ]; then hosttraces=$(cat ${APP_TRACES} | tr '\n\r' ' ' ) NUMTRACES=$(cat ${APP_TRACES} | wc -l) else - printf "File not found: %s\n", "${APP_TRACES:-\${APP_TRACES\}}" >&2 + printf "File not found: %s\n" "${APP_TRACES:-\${APP_TRACES\}}" >&2 exit 1 fi fi @@ -332,9 +425,9 @@ if [ -n "${HAVE_SEQ}" ]; then SEQ=`${HAVE_SEQ} 0 $((${NUMPROCS}-1))` else cnt=0 - while (( $cnt < ${NUMPROCS} )) ; do - SEQ="$SEQ $cnt" - cnt=$((cnt + 1)); + while [ $cnt -lt ${NUMPROCS} ] ; do + SEQ="$SEQ $cnt" + cnt=$((cnt + 1)); done fi @@ -418,26 +511,23 @@ export SMPI_GLOBAL_SIZE=${NUMPROCS} if [ -n "${KEEP}" ] ; then echo ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} if [ ${HOSTFILETMP} = 1 ] ; then - echo "Generated hostfile ${HOSTFILE} keeped." + echo "Generated hostfile ${HOSTFILE} kept." fi if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then - echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} keeped." + echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} kept." fi fi -${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} -status=$? - -if [ -z "${KEEP}" ] ; then - if [ -z "${PLATFORM}" ]; then - rm ${PLATFORMTMP} - fi - if [ ${HOSTFILETMP} = 1 ] ; then - rm ${HOSTFILE} - fi - if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then - rm ${UNROLLEDHOSTFILE} - fi - rm ${APPLICATIONTMP} +if [ "$foreground" = 1 ]; then + ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} + status=$? +else + ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} & + pid=$! + wait $pid + status=$? + pid="" fi +smpirun_cleanup + exit $status