diff --git a/ompi/mca/bml/base/bml_base_init.c b/ompi/mca/bml/base/bml_base_init.c index 35ced5b95d..6b1a4fc1db 100644 --- a/ompi/mca/bml/base/bml_base_init.c +++ b/ompi/mca/bml/base/bml_base_init.c @@ -96,6 +96,4 @@ int mca_bml_base_init( bool enable_progress_threads, &mca_bml_base_components_available, (mca_base_component_t*) best_component); } - - } diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h index 3312ac8828..b088b8de95 100644 --- a/ompi/mca/bml/bml.h +++ b/ompi/mca/bml/bml.h @@ -329,7 +329,7 @@ static inline void mca_bml_base_prepare_src(mca_bml_base_btl_t* bml_btl, reserve, size ); - if((*des) != NULL) { + if( OPAL_LIKELY((*des) != NULL) ) { (*des)->des_context = (void*) bml_btl; } } @@ -350,7 +350,7 @@ static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl, reserve, size ); - if((*des) != NULL) { + if( OPAL_LIKELY((*des) != NULL) ) { (*des)->des_context = (void*) bml_btl; } } @@ -370,7 +370,7 @@ static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl, } else { \ des = bml_btl->btl_alloc(bml_btl->btl, order, alloc_size); \ } \ - if(des != NULL) { \ + if( OPAL_LIKELY(des != NULL) ) { \ des->des_src->seg_len = seg_size; \ des->des_context = (void*) bml_btl; \ } \ @@ -385,7 +385,7 @@ static inline void mca_bml_base_prepare_dst(mca_bml_base_btl_t* bml_btl, } else { \ des = bml_btl->btl_alloc(bml_btl->btl, order, alloc_size); \ } \ - if(des != NULL) { \ + if( OPAL_LIKELY(des != NULL) ) { \ des->des_src->seg_len = seg_size; \ des->des_context = (void*) bml_btl; \ } \