From 0bc7405e07ed6df2ad55d4f4e71f6bce3cc6f41b Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 9 Jul 2014 19:33:58 +0000 Subject: [PATCH] Subject: fix name conflict when both ugni and scif installed on system Description: This mod fixes two name conflicts between the ugni and scif btls. References:4771 Closes:4771 cmr=v1.8.2:reviewer=hjelmn This commit was SVN r32183. --- ompi/mca/btl/scif/btl_scif.h | 2 +- ompi/mca/btl/scif/btl_scif_component.c | 2 +- ompi/mca/btl/scif/btl_scif_endpoint.c | 2 +- ompi/mca/btl/scif/btl_scif_endpoint.h | 12 +++++++----- ompi/mca/btl/scif/btl_scif_send.c | 2 +- ompi/mca/btl/ugni/btl_ugni.h | 2 +- ompi/mca/btl/ugni/btl_ugni_component.c | 2 +- ompi/mca/btl/ugni/btl_ugni_endpoint.c | 4 ++-- ompi/mca/btl/ugni/btl_ugni_endpoint.h | 17 +++++++++-------- ompi/mca/btl/ugni/btl_ugni_send.c | 2 +- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/ompi/mca/btl/scif/btl_scif.h b/ompi/mca/btl/scif/btl_scif.h index c5ba1267eb..805514d27e 100644 --- a/ompi/mca/btl/scif/btl_scif.h +++ b/ompi/mca/btl/scif/btl_scif.h @@ -224,7 +224,7 @@ mca_btl_scif_alloc(struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint, uint8_t order, size_t size, uint32_t flags); -int mca_btl_progress_send_wait_list (struct mca_btl_base_endpoint_t *endpoint); +int mca_btl_scif_progress_send_wait_list (struct mca_btl_base_endpoint_t *endpoint); typedef struct mca_btl_scif_reg_t { mca_mpool_base_registration_t base; diff --git a/ompi/mca/btl/scif/btl_scif_component.c b/ompi/mca/btl/scif/btl_scif_component.c index 559f822554..3223e829c2 100644 --- a/ompi/mca/btl/scif/btl_scif_component.c +++ b/ompi/mca/btl/scif/btl_scif_component.c @@ -355,7 +355,7 @@ static int mca_btl_scif_progress_sends (mca_btl_base_endpoint_t *ep) { /* try sending any wait listed fragments */ if (OPAL_UNLIKELY(0 != opal_list_get_size (&ep->frag_wait_list))) { - return mca_btl_progress_send_wait_list (ep); + return mca_btl_scif_progress_send_wait_list (ep); } return 0; diff --git a/ompi/mca/btl/scif/btl_scif_endpoint.c b/ompi/mca/btl/scif/btl_scif_endpoint.c index a76ffbc57f..754da981a6 100644 --- a/ompi/mca/btl/scif/btl_scif_endpoint.c +++ b/ompi/mca/btl/scif/btl_scif_endpoint.c @@ -38,7 +38,7 @@ static void mca_btl_scif_ep_destruct (mca_btl_base_endpoint_t *ep) { OBJ_DESTRUCT(&ep->frag_wait_list); } -OBJ_CLASS_INSTANCE(mca_btl_base_endpoint_t, opal_list_item_t, +OBJ_CLASS_INSTANCE(mca_btl_scif_endpoint_t, opal_list_item_t, mca_btl_scif_ep_construct, mca_btl_scif_ep_destruct); static void mca_btl_scif_ep_free_buffer (mca_btl_base_endpoint_t *ep) { diff --git a/ompi/mca/btl/scif/btl_scif_endpoint.h b/ompi/mca/btl/scif/btl_scif_endpoint.h index efb091eef6..c49b59ccc9 100644 --- a/ompi/mca/btl/scif/btl_scif_endpoint.h +++ b/ompi/mca/btl/scif/btl_scif_endpoint.h @@ -61,19 +61,21 @@ typedef struct mca_btl_base_endpoint_t { #endif } mca_btl_base_endpoint_t; -OBJ_CLASS_DECLARATION(mca_btl_base_endpoint_t); +typedef mca_btl_base_endpoint_t mca_btl_scif_endpoint_t; -int mca_btl_scif_ep_connect (mca_btl_base_endpoint_t *ep); +OBJ_CLASS_DECLARATION(mca_btl_scif_endpoint_t); + +int mca_btl_scif_ep_connect (mca_btl_scif_endpoint_t *ep); int mca_btl_scif_ep_connect_start_passive (void); -static inline int mca_btl_scif_ep_init (mca_btl_base_endpoint_t *endpoint, +static inline int mca_btl_scif_ep_init (mca_btl_scif_endpoint_t *endpoint, mca_btl_scif_module_t *btl, ompi_proc_t *peer_proc) { mca_btl_scif_modex_t *modex; size_t msg_size; int rc; - OBJ_CONSTRUCT(endpoint, mca_btl_base_endpoint_t); + OBJ_CONSTRUCT(endpoint, mca_btl_scif_endpoint_t); endpoint->state = MCA_BTL_SCIF_EP_STATE_INIT; rc = ompi_modex_recv (&mca_btl_scif_component.super.btl_version, peer_proc, @@ -97,7 +99,7 @@ static inline int mca_btl_scif_ep_init (mca_btl_base_endpoint_t *endpoint, return OMPI_SUCCESS; } -static inline int mca_btl_scif_ep_release (mca_btl_base_endpoint_t *ep) +static inline int mca_btl_scif_ep_release (mca_btl_scif_endpoint_t *ep) { OBJ_DESTRUCT(ep); return OMPI_SUCCESS; diff --git a/ompi/mca/btl/scif/btl_scif_send.c b/ompi/mca/btl/scif/btl_scif_send.c index 379a41048c..4bd57af119 100644 --- a/ompi/mca/btl/scif/btl_scif_send.c +++ b/ompi/mca/btl/scif/btl_scif_send.c @@ -272,7 +272,7 @@ int mca_btl_scif_sendi (struct mca_btl_base_module_t *btl, return OMPI_SUCCESS; } -int mca_btl_progress_send_wait_list (mca_btl_base_endpoint_t *endpoint) +int mca_btl_scif_progress_send_wait_list (mca_btl_base_endpoint_t *endpoint) { mca_btl_scif_base_frag_t *frag; int rc = OMPI_SUCCESS; diff --git a/ompi/mca/btl/ugni/btl_ugni.h b/ompi/mca/btl/ugni/btl_ugni.h index bf98a35326..a39985b9f4 100644 --- a/ompi/mca/btl/ugni/btl_ugni.h +++ b/ompi/mca/btl/ugni/btl_ugni.h @@ -272,7 +272,7 @@ mca_btl_ugni_put (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint, struct mca_btl_base_descriptor_t *des); -int mca_btl_progress_send_wait_list (struct mca_btl_base_endpoint_t *endpoint); +int mca_btl_ugni_progress_send_wait_list (struct mca_btl_base_endpoint_t *endpoint); mca_btl_base_descriptor_t * mca_btl_ugni_alloc(struct mca_btl_base_module_t *btl, diff --git a/ompi/mca/btl/ugni/btl_ugni_component.c b/ompi/mca/btl/ugni/btl_ugni_component.c index 833c1c76ab..df32428adc 100644 --- a/ompi/mca/btl/ugni/btl_ugni_component.c +++ b/ompi/mca/btl/ugni/btl_ugni_component.c @@ -521,7 +521,7 @@ mca_btl_ugni_progress_wait_list (mca_btl_ugni_module_t *ugni_module) endpoint->wait_listed = false; - rc = mca_btl_progress_send_wait_list (endpoint); + rc = mca_btl_ugni_progress_send_wait_list (endpoint); if (OMPI_SUCCESS != rc && false == endpoint->wait_listed) { opal_list_append (&ugni_module->ep_wait_list, &endpoint->super); endpoint->wait_listed = true; diff --git a/ompi/mca/btl/ugni/btl_ugni_endpoint.c b/ompi/mca/btl/ugni/btl_ugni_endpoint.c index 9e16381148..c730d2e00e 100644 --- a/ompi/mca/btl/ugni/btl_ugni_endpoint.c +++ b/ompi/mca/btl/ugni/btl_ugni_endpoint.c @@ -28,7 +28,7 @@ static void mca_btl_ugni_ep_destruct (mca_btl_base_endpoint_t *ep) OBJ_DESTRUCT(&ep->lock); } -OBJ_CLASS_INSTANCE(mca_btl_base_endpoint_t, opal_list_item_t, +OBJ_CLASS_INSTANCE(mca_btl_ugni_endpoint_t, opal_list_item_t, mca_btl_ugni_ep_construct, mca_btl_ugni_ep_destruct); static inline int mca_btl_ugni_ep_smsg_get_mbox (mca_btl_base_endpoint_t *ep) { @@ -155,7 +155,7 @@ static inline int mca_btl_ugni_ep_connect_finish (mca_btl_base_endpoint_t *ep) { /* send all pending messages */ BTL_VERBOSE(("endpoint connected. posting %u sends", (unsigned int) opal_list_get_size (&ep->frag_wait_list))); - rc = mca_btl_progress_send_wait_list (ep); + rc = mca_btl_ugni_progress_send_wait_list (ep); if (OPAL_UNLIKELY(OMPI_SUCCESS != rc)) { ep->wait_listed = true; opal_list_append (&ep->btl->ep_wait_list, &ep->super); diff --git a/ompi/mca/btl/ugni/btl_ugni_endpoint.h b/ompi/mca/btl/ugni/btl_ugni_endpoint.h index b98253d0f9..6234b099d5 100644 --- a/ompi/mca/btl/ugni/btl_ugni_endpoint.h +++ b/ompi/mca/btl/ugni/btl_ugni_endpoint.h @@ -51,18 +51,19 @@ typedef struct mca_btl_base_endpoint_t { int index; } mca_btl_base_endpoint_t; -OBJ_CLASS_DECLARATION(mca_btl_base_endpoint_t); +typedef mca_btl_base_endpoint_t mca_btl_ugni_endpoint_t; +OBJ_CLASS_DECLARATION(mca_btl_ugni_endpoint_t); -int mca_btl_ugni_ep_connect_progress (mca_btl_base_endpoint_t *ep); -int mca_btl_ugni_ep_disconnect (mca_btl_base_endpoint_t *ep, bool send_disconnect); +int mca_btl_ugni_ep_connect_progress (mca_btl_ugni_endpoint_t *ep); +int mca_btl_ugni_ep_disconnect (mca_btl_ugni_endpoint_t *ep, bool send_disconnect); static inline int mca_btl_ugni_init_ep (mca_btl_ugni_module_t *ugni_module, - mca_btl_base_endpoint_t **ep, + mca_btl_ugni_endpoint_t **ep, mca_btl_ugni_module_t *btl, ompi_proc_t *peer_proc) { - mca_btl_base_endpoint_t *endpoint; + mca_btl_ugni_endpoint_t *endpoint; - endpoint = OBJ_NEW(mca_btl_base_endpoint_t); + endpoint = OBJ_NEW(mca_btl_ugni_endpoint_t); assert (endpoint != NULL); endpoint->smsg_progressing = 0; @@ -78,7 +79,7 @@ static inline int mca_btl_ugni_init_ep (mca_btl_ugni_module_t *ugni_module, return OMPI_SUCCESS; } -static inline void mca_btl_ugni_release_ep (mca_btl_base_endpoint_t *ep) { +static inline void mca_btl_ugni_release_ep (mca_btl_ugni_endpoint_t *ep) { int rc; if (ep->common) { @@ -100,7 +101,7 @@ static inline void mca_btl_ugni_release_ep (mca_btl_base_endpoint_t *ep) { OBJ_RELEASE(ep); } -static inline int mca_btl_ugni_check_endpoint_state (mca_btl_base_endpoint_t *ep) { +static inline int mca_btl_ugni_check_endpoint_state (mca_btl_ugni_endpoint_t *ep) { int rc; if (OPAL_LIKELY(MCA_BTL_UGNI_EP_STATE_CONNECTED == ep->state)) { diff --git a/ompi/mca/btl/ugni/btl_ugni_send.c b/ompi/mca/btl/ugni/btl_ugni_send.c index a59594a9d9..eda6f15c20 100644 --- a/ompi/mca/btl/ugni/btl_ugni_send.c +++ b/ompi/mca/btl/ugni/btl_ugni_send.c @@ -131,7 +131,7 @@ mca_btl_ugni_sendi (struct mca_btl_base_module_t *btl, return OMPI_ERR_OUT_OF_RESOURCE; } -int mca_btl_progress_send_wait_list (mca_btl_base_endpoint_t *endpoint) +int mca_btl_ugni_progress_send_wait_list (mca_btl_base_endpoint_t *endpoint) { mca_btl_ugni_base_frag_t *frag; int rc;