diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-12 20:05:14 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-12 20:05:14 (GMT) |
| commit | 6c60f4f78cf310959ca05fbddea9a1c3f876c583 (patch) | |
| tree | 38812590db8eb831eef703d0787d7960ccc74e7c | |
| parent | 4ba33c06209525970d4dcd6732607a85e28dcc68 (diff) | |
| download | hdf5-6c60f4f78cf310959ca05fbddea9a1c3f876c583.zip hdf5-6c60f4f78cf310959ca05fbddea9a1c3f876c583.tar.gz hdf5-6c60f4f78cf310959ca05fbddea9a1c3f876c583.tar.bz2 | |
[svn-r29099] Merged r29094 from trunk. Fixes H5B slowdown.
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial
CMake serial
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index de8a348..a85b0fe 100644 --- a/configure.ac +++ b/configure.ac @@ -2125,8 +2125,13 @@ AC_SUBST([INTERNAL_DEBUG_OUTPUT]) ## These are all the packages that use H5*_DEBUG. ## There is no harm in specifying a package not in this list; ## you'll just get an unused H5<pkg>_DEBUG symbol. +## +## Some packages that define debug checks or output are +## too specialized or have huge performance hits. These +## are not listed in the "all" packages list. +## ## all_packages="AC,B,B2,D,F,FA,FL,FS,HL,I,O,S,ST,T,Z" -all_packages="AC,B,B2,D,F,HL,I,O,S,ST,T,Z" +all_packages="AC,B2,D,F,HL,I,O,S,ST,T,Z" case "X-$INTERNAL_DEBUG_OUTPUT" in X-yes|X-all) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca71fca..6af2b9a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -872,7 +872,7 @@ option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF) if (HDF5_ENABLE_DEBUG_APIS) set_target_properties (${HDF5_LIB_TARGET} PROPERTIES COMPILE_DEFINITIONS - "H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5B_DEBUG;H5AC_DEBUG" + "H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG" ) endif (HDF5_ENABLE_DEBUG_APIS) set (install_targets ${HDF5_LIB_TARGET}) @@ -924,7 +924,7 @@ if (BUILD_SHARED_LIBS) if (HDF5_ENABLE_DEBUG_APIS) set_property (TARGET ${HDF5_LIBSH_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS - "H5Z_DEBUG;H5VM_DEBUG;H5T_DEBUG;H5S_DEBUG;H5P_DEBUG;H5O_DEBUG;H5MM_DEBUG;H5MF_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5HG_DEBUG;H5G_DEBUG;H5F_DEBUG;H5E_DEBUG;H5D_DEBUG;H5B_DEBUG;H5AC_DEBUG" + "H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG" ) endif (HDF5_ENABLE_DEBUG_APIS) set (install_targets ${install_targets} ${HDF5_LIBSH_TARGET}) |