From a809881f78e58b03a5d029f1e40927d9c0a6b7a3 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Tue, 12 Jun 2012 15:44:47 +0000 Subject: [PATCH] ob1: reset the converter after a failed sendi before trying send This commit was SVN r26597. --- ompi/mca/pml/ob1/pml_ob1_sendreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c index 3be8d60375..38b2771990 100644 --- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c @@ -70,8 +70,8 @@ void mca_pml_ob1_send_request_process_pending(mca_bml_base_btl_t *bml_btl) add_request_to_send_pending(sendreq, MCA_PML_OB1_SEND_PENDING_START, true); } else { - MCA_PML_OB1_SEND_REQUEST_RESET(sendreq); - rc = mca_pml_ob1_send_request_start_btl(sendreq, send_dst); + MCA_PML_OB1_SEND_REQUEST_RESET(sendreq); + rc = mca_pml_ob1_send_request_start_btl(sendreq, send_dst); if (OMPI_ERR_OUT_OF_RESOURCE == rc) { /* No more resources on this btl so prepend to the pending * list to minimize reordering and give up for now. */ @@ -481,6 +481,8 @@ int mca_pml_ob1_send_request_start_copy( mca_pml_ob1_send_request_t* sendreq, MCA_PML_OB1_PROGRESS_PENDING(bml_btl); return OMPI_SUCCESS; } + + MCA_PML_OB1_SEND_REQUEST_RESET(sendreq); } else { /* allocate descriptor */ mca_bml_base_alloc( bml_btl, &des,