diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 00:39:37 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2021-03-25 00:39:37 (GMT) |
| commit | feb20aac304b39e18c70f88cae2f7cf7d5c82db2 (patch) | |
| tree | e15d7e751af4e3c42e77ea955d91db4cf27a71cf /test/page_buffer.c | |
| parent | bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23 (diff) | |
| download | hdf5-feb20aac304b39e18c70f88cae2f7cf7d5c82db2.zip hdf5-feb20aac304b39e18c70f88cae2f7cf7d5c82db2.tar.gz hdf5-feb20aac304b39e18c70f88cae2f7cf7d5c82db2.tar.bz2 | |
Formats the source and updates the gcc warning pragmas
Diffstat (limited to 'test/page_buffer.c')
| -rw-r--r-- | test/page_buffer.c | 2523 |
1 files changed, 1157 insertions, 1366 deletions
diff --git a/test/page_buffer.c b/test/page_buffer.c index 4526410..84e6c33 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -12,12 +12,12 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*********************************************************** -* -* Test program: cache_page_buffer -* -* Tests the Page Buffer Feature. -* -*************************************************************/ + * + * Test program: cache_page_buffer + * + * Tests the Page Buffer Feature. + * + *************************************************************/ #include "h5test.h" @@ -25,33 +25,31 @@ * This file needs to access private information from the H5C package. * This file also needs to access the metadata cache testing code. */ -#define H5C_FRIEND /*suppress error about including H5Cpkg */ -#define H5C_TESTING /*suppress warning about H5C testing funcs*/ -#include "H5Cpkg.h" /* Cache */ +#define H5C_FRIEND /*suppress error about including H5Cpkg */ +#define H5C_TESTING /*suppress warning about H5C testing funcs*/ +#include "H5Cpkg.h" /* Cache */ - -#include "H5CXprivate.h" /* API Contexts */ +#include "H5CXprivate.h" /* API Contexts */ #include "H5Iprivate.h" #include "H5PBprivate.h" -#include "H5VLprivate.h" /* Virtual Object Layer */ +#include "H5VLprivate.h" /* Virtual Object Layer */ /* * This file needs to access private information from the H5F package. */ -#define H5MF_FRIEND /*suppress error about including H5MFpkg */ +#define H5MF_FRIEND /*suppress error about including H5MFpkg */ #include "H5MFpkg.h" -#define H5F_FRIEND /*suppress error about including H5Fpkg */ +#define H5F_FRIEND /*suppress error about including H5Fpkg */ #define H5F_TESTING #include "H5Fpkg.h" - -#define FILENAME_LEN 1024 +#define FILENAME_LEN 1024 #ifndef H5_HAVE_PARALLEL -#define NUM_DSETS 5 -#define NX 100 -#define NY 50 +#define NUM_DSETS 5 +#define NX 100 +#define NY 50 #endif /* helper routines */ @@ -62,28 +60,24 @@ static unsigned open_file(char *filename, hid_t fapl, hsize_t page_size, size_t /* test routines */ #ifdef H5_HAVE_PARALLEL -static unsigned verify_page_buffering_disabled(hid_t orig_fapl, - const char *env_h5_drvr); +static unsigned verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr); #else static unsigned test_args(hid_t fapl, const char *env_h5_drvr); -static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, - bool); +static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, bool); static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr); -static unsigned md_entry_splitting_smoke_check(hid_t orig_fapl, - const char *env_h5_drvr, bool); -static unsigned md_entry_splitting_boundary_test(hid_t orig_fapl, - const char *env_h5_drvr, bool); +static unsigned md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, bool); +static unsigned md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, bool); #endif /* H5_HAVE_PARALLEL */ #define FILENAME "filepaged" static const char *namebases[] = {FILENAME, NULL}; -static const char *namebase = FILENAME; +static const char *namebase = FILENAME; static hid_t paging_fcpl_create(const hsize_t pgsz) -{ +{ hid_t fcpl = H5I_INVALID_HID; if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -103,15 +97,13 @@ error: static int swmr_fapl_augment(hid_t fapl, const char *filename, uint32_t max_lag) { - H5F_vfd_swmr_config_t config = { - .version = H5F__CURR_VFD_SWMR_CONFIG_VERSION - , .tick_len = 4 - , .max_lag = max_lag - , .writer = true - , .md_pages_reserved = 128 - }; - char *bname = NULL; - char *dname = NULL; + H5F_vfd_swmr_config_t config = {.version = H5F__CURR_VFD_SWMR_CONFIG_VERSION, + .tick_len = 4, + .max_lag = max_lag, + .writer = true, + .md_pages_reserved = 128}; + char * bname = NULL; + char * dname = NULL; if (H5_dirname(filename, &dname) < 0) { HDfprintf(stderr, "H5_dirname() failed\n"); @@ -121,13 +113,12 @@ swmr_fapl_augment(hid_t fapl, const char *filename, uint32_t max_lag) HDfprintf(stderr, "H5_basename() failed\n"); return -1; } - HDsnprintf(config.md_file_path, sizeof(config.md_file_path), - "%s/%s.shadow", dname, bname); + HDsnprintf(config.md_file_path, sizeof(config.md_file_path), "%s/%s.shadow", dname, bname); HDfree(dname); HDfree(bname); /* Enable VFD SWMR configuration */ - if(H5Pset_vfd_swmr_config(fapl, &config) < 0) { + if (H5Pset_vfd_swmr_config(fapl, &config) < 0) { HDfprintf(stderr, "H5Pset_vrd_swmr_config failed\n"); return -1; } @@ -135,8 +126,7 @@ swmr_fapl_augment(hid_t fapl, const char *filename, uint32_t max_lag) } static bool -pgbuf_read_each_equals(H5F_t *f, H5FD_mem_t ty, haddr_t addr, size_t nelts, - int *data, int val) +pgbuf_read_each_equals(H5F_t *f, H5FD_mem_t ty, haddr_t addr, size_t nelts, int *data, int val) { size_t i; @@ -146,8 +136,7 @@ pgbuf_read_each_equals(H5F_t *f, H5FD_mem_t ty, haddr_t addr, size_t nelts, for (i = 0; i < nelts; i++) { if (data[i] != val) { - printf("%s: read %d at data[%zu], expected %d\n", __func__, - data[i], i, val); + printf("%s: read %d at data[%zu], expected %d\n", __func__, data[i], i, val); return false; } } @@ -157,8 +146,7 @@ error: } static bool -vfd_read_each_equals(H5F_t *f, H5FD_mem_t ty, haddr_t addr, size_t nelts, - int *data, int val) +vfd_read_each_equals(H5F_t *f, H5FD_mem_t ty, haddr_t addr, size_t nelts, int *data, int val) { size_t i; @@ -181,7 +169,7 @@ error: } #ifndef H5_HAVE_PARALLEL - + /*------------------------------------------------------------------------- * Function: create_file() * @@ -207,123 +195,124 @@ error: static unsigned create_file(char *filename, hid_t fcpl, hid_t fapl) { - hid_t file_id = -1; - hid_t dset_id = -1; - hid_t grp_id = -1; - hid_t filespace = -1; - hsize_t dimsf[2] = {NX, NY}; /* dataset dimensions */ - int *data = NULL; /* pointer to data buffer to write */ - hid_t dcpl = -1; - int i; - int num_elements; - int j; - char dset_name[32]; + hid_t file_id = -1; + hid_t dset_id = -1; + hid_t grp_id = -1; + hid_t filespace = -1; + hsize_t dimsf[2] = {NX, NY}; /* dataset dimensions */ + int * data = NULL; /* pointer to data buffer to write */ + hid_t dcpl = -1; + int i; + int num_elements; + int j; + char dset_name[32]; - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; - if((grp_id = H5Gcreate2(file_id, "GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((grp_id = H5Gcreate2(file_id, "GROUP", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - num_elements = NX * NY; - if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + num_elements = NX * NY; + if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR - for (i=0; i < (int)num_elements; i++) + for (i = 0; i < (int)num_elements; i++) data[i] = i; - if((filespace = H5Screate_simple(2, dimsf, NULL)) < 0) + if ((filespace = H5Screate_simple(2, dimsf, NULL)) < 0) FAIL_STACK_ERROR; - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) - FAIL_STACK_ERROR; - if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + FAIL_STACK_ERROR; + if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) FAIL_STACK_ERROR; - for(i=0 ; i<NUM_DSETS; i++) { + for (i = 0; i < NUM_DSETS; i++) { HDsprintf(dset_name, "D1dset%d", i); - if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, - H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) + if ((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, dcpl, + H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; HDsprintf(dset_name, "D2dset%d", i); - if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, - H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) + if ((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, dcpl, + H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; HDsprintf(dset_name, "D3dset%d", i); - if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, - H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) + if ((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, dcpl, + H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; HDsprintf(dset_name, "dset%d", i); - if((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, - H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) + if ((dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, dcpl, + H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - if(H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; HDmemset(data, 0, (size_t)num_elements * sizeof(int)); - if((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0) + if ((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; - for (j=0; j < num_elements; j++) { - if(data[j] != j) { + for (j = 0; j < num_elements; j++) { + if (data[j] != j) { HDfprintf(stderr, "Read different values than written\n"); FAIL_STACK_ERROR; } } HDsprintf(dset_name, "D1dset%d", i); - if(H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0) + if (H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; HDsprintf(dset_name, "D2dset%d", i); - if(H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0) + if (H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; HDsprintf(dset_name, "D3dset%d", i); - if(H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0) + if (H5Ldelete(grp_id, dset_name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; } - if(H5Gclose(grp_id) < 0) + if (H5Gclose(grp_id) < 0) FAIL_STACK_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - if(H5Pclose(dcpl) < 0) + if (H5Pclose(dcpl) < 0) FAIL_STACK_ERROR; - if(H5Sclose(filespace) < 0) + if (H5Sclose(filespace) < 0) FAIL_STACK_ERROR; HDfree(data); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(dcpl); H5Sclose(filespace); H5Gclose(grp_id); H5Fclose(file_id); - if(data) + if (data) HDfree(data); - } H5E_END_TRY; - return(1); + } + H5E_END_TRY; + return (1); } /* create_file() */ - /*------------------------------------------------------------------------- * Function: open_file() * @@ -345,75 +334,76 @@ error: *------------------------------------------------------------------------- */ static unsigned -open_file(char *filename, hid_t fapl, hsize_t page_size, - size_t page_buffer_size) +open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size) { - hid_t file_id = -1; - hid_t dset_id = -1; - hid_t grp_id = -1; - int *data = NULL; /* pointer to data buffer to write */ - int i; - int j; - int num_elements; - char dset_name[32]; - H5F_t *f = NULL; + hid_t file_id = -1; + hid_t dset_id = -1; + hid_t grp_id = -1; + int * data = NULL; /* pointer to data buffer to write */ + int i; + int j; + int num_elements; + char dset_name[32]; + H5F_t *f = NULL; - if((file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) + if ((file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; - if(f->shared->pb_ptr == NULL) + if (f->shared->pb_ptr == NULL) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->page_size != page_size) + if (f->shared->pb_ptr->page_size != page_size) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->max_size != page_buffer_size) + if (f->shared->pb_ptr->max_size != page_buffer_size) FAIL_STACK_ERROR; - if((grp_id = H5Gopen2(file_id, "GROUP", H5P_DEFAULT)) < 0) + if ((grp_id = H5Gopen2(file_id, "GROUP", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - num_elements = NX * NY; - if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + num_elements = NX * NY; + if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR - for(i=0 ; i<NUM_DSETS; i++) { + for (i = 0; i < NUM_DSETS; i++) { HDsprintf(dset_name, "dset%d", i); - if((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0) + if ((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; - if(H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR; - if(H5Dclose(dset_id) < 0) + if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; - for (j=0; j < num_elements; j++) { - if(data[j] != j) { + for (j = 0; j < num_elements; j++) { + if (data[j] != j) { HDfprintf(stderr, "Read different values than written\n"); FAIL_STACK_ERROR; } } } - if(H5Gclose(grp_id) < 0) + if (H5Gclose(grp_id) < 0) FAIL_STACK_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; HDfree(data); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Gclose(grp_id); H5Fclose(file_id); - if(data) + if (data) HDfree(data); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } #endif /* H5_HAVE_PARALLEL */ @@ -428,47 +418,48 @@ error: static unsigned set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) { - hbool_t split = FALSE; - hbool_t multi = FALSE; + hbool_t split = FALSE; + hbool_t multi = FALSE; H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; - hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; - char *memb_name[H5FD_MEM_NTYPES]; - haddr_t memb_addr[H5FD_MEM_NTYPES]; - hbool_t relax; - H5FD_mem_t mt; + hid_t memb_fapl_arr[H5FD_MEM_NTYPES]; + char * memb_name[H5FD_MEM_NTYPES]; + haddr_t memb_addr[H5FD_MEM_NTYPES]; + hbool_t relax; + H5FD_mem_t mt; /* Check for split or multi driver */ - if(!HDstrcmp(env_h5_drvr, "split")) + if (!HDstrcmp(env_h5_drvr, "split")) split = TRUE; - else if(!HDstrcmp(env_h5_drvr, "multi")) + else if (!HDstrcmp(env_h5_drvr, "multi")) multi = TRUE; - if(split || multi) { + if (split || multi) { HDmemset(memb_name, 0, sizeof memb_name); /* Get current split settings */ - if(H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) + if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) TEST_ERROR - if(split) { + if (split) { /* Set memb_addr aligned */ memb_addr[H5FD_MEM_SUPER] = ((memb_addr[H5FD_MEM_SUPER] + pagesize - 1) / pagesize) * pagesize; - memb_addr[H5FD_MEM_DRAW] = ((memb_addr[H5FD_MEM_DRAW] + pagesize - 1) / pagesize) * pagesize; - } else { + memb_addr[H5FD_MEM_DRAW] = ((memb_addr[H5FD_MEM_DRAW] + pagesize - 1) / pagesize) * pagesize; + } + else { /* Set memb_addr aligned */ - for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) + for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) memb_addr[mt] = ((memb_addr[mt] + pagesize - 1) / pagesize) * pagesize; } /* Set multi driver with new FAPLs */ - if(H5Pset_fapl_multi(fapl, memb_map, memb_fapl_arr, (const char * const *)memb_name, memb_addr, relax) < 0) + if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl_arr, (const char *const *)memb_name, memb_addr, + relax) < 0) TEST_ERROR /* Free memb_name */ - for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) + for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) free(memb_name[mt]); - } return 0; @@ -479,7 +470,7 @@ error: } /* set_multi_split() */ #ifndef H5_HAVE_PARALLEL - + /*------------------------------------------------------------------------- * Function: test_args() * @@ -499,7 +490,7 @@ error: * Programmer: unknown * ?? / ?? / ?? * - * Changes: Minor updates to adapt to new implementation of page + * Changes: Minor updates to adapt to new implementation of page * buffer. * JRM -- 10//26/18 * @@ -509,159 +500,160 @@ error: static unsigned test_args(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; herr_t ret; TESTING("Settings for Page Buffering"); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); - if((fapl = H5Pcopy(orig_fapl)) < 0) TEST_ERROR + if ((fapl = H5Pcopy(orig_fapl)) < 0) + TEST_ERROR - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR; - /* Test setting a page buffer without Paged Aggregation enabled - * should fail */ - if(H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0) TEST_ERROR; - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); - } H5E_END_TRY; + } + H5E_END_TRY; - if(file_id >= 0) + if (file_id >= 0) TEST_ERROR; - /* Test setting a page buffer with a size smaller than a single * page size - should fail */ - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) TEST_ERROR; - if(H5Pset_file_space_page_size(fcpl, 512) < 0) + if (H5Pset_file_space_page_size(fcpl, 512) < 0) TEST_ERROR; - if(H5Pset_page_buffer_size(fapl, 511, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 511, 0, 0) < 0) TEST_ERROR; - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); - } H5E_END_TRY; + } + H5E_END_TRY; - if(file_id >= 0) + if (file_id >= 0) TEST_ERROR; - /* Test setting a page buffer with sum of min meta and raw * data percentage > 100 - should fail */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { ret = H5Pset_page_buffer_size(fapl, 512, 50, 51); - } H5E_END_TRY; + } + H5E_END_TRY; - if(ret >= 0) + if (ret >= 0) TEST_ERROR; - if(set_multi_split(env_h5_drvr, fapl, 512) != 0) + if (set_multi_split(env_h5_drvr, fapl, 512) != 0) TEST_ERROR; /* Test setting a page buffer with a size equal to a single page size */ - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) TEST_ERROR; - if(H5Pset_file_space_page_size(fcpl, 512) < 0) + if (H5Pset_file_space_page_size(fcpl, 512) < 0) TEST_ERROR; - if(H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0) TEST_ERROR; - if(create_file(filename, fcpl, fapl) != 0) + if (create_file(filename, fcpl, fapl) != 0) TEST_ERROR; - if(open_file(filename, fapl, 512, 512) != 0) + if (open_file(filename, fapl, 512, 512) != 0) TEST_ERROR; - /* Test setting a page buffer with a size slightly larger than a * single page size */ - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) TEST_ERROR; - if(H5Pset_file_space_page_size(fcpl, 512) < 0) + if (H5Pset_file_space_page_size(fcpl, 512) < 0) TEST_ERROR; - if(H5Pset_page_buffer_size(fapl, 513, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 513, 0, 0) < 0) TEST_ERROR; - if(create_file(filename, fcpl, fapl) != 0) + if (create_file(filename, fcpl, fapl) != 0) TEST_ERROR; - if(open_file(filename, fapl, 512, 512) != 0) + if (open_file(filename, fapl, 512, 512) != 0) TEST_ERROR; - if(set_multi_split(env_h5_drvr, fapl, 4194304) != 0) + if (set_multi_split(env_h5_drvr, fapl, 4194304) != 0) TEST_ERROR; - /* Test setting a large page buffer size and page size */ - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) TEST_ERROR; - if(H5Pset_file_space_page_size(fcpl, 4194304) < 0) + if (H5Pset_file_space_page_size(fcpl, 4194304) < 0) TEST_ERROR; - if(H5Pset_page_buffer_size(fapl, 16777216, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 16777216, 0, 0) < 0) TEST_ERROR; - if(create_file(filename, fcpl, fapl) != 0) + if (create_file(filename, fcpl, fapl) != 0) TEST_ERROR; - if(open_file(filename, fapl, 4194304, 16777216) != 0) + if (open_file(filename, fapl, 4194304, 16777216) != 0) TEST_ERROR; - if(set_multi_split(env_h5_drvr, fapl, 1) != 0) + if (set_multi_split(env_h5_drvr, fapl, 1) != 0) TEST_ERROR; - /* Test setting a 512 byte page buffer size and page size */ - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) TEST_ERROR; - if(H5Pset_file_space_page_size(fcpl, 512) < 0) + if (H5Pset_file_space_page_size(fcpl, 512) < 0) TEST_ERROR; - if(H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 512, 0, 0) < 0) TEST_ERROR; - if(create_file(filename, fcpl, fapl) != 0) + if (create_file(filename, fcpl, fapl) != 0) TEST_ERROR; - if(open_file(filename, fapl, 512, 512) != 0) + if (open_file(filename, fapl, 512, 512) != 0) TEST_ERROR; - - if(H5Pclose(fcpl) < 0) + if (H5Pclose(fcpl) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(fapl); H5Pclose(fcpl); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_args */ - /* * Function: test_mpmde_delay_basic() * @@ -681,16 +673,16 @@ error: static unsigned test_mpmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - size_t i, num_elements = 2000; - int *data = NULL, *odata = NULL; - H5F_t *f; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + size_t i, num_elements = 2000; + int * data = NULL, *odata = NULL; + H5F_t * f; const uint32_t max_lag = 5; - hsize_t pgsz = sizeof(int) * 200; - haddr_t addr; + hsize_t pgsz = sizeof(int) * 200; + haddr_t addr; TESTING("Multipage Metadata Delay Handling"); @@ -733,11 +725,10 @@ test_mpmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; /* initialize all the elements to have a value of -1 */ - for(i = 0; i < num_elements; i++) + for (i = 0; i < num_elements; i++) odata[i] = -1; - if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, - odata) < 0) + if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, odata) < 0) FAIL_STACK_ERROR; /* H5Fvfd_swmr_end_tick() processes delayed writes before it increases @@ -746,8 +737,7 @@ test_mpmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) */ for (i = 0; i < max_lag + 1; i++) { /* All elements read using the VFD should be 0. */ - if (!vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, - data, 0)) + if (!vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, data, 0)) TEST_ERROR; H5Fvfd_swmr_end_tick(file_id); } @@ -782,7 +772,8 @@ test_mpmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -793,12 +784,12 @@ error: HDfree(data); if (odata != NULL) HDfree(odata); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_mpmde_delay_basic() */ - /* * Function: test_spmde_lru_evict_basic() * @@ -827,20 +818,20 @@ error: static unsigned test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - size_t i, num_elements = 20; - int *data = NULL, *odata = NULL; - H5F_t *f; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + size_t i, num_elements = 20; + int * data = NULL, *odata = NULL; + H5F_t * f; const uint32_t max_lag = 5; - const hsize_t pgsz = sizeof(int) * 200; - const hsize_t pgbufsz = 10 * pgsz; - hsize_t ofs; - bool flushed; - haddr_t addr; - haddr_t pressure; + const hsize_t pgsz = sizeof(int) * 200; + const hsize_t pgbufsz = 10 * pgsz; + hsize_t ofs; + bool flushed; + haddr_t addr; + haddr_t pressure; TESTING("Single Page Metadata Flush & Eviction Handling"); @@ -889,11 +880,10 @@ test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; /* initialize all the elements to have a value of -1 */ - for(i = 0; i < num_elements; i++) + for (i = 0; i < num_elements; i++) odata[i] = -1; - if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, - odata) < 0) + if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, odata) < 0) FAIL_STACK_ERROR; /* H5Fvfd_swmr_end_tick() processes delayed writes before it increases @@ -902,8 +892,7 @@ test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr) */ for (i = 0; i < max_lag + 1; i++) { /* All elements read using the VFD should be 0. */ - if (!vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, - data, 0)) + if (!vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, data, 0)) TEST_ERROR; H5Fvfd_swmr_end_tick(file_id); } @@ -918,12 +907,9 @@ test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr) */ for (ofs = 0; ofs < pgbufsz - pgsz * 2; ofs += pgsz) { int tmp = -1; - if (H5F_block_write(f, H5FD_MEM_BTREE, pressure + ofs, - sizeof(tmp), &tmp) < 0) + if (H5F_block_write(f, H5FD_MEM_BTREE, pressure + ofs, sizeof(tmp), &tmp) < 0) FAIL_STACK_ERROR; - if (!flushed && - vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, - data, -1)) { + if (!flushed && vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, data, -1)) { flushed = true; #if 0 printf("Writing page %" PRIuHSIZE " flushed target page.\n", @@ -936,18 +922,16 @@ test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; /* initialize all the elements to have a value of -2 */ - for(i = 0; i < num_elements; i++) + for (i = 0; i < num_elements; i++) odata[i] = -2; /* Write -2 to our target page using the VFD. */ - if (H5FD_write(f->shared->lf, H5FD_MEM_BTREE, addr, - sizeof(int) * num_elements, odata) < 0) + if (H5FD_write(f->shared->lf, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, odata) < 0) FAIL_STACK_ERROR; /* All elements read through the page buffer should be -2. That is, * no page-buffer entry should shadow the page. */ - if (!pgbuf_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, data, - -2)) + if (!pgbuf_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, data, -2)) TEST_ERROR; /* Force ticks to occur so that H5Fclose() doesn't pause waiting @@ -969,7 +953,8 @@ test_spmde_lru_evict_basic(hid_t orig_fapl, const char *env_h5_drvr) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -980,12 +965,12 @@ error: HDfree(data); if (odata != NULL) HDfree(odata); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_spmde_lru_evict_basic() */ - /* * Function: test_spmde_delay_basic() * @@ -1011,16 +996,16 @@ error: static unsigned test_spmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - size_t i, num_elements = 20; - int *data = NULL, *odata = NULL; - H5F_t *f; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + size_t i, num_elements = 20; + int * data = NULL, *odata = NULL; + H5F_t * f; const uint32_t max_lag = 5; - hsize_t pgsz = sizeof(int) * 200; - haddr_t addr; + hsize_t pgsz = sizeof(int) * 200; + haddr_t addr; TESTING("Single Page Metadata Delay Handling"); @@ -1051,8 +1036,7 @@ test_spmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; - addr = H5MF_alloc(f, H5FD_MEM_BTREE, - sizeof(int) * num_elements); + addr = H5MF_alloc(f, H5FD_MEM_BTREE, sizeof(int) * num_elements); /* allocate space for 2000 elements */ if (HADDR_UNDEF == addr) FAIL_STACK_ERROR; @@ -1064,11 +1048,10 @@ test_spmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) TEST_ERROR; /* initialize all the elements to have a value of -1 */ - for(i = 0; i < num_elements; i++) + for (i = 0; i < num_elements; i++) odata[i] = -1; - if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, - odata) < 0) + if (H5F_block_write(f, H5FD_MEM_BTREE, addr, sizeof(int) * num_elements, odata) < 0) FAIL_STACK_ERROR; /* H5Fvfd_swmr_end_tick() processes delayed writes before it increases @@ -1077,8 +1060,7 @@ test_spmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) */ for (i = 0; i < max_lag + 1; i++) { /* All elements read using the VFD should be 0. */ - if (!vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, - data, 0)) + if (!vfd_read_each_equals(f, H5FD_MEM_BTREE, addr, num_elements, data, 0)) TEST_ERROR; H5Fvfd_swmr_end_tick(file_id); } @@ -1107,7 +1089,8 @@ test_spmde_delay_basic(hid_t orig_fapl, const char *env_h5_drvr) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -1118,12 +1101,12 @@ error: HDfree(data); if (odata != NULL) HDfree(odata); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_spmde_delay_basic() */ - /* * Function: test_raw_data_handling() * @@ -1150,40 +1133,39 @@ error: * * JRM -- 2/23/17 * - * Minor changes to adapt to re-implementation of the + * Minor changes to adapt to re-implementation of the * page buffer. * * JRM -- 10/26/18 * * We have decided not to buffer raw data in the page buffer - * when operating in VFD SWMR mode. This is necessary as + * when operating in VFD SWMR mode. This is necessary as * otherwise raw data can get stuck in the page buffer, thus - * delaying it's visibility to the reader. + * delaying it's visibility to the reader. * - * Obviously, there is a potential performance trade off - * here, but it shouldn't be significant in the expected + * Obviously, there is a potential performance trade off + * here, but it shouldn't be significant in the expected * VFD SWMR use cases. Needless to say, we will revisit this * if necessary. * * JRM -- 4/8/20 - * + * */ /* Changes due to file space page size has a minimum size of 512 */ static unsigned -test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, - bool vfd_swmr_mode) +test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, bool vfd_swmr_mode) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - int64_t base_page_cnt; - int64_t page_count = 0; - int i, num_elements = 2000; - haddr_t addr = HADDR_UNDEF; - int *data = NULL; - H5F_t *f = NULL; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + int64_t base_page_cnt; + int64_t page_count = 0; + int i, num_elements = 2000; + haddr_t addr = HADDR_UNDEF; + int * data = NULL; + H5F_t * f = NULL; const uint32_t max_lag = 5; TESTING("%sRaw Data Handling", vfd_swmr_mode ? "VFD SWMR " : ""); @@ -1211,7 +1193,7 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* opening the file inserts one or more pages into the page buffer. @@ -1223,101 +1205,89 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, TEST_ERROR; /* allocate space for 2000 elements */ - if (HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int) * (size_t)num_elements))) + if (HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; /* initialize all the elements to have a value of -1 */ - for(i=0 ; i<num_elements ; i++) + for (i = 0; i < num_elements; i++) data[i] = -1; - if (H5F_block_write(f, H5FD_MEM_DRAW, addr, - sizeof(int) * (size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; /* update the first 100 elements to have values 0-99 - this will be a page buffer update with 1 page resulting in the page buffer. */ - for(i=0 ; i<100 ; i++) + for (i = 0; i < 100; i++) data[i] = i; if (H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - page_count ++; + page_count++; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) FAIL_STACK_ERROR; /* update elements 300 - 450, with values 300 - - this will bring two more pages into the page buffer. */ - for(i=0 ; i<150 ; i++) - data[i] = i+300; + for (i = 0; i < 150; i++) + data[i] = i + 300; - if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 300), - sizeof(int) * 150, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 300), sizeof(int) * 150, data) < 0) FAIL_STACK_ERROR; page_count += 2; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) FAIL_STACK_ERROR; /* update elements 100 - 300, this will go to disk but also update existing pages in the page buffer. */ - for(i=0 ; i<200 ; i++) - data[i] = i+100; + for (i = 0; i < 200; i++) + data[i] = i + 100; - if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 100), - sizeof(int) * 200, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 100), sizeof(int) * 200, data) < 0) FAIL_STACK_ERROR; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) FAIL_STACK_ERROR; /* Update elements 225-300 - this will update an existing page in the PB */ /* Changes: 450 - 600; 150 */ - for(i=0 ; i<150 ; i++) - data[i] = i+450; + for (i = 0; i < 150; i++) + data[i] = i + 450; - if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 450), - sizeof(int) * 150, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 450), sizeof(int) * 150, data) < 0) FAIL_STACK_ERROR; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) FAIL_STACK_ERROR; /* Do a full page write to block 600-800 - should bypass the PB */ - for(i=0 ; i<200 ; i++) - data[i] = i+600; + for (i = 0; i < 200; i++) + data[i] = i + 600; - if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 600), - sizeof(int) * 200, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 600), sizeof(int) * 200, data) < 0) FAIL_STACK_ERROR; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) FAIL_STACK_ERROR; - /* read elements 800 - 1200, this should not affect the PB, and should - * read -1s + /* read elements 800 - 1200, this should not affect the PB, and should + * read -1s */ - if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 800), - sizeof(int) * 400, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 800), sizeof(int) * 400, data) < 0) FAIL_STACK_ERROR; - for (i=0; i < 400; i++) { + for (i = 0; i < 400; i++) { if (data[i] != -1) { HDfprintf(stderr, "Read different values than written\n"); HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], -1); @@ -1325,80 +1295,71 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, } } - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) FAIL_STACK_ERROR; /* read elements 1200 - 1201, this should read -1 and bring in an * entire page of addr 1200 */ - if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 1200), - sizeof(int) * 1, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 1200), sizeof(int) * 1, data) < 0) FAIL_STACK_ERROR; - for (i=0; i < 1; i++) { + for (i = 0; i < 1; i++) { if (data[i] != -1) { HDfprintf(stderr, "Read different values than written\n"); HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], -1); TEST_ERROR; } } - page_count ++; + page_count++; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) TEST_ERROR; /* read elements 175 - 225, this should use the PB existing pages */ /* Changes: 350 - 450 */ /* read elements 175 - 225, this should use the PB existing pages */ - if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 350), - sizeof(int) * 100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 350), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - for (i=0; i < 100; i++) { + for (i = 0; i < 100; i++) { if (data[i] != i + 350) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], - i + 350); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], i + 350); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) TEST_ERROR; - /* read elements 0 - 800 using the VFD. + /* read elements 0 - 800 using the VFD. * * In the non-VFD SWMR case, this should result in -1s - * except for the writes that went through the PB (100-300 & 600-800) + * except for the writes that went through the PB (100-300 & 600-800) * * In the VFD SWMR case, the page buffer is bypassed for raw data, * thus all writes should be visible. */ - if (H5FD_read(f->shared->lf, H5FD_MEM_DRAW, addr, - sizeof(int) * 800, data) < 0) + if (H5FD_read(f->shared->lf, H5FD_MEM_DRAW, addr, sizeof(int) * 800, data) < 0) FAIL_STACK_ERROR; i = 0; while (i < 800) { - if((vfd_swmr_mode) || (i>=100 && i<300) || i >= 600) { + if ((vfd_swmr_mode) || (i >= 100 && i < 300) || i >= 600) { if (data[i] != i) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", - i, data[i], i); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], i); TEST_ERROR; } } else { if (data[i] != -1) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", - i, data[i], -1); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], -1); TEST_ERROR; } } @@ -1411,16 +1372,14 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_DRAW, addr, sizeof(int) * 800, data) < 0) FAIL_STACK_ERROR; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) TEST_ERROR; - for (i=0; i < 800; i++) { + for (i = 0; i < 800; i++) { if (data[i] != i) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", - i, data[i], i); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], i); TEST_ERROR; } } @@ -1429,18 +1388,16 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, * also evict existing pages from the PB (page 400 & 1200 that are * existing). */ - for(i=0 ; i<1000 ; i++) + for (i = 0; i < 1000; i++) data[i] = 0; - if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 400), - sizeof(int) * 1000, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 400), sizeof(int) * 1000, data) < 0) FAIL_STACK_ERROR; page_count -= 2; - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) TEST_ERROR; /* read elements 0 - 1000.. this should go to disk then update the @@ -1449,30 +1406,27 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_DRAW, addr, sizeof(int) * 1000, data) < 0) FAIL_STACK_ERROR; - i=0; + i = 0; while (i < 1000) { - if(i<400) { + if (i < 400) { if (data[i] != i) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", - i, data[i], i); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], i); TEST_ERROR; } } else { if (data[i] != 0) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", - i, data[i], 0); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], 0); TEST_ERROR; } } i++; } - if ( ( f->shared->pb_ptr->curr_pages != page_count + base_page_cnt ) && - ( ( vfd_swmr_mode ) && - ( f->shared->pb_ptr->curr_pages != base_page_cnt ) ) ) + if ((f->shared->pb_ptr->curr_pages != page_count + base_page_cnt) && + ((vfd_swmr_mode) && (f->shared->pb_ptr->curr_pages != base_page_cnt))) TEST_ERROR; if (H5Fclose(file_id) < 0) @@ -1487,7 +1441,8 @@ test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -1496,11 +1451,11 @@ error: H5Fclose(file_id); if (data != NULL) HDfree(data); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_raw_data_handling */ - /*------------------------------------------------------------------------- * Function: test_lru_processing() * @@ -1515,9 +1470,9 @@ error: * * Programmer: unknown * ?? / ?? / ?? - * - * Changes: Reworked for new implementation of page buffer. Major - * change was adaption to the new implementation's greater + * + * Changes: Reworked for new implementation of page buffer. Major + * change was adaption to the new implementation's greater * respect for max_pages. * * JRM -- 10/26/18 @@ -1529,62 +1484,60 @@ error: static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ + char filename[FILENAME_LEN]; /* Filename to use */ hbool_t page_exists; - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - int i; - int num_elements = 2000; - haddr_t addr = HADDR_UNDEF; - haddr_t search_addr = HADDR_UNDEF; - int *data = NULL; - H5F_t *f = NULL; + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + int i; + int num_elements = 2000; + haddr_t addr = HADDR_UNDEF; + haddr_t search_addr = HADDR_UNDEF; + int * data = NULL; + H5F_t * f = NULL; TESTING("LRU Processing"); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); - if((fapl = H5Pcopy(orig_fapl)) < 0) + if ((fapl = H5Pcopy(orig_fapl)) < 0) FAIL_STACK_ERROR - if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200) != 0) + if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0) + if (H5Pset_file_space_page_size(fcpl, sizeof(int) * 200) < 0) FAIL_STACK_ERROR; /* keep 2 pages at max in the page buffer */ - if(H5Pset_page_buffer_size(fapl, sizeof(int)*400, 20, 0) < 0) + if (H5Pset_page_buffer_size(fapl, sizeof(int) * 400, 20, 0) < 0) FAIL_STACK_ERROR; - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* allocate space for 2000 elements */ - if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; /* initialize all the elements to have a value of -1 */ - for(i=0 ; i<num_elements ; i++) + for (i = 0; i < num_elements; i++) data[i] = -1; - if(H5F_block_write(f, H5FD_MEM_DRAW, addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; /* there should be no raw data pages in the page buffer -- verify this */ @@ -1594,39 +1547,37 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) /* update the first 100 elements to have values 0-99 - this will be * a page buffer update that loads page addr + 0 into the page buffer. */ - for(i=0 ; i<100 ; i++) + for (i = 0; i < 100; i++) data[i] = i; - if(H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; /* verify addr + 0 is the only raw data page in the page buffer */ search_addr = addr; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; if (f->shared->pb_ptr->curr_rd_pages != 1) FAIL_STACK_ERROR; - /* update elements 300 - 450, with values 300 - 449 - this will - * bring two pages (addr + 200 & addr + 400) into the page buffer and - * evict addr + 0. + * bring two pages (addr + 200 & addr + 400) into the page buffer and + * evict addr + 0. */ - for(i=0 ; i<150 ; i++) - data[i] = i+300; + for (i = 0; i < 150; i++) + data[i] = i + 300; - if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*300), - sizeof(int)*150, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 300), sizeof(int) * 150, data) < 0) FAIL_STACK_ERROR; /* verify that addr + 200 and addr + 400 are the only raw data pages in * the page buffer. */ - search_addr = addr + sizeof(int)*200; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 200; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; - search_addr = addr + sizeof(int)*400; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 400; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; if (f->shared->pb_ptr->curr_rd_pages != 2) FAIL_STACK_ERROR; @@ -1634,41 +1585,38 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) /* at this point, the page buffer entries created at file open should * have been evicted. */ - if(f->shared->pb_ptr->curr_md_pages != 0) + if (f->shared->pb_ptr->curr_md_pages != 0) FAIL_STACK_ERROR; - - /* update elements 300-301, this will update page addr + 200 in - * page buffer and move it to the top of the LRU. + /* update elements 300-301, this will update page addr + 200 in + * page buffer and move it to the top of the LRU. */ - for(i=0 ; i<1 ; i++) - data[i] = i+300; - if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*300), - sizeof(int)*2, data) < 0) + for (i = 0; i < 1; i++) + data[i] = i + 300; + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 300), sizeof(int) * 2, data) < 0) FAIL_STACK_ERROR; /* verify that addr + 200 and addr + 400 are the only raw data pages in * the page buffer. */ - search_addr = addr + sizeof(int)*200; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 200; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; - search_addr = addr + sizeof(int)*400; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 400; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; if (f->shared->pb_ptr->curr_rd_pages != 2) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 2) + if (f->shared->pb_ptr->curr_pages != 2) FAIL_STACK_ERROR; - /* read elements 1200 - 1201, this should read -1, bring in page + /* read elements 1200 - 1201, this should read -1, bring in page * addr + 1200, and evict page addr + 400 */ - if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*1200), - sizeof(int)*1, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 1200), sizeof(int) * 1, data) < 0) FAIL_STACK_ERROR; - for (i=0; i < 1; i++) { - if(data[i] != -1) { + for (i = 0; i < 1; i++) { + if (data[i] != -1) { HDfprintf(stderr, "Read different values than written\n"); HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], -1); TEST_ERROR; @@ -1678,28 +1626,26 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) /* verify that addr + 200 and addr + 1200 are the only raw data pages in * the page buffer. */ - search_addr = addr + sizeof(int)*200; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 200; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; - search_addr = addr + sizeof(int)*1200; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 1200; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; if (f->shared->pb_ptr->curr_rd_pages != 2) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 2) + if (f->shared->pb_ptr->curr_pages != 2) FAIL_STACK_ERROR; /* read elements 350 - 450, this should load page addr + 400 and move * it to the top of the LRU, and evict page addr + 1200. - */ - if(H5F_block_read(f, H5FD_MEM_DRAW, addr+(sizeof(int)*350), - sizeof(int)*100, data) < 0) + */ + if (H5F_block_read(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 350), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - for (i=0; i < 100; i++) { - if(data[i] != i+350) { + for (i = 0; i < 100; i++) { + if (data[i] != i + 350) { HDfprintf(stderr, "Read different values than written\n"); - HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], - i + 350); + HDfprintf(stderr, "data[%d] = %d, %d expected.\n", i, data[i], i + 350); TEST_ERROR; } } @@ -1707,42 +1653,40 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) /* verify that addr + 200 and addr + 400 are the only raw data pages in * the page buffer. */ - search_addr = addr + sizeof(int)*200; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 200; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; - search_addr = addr + sizeof(int)*400; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 400; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; if (f->shared->pb_ptr->curr_rd_pages != 2) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 2) + if (f->shared->pb_ptr->curr_pages != 2) FAIL_STACK_ERROR; - - /* update elements 400 - 1400 to value 0, this will overwrite and + /* update elements 400 - 1400 to value 0, this will overwrite and * evict page addr + 400. */ - for(i=0 ; i<1000 ; i++) + for (i = 0; i < 1000; i++) data[i] = 0; - if(H5F_block_write(f, H5FD_MEM_DRAW, addr+(sizeof(int)*400), - sizeof(int)*1000, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, addr + (sizeof(int) * 400), sizeof(int) * 1000, data) < 0) FAIL_STACK_ERROR; /* verify that addr + 200 is the only raw data page in the page buffer. */ - search_addr = addr + sizeof(int)*200; - if((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) + search_addr = addr + sizeof(int) * 200; + if ((H5PB_page_exists(f->shared, search_addr, &page_exists) < 0) || (!page_exists)) FAIL_STACK_ERROR; if (f->shared->pb_ptr->curr_rd_pages != 1) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 1) + if (f->shared->pb_ptr->curr_pages != 1) FAIL_STACK_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fcpl) < 0) + if (H5Pclose(fcpl) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; HDfree(data); @@ -1750,7 +1694,8 @@ test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -1759,11 +1704,11 @@ error: H5Fclose(file_id); if (data != NULL) HDfree(data); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_lru_processing */ - /*------------------------------------------------------------------------- * Function: test_min_threshold() * @@ -1793,9 +1738,9 @@ error: * JRM -- 2/23/17 * * Reworked test for new implementatin of the page buffer. - * The major change was adapting the test for the new + * The major change was adapting the test for the new * page buffers refusal to buffer any raw data when - * min_md_pages == max_pages, or any metadata pages wwhen + * min_md_pages == max_pages, or any metadata pages wwhen * min_rd_pages == max_pages. * * JRM -- 10/27/18 @@ -1806,54 +1751,54 @@ error: static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - int64_t base_raw_cnt = 0; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + int64_t base_raw_cnt = 0; int64_t base_meta_cnt = 0; - int i; - int num_elements = 1000; + int i; + int num_elements = 1000; H5PB_t *pb_ptr; haddr_t meta_addr = HADDR_UNDEF; - haddr_t raw_addr = HADDR_UNDEF; - int *data = NULL; - H5F_t *f = NULL; + haddr_t raw_addr = HADDR_UNDEF; + int * data = NULL; + H5F_t * f = NULL; TESTING("Minimum Metadata threshold Processing"); HDprintf("\n"); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); - if((fapl = H5Pcopy(orig_fapl)) < 0) + if ((fapl = H5Pcopy(orig_fapl)) < 0) TEST_ERROR - if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200) != 0) + if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR; - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0) + if (H5Pset_file_space_page_size(fcpl, sizeof(int) * 200) < 0) FAIL_STACK_ERROR; HDprintf("\tMinimum metadata threshold = 100%%\n"); /* keep 5 pages at max in the page buffer and 5 meta page minimum */ - if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 100, 0) < 0) + if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 100, 0) < 0) FAIL_STACK_ERROR; /* create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* opening the file inserts one or more pages into the page buffer. @@ -1863,140 +1808,123 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) HDassert(f->shared); HDassert(f->shared->pb_ptr); - base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; + base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; base_meta_cnt = f->shared->pb_ptr->curr_md_pages; - if(base_raw_cnt != 0) + if (base_raw_cnt != 0) TEST_ERROR; - if(base_meta_cnt != 2) + if (base_meta_cnt != 2) TEST_ERROR; pb_ptr = f->shared->pb_ptr; - if(pb_ptr->min_md_pages != 5) + if (pb_ptr->min_md_pages != 5) TEST_ERROR; - if(pb_ptr->min_rd_pages != 0) + if (pb_ptr->min_rd_pages != 0) TEST_ERROR; - if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; /* write all raw data. Since min_md_pages == max_pages, none of it * should end up in the page buffer. */ - for(i=0 ; i<100 ; i++) + for (i = 0; i < 100; i++) data[i] = i; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != base_meta_cnt) + if (f->shared->pb_ptr->curr_pages != base_meta_cnt) FAIL_STACK_ERROR; - if(pb_ptr->curr_rd_pages != 0) + if (pb_ptr->curr_rd_pages != 0) TEST_ERROR; /* write all meta data, this would end up in page buffer */ - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), - sizeof(int)*50, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 200), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), - sizeof(int)*50, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 400), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), - sizeof(int)*50, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 600), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), - sizeof(int)*50, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 800), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(pb_ptr->curr_md_pages != 5) + if (pb_ptr->curr_md_pages != 5) TEST_ERROR; - if(pb_ptr->curr_rd_pages != 0) + if (pb_ptr->curr_rd_pages != 0) TEST_ERROR; /* write and read more raw data and make sure that they don't end up in * page buffer */ - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*350), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 350), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*500), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 500), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*750), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 750), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*900), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 900), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(pb_ptr->curr_md_pages != 5) + if (pb_ptr->curr_md_pages != 5) TEST_ERROR; - if(pb_ptr->curr_rd_pages != 0) + if (pb_ptr->curr_rd_pages != 0) TEST_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - HDprintf("\tMinimum raw data threshold = 100%%\n"); /* keep 5 pages at max in the page buffer and 5 raw page minimum */ - if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 0, 100) < 0) + if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 0, 100) < 0) TEST_ERROR; /* create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* opening the file inserts one or more pages into the page buffer. @@ -2006,141 +1934,125 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) HDassert(f->shared); HDassert(f->shared->pb_ptr); - base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; + base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; base_meta_cnt = f->shared->pb_ptr->curr_md_pages; - if(base_raw_cnt != 0) + if (base_raw_cnt != 0) TEST_ERROR; - if(base_meta_cnt != 0) + if (base_meta_cnt != 0) TEST_ERROR; pb_ptr = f->shared->pb_ptr; - if(pb_ptr->min_md_pages != 0) + if (pb_ptr->min_md_pages != 0) TEST_ERROR; - if(pb_ptr->min_rd_pages != 5) + if (pb_ptr->min_rd_pages != 5) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) TEST_ERROR; /* write all meta data, none of this should end up in the page buffer since * min_rd_pages == max_pages * is no raw data yet */ - for(i=0 ; i<100 ; i++) + for (i = 0; i < 100; i++) data[i] = i; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 0) + if (f->shared->pb_ptr->curr_pages != 0) FAIL_STACK_ERROR; - if(pb_ptr->curr_md_pages != 0) + if (pb_ptr->curr_md_pages != 0) TEST_ERROR; /* write/read all raw data, this would end up in page buffer */ - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(pb_ptr->curr_rd_pages != 5) + if (pb_ptr->curr_rd_pages != 5) TEST_ERROR; - if(pb_ptr->curr_md_pages != 0) + if (pb_ptr->curr_md_pages != 0) TEST_ERROR; /* write and read more meta data and make sure that they don't end up in * page buffer */ - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*100), - sizeof(int)*50, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 100), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*350), - sizeof(int)*50, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 350), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*500), - sizeof(int)*50, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 500), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*750), - sizeof(int)*50, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 750), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*900), - sizeof(int)*50, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 900), sizeof(int) * 50, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(pb_ptr->curr_rd_pages != 5) + if (pb_ptr->curr_rd_pages != 5) TEST_ERROR; - if(pb_ptr->curr_md_pages != 0) + if (pb_ptr->curr_md_pages != 0) TEST_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - HDprintf("\tMinimum metadata threshold = 40%%, "); HDprintf("Minimum rawdata threshold = 40%%\n"); - /* keep 5 pages at max in the page buffer 2 meta pages, 2 raw pages - * minimum + /* keep 5 pages at max in the page buffer 2 meta pages, 2 raw pages + * minimum */ - if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 40, 40) < 0) + if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 40, 40) < 0) TEST_ERROR; /* create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* opening the file inserts one or more pages into the page buffer. @@ -2150,330 +2062,296 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) * metadata entry counts. */ - base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; + base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; base_meta_cnt = f->shared->pb_ptr->curr_md_pages; - if(base_raw_cnt != 0) + if (base_raw_cnt != 0) TEST_ERROR; - if(base_meta_cnt != 2) + if (base_meta_cnt != 2) TEST_ERROR; pb_ptr = f->shared->pb_ptr; - if(pb_ptr->min_md_pages != 2) + if (pb_ptr->min_md_pages != 2) TEST_ERROR; - if(pb_ptr->min_rd_pages != 2) + if (pb_ptr->min_rd_pages != 2) TEST_ERROR; - if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; /* initialize all the elements to have a value of -1 */ - for(i=0 ; i<num_elements ; i++) + for (i = 0; i < num_elements; i++) data[i] = -1; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; /* fill the page buffer with raw data */ - for(i=0 ; i<100 ; i++) + for (i = 0; i < 100; i++) data[i] = i; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 5 - base_meta_cnt) + if (f->shared->pb_ptr->curr_rd_pages != 5 - base_meta_cnt) TEST_ERROR; /* add 3 meta entries evicting 1 raw entry */ - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 3) + if (f->shared->pb_ptr->curr_md_pages != 3) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 2) + if (f->shared->pb_ptr->curr_rd_pages != 2) TEST_ERROR; /* adding more meta entires should replace meta entries since raw data * is at its minimum */ - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 3) + if (f->shared->pb_ptr->curr_md_pages != 3) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 2) + if (f->shared->pb_ptr->curr_rd_pages != 2) TEST_ERROR; /* bring existing raw entires up the LRU */ - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*750), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 750), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; /* adding 2 raw entries (even with 1 call) should only evict 1 meta * entry and another raw entry */ - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*350), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 350), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 2) + if (f->shared->pb_ptr->curr_md_pages != 2) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 3) + if (f->shared->pb_ptr->curr_rd_pages != 3) TEST_ERROR; - /* read a metadata entry to force the flush of the metadata entries - * in the page buffer, and then read some raw data so that the metadata + /* read a metadata entry to force the flush of the metadata entries + * in the page buffer, and then read some raw data so that the metadata * pages are at the bottom of the LRU. * - * When we are done, should still have 2 metadata pages and 3 raw data + * When we are done, should still have 2 metadata pages and 3 raw data * pages in the page buffer */ - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*442), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 442), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*150), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 150), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*550), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 550), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 2) + if (f->shared->pb_ptr->curr_md_pages != 2) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 3) + if (f->shared->pb_ptr->curr_rd_pages != 3) TEST_ERROR; - /* adding 2 meta entries should replace 2 entires at the bottom - * of the LRU + /* adding 2 meta entries should replace 2 entires at the bottom + * of the LRU */ - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*98), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 98), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*242), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 242), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 2) + if (f->shared->pb_ptr->curr_md_pages != 2) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 3) + if (f->shared->pb_ptr->curr_rd_pages != 3) TEST_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; HDprintf("\tMinimum metadata threshold = 20%%\n"); /* keep 5 pages at max in the page buffer and 1 meta page minimum */ - if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 39, 0) < 0) + if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 39, 0) < 0) TEST_ERROR; /* create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; pb_ptr = f->shared->pb_ptr; - if(pb_ptr->min_md_pages != 1) + if (pb_ptr->min_md_pages != 1) TEST_ERROR; - if(pb_ptr->min_rd_pages != 0) + if (pb_ptr->min_rd_pages != 0) TEST_ERROR; - if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; /* initialize all the elements to have a value of -1 */ - for(i=0 ; i<num_elements ; i++) + for (i = 0; i < num_elements; i++) data[i] = -1; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; /* fill the page buffer with raw data */ - for(i=0 ; i<100 ; i++) + for (i = 0; i < 100; i++) data[i] = i; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 1) + if (f->shared->pb_ptr->curr_md_pages != 1) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 4) + if (f->shared->pb_ptr->curr_rd_pages != 4) TEST_ERROR; /* add 2 meta entries evicting 2 raw entries */ - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 3) + if (f->shared->pb_ptr->curr_md_pages != 3) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 2) + if (f->shared->pb_ptr->curr_rd_pages != 2) TEST_ERROR; /* bring the rest of the raw entries up the LRU */ - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*500), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 500), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*700), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 700), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*900), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 900), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; /* write one more raw entry which replace one meta entry */ - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*100), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 100), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 1) + if (f->shared->pb_ptr->curr_md_pages != 1) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 4) + if (f->shared->pb_ptr->curr_rd_pages != 4) TEST_ERROR; /* write one more raw entry which should replace another raw entry * keeping min threshold of meta entries */ - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*300), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 300), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 1) + if (f->shared->pb_ptr->curr_md_pages != 1) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 4) + if (f->shared->pb_ptr->curr_rd_pages != 4) TEST_ERROR; /* write a metadata entry that should replace the metadata entry * at the bottom of the LRU */ - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*500), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 500), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_pages != 5) + if (f->shared->pb_ptr->curr_pages != 5) FAIL_STACK_ERROR; - if(f->shared->pb_ptr->curr_md_pages != 1) + if (f->shared->pb_ptr->curr_md_pages != 1) TEST_ERROR; - if(f->shared->pb_ptr->curr_rd_pages != 4) + if (f->shared->pb_ptr->curr_rd_pages != 4) TEST_ERROR; - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fcpl) < 0) + if (H5Pclose(fcpl) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; HDfree(data); @@ -2483,7 +2361,8 @@ test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -2492,11 +2371,11 @@ error: H5Fclose(file_id); if (data != NULL) HDfree(data); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_min_threshold */ - /*------------------------------------------------------------------------- * Function: test_stats_collection() * @@ -2534,50 +2413,50 @@ error: static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - int i; - int num_elements = 1000; - int64_t base_raw_cnt = 0; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + int i; + int num_elements = 1000; + int64_t base_raw_cnt = 0; int64_t base_meta_cnt = 0; - haddr_t meta_addr = HADDR_UNDEF; - haddr_t raw_addr = HADDR_UNDEF; - int *data = NULL; - H5F_t *f = NULL; + haddr_t meta_addr = HADDR_UNDEF; + haddr_t raw_addr = HADDR_UNDEF; + int * data = NULL; + H5F_t * f = NULL; TESTING("Statistics Collection"); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); - if((fapl = H5Pcopy(orig_fapl)) < 0) + if ((fapl = H5Pcopy(orig_fapl)) < 0) TEST_ERROR - if(set_multi_split(env_h5_drvr, fapl, sizeof(int)*200) != 0) + if (set_multi_split(env_h5_drvr, fapl, sizeof(int) * 200) != 0) TEST_ERROR; - if((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) + if ((data = (int *)HDcalloc((size_t)num_elements, sizeof(int))) == NULL) TEST_ERROR - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR; - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) TEST_ERROR; - if(H5Pset_file_space_page_size(fcpl, sizeof(int)*200) < 0) + if (H5Pset_file_space_page_size(fcpl, sizeof(int) * 200) < 0) TEST_ERROR; /* keep 5 pages at max in the page buffer */ - if(H5Pset_page_buffer_size(fapl, sizeof(int)*1000, 20, 0) < 0) + if (H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 20, 0) < 0) TEST_ERROR; - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* opening the file inserts one or more pages into the page buffer. @@ -2588,195 +2467,155 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) HDassert(f->shared); HDassert(f->shared->pb_ptr); - base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; + base_raw_cnt = f->shared->pb_ptr->curr_rd_pages; base_meta_cnt = f->shared->pb_ptr->curr_md_pages; - if(base_raw_cnt != 0) + if (base_raw_cnt != 0) TEST_ERROR; - if(base_meta_cnt != 2) + if (base_meta_cnt != 2) TEST_ERROR; /* reset statistics before we begin the tests */ - if(H5Freset_page_buffering_stats(file_id) < 0) + if (H5Freset_page_buffering_stats(file_id) < 0) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (meta_addr = H5MF_alloc(f, H5FD_MEM_SUPER, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; - if(HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, - sizeof(int)*(size_t)num_elements))) + if (HADDR_UNDEF == (raw_addr = H5MF_alloc(f, H5FD_MEM_DRAW, sizeof(int) * (size_t)num_elements))) FAIL_STACK_ERROR; - /* initialize all the elements to have a value of -1 */ - for(i=0 ; i<num_elements ; i++) + for (i = 0; i < num_elements; i++) data[i] = -1; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, - sizeof(int)*(size_t)num_elements, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * (size_t)num_elements, data) < 0) FAIL_STACK_ERROR; - for(i=0 ; i<200 ; i++) + for (i = 0; i < 200; i++) data[i] = i; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*500), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 500), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*700), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 700), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*900), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 900), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), - sizeof(int)*200, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 400), sizeof(int) * 200, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*100), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 100), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*300), - sizeof(int)*100, data) < 0) + if (H5F_block_write(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 300), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_write(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), - sizeof(int)*182, data) < 0) + if (H5F_block_write(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 800), sizeof(int) * 182, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr, sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr, sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr, sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*200), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 200), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*600), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 600), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_DRAW, raw_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_DRAW, raw_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*400), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 400), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*600), - sizeof(int)*200, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 600), sizeof(int) * 200, data) < 0) FAIL_STACK_ERROR; - if(H5F_block_read(f, H5FD_MEM_SUPER, meta_addr+(sizeof(int)*800), - sizeof(int)*100, data) < 0) + if (H5F_block_read(f, H5FD_MEM_SUPER, meta_addr + (sizeof(int) * 800), sizeof(int) * 100, data) < 0) FAIL_STACK_ERROR; /* was 9, 16, 0 -- review this */ - if ( ( f->shared->pb_ptr->accesses[0] != 10 ) || - ( f->shared->pb_ptr->accesses[1] != 16 ) || - ( f->shared->pb_ptr->accesses[2] != 0 ) ) { + if ((f->shared->pb_ptr->accesses[0] != 10) || (f->shared->pb_ptr->accesses[1] != 16) || + (f->shared->pb_ptr->accesses[2] != 0)) { - HDfprintf(stderr, "accesses[] = {%d, %d, %d}. {10, 16, 0} expected\n", - f->shared->pb_ptr->accesses[0], - f->shared->pb_ptr->accesses[1], - f->shared->pb_ptr->accesses[2]); + HDfprintf(stderr, "accesses[] = {%d, %d, %d}. {10, 16, 0} expected\n", f->shared->pb_ptr->accesses[0], + f->shared->pb_ptr->accesses[1], f->shared->pb_ptr->accesses[2]); TEST_ERROR; } /* was 2, 1, 1 -- review this */ - if ( ( f->shared->pb_ptr->bypasses[0] != 0 ) || - ( f->shared->pb_ptr->bypasses[1] != 1 ) || - ( f->shared->pb_ptr->bypasses[2] != 1 ) ) { + if ((f->shared->pb_ptr->bypasses[0] != 0) || (f->shared->pb_ptr->bypasses[1] != 1) || + (f->shared->pb_ptr->bypasses[2] != 1)) { - HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {0, 1, 1} expected\n", - f->shared->pb_ptr->bypasses[0], - f->shared->pb_ptr->bypasses[1], - f->shared->pb_ptr->bypasses[2]); + HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {0, 1, 1} expected\n", f->shared->pb_ptr->bypasses[0], + f->shared->pb_ptr->bypasses[1], f->shared->pb_ptr->bypasses[2]); TEST_ERROR; } - if ( ( f->shared->pb_ptr->hits[0] != 0 ) || - ( f->shared->pb_ptr->hits[1] != 4 ) || - ( f->shared->pb_ptr->hits[2] != 0 ) ) { + if ((f->shared->pb_ptr->hits[0] != 0) || (f->shared->pb_ptr->hits[1] != 4) || + (f->shared->pb_ptr->hits[2] != 0)) { - HDfprintf(stderr, "hits[] = {%d, %d, %d}. {0, 4, 0} expected\n", - f->shared->pb_ptr->hits[0], - f->shared->pb_ptr->hits[1], - f->shared->pb_ptr->hits[2]); + HDfprintf(stderr, "hits[] = {%d, %d, %d}. {0, 4, 0} expected\n", f->shared->pb_ptr->hits[0], + f->shared->pb_ptr->hits[1], f->shared->pb_ptr->hits[2]); TEST_ERROR; } /* was 9, 16. 0 -- review this */ - if ( ( f->shared->pb_ptr->misses[0] != 10 ) || - ( f->shared->pb_ptr->misses[1] != 16 ) || - ( f->shared->pb_ptr->misses[2] != 0 ) ) { + if ((f->shared->pb_ptr->misses[0] != 10) || (f->shared->pb_ptr->misses[1] != 16) || + (f->shared->pb_ptr->misses[2] != 0)) { - HDfprintf(stderr, "misses[] = {%d, %d, %d}. {10, 16, 0} expected\n", - f->shared->pb_ptr->misses[0], - f->shared->pb_ptr->misses[1], - f->shared->pb_ptr->misses[2]); + HDfprintf(stderr, "misses[] = {%d, %d, %d}. {10, 16, 0} expected\n", f->shared->pb_ptr->misses[0], + f->shared->pb_ptr->misses[1], f->shared->pb_ptr->misses[2]); TEST_ERROR; } /* was 7, 9, 0 -- review this */ - if ( ( f->shared->pb_ptr->evictions[0] != 9) || - ( f->shared->pb_ptr->evictions[1] != 9) || - ( f->shared->pb_ptr->evictions[2] != 0 ) ) { + if ((f->shared->pb_ptr->evictions[0] != 9) || (f->shared->pb_ptr->evictions[1] != 9) || + (f->shared->pb_ptr->evictions[2] != 0)) { HDfprintf(stderr, "evictions[] = {%d, %d, %d}. {%d, %d, 0} expected\n", - f->shared->pb_ptr->evictions[0], - f->shared->pb_ptr->evictions[1], - f->shared->pb_ptr->evictions[2], 7, 9); + f->shared->pb_ptr->evictions[0], f->shared->pb_ptr->evictions[1], + f->shared->pb_ptr->evictions[2], 7, 9); TEST_ERROR; } @@ -2787,104 +2626,89 @@ test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) unsigned evictions[3]; unsigned bypasses[3]; - if(H5Fget_page_buffering_stats(file_id, accesses, hits, misses, - evictions, bypasses) < 0) + if (H5Fget_page_buffering_stats(file_id, accesses, hits, misses, evictions, bypasses) < 0) FAIL_STACK_ERROR; /* was 9, 16, 0 -- review this */ - if ( ( accesses[0] != 10 ) || - ( accesses[1] != 16 ) || - ( accesses[2] != 0 ) ) { + if ((accesses[0] != 10) || (accesses[1] != 16) || (accesses[2] != 0)) { - HDfprintf(stderr, - "accesses[] = {%d, %d, %d}. {10, 16, 0} expected\n", - accesses[0], accesses[1], accesses[2]); + HDfprintf(stderr, "accesses[] = {%d, %d, %d}. {10, 16, 0} expected\n", accesses[0], accesses[1], + accesses[2]); TEST_ERROR; } /* was 2, 1, 1 -- review this */ - if ( ( bypasses[0] != 0 ) || - ( bypasses[1] != 1 ) || - ( bypasses[2] != 1 ) ) { + if ((bypasses[0] != 0) || (bypasses[1] != 1) || (bypasses[2] != 1)) { - HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {2, 1, 1} expected\n", - bypasses[0], bypasses[1], bypasses[2]); + HDfprintf(stderr, "bypasses[] = {%d, %d, %d}. {2, 1, 1} expected\n", bypasses[0], bypasses[1], + bypasses[2]); TEST_ERROR; } - if ( ( hits[0] != 0 ) || - ( hits[1] != 4 ) || - ( hits[2] != 0 ) ) { + if ((hits[0] != 0) || (hits[1] != 4) || (hits[2] != 0)) { - HDfprintf(stderr, "hits[] = {%d, %d, %d}. {0, 4, 0} expected\n", - hits[0], hits[1], hits[2]); + HDfprintf(stderr, "hits[] = {%d, %d, %d}. {0, 4, 0} expected\n", hits[0], hits[1], hits[2]); TEST_ERROR; } /* was 9, 16. 0 -- review this */ - if ( ( misses[0] != 10 ) || - ( misses[1] != 16 ) || - ( misses[2] != 0 ) ) { + if ((misses[0] != 10) || (misses[1] != 16) || (misses[2] != 0)) { - HDfprintf(stderr, "misses[] = {%d, %d, %d}. {10, 16, 0} expected\n", - misses[0], misses[1], misses[2]); + HDfprintf(stderr, "misses[] = {%d, %d, %d}. {10, 16, 0} expected\n", misses[0], misses[1], + misses[2]); TEST_ERROR; } /* was 9, 9, 0 -- review this */ - if ( ( evictions[0] != 9 ) || - ( evictions[1] != 9 ) || - ( evictions[2] != 0 ) ) { + if ((evictions[0] != 9) || (evictions[1] != 9) || (evictions[2] != 0)) { - HDfprintf(stderr, - "evictions[] = {%d, %d, %d}. {9, 9, 0} expected\n", - evictions[0], evictions[1], evictions[2]); + HDfprintf(stderr, "evictions[] = {%d, %d, %d}. {9, 9, 0} expected\n", evictions[0], evictions[1], + evictions[2]); TEST_ERROR; } - if(H5Freset_page_buffering_stats(file_id) < 0) + if (H5Freset_page_buffering_stats(file_id) < 0) FAIL_STACK_ERROR; - if(H5Fget_page_buffering_stats(file_id, accesses, hits, misses, - evictions, bypasses) < 0) + if (H5Fget_page_buffering_stats(file_id, accesses, hits, misses, evictions, bypasses) < 0) FAIL_STACK_ERROR; - if(accesses[0] != 0) + if (accesses[0] != 0) TEST_ERROR; - if(accesses[1] != 0) + if (accesses[1] != 0) TEST_ERROR; - if(bypasses[0] != 0) + if (bypasses[0] != 0) TEST_ERROR; - if(bypasses[1] != 0) + if (bypasses[1] != 0) TEST_ERROR; - if(hits[0] != 0) + if (hits[0] != 0) TEST_ERROR; - if(hits[1] != 0) + if (hits[1] != 0) TEST_ERROR; - if(misses[0] != 0) + if (misses[0] != 0) TEST_ERROR; - if(misses[1] != 0) + if (misses[1] != 0) TEST_ERROR; - if(evictions[0] != 0) + if (evictions[0] != 0) TEST_ERROR; - if(evictions[1] != 0) + if (evictions[1] != 0) TEST_ERROR; } - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fcpl) < 0) + if (H5Pclose(fcpl) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; HDfree(data); - PASSED(); return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) @@ -2893,13 +2717,13 @@ error: H5Fclose(file_id); if (data != NULL) HDfree(data); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* test_stats_collection */ #endif /* #ifndef H5_HAVE_PARALLEL */ - /*------------------------------------------------------------------------- * Function: verify_page_buffering_disabled() * @@ -2924,77 +2748,80 @@ error: static unsigned verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; TESTING("Page Buffering Disabled"); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); - /* first, try to create a file with page buffering enabled */ - if((fapl = H5Pcopy(orig_fapl)) < 0) + if ((fapl = H5Pcopy(orig_fapl)) < 0) TEST_ERROR - if(set_multi_split(env_h5_drvr, fapl, 4096) != 0) + if (set_multi_split(env_h5_drvr, fapl, 4096) != 0) TEST_ERROR; - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_page_size(fcpl, 4096) < 0) + if (H5Pset_file_space_page_size(fcpl, 4096) < 0) FAIL_STACK_ERROR; - if(H5Pset_page_buffer_size(fapl, 4096*8, 0, 0) < 0) + if (H5Pset_page_buffer_size(fapl, 4096 * 8, 0, 0) < 0) FAIL_STACK_ERROR; /* try to create the file -- should fail */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); - } H5E_END_TRY; + } + H5E_END_TRY; - if(file_id >= 0) + if (file_id >= 0) TEST_ERROR; /* now, create a file, close it, and then try to open it with page * buffering enabled. */ - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) + if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, 0, 1) < 0) FAIL_STACK_ERROR; - if(H5Pset_file_space_page_size(fcpl, 4096) < 0) + if (H5Pset_file_space_page_size(fcpl, 4096) < 0) FAIL_STACK_ERROR; /* create the file */ - if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0) + if ((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; /* close the file */ - if(H5Fclose(file_id) < 0) + if (H5Fclose(file_id) < 0) FAIL_STACK_ERROR; /* try to open the file using the fapl prepared above which enables * page buffering. Should fail. */ - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl); - } H5E_END_TRY; + } + H5E_END_TRY; - if(file_id >= 0) + if (file_id >= 0) TEST_ERROR; - if(H5Pclose(fcpl) < 0) + if (H5Pclose(fcpl) < 0) FAIL_STACK_ERROR; - if(H5Pclose(fapl) < 0) + if (H5Pclose(fapl) < 0) FAIL_STACK_ERROR; PASSED(); @@ -3003,76 +2830,77 @@ verify_page_buffering_disabled(hid_t orig_fapl, const char *env_h5_drvr) error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) H5Pclose(fcpl); if (file_id != H5I_INVALID_HID) H5Fclose(file_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* verify_page_buffering_disabled() */ - + #endif /* H5_HAVE_PARALLEL */ - /************************************************************************* * * Function: md_entry_splitting_smoke_check() * * Purpose: Normally, file space for metadata entries is allocated - * indvidually. In the context of paged allocation, this + * indvidually. In the context of paged allocation, this * ensures that all entries that cross page boundaries start * on a page boundary, and that any space between the end of - * a multi-page metadata entry and the next page boundary - * is un-used. + * a multi-page metadata entry and the next page boundary + * is un-used. * * In the context of VFD SWMR, this fact along with atomic - * metadata entry I/O is used to minimize the size of the - * index in the metadata file, and to optimize metadata + * metadata entry I/O is used to minimize the size of the + * index in the metadata file, and to optimize metadata * metadata reads on the VFD SWMR reader side. It is also - * used as a simplifying assumption in normal page buffer + * used as a simplifying assumption in normal page buffer * operation. * - * Unfortunately, it turns out that some metadata cache - * clients (H5FA & H5EA) allocate the needed file space in - * a single block, and sub-allocate space for individual - * entries out of this block. + * Unfortunately, it turns out that some metadata cache + * clients (H5FA & H5EA) allocate the needed file space in + * a single block, and sub-allocate space for individual + * entries out of this block. * * While this is a design flaw from the perspective - * VFD SWMR, repairing the issue no feasible at this time, - * and in any case, there will always be the issue of + * VFD SWMR, repairing the issue no feasible at this time, + * and in any case, there will always be the issue of * existing files. * * Thus, for now at least, the page buffer has to code around * the issue when operating in VFD SWMR mode. * - * It does this by examining metadata I/O requests that - * cross page boundaries, and querying the metadata cache + * It does this by examining metadata I/O requests that + * cross page boundaries, and querying the metadata cache * for the ID of the associated cache client. * - * If the request is associated with a cache client that - * that uses sub-allocation, the I/O request must be broken - * into the minimal number of sub-requests such that each - * request either doesn't cross page boundaries, or is - * page aligned, and of length equal to some multiple of + * If the request is associated with a cache client that + * that uses sub-allocation, the I/O request must be broken + * into the minimal number of sub-requests such that each + * request either doesn't cross page boundaries, or is + * page aligned, and of length equal to some multiple of * the page size. * * This test exists to verify that such entries are read * and written correctly. * - * Note that it does not concern itself with verifying - * the correct handling of the split I/O requests, as - * the split is done immediately upon receipt, and each - * of the sub-requests is treated as a normal metadata + * Note that it does not concern itself with verifying + * the correct handling of the split I/O requests, as + * the split is done immediately upon receipt, and each + * of the sub-requests is treated as a normal metadata * I/O request. * * Note that this test requires us to modify the page buffer - * hint fields in the metadata cache to trick it into - * re-laying the desired hints to the page buffer, even + * hint fields in the metadata cache to trick it into + * re-laying the desired hints to the page buffer, even * though it is not generating the I/O requests in this * test. * @@ -3083,33 +2911,31 @@ error: * 4/9/20 * * Changes: None. - * + * *************************************************************************/ -#define HDR_SIZE 40 -#define MD_PAGE_SIZE 250 +#define HDR_SIZE 40 +#define MD_PAGE_SIZE 250 #define TOT_SYNTH_ENTRY_SIZES (HDR_SIZE + (3 * MD_PAGE_SIZE)) static unsigned -md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, - bool vfd_swmr_mode) +md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, bool vfd_swmr_mode) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - int i; - int * synth_md_vals = NULL; - int * synth_md_test_buf = NULL; - haddr_t base_addr; - haddr_t p0_addr; - haddr_t p1_addr; - haddr_t p2_addr; - H5F_t *f = NULL; + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + int i; + int * synth_md_vals = NULL; + int * synth_md_test_buf = NULL; + haddr_t base_addr; + haddr_t p0_addr; + haddr_t p1_addr; + haddr_t p2_addr; + H5F_t * f = NULL; const uint32_t max_lag = 5; - TESTING("%sMetadata Entry Splitting Smoke Check", \ - vfd_swmr_mode ? "VFD SWMR " : ""); + TESTING("%sMetadata Entry Splitting Smoke Check", vfd_swmr_mode ? "VFD SWMR " : ""); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); @@ -3138,18 +2964,18 @@ md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* The objective is to perform a quick smoke check on I/O of metadata - * entries that have been sub-allocated out of a larger space allocation. - * We do this by simulating a structure similar to elements of the - * fixed array on disk structure. Specifically, we create a synthetic - * set of metadata entries that are allocated out of a single allocation - * from the free space manager, and perform several reads and writes to + * entries that have been sub-allocated out of a larger space allocation. + * We do this by simulating a structure similar to elements of the + * fixed array on disk structure. Specifically, we create a synthetic + * set of metadata entries that are allocated out of a single allocation + * from the free space manager, and perform several reads and writes to * verify expected behaviour. * - * The synthetic set of metadata entries are constucted of integers + * The synthetic set of metadata entries are constucted of integers * so as to allow easy assignement of unique values. It is constructed * as follows: * @@ -3161,44 +2987,40 @@ md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, * page 1: 250 2290, 2291, ... 2539 base_addr + 290 * sizeof(int) * page 2: 250 3540, 3541, ... 3789 base_addr + 540 * sizeof(int) * - * The overall size of the compound metadata entry is 395 * sizeof(int). - * Since we use a page size of 100 * sizeof(int), this system of synthetic + * The overall size of the compound metadata entry is 395 * sizeof(int). + * Since we use a page size of 100 * sizeof(int), this system of synthetic * metadata entries spans four pages. */ /* allocate the buffers needed for the synthetic md entry test */ - if ( (synth_md_vals = (int *)HDcalloc((size_t)TOT_SYNTH_ENTRY_SIZES, - sizeof(int))) == NULL ) + if ((synth_md_vals = (int *)HDcalloc((size_t)TOT_SYNTH_ENTRY_SIZES, sizeof(int))) == NULL) TEST_ERROR - if ( (synth_md_test_buf = (int *)HDcalloc((size_t)TOT_SYNTH_ENTRY_SIZES, - sizeof(int))) == NULL ) + if ((synth_md_test_buf = (int *)HDcalloc((size_t)TOT_SYNTH_ENTRY_SIZES, sizeof(int))) == NULL) TEST_ERROR - /* allocate file space for the synthetic metadata entries and + /* allocate file space for the synthetic metadata entries and * compute their addresses. */ - if (HADDR_UNDEF == - (base_addr = H5MF_alloc(f, H5FD_MEM_BTREE, - sizeof(int) * (size_t)(TOT_SYNTH_ENTRY_SIZES)))) + if (HADDR_UNDEF == + (base_addr = H5MF_alloc(f, H5FD_MEM_BTREE, sizeof(int) * (size_t)(TOT_SYNTH_ENTRY_SIZES)))) FAIL_STACK_ERROR; p0_addr = base_addr + (haddr_t)(sizeof(int) * HDR_SIZE); p1_addr = p0_addr + (haddr_t)(sizeof(int) * MD_PAGE_SIZE); p2_addr = p1_addr + (haddr_t)(sizeof(int) * MD_PAGE_SIZE); - - /* Set all cells in synth_md_vals[] to -1 and write directly to + /* Set all cells in synth_md_vals[] to -1 and write directly to * the underlying file via an H5FD call. This gives us a known * set of values in the underlying file. */ - for ( i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { + for (i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { synth_md_vals[i] = -1; } - if ( H5FD_write(f->shared->lf, H5FD_MEM_BTREE, base_addr, - sizeof(int) * TOT_SYNTH_ENTRY_SIZES, synth_md_vals) < 0) + if (H5FD_write(f->shared->lf, H5FD_MEM_BTREE, base_addr, sizeof(int) * TOT_SYNTH_ENTRY_SIZES, + synth_md_vals) < 0) FAIL_STACK_ERROR; /* touch up the metadata cache so that it will report that a metadata @@ -3207,121 +3029,108 @@ md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, */ H5C_set_curr_io_type_splitable(f->shared->cache, TRUE); - /* initialize the buffer with the values of the synthetic metadata + /* initialize the buffer with the values of the synthetic metadata * entries. */ - for ( i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++ ) { + for (i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { synth_md_vals[i] = i; - if ( i > HDR_SIZE ) { + if (i > HDR_SIZE) { synth_md_vals[i] += 1000; } - - if ( i > HDR_SIZE + MD_PAGE_SIZE ) { + + if (i > HDR_SIZE + MD_PAGE_SIZE) { synth_md_vals[i] += 1000; } - if ( i > HDR_SIZE + MD_PAGE_SIZE + MD_PAGE_SIZE ) { + if (i > HDR_SIZE + MD_PAGE_SIZE + MD_PAGE_SIZE) { synth_md_vals[i] += 1000; } - } /* write the header */ - if (H5F_block_write(f, H5FD_MEM_BTREE, base_addr, - sizeof(int) * (size_t)HDR_SIZE, synth_md_vals) < 0) + if (H5F_block_write(f, H5FD_MEM_BTREE, base_addr, sizeof(int) * (size_t)HDR_SIZE, synth_md_vals) < 0) FAIL_STACK_ERROR; /* read the header */ - if (H5F_block_read(f, H5FD_MEM_BTREE, base_addr, - sizeof(int) * (size_t)HDR_SIZE, synth_md_test_buf) < 0) + if (H5F_block_read(f, H5FD_MEM_BTREE, base_addr, sizeof(int) * (size_t)HDR_SIZE, synth_md_test_buf) < 0) FAIL_STACK_ERROR; /* write page 0 */ - if (H5F_block_write(f, H5FD_MEM_BTREE, p0_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_write(f, H5FD_MEM_BTREE, p0_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_vals[HDR_SIZE])) < 0) FAIL_STACK_ERROR; /* read page 0 */ - if (H5F_block_read(f, H5FD_MEM_BTREE, p0_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_read(f, H5FD_MEM_BTREE, p0_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_test_buf[HDR_SIZE])) < 0) FAIL_STACK_ERROR; /* write page 1 */ - if (H5F_block_write(f, H5FD_MEM_BTREE, p1_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_write(f, H5FD_MEM_BTREE, p1_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_vals[HDR_SIZE + MD_PAGE_SIZE])) < 0) FAIL_STACK_ERROR; /* read page 1 */ - if (H5F_block_read(f, H5FD_MEM_BTREE, p1_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_read(f, H5FD_MEM_BTREE, p1_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_test_buf[HDR_SIZE + MD_PAGE_SIZE])) < 0) FAIL_STACK_ERROR; /* write page 2 */ - if (H5F_block_write(f, H5FD_MEM_BTREE, p2_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_write(f, H5FD_MEM_BTREE, p2_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_vals[HDR_SIZE + 2 * MD_PAGE_SIZE])) < 0) FAIL_STACK_ERROR; /* read page 2 */ - if (H5F_block_read(f, H5FD_MEM_BTREE, p2_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_read(f, H5FD_MEM_BTREE, p2_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_test_buf[HDR_SIZE + 2 * MD_PAGE_SIZE])) < 0) FAIL_STACK_ERROR; /* verify reads */ - for ( i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++ ) { + for (i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { - if ( synth_md_vals[i] != synth_md_test_buf[i] ) { + if (synth_md_vals[i] != synth_md_test_buf[i]) { - HDfprintf(stderr, "(1) unexpected read %d: val %d -- %d expected\n", - i, synth_md_test_buf[i], synth_md_vals[i]); + HDfprintf(stderr, "(1) unexpected read %d: val %d -- %d expected\n", i, synth_md_test_buf[i], + synth_md_vals[i]); TEST_ERROR; } } /* zero the test buffer, do the reads again in reverse order, and verify */ - for ( i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { + for (i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { synth_md_test_buf[i] = 0; } /* read page 2 */ - if (H5F_block_read(f, H5FD_MEM_BTREE, p2_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_read(f, H5FD_MEM_BTREE, p2_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_test_buf[HDR_SIZE + 2 * MD_PAGE_SIZE])) < 0) FAIL_STACK_ERROR; /* read page 1 */ - if (H5F_block_read(f, H5FD_MEM_BTREE, p1_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_read(f, H5FD_MEM_BTREE, p1_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_test_buf[HDR_SIZE + MD_PAGE_SIZE])) < 0) FAIL_STACK_ERROR; /* read page 0 */ - if (H5F_block_read(f, H5FD_MEM_BTREE, p0_addr, - sizeof(int) * (size_t)MD_PAGE_SIZE, + if (H5F_block_read(f, H5FD_MEM_BTREE, p0_addr, sizeof(int) * (size_t)MD_PAGE_SIZE, &(synth_md_test_buf[HDR_SIZE])) < 0) FAIL_STACK_ERROR; /* read the header */ - if (H5F_block_read(f, H5FD_MEM_BTREE, base_addr, - sizeof(int) * (size_t)HDR_SIZE, synth_md_test_buf) < 0) + if (H5F_block_read(f, H5FD_MEM_BTREE, base_addr, sizeof(int) * (size_t)HDR_SIZE, synth_md_test_buf) < 0) FAIL_STACK_ERROR; /* verify reads again */ - for ( i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++ ) { + for (i = 0; i < TOT_SYNTH_ENTRY_SIZES; i++) { - if ( synth_md_vals[i] != synth_md_test_buf[i] ) { + if (synth_md_vals[i] != synth_md_test_buf[i]) { - HDfprintf(stderr, "(2) unexpected read %d: val %d -- %d expected\n", - i, synth_md_test_buf[i], synth_md_vals[i]); + HDfprintf(stderr, "(2) unexpected read %d: val %d -- %d expected\n", i, synth_md_test_buf[i], + synth_md_vals[i]); TEST_ERROR; } } @@ -3346,45 +3155,46 @@ md_entry_splitting_smoke_check(hid_t orig_fapl, const char *env_h5_drvr, error: /* Undo the touchup of the metadata cache */ - if ( ( f ) && ( f->shared ) && ( f->shared->cache) ) + if ((f) && (f->shared) && (f->shared->cache)) H5C_set_curr_io_type_splitable(f->shared->cache, FALSE); - if ( synth_md_vals ) + if (synth_md_vals) HDfree(synth_md_vals); - if ( synth_md_test_buf ) + if (synth_md_test_buf) HDfree(synth_md_test_buf); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) H5Pclose(fcpl); if (file_id != H5I_INVALID_HID) H5Fclose(file_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* md_entry_splitting_smoke_check() */ #undef HDR_SIZE -#undef MD_PAGE_SIZE -#undef TOT_SYNTH_ENTRY_SIZES +#undef MD_PAGE_SIZE +#undef TOT_SYNTH_ENTRY_SIZES - /************************************************************************* * * Function: md_entry_splitting_boundary_test() * - * Purpose: Test to verify that I/O request splitting performs as + * Purpose: Test to verify that I/O request splitting performs as * as expected in various boundary conditions. * * The above md_entry_splitting_smoke_check() was directed - * at verifying that the page buffer behaved as expected + * at verifying that the page buffer behaved as expected * in something approaching a typical use case. * - * This test is directed at verifying that entries are - * split correctly under a variety of conditions that + * This test is directed at verifying that entries are + * split correctly under a variety of conditions that * are unlikely unless the user chooses at odd page size. * * Return: 0 if test is sucessful @@ -3394,34 +3204,31 @@ error: * 4/12/20 * * Changes: None. - * + * *************************************************************************/ - static unsigned -md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, - bool vfd_swmr_mode) +md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, bool vfd_swmr_mode) { - char filename[FILENAME_LEN]; /* Filename to use */ - hid_t file_id = -1; /* File ID */ - hid_t fcpl = -1; - hid_t fapl = -1; - int64_t base_page_cnt; - int i; - H5F_t *f = NULL; - const uint32_t max_lag = 5; - size_t page_size = (size_t)512; - int pages_allocated = 32; - size_t alloc_size; - uint8_t * write_buf = NULL; - uint8_t * read_buf = NULL; - haddr_t base_addr = HADDR_UNDEF; - haddr_t first_page_addr = HADDR_UNDEF; - haddr_t start_addr = HADDR_UNDEF; - size_t test_len; - - TESTING("%sMetadata Entry Splitting Boundary Test", \ - vfd_swmr_mode ? "VFD SWMR " : ""); + char filename[FILENAME_LEN]; /* Filename to use */ + hid_t file_id = -1; /* File ID */ + hid_t fcpl = -1; + hid_t fapl = -1; + int64_t base_page_cnt; + int i; + H5F_t * f = NULL; + const uint32_t max_lag = 5; + size_t page_size = (size_t)512; + int pages_allocated = 32; + size_t alloc_size; + uint8_t * write_buf = NULL; + uint8_t * read_buf = NULL; + haddr_t base_addr = HADDR_UNDEF; + haddr_t first_page_addr = HADDR_UNDEF; + haddr_t start_addr = HADDR_UNDEF; + size_t test_len; + + TESTING("%sMetadata Entry Splitting Boundary Test", vfd_swmr_mode ? "VFD SWMR " : ""); h5_fixname(namebase, orig_fapl, filename, sizeof(filename)); @@ -3450,11 +3257,11 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, FAIL_STACK_ERROR; /* Get a pointer to the internal file object */ - if(NULL == (f = (H5F_t *)H5VL_object(file_id))) + if (NULL == (f = (H5F_t *)H5VL_object(file_id))) FAIL_STACK_ERROR; /* opening the file inserts one or more pages into the page buffer. - * Get the number of pages inserted, and verify that it is the + * Get the number of pages inserted, and verify that it is the * expected value. */ base_page_cnt = f->shared->pb_ptr->curr_pages; @@ -3463,31 +3270,31 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, /* Test the folowing cases: * - * 1) splittable md entry that is page aligned and exactly one + * 1) splittable md entry that is page aligned and exactly one * page long. * - * 2) splittable md entry that is page aligned and exactly two + * 2) splittable md entry that is page aligned and exactly two * pages long * * 3) splittable md entry that is page aligned and is exactly one * page and one byte long. - * - * 4) splittable md entry that is exactly one page and one byte + * + * 4) splittable md entry that is exactly one page and one byte * long, and starts one byte before a page bundary. * - * 5) splittable md entry that is exactly one page and two bytes + * 5) splittable md entry that is exactly one page and two bytes * long, and starts one byte before a page boundary. * - * 6) splittable md entry that is two bytes long, and starts one + * 6) splittable md entry that is two bytes long, and starts one * byte before a page boundary. * * 7) splittable md entry that is page aligned and is exactly two * pages and one byte long. - * - * 8) splittable md entry that is exactly two pages and one byte + * + * 8) splittable md entry that is exactly two pages and one byte * long, and starts one byte before a page bundary. * - * 9) splittable md entry that is exactly two pages and two bytes + * 9) splittable md entry that is exactly two pages and two bytes * long, and starts one byte before a page boundary. * */ @@ -3504,17 +3311,16 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (HADDR_UNDEF == (base_addr = H5MF_alloc(f, H5FD_MEM_SUPER, alloc_size))) FAIL_STACK_ERROR; - /* Set all cells write_buf[] to 0 and write directly to + /* Set all cells write_buf[] to 0 and write directly to * the underlying file via an H5FD call. This gives us a known * set of values in the underlying file. */ - for ( i = 0; i < (int)alloc_size; i++) { + for (i = 0; i < (int)alloc_size; i++) { write_buf[i] = 0; } - if ( H5FD_write(f->shared->lf, H5FD_MEM_SUPER, base_addr, - alloc_size, write_buf) < 0) + if (H5FD_write(f->shared->lf, H5FD_MEM_SUPER, base_addr, alloc_size, write_buf) < 0) FAIL_STACK_ERROR; /* touch up the metadata cache so that it will report that a metadata @@ -3523,11 +3329,10 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, */ H5C_set_curr_io_type_splitable(f->shared->cache, TRUE); - - /* 1) splittable md entry that is page aligned and exactly one + /* 1) splittable md entry that is page aligned and exactly one * page long. * - * Should not register as a split I/O. + * Should not register as a split I/O. * * Should log 4 metadata accesses. * should log 3 metadata hits @@ -3535,22 +3340,22 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * should log 1 metadata loads * should log 1 metadata insertions * - * Note that exposes an inefficiency in the page buffer, as page + * Note that exposes an inefficiency in the page buffer, as page * aligned I/O requests of exactly oen page in length really should - * bypass the page buffer. + * bypass the page buffer. * * This should be fixed, but I am bypassing it for now. * * JRM -- 4/18/20 */ first_page_addr = base_addr; - start_addr = base_addr; - test_len = page_size; + start_addr = base_addr; + test_len = page_size; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 1; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3559,15 +3364,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "1.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "1.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 2; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3576,27 +3381,24 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "1.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "1.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 0 ) || - ( f->shared->pb_ptr->md_write_splits != 0 ) ) + if ((f->shared->pb_ptr->md_read_splits != 0) || (f->shared->pb_ptr->md_write_splits != 0)) TEST_ERROR; - if ( ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1 ) ) + if ((f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3) || (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1)) TEST_ERROR; - - /* 2) splittable md entry that is page aligned and exactly two + /* 2) splittable md entry that is page aligned and exactly two * pages long * * Should not register as a split I/O. @@ -3622,13 +3424,13 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * The misses in the normal operating mode could be avoided. */ first_page_addr = base_addr + (haddr_t)(page_size); - start_addr = first_page_addr; - test_len = 3 * page_size; + start_addr = first_page_addr; + test_len = 3 * page_size; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 3; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3637,15 +3439,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "2.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "2.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 4; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3654,38 +3456,36 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "2.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "2.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 0 ) || - ( f->shared->pb_ptr->md_write_splits != 0 ) ) + if ((f->shared->pb_ptr->md_read_splits != 0) || (f->shared->pb_ptr->md_write_splits != 0)) TEST_ERROR; - if ( vfd_swmr_mode ) { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1 ) ) + if (vfd_swmr_mode) { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1)) TEST_ERROR; - - } else { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 0 ) ) + } + else { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2) || + (f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 0)) TEST_ERROR; } - /* 3) splittable md entry that is page aligned and is exactly one * page and one byte long. * @@ -3700,13 +3500,13 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * should log 2 metadata insertions */ first_page_addr = base_addr + (haddr_t)(3 * page_size); - start_addr = first_page_addr; - test_len = page_size + 1; + start_addr = first_page_addr; + test_len = page_size + 1; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 5; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3715,15 +3515,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "3.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "3.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 6; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3732,28 +3532,25 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "3.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "3.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) TEST_ERROR; - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2 ) ) + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6) || (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2)) TEST_ERROR; - - /* 4) splittable md entry that is exactly one page and one byte + /* 4) splittable md entry that is exactly one page and one byte * long, and starts one byte before a page bundary. * * Should register 2 metadata read splits @@ -3768,36 +3565,37 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * */ first_page_addr = base_addr + (haddr_t)(5 * page_size); - start_addr = first_page_addr + (haddr_t)(page_size - 1);; + start_addr = first_page_addr + (haddr_t)(page_size - 1); + ; test_len = page_size + 1; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 7; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) FAIL_STACK_ERROR; - if ( f->shared->pb_ptr->md_write_splits != 1 ) + if (f->shared->pb_ptr->md_write_splits != 1) TEST_ERROR; if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - if ( f->shared->pb_ptr->md_read_splits != 1 ) + if (f->shared->pb_ptr->md_read_splits != 1) TEST_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "4.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "4.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 8; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3806,28 +3604,25 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "4.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "4.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) TEST_ERROR; - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2 ) ) + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6) || (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2)) TEST_ERROR; - - /* 5) splittable md entry that is exactly one page and two bytes + /* 5) splittable md entry that is exactly one page and two bytes * long, and starts one byte before a page boundary. * * Should register 2 metadata read splits @@ -3841,13 +3636,14 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * should log 3 metadata insertions */ first_page_addr = base_addr + (haddr_t)(8 * page_size); - start_addr = first_page_addr + (haddr_t)(page_size - 1);; + start_addr = first_page_addr + (haddr_t)(page_size - 1); + ; test_len = page_size + 2; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 9; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3856,15 +3652,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "5.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "5.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 10; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3873,28 +3669,25 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "5.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "5.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) TEST_ERROR; - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 12 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 9 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 3 ) ) + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 12) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 9) || (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 3) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 3) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 3)) TEST_ERROR; - - /* 6) splittable md entry that is two bytes long, and starts one + /* 6) splittable md entry that is two bytes long, and starts one * byte before a page boundary. * * Should register 2 metadata read splits @@ -3908,13 +3701,14 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * should log 2 metadata insertions */ first_page_addr = base_addr + (haddr_t)(11 * page_size); - start_addr = first_page_addr + (haddr_t)(page_size - 1);; + start_addr = first_page_addr + (haddr_t)(page_size - 1); + ; test_len = 2; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 11; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3923,15 +3717,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "6.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "6.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 12; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -3940,26 +3734,24 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "6.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "6.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) TEST_ERROR; - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2 ) ) + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MD] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6) || (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2)) TEST_ERROR; - + /* 7) splittable md entry that is page aligned and is exactly two * pages and one byte long. * @@ -3993,13 +3785,13 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * The misses in the normal operating mode could be avoided. */ first_page_addr = base_addr + (haddr_t)(13 * page_size); - start_addr = first_page_addr; - test_len = 2 * page_size + 1; + start_addr = first_page_addr; + test_len = 2 * page_size + 1; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 13; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -4008,15 +3800,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "3.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "3.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 14; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -4025,45 +3817,43 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "3.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "3.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) - TEST_ERROR; - - if ( vfd_swmr_mode ) { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) + TEST_ERROR; + + if (vfd_swmr_mode) { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4) || + (f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1)) TEST_ERROR; - - } else { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1 ) ) + } + else { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2) || + (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1)) TEST_ERROR; } - - /* 8) splittable md entry that is exactly two pages and one byte + /* 8) splittable md entry that is exactly two pages and one byte * long, and starts one byte before a page bundary. * * Should register 2 metadata read splits @@ -4096,36 +3886,37 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * The misses in the normal operating mode could be avoided. */ first_page_addr = base_addr + (haddr_t)(16 * page_size); - start_addr = first_page_addr + (haddr_t)(page_size - 1);; - test_len =2 * page_size + 1; + start_addr = first_page_addr + (haddr_t)(page_size - 1); + ; + test_len = 2 * page_size + 1; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 15; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) FAIL_STACK_ERROR; - if ( f->shared->pb_ptr->md_write_splits != 1 ) + if (f->shared->pb_ptr->md_write_splits != 1) TEST_ERROR; if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - if ( f->shared->pb_ptr->md_read_splits != 1 ) + if (f->shared->pb_ptr->md_read_splits != 1) TEST_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "4.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "4.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 16; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -4134,45 +3925,43 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "4.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "4.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) - TEST_ERROR; - - if ( vfd_swmr_mode ) { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) + TEST_ERROR; + + if (vfd_swmr_mode) { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4) || + (f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1)) TEST_ERROR; - - } else { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1 ) ) + } + else { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 4) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 3) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2) || + (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 1)) TEST_ERROR; } - - /* 9) splittable md entry that is exactly two pages and two bytes + /* 9) splittable md entry that is exactly two pages and two bytes * long, and starts one byte before a page boundary. * * if vfd_swmr_mode @@ -4202,13 +3991,14 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, * The misses in the normal operating mode could be avoided. */ first_page_addr = base_addr + (haddr_t)(19 * page_size); - start_addr = first_page_addr + (haddr_t)(page_size - 1);; + start_addr = first_page_addr + (haddr_t)(page_size - 1); + ; test_len = 2 * page_size + 2; - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 17; - if ( H5PB_reset_stats(f->shared->pb_ptr) < 0 ) + if (H5PB_reset_stats(f->shared->pb_ptr) < 0) FAIL_STACK_ERROR; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -4217,15 +4007,15 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "5.1) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "5.1) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - for ( i = 0; i < (int)test_len; i++ ) + for (i = 0; i < (int)test_len; i++) write_buf[i] = 18; if (H5F_block_write(f, H5FD_MEM_SUPER, start_addr, test_len, write_buf) < 0) @@ -4234,44 +4024,42 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, if (H5F_block_read(f, H5FD_MEM_SUPER, start_addr, test_len, read_buf) < 0) FAIL_STACK_ERROR; - for ( i = 0; i < (int)test_len; i++ ) { - if ( write_buf[i] != read_buf[i] ) { - HDfprintf(stdout, "5.2) write_buf[%d] = %d != %d = read_buf[%d]\n", - i, (int)(write_buf[i]), (int)(read_buf[i]), i); + for (i = 0; i < (int)test_len; i++) { + if (write_buf[i] != read_buf[i]) { + HDfprintf(stdout, "5.2) write_buf[%d] = %d != %d = read_buf[%d]\n", i, (int)(write_buf[i]), + (int)(read_buf[i]), i); TEST_ERROR; } } - if ( ( f->shared->pb_ptr->md_read_splits != 2 ) || - ( f->shared->pb_ptr->md_write_splits != 2 ) ) - TEST_ERROR; - - if ( vfd_swmr_mode ) { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2 ) ) + if ((f->shared->pb_ptr->md_read_splits != 2) || (f->shared->pb_ptr->md_write_splits != 2)) + TEST_ERROR; + + if (vfd_swmr_mode) { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8) || + (f->shared->pb_ptr->hits[H5PB__STATS_MPMDE] != 3) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->loads[H5PB__STATS_MPMDE] != 0) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MPMDE] != 1) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2)) TEST_ERROR; - - } else { - if ( ( f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4 ) || - ( f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8 ) || - ( f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2 ) || - ( f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2 ) || - ( f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2 ) ) + } + else { + if ((f->shared->pb_ptr->bypasses[H5PB__STATS_MPMDE] != 4) || + (f->shared->pb_ptr->accesses[H5PB__STATS_MD] != 8) || + (f->shared->pb_ptr->hits[H5PB__STATS_MD] != 6) || + (f->shared->pb_ptr->misses[H5PB__STATS_MPMDE] != 2) || + (f->shared->pb_ptr->misses[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->loads[H5PB__STATS_MD] != 2) || + (f->shared->pb_ptr->insertions[H5PB__STATS_MD] != 2)) TEST_ERROR; } - /* Undo the touchup of the metadata cache */ H5C_set_curr_io_type_splitable(f->shared->cache, FALSE); @@ -4292,29 +4080,29 @@ md_entry_splitting_boundary_test(hid_t orig_fapl, const char *env_h5_drvr, error: /* Undo the touchup of the metadata cache */ - if ( ( f ) && ( f->shared ) && ( f->shared->cache) ) + if ((f) && (f->shared) && (f->shared->cache)) H5C_set_curr_io_type_splitable(f->shared->cache, FALSE); - if ( write_buf ) + if (write_buf) HDfree(write_buf); - if ( read_buf ) + if (read_buf) HDfree(read_buf); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { if (fapl != H5I_INVALID_HID) H5Pclose(fapl); if (fcpl != H5I_INVALID_HID) H5Pclose(fcpl); if (file_id != H5I_INVALID_HID) H5Fclose(file_id); - } H5E_END_TRY; + } + H5E_END_TRY; return 1; } /* md_entry_splitting_boundary_test() */ - - /*------------------------------------------------------------------------- * Function: main() * @@ -4331,24 +4119,23 @@ error: int main(void) { - hid_t fapl = -1; /* File access property list for data files */ - unsigned nerrors = 0; /* Cumulative error count */ - const char *env_h5_drvr = NULL; /* File Driver value from environment */ - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + hid_t fapl = -1; /* File access property list for data files */ + unsigned nerrors = 0; /* Cumulative error count */ + const char *env_h5_drvr = NULL; /* File Driver value from environment */ + hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ h5_reset(); /* Get the VFD to use */ env_h5_drvr = HDgetenv("HDF5_DRIVER"); - if(env_h5_drvr == NULL) + if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; /* Temporary skip testing with multi/split drivers: * Page buffering depends on paged aggregation which is * currently disabled for multi/split drivers. */ - if((0 == HDstrcmp(env_h5_drvr, "multi")) || - (0 == HDstrcmp(env_h5_drvr, "split"))) { + if ((0 == HDstrcmp(env_h5_drvr, "multi")) || (0 == HDstrcmp(env_h5_drvr, "split"))) { SKIPPED() HDputs("Skip page buffering test because paged aggregation is disabled for multi/split drivers"); @@ -4356,16 +4143,17 @@ main(void) HDexit(EXIT_SUCCESS); } - if((fapl = h5_fileaccess()) < 0) { + if ((fapl = h5_fileaccess()) < 0) { nerrors++; PUTS_ERROR("Can't get VFD-dependent fapl") } /* Push API context */ - if(H5CX_push() < 0) FAIL_STACK_ERROR + if (H5CX_push() < 0) + FAIL_STACK_ERROR api_ctx_pushed = TRUE; -#ifdef H5_HAVE_PARALLEL +#ifdef H5_HAVE_PARALLEL HDputs("Page Buffering is disabled for parallel."); nerrors += verify_page_buffering_disabled(fapl, env_h5_drvr); @@ -4390,11 +4178,12 @@ main(void) h5_clean_files(namebases, fapl); - if(nerrors) + if (nerrors) goto error; /* Pop API context */ - if(api_ctx_pushed && H5CX_pop() < 0) FAIL_STACK_ERROR + if (api_ctx_pushed && H5CX_pop() < 0) + FAIL_STACK_ERROR api_ctx_pushed = FALSE; HDputs("All Page Buffering tests passed."); @@ -4402,14 +4191,16 @@ main(void) HDexit(EXIT_SUCCESS); error: - HDprintf("***** %d Page Buffering TEST%s FAILED! *****\n", - nerrors, nerrors > 1 ? "S" : ""); + HDprintf("***** %d Page Buffering TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Pclose(fapl); - } H5E_END_TRY; + } + H5E_END_TRY; - if(api_ctx_pushed) H5CX_pop(); + if (api_ctx_pushed) + H5CX_pop(); HDexit(EXIT_FAILURE); |