Merge pull request #1939 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop

* commit '6eb506eff76b5455f8aac8889c6809aca2d8be52': Revert "Moved NDEBUG guards to H5EA_DEBUG in H5EA package." Revert "Fix for H5EA debug package when built in release mode."
2019-09-24 10:42:32 -05:00
parent 7997eb8c84 6eb506eff7
commit 6b60b95dbb
7 changed files with 38 additions and 20 deletions
--- 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,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"
+## 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"

 case "X-$INTERNAL_DEBUG_OUTPUT" in
  X-yes|X-all)
--- 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,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"
+## 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"
 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;H5EA_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;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;H5EA_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;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>
  )
  TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED)
  target_link_libraries (${HDF5_LIBSH_TARGET}
--- 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 */

-#ifdef H5EA_DEBUG
+#ifndef NDEBUG
 {
    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 /* H5EA_DEBUG */
+#endif /* NDEBUG */

            /* Lock the array header into memory */
            /* (OK to pass in NULL for callback context, since we know the header must be in the cache) */
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -581,7 +581,11 @@ 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
@@ -974,7 +978,11 @@ 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
@@ -1382,7 +1390,11 @@ 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
@@ -1791,7 +1803,11 @@ 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
@@ -2168,7 +2184,11 @@ 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
--- a/src/H5EAhdr.c
+++ b/src/H5EAhdr.c
@@ -49,10 +49,10 @@
 /* Local Macros */
 /****************/

-#ifdef H5EA_DEBUG
+#ifndef NDEBUG
 /* Max. # of bits for max. nelmts index */
 #define H5EA_MAX_NELMTS_IDX_MAX 64
-#endif /* H5EA_DEBUG */
+#endif /* NDEBUG */

 /* # 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);

-#ifdef H5EA_DEBUG
+#ifndef NDEBUG
 {
    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 /* H5EA_DEBUG */
+#endif /* NDEBUG */

    /* 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);

-#ifdef H5EA_DEBUG
+#ifndef NDEBUG
 {
    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 /* H5EA_DEBUG */
+#endif /* NDEBUG */

    /* Check for index block */
    if(H5F_addr_defined(hdr->idx_blk_addr)) {
--- 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_DEBUG
-#endif /* H5EA_DEBUG */
+#ifdef H5EA_DEBUGGING
+#endif /* H5EA_DEBUGGING */

 #endif /* _H5EAprivate_H */

--- 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 */
-#ifdef H5EA_DEBUG
+#ifndef NDEBUG
    H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx;   /* Callback context to destroy */
-#endif /* H5EA_DEBUG */
+#endif /* NDEBUG */
    uint64_t *elmt = (uint64_t *)_elmt;     /* Convenience pointer to native elements */
    const uint8_t *raw = (const uint8_t *)_raw; /* Convenience pointer to raw elements */

@@ -292,9 +292,7 @@ H5EA__test_decode(const void *_raw, void *_elmt, size_t nelmts, void *_ctx))
    HDassert(raw);
    HDassert(elmt);
    HDassert(nelmts);
-#ifdef H5EA_DEBUG
    HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
-#endif /* H5EA_DEBUG */

    /* Decode raw elements into native elements */
    while(nelmts) {