diff options
| -rw-r--r-- | src/H5HFdbg.c | 6 | ||||
| -rw-r--r-- | src/H5HFhdr.c | 1 | ||||
| -rw-r--r-- | src/H5HFiblock.c | 4 | ||||
| -rw-r--r-- | src/H5HFint.c | 7 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c index 9748964..81faf1e 100644 --- a/src/H5HFdbg.c +++ b/src/H5HFdbg.c @@ -232,6 +232,9 @@ H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, "Total managed space data block size:", hdr->man_size); HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, + "Total managed space allocated data block size:", + hdr->man_alloc_size); + HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, "Total standalone space data block size:", hdr->std_size); HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth, @@ -537,7 +540,7 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, hdr->man_dtable.max_direct_rows); /* Print the entry tables */ - HDfprintf(stream, "%*sDirect Block Entries (address, free space):\n", indent, ""); + HDfprintf(stream, "%*sDirect Block Entries: (address)\n", indent, ""); for(u = 0; u < hdr->man_dtable.max_direct_rows && u < iblock->nrows; u++) { sprintf(temp_str, "Row #%u: (block size: %lu)", (unsigned)u, (unsigned long)hdr->man_dtable.row_block_size[u]); HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), @@ -578,7 +581,6 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "<none>"); - done: if(iblock && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_IBLOCK, addr, iblock, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap direct block") diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c index a25a11b..05d0a77 100644 --- a/src/H5HFhdr.c +++ b/src/H5HFhdr.c @@ -384,6 +384,7 @@ H5HF_hdr_decr(H5HF_hdr_t *hdr) /* Sanity check */ HDassert(hdr); + HDassert(hdr->rc); /* Decrement reference count on shared header */ hdr->rc--; diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index d9462c8..f3d7029 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -784,10 +784,6 @@ H5HF_indirect_t * H5HF_man_iblock_place_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size, size_t *entry_p, size_t *dblock_size) { -#ifdef OLD_WAY - H5HF_indirect_t *iblock; /* Pointer to indirect block */ - haddr_t iblock_addr; /* Indirect block's address */ -#endif /* OLD_WAY */ H5HF_indirect_t *ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_place_dblock) diff --git a/src/H5HFint.c b/src/H5HFint.c index 4148d14..149eacc 100644 --- a/src/H5HFint.c +++ b/src/H5HFint.c @@ -645,13 +645,14 @@ HDfprintf(stderr, "%s: blk_off = %Zu\n", FUNC, blk_off); HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block") dblock = NULL; + /* Update statistics about heap */ + hdr->nobjs--; + hdr->total_man_free += obj_len; + /* Return free space to the heap's list of space */ if(H5HF_space_return(hdr, dxpl_id, sec_node) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add direct block free space to global list") - /* Update statistics about heap */ - hdr->nobjs--; - /* Mark heap header as modified */ if(H5HF_hdr_dirty(hdr) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark heap header as dirty") |