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 cac7e4b0632c134244b89b4dddb2cc5cac77847c (commit) via c5613c2b6dc2de0f0b6d8473a54509290c5c498e (commit) from edd7b267311ade70c555213dfc4db040132ebd4c (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/cac7e4b0632c134244b89b4dddb2cc5cac... commit cac7e4b0632c134244b89b4dddb2cc5cac77847c Author: Pavan Balaji <[email protected]> Date: Thu Jan 28 20:36:17 2016 -0600 romio: use MPL_malloc and friends instead of MPL_trmalloc. MPL_malloc internally either uses malloc or MPL_trmalloc depending on what the configure options are. There's no need to call MPL_trmalloc directly. No reviewer. diff --git a/src/mpi/romio/adio/common/malloc.c b/src/mpi/romio/adio/common/malloc.c index dd45b1e..6323942 100644 --- a/src/mpi/romio/adio/common/malloc.c +++ b/src/mpi/romio/adio/common/malloc.c @@ -45,7 +45,7 @@ void *ADIOI_Malloc_fn(size_t size, int lineno, const char *fname) new = (void *) memalign(XFS_MEMALIGN, size); #else #ifdef HAVE_MPIU_FUNCS - new = (void *) MPL_trmalloc(size, lineno, fname); + new = (void *) MPL_malloc(size); #else new = (void *) malloc(size); #endif @@ -64,7 +64,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_trcalloc(nelem, elsize, lineno, fname); + new = (void *) MPL_calloc(nelem, elsize); #else new = (void *) calloc(nelem, elsize); #endif @@ -82,7 +82,7 @@ void *ADIOI_Realloc_fn(void *ptr, size_t size, int lineno, const char *fname) void *new; #ifdef HAVE_MPIU_FUNCS - new = (void *) MPL_trrealloc(ptr, size, lineno, fname); + new = (void *) MPL_realloc(ptr, size); #else new = (void *) realloc(ptr, size); #endif @@ -104,7 +104,7 @@ void ADIOI_Free_fn(void *ptr, int lineno, const char *fname) } #ifdef HAVE_MPIU_FUNCS - MPL_trfree(ptr, lineno, fname); + MPL_free(ptr); #else free(ptr); #endif http://git.mpich.org/mpich.git/commitdiff/c5613c2b6dc2de0f0b6d8473a54509290c... commit c5613c2b6dc2de0f0b6d8473a54509290c5c498e Author: Pavan Balaji <[email protected]> Date: Thu Jan 28 20:34:47 2016 -0600 fixup comments with the current macro name. No reviewer. diff --git a/src/mpl/include/mpl_trmem.h b/src/mpl/include/mpl_trmem.h index 2b41174..b787b3b 100644 --- a/src/mpl/include/mpl_trmem.h +++ b/src/mpl/include/mpl_trmem.h @@ -103,14 +103,14 @@ char *MPL_strdup(const char *str); #define MPL_realloc(a,b) MPL_trrealloc((a),(b),__LINE__,__FILE__) -#else /* USE_MEMORY_TRACING */ +#else /* MPL_USE_MEMORY_TRACING */ /* No memory tracing; just use native functions */ #define MPL_malloc(a) malloc((size_t)(a)) #define MPL_calloc(a,b) calloc((size_t)(a),(size_t)(b)) #define MPL_free(a) free((void *)(a)) #define MPL_realloc(a,b) realloc((void *)(a),(size_t)(b)) -#endif /* USE_MEMORY_TRACING */ +#endif /* MPL_USE_MEMORY_TRACING */ /* FIXME: Consider an option of specifying __attribute__((malloc)) for ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/malloc.c | 8 ++++---- src/mpl/include/mpl_trmem.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository