diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-11-30 04:53:52 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-11-30 04:53:52 (GMT) |
| commit | a046ac31d263465130c8824c80af6db06587552e (patch) | |
| tree | d539770b4bb812c820344554674b8fff5957a6ae /src/H5Ctag.c | |
| parent | 63bcd73f1f53a8b4bb31083cbc30f9a90663438f (diff) | |
| download | hdf5-a046ac31d263465130c8824c80af6db06587552e.zip hdf5-a046ac31d263465130c8824c80af6db06587552e.tar.gz hdf5-a046ac31d263465130c8824c80af6db06587552e.tar.bz2 | |
First cut at fixing the tagging issue with the free space managers.
* Converted the tag macros to regular ones so the parent's tag
is used via the dxpl.
* Updated the tag sanity check logic so for free space managers.
* Turned new-style group checks back on in test/evict_on_close.c
Diffstat (limited to 'src/H5Ctag.c')
| -rw-r--r-- | src/H5Ctag.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/H5Ctag.c b/src/H5Ctag.c index 6d5b454..e284cdc 100644 --- a/src/H5Ctag.c +++ b/src/H5Ctag.c @@ -645,20 +645,13 @@ H5C_verify_tag(int id, haddr_t tag) } /* end else */ /* Free Space Manager */ - if((id == H5AC_FSPACE_HDR_ID) || (id == H5AC_FSPACE_SINFO_ID)) { - if(tag != H5AC__FREESPACE_TAG) - HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "freespace entry not tagged with H5AC__FREESPACE_TAG") - } /* end if */ - else { - if(tag == H5AC__FREESPACE_TAG) + if(tag == H5AC__FREESPACE_TAG && ((id != H5AC_FSPACE_HDR_ID) && (id != H5AC_FSPACE_SINFO_ID))) HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "H5AC__FREESPACE_TAG applied to non-freespace entry") - } /* end else */ /* SOHM */ - if((id == H5AC_SOHM_TABLE_ID) || (id == H5AC_SOHM_LIST_ID)) { + if((id == H5AC_SOHM_TABLE_ID) || (id == H5AC_SOHM_LIST_ID)) if(tag != H5AC__SOHM_TAG) HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, FAIL, "sohm entry not tagged with H5AC__SOHM_TAG") - } /* end if */ /* Global Heap */ if(id == H5AC_GHEAP_ID) { |