summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@koziol.gov>2020-06-11 13:14:48 (GMT)
committerQuincey Koziol <koziol@koziol.gov>2020-06-11 13:14:48 (GMT)
commit6ca633026c2fe19f31ab17f8833b547c138622da (patch)
tree005261735e79aeb681dafca631f1cfdb5bd7e730
parenta9e9de8c6c204f15a091630d12037079542f6596 (diff)
parent770f7b844949e78412310f8d08e4282f971eed92 (diff)
downloadhdf5-6ca633026c2fe19f31ab17f8833b547c138622da.zip
hdf5-6ca633026c2fe19f31ab17f8833b547c138622da.tar.gz
hdf5-6ca633026c2fe19f31ab17f8833b547c138622da.tar.bz2
Merge remote-tracking branch 'origin/hdf5_1_12' into hdf5_1_12_opt_single_selection_io
-rw-r--r--release_docs/RELEASE.txt5
-rw-r--r--src/H5Dchunk.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 847bd12..61f8ba8 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -109,6 +109,11 @@ Bug Fixes since HDF5-1.12.0 release
==================================
Library
-------
+ - Remove redundant tagging of metadata cache entries for some chunked
+ dataset operations.
+
+ (QAK - 2020/06/10)
+
- Better detect selections with the same shape, improving performance for
some uses of H5DOappend (and other situations).
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 58dfbc5..f6fa91a 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -3350,7 +3350,7 @@ H5D__chunk_flush_entry(const H5D_t *dset, H5D_rdcc_ent_t *ent, hbool_t reset)
H5O_storage_chunk_t *sc = &(dset->shared->layout.storage.u.chunk);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_STATIC_TAG(dset->oloc.addr)
+ FUNC_ENTER_STATIC
HDassert(dset);
HDassert(dset->shared);
@@ -3514,7 +3514,7 @@ done:
((ent->edge_chunk_state & H5D_RDCC_DISABLE_FILTERS) ? NULL
: &(dset->shared->dcpl_cache.pline)));
- FUNC_LEAVE_NOAPI_TAG(ret_value)
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__chunk_flush_entry() */
@@ -4349,7 +4349,7 @@ H5D__chunk_allocate(const H5D_io_info_t *io_info, hbool_t full_overwrite, hsize_
const H5O_storage_chunk_t *sc = &(layout->storage.u.chunk);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_PACKAGE_TAG(dset->oloc.addr)
+ FUNC_ENTER_PACKAGE
/* Check args */
HDassert(dset && H5D_CHUNKED == layout->type);
@@ -4753,7 +4753,7 @@ done:
H5MM_free(chunk_info.addr);
#endif
- FUNC_LEAVE_NOAPI_TAG(ret_value)
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__chunk_allocate() */