Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '57f1a2124c65283fc48c4ca700392e1682d0e754':
  Moved NDEBUG guards to H5EA_DEBUG in H5EA package.

7 files changed, 18 insertions, 38 deletions

diff --git a/configure.ac b/configure.ac
index e119e0a..b4308f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2280,8 +2280,8 @@ AC_SUBST([INTERNAL_DEBUG_OUTPUT])
 ## 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,B2,CX,D,F,HL,I,O,S,ST,T,Z"
+## all_packages="AC,B,B2,D,EA,F,FA,FL,FS,HL,I,O,S,ST,T,Z"
+all_packages="AC,B2,CX,D,EA,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 6df8af3..26a3c26 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1115,8 +1115,8 @@ if (BUILD_SHARED_LIBS)
   set_source_files_properties (${HDF5_BINARY_DIR}/shared/H5lib_settings.c PROPERTIES GENERATED TRUE)
 endif ()
 
-## all_packages="AC,B,B2,D,F,FA,FL,FS,HL,I,O,S,ST,T,Z"
-#all_packages="AC,B2,CX,D,F,HL,I,O,S,ST,T,Z"
+## all_packages="AC,B,B2,D,EA,F,FA,FL,FS,HL,I,O,S,ST,T,Z"
+#all_packages="AC,B2,CX,D,EA,F,HL,I,O,S,ST,T,Z"
 option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF)
 
 #-----------------------------------------------------------------------------
@@ -1137,7 +1137,7 @@ if (NOT ONLY_SHARED_LIBS)
           ${HDF_EXTRA_FLAGS}
       PRIVATE
           $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API>  # Enable tracing of the API
-          $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>
+          $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5EA_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>
   )
   TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC)
   target_link_libraries (${HDF5_LIB_TARGET}
@@ -1175,7 +1175,7 @@ if (BUILD_SHARED_LIBS)
       PRIVATE
           $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:H5_HAVE_THREADSAFE>
           $<$<BOOL:${HDF5_ENABLE_TRACE}>:H5_DEBUG_API>  # Enable tracing of the API
-          $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>
+          $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5EA_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>
   )
   TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED)
   target_link_libraries (${HDF5_LIBSH_TARGET}
diff --git a/src/H5EA.c b/src/H5EA.c
index 96eee12..604df5d 100644
--- a/src/H5EA.c
+++ b/src/H5EA.c
@@ -877,7 +877,7 @@ H5EA_close(H5EA_t *ea))
         if(pending_delete) {
             H5EA_hdr_t *hdr;            /* Another pointer to extensible array header */
 
-#ifndef NDEBUG
+#ifdef H5EA_DEBUG
 {
     unsigned hdr_status = 0;         /* Header's status in the metadata cache */
 
@@ -890,7 +890,7 @@ H5EA_close(H5EA_t *ea))
     HDassert(hdr_status & H5AC_ES__IS_PINNED);
     HDassert(!(hdr_status & H5AC_ES__IS_PROTECTED));
 }
-#endif /* NDEBUG */
+#endif /* H5EA_DEBUG */
 
             /* Lock the array header into memory */
             /* (OK to pass in NULL for callback context, since we know the header must be in the cache) */
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index da67e6b..d55a2b4 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -581,11 +581,7 @@ H5EA__cache_hdr_notify(H5AC_notify_action_t action, void *_thing))
 		break;
 
             default:
-#ifdef NDEBUG
                 H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
-                HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
         } /* end switch */
     } /* end if */
     else
@@ -978,11 +974,7 @@ H5EA__cache_iblock_notify(H5AC_notify_action_t action, void *_thing))
             break;
 
         default:
-#ifdef NDEBUG
             H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
-            HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
     } /* end switch */
 
 CATCH
@@ -1390,11 +1382,7 @@ H5EA__cache_sblock_notify(H5AC_notify_action_t action, void *_thing))
             break;
 
         default:
-#ifdef NDEBUG
             H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
-            HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
     } /* end switch */
 
 CATCH
@@ -1803,11 +1791,7 @@ H5EA__cache_dblock_notify(H5AC_notify_action_t action, void *_thing))
             break;
 
         default:
