summaryrefslogtreecommitdiffstats
path: root/src/H5Pfapl.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-07-30 21:53:01 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-07-30 21:53:01 (GMT)
commit2a64d2fe93a0ba1da27c77df8a9e3b76e3cd5ee9 (patch)
tree7b3475f076365f2006ffaac55161183d4170c777 /src/H5Pfapl.c
parent5632094d5c733af77003ecf4051a14f38645d993 (diff)
downloadhdf5-2a64d2fe93a0ba1da27c77df8a9e3b76e3cd5ee9.zip
hdf5-2a64d2fe93a0ba1da27c77df8a9e3b76e3cd5ee9.tar.gz
hdf5-2a64d2fe93a0ba1da27c77df8a9e3b76e3cd5ee9.tar.bz2
Change H5F_open to perform deduplication of open VFDs in a more flexible way,
using the new routine H5FDdeduplicate(). Simplify H5F_open() a bit, pushing some of the configuration checks into the SMWR VFD. For example, check that page buffering is enabled in H5FD_vfd_swmr_open() instead of in H5F_open(). Compare VFD SWMR configurations in H5FD_vfd_swmr_dedup() instead of in H5F_open(). Clone the default file-access property list at a new file-access property list ID, H5P_FILE_ACCESS_ANY_VFD. The new ID is used to indicate that if the file that's being opened is already open under an existing virtual file, and if that virtual file would not ordinarily be opened with the default FAPL, then it's ok to use that virtual file. Add a new optional method, `dedup`, to H5FD_class_t, and use it to customize a VFD's deduplication. Customize the SWMR VFD's deduplication. Make it honor H5P_FILE_ACCESS_ANY_VFD Embed the VFD SWMR configuration in the H5FD_vfd_swmr_t to facilitate comparison of configuration between new and old SWMR virtual files. In H5F__sfile_search(), match using a pointer comparison instead of H5FD_cmp(), because we will only ever enter H5F__sfile_search() with a deduplicated H5FD_t *.
Diffstat (limited to 'src/H5Pfapl.c')
-rw-r--r--src/H5Pfapl.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 678dbf7..ed6f06a 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -721,6 +721,13 @@ H5P__facc_reg_prop(H5P_genclass_t *pclass)
H5F_ACS_VOL_CONN_DEL, H5F_ACS_VOL_CONN_COPY, H5F_ACS_VOL_CONN_CMP, H5F_ACS_VOL_CONN_CLOSE) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+ if (H5P_LST_FILE_ACCESS_ANY_VFD_g == H5I_INVALID_HID) {
+ H5P_LST_FILE_ACCESS_ANY_VFD_g = H5P_create_id(pclass, false);
+ if (H5P_LST_FILE_ACCESS_ANY_VFD_g == H5I_INVALID_HID) {
+ HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL,
+ "can't create any-vfd fapl");
+ }
+ }
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5P__facc_reg_prop() */