From 6a331275d8b147f780100d27db662da394aecf9f Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Mon, 11 Nov 2013 21:50:54 +0000 Subject: [PATCH] Set transfers as active before starting them. cmr=v1.7.4:ticket=trac:3898 This commit was SVN r29654. The following Trac tickets were found above: Ticket 3898 --> https://svn.open-mpi.org/trac/ompi/ticket/3898 --- ompi/mca/dpm/orte/dpm_orte.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mca/dpm/orte/dpm_orte.c b/ompi/mca/dpm/orte/dpm_orte.c index 92aef17f35..a37162081d 100644 --- a/ompi/mca/dpm/orte/dpm_orte.c +++ b/ompi/mca/dpm/orte/dpm_orte.c @@ -227,11 +227,11 @@ static int connect_accept(ompi_communicator_t *comm, int root, ORTE_RML_TAG_COLL_ID_REQ, orte_rml_send_callback, NULL); /* wait for the id */ + xfer.active = true; orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_COLL_ID, ORTE_RML_NON_PERSISTENT, orte_rml_recv_callback, &xfer); /* wait for response */ - xfer.active = true; OMPI_WAIT_FOR_COMPLETION(xfer.active); i=1; if (OPAL_SUCCESS != (rc = opal_dss.unpack(&xfer.data, &id, &i, ORTE_GRPCOMM_COLL_ID_T))) { @@ -252,11 +252,11 @@ static int connect_accept(ompi_communicator_t *comm, int root, rc = orte_rml.send_buffer_nb(&port, nbuf, tag, orte_rml_send_callback, NULL); } else { /* wait to recv the collective id */ + xfer.active = true; orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, tag, ORTE_RML_NON_PERSISTENT, orte_rml_recv_callback, &xfer); /* wait for response */ - xfer.active = true; OMPI_WAIT_FOR_COMPLETION(xfer.active); i=1; if (OPAL_SUCCESS != (rc = opal_dss.unpack(&xfer.data, &id, &i, ORTE_GRPCOMM_COLL_ID_T))) {