From 67f4b69848327d0f2845048f0623f9d45c3bba21 Mon Sep 17 00:00:00 2001 From: Rich Graham Date: Sat, 27 Oct 2007 00:17:53 +0000 Subject: [PATCH] propogate fix for out of buffered send memory space to dr and ob1 - thanks George. This commit was SVN r16593. --- ompi/mca/pml/base/pml_base_bsend.c | 6 ++++++ ompi/mca/pml/cm/pml_cm_sendreq.h | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ompi/mca/pml/base/pml_base_bsend.c b/ompi/mca/pml/base/pml_base_bsend.c index 1684e16838..13365a4e12 100644 --- a/ompi/mca/pml/base/pml_base_bsend.c +++ b/ompi/mca/pml/base/pml_base_bsend.c @@ -292,6 +292,9 @@ int mca_pml_base_bsend_request_alloc(ompi_request_t* request) /* release resources when request is freed */ sendreq->req_base.req_pml_complete = true; OPAL_THREAD_UNLOCK(&mca_pml_bsend_mutex); + /* progress communications, with the hope that more resources + * will be freed */ + opal_progress(); return OMPI_ERR_BUFFER; } @@ -322,6 +325,9 @@ void* mca_pml_base_bsend_request_alloc_buf( size_t length ) if(NULL == buf) { /* release resources when request is freed */ OPAL_THREAD_UNLOCK(&mca_pml_bsend_mutex); + /* progress communications, with the hope that more resources + * will be freed */ + opal_progress(); return NULL; } diff --git a/ompi/mca/pml/cm/pml_cm_sendreq.h b/ompi/mca/pml/cm/pml_cm_sendreq.h index 53ae295e82..079bb18ff1 100644 --- a/ompi/mca/pml/cm/pml_cm_sendreq.h +++ b/ompi/mca/pml/cm/pml_cm_sendreq.h @@ -225,8 +225,6 @@ do { \ sendreq->req_buff = \ mca_pml_base_bsend_request_alloc_buf(sendreq->req_count); \ if (NULL == sendreq->req_buff) { \ - /* progress to complete outstanding sends and free resources */ \ - opal_progress(); \ ret = MPI_ERR_BUFFER; \ } else { \ iov.iov_base = (IOVBASE_TYPE*)sendreq->req_buff; \