X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27b0c1ee1d85c53f1d11bb2b8e539cd76e4cf437..a73d9376e051e0019d2bf02c0d11e4ad340dcaf6:/src/smpi/smpirun.in
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index b7b2203d2b..858bc05cdd 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.
@@ -270,7 +270,9 @@ 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 +323,7 @@ if [ -z "${PLATFORM}" ]; then
cat > ${PLATFORMTMP} <
-
+
PLATFORMHEAD
@@ -363,7 +365,7 @@ APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)"
cat > ${APPLICATIONTMP} <
-
+
APPLICATIONHEAD
@@ -500,6 +502,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