From 3b4a134a24797167f8580988a740666a59863347 Mon Sep 17 00:00:00 2001
From: Tim Woodall <twoodall@lanl.gov>
Date: Tue, 4 Oct 2005 14:33:26 +0000
Subject: [PATCH] - removed unused define - correct free to release
registration rather than retain it
This commit was SVN r7611.
---
ompi/mca/btl/gm/btl_gm.c | 13 +++++--------
ompi/mca/btl/gm/btl_gm_component.c | 2 +-
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ompi/mca/btl/gm/btl_gm.c b/ompi/mca/btl/gm/btl_gm.c
index a1593bdb48..60908a0758 100644
--- a/ompi/mca/btl/gm/btl_gm.c
+++ b/ompi/mca/btl/gm/btl_gm.c
@@ -189,8 +189,7 @@ int mca_btl_gm_free(
{
mca_btl_gm_frag_t* frag = (mca_btl_gm_frag_t*)des;
if(frag->size == 0) {
- btl->btl_mpool->mpool_release(btl->btl_mpool,
- frag->registration);
+ btl->btl_mpool->mpool_release(btl->btl_mpool, frag->registration);
MCA_BTL_GM_FRAG_RETURN_USER(btl, frag);
} else if(frag->size == mca_btl_gm_component.gm_eager_frag_size) {
MCA_BTL_GM_FRAG_RETURN_EAGER(btl, frag);
@@ -226,8 +225,7 @@ mca_btl_base_descriptor_t* mca_btl_gm_prepare_src(
int32_t free_after;
int rc;
-#if OMPI_MCA_BTL_GM_SUPPORT_REGISTERING && \
- (OMPI_MCA_BTL_GM_HAVE_RDMA_GET || OMPI_MCA_BTL_GM_HAVE_RDMA_PUT)
+#if (OMPI_MCA_BTL_GM_HAVE_RDMA_GET || OMPI_MCA_BTL_GM_HAVE_RDMA_PUT)
/*
* If the data has already been pinned and is contigous than we can
* use it in place.
@@ -376,8 +374,7 @@ mca_btl_base_descriptor_t* mca_btl_gm_prepare_dst(
size_t reserve,
size_t* size)
{
-#if OMPI_MCA_BTL_GM_SUPPORT_REGISTERING && \
- (OMPI_MCA_BTL_GM_HAVE_RDMA_GET || OMPI_MCA_BTL_GM_HAVE_RDMA_PUT)
+#if (OMPI_MCA_BTL_GM_HAVE_RDMA_GET || OMPI_MCA_BTL_GM_HAVE_RDMA_PUT)
mca_btl_gm_frag_t* frag;
mca_mpool_base_module_t* mpool = btl->btl_mpool;
int rc;
@@ -643,9 +640,9 @@ int mca_btl_gm_get(
frag->btl = gm_btl;
frag->endpoint = endpoint;
- gm_put(gm_btl->port,
- des->des_src->seg_addr.pval,
+ gm_get(gm_btl->port,
des->des_dst->seg_addr.lval,
+ des->des_src->seg_addr.pval,
des->des_src->seg_len,
GM_LOW_PRIORITY,
endpoint->endpoint_addr.node_id,
diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c
index 1196c170ce..beb4fbc936 100644
--- a/ompi/mca/btl/gm/btl_gm_component.c
+++ b/ompi/mca/btl/gm/btl_gm_component.c
@@ -151,7 +151,7 @@ int mca_btl_gm_component_open(void)
mca_btl_gm_param_register_int("min_rdma_size", 512*1024);
mca_btl_gm_module.super.btl_max_rdma_size =
mca_btl_gm_param_register_int("max_rdma_size", 128*1024);
-#if OMPI_MCA_BTL_GM_SUPPORT_REGISTERING && OMPI_MCA_BTL_GM_HAVE_RDMA_PUT
+#if OMPI_MCA_BTL_GM_HAVE_RDMA_PUT
mca_btl_gm_module.super.btl_flags =
mca_btl_gm_param_register_int("flags", MCA_BTL_FLAGS_PUT);
#else