diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:55:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-02-10 17:55:55 (GMT) |
| commit | c8a6c6030a768952bc4161b2bf30c948b8b58723 (patch) | |
| tree | 064e57faf3f85c030d70900c3354fee2fbffd8ac /src/H5Dchunk.c | |
| parent | f1283d59b061cde641f2c24d23f01efbca46ad2f (diff) | |
| download | hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.zip hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.gz hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.bz2 | |
[svn-r29077] Description:
Normalize against the trunk, in preparation for final merge.
Tested on:
MacOSX/64 10.11.3 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 37e48ba..a17e035 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -45,7 +45,7 @@ /****************/ #include "H5Dmodule.h" /* This source code file is part of the H5D module */ -#define H5F_FRIEND /*suppress error about including H5Fpkg */ + /***********/ /* Headers */ @@ -56,7 +56,7 @@ #endif /* H5_HAVE_PARALLEL */ #include "H5Dpkg.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ -#include "H5Fpkg.h" /* File functions */ +#include "H5Fprivate.h" /* File functions */ #include "H5FLprivate.h" /* Free Lists */ #include "H5Iprivate.h" /* IDs */ #include "H5MMprivate.h" /* Memory management */ @@ -2652,7 +2652,7 @@ H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *scaled, if(!H5D__chunk_cinfo_cache_found(&dset->shared->cache.chunk.last, udata)) { H5D_chk_idx_info_t idx_info; /* Chunked index info */ #ifdef H5_HAVE_PARALLEL - H5P_coll_md_read_flag_t temp_flag; /* temp flag to hold the coll metadata read setting */ + H5P_coll_md_read_flag_t temp_cmr; /* Temp value to hold the coll metadata read setting */ #endif /* H5_HAVE_PARALLEL */ /* Compose chunked index info struct */ @@ -2668,9 +2668,9 @@ H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *scaled, as it is highly unlikely that users would read the same chunks from all processes. MSC - might turn on for root node? */ - temp_flag = idx_info.f->coll_md_read; - idx_info.f->coll_md_read = H5P_FORCE_FALSE; - } + temp_cmr = H5F_COLL_MD_READ(idx_info.f); + H5F_set_coll_md_read(idx_info.f, H5P_FORCE_FALSE); + } /* end if */ #endif /* H5_HAVE_PARALLEL */ /* Go get the chunk information */ @@ -2678,9 +2678,8 @@ H5D__chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *scaled, HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query chunk address") #ifdef H5_HAVE_PARALLEL - if(H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) { - idx_info.f->coll_md_read = temp_flag; - } + if(H5F_HAS_FEATURE(idx_info.f, H5FD_FEAT_HAS_MPI)) + H5F_set_coll_md_read(idx_info.f, temp_cmr); #endif /* H5_HAVE_PARALLEL */ /* Cache the information retrieved */ |