diff options
| author | John Mainzer <mainzer@hdfgroup.org> | 2005-06-24 06:30:29 (GMT) |
|---|---|---|
| committer | John Mainzer <mainzer@hdfgroup.org> | 2005-06-24 06:30:29 (GMT) |
| commit | 7f8e3460261851cdad1e344d8929d2817e3149ad (patch) | |
| tree | 760d0e8dd581c4d4245a7e8acf51254f0c29d1ad /src/H5BTtest.c | |
| parent | 2ab6b12b552e9260e2e76640a788b5a3744c6a9f (diff) | |
| download | hdf5-7f8e3460261851cdad1e344d8929d2817e3149ad.zip hdf5-7f8e3460261851cdad1e344d8929d2817e3149ad.tar.gz hdf5-7f8e3460261851cdad1e344d8929d2817e3149ad.tar.bz2 | |
[svn-r10978] Purpose:
Interim checkin of code changes moving management of the is_dirty flag
into the cache code.
Description:
Prior to this checkin, management of the is_dirty flag was handled
above the level of the metadata cache. This can no longer be allowed,
as it introduces a race condition in the proposed fix for a cache
coherency bug in PHDF5.
Solution:
Move management fo the is_dirty flag to the cache code proper.
Entries are now marked as dirty via a flag on the unprotect call.
Platforms tested:
h5committested
Misc. update:
Diffstat (limited to 'src/H5BTtest.c')
| -rw-r--r-- | src/H5BTtest.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/H5BTtest.c b/src/H5BTtest.c index 974cfb3..61d25b9 100644 --- a/src/H5BTtest.c +++ b/src/H5BTtest.c @@ -45,12 +45,18 @@ * * Modifications: * + * John Mainzer, 6/17/05 + * Modified the function to use the new dirtied parameter of + * of H5AC_unprotect() instead of modifying the is_dirty + * field of the cache info. + * *------------------------------------------------------------------------- */ herr_t H5BT_get_max_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *size, uint32_t *count, hbool_t *valid) { + hbool_t bt_dirtied = FALSE; H5BT_t *bt=NULL; /* Pointer to the block tracker info */ herr_t ret_value = SUCCEED; @@ -74,7 +80,7 @@ H5BT_get_max_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *size, done: /* Release the block tracker info */ - if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, H5AC__NO_FLAGS_SET) < 0) + if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, bt_dirtied, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_BLKTRK, H5E_CANTUNPROTECT, FAIL, "unable to release block tracker info") FUNC_LEAVE_NOAPI(ret_value) @@ -95,12 +101,18 @@ done: * * Modifications: * + * John Mainzer, 6/17/05 + * Modified the function to use the new dirtied parameter of + * of H5AC_unprotect() instead of modifying the is_dirty + * field of the cache info. + * *------------------------------------------------------------------------- */ herr_t H5BT_get_min_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *size, uint32_t *count, hbool_t *valid) { + hbool_t bt_dirtied = FALSE; H5BT_t *bt=NULL; /* Pointer to the block tracker info */ herr_t ret_value = SUCCEED; @@ -124,7 +136,7 @@ H5BT_get_min_info(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *size, done: /* Release the block tracker info */ - if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, H5AC__NO_FLAGS_SET) < 0) + if (bt && H5AC_unprotect(f, dxpl_id, H5AC_BLTR, addr, bt, bt_dirtied, H5AC__NO_FLAGS_SET) < 0) HDONE_ERROR(H5E_BLKTRK, H5E_CANTUNPROTECT, FAIL, "unable to release block tracker info") FUNC_LEAVE_NOAPI(ret_value) |