From 58dd6c24931a9a2511e6c071f51577c876a6c67b Mon Sep 17 00:00:00 2001 From: Tim Woodall Date: Thu, 17 Nov 2005 05:32:30 +0000 Subject: [PATCH] - merge from release branch This commit was SVN r8174. --- ompi/mca/btl/mvapi/btl_mvapi_endpoint.c | 13 +++---------- ompi/mca/btl/openib/btl_openib_endpoint.c | 9 ++------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c b/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c index 0cc8d460e3..8c379c63a4 100644 --- a/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c +++ b/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c @@ -503,8 +503,7 @@ static void mca_btl_mvapi_endpoint_recv( uint32_t i; size_t cnt = 1; mca_btl_mvapi_rem_info_t rem_info; - - ib_endpoint = (mca_btl_mvapi_endpoint_t*) endpoint; + /* start by unpacking data first so we know who is knocking at our door */ @@ -569,11 +568,9 @@ static void mca_btl_mvapi_endpoint_recv( opal_list_get_end(&mca_btl_mvapi_component.ib_procs); ib_proc = (mca_btl_mvapi_proc_t*)opal_list_get_next(ib_proc)) { - if(ib_proc->proc_guid.vpid == endpoint->vpid) { + if(orte_ns.compare(ORTE_NS_CMP_ALL, &ib_proc->proc_guid, endpoint) == 0) { bool found = false; - /* ib_endpoint = ib_proc->proc_endpoints[0] */ - /* Try to get the endpoint instance of this proc */ /* first match the endpoint based on lid meaning we've seen */ /* this endpoint before.. */ @@ -672,10 +669,6 @@ static void mca_btl_mvapi_endpoint_recv( break; } } - - /* Okay, now that we are done receiving, - * re-post the buffer */ - mca_btl_mvapi_post_recv(); } void mca_btl_mvapi_post_recv() @@ -683,7 +676,7 @@ void mca_btl_mvapi_post_recv() orte_rml.recv_buffer_nb( ORTE_RML_NAME_ANY, ORTE_RML_TAG_DYNAMIC-1, - 0, + ORTE_RML_PERSISTENT, mca_btl_mvapi_endpoint_recv, NULL); } diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c index 3f2dd739b1..3799c29482 100644 --- a/ompi/mca/btl/openib/btl_openib_endpoint.c +++ b/ompi/mca/btl/openib/btl_openib_endpoint.c @@ -501,7 +501,6 @@ static void mca_btl_openib_endpoint_recv( size_t cnt = 1; mca_btl_openib_rem_info_t rem_info; - ib_endpoint = (mca_btl_openib_endpoint_t*) endpoint; /* start by unpacking data first so we know who is knocking at our door */ @@ -576,7 +575,7 @@ static void mca_btl_openib_endpoint_recv( opal_list_get_end(&mca_btl_openib_component.ib_procs); ib_proc = (mca_btl_openib_proc_t*)opal_list_get_next(ib_proc)) { - if(ib_proc->proc_guid.vpid == endpoint->vpid) { + if(orte_ns.compare(ORTE_NS_CMP_ALL, &ib_proc->proc_guid, endpoint) == 0) { bool found = false; /* Try to get the endpoint instance of this proc */ @@ -675,10 +674,6 @@ static void mca_btl_openib_endpoint_recv( break; } } - - /* Okay, now that we are done receiving, - * re-post the buffer */ - mca_btl_openib_post_recv(); } /* @@ -690,7 +685,7 @@ void mca_btl_openib_post_recv() orte_rml.recv_buffer_nb( ORTE_RML_NAME_ANY, ORTE_RML_TAG_DYNAMIC-1, - 0, + ORTE_RML_PERSISTENT, mca_btl_openib_endpoint_recv, NULL); }