Oy! Thanks for removing that debug opal_output... :-)
On Oct 17, 2014, at 7:39 AM, <git...@crest.iu.edu> <git...@crest.iu.edu> wrote: > This is an automated email from the git hooks/post-receive script. It was > generated because a ref change was pushed to the repository containing > the project "open-mpi/ompi". > > The branch, master has been updated > via e3be1fb9a5f8e3c5a5234e86a88f616a40d2cab8 (commit) > from f9d620e3a772cdeddd40b4f0789cf59c75b44868 (commit) > > Those revisions listed above that are new to this repository have > not appeared on any other notification email; so we list those > revisions in full, below. > > - Log ----------------------------------------------------------------- > https://github.com/open-mpi/ompi/commit/e3be1fb9a5f8e3c5a5234e86a88f616a40d2cab8 > > commit e3be1fb9a5f8e3c5a5234e86a88f616a40d2cab8 > Author: Aurélien Bouteiller <boute...@icl.utk.edu> > Date: Fri Oct 17 10:38:35 2014 -0400 > > Quick pass over the sm-knem code, indent fixes > > diff --git a/opal/mca/btl/sm/btl_sm.c b/opal/mca/btl/sm/btl_sm.c > index 1f61028..d0cc950 100644 > --- a/opal/mca/btl/sm/btl_sm.c > +++ b/opal/mca/btl/sm/btl_sm.c > @@ -395,15 +395,15 @@ sm_btl_first_time_init(mca_btl_sm_t *sm_btl, > return i; > > i = ompi_free_list_init_new(&mca_btl_sm_component.sm_frags_user, > - sizeof(mca_btl_sm_user_t), > - opal_cache_line_size, OBJ_CLASS(mca_btl_sm_user_t), > - sizeof(mca_btl_sm_hdr_t), opal_cache_line_size, > - mca_btl_sm_component.sm_free_list_num, > - mca_btl_sm_component.sm_free_list_max, > - mca_btl_sm_component.sm_free_list_inc, > - mca_btl_sm_component.sm_mpool); > + sizeof(mca_btl_sm_user_t), > + opal_cache_line_size, OBJ_CLASS(mca_btl_sm_user_t), > + sizeof(mca_btl_sm_hdr_t), opal_cache_line_size, > + mca_btl_sm_component.sm_free_list_num, > + mca_btl_sm_component.sm_free_list_max, > + mca_btl_sm_component.sm_free_list_inc, > + mca_btl_sm_component.sm_mpool); > if ( OPAL_SUCCESS != i ) > - return i; > + return i; > > mca_btl_sm_component.num_outstanding_frags = 0; > > @@ -1000,14 +1000,14 @@ int mca_btl_sm_send( struct mca_btl_base_module_t* > btl, > > #if OPAL_BTL_SM_HAVE_KNEM || OPAL_BTL_SM_HAVE_CMA > struct mca_btl_base_descriptor_t* mca_btl_sm_prepare_dst( > - struct mca_btl_base_module_t* btl, > - struct mca_btl_base_endpoint_t* endpoint, > - struct mca_mpool_base_registration_t* registration, > - struct opal_convertor_t* convertor, > - uint8_t order, > - size_t reserve, > - size_t* size, > - uint32_t flags) > + struct mca_btl_base_module_t* btl, > + struct mca_btl_base_endpoint_t* endpoint, > + struct mca_mpool_base_registration_t* registration, > + struct opal_convertor_t* convertor, > + uint8_t order, > + size_t reserve, > + size_t* size, > + uint32_t flags) > { > void *ptr; > mca_btl_sm_frag_t* frag; > diff --git a/opal/mca/btl/sm/btl_sm.h b/opal/mca/btl/sm/btl_sm.h > index 358bed5..fd7271f 100644 > --- a/opal/mca/btl/sm/btl_sm.h > +++ b/opal/mca/btl/sm/btl_sm.h > @@ -505,19 +505,19 @@ extern int mca_btl_sm_send( > * Synchronous knem/cma get > */ > extern int mca_btl_sm_get_sync( > - struct mca_btl_base_module_t* btl, > - struct mca_btl_base_endpoint_t* endpoint, > - struct mca_btl_base_descriptor_t* des ); > + struct mca_btl_base_module_t* btl, > + struct mca_btl_base_endpoint_t* endpoint, > + struct mca_btl_base_descriptor_t* des ); > > extern struct mca_btl_base_descriptor_t* mca_btl_sm_prepare_dst( > - struct mca_btl_base_module_t* btl, > - struct mca_btl_base_endpoint_t* endpoint, > - struct mca_mpool_base_registration_t* registration, > - struct opal_convertor_t* convertor, > - uint8_t order, > - size_t reserve, > - size_t* size, > - uint32_t flags); > + struct mca_btl_base_module_t* btl, > + struct mca_btl_base_endpoint_t* endpoint, > + struct mca_mpool_base_registration_t* registration, > + struct opal_convertor_t* convertor, > + uint8_t order, > + size_t reserve, > + size_t* size, > + uint32_t flags); > #endif /* OPAL_BTL_SM_HAVE_KNEM || OPAL_BTL_SM_HAVE_CMA */ > > #if OPAL_BTL_SM_HAVE_KNEM > diff --git a/opal/mca/btl/sm/btl_sm_component.c > b/opal/mca/btl/sm/btl_sm_component.c > index 37bc9f7..4f06742 100644 > --- a/opal/mca/btl/sm/btl_sm_component.c > +++ b/opal/mca/btl/sm/btl_sm_component.c > @@ -168,7 +168,7 @@ static int sm_register(void) > MCA_BASE_VAR_SCOPE_CONSTANT, > &have_knem); > > - if (OPAL_BTL_SM_HAVE_KNEM) { > + if (have_knem) { > mca_btl_sm_component.use_knem = -1; > } else { > mca_btl_sm_component.use_knem = 0; > @@ -1142,7 +1142,6 @@ int mca_btl_sm_component_progress(void) > if( 0 == mca_btl_sm_component.use_knem ) { > return nevents; > } > - opal_output(0, "===checking for knem progress"); > while (mca_btl_sm.knem_status_num_used > 0 && > KNEM_STATUS_PENDING != > mca_btl_sm.knem_status_array[mca_btl_sm.knem_status_first_used]) { > > > ----------------------------------------------------------------------- > > Summary of changes: > opal/mca/btl/sm/btl_sm.c | 32 ++++++++++++++++---------------- > opal/mca/btl/sm/btl_sm.h | 22 +++++++++++----------- > opal/mca/btl/sm/btl_sm_component.c | 3 +-- > 3 files changed, 28 insertions(+), 29 deletions(-) > > > hooks/post-receive > -- > open-mpi/ompi > _______________________________________________ > ompi-commits mailing list > ompi-comm...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/ompi-commits -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
