diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-07 16:38:55 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2016-02-07 16:38:55 (GMT) |
| commit | 0461830ee3a7eea419fbb6629c47e40c27aaf6f8 (patch) | |
| tree | c4955c2febb9606bb68f803276b79503ba3f7a00 /src/H5ACprivate.h | |
| parent | c3f08947c1fbca8f6ccd87ca35f0f23b6209b129 (diff) | |
| parent | 48bebcc39ef565796356c159d16f09bfb0efba4d (diff) | |
| download | hdf5-0461830ee3a7eea419fbb6629c47e40c27aaf6f8.zip hdf5-0461830ee3a7eea419fbb6629c47e40c27aaf6f8.tar.gz hdf5-0461830ee3a7eea419fbb6629c47e40c27aaf6f8.tar.bz2 | |
[svn-r29059] merge from trunk.
Diffstat (limited to 'src/H5ACprivate.h')
| -rw-r--r-- | src/H5ACprivate.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 17d8776..7481f0a 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -181,8 +181,6 @@ typedef H5C_cache_entry_t H5AC_info_t; /* Typedef for metadata cache (defined in H5Cpkg.h) */ typedef H5C_t H5AC_t; -/* Metadata specific properties for FAPL */ -/* (Only used for parallel I/O) */ #ifdef H5_HAVE_PARALLEL /* Definitions for "collective metadata write" property */ #define H5AC_COLLECTIVE_META_WRITE_NAME "H5AC_collective_metadata_write" @@ -196,13 +194,20 @@ typedef H5C_t H5AC_t; #define H5AC_RING_NAME "H5AC_ring_type" -/* Dataset transfer property list for flush calls */ -extern hid_t H5AC_dxpl_id; +/* Dataset transfer property list for metadata calls */ +H5_DLLVAR hid_t H5AC_dxpl_id; extern hid_t H5AC_ind_read_dxpl_id; #ifdef H5_HAVE_PARALLEL extern hid_t H5AC_coll_read_dxpl_id; #endif /* H5_HAVE_PARALLEL */ +/* DXPL to be used in operations that will not result in I/O calls */ +extern hid_t H5AC_noio_dxpl_id; + +/* DXPL to be used for raw data I/O operations when one is not + provided by the user (fill values in H5Dcreate) */ +extern hid_t H5AC_rawdata_dxpl_id; + /* Default cache configuration. */ #define H5AC__DEFAULT_METADATA_WRITE_STRATEGY \ @@ -341,7 +346,7 @@ H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, H5_DLL herr_t H5AC_flush(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5AC_mark_entry_dirty(void *thing); H5_DLL herr_t H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, - haddr_t old_addr, haddr_t new_addr); + haddr_t old_addr, haddr_t new_addr, hid_t dxpl_id); H5_DLL herr_t H5AC_dest(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5AC_expunge_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, unsigned flags); |