-#ifdef NDEBUG
             H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
-            HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
     } /* end switch */
 
 CATCH
@@ -2184,11 +2168,7 @@ H5EA__cache_dblk_page_notify(H5AC_notify_action_t action, void *_thing))
             break;
 
         default:
-#ifdef NDEBUG
             H5E_THROW(H5E_BADVALUE, "unknown action from metadata cache")
-#else /* NDEBUG */
-            HDassert(0 && "Unknown action?!?");
-#endif /* NDEBUG */
     } /* end switch */
 
 CATCH
diff --git a/src/H5EAhdr.c b/src/H5EAhdr.c
index ec40298..8a2e1d1 100644
--- a/src/H5EAhdr.c
+++ b/src/H5EAhdr.c
@@ -49,10 +49,10 @@
 /* Local Macros */
 /****************/
 
-#ifndef NDEBUG
+#ifdef H5EA_DEBUG
 /* Max. # of bits for max. nelmts index */
 #define H5EA_MAX_NELMTS_IDX_MAX 64
-#endif /* NDEBUG */
+#endif /* H5EA_DEBUG */
 
 /* # of elements in a data block for a particular super block */
 #define H5EA_SBLK_DBLK_NELMTS(s, m)                                           \
@@ -366,7 +366,7 @@ H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata))
     HDassert(f);
     HDassert(cparam);
 
-#ifndef NDEBUG
+#ifdef H5EA_DEBUG
 {
     unsigned sblk_idx;          /* Super block index for first "actual" super block */
     size_t dblk_nelmts;         /* Number of data block elements */
@@ -398,7 +398,7 @@ H5EA__hdr_create(H5F_t *f, const H5EA_create_t *cparam, void *ctx_udata))
     if(cparam->max_dblk_page_nelmts_bits > cparam->max_nelmts_bits)
         H5E_THROW(H5E_BADVALUE, "max. # of elements per data block page bits must be <= max. # of elements bits")
 }
-#endif /* NDEBUG */
+#endif /* H5EA_DEBUG */
 
     /* Allocate space for the shared information */
     if(NULL == (hdr = H5EA__hdr_alloc(f)))
@@ -724,7 +724,7 @@ H5EA__hdr_delete(H5EA_hdr_t *hdr))
     HDassert(hdr);
     HDassert(!hdr->file_rc);
 
-#ifndef NDEBUG
+#ifdef H5EA_DEBUG
 {
     unsigned hdr_status = 0;         /* Array header's status in the metadata cache */
 
@@ -736,7 +736,7 @@ H5EA__hdr_delete(H5EA_hdr_t *hdr))
     HDassert(hdr_status & H5AC_ES__IN_CACHE);
     HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
 } /* end block */
-#endif /* NDEBUG */
+#endif /* H5EA_DEBUG */
 
     /* Check for index block */
     if(H5F_addr_defined(hdr->idx_blk_addr)) {
diff --git a/src/H5EAprivate.h b/src/H5EAprivate.h
index 1195256..6067ed0 100644
--- a/src/H5EAprivate.h
+++ b/src/H5EAprivate.h
@@ -150,8 +150,8 @@ H5_DLL herr_t H5EA_patch_file(H5EA_t *fa, H5F_t *f);
 H5_DLL herr_t H5EA_get_stats(const H5EA_t *ea, H5EA_stat_t *stats);
 
 /* Debugging routines */
-#ifdef H5EA_DEBUGGING
-#endif /* H5EA_DEBUGGING */
+#ifdef H5EA_DEBUG
+#endif /* H5EA_DEBUG */
 
 #endif /* _H5EAprivate_H */
 
diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index 814e64f..b7064de 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -282,9 +282,9 @@ herr_t, SUCCEED, -,
 H5EA__test_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx))
 
     /* Local variables */
-#ifndef NDEBUG
+#ifdef H5EA_DEBUG
     H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx;   /* Callback context to destroy */
-#endif /* NDEBUG */
+#endif /* H5EA_DEBUG */
     uint64_t *elmt = (uint64_t *)_elmt;     /* Convenience pointer to native elements */
     const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */