From 2503b5f10faa3810c5f36900cf248df0e7177c84 Mon Sep 17 00:00:00 2001 From: Joseph Schuchart Date: Tue, 21 Apr 2020 22:49:48 +0200 Subject: [PATCH 1/3] RDMA osc: remove extra retain on pending_op Signed-off-by: Joseph Schuchart (cherry picked from commit de67ada44251b2792f3fef19d890dc7aad39dd73) --- ompi/mca/osc/rdma/osc_rdma_lock.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ompi/mca/osc/rdma/osc_rdma_lock.h b/ompi/mca/osc/rdma/osc_rdma_lock.h index 7af4d703f6..9e7ec485f0 100644 --- a/ompi/mca/osc/rdma/osc_rdma_lock.h +++ b/ompi/mca/osc/rdma/osc_rdma_lock.h @@ -45,9 +45,7 @@ static inline int ompi_osc_rdma_btl_fop (ompi_osc_rdma_module_t *module, struct pending_op = OBJ_NEW(ompi_osc_rdma_pending_op_t); assert (NULL != pending_op); - if (wait_for_completion) { - OBJ_RETAIN(pending_op); - } else { + if (!wait_for_completion) { /* NTH: need to keep track of pending ops to avoid a potential teardown problem */ pending_op->module = module; (void) opal_atomic_fetch_add_32 (&module->pending_ops, 1); From a0cdd9f597d4fe27c8fded298338aa593083db7b Mon Sep 17 00:00:00 2001 From: Joseph Schuchart Date: Tue, 21 Apr 2020 21:53:10 +0200 Subject: [PATCH 2/3] OSC base: do not retain datatype by default Signed-off-by: Joseph Schuchart (cherry picked from commit 154cf571b6a6996ff6ba9e0860f5d6a6fcf2d425) --- ompi/mca/osc/base/osc_base_obj_convert.h | 1 - 1 file changed, 1 deletion(-) diff --git a/ompi/mca/osc/base/osc_base_obj_convert.h b/ompi/mca/osc/base/osc_base_obj_convert.h index c470959450..20a993bea1 100644 --- a/ompi/mca/osc/base/osc_base_obj_convert.h +++ b/ompi/mca/osc/base/osc_base_obj_convert.h @@ -54,7 +54,6 @@ ompi_osc_base_datatype_create(ompi_proc_t *remote_proc, void **payload) struct ompi_datatype_t *datatype = ompi_datatype_create_from_packed_description(payload, remote_proc); if (NULL == datatype) return NULL; - OMPI_DATATYPE_RETAIN(datatype); return datatype; } From 2785cbbc04ea95fbb6d5fc8d208c983092732d22 Mon Sep 17 00:00:00 2001 From: Joseph Schuchart Date: Tue, 21 Apr 2020 21:53:36 +0200 Subject: [PATCH 3/3] OSC base: fix typos in documentation Signed-off-by: Joseph Schuchart (cherry picked from commit 07d1011afeb59d6ccaf401b30f6af7403da83f1f) --- ompi/mca/osc/base/osc_base_obj_convert.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/mca/osc/base/osc_base_obj_convert.h b/ompi/mca/osc/base/osc_base_obj_convert.h index 20a993bea1..86b2bc6345 100644 --- a/ompi/mca/osc/base/osc_base_obj_convert.h +++ b/ompi/mca/osc/base/osc_base_obj_convert.h @@ -59,9 +59,9 @@ ompi_osc_base_datatype_create(ompi_proc_t *remote_proc, void **payload) /** - * Create datatype based on Fortran Index + * Create operation based on Fortran Index * - * Create a useable MPI datatype based on it's Fortran index, which is + * Create a useable MPI operation based on it's Fortran index, which is * globally the same for predefined operations. The op handle is * owned by the calling process and must be OBJ_RELEASEd when no * longer in use.