diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-15 20:30:48 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-15 20:30:48 (GMT) |
| commit | 80d5ae2fc16e800fbc30008d7771408a40cfdcbf (patch) | |
| tree | 8345fd40909d129b14146a027684db235cd28988 /src/H5Dint.c | |
| parent | 4fa6fd807dddf42e14d2c4c1c40caf11674bb849 (diff) | |
| download | hdf5-80d5ae2fc16e800fbc30008d7771408a40cfdcbf.zip hdf5-80d5ae2fc16e800fbc30008d7771408a40cfdcbf.tar.gz hdf5-80d5ae2fc16e800fbc30008d7771408a40cfdcbf.tar.bz2 | |
[svn-r18574] Description:
Bring r18571 from trunk to 1.8 branch:
Bring r18542 from metadata journaling "merging" branch to trunk:
Bring new object header pin/unpin & protect/unprotect routines and
split-out object header chunk proxy changes from metadata_journaling branch to
"merging" branch, along with some other minor tweaks to clean up compiler
warnings, etc.
Also: clean up chunk protect/unprotect calls when allocating or freeing
space in a chunk, optimize metadata accumulator code to avoid some re-reading
of information from the file, refactor H5O_pin/H5O_unpin from way they are done
on the merging branch back to way they were previously done on trunk, other
minor code cleanups, etc.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index d3800e8..72c9079 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -27,7 +27,6 @@ /* Headers */ /***********/ #include "H5private.h" /* Generic Functions */ -#include "H5ACprivate.h" /* Metadata cache */ #include "H5Dpkg.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free Lists */ @@ -794,7 +793,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset object header") HDassert(file == dset->oloc.file); - /* Get a pointer to the object header itself */ + /* Pin the object header */ if(NULL == (oh = H5O_pin(oloc, dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header") @@ -2261,7 +2260,7 @@ H5D_flush_real(H5D_t *dataset, hid_t dxpl_id) if(dataset->shared->layout_dirty || dataset->shared->space_dirty) { unsigned update_flags = H5O_UPDATE_TIME; /* Modification time flag */ - /* Get a pointer to the dataset's object header */ + /* Pin the object header */ if(NULL == (oh = H5O_pin(&dataset->oloc, dxpl_id))) HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header") |