Modifications to common routines used by VFD SWMR tests:

(1) Add a parameter page_buf_size to the common routine vfd_swmr_create_fapl().
(2) Add a new common routine vfd_swmr_create_fcpl() to set the file space strategy and file space page size.
VFD SWMR tests are modified accordingly to call the above routines.

1 files changed, 5 insertions, 10 deletions

diff --git a/test/vfd_swmr_dsetchks_writer.c b/test/vfd_swmr_dsetchks_writer.c
index 25066d8..7daf567 100644
--- a/test/vfd_swmr_dsetchks_writer.c
+++ b/test/vfd_swmr_dsetchks_writer.c
@@ -1620,7 +1620,6 @@ verify_dsets_chunks(unsigned action, const state_t *s, const dsets_state_t *ds,
     hsize_t       stride[2] = {0, 0};
     hsize_t       count[2]  = {0, 0};
     hsize_t       block[2]  = {0, 0};
-    unsigned int *vbuf      = NULL;
 
     HDassert(s->implicit_index || s->fa_index || s->ea_index || s->bt2_index);
 
@@ -2153,19 +2152,15 @@ main(int argc, char **argv)
     /* config, tick_len, max_lag, writer, flush_raw_data, md_pages_reserved, md_file_path */
     init_vfd_swmr_config(&config, 4, 7, writer, FALSE, 128, "./dsetchks-shadow");
 
-    /* use_latest_format, use_vfd_swmr, only_meta_page, config */
-    if ((fapl = vfd_swmr_create_fapl(true, s.use_vfd_swmr, true, &config)) < 0) {
+    /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */
+    if ((fapl = vfd_swmr_create_fapl(true, s.use_vfd_swmr, true, 4096, &config)) < 0) {
         printf("vfd_swmr_create_fapl() failed\n");
         TEST_ERROR;
     }
 
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) {
-        printf("H5Pcreate failed\n");
-        TEST_ERROR;
-    }
-
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, 1) < 0) {
-        printf("H5Pset_file_space_strategy failed\n");
+    /* Set fs_strategy (file space strategy) and fs_page_size (file space page size) */
+    if ((fcpl = vfd_swmr_create_fcpl(H5F_FSPACE_STRATEGY_PAGE, 4096)) < 0) {
+        HDprintf("vfd_swmr_create_fcpl() failed");
         TEST_ERROR;
     }