diff options
author | vchoi <vchoi@jelly.ad.hdfgroup.org> | 2022-04-21 22:00:00 (GMT) |
---|---|---|
committer | vchoi <vchoi@jelly.ad.hdfgroup.org> | 2022-04-21 22:00:00 (GMT) |
commit | 21c9366d1dc9e72ee43da7071da932a49483e2bb (patch) | |
tree | 4a8362580b8210e1e28d8d2bd50df0ad57d36761 /test | |
parent | 9163f6ca9bc447bfbd50554d10e0d9e7eb076724 (diff) | |
parent | 3ed0a0ee541f90e316bbabce0b3841a306420994 (diff) | |
download | hdf5-21c9366d1dc9e72ee43da7071da932a49483e2bb.zip hdf5-21c9366d1dc9e72ee43da7071da932a49483e2bb.tar.gz hdf5-21c9366d1dc9e72ee43da7071da932a49483e2bb.tar.bz2 |
Merge branch 'new_vds_feature_vfd_swmr' of https://github.com/vchoi-hdfgroup/hdf5 into new_vds_feature_vfd_swmr
Diffstat (limited to 'test')
-rw-r--r-- | test/vfd_swmr.c | 24 | ||||
-rw-r--r-- | test/vfd_swmr_attrdset_writer.c | 12 | ||||
-rw-r--r-- | test/vfd_swmr_bigset_writer.c | 21 | ||||
-rw-r--r-- | test/vfd_swmr_common.c | 26 | ||||
-rw-r--r-- | test/vfd_swmr_common.h | 6 | ||||
-rw-r--r-- | test/vfd_swmr_dsetchks_writer.c | 4 | ||||
-rw-r--r-- | test/vfd_swmr_dsetops_writer.c | 7 | ||||
-rw-r--r-- | test/vfd_swmr_generator.c | 3 | ||||
-rw-r--r-- | test/vfd_swmr_gfail_writer.c | 4 | ||||
-rw-r--r-- | test/vfd_swmr_gperf_writer.c | 4 | ||||
-rw-r--r-- | test/vfd_swmr_group_writer.c | 4 | ||||
-rw-r--r-- | test/vfd_swmr_indep_rw_writer.c | 4 | ||||
-rw-r--r-- | test/vfd_swmr_remove_reader.c | 6 | ||||
-rw-r--r-- | test/vfd_swmr_vlstr_reader.c | 6 | ||||
-rw-r--r-- | test/vfd_swmr_zoo_writer.c | 3 |
15 files changed, 70 insertions, 64 deletions
diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c index f53b453..cffe503 100644 --- a/test/vfd_swmr.c +++ b/test/vfd_swmr.c @@ -183,7 +183,7 @@ test_fapl(void) /* Set valid md_pages_reserved */ my_config->md_pages_reserved = 2; - my_config->writer = TRUE; + my_config->writer = TRUE; /* Should fail: at least one of maintain_metadata_file and generate_updater_files must be true */ H5E_BEGIN_TRY @@ -1409,7 +1409,8 @@ test_reader_md_concur(void) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(config_reader, 1, 3, FALSE, FALSE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME, NULL); + init_vfd_swmr_config(config_reader, 1, 3, FALSE, FALSE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME, + NULL); /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ fapl_reader = vfd_swmr_create_fapl(FALSE, TRUE, FALSE, FS_PAGE_SIZE, config_reader); @@ -2017,7 +2018,8 @@ test_multiple_file_opens_concur(void) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(config_writer, 1, 3, FALSE, TRUE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME2, NULL); + init_vfd_swmr_config(config_writer, 1, 3, FALSE, TRUE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME2, + NULL); /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ fapl_writer = vfd_swmr_create_fapl(FALSE, TRUE, FALSE, FS_PAGE_SIZE, config_writer); @@ -2350,7 +2352,8 @@ test_disable_enable_eot_concur(void) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(config_reader, 1, 3, FALSE, FALSE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME, NULL); + init_vfd_swmr_config(config_reader, 1, 3, FALSE, FALSE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME, + NULL); /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ fapl_reader = vfd_swmr_create_fapl(FALSE, TRUE, FALSE, FS_PAGE_SIZE, config_reader); @@ -2638,7 +2641,8 @@ test_file_end_tick_concur(void) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(config_reader, 1, 3, FALSE, FALSE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME, NULL); + init_vfd_swmr_config(config_reader, 1, 3, FALSE, FALSE, TRUE, FALSE, TRUE, 256, NULL, MD_FILENAME, + NULL); /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ fapl_reader = vfd_swmr_create_fapl(FALSE, TRUE, FALSE, FS_PAGE_SIZE, config_reader); @@ -3721,7 +3725,7 @@ error: static unsigned test_updater_flags(void) { - char filename[FILE_NAME_LEN]; /* Filename to use */ + char filename[FILE_NAME_LEN]; /* Filename to use */ hid_t fid = H5I_INVALID_HID; /* File ID */ hid_t fcpl = H5I_INVALID_HID; /* File creation property list ID */ hid_t fapl = H5I_INVALID_HID; /* File access property list ID */ @@ -3766,13 +3770,12 @@ test_updater_flags(void) /* FILENAME */ h5_fixname("vfd_swmr_file", fapl, filename, sizeof(filename)); - + if ((fcpl = vfd_swmr_create_fcpl(H5F_FSPACE_STRATEGY_PAGE, 4096)) < 0) { HDprintf("vfd_swmr_create_fcpl() failed"); FAIL_STACK_ERROR; } - if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) TEST_ERROR; @@ -4281,8 +4284,8 @@ test_updater_generate_md_checksums(hbool_t file_create) hid_t fapl = H5I_INVALID_HID; /* File access property list ID */ H5F_vfd_swmr_config_t config; /* Configuration for VFD SWMR */ H5F_generate_md_ck_cb_t cb_info; /* Callback */ - H5F_t * f = NULL; /* Internal file object pointer */ - char *md_file_path_name; + H5F_t * f = NULL; /* Internal file object pointer */ + char * md_file_path_name; if (file_create) { TESTING("VFD SWMR updater generate checksums for metadata file with H5Fcreate"); @@ -4336,7 +4339,6 @@ test_updater_generate_md_checksums(hbool_t file_create) /* Get the full metadata file pathname */ md_file_path_name = HDstrdup(f->shared->md_file_path_name); - /* Close the file */ if (H5Fclose(fid) < 0) FAIL_STACK_ERROR; diff --git a/test/vfd_swmr_attrdset_writer.c b/test/vfd_swmr_attrdset_writer.c index 4b3dbc0..85ceb01 100644 --- a/test/vfd_swmr_attrdset_writer.c +++ b/test/vfd_swmr_attrdset_writer.c @@ -135,7 +135,7 @@ static hbool_t state_init(state_t *s, int argc, const char *const *argv); static hbool_t np_init(np_state_t *np, hbool_t writer); static hbool_t np_close(np_state_t *np, hbool_t writer); static hbool_t np_writer(hbool_t result, unsigned step, const state_t *s, np_state_t *np, - H5F_vfd_swmr_config_t *config); + H5F_vfd_swmr_config_t *config); static hbool_t np_reader(hbool_t result, unsigned step, const state_t *s, np_state_t *np); static hbool_t np_confirm_verify_notify(int fd, unsigned step, const state_t *s, np_state_t *np); static hbool_t np_reader_no_verification(const state_t *s, np_state_t *np, H5F_vfd_swmr_config_t *config); @@ -143,11 +143,11 @@ static hbool_t np_reader_no_verification(const state_t *s, np_state_t *np, H5F_v static hbool_t create_dsets(const state_t *s, dsets_state_t *ds); static hbool_t open_dsets(const state_t *s, dsets_state_t *ds); static hbool_t open_dset_real(hid_t fid, hid_t *did, const char *name, unsigned *max_compact, - unsigned *min_dense); + unsigned *min_dense); static hbool_t close_dsets(const dsets_state_t *ds); static hbool_t perform_dsets_operations(state_t *s, dsets_state_t *ds, H5F_vfd_swmr_config_t *config, - np_state_t *np); + np_state_t *np); static hbool_t attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, unsigned which); static hbool_t attr_action(unsigned action, const state_t *s, hid_t did, unsigned which); static hbool_t add_attr(const state_t *s, hid_t did, unsigned int which); @@ -155,14 +155,14 @@ static hbool_t modify_attr(const state_t *s, hid_t did, unsigned int which); static hbool_t delete_attr(hid_t did, unsigned int which); static hbool_t verify_dsets_operations(state_t *s, dsets_state_t *ds, H5F_vfd_swmr_config_t *config, - np_state_t *np); + np_state_t *np); static hbool_t verify_attr_dsets_action(unsigned action, const state_t *s, const dsets_state_t *ds, - unsigned which); + unsigned which); static hbool_t verify_attr_action(unsigned action, hid_t did, unsigned which); static hbool_t verify_add_or_modify_attr(unsigned action, hid_t did, char *attr_name, unsigned int which); static hbool_t verify_delete_attr(hid_t did, char *attr_name); static hbool_t verify_storage_cont(unsigned action, hid_t did, unsigned int which, unsigned max_compact, - unsigned min_dense, unsigned asteps); + unsigned min_dense, unsigned asteps); static hbool_t verify_storage_cont_real(hid_t did, unsigned int which, unsigned cut_point); /* Names for datasets */ diff --git a/test/vfd_swmr_bigset_writer.c b/test/vfd_swmr_bigset_writer.c index b647dd6..6ff5d03 100644 --- a/test/vfd_swmr_bigset_writer.c +++ b/test/vfd_swmr_bigset_writer.c @@ -2589,21 +2589,22 @@ main(int argc, char **argv) /* If using the auxiliary process, the writer creates the updater files. * The reader uses the metadata file generated by the auxiliary process. */ if (s.writer) { - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, s.writer, FALSE, TRUE, s.flush_raw_data, 128, - "./", "bigset-shadow-%zu", "bigset_updater", i); + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, s.writer, FALSE, TRUE, + s.flush_raw_data, 128, "./", "bigset-shadow-%zu", "bigset_updater", i); } else { - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, s.writer, TRUE, FALSE, s.flush_raw_data, 128, - "./", "mdfile", NULL); + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, s.writer, TRUE, FALSE, + s.flush_raw_data, 128, "./", "mdfile", NULL); } #else - if(s.vds == vds_multi || s.vds == vds_single) { - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, TRUE, s.writer, TRUE, FALSE, s.flush_raw_data, 128, - "", "", NULL); - } else { - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, s.writer, TRUE, FALSE, s.flush_raw_data, 128, - "./", "bigset-shadow-%zu", NULL, i); + if (s.vds == vds_multi || s.vds == vds_single) { + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, TRUE, s.writer, TRUE, FALSE, + s.flush_raw_data, 128, "", "", NULL); + } + else { + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, s.writer, TRUE, FALSE, + s.flush_raw_data, 128, "./", "bigset-shadow-%zu", NULL, i); } #endif diff --git a/test/vfd_swmr_common.c b/test/vfd_swmr_common.c index e1d1ccc..1b87d5f 100644 --- a/test/vfd_swmr_common.c +++ b/test/vfd_swmr_common.c @@ -326,13 +326,13 @@ await_signal(hid_t fid) #endif /* H5_HAVE_WIN32_API */ -/* +/* * Revised support routines that can be used for all VFD SWMR integration tests */ void -init_vfd_swmr_config(H5F_vfd_swmr_config_t *config, uint32_t tick_len, uint32_t max_lag, - hbool_t presume_posix_semantics, hbool_t writer, hbool_t maintain_metadata_file, - hbool_t generate_updater_files, hbool_t flush_raw_data, uint32_t md_pages_reserved, +init_vfd_swmr_config(H5F_vfd_swmr_config_t *config, uint32_t tick_len, uint32_t max_lag, + hbool_t presume_posix_semantics, hbool_t writer, hbool_t maintain_metadata_file, + hbool_t generate_updater_files, hbool_t flush_raw_data, uint32_t md_pages_reserved, const char *md_file_path, const char *md_file_fmtstr, const char *updater_file_path, ...) { va_list ap; @@ -342,21 +342,21 @@ init_vfd_swmr_config(H5F_vfd_swmr_config_t *config, uint32_t tick_len, uint32_t config->version = H5F__CURR_VFD_SWMR_CONFIG_VERSION; config->pb_expansion_threshold = 0; - config->tick_len = tick_len; - config->max_lag = max_lag; + config->tick_len = tick_len; + config->max_lag = max_lag; config->presume_posix_semantics = presume_posix_semantics; - config->writer = writer; - config->maintain_metadata_file = maintain_metadata_file; - config->generate_updater_files = generate_updater_files; - config->flush_raw_data = flush_raw_data; - config->md_pages_reserved = md_pages_reserved; + config->writer = writer; + config->maintain_metadata_file = maintain_metadata_file; + config->generate_updater_files = generate_updater_files; + config->flush_raw_data = flush_raw_data; + config->md_pages_reserved = md_pages_reserved; - if(md_file_path == NULL) + if (md_file_path == NULL) config->md_file_path[0] = '\0'; else HDstrcpy(config->md_file_path, md_file_path); - if(md_file_fmtstr == NULL) + if (md_file_fmtstr == NULL) config->md_file_name[0] = '\0'; else { diff --git a/test/vfd_swmr_common.h b/test/vfd_swmr_common.h index 0453d91..8d6f2d5 100644 --- a/test/vfd_swmr_common.h +++ b/test/vfd_swmr_common.h @@ -74,9 +74,9 @@ H5TEST_DLL hid_t vfd_swmr_create_fapl(bool use_latest_format, bool use_vfd_swmr, size_t page_buf_size, H5F_vfd_swmr_config_t *config); H5TEST_DLL void init_vfd_swmr_config(H5F_vfd_swmr_config_t *config, uint32_t tick_len, uint32_t max_lag, - hbool_t presume_posix_semantics, hbool_t writer, - hbool_t maintain_metadata_file, hbool_t generate_updater_files, - hbool_t flush_raw_data, uint32_t md_pages_reserved, + hbool_t presume_posix_semantics, hbool_t writer, + hbool_t maintain_metadata_file, hbool_t generate_updater_files, + hbool_t flush_raw_data, uint32_t md_pages_reserved, const char *md_file_path, const char *md_file_fmtstr, const char *updater_file_path, ...) H5_ATTR_FORMAT(printf, 11, 13); diff --git a/test/vfd_swmr_dsetchks_writer.c b/test/vfd_swmr_dsetchks_writer.c index 0acacce..1e4de5a 100644 --- a/test/vfd_swmr_dsetchks_writer.c +++ b/test/vfd_swmr_dsetchks_writer.c @@ -2311,8 +2311,8 @@ main(int argc, char **argv) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&config, 4, 7, FALSE, writer, TRUE, FALSE, s.flush_raw_data, 128, - "./", "dsetchks-shadow", NULL); + init_vfd_swmr_config(&config, 4, 7, FALSE, writer, TRUE, FALSE, s.flush_raw_data, 128, "./", + "dsetchks-shadow", NULL); /* 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) { diff --git a/test/vfd_swmr_dsetops_writer.c b/test/vfd_swmr_dsetops_writer.c index bce1d08..cdb84b2 100644 --- a/test/vfd_swmr_dsetops_writer.c +++ b/test/vfd_swmr_dsetops_writer.c @@ -2228,10 +2228,11 @@ main(int argc, char **argv) TEST_ERROR; } - /* config, tick_len, max_lag, presume_posix_semantics, writer, - * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, + /* config, tick_len, max_lag, presume_posix_semantics, writer, + * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&config, 4, 7, FALSE, writer, TRUE, FALSE, s.flush_raw_data, 128, "./", "dsetops-shadow", NULL); + init_vfd_swmr_config(&config, 4, 7, FALSE, writer, TRUE, FALSE, s.flush_raw_data, 128, "./", + "dsetops-shadow", NULL); /* 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) { diff --git a/test/vfd_swmr_generator.c b/test/vfd_swmr_generator.c index e002b4d..1392293 100644 --- a/test/vfd_swmr_generator.c +++ b/test/vfd_swmr_generator.c @@ -128,7 +128,8 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t vfd_swmr_write, int /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(config, 4, 10, FALSE, vfd_swmr_write, TRUE, FALSE, TRUE, 128, NULL, "generator-shadow", NULL); + init_vfd_swmr_config(config, 4, 10, FALSE, vfd_swmr_write, TRUE, FALSE, TRUE, 128, NULL, + "generator-shadow", NULL); } /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ diff --git a/test/vfd_swmr_gfail_writer.c b/test/vfd_swmr_gfail_writer.c index fc3bcb0..10370cc 100644 --- a/test/vfd_swmr_gfail_writer.c +++ b/test/vfd_swmr_gfail_writer.c @@ -547,8 +547,8 @@ main(int argc, char **argv) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, writer, TRUE, FALSE, TRUE, 128, - "./", "group-shadow", NULL); + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, writer, TRUE, FALSE, TRUE, 128, "./", + "group-shadow", NULL); /* If old-style option is chosen, use the earliest file format(H5F_LIBVER_EARLIEST) * as the second parameter of H5Pset_libver_bound() that is called by diff --git a/test/vfd_swmr_gperf_writer.c b/test/vfd_swmr_gperf_writer.c index a1f3ff1..c376b51 100644 --- a/test/vfd_swmr_gperf_writer.c +++ b/test/vfd_swmr_gperf_writer.c @@ -2807,8 +2807,8 @@ main(int argc, char **argv) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, writer, TRUE, FALSE, FALSE, 128, - "./", "group-shadow", NULL); + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, writer, TRUE, FALSE, FALSE, 128, "./", + "group-shadow", NULL); /* If the log flag is on, create the log file log-test under the current directory. */ if (s.glog == true) diff --git a/test/vfd_swmr_group_writer.c b/test/vfd_swmr_group_writer.c index 50e0535..dd387b2 100644 --- a/test/vfd_swmr_group_writer.c +++ b/test/vfd_swmr_group_writer.c @@ -5006,8 +5006,8 @@ main(int argc, char **argv) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, writer, TRUE, FALSE, TRUE, 128, - "./", "group-shadow", NULL); + init_vfd_swmr_config(&config, s.tick_len, s.max_lag, FALSE, writer, TRUE, FALSE, TRUE, 128, "./", + "group-shadow", NULL); /* If old-style option is chosen, use the earliest file format(H5F_LIBVER_EARLIEST) * as the second parameter of H5Pset_libver_bound() that is called by diff --git a/test/vfd_swmr_indep_rw_writer.c b/test/vfd_swmr_indep_rw_writer.c index 97bb9b1..77eee74 100644 --- a/test/vfd_swmr_indep_rw_writer.c +++ b/test/vfd_swmr_indep_rw_writer.c @@ -367,8 +367,8 @@ indep_init_vfd_swmr_config_plist(state_t *s, hbool_t writer, const char *mdf_nam /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&config, s->tick_len, s->max_lag, FALSE, writer, TRUE, FALSE, TRUE, 128, - "./", mdf_name, NULL); + init_vfd_swmr_config(&config, s->tick_len, s->max_lag, FALSE, writer, TRUE, FALSE, TRUE, 128, "./", + mdf_name, NULL); /* Pass the use_vfd_swmr, only_meta_page, page buffer size, config to vfd_swmr_create_fapl().*/ if ((s->fapl = vfd_swmr_create_fapl(TRUE, s->use_vfd_swmr, TRUE, s->pbs, &config)) < 0) { diff --git a/test/vfd_swmr_remove_reader.c b/test/vfd_swmr_remove_reader.c index 9b73adc..775eb76 100644 --- a/test/vfd_swmr_remove_reader.c +++ b/test/vfd_swmr_remove_reader.c @@ -303,9 +303,9 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns if ((config = HDcalloc(1, sizeof(*config))) == NULL) goto error; - /* config, tick_len, max_lag, presume_posix_semantics, writer, - * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, - * md_file_path, md_file_name, updater_file_path */ + /* config, tick_len, max_lag, presume_posix_semantics, writer, + * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, + * md_file_path, md_file_name, updater_file_path */ init_vfd_swmr_config(config, 4, 5, FALSE, FALSE, TRUE, FALSE, TRUE, 128, NULL, "rw-shadow", NULL); /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ diff --git a/test/vfd_swmr_vlstr_reader.c b/test/vfd_swmr_vlstr_reader.c index 406f13b..dc403cf 100644 --- a/test/vfd_swmr_vlstr_reader.c +++ b/test/vfd_swmr_vlstr_reader.c @@ -115,9 +115,9 @@ main(int argc, char **argv) if (argc > 0) errx(EXIT_FAILURE, "unexpected command-line arguments"); - /* config, tick_len, max_lag, presume_posix_semantics, writer, - * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, - * md_file_path, md_file_name, updater_file_path */ + /* config, tick_len, max_lag, presume_posix_semantics, writer, + * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, + * md_file_path, md_file_name, updater_file_path */ init_vfd_swmr_config(&config, 4, 7, FALSE, false, TRUE, FALSE, TRUE, 128, "./", "vlstr-shadow", NULL); /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ diff --git a/test/vfd_swmr_zoo_writer.c b/test/vfd_swmr_zoo_writer.c index a040fca..4a6e61c 100644 --- a/test/vfd_swmr_zoo_writer.c +++ b/test/vfd_swmr_zoo_writer.c @@ -478,7 +478,8 @@ main(int argc, char **argv) /* config, tick_len, max_lag, presume_posix_semantics, writer, * maintain_metadata_file, generate_updater_files, flush_raw_data, md_pages_reserved, * md_file_path, md_file_name, updater_file_path */ - init_vfd_swmr_config(&vfd_swmr_config, TICK_LEN, 7, FALSE, writer, TRUE, FALSE, TRUE, 128, "./", "zoo-shadow", NULL); + init_vfd_swmr_config(&vfd_swmr_config, TICK_LEN, 7, FALSE, writer, TRUE, FALSE, TRUE, 128, "./", + "zoo-shadow", NULL); /* ? turn off use latest format argument via 1st argument? since later on it reset to early format */ /* use_latest_format, use_vfd_swmr, only_meta_page, page_buf_size, config */ |