X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82230d737404aa70c3c2b5824d97109f1f129d58..8c416e92254512408c1d0ce729e8d3cf82ec9938:/src/smpi/smpirun.in
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 3016954230..4f93d34dea 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!/usr/bin/env sh
-# Copyright (c) 2007-2016, The SimGrid Team. All rights reserved.
+# Copyright (c) 2007-2018. 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.
@@ -23,7 +23,7 @@ NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}"
NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
SPEED="${DEFAULT_SPEED}"
-PRIVATIZE="--cfg=smpi/privatization:@HAVE_PRIVATIZATION@"
+PRIVATIZE="--cfg=smpi/privatization:${SMPI_PRIVATIZATION:-@HAVE_PRIVATIZATION@}"
SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI"
@@ -158,7 +158,7 @@ while true; do
shift 2
;;
"-no-privatize")
- PRIVATIZE=""
+ PRIVATIZE="--cfg=smpi/privatization:no"
shift 1
;;
"-map")
@@ -255,7 +255,7 @@ while [ $# -gt 0 ]; do
;;
*)
PROC_ARGS="${PROC_ARGS:+$PROC_ARGS }$1"
- shift
+ shift
;;
esac
done
@@ -270,12 +270,12 @@ if [ -z "${HOSTFILE}" ] ; then
HOSTFILETMP=1
HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)"
perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE}
- perl -ne 'if (/.*" >> ${APPLICATIONTMP}
fi
- else
+ else
echo ${XML_ARGS} >> ${APPLICATIONTMP}
fi
echo " " >> ${APPLICATIONTMP}
@@ -480,7 +480,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
@@ -495,7 +495,7 @@ fi
# * The FD 3 is used to temporarily store FD 1. This is because the shell connects FD 1 to /dev/null when the command
# is launched in the background: this can be overriden in bash but not in standard bourne shell.
exec 3<&0
-${WRAPPER} "@SMPIMAIN@" ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} <&3 3>&- &
+${WRAPPER} "@SMPIMAIN@" ${EXEC} ${PRIVATIZE} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} <&3 3>&- &
pid=$!
exec 3>&-
wait $pid