diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-01-12 01:49:41 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-01-12 01:49:41 (GMT) |
| commit | ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8 (patch) | |
| tree | ecfd893a79f9d9b6981abbf6c295bfc8f750ce91 /src/H5MMprivate.h | |
| parent | 994401b905680598db47e154e5123b8838f1f1c8 (diff) | |
| download | hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.zip hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.tar.gz hdf5-ac8263fcc7cf5e8aafccbebadafb92c4ce6505a8.tar.bz2 | |
[svn-r28859] Merge of r28762, 28770-82, 28791-28806, 28816-28836, 28857
from revise_chunks.
This is basically all the revise_chunks changes since alpha0
aside from the v2 B-tree changes that cause SWMR to fail.
This merge should also bring the alpha branch in sync with
the trunk.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial w/ C++ and Fortran
autotools parallel w/ Fortran (MPICH 3.1.4)
cmake serial (cmakehdf5) w/ C++ and Fortran
Diffstat (limited to 'src/H5MMprivate.h')
| -rw-r--r-- | src/H5MMprivate.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h index 0d608b2..14bd28d 100644 --- a/src/H5MMprivate.h +++ b/src/H5MMprivate.h @@ -21,8 +21,6 @@ * * Purpose: Private header for memory management. * - * Modifications: - * *------------------------------------------------------------------------- */ #ifndef _H5MMprivate_H @@ -33,7 +31,12 @@ /* Private headers needed by this file */ #include "H5private.h" +#if defined H5_MEMORY_ALLOC_SANITY_CHECK +/*#define H5MM_PRINT_MEMORY_STATS */ +#define H5MM_free(Z) H5MM_xfree(Z) +#else /* H5_MEMORY_ALLOC_SANITY_CHECK */ #define H5MM_free(Z) HDfree(Z) +#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */ /* * Library prototypes... @@ -44,5 +47,10 @@ H5_DLL void *H5MM_realloc(void *mem, size_t size); H5_DLL char *H5MM_xstrdup(const char *s); H5_DLL char *H5MM_strdup(const char *s); H5_DLL void *H5MM_xfree(void *mem); +#if defined H5_MEMORY_ALLOC_SANITY_CHECK +H5_DLL void H5MM_sanity_check_all(void); +H5_DLL void H5MM_final_sanity_check(void); +#endif /* H5_MEMORY_ALLOC_SANITY_CHECK */ + +#endif /* _H5MMprivate_H */ -#endif |