From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 27 Jun 2014 08:02:16 +0000 (+0200)
Subject: Properly fix the case where the user provides an empty hostfile
X-Git-Tag: v3_12~960
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a468554825e3eb9066f0898f723c049f6c85fdf7?hp=756ad11d5e98fcf0d7288b97b739f209852790e4

Properly fix the case where the user provides an empty hostfile
---

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 9dfb521d3f..1d4945164e 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -244,6 +244,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 "[$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
@@ -350,11 +354,7 @@ fi
 for i in ${SEQ}
 do
     if [ -n "${HOSTFILE}" ]; then
-        if [ ${NUMHOSTS} = 0 ] ; then
-	   j= 0
-	else
-	   j=$(( $i % ${NUMHOSTS} + 1 ))
-	fi
+	j=$(( $i % ${NUMHOSTS} + 1 ))
     fi
     ##---- optional display of ranks to process mapping
     if [ -n "${MAPOPT}" ]; then