diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2019-10-11 20:02:54 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2019-10-11 20:02:54 (GMT) |
commit | 1fa1ec619011a1ba13935a5c68f217e60f20c0a7 (patch) | |
tree | 0cf682df6376db930f2fb86e99bf6eb39ccee868 /src/H5VLnative.h | |
parent | af2e625041ee761f5e88d0ea221a356c28302841 (diff) | |
parent | 75f2ed6167b094431fce2b4b700b3cf9da564c51 (diff) | |
download | hdf5-1fa1ec619011a1ba13935a5c68f217e60f20c0a7.zip hdf5-1fa1ec619011a1ba13935a5c68f217e60f20c0a7.tar.gz hdf5-1fa1ec619011a1ba13935a5c68f217e60f20c0a7.tar.bz2 |
Merge pull request #2001 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_12_alpha_merges to hdf5_1_12
* commit '75f2ed6167b094431fce2b4b700b3cf9da564c51':
Fixed a bug (HDFFV-10899) where the behavior of the deprecated H5Gget_objinfo() call had changed and passing in a non-existing soft link with a statbuf of NULL passed instead of failed (as it should as per the RM). The HDF5 1.8 and 1.10 behavior was restored and H5Gget_objinfo() will now fail and return -1 as before.
Fixed the java assert issue with H5O cache corking calls.
Corrected missing parallel #ifdefs.
Converted H5O MD cache cork calls to use the VOL.
Marked up H5Fget/set_mpi_atomicity() to use the VOL.
Diffstat (limited to 'src/H5VLnative.h')
-rw-r--r-- | src/H5VLnative.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/H5VLnative.h b/src/H5VLnative.h index ec0ecbc..5b51e66 100644 --- a/src/H5VLnative.h +++ b/src/H5VLnative.h @@ -74,6 +74,8 @@ typedef int H5VL_native_file_optional_t; #define H5VL_NATIVE_FILE_SET_LIBVER_BOUNDS 24 /* H5Fset_latest_format/libver_bounds */ #define H5VL_NATIVE_FILE_GET_MIN_DSET_OHDR_FLAG 25 /* H5Fget_dset_no_attrs_hint */ #define H5VL_NATIVE_FILE_SET_MIN_DSET_OHDR_FLAG 26 /* H5Fset_dset_no_attrs_hint */ +#define H5VL_NATIVE_FILE_GET_MPI_ATOMICITY 27 /* H5Fget_mpi_atomicity */ +#define H5VL_NATIVE_FILE_SET_MPI_ATOMICITY 28 /* H5Fset_mpi_atomicity */ /* Typedef and values for native VOL connector group optional VOL operations */ typedef int H5VL_native_group_optional_t; @@ -84,9 +86,12 @@ typedef int H5VL_native_group_optional_t; /* Typedef and values for native VOL connector object optional VOL operations */ typedef int H5VL_native_object_optional_t; -#define H5VL_NATIVE_OBJECT_GET_COMMENT 0 /* H5G|H5Oget_comment, H5Oget_comment_by_name */ -#define H5VL_NATIVE_OBJECT_GET_INFO 1 /* H5Oget_info(_by_idx, _by_name)(2) */ -#define H5VL_NATIVE_OBJECT_SET_COMMENT 2 /* H5G|H5Oset_comment, H5Oset_comment_by_name */ +#define H5VL_NATIVE_OBJECT_GET_COMMENT 0 /* H5G|H5Oget_comment, H5Oget_comment_by_name */ +#define H5VL_NATIVE_OBJECT_GET_INFO 1 /* H5Oget_info(_by_idx, _by_name)(2) */ +#define H5VL_NATIVE_OBJECT_SET_COMMENT 2 /* H5G|H5Oset_comment, H5Oset_comment_by_name */ +#define H5VL_NATIVE_OBJECT_DISABLE_MDC_FLUSHES 3 /* H5Odisable_mdc_flushes */ +#define H5VL_NATIVE_OBJECT_ENABLE_MDC_FLUSHES 4 /* H5Oenable_mdc_flushes */ +#define H5VL_NATIVE_OBJECT_ARE_MDC_FLUSHES_DISABLED 5 /* H5Oare_mdc_flushes_disabled */ #ifdef __cplusplus extern "C" { |