diff options
Diffstat (limited to 'testpar')
-rw-r--r-- | testpar/t_2Gio.c | 56 | ||||
-rw-r--r-- | testpar/t_bigio.c | 10 | ||||
-rw-r--r-- | testpar/t_cache.c | 46 | ||||
-rw-r--r-- | testpar/t_cache_image.c | 28 | ||||
-rw-r--r-- | testpar/t_coll_chunk.c | 4 | ||||
-rw-r--r-- | testpar/t_coll_md_read.c | 12 | ||||
-rw-r--r-- | testpar/t_dset.c | 50 | ||||
-rw-r--r-- | testpar/t_file.c | 16 | ||||
-rw-r--r-- | testpar/t_file_image.c | 4 | ||||
-rw-r--r-- | testpar/t_filter_read.c | 6 | ||||
-rw-r--r-- | testpar/t_filters_parallel.c | 198 | ||||
-rw-r--r-- | testpar/t_mdset.c | 38 | ||||
-rw-r--r-- | testpar/t_mpi.c | 2 | ||||
-rw-r--r-- | testpar/t_pflush1.c | 2 | ||||
-rw-r--r-- | testpar/t_pread.c | 4 | ||||
-rw-r--r-- | testpar/t_prop.c | 4 | ||||
-rw-r--r-- | testpar/t_shapesame.c | 94 | ||||
-rw-r--r-- | testpar/testphdf5.c | 2 |
18 files changed, 296 insertions, 280 deletions
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index 63d6b69..33f9d14 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -73,12 +73,12 @@ int facc_type = FACC_MPIO; /*Test file access type */ int dxfer_coll_type = DXFER_COLLECTIVE_IO; H5E_auto2_t old_func; /* previous error handler */ -void * old_client_data; /* previous error handler arg.*/ +void *old_client_data; /* previous error handler arg.*/ #define NFILENAME 3 #define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME] = {"ParaTest", "Hugefile", NULL}; -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ MPI_Comm test_comm = MPI_COMM_WORLD; @@ -554,7 +554,7 @@ MpioTest2G(MPI_Comm comm) hid_t file_id, dset_id; /* file and dataset identifiers */ hid_t plist_id; /* property list identifier */ hid_t filespace; /* file and memory dataspace identifiers */ - int * data; /* pointer to data buffer to write */ + int *data; /* pointer to data buffer to write */ size_t tot_size_bytes; hid_t dcpl_id; hid_t memorydataspace; @@ -714,7 +714,7 @@ dataset_writeInd(void) 1, }; /* dataset dim sizes */ hsize_t data_size; - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -854,8 +854,8 @@ dataset_readInd(void) hid_t file_dataspace; /* File dataspace ID */ hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -983,7 +983,7 @@ dataset_writeAll(void) hsize_t dims[MAX_RANK] = { 1, }; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -1499,8 +1499,8 @@ dataset_readAll(void) hid_t file_dataspace; /* File dataspace ID */ hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2, dataset5, dataset6, dataset7; /* Dataset ID */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -1857,7 +1857,7 @@ dataset_readAll(void) start[0] = (hsize_t)dim0 / (hsize_t)mpi_size * (hsize_t)mpi_rank; start[1] = 0; ret = dataset_vrfy(start, count, stride, block, data_array1 + (dim0 / mpi_size * dim1 * mpi_rank), - data_origin1); + data_origin1); if (ret) nerrors++; @@ -1916,7 +1916,7 @@ extend_writeInd(void) const char *filename; hsize_t dims[MAX_RANK]; /* dataset dim sizes */ hsize_t max_dims[MAX_RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ hsize_t chunk_dims[MAX_RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2294,9 +2294,9 @@ extend_readInd(void) hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ hsize_t dims[MAX_RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_array2 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_array2 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[MAX_RANK]; /* for hyperslab setting */ @@ -2476,7 +2476,7 @@ extend_writeAll(void) const char *filename; hsize_t dims[MAX_RANK]; /* dataset dim sizes */ hsize_t max_dims[MAX_RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ hsize_t chunk_dims[MAX_RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2715,9 +2715,9 @@ extend_readAll(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[MAX_RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_array2 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_array2 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ hsize_t start[MAX_RANK]; /* for hyperslab setting */ hsize_t count[MAX_RANK], stride[MAX_RANK]; /* for hyperslab setting */ @@ -2912,8 +2912,8 @@ compress_readAll(void) unsigned u; /* Local index variable */ unsigned chunk_opts; /* Chunk options */ unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ - DATATYPE * data_read = NULL; /* data buffer */ - DATATYPE * data_orig = NULL; /* expected data buffer */ + DATATYPE *data_read = NULL; /* data buffer */ + DATATYPE *data_orig = NULL; /* expected data buffer */ const char *filename; MPI_Comm comm = test_comm; MPI_Info info = MPI_INFO_NULL; @@ -3095,8 +3095,8 @@ none_selection_chunk(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[MAX_RANK]; /* dataset dim sizes */ - DATATYPE * data_origin = NULL; /* data buffer */ - DATATYPE * data_array = NULL; /* data buffer */ + DATATYPE *data_origin = NULL; /* data buffer */ + DATATYPE *data_array = NULL; /* data buffer */ hsize_t chunk_dims[MAX_RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -3353,8 +3353,8 @@ test_actual_io_mode(int selection_mode) H5D_mpio_actual_io_mode_t actual_io_mode_write = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_read = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_expected = H5D_MPIO_NO_COLLECTIVE; - const char * filename; - const char * test_name; + const char *filename; + const char *test_name; hbool_t direct_multi_chunk_io; hbool_t multi_chunk_io; hbool_t is_chunked; @@ -3362,7 +3362,7 @@ test_actual_io_mode(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm = MPI_COMM_NULL; MPI_Info mpi_info = MPI_INFO_NULL; @@ -3875,7 +3875,7 @@ test_no_collective_cause_mode(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm; MPI_Info mpi_info; @@ -4185,8 +4185,8 @@ dataset_atomicity(void) hid_t sid; /* Dataspace ID */ hid_t dataset1; /* Dataset IDs */ hsize_t dims[MAX_RANK]; /* dataset dim sizes */ - int * write_buf = NULL; /* data buffer */ - int * read_buf = NULL; /* data buffer */ + int *write_buf = NULL; /* data buffer */ + int *read_buf = NULL; /* data buffer */ int buf_size; hid_t dataset2; hid_t file_dataspace; /* File dataspace ID */ diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 406e7bf..68e828d 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -467,7 +467,7 @@ dataset_big_write(void) hsize_t start[RANK]; /* for hyperslab setting */ hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */ hsize_t block[RANK]; /* for hyperslab setting */ - hsize_t * coords = NULL; + hsize_t *coords = NULL; herr_t ret; /* Generic return value */ hid_t fid; /* HDF5 file ID */ hid_t acc_tpl; /* File access templates */ @@ -776,7 +776,7 @@ dataset_big_read(void) hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */ hsize_t block[RANK]; /* for hyperslab setting */ size_t num_points; - hsize_t * coords = NULL; + hsize_t *coords = NULL; herr_t ret; /* Generic return value */ /* allocate memory for data buffer */ @@ -1114,7 +1114,7 @@ single_rank_independent_io(void) hid_t fspace_id = -1; hid_t mspace_id = -1; herr_t ret; - int * data = NULL; + int *data = NULL; uint64_t i; fapl_id = H5Pcreate(H5P_FILE_ACCESS); @@ -1418,8 +1418,8 @@ coll_chunktest(const char *filename, int chunk_factor, int select_factor, int ap hid_t acc_plist, xfer_plist, crp_plist; hsize_t dims[RANK], chunk_dims[RANK]; - int * data_array1 = NULL; - int * data_origin1 = NULL; + int *data_array1 = NULL; + int *data_origin1 = NULL; hsize_t start[RANK], count[RANK], stride[RANK], block[RANK]; diff --git a/testpar/t_cache.c b/testpar/t_cache.c index cf2415c..b37890b 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -41,7 +41,7 @@ const char *FILENAME[NFILENAME] = {"CacheTestDummy", NULL}; #ifndef PATH_MAX #define PATH_MAX 512 #endif /* !PATH_MAX */ -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ haddr_t max_addr = 0; /* used to store the end of * the address space used by @@ -2301,7 +2301,7 @@ datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t le { herr_t ret_value = SUCCEED; int idx; - struct datum * entry_ptr; + struct datum *entry_ptr; struct H5AC_aux_t *aux_ptr; HDassert(thing_ptr); @@ -2371,7 +2371,7 @@ datum_notify(H5C_notify_action_t action, void *thing) { hbool_t was_dirty = FALSE; herr_t ret_value = SUCCEED; - struct datum * entry_ptr; + struct datum *entry_ptr; struct H5AC_aux_t *aux_ptr; struct mssg_t mssg; int idx; @@ -3248,7 +3248,7 @@ lock_and_unlock_random_entry(H5F_t *file_ptr, int min_idx, int max_idx) static void lock_entry(H5F_t *file_ptr, int32_t idx) { - struct datum * entry_ptr; + struct datum *entry_ptr; H5C_cache_entry_t *cache_entry_ptr; if (nerrors == 0) { @@ -3736,8 +3736,8 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr hid_t fid = -1; H5AC_cache_config_t config; H5AC_cache_config_t test_config; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; haddr_t actual_base_addr; HDassert(fid_ptr != NULL); @@ -5104,8 +5104,8 @@ smoke_check_1(int metadata_write_strategy) int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -5268,8 +5268,8 @@ smoke_check_2(int metadata_write_strategy) int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -5473,8 +5473,8 @@ smoke_check_3(int metadata_write_strategy) int min_idx; int max_idx; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -5758,8 +5758,8 @@ smoke_check_4(int metadata_write_strategy) int min_idx; int max_idx; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -6033,8 +6033,8 @@ smoke_check_5(int metadata_write_strategy) int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { @@ -6247,7 +6247,7 @@ trace_file_check(int metadata_write_strategy) hbool_t success = TRUE; const char *((*expected_output)[]) = NULL; - const char * expected_output_0[] = {"### HDF5 metadata cache trace file version 1 ###\n", + const char *expected_output_0[] = {"### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config", "H5AC_insert_entry", "H5AC_insert_entry", @@ -6273,7 +6273,7 @@ trace_file_check(int metadata_write_strategy) "H5AC_flush", "H5AC_flush", NULL}; - const char * expected_output_1[] = {"### HDF5 metadata cache trace file version 1 ###\n", + const char *expected_output_1[] = {"### HDF5 metadata cache trace file version 1 ###\n", "H5AC_set_cache_auto_resize_config", "H5AC_insert_entry", "H5AC_insert_entry", @@ -6307,9 +6307,9 @@ trace_file_check(int metadata_write_strategy) size_t expected_line_len; size_t actual_line_len; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; - FILE * trace_file_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; + FILE *trace_file_ptr = NULL; H5AC_cache_config_t config; struct mssg_t mssg; @@ -6625,8 +6625,8 @@ smoke_check_6(int metadata_write_strategy) int i; int max_nerrors; hid_t fid = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; struct mssg_t mssg; switch (metadata_write_strategy) { diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index 4522572..963681d 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -143,8 +143,8 @@ construct_test_file(int test_file_index) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; int min_dset = 0; int max_dset = 0; @@ -846,7 +846,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons const hbool_t all_coll_metadata_ops, const hbool_t coll_metadata_write, const int md_write_strat) { - const char * fcn_name = "open_hdf5_file()"; + const char *fcn_name = "open_hdf5_file()"; hbool_t show_progress = FALSE; hbool_t verbose = FALSE; int cp = 0; @@ -854,8 +854,8 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons hid_t fcpl_id = -1; hid_t file_id = -1; herr_t result; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; H5C_cache_image_ctl_t image_ctl; H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; @@ -2153,8 +2153,8 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) int i; int num_dsets = PAR_NUM_DSETS; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; MPI_Comm dummy_comm = MPI_COMM_WORLD; MPI_Info dummy_info = MPI_INFO_NULL; @@ -2912,8 +2912,8 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; pass = TRUE; @@ -3179,8 +3179,8 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; pass = TRUE; @@ -3439,12 +3439,12 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) static hbool_t smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) { - const char * fcn_name = "smoke_check_1()"; + const char *fcn_name = "smoke_check_1()"; char filename[512]; hbool_t show_progress = FALSE; hid_t file_id = -1; - H5F_t * file_ptr = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *file_ptr = NULL; + H5C_t *cache_ptr = NULL; int cp = 0; int i; int num_dsets = PAR_NUM_DSETS; diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c index 104460a..854a1d4 100644 --- a/testpar/t_coll_chunk.c +++ b/testpar/t_coll_chunk.c @@ -591,8 +591,8 @@ coll_chunktest(const char *filename, int chunk_factor, int select_factor, int ap hid_t acc_plist, xfer_plist, crp_plist; hsize_t dims[RANK], chunk_dims[RANK]; - int * data_array1 = NULL; - int * data_origin1 = NULL; + int *data_array1 = NULL; + int *data_origin1 = NULL; hsize_t start[RANK], count[RANK], stride[RANK], block[RANK]; diff --git a/testpar/t_coll_md_read.c b/testpar/t_coll_md_read.c index cabdea0..e402428 100644 --- a/testpar/t_coll_md_read.c +++ b/testpar/t_coll_md_read.c @@ -56,7 +56,7 @@ void test_partial_no_selection_coll_md_read(void) { const char *filename; - hsize_t * dataset_dims = NULL; + hsize_t *dataset_dims = NULL; hsize_t max_dataset_dims[PARTIAL_NO_SELECTION_DATASET_NDIMS]; hsize_t sel_dims[1]; hsize_t chunk_dims[PARTIAL_NO_SELECTION_DATASET_NDIMS] = {PARTIAL_NO_SELECTION_Y_DIM_SCALE, @@ -73,8 +73,8 @@ test_partial_no_selection_coll_md_read(void) hid_t fspace_id = H5I_INVALID_HID; hid_t mspace_id = H5I_INVALID_HID; int mpi_rank, mpi_size; - void * data = NULL; - void * read_buf = NULL; + void *data = NULL; + void *read_buf = NULL; MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); @@ -255,7 +255,7 @@ test_multi_chunk_io_addrmap_issue(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t dxpl_id = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - void * read_buf = NULL; + void *read_buf = NULL; int mpi_rank; int data[5][5] = {{0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}, {0, 1, 2, 3, 4}}; @@ -402,8 +402,8 @@ test_link_chunk_io_sort_chunk_issue(void) hid_t fspace_id = H5I_INVALID_HID; hid_t mspace_id = H5I_INVALID_HID; int mpi_rank, mpi_size; - void * data = NULL; - void * read_buf = NULL; + void *data = NULL; + void *read_buf = NULL; MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 6b6be6f..1609fc0 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -281,7 +281,7 @@ dataset_writeInd(void) hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -418,8 +418,8 @@ dataset_readInd(void) hid_t file_dataspace; /* File dataspace ID */ hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -545,7 +545,7 @@ dataset_writeAll(void) hid_t dataset5, dataset6, dataset7; /* Dataset ID */ hid_t datatype; /* Datatype ID */ hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -1060,8 +1060,8 @@ dataset_readAll(void) hid_t file_dataspace; /* File dataspace ID */ hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2, dataset5, dataset6, dataset7; /* Dataset ID */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -1418,7 +1418,7 @@ dataset_readAll(void) start[0] = (hsize_t)(dim0 / mpi_size * mpi_rank); start[1] = 0; ret = dataset_vrfy(start, count, stride, block, data_array1 + (dim0 / mpi_size * dim1 * mpi_rank), - data_origin1); + data_origin1); if (ret) nerrors++; @@ -1477,7 +1477,7 @@ extend_writeInd(void) const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ hsize_t chunk_dims[RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -1855,9 +1855,9 @@ extend_readInd(void) hid_t mem_dataspace; /* memory dataspace ID */ hid_t dataset1, dataset2; /* Dataset ID */ hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_array2 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_array2 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ const char *filename; hsize_t start[RANK]; /* for hyperslab setting */ @@ -2036,7 +2036,7 @@ extend_writeAll(void) const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ hsize_t max_dims[RANK] = {H5S_UNLIMITED, H5S_UNLIMITED}; /* dataset maximum dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ hsize_t chunk_dims[RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2274,9 +2274,9 @@ extend_readAll(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_array1 = NULL; /* data buffer */ - DATATYPE * data_array2 = NULL; /* data buffer */ - DATATYPE * data_origin1 = NULL; /* expected data buffer */ + DATATYPE *data_array1 = NULL; /* data buffer */ + DATATYPE *data_array2 = NULL; /* data buffer */ + DATATYPE *data_origin1 = NULL; /* expected data buffer */ hsize_t start[RANK]; /* for hyperslab setting */ hsize_t count[RANK], stride[RANK]; /* for hyperslab setting */ @@ -2470,8 +2470,8 @@ compress_readAll(void) unsigned u; /* Local index variable */ unsigned chunk_opts; /* Chunk options */ unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ - DATATYPE * data_read = NULL; /* data buffer */ - DATATYPE * data_orig = NULL; /* expected data buffer */ + DATATYPE *data_read = NULL; /* data buffer */ + DATATYPE *data_orig = NULL; /* expected data buffer */ const char *filename; MPI_Comm comm = MPI_COMM_WORLD; MPI_Info info = MPI_INFO_NULL; @@ -2653,8 +2653,8 @@ none_selection_chunk(void) hid_t dataset1, dataset2; /* Dataset ID */ const char *filename; hsize_t dims[RANK]; /* dataset dim sizes */ - DATATYPE * data_origin = NULL; /* data buffer */ - DATATYPE * data_array = NULL; /* data buffer */ + DATATYPE *data_origin = NULL; /* data buffer */ + DATATYPE *data_array = NULL; /* data buffer */ hsize_t chunk_dims[RANK]; /* chunk sizes */ hid_t dataset_pl; /* dataset create prop. list */ @@ -2911,8 +2911,8 @@ test_actual_io_mode(int selection_mode) H5D_mpio_actual_io_mode_t actual_io_mode_write = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_read = H5D_MPIO_NO_COLLECTIVE; H5D_mpio_actual_io_mode_t actual_io_mode_expected = H5D_MPIO_NO_COLLECTIVE; - const char * filename; - const char * test_name; + const char *filename; + const char *test_name; hbool_t direct_multi_chunk_io; hbool_t multi_chunk_io; hbool_t is_chunked; @@ -2920,7 +2920,7 @@ test_actual_io_mode(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm = MPI_COMM_NULL; MPI_Info mpi_info = MPI_INFO_NULL; @@ -3442,7 +3442,7 @@ test_no_collective_cause_mode(int selection_mode) int mpi_size = -1; int mpi_rank = -1; int length; - int * buffer; + int *buffer; int i; MPI_Comm mpi_comm; MPI_Info mpi_info; @@ -3754,8 +3754,8 @@ dataset_atomicity(void) hid_t sid; /* Dataspace ID */ hid_t dataset1; /* Dataset IDs */ hsize_t dims[RANK]; /* dataset dim sizes */ - int * write_buf = NULL; /* data buffer */ - int * read_buf = NULL; /* data buffer */ + int *write_buf = NULL; /* data buffer */ + int *read_buf = NULL; /* data buffer */ int buf_size; hid_t dataset2; hid_t file_dataspace; /* File dataspace ID */ diff --git a/testpar/t_file.c b/testpar/t_file.c index 557a699..ebdf1bb 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -124,8 +124,8 @@ test_page_buffer_access(void) size_t page_count = 0; int i, num_elements = 200; haddr_t raw_addr, meta_addr; - int * data; - H5F_t * f = NULL; + int *data; + H5F_t *f = NULL; herr_t ret; /* generic return value */ const char *filename; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ @@ -440,13 +440,13 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str hsize_t count[RANK]; hsize_t stride[RANK]; hsize_t block[RANK]; - DATATYPE * data_array = NULL; + DATATYPE *data_array = NULL; hsize_t dims[RANK], i; hsize_t num_elements; int k; char dset_name[20]; - H5F_t * f = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *f = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t config; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret; @@ -593,7 +593,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t { hid_t file_id, dset_id, grp_id, grp_id2; hid_t sid, mem_dataspace; - DATATYPE * data_array = NULL; + DATATYPE *data_array = NULL; hsize_t dims[RANK]; hsize_t start[RANK]; hsize_t count[RANK]; @@ -602,8 +602,8 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t int i, k, ndims; hsize_t num_elements; char dset_name[20]; - H5F_t * f = NULL; - H5C_t * cache_ptr = NULL; + H5F_t *f = NULL; + H5C_t *cache_ptr = NULL; H5AC_cache_config_t config; hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ herr_t ret; diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c index a8251de..039576f 100644 --- a/testpar/t_file_image.c +++ b/testpar/t_file_image.c @@ -67,7 +67,7 @@ file_image_daisy_chain_test(void) int i; int space_ndims; MPI_Status rcvstat; - int * vector_ptr = NULL; + int *vector_ptr = NULL; hid_t fapl_id = -1; hid_t file_id; /* file IDs */ hid_t dset_id = -1; @@ -75,7 +75,7 @@ file_image_daisy_chain_test(void) hid_t space_id = -1; herr_t err; hsize_t dims[1]; - void * image_ptr = NULL; + void *image_ptr = NULL; ssize_t bytes_read; ssize_t image_len; hbool_t vector_ok = TRUE; diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c index 5c0d10f..efbe847 100644 --- a/testpar/t_filter_read.c +++ b/testpar/t_filter_read.c @@ -60,8 +60,8 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size) size_t i, j; /* Local index variables */ char name[32] = "dataset"; herr_t hrc; /* Error status */ - int * points = NULL; /* Writing buffer for entire dataset */ - int * check = NULL; /* Reading buffer for selected hyperslab */ + int *points = NULL; /* Writing buffer for entire dataset */ + int *check = NULL; /* Reading buffer for selected hyperslab */ /* set up MPI parameters */ MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); @@ -207,7 +207,7 @@ test_filter_read(void) unsigned chunk_opts; /* Chunk options */ unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ herr_t hrc; - const char * filename; + const char *filename; #ifdef H5_HAVE_FILTER_FLETCHER32 hsize_t fletcher32_size; /* Size of dataset with Fletcher32 checksum */ #endif diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index d7e3123..1f8db7d 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -76,16 +76,16 @@ static void test_write_filtered_dataset_no_overlap_partial(const char *parent_gr hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_single_unlim_dim_no_overlap(const char * parent_group, +static void test_write_filtered_dataset_single_unlim_dim_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_single_unlim_dim_overlap(const char * parent_group, +static void test_write_filtered_dataset_single_unlim_dim_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char * parent_group, +static void test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_filtered_dataset_multi_unlim_dim_overlap(const char * parent_group, +static void test_write_filtered_dataset_multi_unlim_dim_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_filtered_dataset_single_no_selection(const char *parent_group, H5Z_filter_t filter_id, @@ -96,27 +96,27 @@ static void test_write_filtered_dataset_point_selection(const char *parent_group hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_filtered_dataset_interleaved_write(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_transformed_filtered_dataset_no_overlap(const char * parent_group, +static void test_write_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_3d_filtered_dataset_no_overlap_separate_pages(const char * parent_group, +static void test_write_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_3d_filtered_dataset_no_overlap_same_pages(const char * parent_group, +static void test_write_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_no_conversion_unshared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_no_conversion_shared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_type_conversion_unshared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_write_cmpd_filtered_dataset_type_conversion_shared(const char * parent_group, +static void test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); #endif @@ -136,27 +136,27 @@ static void test_read_filtered_dataset_point_selection(const char *parent_group, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_transformed_filtered_dataset_no_overlap(const char * parent_group, +static void test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_3d_filtered_dataset_no_overlap_separate_pages(const char * parent_group, +static void test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_3d_filtered_dataset_no_overlap_same_pages(const char * parent_group, +static void test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); static void test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_no_conversion_unshared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_no_conversion_shared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_type_conversion_unshared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); -static void test_read_cmpd_filtered_dataset_type_conversion_shared(const char * parent_group, +static void test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id, hid_t dcpl_id, hid_t dxpl_id); @@ -972,9 +972,10 @@ test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filte data[i] = (C_DATATYPE)GEN_DATA(i); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -1987,7 +1988,7 @@ test_write_filtered_dataset_point_selection(const char *parent_group, H5Z_filter C_DATATYPE *data = NULL; C_DATATYPE *correct_buf = NULL; C_DATATYPE *read_buf = NULL; - hsize_t * coords = NULL; + hsize_t *coords = NULL; hsize_t dataset_dims[WRITE_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t chunk_dims[WRITE_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t sel_dims[WRITE_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; @@ -2072,9 +2073,10 @@ test_write_filtered_dataset_point_selection(const char *parent_group, H5Z_filter data[i] = (C_DATATYPE)GEN_DATA(i); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -2899,19 +2901,21 @@ test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fi for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) /* Add the Column Index */ - correct_buf[i] = (C_DATATYPE)( - (i % (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the Row Index */ - + ((i % (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * - WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / - (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the amount that gets added when a rank moves down to its next - section vertically in the dataset */ - + ((hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS) * - (i / (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * - WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); + correct_buf[i] = (C_DATATYPE)((i % (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the Row Index */ + + ((i % (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / + (hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the amount that gets added when a rank moves down to its next + section vertically in the dataset */ + + ((hsize_t)(WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS) * + (i / (hsize_t)(mpi_size * WRITE_SHARED_FILTERED_CHUNKS_3D_DEPTH * + WRITE_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -3749,8 +3753,8 @@ test_read_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t filt hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from one-chunk filtered dataset"); @@ -3950,8 +3954,8 @@ test_read_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fil hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks"); @@ -4151,8 +4155,8 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from shared filtered chunks"); @@ -4167,9 +4171,10 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter VRFY((NULL != correct_buf), "HDcalloc succeeded"); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -4369,8 +4374,8 @@ test_read_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fil hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from filtered chunks with a single process having no selection"); @@ -4721,7 +4726,7 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ C_DATATYPE *correct_buf = NULL; C_DATATYPE *read_buf = NULL; C_DATATYPE *global_buf = NULL; - hsize_t * coords = NULL; + hsize_t *coords = NULL; hsize_t dataset_dims[READ_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t chunk_dims[READ_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; hsize_t sel_dims[READ_POINT_SELECTION_FILTERED_CHUNKS_DATASET_DIMS]; @@ -4731,8 +4736,8 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from filtered chunks with point selection"); @@ -4747,9 +4752,10 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ VRFY((NULL != correct_buf), "HDcalloc succeeded"); for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) - correct_buf[i] = (C_DATATYPE)( - (dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + (i % dataset_dims[1]) + - (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); + correct_buf[i] = + (C_DATATYPE)((dataset_dims[1] * (i / ((hsize_t)mpi_size * dataset_dims[1]))) + + (i % dataset_dims[1]) + + (((i % ((hsize_t)mpi_size * dataset_dims[1])) / dataset_dims[1]) % dataset_dims[1])); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -4946,8 +4952,8 @@ test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing interleaved read from filtered chunks"); @@ -5161,9 +5167,9 @@ test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group { MPI_Datatype vector_type; MPI_Datatype resized_vector_type; - C_DATATYPE * read_buf = NULL; - C_DATATYPE * correct_buf = NULL; - C_DATATYPE * global_buf = NULL; + C_DATATYPE *read_buf = NULL; + C_DATATYPE *correct_buf = NULL; + C_DATATYPE *global_buf = NULL; hsize_t dataset_dims[READ_UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS]; hsize_t chunk_dims[READ_UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS]; hsize_t sel_dims[READ_UNSHARED_FILTERED_CHUNKS_3D_SEP_PAGE_DATASET_DIMS]; @@ -5393,8 +5399,8 @@ test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_ hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared transformed and filtered chunks"); @@ -5618,8 +5624,8 @@ test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5 hid_t file_id = H5I_INVALID_HID, dset_id = H5I_INVALID_HID, plist_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks on the same pages in 3D dataset"); @@ -5816,9 +5822,9 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil { MPI_Datatype vector_type; MPI_Datatype resized_vector_type; - C_DATATYPE * read_buf = NULL; - C_DATATYPE * correct_buf = NULL; - C_DATATYPE * global_buf = NULL; + C_DATATYPE *read_buf = NULL; + C_DATATYPE *correct_buf = NULL; + C_DATATYPE *global_buf = NULL; hsize_t dataset_dims[READ_SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS]; hsize_t chunk_dims[READ_SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS]; hsize_t sel_dims[READ_SHARED_FILTERED_CHUNKS_3D_DATASET_DIMS]; @@ -5847,19 +5853,21 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil for (i = 0; i < correct_buf_size / sizeof(*correct_buf); i++) /* Add the Column Index */ - correct_buf[i] = (C_DATATYPE)( - (i % (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the Row Index */ - + ((i % (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * - READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / - (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) - - /* Add the amount that gets added when a rank moves down to its next - section vertically in the dataset */ - + ((hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * READ_SHARED_FILTERED_CHUNKS_3D_NCOLS) * - (i / (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * - READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); + correct_buf[i] = (C_DATATYPE)((i % (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the Row Index */ + + ((i % (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) / + (hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)) + + /* Add the amount that gets added when a rank moves down to its next + section vertically in the dataset */ + + ((hsize_t)(READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS) * + (i / (hsize_t)(mpi_size * READ_SHARED_FILTERED_CHUNKS_3D_DEPTH * + READ_SHARED_FILTERED_CHUNKS_3D_NCOLS)))); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -6060,8 +6068,8 @@ test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks in Compound Datatype dataset without Datatype " @@ -6287,8 +6295,8 @@ test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from shared filtered chunks in Compound Datatype dataset without Datatype " @@ -6520,8 +6528,8 @@ test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_grou hid_t filetype = H5I_INVALID_HID, memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing read from unshared filtered chunks in Compound Datatype dataset with Datatype " @@ -6756,8 +6764,8 @@ test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, hid_t filetype = H5I_INVALID_HID, memtype = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID, memspace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs( @@ -7857,7 +7865,7 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t * edge chunk and writes to just a portion of the edge chunk. */ static void -test_edge_chunks_partial_write(const char H5_ATTR_PARALLEL_UNUSED * parent_group, +test_edge_chunks_partial_write(const char H5_ATTR_PARALLEL_UNUSED *parent_group, H5Z_filter_t H5_ATTR_PARALLEL_UNUSED filter_id, hid_t H5_ATTR_PARALLEL_UNUSED fapl_id, hid_t H5_ATTR_PARALLEL_UNUSED dcpl_id, hid_t H5_ATTR_PARALLEL_UNUSED dxpl_id) @@ -7890,8 +7898,8 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id hid_t group_id = H5I_INVALID_HID; hid_t memspace = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing fill values"); @@ -8269,8 +8277,8 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_ hid_t dxpl_id) { H5D_alloc_time_t alloc_time; - C_DATATYPE * data = NULL; - C_DATATYPE * read_buf = NULL; + C_DATATYPE *data = NULL; + C_DATATYPE *read_buf = NULL; hsize_t dataset_dims[FILL_VALUE_UNDEFINED_TEST_DATASET_DIMS]; hsize_t chunk_dims[FILL_VALUE_UNDEFINED_TEST_DATASET_DIMS]; hsize_t sel_dims[FILL_VALUE_UNDEFINED_TEST_DATASET_DIMS]; @@ -8499,8 +8507,8 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap hid_t group_id = H5I_INVALID_HID; hid_t memspace = H5I_INVALID_HID; hid_t filespace = H5I_INVALID_HID; - int * recvcounts = NULL; - int * displs = NULL; + int *recvcounts = NULL; + int *displs = NULL; if (MAINPROCESS) HDputs("Testing fill time H5D_FILL_TIME_NEVER"); diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index 339ca33..cc88431 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -139,12 +139,12 @@ multiple_dset_write(void) hsize_t chunk_origin[DIM]; hsize_t chunk_dims[DIM], file_dims[DIM]; hsize_t count[DIM] = {1, 1}; - double * outme = NULL; + double *outme = NULL; double fill = 1.0; /* Fill value */ char dname[100]; herr_t ret; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ndatasets; pt = GetTestParameters(); @@ -219,8 +219,8 @@ compact_dataset(void) int i, j, mpi_size, mpi_rank, size, err_num = 0; hid_t iof, plist, dcpl, dxpl, dataset, filespace; hsize_t file_dims[DIM]; - double * outme; - double * inme; + double *outme; + double *inme; char dname[] = "dataset"; herr_t ret; const char *filename; @@ -583,8 +583,8 @@ dataset_fillvalue(void) hsize_t req_start[4] = {0, 0, 0, 0}; hsize_t req_count[4] = {1, 6, 7, 8}; hsize_t dset_size; /* Dataset size */ - int * rdata, *wdata; /* Buffers for data to read and write */ - int * twdata, *trdata; /* Temporary pointer into buffer */ + int *rdata, *wdata; /* Buffers for data to read and write */ + int *twdata, *trdata; /* Temporary pointer into buffer */ int acc, i, ii, j, k, l; /* Local index variables */ herr_t ret; /* Generic return value */ const char *filename; @@ -827,13 +827,13 @@ collective_group_write(void) int i, j, m; char gname[64], dname[32]; hid_t fid, gid, did, plist, dcpl, memspace, filespace; - DATATYPE * outme = NULL; + DATATYPE *outme = NULL; hsize_t chunk_origin[DIM]; hsize_t chunk_dims[DIM], file_dims[DIM], count[DIM]; hsize_t chunk_size[2]; /* Chunk dimensions - computed shortly */ herr_t ret1, ret2; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -926,7 +926,7 @@ independent_group_read(void) int mpi_rank, m; hid_t plist, fid; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; herr_t ret; @@ -1046,7 +1046,7 @@ multiple_group_write(void) hsize_t chunk_dims[DIM], file_dims[DIM], count[DIM]; herr_t ret; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -1201,7 +1201,7 @@ multiple_group_read(void) hsize_t chunk_origin[DIM]; hsize_t chunk_dims[DIM], file_dims[DIM], count[DIM]; const H5Ptest_param_t *pt; - char * filename; + char *filename; int ngroups; pt = GetTestParameters(); @@ -1516,10 +1516,10 @@ io_mode_confusion(void) * test bed related variables */ - const char * fcn_name = "io_mode_confusion"; + const char *fcn_name = "io_mode_confusion"; const hbool_t verbose = FALSE; const H5Ptest_param_t *pt; - char * filename; + char *filename; pt = GetTestParameters(); filename = pt->name; @@ -1766,7 +1766,7 @@ rr_obj_hdr_flush_confusion(void) MPI_Comm comm; /* test bed related variables */ - const char * fcn_name = "rr_obj_hdr_flush_confusion"; + const char *fcn_name = "rr_obj_hdr_flush_confusion"; const hbool_t verbose = FALSE; /* Create two new private communicators from MPI_COMM_WORLD. @@ -1843,10 +1843,10 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm) int steps_done = 0; /* test bed related variables */ - const char * fcn_name = "rr_obj_hdr_flush_confusion_writer"; + const char *fcn_name = "rr_obj_hdr_flush_confusion_writer"; const hbool_t verbose = FALSE; const H5Ptest_param_t *pt; - char * filename; + char *filename; /* * setup test bed related variables: @@ -2222,10 +2222,10 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm) int steps_done = -1; /* How far (steps) have been verified */ /* test bed related variables */ - const char * fcn_name = "rr_obj_hdr_flush_confusion_reader"; + const char *fcn_name = "rr_obj_hdr_flush_confusion_reader"; const hbool_t verbose = FALSE; const H5Ptest_param_t *pt; - char * filename; + char *filename; /* * setup test bed related variables: @@ -2554,7 +2554,7 @@ chunk_align_bug_1(void) h5_stat_size_t file_size; hsize_t align; herr_t ret; - const char * filename; + const char *filename; MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 1e685d3..b43768f 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -199,7 +199,7 @@ test_mpio_gb_file(char *filename) int writerrs; /* write errors */ int nerrs; int ntimes; /* how many times */ - char * buf = NULL; + char *buf = NULL; char expected; MPI_Offset size; MPI_Offset mpi_off; diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c index 49b6ec9..c2f6f52 100644 --- a/testpar/t_pflush1.c +++ b/testpar/t_pflush1.c @@ -117,7 +117,7 @@ main(int argc, char *argv[]) hid_t fid1 = H5I_INVALID_HID; hid_t fid2 = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; - MPI_File * mpifh_p = NULL; + MPI_File *mpifh_p = NULL; char name[1024]; const char *envval = NULL; int mpi_size; diff --git a/testpar/t_pread.c b/testpar/t_pread.c index d79130b..194f941 100644 --- a/testpar/t_pread.c +++ b/testpar/t_pread.c @@ -110,7 +110,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) hid_t dcpl_id = H5P_DEFAULT; hsize_t chunk[1]; float nextValue; - float * data_slice = NULL; + float *data_slice = NULL; pass = TRUE; @@ -514,7 +514,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) hsize_t count = COUNT; hsize_t dims[1] = {0}; float nextValue; - float * data_slice = NULL; + float *data_slice = NULL; pass = TRUE; diff --git a/testpar/t_prop.c b/testpar/t_prop.c index 606e100..e4a814c 100644 --- a/testpar/t_prop.c +++ b/testpar/t_prop.c @@ -26,7 +26,7 @@ test_encode_decode(hid_t orig_pl, int mpi_rank, int recv_proc) MPI_Status status; hid_t pl; /* Decoded property list */ size_t buf_size = 0; - void * sbuf = NULL; + void *sbuf = NULL; herr_t ret; /* Generic return value */ if (mpi_rank == 0) { @@ -105,7 +105,7 @@ test_plist_ed(void) unsigned max_compact; unsigned min_dense; hsize_t max_size[1]; /*data space maximum size */ - const char * c_to_f = "x+32"; + const char *c_to_f = "x+32"; H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, TRUE, FALSE, diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index d265761..201f331 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -85,10 +85,10 @@ struct hs_dr_pio_test_vars_t { hsize_t stride[PAR_SS_DR_MAX_RANK]; hsize_t count[PAR_SS_DR_MAX_RANK]; hsize_t block[PAR_SS_DR_MAX_RANK]; - hsize_t * start_ptr; - hsize_t * stride_ptr; - hsize_t * count_ptr; - hsize_t * block_ptr; + hsize_t *start_ptr; + hsize_t *stride_ptr; + hsize_t *count_ptr; + hsize_t *block_ptr; int skips; int max_skips; int64_t total_tests; @@ -126,8 +126,8 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker int mrc; int mpi_rank; /* needed by the VRFY macro */ uint32_t expected_value; - uint32_t * ptr_0; - uint32_t * ptr_1; + uint32_t *ptr_0; + uint32_t *ptr_1; hid_t acc_tpl; /* File access templates */ hid_t small_ds_dcpl_id = H5P_DEFAULT; hid_t large_ds_dcpl_id = H5P_DEFAULT; @@ -830,12 +830,13 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that expected data is retrieved */ - mis_match = FALSE; - ptr_1 = tv_ptr->small_ds_slice_buf; - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + mis_match = FALSE; + ptr_1 = tv_ptr->small_ds_slice_buf; + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); for (n = 0; n < tv_ptr->small_ds_slice_size; n++) { @@ -1062,10 +1063,11 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) */ ptr_1 = tv_ptr->large_ds_buf_1; expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; HDassert(start_index < stop_index); @@ -1335,10 +1337,11 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) mis_match = FALSE; ptr_1 = tv_ptr->small_ds_buf_1; - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); start_index = (size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size; stop_index = start_index + tv_ptr->small_ds_slice_size - 1; @@ -1625,10 +1628,11 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1 = tv_ptr->large_ds_buf_1; expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; HDassert(start_index < stop_index); @@ -2531,7 +2535,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) { #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__d2m_l2s()"; - uint32_t * ptr_0; + uint32_t *ptr_0; #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */ hbool_t data_ok = FALSE; int i, j, k, l; @@ -2708,10 +2712,11 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that expected data is retrieved */ - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); data_ok = ckrbrd_hs_dr_pio_test__verify_data( tv_ptr->small_ds_slice_buf, tv_ptr->small_rank - 1, tv_ptr->edge_size, @@ -2929,10 +2934,11 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) data_ok = TRUE; ptr_1 = tv_ptr->large_ds_buf_1; expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG @@ -3256,10 +3262,11 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that expected data is retrieved */ - expected_value = (uint32_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + expected_value = + (uint32_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); start_index = (size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size; stop_index = start_index + tv_ptr->small_ds_slice_size - 1; @@ -3553,10 +3560,11 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) */ expected_value = (uint32_t)((size_t)(tv_ptr->mpi_rank) * tv_ptr->small_ds_slice_size); - start_index = (size_t)( - (i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + - (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); + start_index = + (size_t)((i * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size * + tv_ptr->edge_size) + + (j * tv_ptr->edge_size * tv_ptr->edge_size * tv_ptr->edge_size) + + (k * tv_ptr->edge_size * tv_ptr->edge_size) + (l * tv_ptr->edge_size)); stop_index = start_index + tv_ptr->small_ds_slice_size - 1; HDassert(start_index < stop_index); @@ -3944,7 +3952,7 @@ int facc_type = FACC_MPIO; /*Test file access type */ int dxfer_coll_type = DXFER_COLLECTIVE_IO; H5E_auto2_t old_func; /* previous error handler */ -void * old_client_data; /* previous error handler arg.*/ +void *old_client_data; /* previous error handler arg.*/ /* other option flags */ @@ -3956,7 +3964,7 @@ void * old_client_data; /* previous error handler arg.*/ #define NFILENAME 2 #define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME] = {"ShapeSameTest", NULL}; -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ #ifdef USE_PAUSE diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 288c7b2..3721bae 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -43,7 +43,7 @@ int dxfer_coll_type = DXFER_COLLECTIVE_IO; #define NFILENAME 2 #define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME] = {"ParaTest", NULL}; -char * filenames[NFILENAME]; +char *filenames[NFILENAME]; hid_t fapl; /* file access property list */ #ifdef USE_PAUSE |