diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-09-10 17:05:19 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-09-10 17:05:19 (GMT) |
| commit | 6d928cf05ef860086825665cbfff18c6d1c15b3c (patch) | |
| tree | 1236f11f1935fefcd8d6ec04631e5313dba3baaa /src/H5HLdbg.c | |
| parent | 14f7f3e53d97c3f31a129145e7ea7e9cd55008dc (diff) | |
| download | hdf5-6d928cf05ef860086825665cbfff18c6d1c15b3c.zip hdf5-6d928cf05ef860086825665cbfff18c6d1c15b3c.tar.gz hdf5-6d928cf05ef860086825665cbfff18c6d1c15b3c.tar.bz2 | |
[svn-r7456] Purpose:
Removal of H5AC_find()
Description:
The H5AC_find() function is mostly redundant and with the new
Flexible Parallel HDF5 stuff, we need to do locking on metadata
returned from the H5AC_find() anyway. So, all of the locking stuff
will be placed in the H5AC_{un}protect() functions. The H5AC_find()
is no longer needed.
Solution:
Replaced all H5AC_finds with H5AC_protects and H5AC_unprotects.
Platforms tested:
Linux (Fortran & C++)
Solaris (Fortran)
Irix (Parallel & Fortran)
Misc. update:
Diffstat (limited to 'src/H5HLdbg.c')
| -rw-r--r-- | src/H5HLdbg.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c index 2e0be37..0277044 100644 --- a/src/H5HLdbg.c +++ b/src/H5HLdbg.c @@ -71,8 +71,9 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int assert(indent >= 0); assert(fwidth >= 0); - if (NULL == (h = H5AC_find(f, dxpl_id, H5AC_LHEAP, addr, NULL, NULL))) - HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap"); + if (NULL == (h = H5AC_protect(f, dxpl_id, H5AC_LHEAP, addr, NULL, NULL))) + HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap"); + fprintf(stream, "%*sLocal Heap...\n", indent, ""); fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, "Dirty:", @@ -93,11 +94,12 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int /* * Traverse the free list and check that all free blocks fall within * the heap and that no two free blocks point to the same region of - * the heap. - */ + * the heap. */ if (NULL==(marker = H5MM_calloc(h->mem_alloc))) HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); + fprintf(stream, "%*sFree Blocks (offset, size):\n", indent, ""); + for (free_block=0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) { char temp_str[32]; @@ -166,6 +168,11 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int HDfputc('\n', stream); } + if (H5AC_unprotect(f, dxpl_id, H5AC_LHEAP, addr, h, FALSE) != SUCCEED) + HGOTO_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header"); + + h = NULL; + H5MM_xfree(marker); done: |