diff options
Diffstat (limited to 'testpar/API')
| -rw-r--r-- | testpar/API/H5_api_async_test_parallel.c | 100 | ||||
| -rw-r--r-- | testpar/API/H5_api_dataset_test_parallel.c | 50 | ||||
| -rw-r--r-- | testpar/API/H5_api_file_test_parallel.c | 8 | ||||
| -rw-r--r-- | testpar/API/H5_api_test_parallel.c | 22 | ||||
| -rw-r--r-- | testpar/API/H5_api_test_parallel.h | 8 | ||||
| -rw-r--r-- | testpar/API/t_bigio.c | 4 | ||||
| -rw-r--r-- | testpar/API/t_chunk_alloc.c | 2 | ||||
| -rw-r--r-- | testpar/API/t_coll_chunk.c | 2 | ||||
| -rw-r--r-- | testpar/API/t_dset.c | 40 | ||||
| -rw-r--r-- | testpar/API/t_file.c | 88 | ||||
| -rw-r--r-- | testpar/API/t_file_image.c | 24 | ||||
| -rw-r--r-- | testpar/API/t_filter_read.c | 2 | ||||
| -rw-r--r-- | testpar/API/t_mdset.c | 68 | ||||
| -rw-r--r-- | testpar/API/t_prop.c | 24 | ||||
| -rw-r--r-- | testpar/API/t_shapesame.c | 165 | ||||
| -rw-r--r-- | testpar/API/t_span_tree.c | 124 | ||||
| -rw-r--r-- | testpar/API/testphdf5.c | 4 | ||||
| -rw-r--r-- | testpar/API/testphdf5.h | 20 |
18 files changed, 376 insertions, 379 deletions
diff --git a/testpar/API/H5_api_async_test_parallel.c b/testpar/API/H5_api_async_test_parallel.c index 23e3544..79327d0 100644 --- a/testpar/API/H5_api_async_test_parallel.c +++ b/testpar/API/H5_api_async_test_parallel.c @@ -47,7 +47,7 @@ static int (*par_async_tests[])(void) = { test_file_reopen, }; -hbool_t coll_metadata_read = TRUE; +bool coll_metadata_read = true; /* Highest "printf" file created (starting at 0) */ int max_printf_file = -1; @@ -65,8 +65,8 @@ test_one_dataset_io(void) hsize_t stride[ONE_DATASET_IO_TEST_SPACE_RANK]; hsize_t count[ONE_DATASET_IO_TEST_SPACE_RANK]; hsize_t block[ONE_DATASET_IO_TEST_SPACE_RANK]; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + bool op_failed = false; + bool is_native_vol = false; size_t i, data_size, num_in_progress; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; @@ -429,7 +429,7 @@ test_multi_dataset_io(void) hsize_t stride[MULTI_DATASET_IO_TEST_SPACE_RANK]; hsize_t count[MULTI_DATASET_IO_TEST_SPACE_RANK]; hsize_t block[MULTI_DATASET_IO_TEST_SPACE_RANK]; - hbool_t op_failed; + bool op_failed; size_t i, j, data_size, num_in_progress; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; @@ -753,8 +753,8 @@ test_multi_file_dataset_io(void) hsize_t stride[MULTI_FILE_DATASET_IO_TEST_SPACE_RANK]; hsize_t count[MULTI_FILE_DATASET_IO_TEST_SPACE_RANK]; hsize_t block[MULTI_FILE_DATASET_IO_TEST_SPACE_RANK]; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + bool op_failed = false; + bool is_native_vol = false; size_t i, j, data_size, num_in_progress; hid_t fapl_id = H5I_INVALID_HID; hid_t file_id[MULTI_FILE_DATASET_IO_TEST_NFILES] = {H5I_INVALID_HID, H5I_INVALID_HID, H5I_INVALID_HID, @@ -1178,7 +1178,7 @@ test_multi_file_grp_dset_io(void) hsize_t stride[MULTI_FILE_GRP_DSET_IO_TEST_SPACE_RANK]; hsize_t count[MULTI_FILE_GRP_DSET_IO_TEST_SPACE_RANK]; hsize_t block[MULTI_FILE_GRP_DSET_IO_TEST_SPACE_RANK]; - hbool_t op_failed; + bool op_failed; size_t i, j, data_size, num_in_progress; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; @@ -1597,8 +1597,8 @@ test_set_extent(void) hsize_t stride[SET_EXTENT_TEST_SPACE_RANK]; hsize_t count[SET_EXTENT_TEST_SPACE_RANK]; hsize_t block[SET_EXTENT_TEST_SPACE_RANK]; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + bool op_failed = false; + bool is_native_vol = false; size_t i, j, data_size, num_in_progress; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; @@ -1933,11 +1933,11 @@ static int test_attribute_exists(void) { hsize_t *dims = NULL; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + bool op_failed = false; + bool is_native_vol = false; size_t num_in_progress; - hbool_t exists1 = false; - hbool_t exists2 = false; + bool exists1 = false; + bool exists2 = false; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; @@ -2022,9 +2022,9 @@ test_attribute_exists(void) /* Check if H5Aexists returned the correct values */ if (exists1) - FAIL_PUTS_ERROR(" H5Aexists returned TRUE for an attribute that should not exist") + FAIL_PUTS_ERROR(" H5Aexists returned true for an attribute that should not exist") if (!exists2) - FAIL_PUTS_ERROR(" H5Aexists returned FALSE for an attribute that should exist"); + FAIL_PUTS_ERROR(" H5Aexists returned false for an attribute that should exist"); /* Close */ if (H5Aclose_async(attr_id, es_id) < 0) @@ -2085,8 +2085,8 @@ static int test_attribute_io(void) { hsize_t *dims = NULL; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + bool op_failed = false; + bool is_native_vol = false; size_t num_in_progress; size_t i, data_size; hid_t file_id = H5I_INVALID_HID; @@ -2293,7 +2293,7 @@ static int test_attribute_io_tconv(void) { hsize_t *dims = NULL; - hbool_t op_failed; + bool op_failed; size_t num_in_progress; size_t i, data_size; hid_t file_id = H5I_INVALID_HID; @@ -2493,7 +2493,7 @@ static int test_attribute_io_compound(void) { hsize_t *dims = NULL; - hbool_t op_failed; + bool op_failed; size_t num_in_progress; size_t i, data_size; hid_t file_id = H5I_INVALID_HID; @@ -2907,7 +2907,7 @@ test_group(void) H5G_info_t info2; H5G_info_t info3; size_t num_in_progress; - hbool_t op_failed; + bool op_failed; TESTING("group operations"); @@ -3073,21 +3073,21 @@ error: static int test_link(void) { - hid_t file_id = H5I_INVALID_HID; - hid_t fapl_id = H5I_INVALID_HID; - hid_t parent_group_id = H5I_INVALID_HID; - hid_t group_id = H5I_INVALID_HID; - hid_t gcpl_id = H5I_INVALID_HID; - hid_t es_id = H5I_INVALID_HID; - hbool_t existsh1; - hbool_t existsh2; - hbool_t existsh3; - hbool_t existss1; - hbool_t existss2; - hbool_t existss3; - size_t num_in_progress; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + hid_t file_id = H5I_INVALID_HID; + hid_t fapl_id = H5I_INVALID_HID; + hid_t parent_group_id = H5I_INVALID_HID; + hid_t group_id = H5I_INVALID_HID; + hid_t gcpl_id = H5I_INVALID_HID; + hid_t es_id = H5I_INVALID_HID; + bool existsh1; + bool existsh2; + bool existsh3; + bool existss1; + bool existss2; + bool existss3; + size_t num_in_progress; + bool op_failed = false; + bool is_native_vol = false; TESTING("link operations"); @@ -3276,17 +3276,17 @@ test_link(void) /* Check if existence returns were correct */ if (!existsh1) - FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned false for link that should exist"); if (!existss1) - FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned false for link that should exist"); if (!existsh2) - FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned false for link that should exist"); if (existss2) - FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned true for link that should not exist"); if (existsh3) - FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned true for link that should not exist"); if (existsh3) - FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned true for link that should not exist"); /* Close */ if (H5Gclose_async(parent_group_id, es_id) < 0) @@ -3342,8 +3342,8 @@ test_ocopy_orefresh(void) hid_t space_id = H5I_INVALID_HID; hid_t es_id = H5I_INVALID_HID; size_t num_in_progress; - hbool_t op_failed = false; - hbool_t is_native_vol = false; + bool op_failed = false; + bool is_native_vol = false; TESTING("H5Ocopy() and H5Orefresh()"); @@ -3495,12 +3495,12 @@ error: static int test_file_reopen(void) { - hid_t file_id = H5I_INVALID_HID; - hid_t fapl_id = H5I_INVALID_HID; - hid_t reopened_file_id = H5I_INVALID_HID; - hid_t es_id = H5I_INVALID_HID; - size_t num_in_progress; - hbool_t op_failed; + hid_t file_id = H5I_INVALID_HID; + hid_t fapl_id = H5I_INVALID_HID; + hid_t reopened_file_id = H5I_INVALID_HID; + hid_t es_id = H5I_INVALID_HID; + size_t num_in_progress; + bool op_failed; TESTING("H5Freopen()"); @@ -3631,7 +3631,7 @@ H5_api_async_test_parallel(void) printf("\n * Re-testing with independent metadata reads *\n"); } - coll_metadata_read = FALSE; + coll_metadata_read = false; for (i = 0, nerrors = 0; i < ARRAY_LENGTH(par_async_tests); i++) { nerrors += (*par_async_tests[i])() ? 1 : 0; diff --git a/testpar/API/H5_api_dataset_test_parallel.c b/testpar/API/H5_api_dataset_test_parallel.c index 5639348..0d53d44 100644 --- a/testpar/API/H5_api_dataset_test_parallel.c +++ b/testpar/API/H5_api_dataset_test_parallel.c @@ -121,7 +121,7 @@ test_write_dataset_data_verification(void) TESTING_2("test setup"); - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -197,7 +197,7 @@ test_write_dataset_data_verification(void) { PART_BEGIN(H5Dwrite_all_read) { - hbool_t op_failed = FALSE; + bool op_failed = false; TESTING_2("H5Dwrite using H5S_ALL then H5Dread"); @@ -221,10 +221,10 @@ test_write_dataset_data_verification(void) if (H5Dwrite(dset_id, DATASET_WRITE_DATA_VERIFY_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) - op_failed = TRUE; + op_failed = true; } else - op_failed = TRUE; + op_failed = true; if (write_buf) { free(write_buf); @@ -239,7 +239,7 @@ test_write_dataset_data_verification(void) PART_ERROR(H5Dwrite_all_read); } - if (op_failed == TRUE) { + if (op_failed == true) { H5_FAILED(); printf(" dataset write on rank 0 failed!\n"); PART_ERROR(H5Dwrite_all_read); @@ -936,7 +936,7 @@ test_write_dataset_independent(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -1275,7 +1275,7 @@ test_write_dataset_one_proc_0_selection(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -1572,7 +1572,7 @@ test_write_dataset_one_proc_none_selection(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -1882,7 +1882,7 @@ test_write_dataset_one_proc_all_selection(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -2179,7 +2179,7 @@ test_write_dataset_hyper_file_all_mem(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -2447,7 +2447,7 @@ test_write_dataset_all_file_hyper_mem(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -2755,7 +2755,7 @@ test_write_dataset_all_file_point_mem(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -3070,7 +3070,7 @@ test_write_dataset_hyper_file_point_mem(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -3390,7 +3390,7 @@ test_write_dataset_point_file_hyper_mem(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { @@ -3845,7 +3845,7 @@ test_read_dataset_one_proc_0_selection(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -4180,7 +4180,7 @@ test_read_dataset_one_proc_none_selection(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -4526,7 +4526,7 @@ test_read_dataset_one_proc_all_selection(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -4880,7 +4880,7 @@ test_read_dataset_all_file_hyper_mem(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -5228,7 +5228,7 @@ test_read_dataset_all_file_point_mem(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -5581,7 +5581,7 @@ test_read_dataset_hyper_file_point_mem(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -5935,7 +5935,7 @@ test_read_dataset_point_file_hyper_mem(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -6413,7 +6413,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -6876,7 +6876,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -7277,7 +7277,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); @@ -7803,7 +7803,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) /* * Re-open file on all ranks. */ - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_api_test_parallel_filename, H5F_ACC_RDWR, fapl_id)) < 0) { H5_FAILED(); diff --git a/testpar/API/H5_api_file_test_parallel.c b/testpar/API/H5_api_file_test_parallel.c index 9bbcd9c..2d9b5c2 100644 --- a/testpar/API/H5_api_file_test_parallel.c +++ b/testpar/API/H5_api_file_test_parallel.c @@ -44,7 +44,7 @@ test_create_file(void) return 0; } - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; if ((file_id = H5Fcreate(FILE_CREATE_TEST_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) { @@ -93,7 +93,7 @@ test_open_file(void) TESTING_2("test setup"); - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) TEST_ERROR; PASSED(); @@ -229,7 +229,7 @@ test_split_comm_file_access(void) MPI_Comm_rank(comm, &sub_mpi_rank); /* setup file access template */ - if ((fapl_id = create_mpi_fapl(comm, info, TRUE)) < 0) { + if ((fapl_id = create_mpi_fapl(comm, info, true)) < 0) { err_occurred = 1; goto access_end; } @@ -315,7 +315,7 @@ cleanup_files(void) { hid_t fapl_id = H5I_INVALID_HID; - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, TRUE)) < 0) { + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, true)) < 0) { if (MAINPROCESS) printf(" failed to create FAPL for deleting test files\n"); return; diff --git a/testpar/API/H5_api_test_parallel.c b/testpar/API/H5_api_test_parallel.c index 9b1d432..224c1b8 100644 --- a/testpar/API/H5_api_test_parallel.c +++ b/testpar/API/H5_api_test_parallel.c @@ -105,7 +105,7 @@ H5_api_test_run(void) } hid_t -create_mpi_fapl(MPI_Comm comm, MPI_Info info, hbool_t coll_md_read) +create_mpi_fapl(MPI_Comm comm, MPI_Info info, bool coll_md_read) { hid_t ret_pl = H5I_INVALID_HID; @@ -118,7 +118,7 @@ create_mpi_fapl(MPI_Comm comm, MPI_Info info, hbool_t coll_md_read) goto error; if (H5Pset_all_coll_metadata_ops(ret_pl, coll_md_read) < 0) goto error; - if (H5Pset_coll_metadata_write(ret_pl, TRUE) < 0) + if (H5Pset_coll_metadata_write(ret_pl, true) < 0) goto error; return ret_pl; @@ -236,13 +236,13 @@ main(int argc, char **argv) srand(seed); - if (NULL == (test_path_prefix = HDgetenv(HDF5_API_TEST_PATH_PREFIX))) + if (NULL == (test_path_prefix = getenv(HDF5_API_TEST_PATH_PREFIX))) test_path_prefix = ""; - HDsnprintf(H5_api_test_parallel_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s%s", test_path_prefix, - PARALLEL_TEST_FILE_NAME); + snprintf(H5_api_test_parallel_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s%s", test_path_prefix, + PARALLEL_TEST_FILE_NAME); - if (NULL == (vol_connector_string = HDgetenv(HDF5_VOL_CONNECTOR))) { + if (NULL == (vol_connector_string = getenv(HDF5_VOL_CONNECTOR))) { if (MAINPROCESS) printf("No VOL connector selected; using native VOL connector\n"); vol_connector_name = "native"; @@ -253,7 +253,7 @@ main(int argc, char **argv) BEGIN_INDEPENDENT_OP(copy_connector_string) { - if (NULL == (vol_connector_string_copy = HDstrdup(vol_connector_string))) { + if (NULL == (vol_connector_string_copy = strdup(vol_connector_string))) { if (MAINPROCESS) fprintf(stderr, "Unable to copy VOL connector string\n"); INDEPENDENT_OP_ERROR(copy_connector_string); @@ -263,7 +263,7 @@ main(int argc, char **argv) BEGIN_INDEPENDENT_OP(get_connector_name) { - if (NULL == (token = HDstrtok(vol_connector_string_copy, " "))) { + if (NULL == (token = strtok(vol_connector_string_copy, " "))) { if (MAINPROCESS) fprintf(stderr, "Error while parsing VOL connector string\n"); INDEPENDENT_OP_ERROR(get_connector_name); @@ -273,7 +273,7 @@ main(int argc, char **argv) vol_connector_name = token; - if (NULL != (token = HDstrtok(NULL, " "))) { + if (NULL != (token = strtok(NULL, " "))) { vol_connector_info = token; } } @@ -290,7 +290,7 @@ main(int argc, char **argv) BEGIN_INDEPENDENT_OP(create_fapl) { - if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, FALSE)) < 0) { + if ((fapl_id = create_mpi_fapl(MPI_COMM_WORLD, MPI_INFO_NULL, false)) < 0) { if (MAINPROCESS) fprintf(stderr, "Unable to create FAPL\n"); INDEPENDENT_OP_ERROR(create_fapl); @@ -307,7 +307,7 @@ main(int argc, char **argv) * Otherwise, HDF5 will default to running the tests * with the native connector, which could be misleading. */ - if (0 != HDstrcmp(vol_connector_name, "native")) { + if (0 != strcmp(vol_connector_name, "native")) { htri_t is_registered; if ((is_registered = H5VLis_connector_registered_by_name(vol_connector_name)) < 0) { diff --git a/testpar/API/H5_api_test_parallel.h b/testpar/API/H5_api_test_parallel.h index 44f9440..ae78814 100644 --- a/testpar/API/H5_api_test_parallel.h +++ b/testpar/API/H5_api_test_parallel.h @@ -139,7 +139,7 @@ extern char H5_api_test_parallel_filename[]; { \ if (MAINPROCESS) { \ printf("Testing %-62s", WHAT); \ - HDputs(""); \ + puts(""); \ fflush(stdout); \ } \ } @@ -151,7 +151,7 @@ extern char H5_api_test_parallel_filename[]; */ #define BEGIN_INDEPENDENT_OP(op_name) \ { \ - hbool_t ind_op_failed = FALSE; \ + bool ind_op_failed = false; \ \ { @@ -176,10 +176,10 @@ extern char H5_api_test_parallel_filename[]; } #define INDEPENDENT_OP_ERROR(op_name) \ - ind_op_failed = TRUE; \ + ind_op_failed = true; \ goto op_##op_name##_end; -hid_t create_mpi_fapl(MPI_Comm comm, MPI_Info info, hbool_t coll_md_read); +hid_t create_mpi_fapl(MPI_Comm comm, MPI_Info info, bool coll_md_read); int generate_random_parallel_dimensions(int space_rank, hsize_t **dims_out); extern int mpi_size; diff --git a/testpar/API/t_bigio.c b/testpar/API/t_bigio.c index 3ab4c38..e7bdfb0 100644 --- a/testpar/API/t_bigio.c +++ b/testpar/API/t_bigio.c @@ -1212,9 +1212,9 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(ret_pl, comm, info); VRFY_G((ret >= 0), ""); - ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE); + ret = H5Pset_all_coll_metadata_ops(ret_pl, true); VRFY_G((ret >= 0), ""); - ret = H5Pset_coll_metadata_write(ret_pl, TRUE); + ret = H5Pset_coll_metadata_write(ret_pl, true); VRFY_G((ret >= 0), ""); return (ret_pl); } diff --git a/testpar/API/t_chunk_alloc.c b/testpar/API/t_chunk_alloc.c index 37ea2fa..673563b 100644 --- a/testpar/API/t_chunk_alloc.c +++ b/testpar/API/t_chunk_alloc.c @@ -171,7 +171,6 @@ static void parallel_access_dataset(const char *filename, int chunk_factor, access_type action, hid_t *file_id, hid_t *dataset) { - /* HDF5 gubbins */ hid_t memspace, dataspace; /* HDF5 file identifier */ hid_t access_plist; /* HDF5 ID for file access property list */ herr_t hrc; /* HDF5 return code */ @@ -320,7 +319,6 @@ static void verify_data(const char *filename, int chunk_factor, write_type write_pattern, int vclose, hid_t *file_id, hid_t *dataset) { - /* HDF5 gubbins */ hid_t dataspace, memspace; /* HDF5 file identifier */ hid_t access_plist; /* HDF5 ID for file access property list */ herr_t hrc; /* HDF5 return code */ diff --git a/testpar/API/t_coll_chunk.c b/testpar/API/t_coll_chunk.c index b4e057e..99f845f 100644 --- a/testpar/API/t_coll_chunk.c +++ b/testpar/API/t_coll_chunk.c @@ -922,7 +922,7 @@ coll_chunktest(const char *filename, int chunk_factor, int select_factor, int ap /* Only check chunk optimization mode if selection I/O is not being used - * selection I/O bypasses this IO mode decision - it's effectively always * multi chunk currently */ - if (facc_type == FACC_MPIO && /* !H5_use_selection_io_g */ TRUE) { + if (facc_type == FACC_MPIO && /* !H5_use_selection_io_g */ true) { switch (api_option) { case API_LINK_HARD: status = H5Pget(xfer_plist, H5D_XFER_COLL_CHUNK_LINK_HARD_NAME, &prop_value); diff --git a/testpar/API/t_dset.c b/testpar/API/t_dset.c index 228cadc..0da25b0 100644 --- a/testpar/API/t_dset.c +++ b/testpar/API/t_dset.c @@ -3041,10 +3041,10 @@ test_actual_io_mode(int selection_mode) H5D_mpio_actual_io_mode_t actual_io_mode_expected = H5D_MPIO_NO_COLLECTIVE; const char *filename; const char *test_name; - hbool_t direct_multi_chunk_io; - hbool_t multi_chunk_io; - hbool_t is_chunked; - hbool_t is_collective; + bool direct_multi_chunk_io; + bool multi_chunk_io; + bool is_chunked; + bool is_collective; int mpi_size = -1; int mpi_rank = -1; int length; @@ -3401,10 +3401,10 @@ test_actual_io_mode(int selection_mode) /* Test values */ if (actual_chunk_opt_mode_expected != (H5D_mpio_actual_chunk_opt_mode_t)-1 && actual_io_mode_expected != (H5D_mpio_actual_io_mode_t)-1) { - HDsnprintf(message, sizeof(message), "Actual Chunk Opt Mode has the correct value for %s.\n", - test_name); + snprintf(message, sizeof(message), "Actual Chunk Opt Mode has the correct value for %s.\n", + test_name); VRFY((actual_chunk_opt_mode_write == actual_chunk_opt_mode_expected), message); - HDsnprintf(message, sizeof(message), "Actual IO Mode has the correct value for %s.\n", test_name); + snprintf(message, sizeof(message), "Actual IO Mode has the correct value for %s.\n", test_name); VRFY((actual_io_mode_write == actual_io_mode_expected), message); } else { @@ -3492,7 +3492,7 @@ actual_io_mode_tests(void) /* Only run these tests if selection I/O is not being used - selection I/O * bypasses this IO mode decision - it's effectively always multi chunk * currently */ - if (/* !H5_use_selection_io_g */ TRUE) { + if (/* !H5_use_selection_io_g */ true) { test_actual_io_mode(TEST_ACTUAL_IO_NO_COLLECTIVE); /* @@ -3579,8 +3579,8 @@ test_no_collective_cause_mode(int selection_mode) const char *filename; const char *test_name; - hbool_t is_chunked = 1; - hbool_t is_independent = 0; + bool is_chunked = 1; + bool is_independent = 0; int mpi_size = -1; int mpi_rank = -1; int length; @@ -3822,12 +3822,12 @@ test_no_collective_cause_mode(int selection_mode) /* Test values */ memset(message, 0, sizeof(message)); - HDsnprintf(message, sizeof(message), - "Local cause of Broken Collective I/O has the correct value for %s.\n", test_name); + snprintf(message, sizeof(message), "Local cause of Broken Collective I/O has the correct value for %s.\n", + test_name); VRFY((no_collective_cause_local_write == no_collective_cause_local_expected), message); memset(message, 0, sizeof(message)); - HDsnprintf(message, sizeof(message), - "Global cause of Broken Collective I/O has the correct value for %s.\n", test_name); + snprintf(message, sizeof(message), + "Global cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_global_write == no_collective_cause_global_expected), message); /* Release some resources */ @@ -3922,7 +3922,7 @@ dataset_atomicity(void) herr_t ret; /* Generic return value */ int mpi_size, mpi_rank; int i, j, k; - hbool_t atomicity = FALSE; + bool atomicity = false; MPI_Comm comm = MPI_COMM_WORLD; MPI_Info info = MPI_INFO_NULL; @@ -4015,7 +4015,7 @@ dataset_atomicity(void) /* should fail */ H5E_BEGIN_TRY { - ret = H5Fset_mpi_atomicity(fid, TRUE); + ret = H5Fset_mpi_atomicity(fid, true); } H5E_END_TRY VRFY((ret == FAIL), "H5Fset_mpi_atomicity failed"); @@ -4038,7 +4038,7 @@ dataset_atomicity(void) ret = H5Pclose(acc_tpl); VRFY((ret >= 0), "H5Pclose succeeded"); - ret = H5Fset_mpi_atomicity(fid, TRUE); + ret = H5Fset_mpi_atomicity(fid, true); VRFY((ret >= 0), "H5Fset_mpi_atomicity succeeded"); /* open dataset1 (contiguous case) */ @@ -4059,7 +4059,7 @@ dataset_atomicity(void) /* check that the atomicity flag is set */ ret = H5Fget_mpi_atomicity(fid, &atomicity); VRFY((ret >= 0), "atomcity get failed"); - VRFY((atomicity == TRUE), "atomcity set failed"); + VRFY((atomicity == true), "atomcity set failed"); MPI_Barrier(comm); @@ -4129,11 +4129,11 @@ dataset_atomicity(void) read_buf[i] = 8; } - atomicity = FALSE; + atomicity = false; /* check that the atomicity flag is set */ ret = H5Fget_mpi_atomicity(fid, &atomicity); VRFY((ret >= 0), "atomcity get failed"); - VRFY((atomicity == TRUE), "atomcity set failed"); + VRFY((atomicity == true), "atomcity set failed"); block[0] = (hsize_t)(dim0 / mpi_size - 1); block[1] = (hsize_t)(dim1 / mpi_size - 1); diff --git a/testpar/API/t_file.c b/testpar/API/t_file.c index c906c78..61d009c 100644 --- a/testpar/API/t_file.c +++ b/testpar/API/t_file.c @@ -143,7 +143,7 @@ test_page_buffer_access(void) H5F_t *f = NULL; herr_t ret; /* generic return value */ const char *filename; - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); @@ -174,7 +174,7 @@ test_page_buffer_access(void) VRFY((file_id < 0), "H5Fcreate failed"); /* disable collective metadata writes for page buffering to work */ - ret = H5Pset_coll_metadata_write(fapl, FALSE); + ret = H5Pset_coll_metadata_write(fapl, false); VRFY((ret >= 0), ""); ret = create_file(filename, fcpl, fapl, H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED); @@ -204,7 +204,7 @@ test_page_buffer_access(void) ret = H5Pset_page_buffer_size(fapl_self, sizeof(int) * 1000, 0, 0); VRFY((ret == 0), ""); /* collective metadata writes do not work with page buffering */ - ret = H5Pset_coll_metadata_write(fapl_self, FALSE); + ret = H5Pset_coll_metadata_write(fapl_self, false); VRFY((ret >= 0), ""); file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl_self); @@ -213,7 +213,7 @@ test_page_buffer_access(void) /* Push API context */ ret = H5CX_push(); VRFY((ret == 0), "H5CX_push()"); - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get a pointer to the internal file object */ f = (H5F_t *)H5I_object(file_id); @@ -302,9 +302,9 @@ test_page_buffer_access(void) /* Pop API context */ if (api_ctx_pushed) { - ret = H5CX_pop(FALSE); + ret = H5CX_pop(false); VRFY((ret == 0), "H5CX_pop()"); - api_ctx_pushed = FALSE; + api_ctx_pushed = false; } } @@ -314,7 +314,7 @@ test_page_buffer_access(void) ret = H5Pset_page_buffer_size(fapl, sizeof(int) * 1000, 0, 0); VRFY((ret == 0), ""); /* collective metadata writes do not work with page buffering */ - ret = H5Pset_coll_metadata_write(fapl, FALSE); + ret = H5Pset_coll_metadata_write(fapl, false); VRFY((ret >= 0), ""); file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); @@ -323,7 +323,7 @@ test_page_buffer_access(void) /* Push API context */ ret = H5CX_push(); VRFY((ret == 0), "H5CX_push()"); - api_ctx_pushed = TRUE; + api_ctx_pushed = true; /* Get a pointer to the internal file object */ f = (H5F_t *)H5I_object(file_id); @@ -436,9 +436,9 @@ test_page_buffer_access(void) /* Pop API context */ if (api_ctx_pushed) { - ret = H5CX_pop(FALSE); + ret = H5CX_pop(false); VRFY((ret == 0), "H5CX_pop()"); - api_ctx_pushed = FALSE; + api_ctx_pushed = false; } free(data); @@ -463,7 +463,7 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str H5F_t *f = NULL; H5C_t *cache_ptr = NULL; H5AC_cache_config_t config; - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ herr_t ret; file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl); @@ -475,7 +475,7 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str /* Push API context */ ret = H5CX_push(); VRFY((ret == 0), "H5CX_push()"); - api_ctx_pushed = TRUE; + api_ctx_pushed = true; f = (H5F_t *)H5I_object(file_id); VRFY((f != NULL), ""); @@ -483,7 +483,7 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str cache_ptr = f->shared->cache; VRFY((cache_ptr->magic == H5C__H5C_T_MAGIC), ""); - cache_ptr->ignore_tags = TRUE; + cache_ptr->ignore_tags = true; H5C_stats__reset(cache_ptr); config.version = H5AC__CURR_CACHE_CONFIG_VERSION; @@ -529,25 +529,25 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str VRFY((mem_dataspace >= 0), ""); for (k = 0; k < NUM_DSETS; k++) { - HDsnprintf(dset_name, sizeof(dset_name), "D1dset%d", k); + snprintf(dset_name, sizeof(dset_name), "D1dset%d", k); dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((dset_id >= 0), ""); ret = H5Dclose(dset_id); VRFY((ret == 0), ""); - HDsnprintf(dset_name, sizeof(dset_name), "D2dset%d", k); + snprintf(dset_name, sizeof(dset_name), "D2dset%d", k); dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((dset_id >= 0), ""); ret = H5Dclose(dset_id); VRFY((ret == 0), ""); - HDsnprintf(dset_name, sizeof(dset_name), "D3dset%d", k); + snprintf(dset_name, sizeof(dset_name), "D3dset%d", k); dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((dset_id >= 0), ""); ret = H5Dclose(dset_id); VRFY((ret == 0), ""); - HDsnprintf(dset_name, sizeof(dset_name), "dset%d", k); + snprintf(dset_name, sizeof(dset_name), "dset%d", k); dset_id = H5Dcreate2(grp_id, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((dset_id >= 0), ""); @@ -570,13 +570,13 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str for (i = 0; i < num_elements; i++) VRFY((data_array[i] == mpi_rank + 1), "Dataset Verify failed"); - HDsnprintf(dset_name, sizeof(dset_name), "D1dset%d", k); + snprintf(dset_name, sizeof(dset_name), "D1dset%d", k); ret = H5Ldelete(grp_id, dset_name, H5P_DEFAULT); VRFY((ret == 0), ""); - HDsnprintf(dset_name, sizeof(dset_name), "D2dset%d", k); + snprintf(dset_name, sizeof(dset_name), "D2dset%d", k); ret = H5Ldelete(grp_id, dset_name, H5P_DEFAULT); VRFY((ret == 0), ""); - HDsnprintf(dset_name, sizeof(dset_name), "D3dset%d", k); + snprintf(dset_name, sizeof(dset_name), "D3dset%d", k); ret = H5Ldelete(grp_id, dset_name, H5P_DEFAULT); VRFY((ret == 0), ""); } @@ -592,9 +592,9 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str /* Pop API context */ if (api_ctx_pushed) { - ret = H5CX_pop(FALSE); + ret = H5CX_pop(false); VRFY((ret == 0), "H5CX_pop()"); - api_ctx_pushed = FALSE; + api_ctx_pushed = false; } MPI_Barrier(MPI_COMM_WORLD); @@ -620,7 +620,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t H5F_t *f = NULL; H5C_t *cache_ptr = NULL; H5AC_cache_config_t config; - hbool_t api_ctx_pushed = FALSE; /* Whether API context pushed */ + bool api_ctx_pushed = false; /* Whether API context pushed */ herr_t ret; config.version = H5AC__CURR_CACHE_CONFIG_VERSION; @@ -639,7 +639,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t /* Push API context */ ret = H5CX_push(); VRFY((ret == 0), "H5CX_push()"); - api_ctx_pushed = TRUE; + api_ctx_pushed = true; ret = H5Fflush(file_id, H5F_SCOPE_GLOBAL); VRFY((ret == 0), ""); @@ -682,7 +682,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t VRFY((mem_dataspace >= 0), ""); for (k = 0; k < NUM_DSETS; k++) { - HDsnprintf(dset_name, sizeof(dset_name), "dset%d", k); + snprintf(dset_name, sizeof(dset_name), "dset%d", k); dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT); VRFY((dset_id >= 0), ""); @@ -728,7 +728,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t while (entry_ptr != NULL) { assert(entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC); - assert(entry_ptr->is_dirty == FALSE); + assert(entry_ptr->is_dirty == false); if (!entry_ptr->is_pinned && !entry_ptr->is_protected) { ret = H5AC_expunge_entry(f, entry_ptr->type, entry_ptr->addr, 0); @@ -756,9 +756,9 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t /* Pop API context */ if (api_ctx_pushed) { - ret = H5CX_pop(FALSE); + ret = H5CX_pop(false); VRFY((ret == 0), "H5CX_pop()"); - api_ctx_pushed = FALSE; + api_ctx_pushed = false; } free(data_array); @@ -778,7 +778,7 @@ test_file_properties(void) hid_t fid = H5I_INVALID_HID; /* HDF5 file ID */ hid_t fapl_id = H5I_INVALID_HID; /* File access plist */ hid_t fapl_copy_id = H5I_INVALID_HID; /* File access plist */ - hbool_t is_coll; + bool is_coll; htri_t are_equal; const char *filename; MPI_Comm comm = MPI_COMM_WORLD; @@ -847,7 +847,7 @@ test_file_properties(void) fapl_copy_id = H5Pcopy(fapl_id); VRFY((fapl_copy_id != H5I_INVALID_HID), "H5Pcopy"); are_equal = H5Pequal(fapl_id, fapl_copy_id); - VRFY((TRUE == are_equal), "H5Pequal"); + VRFY((true == are_equal), "H5Pequal"); /* Add a property to the copy and ensure it's different now */ mpi_ret = MPI_Info_set(info, "hdf_info_prop2", "abc"); @@ -855,7 +855,7 @@ test_file_properties(void) ret = H5Pset_mpi_params(fapl_copy_id, comm, info); VRFY((ret >= 0), "H5Pset_mpi_params succeeded"); are_equal = H5Pequal(fapl_id, fapl_copy_id); - VRFY((FALSE == are_equal), "H5Pequal"); + VRFY((false == are_equal), "H5Pequal"); /* Add a property with the same key but a different value to the original * and ensure they are still different. @@ -865,7 +865,7 @@ test_file_properties(void) ret = H5Pset_mpi_params(fapl_id, comm, info); VRFY((ret >= 0), "H5Pset_mpi_params succeeded"); are_equal = H5Pequal(fapl_id, fapl_copy_id); - VRFY((FALSE == are_equal), "H5Pequal"); + VRFY((false == are_equal), "H5Pequal"); /* Set the second property in the original to the same * value as the copy and ensure they are the same now. @@ -875,7 +875,7 @@ test_file_properties(void) ret = H5Pset_mpi_params(fapl_id, comm, info); VRFY((ret >= 0), "H5Pset_mpi_params succeeded"); are_equal = H5Pequal(fapl_id, fapl_copy_id); - VRFY((TRUE == are_equal), "H5Pequal"); + VRFY((true == are_equal), "H5Pequal"); /* create the file */ fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); @@ -886,12 +886,12 @@ test_file_properties(void) /* Collective metadata writes */ ret = H5Pget_coll_metadata_write(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_coll_metadata_write succeeded"); - VRFY((is_coll == FALSE), "Incorrect property setting for coll metadata writes"); + VRFY((is_coll == false), "Incorrect property setting for coll metadata writes"); /* Collective metadata read API calling requirement */ ret = H5Pget_all_coll_metadata_ops(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_all_coll_metadata_ops succeeded"); - VRFY((is_coll == FALSE), "Incorrect property setting for coll metadata API calls requirement"); + VRFY((is_coll == false), "Incorrect property setting for coll metadata API calls requirement"); ret = H5Fclose(fid); VRFY((ret >= 0), "H5Fclose succeeded"); @@ -907,12 +907,12 @@ test_file_properties(void) /* Collective metadata writes */ ret = H5Pget_coll_metadata_write(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_coll_metadata_write succeeded"); - VRFY((is_coll == FALSE), "Incorrect property setting for coll metadata writes"); + VRFY((is_coll == false), "Incorrect property setting for coll metadata writes"); /* Collective metadata read API calling requirement */ ret = H5Pget_all_coll_metadata_ops(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_all_coll_metadata_ops succeeded"); - VRFY((is_coll == FALSE), "Incorrect property setting for coll metadata API calls requirement"); + VRFY((is_coll == false), "Incorrect property setting for coll metadata API calls requirement"); ret = H5Fclose(fid); VRFY((ret >= 0), "H5Fclose succeeded"); @@ -921,10 +921,10 @@ test_file_properties(void) ret = H5Pset_fapl_mpio(fapl_id, comm, info); VRFY((ret >= 0), "H5Pset_fapl_mpio failed"); /* Collective metadata writes */ - ret = H5Pset_coll_metadata_write(fapl_id, TRUE); + ret = H5Pset_coll_metadata_write(fapl_id, true); VRFY((ret >= 0), "H5Pget_coll_metadata_write succeeded"); /* Collective metadata read API calling requirement */ - ret = H5Pset_all_coll_metadata_ops(fapl_id, TRUE); + ret = H5Pset_all_coll_metadata_ops(fapl_id, true); VRFY((ret >= 0), "H5Pget_all_coll_metadata_ops succeeded"); fid = H5Fopen(filename, H5F_ACC_RDWR, fapl_id); VRFY((fid != H5I_INVALID_HID), "H5Fcreate succeeded"); @@ -934,12 +934,12 @@ test_file_properties(void) /* Collective metadata writes */ ret = H5Pget_coll_metadata_write(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_coll_metadata_write succeeded"); - VRFY((is_coll == TRUE), "Incorrect property setting for coll metadata writes"); + VRFY((is_coll == true), "Incorrect property setting for coll metadata writes"); /* Collective metadata read API calling requirement */ ret = H5Pget_all_coll_metadata_ops(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_all_coll_metadata_ops succeeded"); - VRFY((is_coll == TRUE), "Incorrect property setting for coll metadata API calls requirement"); + VRFY((is_coll == true), "Incorrect property setting for coll metadata API calls requirement"); /* close fapl and retrieve it from file */ ret = H5Pclose(fapl_id); @@ -954,12 +954,12 @@ test_file_properties(void) /* Collective metadata writes */ ret = H5Pget_coll_metadata_write(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_coll_metadata_write succeeded"); - VRFY((is_coll == TRUE), "Incorrect property setting for coll metadata writes"); + VRFY((is_coll == true), "Incorrect property setting for coll metadata writes"); /* Collective metadata read API calling requirement */ ret = H5Pget_all_coll_metadata_ops(fapl_id, &is_coll); VRFY((ret >= 0), "H5Pget_all_coll_metadata_ops succeeded"); - VRFY((is_coll == TRUE), "Incorrect property setting for coll metadata API calls requirement"); + VRFY((is_coll == true), "Incorrect property setting for coll metadata API calls requirement"); /* close file */ ret = H5Fclose(fid); @@ -1022,7 +1022,7 @@ test_delete(void) /* Verify that the file is an HDF5 file */ is_hdf5 = H5Fis_accessible(filename, fapl_id); - VRFY((TRUE == is_hdf5), "H5Fis_accessible"); + VRFY((true == is_hdf5), "H5Fis_accessible"); /* Delete the file */ ret = H5Fdelete(filename, fapl_id); diff --git a/testpar/API/t_file_image.c b/testpar/API/t_file_image.c index 16cd521..3b582ad 100644 --- a/testpar/API/t_file_image.c +++ b/testpar/API/t_file_image.c @@ -78,7 +78,7 @@ file_image_daisy_chain_test(void) void *image_ptr = NULL; ssize_t bytes_read; ssize_t image_len; - hbool_t vector_ok = TRUE; + bool vector_ok = true; htri_t tri_result; /* set up MPI parameters */ @@ -100,7 +100,7 @@ file_image_daisy_chain_test(void) } /* setup file name */ - HDsnprintf(file_name, 1024, "file_image_daisy_chain_test_%05d.h5", (int)mpi_rank); + snprintf(file_name, 1024, "file_image_daisy_chain_test_%05d.h5", (int)mpi_rank); if (mpi_rank == 0) { @@ -110,7 +110,7 @@ file_image_daisy_chain_test(void) fapl_id = H5Pcreate(H5P_FILE_ACCESS); VRFY((fapl_id >= 0), "creating fapl"); - err = H5Pset_fapl_core(fapl_id, (size_t)(64 * 1024), FALSE); + err = H5Pset_fapl_core(fapl_id, (size_t)(64 * 1024), false); VRFY((err >= 0), "setting core file driver in fapl."); file_id = H5Fcreate(file_name, 0, H5P_DEFAULT, fapl_id); @@ -199,7 +199,7 @@ file_image_daisy_chain_test(void) fapl_id = H5Pcreate(H5P_FILE_ACCESS); VRFY((fapl_id >= 0), "creating fapl"); - err = H5Pset_fapl_core(fapl_id, (size_t)(64 * 1024), FALSE); + err = H5Pset_fapl_core(fapl_id, (size_t)(64 * 1024), false); VRFY((err >= 0), "setting core file driver in fapl."); err = H5Pset_file_image(fapl_id, image_ptr, (size_t)image_len); @@ -215,7 +215,7 @@ file_image_daisy_chain_test(void) VRFY((dset_type_id >= 0), "obtained data set type"); tri_result = H5Tequal(dset_type_id, H5T_NATIVE_INT); - VRFY((tri_result == TRUE), "verified data set type"); + VRFY((tri_result == true), "verified data set type"); space_id = H5Dget_space(dset_id); VRFY((space_id >= 0), "opened data space"); @@ -233,10 +233,10 @@ file_image_daisy_chain_test(void) err = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, (void *)vector_ptr); VRFY((err >= 0), "read received vector."); - vector_ok = TRUE; + vector_ok = true; for (i = 0; i < mpi_size; i++) if (vector_ptr[i] != i) - vector_ok = FALSE; + vector_ok = false; VRFY((vector_ok), "verified received vector."); free(vector_ptr); @@ -281,7 +281,7 @@ file_image_daisy_chain_test(void) fapl_id = H5Pcreate(H5P_FILE_ACCESS); VRFY((fapl_id >= 0), "creating fapl"); - err = H5Pset_fapl_core(fapl_id, (size_t)(64 * 1024), FALSE); + err = H5Pset_fapl_core(fapl_id, (size_t)(64 * 1024), false); VRFY((err >= 0), "setting core file driver in fapl."); err = H5Pset_file_image(fapl_id, image_ptr, (size_t)image_len); @@ -298,7 +298,7 @@ file_image_daisy_chain_test(void) VRFY((dset_type_id >= 0), "obtained data set type"); tri_result = H5Tequal(dset_type_id, H5T_NATIVE_INT); - VRFY((tri_result == TRUE), "verified data set type"); + VRFY((tri_result == true), "verified data set type"); space_id = H5Dget_space(dset_id); VRFY((space_id >= 0), "opened data space"); @@ -316,15 +316,15 @@ file_image_daisy_chain_test(void) err = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, (void *)vector_ptr); VRFY((err >= 0), "read received vector."); - vector_ok = TRUE; + vector_ok = true; for (i = 0; i < mpi_size; i++) { if (i < mpi_rank) { if (vector_ptr[i] != i) - vector_ok = FALSE; + vector_ok = false; } else { if (vector_ptr[i] != -1) - vector_ok = FALSE; + vector_ok = false; } } VRFY((vector_ok), "verified received vector."); diff --git a/testpar/API/t_filter_read.c b/testpar/API/t_filter_read.c index 06507e4..7275dd9 100644 --- a/testpar/API/t_filter_read.c +++ b/testpar/API/t_filter_read.c @@ -189,7 +189,7 @@ filter_read_internal(const char *filename, hid_t dcpl, hsize_t *dset_size) (unsigned long)(hs_offset[1] + j)); fprintf(stderr, " At original: %d\n", (int)points[i * size[1] + (size_t)hs_offset[1] + j]); fprintf(stderr, " At returned: %d\n", (int)check[i * hs_size[1] + j]); - VRFY(FALSE, ""); + VRFY(false, ""); } } } diff --git a/testpar/API/t_mdset.c b/testpar/API/t_mdset.c index cc49e7b..7c97898 100644 --- a/testpar/API/t_mdset.c +++ b/testpar/API/t_mdset.c @@ -211,7 +211,7 @@ multiple_dset_write(void) VRFY((ret >= 0), "set fill-value succeeded"); for (n = 0; n < ndatasets; n++) { - HDsnprintf(dname, sizeof(dname), "dataset %d", n); + snprintf(dname, sizeof(dname), "dataset %d", n); dataset = H5Dcreate2(iof, dname, H5T_NATIVE_DOUBLE, filespace, H5P_DEFAULT, dcpl, H5P_DEFAULT); VRFY((dataset > 0), dname); @@ -253,7 +253,7 @@ compact_dataset(void) herr_t ret; const char *filename; #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - hbool_t prop_value; + bool prop_value; #endif size = get_size(); @@ -354,10 +354,10 @@ compact_dataset(void) VRFY((ret >= 0), "H5Dread succeeded"); #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - prop_value = FALSE; + prop_value = false; ret = H5Pget(dxpl, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value); VRFY((ret >= 0), "H5Pget succeeded"); - VRFY((prop_value == FALSE && dxfer_coll_type == DXFER_COLLECTIVE_IO), + VRFY((prop_value == false && dxfer_coll_type == DXFER_COLLECTIVE_IO), "rank 0 Bcast optimization was performed for a compact dataset"); #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ @@ -658,7 +658,7 @@ dataset_fillvalue(void) herr_t ret; /* Generic return value */ const char *filename; #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - hbool_t prop_value; + bool prop_value; #endif MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); @@ -737,13 +737,13 @@ dataset_fillvalue(void) VRFY((ret >= 0), "H5Dread succeeded"); #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - prop_value = FALSE; + prop_value = false; ret = H5Pget(dxpl, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value); VRFY((ret >= 0), "testing property list get succeeded"); if (ii == 0) - VRFY((prop_value == FALSE), "correctly handled rank 0 Bcast"); + VRFY((prop_value == false), "correctly handled rank 0 Bcast"); else - VRFY((prop_value == TRUE), "correctly handled rank 0 Bcast"); + VRFY((prop_value == true), "correctly handled rank 0 Bcast"); #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ /* Verify all data read are the fill value 0 */ @@ -827,13 +827,13 @@ dataset_fillvalue(void) VRFY((ret >= 0), "H5Dread succeeded"); #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - prop_value = FALSE; + prop_value = false; ret = H5Pget(dxpl, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value); VRFY((ret >= 0), "testing property list get succeeded"); if (ii == 0) - VRFY((prop_value == FALSE), "correctly handled rank 0 Bcast"); + VRFY((prop_value == false), "correctly handled rank 0 Bcast"); else - VRFY((prop_value == TRUE), "correctly handled rank 0 Bcast"); + VRFY((prop_value == true), "correctly handled rank 0 Bcast"); #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ /* Verify correct data read */ @@ -975,11 +975,11 @@ collective_group_write(void) /* creates ngroups groups under the root group, writes chunked * datasets in parallel. */ for (m = 0; m < ngroups; m++) { - HDsnprintf(gname, sizeof(gname), "group%d", m); + snprintf(gname, sizeof(gname), "group%d", m); gid = H5Gcreate2(fid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((gid > 0), gname); - HDsnprintf(dname, sizeof(dname), "dataset%d", m); + snprintf(dname, sizeof(dname), "dataset%d", m); did = H5Dcreate2(gid, dname, H5T_NATIVE_INT, filespace, H5P_DEFAULT, dcpl, H5P_DEFAULT); VRFY((did > 0), dname); @@ -1051,7 +1051,7 @@ independent_group_read(void) } plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type); - H5Pset_all_coll_metadata_ops(plist, FALSE); + H5Pset_all_coll_metadata_ops(plist, false); fid = H5Fopen(filename, H5F_ACC_RDONLY, plist); VRFY((fid > 0), "H5Fopen"); @@ -1093,12 +1093,12 @@ group_dataset_read(hid_t fid, int mpi_rank, int m) VRFY((outdata != NULL), "malloc succeeded for outdata"); /* open every group under root group. */ - HDsnprintf(gname, sizeof(gname), "group%d", m); + snprintf(gname, sizeof(gname), "group%d", m); gid = H5Gopen2(fid, gname, H5P_DEFAULT); VRFY((gid > 0), gname); /* check the data. */ - HDsnprintf(dname, sizeof(dname), "dataset%d", m); + snprintf(dname, sizeof(dname), "dataset%d", m); did = H5Dopen2(gid, dname, H5P_DEFAULT); VRFY((did > 0), dname); @@ -1211,7 +1211,7 @@ multiple_group_write(void) /* creates ngroups groups under the root group, writes datasets in * parallel. */ for (m = 0; m < ngroups; m++) { - HDsnprintf(gname, sizeof(gname), "group%d", m); + snprintf(gname, sizeof(gname), "group%d", m); gid = H5Gcreate2(fid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((gid > 0), gname); @@ -1267,7 +1267,7 @@ write_dataset(hid_t memspace, hid_t filespace, hid_t gid) VRFY((outme != NULL), "malloc succeeded for outme"); for (n = 0; n < NDATASET; n++) { - HDsnprintf(dname, sizeof(dname), "dataset%d", n); + snprintf(dname, sizeof(dname), "dataset%d", n); did = H5Dcreate2(gid, dname, H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((did > 0), dname); @@ -1305,7 +1305,7 @@ create_group_recursive(hid_t memspace, hid_t filespace, hid_t gid, int counter) } #endif /* BARRIER_CHECKS */ - HDsnprintf(gname, sizeof(gname), "%dth_child_group", counter + 1); + snprintf(gname, sizeof(gname), "%dth_child_group", counter + 1); child_gid = H5Gcreate2(gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); VRFY((child_gid > 0), gname); @@ -1376,7 +1376,7 @@ multiple_group_read(void) /* open every group under root group. */ for (m = 0; m < ngroups; m++) { - HDsnprintf(gname, sizeof(gname), "group%d", m); + snprintf(gname, sizeof(gname), "group%d", m); gid = H5Gopen2(fid, gname, H5P_DEFAULT); VRFY((gid > 0), gname); @@ -1433,7 +1433,7 @@ read_dataset(hid_t memspace, hid_t filespace, hid_t gid) VRFY((outdata != NULL), "malloc succeeded for outdata"); for (n = 0; n < NDATASET; n++) { - HDsnprintf(dname, sizeof(dname), "dataset%d", n); + snprintf(dname, sizeof(dname), "dataset%d", n); did = H5Dopen2(gid, dname, H5P_DEFAULT); VRFY((did > 0), dname); @@ -1484,7 +1484,7 @@ recursive_read_group(hid_t memspace, hid_t filespace, hid_t gid, int counter) nerrors += err_num; if (counter < GROUP_DEPTH) { - HDsnprintf(gname, sizeof(gname), "%dth_child_group", counter + 1); + snprintf(gname, sizeof(gname), "%dth_child_group", counter + 1); child_gid = H5Gopen2(gid, gname, H5P_DEFAULT); VRFY((child_gid > 0), gname); recursive_read_group(memspace, filespace, child_gid, counter + 1); @@ -1506,7 +1506,7 @@ write_attribute(hid_t obj_id, int this_type, int num) MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); if (this_type == is_group) { - HDsnprintf(attr_name, sizeof(attr_name), "Group Attribute %d", num); + snprintf(attr_name, sizeof(attr_name), "Group Attribute %d", num); sid = H5Screate(H5S_SCALAR); aid = H5Acreate2(obj_id, attr_name, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT); H5Awrite(aid, H5T_NATIVE_INT, &num); @@ -1514,7 +1514,7 @@ write_attribute(hid_t obj_id, int this_type, int num) H5Sclose(sid); } /* end if */ else if (this_type == is_dset) { - HDsnprintf(attr_name, sizeof(attr_name), "Dataset Attribute %d", num); + snprintf(attr_name, sizeof(attr_name), "Dataset Attribute %d", num); for (i = 0; i < 8; i++) attr_data[i] = i; sid = H5Screate_simple(dspace_rank, dspace_dims, NULL); @@ -1537,14 +1537,14 @@ read_attribute(hid_t obj_id, int this_type, int num) MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); if (this_type == is_group) { - HDsnprintf(attr_name, sizeof(attr_name), "Group Attribute %d", num); + snprintf(attr_name, sizeof(attr_name), "Group Attribute %d", num); aid = H5Aopen(obj_id, attr_name, H5P_DEFAULT); H5Aread(aid, H5T_NATIVE_INT, &in_num); vrfy_errors = dataset_vrfy(NULL, NULL, NULL, group_block, &in_num, &num); H5Aclose(aid); } else if (this_type == is_dset) { - HDsnprintf(attr_name, sizeof(attr_name), "Dataset Attribute %d", num); + snprintf(attr_name, sizeof(attr_name), "Dataset Attribute %d", num); for (i = 0; i < 8; i++) out_data[i] = i; aid = H5Aopen(obj_id, attr_name, H5P_DEFAULT); @@ -1664,8 +1664,8 @@ io_mode_confusion(void) * test bed related variables */ - const char *fcn_name = "io_mode_confusion"; - const hbool_t verbose = FALSE; + const char *fcn_name = "io_mode_confusion"; + const bool verbose = false; #if 0 const H5Ptest_param_t *pt; #endif @@ -1931,8 +1931,8 @@ rr_obj_hdr_flush_confusion(void) MPI_Comm comm; /* test bed related variables */ - const char *fcn_name = "rr_obj_hdr_flush_confusion"; - const hbool_t verbose = FALSE; + const char *fcn_name = "rr_obj_hdr_flush_confusion"; + const bool verbose = false; /* Create two new private communicators from MPI_COMM_WORLD. * Even and odd ranked processes go to comm_writers and comm_readers @@ -2022,8 +2022,8 @@ 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 hbool_t verbose = FALSE; + const char *fcn_name = "rr_obj_hdr_flush_confusion_writer"; + const bool verbose = false; #if 0 const H5Ptest_param_t *pt; #endif @@ -2405,8 +2405,8 @@ 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 hbool_t verbose = FALSE; + const char *fcn_name = "rr_obj_hdr_flush_confusion_reader"; + const bool verbose = false; #if 0 const H5Ptest_param_t *pt; #endif diff --git a/testpar/API/t_prop.c b/testpar/API/t_prop.c index 9c91906..a4d90c4 100644 --- a/testpar/API/t_prop.c +++ b/testpar/API/t_prop.c @@ -119,12 +119,12 @@ test_plist_ed(void) hsize_t max_size[1]; /*data space maximum size */ const char *c_to_f = "x+32"; H5AC_cache_config_t my_cache_config = {H5AC__CURR_CACHE_CONFIG_VERSION, - TRUE, - FALSE, - FALSE, + true, + false, + false, "temp", - TRUE, - FALSE, + true, + false, (2 * 2048 * 1024), 0.3, (64 * 1024 * 1024), @@ -133,7 +133,7 @@ test_plist_ed(void) H5C_incr__threshold, 0.8, 3.0, - TRUE, + true, (8 * 1024 * 1024), H5C_flash_incr__add_space, 2.0, @@ -141,10 +141,10 @@ test_plist_ed(void) H5C_decr__age_out_with_threshold, 0.997, 0.8, - TRUE, + true, (3 * 1024 * 1024), 3, - FALSE, + false, 0.2, (256 * 2048), 1 /* H5AC__DEFAULT_METADATA_WRITE_STRATEGY */}; @@ -290,7 +290,7 @@ test_plist_ed(void) lcpl = H5Pcreate(H5P_LINK_CREATE); VRFY((lcpl >= 0), "H5Pcreate succeeded"); - ret = H5Pset_create_intermediate_group(lcpl, TRUE); + ret = H5Pset_create_intermediate_group(lcpl, true); VRFY((ret >= 0), "H5Pset_create_intermediate_group succeeded"); ret = test_encode_decode(lcpl, mpi_rank, recv_proc); @@ -569,7 +569,7 @@ external_links(void) /* test opening a group that is to an external link, the external linked file should inherit the source file's access properties */ - HDsnprintf(link_path, sizeof(link_path), "%s%s%s", group_path, "/", link_name); + snprintf(link_path, sizeof(link_path), "%s%s%s", group_path, "/", link_name); group = H5Gopen2(fid, link_path, H5P_DEFAULT); VRFY((group >= 0), "H5Gopen succeeded"); ret = H5Gclose(group); @@ -600,10 +600,10 @@ external_links(void) VRFY((ret >= 0), "H5Pset_elink_fapl succeeded"); tri_status = H5Lexists(fid, link_path, H5P_DEFAULT); - VRFY((tri_status == TRUE), "H5Lexists succeeded"); + VRFY((tri_status == true), "H5Lexists succeeded"); tri_status = H5Lexists(fid, link_path, lapl); - VRFY((tri_status == TRUE), "H5Lexists succeeded"); + VRFY((tri_status == true), "H5Lexists succeeded"); group = H5Oopen(fid, link_path, H5P_DEFAULT); VRFY((group >= 0), "H5Oopen succeeded"); diff --git a/testpar/API/t_shapesame.c b/testpar/API/t_shapesame.c index 06bb4ff..004ce1e 100644 --- a/testpar/API/t_shapesame.c +++ b/testpar/API/t_shapesame.c @@ -130,14 +130,14 @@ struct hs_dr_pio_test_vars_t { static void hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker_edge_size, const int chunk_edge_size, const int small_rank, const int large_rank, - const hbool_t use_collective_io, const hid_t dset_type, const int express_test, + const bool use_collective_io, const hid_t dset_type, const int express_test, struct hs_dr_pio_test_vars_t *tv_ptr) { #if CONTIG_HS_DR_PIO_TEST__SETUP__DEBUG const char *fcnName = "hs_dr_pio_test__setup()"; #endif /* CONTIG_HS_DR_PIO_TEST__SETUP__DEBUG */ const char *filename; - hbool_t mis_match = FALSE; + bool mis_match = false; int i; int mrc; int mpi_rank; /* needed by the VRFY macro */ @@ -470,7 +470,7 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker /* verify that the correct data was written to the small data set */ expected_value = 0; - mis_match = FALSE; + mis_match = false; ptr_1 = tv_ptr->small_ds_buf_1; i = 0; @@ -478,12 +478,12 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } ptr_1++; expected_value++; } - VRFY((mis_match == FALSE), "small ds init data good."); + VRFY((mis_match == false), "small ds init data good."); /* setup selections for writing initial data to the large data set */ @@ -541,7 +541,7 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker /* verify that the correct data was written to the large data set */ expected_value = 0; - mis_match = FALSE; + mis_match = false; ptr_1 = tv_ptr->large_ds_buf_1; i = 0; @@ -549,12 +549,12 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } ptr_1++; expected_value++; } - VRFY((mis_match == FALSE), "large ds init data good."); + VRFY((mis_match == false), "large ds init data good."); /* sync with the other processes before changing data */ mrc = MPI_Barrier(MPI_COMM_WORLD); @@ -702,7 +702,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG const char *fcnName = "contig_hs_dr_pio_test__run_test()"; #endif /* CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG */ - hbool_t mis_match = FALSE; + bool mis_match = false; int i, j, k, l; size_t n; int mpi_rank; /* needed by the VRFY macro */ @@ -824,7 +824,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) * selections as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->small_ds_slice_sid, tv_ptr->file_large_ds_sid_0); - VRFY((check == TRUE), "H5Sselect_shape_same passed"); + VRFY((check == true), "H5Sselect_shape_same passed"); /* Read selection from disk */ #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG @@ -842,7 +842,7 @@ 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; + 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 * @@ -854,7 +854,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } *ptr_1 = 0; /* zero data for next use */ @@ -863,7 +863,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) expected_value++; } - VRFY((mis_match == FALSE), "small slice read from large ds data good."); + VRFY((mis_match == false), "small slice read from large ds data good."); (tv_ptr->tests_run)++; } @@ -910,7 +910,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG const char *fcnName = "contig_hs_dr_pio_test__d2m_s2l()"; #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */ - hbool_t mis_match = FALSE; + bool mis_match = false; int i, j, k, l; size_t n; int mpi_rank; /* needed by the VRFY macro */ @@ -1053,7 +1053,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) * selections as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->file_small_ds_sid_0, tv_ptr->mem_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_shape_same passed"); + VRFY((check == true), "H5Sselect_shape_same passed"); /* Read selection from disk */ #if CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG @@ -1089,7 +1089,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } expected_value++; } @@ -1097,7 +1097,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != 0) { - mis_match = TRUE; + mis_match = true; } } /* zero out the value for the next pass */ @@ -1106,7 +1106,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1++; } - VRFY((mis_match == FALSE), "small slice read from large ds data good."); + VRFY((mis_match == false), "small slice read from large ds data good."); (tv_ptr->tests_run)++; } @@ -1155,7 +1155,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG const char *fcnName = "contig_hs_dr_pio_test__m2d_l2s()"; #endif /* CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG */ - hbool_t mis_match = FALSE; + bool mis_match = false; int i, j, k, l; size_t n; int mpi_rank; /* needed by the VRFY macro */ @@ -1319,7 +1319,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) * on disk full square selections as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->file_small_ds_sid_0, tv_ptr->mem_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_shape_same passed."); + VRFY((check == true), "H5Sselect_shape_same passed."); /* write the slice from the in memory large data set to the * slice of the on disk small dataset. */ @@ -1342,7 +1342,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that expected data is retrieved */ - mis_match = FALSE; + mis_match = false; ptr_1 = tv_ptr->small_ds_buf_1; expected_value = @@ -1363,7 +1363,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } expected_value++; } @@ -1371,7 +1371,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != 0) { - mis_match = TRUE; + mis_match = true; } } /* zero out the value for the next pass */ @@ -1380,7 +1380,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1++; } - VRFY((mis_match == FALSE), "small slice write from large ds data good."); + VRFY((mis_match == false), "small slice write from large ds data good."); (tv_ptr->tests_run)++; } @@ -1431,7 +1431,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG const char *fcnName = "contig_hs_dr_pio_test__m2d_s2l()"; #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */ - hbool_t mis_match = FALSE; + bool mis_match = false; int i, j, k, l; size_t n; int mpi_rank; /* needed by the VRFY macro */ @@ -1602,7 +1602,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) * as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->mem_small_ds_sid, tv_ptr->file_large_ds_sid_0); - VRFY((check == TRUE), "H5Sselect_shape_same passed"); + VRFY((check == true), "H5Sselect_shape_same passed"); /* write the small data set slice from memory to the * target slice of the disk data set @@ -1650,7 +1650,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } expected_value++; @@ -1659,7 +1659,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != 0) { - mis_match = TRUE; + mis_match = true; } } /* zero out buffer for next test */ @@ -1667,7 +1667,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1++; } - VRFY((mis_match == FALSE), "small ds slice write to large ds slice data good."); + VRFY((mis_match == false), "small ds slice write to large ds slice data good."); (tv_ptr->tests_run)++; } @@ -1701,7 +1701,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) static void contig_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const int chunk_edge_size, - const int small_rank, const int large_rank, const hbool_t use_collective_io, + const int small_rank, const int large_rank, const bool use_collective_io, const hid_t dset_type, int express_test, int *skips_ptr, int max_skips, int64_t *total_tests_ptr, int64_t *tests_run_ptr, int64_t *tests_skipped_ptr, int mpi_rank) @@ -1947,7 +1947,7 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type) chunk_edge_size = 0; contig_hs_dr_pio_test__run_test( - test_num, edge_size, chunk_edge_size, small_rank, large_rank, FALSE, dset_type, + test_num, edge_size, chunk_edge_size, small_rank, large_rank, false, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; break; @@ -1958,7 +1958,7 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type) chunk_edge_size = 0; contig_hs_dr_pio_test__run_test( - test_num, edge_size, chunk_edge_size, small_rank, large_rank, TRUE, dset_type, + test_num, edge_size, chunk_edge_size, small_rank, large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; break; @@ -1969,7 +1969,7 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type) chunk_edge_size = 5; contig_hs_dr_pio_test__run_test( - test_num, edge_size, chunk_edge_size, small_rank, large_rank, FALSE, dset_type, + test_num, edge_size, chunk_edge_size, small_rank, large_rank, false, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; break; @@ -1980,14 +1980,14 @@ contig_hs_dr_pio_test(ShapeSameTestMethods sstest_type) chunk_edge_size = 5; contig_hs_dr_pio_test__run_test( - test_num, edge_size, chunk_edge_size, small_rank, large_rank, TRUE, dset_type, + test_num, edge_size, chunk_edge_size, small_rank, large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; break; /* end of case COL_CHUNKED */ default: - VRFY((FALSE), "unknown test type"); + VRFY((false), "unknown test type"); break; } /* end of switch(sstest_type) */ @@ -2046,7 +2046,7 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons #if CKRBRD_HS_DR_PIO_TEST__SELECT_CHECKER_BOARD__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__slct_ckrbrd():"; #endif - hbool_t first_selection = TRUE; + bool first_selection = true; int i, j, k, l, m; int n_cube_offset; int sel_offset; @@ -2249,7 +2249,7 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons if (first_selection) { - first_selection = FALSE; + first_selection = false; ret = H5Sselect_hyperslab(tgt_sid, H5S_SELECT_SET, &(start[n_cube_offset]), &(stride[n_cube_offset]), &(count[n_cube_offset]), @@ -2321,7 +2321,7 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons ** ckrbrd_hs_dr_pio_test__verify_data(): ** ** Examine the supplied buffer to see if it contains the -** expected data. Return TRUE if it does, and FALSE +** expected data. Return true if it does, and false ** otherwise. ** ** The supplied buffer is presumed to this process's slice @@ -2374,17 +2374,17 @@ ckrbrd_hs_dr_pio_test__slct_ckrbrd(const int mpi_rank, const hid_t tgt_sid, cons #define CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG 0 -static hbool_t +static bool ckrbrd_hs_dr_pio_test__verify_data(uint32_t *buf_ptr, const int rank, const int edge_size, const int checker_edge_size, uint32_t first_expected_val, - hbool_t buf_starts_in_checker) + bool buf_starts_in_checker) { #if CKRBRD_HS_DR_PIO_TEST__VERIFY_DATA__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__verify_data():"; #endif - hbool_t good_data = TRUE; - hbool_t in_checker; - hbool_t start_in_checker[5]; + bool good_data = true; + bool in_checker; + bool start_in_checker[5]; uint32_t expected_value; uint32_t *val_ptr; int i, j, k, l, m; /* to track position in n-cube */ @@ -2476,7 +2476,7 @@ do { if (*val_ptr != expected_value) { - good_data = FALSE; + good_data = false; } /* zero out buffer for reuse */ @@ -2484,7 +2484,7 @@ do { } else if (*val_ptr != 0) { - good_data = FALSE; + good_data = false; /* zero out buffer for reuse */ *val_ptr = 0; @@ -2546,7 +2546,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) const char *fcnName = "ckrbrd_hs_dr_pio_test__d2m_l2s()"; uint32_t *ptr_0; #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG */ - hbool_t data_ok = FALSE; + bool data_ok = false; int i, j, k, l; uint32_t expected_value; int mpi_rank; /* needed by VRFY */ @@ -2698,7 +2698,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) * selections as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->small_ds_slice_sid, tv_ptr->file_large_ds_sid_0); - VRFY((check == TRUE), "H5Sselect_shape_same passed"); + VRFY((check == true), "H5Sselect_shape_same passed"); /* Read selection from disk */ #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG @@ -2729,9 +2729,9 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) data_ok = ckrbrd_hs_dr_pio_test__verify_data( tv_ptr->small_ds_slice_buf, tv_ptr->small_rank - 1, tv_ptr->edge_size, - tv_ptr->checker_edge_size, expected_value, (hbool_t)TRUE); + tv_ptr->checker_edge_size, expected_value, (bool)true); - VRFY((data_ok == TRUE), "small slice read from large ds data good."); + VRFY((data_ok == true), "small slice read from large ds data good."); (tv_ptr->tests_run)++; } @@ -2778,7 +2778,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__d2m_s2l()"; #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */ - hbool_t data_ok = FALSE; + bool data_ok = false; int i, j, k, l; size_t u; size_t start_index; @@ -2920,7 +2920,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) * selections as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->file_small_ds_sid_0, tv_ptr->mem_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_shape_same passed"); + VRFY((check == true), "H5Sselect_shape_same passed"); /* Read selection from disk */ #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG @@ -2938,7 +2938,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) /* verify that the expected data and only the * expected data was read. */ - data_ok = TRUE; + 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 = @@ -2978,7 +2978,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != 0) { - data_ok = FALSE; + data_ok = false; } /* zero out the value for the next pass */ @@ -2987,13 +2987,13 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1++; } - VRFY((data_ok == TRUE), "slice read from small to large ds data good(1)."); + VRFY((data_ok == true), "slice read from small to large ds data good(1)."); data_ok = ckrbrd_hs_dr_pio_test__verify_data(ptr_1, tv_ptr->small_rank - 1, tv_ptr->edge_size, tv_ptr->checker_edge_size, - expected_value, (hbool_t)TRUE); + expected_value, (bool)true); - VRFY((data_ok == TRUE), "slice read from small to large ds data good(2)."); + VRFY((data_ok == true), "slice read from small to large ds data good(2)."); ptr_1 = tv_ptr->large_ds_buf_1 + stop_index + 1; @@ -3001,7 +3001,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) if (*ptr_1 != 0) { - data_ok = FALSE; + data_ok = false; } /* zero out the value for the next pass */ @@ -3010,7 +3010,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) ptr_1++; } - VRFY((data_ok == TRUE), "slice read from small to large ds data good(3)."); + VRFY((data_ok == true), "slice read from small to large ds data good(3)."); (tv_ptr->tests_run)++; } @@ -3061,7 +3061,7 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__m2d_l2s()"; #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */ - hbool_t data_ok = FALSE; + bool data_ok = false; int i, j, k, l; size_t u; size_t start_index; @@ -3242,7 +3242,7 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) * slice of the small data set as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->file_small_ds_sid_1, tv_ptr->mem_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_shape_same passed."); + VRFY((check == true), "H5Sselect_shape_same passed."); /* write the checker board selection of the slice from the in * memory large data set to the slice of the on disk small @@ -3279,33 +3279,33 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) assert(start_index < stop_index); assert(stop_index <= tv_ptr->small_ds_size); - data_ok = TRUE; + data_ok = true; ptr_1 = tv_ptr->small_ds_buf_1; for (u = 0; u < start_index; u++, ptr_1++) { if (*ptr_1 != 0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = 0; } } data_ok &= ckrbrd_hs_dr_pio_test__verify_data( tv_ptr->small_ds_buf_1 + start_index, tv_ptr->small_rank - 1, tv_ptr->edge_size, - tv_ptr->checker_edge_size, expected_value, (hbool_t)TRUE); + tv_ptr->checker_edge_size, expected_value, (bool)true); ptr_1 = tv_ptr->small_ds_buf_1; for (u = stop_index; u < tv_ptr->small_ds_size; u++, ptr_1++) { if (*ptr_1 != 0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = 0; } } - VRFY((data_ok == TRUE), "large slice write slice to small slice data good."); + VRFY((data_ok == true), "large slice write slice to small slice data good."); (tv_ptr->tests_run)++; } @@ -3356,7 +3356,7 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG const char *fcnName = "ckrbrd_hs_dr_pio_test__m2d_s2l()"; #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */ - hbool_t data_ok = FALSE; + bool data_ok = false; int i, j, k, l; size_t u; size_t start_index; @@ -3533,7 +3533,7 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) * as having the same shape. */ check = H5Sselect_shape_same(tv_ptr->mem_small_ds_sid, tv_ptr->file_large_ds_sid_1); - VRFY((check == TRUE), "H5Sselect_shape_same passed"); + VRFY((check == true), "H5Sselect_shape_same passed"); /* write the small data set slice from memory to the * target slice of the disk data set @@ -3573,33 +3573,33 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) assert(start_index < stop_index); assert(stop_index < tv_ptr->large_ds_size); - data_ok = TRUE; + data_ok = true; ptr_1 = tv_ptr->large_ds_buf_1; for (u = 0; u < start_index; u++, ptr_1++) { if (*ptr_1 != 0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = 0; } } data_ok &= ckrbrd_hs_dr_pio_test__verify_data( tv_ptr->large_ds_buf_1 + start_index, tv_ptr->small_rank - 1, tv_ptr->edge_size, - tv_ptr->checker_edge_size, expected_value, (hbool_t)TRUE); + tv_ptr->checker_edge_size, expected_value, (bool)true); ptr_1 = tv_ptr->large_ds_buf_1; for (u = stop_index; u < tv_ptr->small_ds_size; u++, ptr_1++) { if (*ptr_1 != 0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = 0; } } - VRFY((data_ok == TRUE), "small ds cb slice write to large ds slice data good."); + VRFY((data_ok == true), "small ds cb slice write to large ds slice data good."); (tv_ptr->tests_run)++; } @@ -3634,10 +3634,9 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) static void ckrbrd_hs_dr_pio_test__run_test(const int test_num, const int edge_size, const int checker_edge_size, const int chunk_edge_size, const int small_rank, const int large_rank, - const hbool_t use_collective_io, const hid_t dset_type, - const int express_test, int *skips_ptr, int max_skips, - int64_t *total_tests_ptr, int64_t *tests_run_ptr, int64_t *tests_skipped_ptr, - int mpi_rank) + const bool use_collective_io, const hid_t dset_type, const int express_test, + int *skips_ptr, int max_skips, int64_t *total_tests_ptr, + int64_t *tests_run_ptr, int64_t *tests_skipped_ptr, int mpi_rank) { #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG @@ -3870,7 +3869,7 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) /* contiguous data set, independent I/O */ chunk_edge_size = 0; ckrbrd_hs_dr_pio_test__run_test(test_num, edge_size, checker_edge_size, chunk_edge_size, - small_rank, large_rank, FALSE, dset_type, express_test, + small_rank, large_rank, false, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; @@ -3881,7 +3880,7 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) /* contiguous data set, collective I/O */ chunk_edge_size = 0; ckrbrd_hs_dr_pio_test__run_test(test_num, edge_size, checker_edge_size, chunk_edge_size, - small_rank, large_rank, TRUE, dset_type, express_test, + small_rank, large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; @@ -3892,7 +3891,7 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) /* chunked data set, independent I/O */ chunk_edge_size = 5; ckrbrd_hs_dr_pio_test__run_test(test_num, edge_size, checker_edge_size, chunk_edge_size, - small_rank, large_rank, FALSE, dset_type, express_test, + small_rank, large_rank, false, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; @@ -3903,7 +3902,7 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) /* chunked data set, collective I/O */ chunk_edge_size = 5; ckrbrd_hs_dr_pio_test__run_test(test_num, edge_size, checker_edge_size, chunk_edge_size, - small_rank, large_rank, TRUE, dset_type, express_test, + small_rank, large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped, mpi_rank); test_num++; @@ -3911,7 +3910,7 @@ ckrbrd_hs_dr_pio_test(ShapeSameTestMethods sstest_type) /* end of case COL_CHUNKED */ default: - VRFY((FALSE), "unknown test type"); + VRFY((false), "unknown test type"); break; } /* end of switch(sstest_type) */ @@ -4188,9 +4187,9 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(ret_pl, comm, info); VRFY((ret >= 0), ""); - ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE); + ret = H5Pset_all_coll_metadata_ops(ret_pl, true); VRFY((ret >= 0), ""); - ret = H5Pset_coll_metadata_write(ret_pl, TRUE); + ret = H5Pset_coll_metadata_write(ret_pl, true); VRFY((ret >= 0), ""); return (ret_pl); } diff --git a/testpar/API/t_span_tree.c b/testpar/API/t_span_tree.c index 40ccb8f..e2f148c 100644 --- a/testpar/API/t_span_tree.c +++ b/testpar/API/t_span_tree.c @@ -21,7 +21,7 @@ one in collective mode, 2) We will read two datasets with the same hyperslab selection settings, 1. independent read to read independent output, - independent read to read collecive output, + independent read to read collective output, Compare the result, If the result is the same, then collective write succeeds. 2. collective read to read independent output, @@ -498,7 +498,7 @@ coll_write_test(int chunk_factor) For testing collective hyperslab selection write In this test, we are using independent read to check - the correctedness of collective write compared with + the correctness of collective write compared with independent write, In order to thoroughly test this feature, we choose @@ -593,7 +593,7 @@ coll_write_test(int chunk_factor) mspaceid = H5Screate_simple(MSPACE_RANK, mdim, NULL); /* - * Select two hyperslabs in memory. Hyperslabs has the same + * Select two hyperslabs in memory. Hyperslabs have the same * size and shape as the selected hyperslabs for the file dataspace * Only the starting point is different. * The first selection @@ -833,7 +833,7 @@ coll_read_test(void) mspaceid = H5Screate_simple(MSPACE_RANK, mdim, NULL); /* - * Select two hyperslabs in memory. Hyperslabs has the same + * Select two hyperslabs in memory. Hyperslabs have the same * size and shape as the selected hyperslabs for the file dataspace. * Only the starting point is different. * The first selection @@ -967,7 +967,7 @@ coll_read_test(void) ** sel_rank fastest changing indices, with origin (in the ** higher indices) as indicated by the start array. ** -** Note that this function, is hard coded to presume a +** Note that this function is hard-coded to presume a ** maximum dataspace rank of 5. ** ** While this maximum is declared as a constant, increasing @@ -993,7 +993,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t #if LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG const char *fcnName = "lower_dim_size_comp_test__select_checker_board():"; #endif - hbool_t first_selection = TRUE; + bool first_selection = true; int i, j, k, l, m; int ds_offset; int sel_offset; @@ -1045,7 +1045,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t * Note that the following computation depends on the C99 * requirement that integer division discard any fraction * (truncation towards zero) to function correctly. As we - * now require C99, this shouldn't be a problem, but noting + * now require C99, this shouldn't be a problem, but note * it may save us some pain if we are ever obliged to support * pre-C99 compilers again. */ @@ -1074,7 +1074,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t /* Now set up the stride and block arrays, and portions of the start * and count arrays that will not be altered during the selection of - * the checker board. + * the checkerboard. */ i = 0; while (i < ds_offset) { @@ -1215,7 +1215,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t if (first_selection) { - first_selection = FALSE; + first_selection = false; ret = H5Sselect_hyperslab(tgt_sid, H5S_SELECT_SET, &(start[ds_offset]), &(stride[ds_offset]), &(count[ds_offset]), @@ -1291,16 +1291,16 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t ** lower_dim_size_comp_test__verify_data(): ** ** Examine the supplied buffer to see if it contains the -** expected data. Return TRUE if it does, and FALSE +** expected data. Return true if it does, and false ** otherwise. ** -** The supplied buffer is presumed to this process's slice +** The supplied buffer is presumed to be this process's slice ** of the target data set. Each such slice will be an ** n-cube of rank (rank -1) and the supplied edge_size with ** origin (mpi_rank, 0, ... , 0) in the target data set. ** ** Further, the buffer is presumed to be the result of reading -** or writing a checker board selection of an m (1 <= m < +** or writing a checkerboard selection of an m (1 <= m < ** rank) dimensional slice through this processes slice ** of the target data set. Also, this slice must be parallel ** to the fastest changing indices. @@ -1311,7 +1311,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t ** with the natural numbers listed in order from the origin ** along the fastest changing axis. ** -** Thus for a 20x10x10 dataset, the value stored in location +** Thus, for a 20x10x10 dataset, the value stored in location ** (x, y, z) (assuming that z is the fastest changing index ** and x the slowest) is assumed to be: ** @@ -1319,7 +1319,7 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t ** ** Further, supposing that this is process 10, this process's ** slice of the dataset would be a 10 x 10 2-cube with origin -** (10, 0, 0) in the data set, and would be initialize (prior +** (10, 0, 0) in the data set, and would be initialized (prior ** to the checkerboard selection) as follows: ** ** 1000, 1001, 1002, ... 1008, 1009 @@ -1344,20 +1344,20 @@ lower_dim_size_comp_test__select_checker_board(const int mpi_rank, const hid_t t #define LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG 0 -static hbool_t +static bool lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr, #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG const int mpi_rank, #endif /* LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG */ const int rank, const int edge_size, const int checker_edge_size, - uint32_t first_expected_val, hbool_t buf_starts_in_checker) + uint32_t first_expected_val, bool buf_starts_in_checker) { #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG const char *fcnName = "lower_dim_size_comp_test__verify_data():"; #endif - hbool_t good_data = TRUE; - hbool_t in_checker; - hbool_t start_in_checker[5]; + bool good_data = true; + bool in_checker; + bool start_in_checker[5]; uint32_t expected_value; uint32_t *val_ptr; int i, j, k, l, m; /* to track position in n-cube */ @@ -1450,7 +1450,7 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr, if (*val_ptr != expected_value) { - good_data = FALSE; + good_data = false; } /* zero out buffer for reuse */ @@ -1458,7 +1458,7 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr, } else if (*val_ptr != 0) { - good_data = FALSE; + good_data = false; /* zero out buffer for reuse */ *val_ptr = 0; @@ -1506,7 +1506,7 @@ lower_dim_size_comp_test__verify_data(uint32_t *buf_ptr, #define LDSCT_DS_RANK 5 static void -lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_collective_io, +lower_dim_size_comp_test__run_test(const int chunk_edge_size, const bool use_collective_io, const hid_t dset_type) { #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG @@ -1516,8 +1516,8 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ hsize_t max_dims[32]; #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */ const char *filename; - hbool_t data_ok = FALSE; - hbool_t mis_match = FALSE; + bool data_ok = false; + bool mis_match = false; int i; int start_index; int stop_index; @@ -1859,10 +1859,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ } check = H5Sselect_valid(mem_small_ds_sid); - VRFY((check == TRUE), "H5Sselect_valid(mem_small_ds_sid) returns TRUE"); + VRFY((check == true), "H5Sselect_valid(mem_small_ds_sid) returns true"); check = H5Sselect_valid(file_small_ds_sid); - VRFY((check == TRUE), "H5Sselect_valid(file_small_ds_sid) returns TRUE"); + VRFY((check == true), "H5Sselect_valid(file_small_ds_sid) returns true"); /* write the initial value of the small data set to file */ #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG @@ -1893,7 +1893,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ * and reset the buffer to zero in passing. */ expected_value = 0; - mis_match = FALSE; + mis_match = false; ptr_1 = small_ds_buf_1; i = 0; @@ -1901,7 +1901,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } *ptr_1 = (uint32_t)0; @@ -1909,7 +1909,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ ptr_1++; expected_value++; } - VRFY((mis_match == FALSE), "small ds init data good."); + VRFY((mis_match == false), "small ds init data good."); /* setup selections for writing initial data to the large data set */ start[0] = (hsize_t)(mpi_rank + 1); @@ -2017,10 +2017,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ #endif /* LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG */ check = H5Sselect_valid(mem_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_valid(mem_large_ds_sid) returns TRUE"); + VRFY((check == true), "H5Sselect_valid(mem_large_ds_sid) returns true"); check = H5Sselect_valid(file_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_valid(file_large_ds_sid) returns TRUE"); + VRFY((check == true), "H5Sselect_valid(file_large_ds_sid) returns true"); /* write the initial value of the large data set to file */ #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG @@ -2054,7 +2054,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ * in passing, reset the buffer to zeros */ expected_value = 0; - mis_match = FALSE; + mis_match = false; ptr_1 = large_ds_buf_1; i = 0; @@ -2062,7 +2062,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ if (*ptr_1 != expected_value) { - mis_match = TRUE; + mis_match = true; } *ptr_1 = (uint32_t)0; @@ -2070,7 +2070,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ ptr_1++; expected_value++; } - VRFY((mis_match == FALSE), "large ds init data good."); + VRFY((mis_match == false), "large ds init data good."); /***********************************/ /***** INITIALIZATION COMPLETE *****/ @@ -2108,7 +2108,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ * selections as having the same shape. */ check = H5Sselect_shape_same(mem_large_ds_sid, file_small_ds_sid); - VRFY((check == TRUE), "H5Sselect_shape_same passed (1)"); + VRFY((check == true), "H5Sselect_shape_same passed (1)"); ret = H5Dread(small_dataset, H5T_NATIVE_UINT32, mem_large_ds_sid, file_small_ds_sid, xfer_plist, large_ds_buf_1); @@ -2123,7 +2123,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ /* verify that expected data is retrieved */ - data_ok = TRUE; + data_ok = true; start_index = (int)((large_sel_start[0] * large_dims[1] * large_dims[2] * large_dims[3] * large_dims[4]) + (large_sel_start[1] * large_dims[2] * large_dims[3] * large_dims[4]) + @@ -2142,14 +2142,14 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ if (*ptr_1 != (uint32_t)0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = (uint32_t)0; } ptr_1++; } - VRFY((data_ok == TRUE), "slice read from small ds data good(1)."); + VRFY((data_ok == true), "slice read from small ds data good(1)."); data_ok = lower_dim_size_comp_test__verify_data(ptr_1, #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG @@ -2158,11 +2158,11 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ /* rank */ 2, /* edge_size */ 10, /* checker_edge_size */ 3, expected_value, - /* buf_starts_in_checker */ TRUE); + /* buf_starts_in_checker */ true); - VRFY((data_ok == TRUE), "slice read from small ds data good(2)."); + VRFY((data_ok == true), "slice read from small ds data good(2)."); - data_ok = TRUE; + data_ok = true; ptr_1 += small_ds_slice_size; @@ -2170,14 +2170,14 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ if (*ptr_1 != (uint32_t)0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = (uint32_t)0; } ptr_1++; } - VRFY((data_ok == TRUE), "slice read from small ds data good(3)."); + VRFY((data_ok == true), "slice read from small ds data good(3)."); /* read a checkerboard selection of a slice of the process slice of * the large on disk data set into the process slice of the small @@ -2205,7 +2205,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ * selections as having the same shape. */ check = H5Sselect_shape_same(mem_small_ds_sid, file_large_ds_sid); - VRFY((check == TRUE), "H5Sselect_shape_same passed (2)"); + VRFY((check == true), "H5Sselect_shape_same passed (2)"); ret = H5Dread(large_dataset, H5T_NATIVE_UINT32, mem_small_ds_sid, file_large_ds_sid, xfer_plist, small_ds_buf_1); @@ -2220,7 +2220,7 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ /* verify that expected data is retrieved */ - data_ok = TRUE; + data_ok = true; expected_value = (uint32_t)((large_sel_start[0] * large_dims[1] * large_dims[2] * large_dims[3] * large_dims[4]) + @@ -2242,14 +2242,14 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ if (*ptr_1 != (uint32_t)0) { - data_ok = FALSE; + data_ok = false; *ptr_1 = (uint32_t)0; } ptr_1++; } - VRFY((data_ok == TRUE), "slice read from large ds data good(1)."); + VRFY((data_ok == true), "slice read from large ds data good(1)."); data_ok = lower_dim_size_comp_test__verify_data(ptr_1, #if LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG @@ -2258,11 +2258,11 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ /* rank */ 2, /* edge_size */ 10, /* checker_edge_size */ 3, expected_value, - /* buf_starts_in_checker */ TRUE); + /* buf_starts_in_checker */ true); - VRFY((data_ok == TRUE), "slice read from large ds data good(2)."); + VRFY((data_ok == true), "slice read from large ds data good(2)."); - data_ok = TRUE; + data_ok = true; ptr_1 += small_ds_slice_size; @@ -2277,14 +2277,14 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size, const hbool_t use_ } #endif /* LOWER_DIM_SIZE_COMP_TEST__VERIFY_DATA__DEBUG */ - data_ok = FALSE; + data_ok = false; *ptr_1 = (uint32_t)0; } ptr_1++; } - VRFY((data_ok == TRUE), "slice read from large ds data good(3)."); + VRFY((data_ok == true), "slice read from large ds data good(3)."); /* Close dataspaces */ ret = H5Sclose(full_mem_small_ds_sid); @@ -2373,10 +2373,10 @@ lower_dim_size_comp_test(void) HDcompile_assert(sizeof(uint32_t) == sizeof(unsigned)); for (use_collective_io = 0; use_collective_io <= 1; use_collective_io++) { chunk_edge_size = 0; - lower_dim_size_comp_test__run_test(chunk_edge_size, (hbool_t)use_collective_io, H5T_NATIVE_UINT); + lower_dim_size_comp_test__run_test(chunk_edge_size, (bool)use_collective_io, H5T_NATIVE_UINT); chunk_edge_size = 5; - lower_dim_size_comp_test__run_test(chunk_edge_size, (hbool_t)use_collective_io, H5T_NATIVE_UINT); + lower_dim_size_comp_test__run_test(chunk_edge_size, (bool)use_collective_io, H5T_NATIVE_UINT); } /* end for */ return; @@ -2398,11 +2398,11 @@ lower_dim_size_comp_test(void) * * 1) Reads or writes exactly one chunk, * - * 2) Has no in memory buffer for any other chunk. + * 2) Has no in-memory buffer for any other chunk. * - * The test differers from Rob Latham's bug report in - * that is runs with an arbitrary number of processes, - * and uses a 1 dimensional dataset. + * The test differs from Rob Latham's bug report in + * that it runs with an arbitrary number of processes, + * and uses a 1-dimensional dataset. * * Return: void *------------------------------------------------------------------------- @@ -2415,7 +2415,7 @@ link_chunk_collective_io_test(void) { /* const char *fcnName = "link_chunk_collective_io_test()"; */ const char *filename; - hbool_t mis_match = FALSE; + bool mis_match = false; int i; int mrc; int mpi_rank; @@ -2552,7 +2552,7 @@ link_chunk_collective_io_test(void) VRFY((ret >= 0), "H5Pclose(xfer_plist) succeeded"); /* verify the data */ - mis_match = FALSE; + mis_match = false; for (i = 0; i < LINK_CHUNK_COLLECTIVE_IO_TEST_CHUNK_SIZE; i++) { diff = local_data_written[i] - local_data_read[i]; @@ -2560,10 +2560,10 @@ link_chunk_collective_io_test(void) if (diff >= 0.001) { - mis_match = TRUE; + mis_match = true; } } - VRFY((mis_match == FALSE), "dataset data good."); + VRFY((mis_match == false), "dataset data good."); /* Close dataspaces */ ret = H5Sclose(write_mem_ds_sid); diff --git a/testpar/API/testphdf5.c b/testpar/API/testphdf5.c index a341112..1d42c61 100644 --- a/testpar/API/testphdf5.c +++ b/testpar/API/testphdf5.c @@ -277,9 +277,9 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type) /* set Parallel access with communicator */ ret = H5Pset_fapl_mpio(ret_pl, comm, info); VRFY((ret >= 0), ""); - ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE); + ret = H5Pset_all_coll_metadata_ops(ret_pl, true); VRFY((ret >= 0), ""); - ret = H5Pset_coll_metadata_write(ret_pl, TRUE); + ret = H5Pset_coll_metadata_write(ret_pl, true); VRFY((ret >= 0), ""); return (ret_pl); } diff --git a/testpar/API/testphdf5.h b/testpar/API/testphdf5.h index 545ab0f..59dd577 100644 --- a/testpar/API/testphdf5.h +++ b/testpar/API/testphdf5.h @@ -39,12 +39,12 @@ enum H5TEST_COLL_CHUNK_API { API_MULTI_IND }; -#ifndef FALSE -#define FALSE 0 +#ifndef false +#define false 0 #endif -#ifndef TRUE -#define TRUE 1 +#ifndef true +#define true 1 #endif /* Constants definitions */ @@ -94,8 +94,8 @@ enum H5TEST_COLL_CHUNK_API { #define LINK_TRUE_NUM_CHUNK 2 #define LINK_FALSE_NUM_CHUNK 6 #define MULTI_TRUE_PERCENT 50 -#define LINK_TRUE_CHUNK_NAME "h5_link_chunk_true" -#define LINK_FALSE_CHUNK_NAME "h5_link_chunk_false" +#define LINK_TRUE_CHUNK_NAME "h5_link_chunk_TRUE" +#define LINK_FALSE_CHUNK_NAME "h5_link_chunk_FALSE" #define LINK_HARD_CHUNK_NAME "h5_link_chunk_hard" #define MULTI_HARD_CHUNK_NAME "h5_multi_chunk_hard" #define MULTI_COLL_CHUNK_NAME "h5_multi_chunk_coll" @@ -217,8 +217,8 @@ enum H5TEST_COLL_CHUNK_API { /* Collective chunk instrumentation properties */ #define H5D_XFER_COLL_CHUNK_LINK_HARD_NAME "coll_chunk_link_hard" #define H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME "coll_chunk_multi_hard" -#define H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME "coll_chunk_link_true" -#define H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME "coll_chunk_link_false" +#define H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME "coll_chunk_link_TRUE" +#define H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME "coll_chunk_link_FALSE" #define H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME "coll_chunk_multi_coll" #define H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME "coll_chunk_multi_ind" @@ -230,8 +230,8 @@ enum H5TEST_COLL_CHUNK_API { #define H5D_XFER_COLL_RANK0_BCAST_NAME "coll_rank0_bcast" /* Definitions for general collective I/O instrumentation properties */ -#define H5D_XFER_COLL_RANK0_BCAST_SIZE sizeof(hbool_t) -#define H5D_XFER_COLL_RANK0_BCAST_DEF FALSE +#define H5D_XFER_COLL_RANK0_BCAST_SIZE sizeof(bool) +#define H5D_XFER_COLL_RANK0_BCAST_DEF false #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ /* type definitions */ |