diff --git a/configure b/configure index 19016136..8cb02608 100755 --- a/configure +++ b/configure @@ -487,7 +487,6 @@ def create_ninja_and_rc(l_installed): l_rc = [ 'export QP_ROOT={0}'.format(QP_ROOT), - '#export QP_NIC=ib0 # Choose the correct network inuterface', 'export QP_EZFIO={0}'.format(path_ezfio.replace(QP_ROOT,"${QP_ROOT}")), 'export QP_PYTHON={0}'.format(":".join(l_python)), "", 'export IRPF90={0}'.format(path_irpf90.replace(QP_ROOT,"${QP_ROOT}")), @@ -498,6 +497,10 @@ def create_ninja_and_rc(l_installed): 'export LIBRARY_PATH="${QP_ROOT}"/lib:"${LIBRARY_PATH}"', "", 'source ${QP_ROOT}/install/EZFIO/Bash/ezfio.sh', "", 'source ${HOME}/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true', + '', + '# Choose the correct network interface', + '# export QP_NIC=ib0', + '# export QP_NIC=eth0', "" ] diff --git a/src/ZMQ/utils.irp.f b/src/ZMQ/utils.irp.f index f2703ff8..444c33fe 100644 --- a/src/ZMQ/utils.irp.f +++ b/src/ZMQ/utils.irp.f @@ -257,15 +257,36 @@ function new_zmq_pull_socket() stop 'Unable to set ZMQ_RCVHWM on pull socket' endif - rc = f77_zmq_bind(new_zmq_pull_socket, zmq_socket_pull_tcp_address) - if (rc /= 0) then - print *, 'Unable to bind new_zmq_pull_socket (tcp)', zmq_socket_pull_tcp_address + integer :: icount + + icount = 10 + do while (icount > 0) + rc = f77_zmq_bind(new_zmq_pull_socket, zmq_socket_pull_inproc_address) + if (rc /= 0) then + icount = icount-1 + call sleep(3) + endif + enddo + + if (icount == 0) then + print *, 'Unable to bind new_zmq_pull_socket (inproc)', zmq_socket_pull_inproc_address stop endif - - rc = f77_zmq_bind(new_zmq_pull_socket, zmq_socket_pull_inproc_address) - if (rc /= 0) then - stop 'Unable to bind new_zmq_pull_socket (inproc)' + + + icount = 10 + do while (icount > 0) + rc = f77_zmq_bind(new_zmq_pull_socket, zmq_socket_pull_tcp_address) + if (rc /= 0) then + icount = icount-1 + call sleep(3) + endif + + enddo + + if (icount == 0) then + print *, 'Unable to bind new_zmq_pull_socket (tcp)', zmq_socket_pull_tcp_address + stop endif end