diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-02-28 21:24:02 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-02-28 21:24:02 (GMT) |
| commit | 646fc294078f560fc9bef784cb1c4e27cdc51f5b (patch) | |
| tree | 21502062cfc4ab6410f6d81de11e28c1523e85bd /src/H5Dprivate.h | |
| parent | 5eef94f83f4875b64ffe7f9cea05d965bddbd802 (diff) | |
| parent | 6819c11508b0610f222fe3bfe8a19f637bf4319c (diff) | |
| download | hdf5-dc9412f73acfd0f887f7a112533ea078fedd1f19.zip hdf5-dc9412f73acfd0f887f7a112533ea078fedd1f19.tar.gz hdf5-dc9412f73acfd0f887f7a112533ea078fedd1f19.tar.bz2 | |
Merge pull request #1590 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_5
* commit '6819c11508b0610f222fe3bfe8a19f637bf4319c': (154 commits)
CMake needs a tar.gz examples file for windows, too.
Correct file permissions on README.txt.
Address merge anomalies and incorrect file permissions.
Update release date in README.txt and RELEASE.txt.
Revisions to Platforms tested.
Updated LT_VERS_AGE in config/lt_vers.am due to reinstatement of previously removed symbols, then ran autogen.sh to propagate so number changes and H5E_LOGFAIL_g addition to files checked in on release branch.
Updated H5err.txt to replace a global variable that was removed during the metadata cache logging changes (to maintain binary compatibility).
HDFFV-10552,10686 restore H5O_*1 functions
Minor fix in h5str_sprintf for NULL region references
Add new files to MANIFEST.
Update so version numbers. fix 2 typos.
Update RELEASE.txt for TRILABS-34 and remove unused sections.
Add script for building HDF5 with CMake on HPC machines that use sbatch. Add README file for inclusion in CMake-hdf5-<version>.tar.gz file. Add updated README_HPC file with cross compile instructions.
set version to 1.10.5-pre1. Change default build mode to production.
Merge pull request #1560 in HDFFV/hdf5 from hdf5-1-10-documentation-only to hdf5_1_10_5
Update HISTORY-1_10.txt and RELEASE.txt files.
Modify RELEASE.txt in response to PR comments
Check in files generated by autogen.sh for hdf5_1_10_5 release branch.
Check in files generated by autogen.sh for hdf5_1_10_5 release branch. 2019/02/16.
Code improvement
...
Diffstat (limited to 'src/H5Dprivate.h')
| -rw-r--r-- | src/H5Dprivate.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index cbee0de..00e1e28 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -45,6 +45,7 @@ #define H5D_CRT_FILL_VALUE_NAME "fill_value" /* Fill value */ #define H5D_CRT_ALLOC_TIME_STATE_NAME "alloc_time_state" /* Space allocation time state */ #define H5D_CRT_EXT_FILE_LIST_NAME "efl" /* External file list */ +#define H5D_CRT_MIN_DSET_HDR_SIZE_NAME "dset_oh_minimize" /* Minimize dataset object header */ /* ======== Dataset access property names ======== */ #define H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME "rdcc_nslots" /* Size of raw data chunk cache(slots) */ @@ -94,7 +95,13 @@ /* Definitions for all collective chunk instrumentation properties */ #define H5D_XFER_COLL_CHUNK_SIZE sizeof(unsigned) #define H5D_XFER_COLL_CHUNK_DEF 1 -#define H5D_XFER_COLL_CHUNK_FIX 0 + +/* General collective I/O instrumentation properties */ +#define H5D_XFER_COLL_RANK0_BCAST_NAME "coll_rank0_bcast" + +/* Definitions for general collective I/O instrumentation properties */ +#define H5D_XFER_COLL_RANK0_BCAST_SIZE sizeof(hbool_t) +#define H5D_XFER_COLL_RANK0_BCAST_DEF FALSE #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ /* Default temporary buffer size */ |