[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-229-g5799e19

[Service Account]

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 "MPICH primary repository".

The branch, master has been updated
       via  5799e199620d5fcd3173a62cf5ac80bd75db7192 (commit)
       via  61d0e097e5f10581343bb6b0422db6f6dea7a6f5 (commit)
       via  afc30416a8056426edadd3b26108827498baa3c4 (commit)
      from  8670745250d3d258b803b1e4f1628eaa334ba04f (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 -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/5799e199620d5fcd3173a62cf5ac80bd75db7192

commit 5799e199620d5fcd3173a62cf5ac80bd75db7192
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Fri Feb 26 15:52:25 2016 -0600

    MPL: provide MPL_container_of macro
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
index 163c253..bbad8ae 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h
@@ -226,9 +226,8 @@ typedef struct MPID_nem_mxm_module_t {
 
 extern MPID_nem_mxm_module_t *mxm_obj;
 
-#define container_of(ptr, type, member) (type *)((char *)(ptr) - offsetof(type,member))
 #define list_dequeue_mxm_req(head) \
-    container_of(list_dequeue(head), MPID_nem_mxm_req_t, queue)
+    MPL_container_of(list_dequeue(head), MPID_nem_mxm_req_t, queue)
 static inline void list_grow_mxm_req(list_head_t * list_head)
 {
     MPID_nem_mxm_req_t *mxm_req = NULL;
diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c
index 1201000..73627a7 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_progress.c
@@ -17,7 +17,7 @@
 /* ------------------------------------------------------------------------ */
 static inline MPID_Request *context_to_req(void *ofi_context)
 {
-    return (MPID_Request *) container_of(ofi_context, MPID_Request, ch.netmod_area.padding);
+    return (MPID_Request *) MPL_container_of(ofi_context, MPID_Request, ch.netmod_area.padding);
 }
 
 #define ADD_SUFFIX(name) name
diff --git a/src/mpl/include/mpl_base.h b/src/mpl/include/mpl_base.h
index 0d9de0c..cb033d2 100644
--- a/src/mpl/include/mpl_base.h
+++ b/src/mpl/include/mpl_base.h
@@ -88,6 +88,9 @@
 #define MPL_UNREFERENCED_ARG(a)
 #endif
 
+/* macro for finding the enclosing structure of an element */
+#define MPL_container_of(ptr, type, member) (type *)((char *)(ptr) - offsetof(type,member))
+
 /* This macro is used to silence warnings from the Mac OS X linker when
  * an object file "has no symbols".  The unused attribute prevents a
  * warning about the unused dummy variable while the used attribute

http://git.mpich.org/mpich.git/commitdiff/61d0e097e5f10581343bb6b0422db6f6dea7a6f5

commit 61d0e097e5f10581343bb6b0422db6f6dea7a6f5
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Thu Feb 25 17:03:10 2016 -0600

    glue/romio: add MPIR_Comm_split_filesystem
    
    Add MPIR_Comm_split_filesystem to all_romio_funcs.c to ensure inclusion
    in libmpi.so when building with --disable-weak-symbols.
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/src/glue/romio/all_romio_symbols b/src/glue/romio/all_romio_symbols
index dfafd87..212142c 100755
--- a/src/glue/romio/all_romio_symbols
+++ b/src/glue/romio/all_romio_symbols
@@ -74,6 +74,7 @@ print OUTFD <<EOT;
 
 #include <stdio.h>
 #include "mpi.h"
+#include "mpiimpl.h"
 
 void MPIR_All_romio_symbols(void);
 void MPIR_All_romio_symbols(void)
@@ -196,6 +197,8 @@ print OUTFD <<EOT;
 
         MPI_File_c2f(fh);
     }
+
+    MPIR_Comm_split_filesystem(MPI_COMM_NULL, 0, NULL, NULL);
 #endif /* MPI_MODE_RDONLY */
 }
 EOT

http://git.mpich.org/mpich.git/commitdiff/afc30416a8056426edadd3b26108827498baa3c4

commit afc30416a8056426edadd3b26108827498baa3c4
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue Feb 23 11:01:50 2016 -0600

    hcoll/subconfigure.m4: error on bad --with-hcoll value
    
    Fail configure if the user provides an HCOLL installation but it cannot
    be successfully built.
    
    Signed-off-by: Pavan Balaji <balaji at anl.gov>

diff --git a/src/mpid/common/hcoll/subconfigure.m4 b/src/mpid/common/hcoll/subconfigure.m4
index 8d7c624..644902a 100644
--- a/src/mpid/common/hcoll/subconfigure.m4
+++ b/src/mpid/common/hcoll/subconfigure.m4
@@ -6,6 +6,8 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[
 	PAC_CHECK_HEADER_LIB([hcoll/api/hcoll_api.h],[hcoll],[hcoll_init],[have_hcoll=yes],[have_hcoll=no])
 	if test "$have_hcoll" = "yes" ; then
 	   PAC_APPEND_FLAG([-lhcoll],[WRAPPER_LIBS])
+	elif test ! -z "${with_hcoll}" ; then
+	   AC_MSG_ERROR(['hcoll/api/hcoll_api.h or libhcoll library not found.'])
 	fi
 	PAC_POP_FLAG(LIBS)
 	AM_CONDITIONAL([BUILD_HCOLL],[test "$have_hcoll" = "yes"])

-----------------------------------------------------------------------

Summary of changes:
 src/glue/romio/all_romio_symbols                   |    3 +++
 .../ch3/channels/nemesis/netmod/mxm/mxm_impl.h     |    3 +--
 .../ch3/channels/nemesis/netmod/ofi/ofi_progress.c |    2 +-
 src/mpid/common/hcoll/subconfigure.m4              |    2 ++
 src/mpl/include/mpl_base.h                         |    3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository