Skip to content

Commit e40e99b

Browse files
committed
ob1: better handling of case when no btls found
that are usable. Related to #11412 Signed-off-by: Howard Pritchard <howardp@lanl.gov>
1 parent d199429 commit e40e99b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

ompi/mca/pml/ob1/pml_ob1.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,10 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs)
400400
return rc;
401401
}
402402

403+
if (NULL == mca_bml.bml_add_procs) {
404+
return OMPI_ERR_UNREACH;
405+
}
406+
403407
rc = mca_bml.bml_add_procs (nprocs, procs, &reachable);
404408
OBJ_DESTRUCT(&reachable);
405409
if (OMPI_SUCCESS != rc) {

ompi/mca/pml/ob1/pml_ob1_component.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,10 @@ int mca_pml_ob1_component_fini(void)
326326
int rc;
327327

328328
/* Shutdown BML */
329-
if(OMPI_SUCCESS != (rc = mca_bml.bml_finalize()))
330-
return rc;
329+
if (NULL != mca_bml.bml_finalize) {
330+
if(OMPI_SUCCESS != (rc = mca_bml.bml_finalize()))
331+
return rc;
332+
}
331333

332334
if(!mca_pml_ob1.enabled) {
333335
if( NULL != mca_pml_ob1.allocator ) {

0 commit comments

Comments
 (0)