X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2a6b02aada9d1b4e802748da39b2f2a2cab6d45..a957c8903c9dd13041a0902b130f0e6543388ca2:/src/smpi/smpirun.in
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 966c456538..e8f17431ec 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-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
@@ -500,6 +500,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