From 75bc3dd43cdec005b1e9966a3577d4d4d34bd774 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Wed, 19 Oct 2005 21:28:52 +0000 Subject: [PATCH] Dont mess around with the OBJ_DESTRUCT on the communicator. It's quicker (and safer) to call directly the communicator cleanup function (ompi_convertor_cleanup). This commit was SVN r7814. --- ompi/mca/pml/base/pml_base_recvreq.h | 12 ++++++------ ompi/mca/pml/base/pml_base_sendreq.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ompi/mca/pml/base/pml_base_recvreq.h b/ompi/mca/pml/base/pml_base_recvreq.h index 92bcd85761..084cf16896 100644 --- a/ompi/mca/pml/base/pml_base_recvreq.h +++ b/ompi/mca/pml/base/pml_base_recvreq.h @@ -85,12 +85,12 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_base_recv_request_t); * * @param request (IN) Receive request. */ -#define MCA_PML_BASE_RECV_REQUEST_FINI( request ) \ - do { \ - OMPI_REQUEST_FINI(&(request)->req_base.req_ompi); \ - OBJ_RELEASE( (request)->req_base.req_comm); \ - OBJ_RELEASE( (request)->req_base.req_datatype ); \ - OBJ_DESTRUCT( &((request)->req_convertor) ); \ +#define MCA_PML_BASE_RECV_REQUEST_FINI( request ) \ + do { \ + OMPI_REQUEST_FINI(&(request)->req_base.req_ompi); \ + OBJ_RELEASE( (request)->req_base.req_comm); \ + OBJ_RELEASE( (request)->req_base.req_datatype ); \ + ompi_convertor_cleanup( &((request)->req_convertor) ); \ } while (0) #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/pml/base/pml_base_sendreq.h b/ompi/mca/pml/base/pml_base_sendreq.h index 752824b207..2e71464e59 100644 --- a/ompi/mca/pml/base/pml_base_sendreq.h +++ b/ompi/mca/pml/base/pml_base_sendreq.h @@ -123,7 +123,7 @@ typedef struct mca_pml_base_send_request_t mca_pml_base_send_request_t; OMPI_REQUEST_FINI(&(request)->req_base.req_ompi); \ OBJ_RELEASE((request)->req_base.req_comm); \ OBJ_RELEASE((request)->req_base.req_datatype); \ - OBJ_DESTRUCT( &((request)->req_convertor) ); \ + ompi_convertor_cleanup( &((request)->req_convertor) ); \ } while (0)