[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-416-gbfefee8

[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  bfefee88130f464b8037b9250a6394d1f7a14dc6 (commit)
      from  fa897516e38b52e3f91abe2da7197630d7d2c639 (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/bfefee88130f464b8037b9250a6394d1f7a14dc6

commit bfefee88130f464b8037b9250a6394d1f7a14dc6
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Thu Aug 4 12:38:01 2016 -0500

    ROMIO: Remove outdated configure check
    
    Now that MPL is embedded in ROMIO, there is no need to check for MPICH
    memory allocation routines. Remove the configure check and use the MPL
    versions directly.
    
    Signed-off-by: Rob Latham <robl at mcs.anl.gov>

diff --git a/confdb/aclocal_romio.m4 b/confdb/aclocal_romio.m4
index 64091ba..94f4e2e 100644
--- a/confdb/aclocal_romio.m4
+++ b/confdb/aclocal_romio.m4
@@ -786,28 +786,6 @@ EOF
   fi
   rm -f conftest$EXEEXT mpitest.c
 ])dnl
-define(PAC_TEST_MPIU_FUNCS,[
-  AC_MSG_CHECKING(support for MPICH memory macros)
-  rm -f mpitest.c
-  cat > mpitest.c <<EOF
-#include "mpi.h"
-#include "stdio.h"
-  main(Int argc, char **argv)
-  {
-      MPL_free(NULL);
-  }
-EOF
-  rm -f conftest$EXEEXT
-  $CC $USER_CFLAGS -I$MPI_INCLUDE_DIR -o conftest$EXEEXT mpitest.c $MPI_LIB > /dev/null 2>&1
-  if test -x conftest$EXEEXT ; then
-     AC_MSG_RESULT(yes)
-     AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined])
-  else
-     AC_MSG_RESULT(no)
-  fi
-  rm -f conftest$EXEEXT mpitest.c
-])dnl
-dnl
 define(PAC_TEST_MPI_GREQUEST,[
   AC_MSG_CHECKING(support for generalized requests)
   rm -f mpitest.c
diff --git a/src/mpi/romio/adio/common/malloc.c b/src/mpi/romio/adio/common/malloc.c
index f0838e1..b10d75f 100644
--- a/src/mpi/romio/adio/common/malloc.c
+++ b/src/mpi/romio/adio/common/malloc.c
@@ -37,12 +37,6 @@ void *ADIOI_Calloc_fn(size_t nelem, size_t elsize, int lineno, const char *fname
 void *ADIOI_Realloc_fn(void *ptr, size_t size, int lineno, const char *fname);
 void ADIOI_Free_fn(void *ptr, int lineno, const char *fname);
 
-/* we used to call MPIU_Malloc, MPIU_Calloc, etc.  these macros either call
- * malloc/calloc directly or they add instrumentation/tracing.  When we re-did
- * the build system in 2011 we hacked ROMIO to call MPIU_trmalloc directly --
- * once again ROMIO's sort-of standalone status bites us.  We dont' test for
- * MPIU_FUNCS: these are set in configure with an AC_DEFINE when we figure out
- * we are built as part of MPICH */
 void *ADIOI_Malloc_fn(size_t size, int lineno, const char *fname)
 {
     void *new;
@@ -50,11 +44,7 @@ void *ADIOI_Malloc_fn(size_t size, int lineno, const char *fname)
 #ifdef ROMIO_XFS
     new = (void *) memalign(XFS_MEMALIGN, size);
 #else
-#ifdef HAVE_MPIU_FUNCS
     new = (void *) MPL_malloc(size);
-#else
-    new = (void *) malloc(size);
-#endif
 #endif
     if (!new && size) {
 	FPRINTF(stderr, "Out of memory in file %s, line %d\n", fname, lineno);
@@ -70,11 +60,7 @@ void *ADIOI_Calloc_fn(size_t nelem, size_t elsize, int lineno, const char *fname
 {
     void *new;
 
-#ifdef HAVE_MPIU_FUNCS
     new = (void *) MPL_calloc(nelem, elsize);
-#else
-    new = (void *) calloc(nelem, elsize);
-#endif
     if (!new && nelem) {
 	FPRINTF(stderr, "Out of memory in file %s, line %d\n", fname, lineno);
 	MPI_Abort(MPI_COMM_WORLD, 1);
@@ -88,11 +74,7 @@ void *ADIOI_Realloc_fn(void *ptr, size_t size, int lineno, const char *fname)
 {
     void *new;
 
-#ifdef HAVE_MPIU_FUNCS
     new = (void *) MPL_realloc(ptr, size);
-#else
-    new = (void *) realloc(ptr, size);
-#endif
     if (!new && size) {
 	FPRINTF(stderr, "realloc failed in file %s, line %d\n", fname, lineno);
 	MPI_Abort(MPI_COMM_WORLD, 1);
@@ -110,11 +92,7 @@ void ADIOI_Free_fn(void *ptr, int lineno, const char *fname)
 	MPI_Abort(MPI_COMM_WORLD, 1);
     }
 
-#ifdef HAVE_MPIU_FUNCS
     MPL_free(ptr);
-#else
-    free(ptr);
-#endif
 }
 
 
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index 67732c4..eaec4f2 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -1516,7 +1516,6 @@ elif test $FROM_MPICH = yes ; then
    AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if status_set_bytes available])
    DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST 1"
    DEFINE_HAVE_MPI_GREQUEST_EXTENSIONS="#define HAVE_MPI_GREQUEST_EXTENSIONS 1"
-   AC_DEFINE(HAVE_MPIU_FUNCS,1,[Define if MPICH memory tracing macros defined])
    AC_DEFINE(HAVE_MPIX_H, 1, [])
    AC_DEFINE(HAVE_MPIIO_CONST, const, Set if MPI-IO prototypes use const qualifier)
    AC_DEFINE(HAVE_MPI_TYPE_SIZE_X, 1, [Define if MPI library provides MPI_TYPE_SIZE_X])
@@ -1531,7 +1530,6 @@ fi
 if test $WITHIN_KNOWN_MPI_IMPL = no ; then
    PAC_TEST_MPIR_STATUS_SET_BYTES
    PAC_TEST_MPI_GREQUEST
-   PAC_TEST_MPIU_FUNCS
    AC_DEFINE(PRINT_ERR_MSG,1,[Define for printing error messages])
    AC_CHECK_TYPE([MPI_Count],[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ], [[#include <mpi.h>]])
    PAC_TEST_NEEDS_CONST

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

Summary of changes:
 confdb/aclocal_romio.m4            |   22 ----------------------
 src/mpi/romio/adio/common/malloc.c |   22 ----------------------
 src/mpi/romio/configure.ac         |    2 --
 3 files changed, 0 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
MPICH primary repository