summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-08-27 09:42:18 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-08-27 09:42:18 (GMT)
commit68cd4eea0e450eb0b8e6e6313c31b612d1019a4f (patch)
tree7f1559870897f5d9df15981710684d2646f23649 /src
parent3bcbce5538eb334948311c5afeaef7c050056dca (diff)
parent6e8c48182fe463721f23597b64127863291cb35a (diff)
downloadhdf5-68cd4eea0e450eb0b8e6e6313c31b612d1019a4f.zip
hdf5-68cd4eea0e450eb0b8e6e6313c31b612d1019a4f.tar.gz
hdf5-68cd4eea0e450eb0b8e6e6313c31b612d1019a4f.tar.bz2
Merge branch 'develop' into H5Pset_fapl_mpi
Diffstat (limited to 'src')
-rw-r--r--src/H5FSsection.c4
-rw-r--r--src/H5Fint.c3
-rw-r--r--src/H5Fpkg.h1
-rw-r--r--src/H5MFaggr.c4
-rw-r--r--src/H5Ocache_image.c2
-rw-r--r--src/H5Ochunk.c2
6 files changed, 10 insertions, 6 deletions
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 9f86aea..df67bd9 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -390,7 +390,7 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
cache_flags |= H5AC__DIRTIED_FLAG;
/* On file close or flushing, does not allow section info to shrink in size */
- if(f->closing || flush_in_progress) {
+ if(f->shared->closing || flush_in_progress) {
if(fspace->sect_size > fspace->alloc_sect_size)
cache_flags |= H5AC__DELETED_FLAG | H5AC__TAKE_OWNERSHIP_FLAG;
else
@@ -441,7 +441,7 @@ HDfprintf(stderr, "%s: Relinquishing section info ownership\n", FUNC);
/* Set flag to release section info space in file */
/* On file close or flushing, only need to release section info with size
bigger than previous section */
- if(f->closing || flush_in_progress) {
+ if(f->shared->closing || flush_in_progress) {
if(fspace->sect_size > fspace->alloc_sect_size)
release_sinfo_space = TRUE;
else
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 9b31d7e..c56bd10 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -1175,6 +1175,9 @@ H5F__dest(H5F_t *f, hbool_t flush)
if(1 == f->shared->nrefs) {
int actype; /* metadata cache type (enum value) */
+ /* Mark this file as closing */
+ f->shared->closing = TRUE;
+
/* Flush at this point since the file will be closed (phase 1).
* Only try to flush the file if it was opened with write access, and if
* the caller requested a flush.
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 42c9a828..7e89111 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -309,6 +309,7 @@ struct H5F_shared_t {
struct H5G_t *root_grp; /* Open root group */
H5FO_t *open_objs; /* Open objects in file */
H5UC_t *grp_btree_shared; /* Ref-counted group B-tree node info */
+ hbool_t closing; /* File is in the process of being closed */
/* Cached VOL connector ID & info */
hid_t vol_id; /* ID of VOL connector for the container */
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index c726341..d716ae2 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -194,9 +194,9 @@ HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
* the cache eventually adjusts/evicts ageout entries and ends up flushing out the
* same entry that is being serialized (flush_in_progress).
*/
- if((f->shared->feature_flags & aggr->feature_flag) && f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && (!f->closing || !f->shared->fs_persist)) {
+ if((f->shared->feature_flags & aggr->feature_flag) && f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && (!f->shared->closing || !f->shared->fs_persist)) {
#ifdef REPLACE
- if((f->shared->feature_flags & aggr->feature_flag) && f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && !f->closing) {
+ if((f->shared->feature_flags & aggr->feature_flag) && f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && !f->shared->closing) {
#endif
haddr_t aggr_frag_addr = HADDR_UNDEF; /* Address of aggregrator fragment */
hsize_t aggr_frag_size = 0; /* Size of aggregator fragment */
diff --git a/src/H5Ocache_image.c b/src/H5Ocache_image.c
index 7336211..70d9ef5 100644
--- a/src/H5Ocache_image.c
+++ b/src/H5Ocache_image.c
@@ -325,7 +325,7 @@ H5O__mdci_delete(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, void *_mesg)
- if(f->closing) {
+ if(f->shared->closing) {
/* Get the eoa, and verify that it has the expected value */
if(HADDR_UNDEF == (final_eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)) )
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c
index 94301b3..9ce5a46 100644
--- a/src/H5Ochunk.c
+++ b/src/H5Ochunk.c
@@ -331,7 +331,7 @@ H5O__chunk_update_idx(H5F_t *f, H5O_t *oh, unsigned idx)
H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_PACKAGE
+ FUNC_ENTER_PACKAGE_TAG(oh->cache_info.addr)
/* check args */
HDassert(f);