Nathan - does this need to come to 1.8.4? Or do you want to go with Paul’s suggested fix?
> On Dec 12, 2014, at 8:09 AM, 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 38d66272c51fd531181d9dc282a7260f40270f64 (commit) > from f4aecdbfd22a74feadab5566d2d595b65be4a8cb (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/38d66272c51fd531181d9dc282a7260f40270f64 > > commit 38d66272c51fd531181d9dc282a7260f40270f64 > Author: Nathan Hjelm <hje...@lanl.gov> > Date: Fri Dec 12 09:09:01 2014 -0700 > > btl/vader: fix compile on SGI UV > > diff --git a/opal/mca/btl/vader/btl_vader_component.c > b/opal/mca/btl/vader/btl_vader_component.c > index 7061612..aabf03d 100644 > --- a/opal/mca/btl/vader/btl_vader_component.c > +++ b/opal/mca/btl/vader/btl_vader_component.c > @@ -354,9 +354,8 @@ static void mca_btl_vader_check_single_copy (void) > #if OPAL_BTL_VADER_HAVE_XPMEM > if (MCA_BTL_VADER_XPMEM == mca_btl_vader_component.single_copy_mechanism) > { > /* try to create an xpmem segment for the entire address space */ > - mca_btl_vader_component.my_seg_id = xpmem_make (0, > VADER_MAX_ADDRESS, XPMEM_PERMIT_MODE, (void *)0666); > - > - if (-1 == mca_btl_vader_component.my_seg_id) { > + rc = mca_btl_vader_xpmem_init (); > + if (OPAL_SUCCESS != rc) { > if (MCA_BTL_VADER_XPMEM == initial_mechanism) { > opal_show_help("help-btl-vader.txt", "xpmem-make-failed", > true, opal_process_info.nodename, errno, > @@ -364,11 +363,7 @@ static void mca_btl_vader_check_single_copy (void) > } > > mca_btl_vader_select_next_single_copy_mechanism (); > - } else { > - mca_btl_vader.super.btl_get = mca_btl_vader_get_xpmem; > - mca_btl_vader.super.btl_put = mca_btl_vader_get_xpmem; > } > - > } > #endif > > diff --git a/opal/mca/btl/vader/btl_vader_xpmem.c > b/opal/mca/btl/vader/btl_vader_xpmem.c > index 7e362ea..4bb9a3b 100644 > --- a/opal/mca/btl/vader/btl_vader_xpmem.c > +++ b/opal/mca/btl/vader/btl_vader_xpmem.c > @@ -19,6 +19,19 @@ > > #if OPAL_BTL_VADER_HAVE_XPMEM > > +int mca_btl_vader_xpmem_init (void) > +{ > + mca_btl_vader_component.my_seg_id = xpmem_make (0, VADER_MAX_ADDRESS, > XPMEM_PERMIT_MODE, (void *)0666); > + if (-1 == mca_btl_vader_component.my_seg_id) { > + return OPAL_ERR_NOT_AVAILABLE; > + } > + > + mca_btl_vader.super.btl_get = mca_btl_vader_get_xpmem; > + mca_btl_vader.super.btl_put = mca_btl_vader_get_xpmem; > + > + return OPAL_SUCCESS; > +} > + > /* look up the remote pointer in the peer rcache and attach if > * necessary */ > mca_mpool_base_registration_t *vader_get_registation (struct > mca_btl_base_endpoint_t *ep, void *rem_ptr, > diff --git a/opal/mca/btl/vader/btl_vader_xpmem.h > b/opal/mca/btl/vader/btl_vader_xpmem.h > index 1be188a..e040e26 100644 > --- a/opal/mca/btl/vader/btl_vader_xpmem.h > +++ b/opal/mca/btl/vader/btl_vader_xpmem.h > @@ -22,6 +22,7 @@ > #include <sn/xpmem.h> > > typedef int64_t xpmem_segid_t; > + typedef int64_t xpmem_apid_t; > #endif > > /* look up the remote pointer in the peer rcache and attach if > @@ -30,6 +31,8 @@ > /* largest address we can attach to using xpmem */ > #define VADER_MAX_ADDRESS ((uintptr_t)0x7ffffffff000ul) > > +int mca_btl_vader_xpmem_init (void); > + > mca_mpool_base_registration_t *vader_get_registation (struct > mca_btl_base_endpoint_t *endpoint, void *rem_ptr, > size_t size, int flags, > void **local_ptr); > > > > ----------------------------------------------------------------------- > > Summary of changes: > opal/mca/btl/vader/btl_vader_component.c | 9 ++------- > opal/mca/btl/vader/btl_vader_xpmem.c | 13 +++++++++++++ > opal/mca/btl/vader/btl_vader_xpmem.h | 3 +++ > 3 files changed, 18 insertions(+), 7 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
