summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-09-04 03:44:19 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-09-04 03:44:19 (GMT)
commitc5bfe49ea68cb324f1ed608083de36071bbe2a24 (patch)
treea2b22274a30d4723bfe1077553ca2e1c6c5fca88 /src
parentb490031679f1319e0f7d68683684d5ea6305b88b (diff)
downloadhdf5-c5bfe49ea68cb324f1ed608083de36071bbe2a24.zip
hdf5-c5bfe49ea68cb324f1ed608083de36071bbe2a24.tar.gz
hdf5-c5bfe49ea68cb324f1ed608083de36071bbe2a24.tar.bz2
[svn-r19352] Description:
Align w/changes on revise_chunks branch Tested on: Mac OS X/32 10.6.4 (amazon) w/debug & production (too minor to require h5committest)
Diffstat (limited to 'src')
-rw-r--r--src/H5Dchunk.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 5768da3..0ccffa8 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -1776,12 +1776,6 @@ done:
* Programmer: Raymond Lu
* Thursday, April 10, 2003
*
- * Modification:Raymond Lu
- * 4 Feb 2009
- * One case that was considered cacheable was when the chunk
- * was bigger than the cache size but not allocated on disk.
- * I moved it to uncacheable branch to bypass the cache to
- * improve performance.
*-------------------------------------------------------------------------
*/
static herr_t
@@ -2667,12 +2661,12 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
hbool_t relax)
{
H5D_t *dset = io_info->dset; /* Local pointer to the dataset info */
- const H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info */
- const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */
- const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */
+ const H5O_pline_t *pline = &(dset->shared->dcpl_cache.pline); /* I/O pipeline info - always equal to the pline passed to H5D_chunk_alloc */
+ const H5O_layout_t *layout = &(dset->shared->layout); /* Dataset layout */
+ const H5O_fill_t *fill = &(dset->shared->dcpl_cache.fill); /* Fill value info */
H5D_fill_buf_info_t fb_info; /* Dataset's fill buffer info */
hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
- H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/
+ H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk); /*raw data chunk cache*/
H5D_rdcc_ent_t *ent = NULL; /*cache entry */
haddr_t chunk_addr = HADDR_UNDEF; /* Address of chunk on disk */
size_t chunk_size; /*size of a chunk */
@@ -3665,14 +3659,6 @@ done:
* To release the chunks, we traverse the B-tree to obtain a list of unused
* allocated chunks, and then call H5B_remove() for each chunk.
*
- * Modifications: Neil Fortner
- * 4 May 2010
- * Rewrote algorithm to work in a way similar to
- * H5D_chunk_allocate: it now iterates over all chunks that need
- * to be filled or removed, and does so as appropriate. This
- * avoids various issues with coherency of locally cached data
- * which could occur with the previous implementation.
- *
*-------------------------------------------------------------------------
*/
herr_t