diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 19:28:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-27 19:28:55 (GMT) |
| commit | 451887585360c787dec42da3ffdb65c519e6ef02 (patch) | |
| tree | cf7774916f692e2c433112361789491e13e2cd27 /src/H5Dchunk.c | |
| parent | 954c91c5517020bee4c09d3012544e70c7182529 (diff) | |
| download | hdf5-451887585360c787dec42da3ffdb65c519e6ef02.zip hdf5-451887585360c787dec42da3ffdb65c519e6ef02.tar.gz hdf5-451887585360c787dec42da3ffdb65c519e6ef02.tar.bz2 | |
[svn-r18638] Description:
Lock the dataspace message into object header chunk #0 (so that the
flush dependency between the extensible array and the object header works and
has the correct semantics).
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 68d8781..7087166 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2458,7 +2458,7 @@ H5D_chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t * ent->dirty = FALSE; /* Check for SWMR writes to the file */ - if(dset->shared->layout.storage.u.chunk.ops->can_swim && H5F_INTENT(dset->oloc.file) & H5F_ACC_SWMR_WRITE) { + if(dset->shared->layout.storage.u.chunk.ops->can_swim && (H5F_INTENT(dset->oloc.file) & H5F_ACC_SWMR_WRITE)) { /* Mark the proxy entry in the cache as clean */ if(H5D_chunk_proxy_mark(ent, FALSE) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTMARKDIRTY, FAIL, "can't mark proxy for chunk from metadata cache as clean") @@ -2537,7 +2537,7 @@ H5D_chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t * } /* end else */ /* Check for SWMR writes to the file */ - if(dset->shared->layout.storage.u.chunk.ops->can_swim && H5F_INTENT(dset->oloc.file) & H5F_ACC_SWMR_WRITE) { + if(dset->shared->layout.storage.u.chunk.ops->can_swim && (H5F_INTENT(dset->oloc.file) & H5F_ACC_SWMR_WRITE)) { /* Remove the proxy entry in the cache */ if(H5D_chunk_proxy_remove(dset, dxpl_id, ent) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTREMOVE, FAIL, "can't remove proxy for chunk from metadata cache") @@ -2893,7 +2893,7 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, /* Check for SWMR writes to the file */ if(io_info->dset->shared->layout.storage.u.chunk.ops->can_swim - && H5F_INTENT(io_info->dset->oloc.file) & H5F_ACC_SWMR_WRITE) { + && (H5F_INTENT(io_info->dset->oloc.file) & H5F_ACC_SWMR_WRITE)) { /* Insert a proxy entry in the cache, to make certain that the * flush dependencies are maintained in the proper way for SWMR * access to work. @@ -3041,7 +3041,7 @@ H5D_chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata, /* Check for SWMR writes to the file */ if(io_info->dset->shared->layout.storage.u.chunk.ops->can_swim - && H5F_INTENT(io_info->dset->oloc.file) & H5F_ACC_SWMR_WRITE) { + && (H5F_INTENT(io_info->dset->oloc.file) & H5F_ACC_SWMR_WRITE)) { /* Mark the proxy entry in the cache as dirty */ if(H5D_chunk_proxy_mark(ent, TRUE) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTMARKDIRTY, FAIL, "can't mark proxy for chunk from metadata cache as dirty") |