Skip to content

Commit c96eb59

Browse files
committed
btl/uct: clear related flags when there is no rdma transport layer
and correctly handle when there is no rdma transport layer. This fixes the use of btl/uct with the tcp memory_domain Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent c28ba95 commit c96eb59

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

opal/mca/btl/uct/btl_uct_endpoint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ int mca_btl_uct_endpoint_connect (mca_btl_uct_module_t *uct_btl, mca_btl_uct_end
309309
void *ep_addr, int tl_index)
310310
{
311311
mca_btl_uct_tl_endpoint_t *tl_endpoint = endpoint->uct_eps[context_id] + tl_index;
312-
mca_btl_uct_tl_t *tl = (tl_index == uct_btl->rdma_tl->tl_index) ? uct_btl->rdma_tl : uct_btl->am_tl;
312+
mca_btl_uct_tl_t *tl = (NULL != uct_btl->rdma_tl && tl_index == uct_btl->rdma_tl->tl_index) ? uct_btl->rdma_tl : uct_btl->am_tl;
313313
mca_btl_uct_device_context_t *tl_context = mca_btl_uct_module_get_tl_context_specific (uct_btl, tl, context_id);
314314
uint8_t *rdma_tl_data = NULL, *conn_tl_data = NULL, *am_tl_data = NULL, *tl_data;
315315
mca_btl_uct_connection_ep_t *conn_ep = NULL;

opal/mca/btl/uct/btl_uct_tl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ int mca_btl_uct_query_tls (mca_btl_uct_module_t *module, mca_btl_uct_md_t *md, u
614614
module->super.btl_get = NULL;
615615
module->super.btl_atomic_fop = NULL;
616616
module->super.btl_atomic_op = NULL;
617+
module->super.btl_flags &= ~(MCA_BTL_FLAGS_RDMA | MCA_BTL_FLAGS_ATOMIC_FOPS | MCA_BTL_FLAGS_ATOMIC_OPS);
617618
}
618619

619620
if (NULL == module->am_tl) {

0 commit comments

Comments
 (0)