diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-03-27 21:57:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-03-27 21:57:50 (GMT) |
| commit | 87050be33e3a5931ef88b4faee557c3bfdb809b4 (patch) | |
| tree | 4f040a5eef27ea3c09367eade4997e85fc548334 /src/H5HFtest.c | |
| parent | 26e1b18a578af61b491ff47a32779507df77a6ff (diff) | |
| download | hdf5-87050be33e3a5931ef88b4faee557c3bfdb809b4.zip hdf5-87050be33e3a5931ef88b4faee557c3bfdb809b4.tar.gz hdf5-87050be33e3a5931ef88b4faee557c3bfdb809b4.tar.bz2 | |
[svn-r12161] Purpose:
Code checkpoint
Description:
Checkpoint fractal heap code at a stable point in development. It appears
that adding objects to heaps and reading them back out is now working
properly (as long as there are no gaps in the heap and no standalone objects
are created).
Platforms tested:
FreeBSD 4.11 (sleipnir)
Linux 2.4 (chicago)
Linux 2.4 (mir) w/64-bit & FORTRAN & C++
Solaris 9 (shanti) w/64-bit
Diffstat (limited to 'src/H5HFtest.c')
| -rw-r--r-- | src/H5HFtest.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/H5HFtest.c b/src/H5HFtest.c index c96d516..02024b9 100644 --- a/src/H5HFtest.c +++ b/src/H5HFtest.c @@ -86,8 +86,7 @@ herr_t H5HF_get_cparam_test(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr, H5HF_create_t *cparam) { - H5HF_t *fh = NULL; /* Pointer to the B-tree header */ - H5HF_shared_t *shared; /* Shared fractal heap information */ + H5HF_t *hdr = NULL; /* Pointer to the fractal heap header */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT(H5HF_get_cparam_test) @@ -98,22 +97,17 @@ H5HF_get_cparam_test(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr, H5HF_create_t *cp HDassert(cparam); /* Look up the fractal heap header */ - if(NULL == (fh = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, NULL, NULL, H5AC_READ))) + if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, NULL, NULL, H5AC_READ))) HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap header") - /* Get the pointer to the shared fractal heap info */ - shared = H5RC_GET_OBJ(fh->shared); - HDassert(shared); - /* Get fractal heap creation parameters */ - cparam->addrmap = shared->addrmap; - cparam->standalone_size = shared->standalone_size; - cparam->ref_count_size = shared->ref_count_size; - HDmemcpy(&(cparam->managed), &(shared->man_dtable.cparam), sizeof(H5HF_dtable_cparam_t)); + cparam->addrmap = hdr->addrmap; + cparam->standalone_size = hdr->standalone_size; + HDmemcpy(&(cparam->managed), &(hdr->man_dtable.cparam), sizeof(H5HF_dtable_cparam_t)); done: /* Release fractal heap header node */ - if(fh && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, fh, H5AC__NO_FLAGS_SET) < 0) + if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, hdr, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header info") FUNC_LEAVE_NOAPI(ret_value) |