diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-09-05 18:49:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 18:49:37 (GMT) |
| commit | d24f5d5223731d507b51d112ba564d764d6d6c18 (patch) | |
| tree | d6b198ab73404830c4a259ef03c8e318b5e029c4 /testpar | |
| parent | 6dd9cb199c0ecf0882fecf17475f25f1af210f95 (diff) | |
| download | hdf5-d24f5d5223731d507b51d112ba564d764d6d6c18.zip hdf5-d24f5d5223731d507b51d112ba564d764d6d6c18.tar.gz hdf5-d24f5d5223731d507b51d112ba564d764d6d6c18.tar.bz2 | |
Convert hbool_t --> bool in testpar (#3495)
Diffstat (limited to 'testpar')
37 files changed, 1613 insertions, 1616 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..9c31e58 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; @@ -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); diff --git a/testpar/API/H5_api_test_parallel.h b/testpar/API/H5_api_test_parallel.h index 44f9440..91eadbb 100644 --- a/testpar/API/H5_api_test_parallel.h +++ b/testpar/API/H5_api_test_parallel.h @@ -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_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 14f9233..332a656 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; @@ -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; @@ -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..7fd9c57 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; @@ -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), ""); @@ -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..d4979dd 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 */ @@ -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..2fd96db 100644 --- a/testpar/API/t_mdset.c +++ b/testpar/API/t_mdset.c @@ -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 */ @@ -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"); @@ -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..b839d2b 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); @@ -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 9d48827..fd6a8dd 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 re-use */ @@ -2484,7 +2484,7 @@ do { } else if (*val_ptr != 0) { - good_data = FALSE; + good_data = false; /* zero out buffer for re-use */ *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 b66b72c..bf52d85 100644 --- a/testpar/API/t_span_tree.c +++ b/testpar/API/t_span_tree.c @@ -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; @@ -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,7 +1291,7 @@ 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 @@ -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 re-use */ @@ -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 re-use */ *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; @@ -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 */ diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index a6e8560..e7e0cfe 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -262,9 +262,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); } @@ -3344,10 +3344,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; @@ -3858,8 +3858,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; diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 3a28022..24721b5 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -1198,9 +1198,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/t_cache.c b/testpar/t_cache.c index 0d18851..3659b2b 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -31,9 +31,9 @@ #define BASE_ADDR (haddr_t)1024 -int nerrors = 0; -int failures = 0; -hbool_t verbose = TRUE; /* used to control error messages */ +int nerrors = 0; +int failures = 0; +bool verbose = true; /* used to control error messages */ #define NFILENAME 2 const char *FILENAME[NFILENAME] = {"CacheTestDummy", NULL}; @@ -41,15 +41,15 @@ const char *FILENAME[NFILENAME] = {"CacheTestDummy", NULL}; #define PATH_MAX 512 #endif /* !PATH_MAX */ char *filenames[NFILENAME]; -hid_t fapl; /* file access property list */ -haddr_t max_addr = 0; /* used to store the end of - * the address space used by - * the data array (see below). - */ -hbool_t callbacks_verbose = FALSE; /* flag used to control whether - * the callback functions are in - * verbose mode. - */ +hid_t fapl; /* file access property list */ +haddr_t max_addr = 0; /* used to store the end of + * the address space used by + * the data array (see below). + */ +bool callbacks_verbose = false; /* flag used to control whether + * the callback functions are in + * verbose mode. + */ int world_mpi_size = -1; int world_mpi_rank = -1; @@ -161,13 +161,13 @@ struct datum { size_t len; size_t local_len; int ver; - hbool_t dirty; - hbool_t valid; - hbool_t locked; - hbool_t global_pinned; - hbool_t local_pinned; - hbool_t cleared; - hbool_t flushed; + bool dirty; + bool valid; + bool locked; + bool global_pinned; + bool local_pinned; + bool cleared; + bool flushed; int reads; int writes; int index; @@ -234,7 +234,7 @@ int *data_index = NULL; * reads and writes. Without some such mechanism, the test code contains * race conditions that will frequently cause spurious failures. * - * When set to TRUE, DO_WRITE_REQ_ACK forces the server to send an ack after + * When set to true, DO_WRITE_REQ_ACK forces the server to send an ack after * each write request, and the client to wait until the ack is received * before proceeding. This was my first solution to the problem, and at * first glance, it would seem to have a lot of unnecessary overhead. @@ -251,13 +251,13 @@ int *data_index = NULL; * * Thus I have left code supporting the second solution in place. * - * Note that while one of these two #defines must be set to TRUE, there - * should never be any need to set both of them to TRUE (although the + * Note that while one of these two #defines must be set to true, there + * should never be any need to set both of them to true (although the * tests will still function with this setting). *****************************************************************************/ -#define DO_WRITE_REQ_ACK TRUE -#define DO_SYNC_AFTER_WRITE FALSE +#define DO_WRITE_REQ_ACK true +#define DO_SYNC_AFTER_WRITE false /***************************************************************************** * struct mssg @@ -332,7 +332,7 @@ static void reset_stats(void); /* MPI setup functions */ -static hbool_t set_up_file_communicator(void); +static bool set_up_file_communicator(void); /* data array manipulation functions */ @@ -347,29 +347,29 @@ static int get_max_nerrors(void); /* mssg xfer related functions */ -static hbool_t recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset); -static hbool_t send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag); -static hbool_t setup_derived_types(void); -static hbool_t takedown_derived_types(void); +static bool recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset); +static bool send_mssg(struct mssg_t *mssg_ptr, bool add_req_to_tag); +static bool setup_derived_types(void); +static bool takedown_derived_types(void); /* server functions */ -static hbool_t reset_server_counters(void); -static hbool_t server_main(void); -static hbool_t serve_read_request(struct mssg_t *mssg_ptr); -static hbool_t serve_sync_request(struct mssg_t *mssg_ptr); -static hbool_t serve_write_request(struct mssg_t *mssg_ptr); -static hbool_t serve_total_writes_request(struct mssg_t *mssg_ptr); -static hbool_t serve_total_reads_request(struct mssg_t *mssg_ptr); -static hbool_t serve_entry_writes_request(struct mssg_t *mssg_ptr); -static hbool_t serve_entry_reads_request(struct mssg_t *mssg_ptr); -static hbool_t serve_rw_count_reset_request(struct mssg_t *mssg_ptr); +static bool reset_server_counters(void); +static bool server_main(void); +static bool serve_read_request(struct mssg_t *mssg_ptr); +static bool serve_sync_request(struct mssg_t *mssg_ptr); +static bool serve_write_request(struct mssg_t *mssg_ptr); +static bool serve_total_writes_request(struct mssg_t *mssg_ptr); +static bool serve_total_reads_request(struct mssg_t *mssg_ptr); +static bool serve_entry_writes_request(struct mssg_t *mssg_ptr); +static bool serve_entry_reads_request(struct mssg_t *mssg_ptr); +static bool serve_rw_count_reset_request(struct mssg_t *mssg_ptr); /* call back functions & related data structures */ static herr_t datum_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr); -static void *datum_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); +static void *datum_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); static herr_t datum_image_len(const void *thing, size_t *image_len_ptr); @@ -417,45 +417,45 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] = {{ /* test utility functions */ -static void expunge_entry(H5F_t *file_ptr, int32_t idx); -static void insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags); -static void local_pin_and_unpin_random_entries(H5F_t *file_ptr, int min_idx, int max_idx, int min_count, - int max_count); -static void local_pin_random_entry(H5F_t *file_ptr, int min_idx, int max_idx); -static void local_unpin_all_entries(H5F_t *file_ptr, hbool_t via_unprotect); -static int local_unpin_next_pinned_entry(H5F_t *file_ptr, int start_idx, hbool_t via_unprotect); -static void lock_and_unlock_random_entries(H5F_t *file_ptr, int min_idx, int max_idx, int min_count, - int max_count); -static void lock_and_unlock_random_entry(H5F_t *file_ptr, int min_idx, int max_idx); -static void lock_entry(H5F_t *file_ptr, int32_t idx); -static void mark_entry_dirty(int32_t idx); -static void pin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty); -static void pin_protected_entry(int32_t idx, hbool_t global); -static void move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx); -static hbool_t reset_server_counts(void); -static void resize_entry(int32_t idx, size_t new_size); -static hbool_t setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, - int metadata_write_strategy); -static void setup_rand(void); -static hbool_t take_down_cache(hid_t fid, H5C_t *cache_ptr); -static hbool_t verify_entry_reads(haddr_t addr, int expected_entry_reads); -static hbool_t verify_entry_writes(haddr_t addr, int expected_entry_writes); -static hbool_t verify_total_reads(int expected_total_reads); -static hbool_t verify_total_writes(unsigned expected_total_writes); -static void verify_writes(unsigned num_writes, haddr_t *written_entries_tbl); -static void unlock_entry(H5F_t *file_ptr, int32_t type, unsigned int flags); -static void unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t via_unprotect); +static void expunge_entry(H5F_t *file_ptr, int32_t idx); +static void insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags); +static void local_pin_and_unpin_random_entries(H5F_t *file_ptr, int min_idx, int max_idx, int min_count, + int max_count); +static void local_pin_random_entry(H5F_t *file_ptr, int min_idx, int max_idx); +static void local_unpin_all_entries(H5F_t *file_ptr, bool via_unprotect); +static int local_unpin_next_pinned_entry(H5F_t *file_ptr, int start_idx, bool via_unprotect); +static void lock_and_unlock_random_entries(H5F_t *file_ptr, int min_idx, int max_idx, int min_count, + int max_count); +static void lock_and_unlock_random_entry(H5F_t *file_ptr, int min_idx, int max_idx); +static void lock_entry(H5F_t *file_ptr, int32_t idx); +static void mark_entry_dirty(int32_t idx); +static void pin_entry(H5F_t *file_ptr, int32_t idx, bool global, bool dirty); +static void pin_protected_entry(int32_t idx, bool global); +static void move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx); +static bool reset_server_counts(void); +static void resize_entry(int32_t idx, size_t new_size); +static bool setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, + int metadata_write_strategy); +static void setup_rand(void); +static bool take_down_cache(hid_t fid, H5C_t *cache_ptr); +static bool verify_entry_reads(haddr_t addr, int expected_entry_reads); +static bool verify_entry_writes(haddr_t addr, int expected_entry_writes); +static bool verify_total_reads(int expected_total_reads); +static bool verify_total_writes(unsigned expected_total_writes); +static void verify_writes(unsigned num_writes, haddr_t *written_entries_tbl); +static void unlock_entry(H5F_t *file_ptr, int32_t type, unsigned int flags); +static void unpin_entry(H5F_t *file_ptr, int32_t idx, bool global, bool dirty, bool via_unprotect); /* test functions */ -static hbool_t server_smoke_check(void); -static hbool_t smoke_check_1(int metadata_write_strategy); -static hbool_t smoke_check_2(int metadata_write_strategy); -static hbool_t smoke_check_3(int metadata_write_strategy); -static hbool_t smoke_check_4(int metadata_write_strategy); -static hbool_t smoke_check_5(int metadata_write_strategy); -static hbool_t smoke_check_6(int metadata_write_strategy); -static hbool_t trace_file_check(int metadata_write_strategy); +static bool server_smoke_check(void); +static bool smoke_check_1(int metadata_write_strategy); +static bool smoke_check_2(int metadata_write_strategy); +static bool smoke_check_3(int metadata_write_strategy); +static bool smoke_check_4(int metadata_write_strategy); +static bool smoke_check_5(int metadata_write_strategy); +static bool smoke_check_6(int metadata_write_strategy); +static bool trace_file_check(int metadata_write_strategy); /*****************************************************************************/ /****************************** stats functions ******************************/ @@ -529,16 +529,16 @@ reset_stats(void) * Purpose: Create the MPI communicator used to open a HDF5 file with. * In passing, also initialize the file_mpi... globals. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool set_up_file_communicator(void) { - hbool_t success = TRUE; + bool success = true; int mpi_result; int num_excluded_ranks; int excluded_ranks[1]; @@ -552,7 +552,7 @@ set_up_file_communicator(void) if (mpi_result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Comm_group() failed with error %d.\n", world_mpi_rank, __func__, mpi_result); @@ -569,7 +569,7 @@ set_up_file_communicator(void) if (mpi_result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Group_excl() failed with error %d.\n", world_mpi_rank, __func__, mpi_result); @@ -584,7 +584,7 @@ set_up_file_communicator(void) if (mpi_result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Comm_create() failed with error %d.\n", world_mpi_rank, __func__, mpi_result); @@ -597,7 +597,7 @@ set_up_file_communicator(void) if (file_mpi_comm == MPI_COMM_NULL) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: file_mpi_comm == MPI_COMM_NULL.\n", world_mpi_rank, __func__); } @@ -610,7 +610,7 @@ set_up_file_communicator(void) if (file_mpi_comm != MPI_COMM_NULL) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: file_mpi_comm != MPI_COMM_NULL.\n", world_mpi_rank, __func__); } @@ -626,7 +626,7 @@ set_up_file_communicator(void) if (mpi_result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Comm_size() failed with error %d.\n", world_mpi_rank, __func__, mpi_result); @@ -641,7 +641,7 @@ set_up_file_communicator(void) if (mpi_result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Comm_rank() failed with error %d.\n", world_mpi_rank, __func__, mpi_result); @@ -712,9 +712,9 @@ addr_to_datum_index(haddr_t base_addr) * Purpose: Initialize the data array, from which cache entries are * loaded. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ static void @@ -743,13 +743,13 @@ init_data(void) data[i].len = (size_t)(addr_offsets[j]); data[i].local_len = (size_t)(addr_offsets[j]); data[i].ver = 0; - data[i].dirty = FALSE; - data[i].valid = FALSE; - data[i].locked = FALSE; - data[i].global_pinned = FALSE; - data[i].local_pinned = FALSE; - data[i].cleared = FALSE; - data[i].flushed = FALSE; + data[i].dirty = false; + data[i].valid = false; + data[i].locked = false; + data[i].global_pinned = false; + data[i].local_pinned = false; + data[i].cleared = false; + data[i].flushed = false; data[i].reads = 0; data[i].writes = 0; data[i].index = i; @@ -851,7 +851,7 @@ do_sync(void) mssg.count = 0; mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; if (verbose) { @@ -928,18 +928,18 @@ get_max_nerrors(void) * Purpose: Receive a message from any process in the provided instance * of struct mssg. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ #define CACHE_TEST_TAG 99 /* different from any used by the library */ -static hbool_t +static bool recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset) { - hbool_t success = TRUE; + bool success = true; int mssg_tag = CACHE_TEST_TAG; int result; MPI_Status status; @@ -947,7 +947,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset) if ((mssg_ptr == NULL) || (mssg_tag_offset < 0) || (mssg_tag_offset > MAX_REQ_CODE)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: bad param(s) on entry.\n", world_mpi_rank, __func__); } @@ -964,7 +964,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset) if (result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Recv() failed.\n", world_mpi_rank, __func__); } @@ -972,7 +972,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset) else if (mssg_ptr->magic != MSSG_MAGIC) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: invalid magic.\n", world_mpi_rank, __func__); } @@ -980,7 +980,7 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset) else if (mssg_ptr->src != status.MPI_SOURCE) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: mssg_ptr->src != status.MPI_SOURCE.\n", world_mpi_rank, __func__); } @@ -1000,15 +1000,15 @@ recv_mssg(struct mssg_t *mssg_ptr, int mssg_tag_offset) * Note that all source and destination ranks are in the * global communicator. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t -send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag) +static bool +send_mssg(struct mssg_t *mssg_ptr, bool add_req_to_tag) { - hbool_t success = TRUE; + bool success = true; int mssg_tag = CACHE_TEST_TAG; int result; static long mssg_num = 0; @@ -1018,7 +1018,7 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag) (mssg_ptr->req > MAX_REQ_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Invalid mssg on entry.\n", world_mpi_rank, __func__); } @@ -1038,7 +1038,7 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag) if (result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Send() failed.\n", world_mpi_rank, __func__); } @@ -1056,15 +1056,15 @@ send_mssg(struct mssg_t *mssg_ptr, hbool_t add_req_to_tag) * Purpose: Set up the derived types used by the test bed. At present, * only the mpi_mssg derived type is needed. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool setup_derived_types(void) { - hbool_t success = TRUE; + bool success = true; int i; int result; MPI_Datatype mpi_types[9] = {MPI_INT, MPI_INT, MPI_INT, MPI_LONG, HADDR_AS_MPI_TYPE, @@ -1087,7 +1087,7 @@ setup_derived_types(void) (MPI_SUCCESS != MPI_Get_address(&sample.magic, &displs[8]))) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Get_address() call failed.\n", world_mpi_rank, __func__); } @@ -1107,7 +1107,7 @@ setup_derived_types(void) if (result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Type_create_struct() call failed.\n", world_mpi_rank, __func__); } @@ -1121,7 +1121,7 @@ setup_derived_types(void) if (result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Type_commit() call failed.\n", world_mpi_rank, __func__); } @@ -1139,16 +1139,16 @@ setup_derived_types(void) * Purpose: take down the derived types used by the test bed. At present, * only the mpi_mssg derived type is needed. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool takedown_derived_types(void) { - hbool_t success = TRUE; - int result; + bool success = true; + int result; if (mpi_mssg_t == MPI_DATATYPE_NULL) return (success); @@ -1158,7 +1158,7 @@ takedown_derived_types(void) if (result != MPI_SUCCESS) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: MPI_Type_free() call failed.\n", world_mpi_rank, __func__); } @@ -1179,18 +1179,18 @@ takedown_derived_types(void) * Purpose: Reset the counters maintained by the server, doing a * sanity check in passing. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool reset_server_counters(void) { - hbool_t success = TRUE; - int i; - long actual_total_reads = 0; - long actual_total_writes = 0; + bool success = true; + int i; + long actual_total_reads = 0; + long actual_total_writes = 0; for (i = 0; i < NUM_DATA_ENTRIES; i++) { if (data[i].reads > 0) { @@ -1208,7 +1208,7 @@ reset_server_counters(void) if (actual_total_reads != total_reads) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: actual/total reads mismatch (%ld/%d).\n", world_mpi_rank, __func__, @@ -1218,7 +1218,7 @@ reset_server_counters(void) if (actual_total_writes != total_writes) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: actual/total writes mismatch (%ld/%d).\n", world_mpi_rank, __func__, @@ -1244,23 +1244,23 @@ reset_server_counters(void) * the test until the count of done messages received equals * the number of client processes. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool server_main(void) { - hbool_t done = FALSE; - hbool_t success = TRUE; + bool done = false; + bool success = true; int done_count = 0; struct mssg_t mssg; if (world_mpi_rank != world_server_mpi_rank) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: This isn't the server process?!?!?\n", world_mpi_rank, __func__); } @@ -1277,7 +1277,7 @@ server_main(void) break; case WRITE_REQ_ACK_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received write ack?!?.\n", __func__); break; @@ -1287,7 +1287,7 @@ server_main(void) break; case READ_REQ_REPLY_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received read req reply?!?.\n", __func__); break; @@ -1297,7 +1297,7 @@ server_main(void) break; case SYNC_ACK_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received sync ack?!?.\n", __func__); break; @@ -1307,7 +1307,7 @@ server_main(void) break; case REQ_TTL_WRITES_RPLY_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received total writes reply?!?.\n", __func__); break; @@ -1317,7 +1317,7 @@ server_main(void) break; case REQ_TTL_READS_RPLY_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received total reads reply?!?.\n", __func__); break; @@ -1327,7 +1327,7 @@ server_main(void) break; case REQ_ENTRY_WRITES_RPLY_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received entry writes reply?!?.\n", __func__); break; @@ -1337,7 +1337,7 @@ server_main(void) break; case REQ_ENTRY_READS_RPLY_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received entry reads reply?!?.\n", __func__); break; @@ -1347,7 +1347,7 @@ server_main(void) break; case REQ_RW_COUNT_RESET_RPLY_CODE: - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%s: Received RW count reset reply?!?.\n", __func__); break; @@ -1355,12 +1355,12 @@ server_main(void) case DONE_REQ_CODE: done_count++; if (done_count >= file_mpi_size) - done = TRUE; + done = true; break; default: nerrors++; - success = FALSE; + success = false; if (verbose) fprintf(stdout, "%d:%s: Unknown request code.\n", world_mpi_rank, __func__); break; @@ -1383,16 +1383,16 @@ server_main(void) * a copy of the indicated datum from the data array to * the requesting process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_read_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; int target_index; haddr_t target_addr; struct mssg_t reply; @@ -1400,7 +1400,7 @@ serve_read_request(struct mssg_t *mssg_ptr) if ((mssg_ptr == NULL) || (mssg_ptr->req != READ_REQ_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1414,7 +1414,7 @@ serve_read_request(struct mssg_t *mssg_ptr) if (target_index < 0) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__, target_addr); @@ -1423,7 +1423,7 @@ serve_read_request(struct mssg_t *mssg_ptr) else if (data[target_index].len != mssg_ptr->len) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: data[i].len = %zu != mssg->len = %d.\n", world_mpi_rank, __func__, data[target_index].len, mssg_ptr->len); @@ -1432,7 +1432,7 @@ serve_read_request(struct mssg_t *mssg_ptr) else if (!(data[target_index].valid)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: proc %d read invalid entry. " @@ -1461,7 +1461,7 @@ serve_read_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -1498,22 +1498,22 @@ serve_read_request(struct mssg_t *mssg_ptr) * that all previous messages have been processed before * proceeding. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_sync_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; struct mssg_t reply; if ((mssg_ptr == NULL) || (mssg_ptr->req != SYNC_REQ_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1535,7 +1535,7 @@ serve_sync_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -1565,16 +1565,16 @@ serve_sync_request(struct mssg_t *mssg_ptr) * the version number of the target data array entry as * specified in the message. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_write_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; int target_index; int new_ver_num = 0; haddr_t target_addr; @@ -1585,7 +1585,7 @@ serve_write_request(struct mssg_t *mssg_ptr) if ((mssg_ptr == NULL) || (mssg_ptr->req != WRITE_REQ_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1599,7 +1599,7 @@ serve_write_request(struct mssg_t *mssg_ptr) if (target_index < 0) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__, target_addr); @@ -1608,7 +1608,7 @@ serve_write_request(struct mssg_t *mssg_ptr) else if (data[target_index].len != mssg_ptr->len) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: data[i].len = %zu != mssg->len = %d.\n", world_mpi_rank, __func__, data[target_index].len, mssg_ptr->len); @@ -1624,7 +1624,7 @@ serve_write_request(struct mssg_t *mssg_ptr) if (new_ver_num <= data[target_index].ver) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: new ver = %d <= old ver = %d.\n", world_mpi_rank, __func__, new_ver_num, data[target_index].ver); @@ -1636,7 +1636,7 @@ serve_write_request(struct mssg_t *mssg_ptr) /* process the write */ data[target_index].ver = new_ver_num; - data[target_index].valid = TRUE; + data[target_index].valid = true; /* and update the counters */ total_writes++; @@ -1656,7 +1656,7 @@ serve_write_request(struct mssg_t *mssg_ptr) reply.magic = MSSG_MAGIC; /* and send it */ - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); #endif /* DO_WRITE_REQ_ACK */ } @@ -1693,22 +1693,22 @@ serve_write_request(struct mssg_t *mssg_ptr) * the current value of the total_writes global variable to * the requesting process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_total_writes_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; struct mssg_t reply; if ((mssg_ptr == NULL) || (mssg_ptr->req != REQ_TTL_WRITES_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1730,7 +1730,7 @@ serve_total_writes_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -1761,22 +1761,22 @@ serve_total_writes_request(struct mssg_t *mssg_ptr) * the current value of the total_reads global variable to * the requesting process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_total_reads_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; struct mssg_t reply; if ((mssg_ptr == NULL) || (mssg_ptr->req != REQ_TTL_READS_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1798,7 +1798,7 @@ serve_total_reads_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -1829,16 +1829,16 @@ serve_total_reads_request(struct mssg_t *mssg_ptr) * written since the last counter reset to the requesting * process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_entry_writes_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; int target_index; haddr_t target_addr; struct mssg_t reply; @@ -1846,7 +1846,7 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr) if ((mssg_ptr == NULL) || (mssg_ptr->req != REQ_ENTRY_WRITES_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1860,7 +1860,7 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr) if (target_index < 0) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__, target_addr); @@ -1883,7 +1883,7 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -1916,16 +1916,16 @@ serve_entry_writes_request(struct mssg_t *mssg_ptr) * read since the last counter reset to the requesting * process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_entry_reads_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; int target_index; haddr_t target_addr; struct mssg_t reply; @@ -1933,7 +1933,7 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr) if ((mssg_ptr == NULL) || (mssg_ptr->req != REQ_ENTRY_READS_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -1947,7 +1947,7 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr) if (target_index < 0) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: addr lookup failed for %" PRIuHADDR ".\n", world_mpi_rank, __func__, target_addr); @@ -1970,7 +1970,7 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -2002,22 +2002,22 @@ serve_entry_reads_request(struct mssg_t *mssg_ptr) * read/write counters, and sends a confirmation message to * the calling process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool serve_rw_count_reset_request(struct mssg_t *mssg_ptr) { - hbool_t report_mssg = FALSE; - hbool_t success = TRUE; + bool report_mssg = false; + bool success = true; struct mssg_t reply; if ((mssg_ptr == NULL) || (mssg_ptr->req != REQ_RW_COUNT_RESET_CODE) || (mssg_ptr->magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad mssg on entry.\n", world_mpi_rank, __func__); } @@ -2044,7 +2044,7 @@ serve_rw_count_reset_request(struct mssg_t *mssg_ptr) if (success) { - success = send_mssg(&reply, TRUE); + success = send_mssg(&reply, true); } if (report_mssg) { @@ -2122,10 +2122,10 @@ datum_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr) */ static void * datum_deserialize(const void H5_ATTR_NDEBUG_UNUSED *image_ptr, H5_ATTR_UNUSED size_t len, void *udata_ptr, - hbool_t *dirty_ptr) + bool *dirty_ptr) { haddr_t addr = *(haddr_t *)udata_ptr; - hbool_t success = TRUE; + bool success = true; int idx; struct datum *entry_ptr = NULL; @@ -2152,7 +2152,7 @@ datum_deserialize(const void H5_ATTR_NDEBUG_UNUSED *image_ptr, H5_ATTR_UNUSED si fflush(stdout); } - *dirty_ptr = FALSE; + *dirty_ptr = false; if (!success) { @@ -2285,7 +2285,7 @@ datum_serialize(const H5F_t *f, void H5_ATTR_NDEBUG_UNUSED *image_ptr, size_t le static herr_t datum_notify(H5C_notify_action_t action, void *thing) { - hbool_t was_dirty = FALSE; + bool was_dirty = false; herr_t ret_value = SUCCEED; struct datum *entry_ptr; struct H5AC_aux_t *aux_ptr; @@ -2349,7 +2349,7 @@ datum_notify(H5C_notify_action_t action, void *thing) mssg.count = 0; /* not used */ mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; ret_value = FAIL; @@ -2446,7 +2446,7 @@ datum_notify(H5C_notify_action_t action, void *thing) else { entry_ptr->ver = mssg.ver; - entry_ptr->dirty = FALSE; + entry_ptr->dirty = false; datum_loads++; } } @@ -2478,7 +2478,7 @@ datum_notify(H5C_notify_action_t action, void *thing) if (entry_ptr->header.is_dirty) { - was_dirty = TRUE; /* so we will receive the ack + was_dirty = true; /* so we will receive the ack * if requested */ @@ -2493,7 +2493,7 @@ datum_notify(H5C_notify_action_t action, void *thing) mssg.count = 0; mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; ret_value = FAIL; @@ -2502,8 +2502,8 @@ datum_notify(H5C_notify_action_t action, void *thing) } } else { - entry_ptr->dirty = FALSE; - entry_ptr->flushed = TRUE; + entry_ptr->dirty = false; + entry_ptr->flushed = true; } } } @@ -2574,8 +2574,8 @@ datum_notify(H5C_notify_action_t action, void *thing) fflush(stdout); } - entry_ptr->cleared = TRUE; - entry_ptr->dirty = FALSE; + entry_ptr->cleared = true; + entry_ptr->dirty = false; datum_clears++; @@ -2711,7 +2711,7 @@ datum_free_icr(void *thing) static void expunge_entry(H5F_t *file_ptr, int32_t idx) { - hbool_t in_cache; + bool in_cache; herr_t result; struct datum *entry_ptr; @@ -2725,7 +2725,7 @@ expunge_entry(H5F_t *file_ptr, int32_t idx) assert(!(entry_ptr->global_pinned)); assert(!(entry_ptr->local_pinned)); - entry_ptr->dirty = FALSE; + entry_ptr->dirty = false; if (nerrors == 0) { @@ -2779,7 +2779,7 @@ expunge_entry(H5F_t *file_ptr, int32_t idx) static void insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags) { - hbool_t insert_pinned; + bool insert_pinned; herr_t result; struct datum *entry_ptr; @@ -2797,7 +2797,7 @@ insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags) if (nerrors == 0) { (entry_ptr->ver)++; - entry_ptr->dirty = TRUE; + entry_ptr->dirty = true; result = H5AC_insert_entry(file_ptr, &(types[0]), entry_ptr->base_addr, (void *)(&(entry_ptr->header)), flags); @@ -2836,13 +2836,13 @@ insert_entry(H5C_t *cache_ptr, H5F_t *file_ptr, int32_t idx, unsigned int flags) if (insert_pinned) { assert(entry_ptr->header.is_pinned); - entry_ptr->global_pinned = TRUE; + entry_ptr->global_pinned = true; global_pins++; } else { assert(!(entry_ptr->header.is_pinned)); - entry_ptr->global_pinned = FALSE; + entry_ptr->global_pinned = false; } /* assert( entry_ptr->header.is_dirty ); */ @@ -2870,10 +2870,10 @@ local_pin_and_unpin_random_entries(H5F_t *file_ptr, int min_idx, int max_idx, in if (nerrors == 0) { - hbool_t via_unprotect; - int count; - int i; - int idx; + bool via_unprotect; + int count; + int i; + int idx; assert(file_ptr); assert(0 <= min_idx); @@ -2943,7 +2943,7 @@ local_pin_random_entry(H5F_t *file_ptr, int min_idx, int max_idx) assert(idx <= max_idx); } while (data[idx].global_pinned || data[idx].local_pinned); - pin_entry(file_ptr, idx, FALSE, FALSE); + pin_entry(file_ptr, idx, false, false); } return; @@ -2961,7 +2961,7 @@ local_pin_random_entry(H5F_t *file_ptr, int min_idx, int max_idx) * *****************************************************************************/ static void -local_unpin_all_entries(H5F_t *file_ptr, hbool_t via_unprotect) +local_unpin_all_entries(H5F_t *file_ptr, bool via_unprotect) { if (nerrors == 0) { @@ -2995,7 +2995,7 @@ local_unpin_all_entries(H5F_t *file_ptr, hbool_t via_unprotect) * *****************************************************************************/ static int -local_unpin_next_pinned_entry(H5F_t *file_ptr, int start_idx, hbool_t via_unprotect) +local_unpin_next_pinned_entry(H5F_t *file_ptr, int start_idx, bool via_unprotect) { int i = 0; int idx = -1; @@ -3019,7 +3019,7 @@ local_unpin_next_pinned_entry(H5F_t *file_ptr, int start_idx, hbool_t via_unprot if (data[idx].local_pinned) { - unpin_entry(file_ptr, idx, FALSE, FALSE, via_unprotect); + unpin_entry(file_ptr, idx, false, false, via_unprotect); } else { @@ -3146,7 +3146,7 @@ lock_entry(H5F_t *file_ptr, int32_t idx) } else { - entry_ptr->locked = TRUE; + entry_ptr->locked = true; } assert(((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE); @@ -3183,7 +3183,7 @@ mark_entry_dirty(int32_t idx) assert(!(entry_ptr->local_pinned)); (entry_ptr->ver)++; - entry_ptr->dirty = TRUE; + entry_ptr->dirty = true; result = H5AC_mark_entry_dirty((void *)entry_ptr); @@ -3214,7 +3214,7 @@ mark_entry_dirty(int32_t idx) * *****************************************************************************/ static void -pin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty) +pin_entry(H5F_t *file_ptr, int32_t idx, bool global, bool dirty) { unsigned int flags = H5AC__PIN_ENTRY_FLAG; struct datum *entry_ptr; @@ -3245,13 +3245,13 @@ pin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty) if (global) { - entry_ptr->global_pinned = TRUE; + entry_ptr->global_pinned = true; global_pins++; } else { - entry_ptr->local_pinned = TRUE; + entry_ptr->local_pinned = true; local_pins++; } @@ -3273,7 +3273,7 @@ pin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty) * *****************************************************************************/ static void -pin_protected_entry(int32_t idx, hbool_t global) +pin_protected_entry(int32_t idx, bool global) { herr_t result; struct datum *entry_ptr; @@ -3302,13 +3302,13 @@ pin_protected_entry(int32_t idx, hbool_t global) if (global) { - entry_ptr->global_pinned = TRUE; + entry_ptr->global_pinned = true; global_pins++; } else { - entry_ptr->local_pinned = TRUE; + entry_ptr->local_pinned = true; local_pins++; } @@ -3364,7 +3364,7 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx) new_addr = new_entry_ptr->base_addr; /* Moving will mark the entry dirty if it is not already */ - old_entry_ptr->dirty = TRUE; + old_entry_ptr->dirty = true; /* touch up versions, base_addrs, and data_index. Do this * now as it is possible that the rename will trigger a @@ -3441,15 +3441,15 @@ move_entry(H5F_t *file_ptr, int32_t old_idx, int32_t new_idx) * Purpose: Send a message to the server process requesting it to reset * its counters. Await confirmation message. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool reset_server_counts(void) { - hbool_t success = TRUE; /* will set to FALSE if appropriate. */ + bool success = true; /* will set to false if appropriate. */ struct mssg_t mssg; if (success) { @@ -3465,10 +3465,10 @@ reset_server_counts(void) mssg.count = 0; mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__); } @@ -3480,7 +3480,7 @@ reset_server_counts(void) if (!recv_mssg(&mssg, REQ_RW_COUNT_RESET_RPLY_CODE)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__); } @@ -3490,7 +3490,7 @@ reset_server_counts(void) (mssg.ver != 0) || (mssg.count != 0) || (mssg.magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad data in req r/w counter reset reply.\n", world_mpi_rank, __func__); @@ -3550,7 +3550,7 @@ resize_entry(int32_t idx, size_t new_size) assert(entry_ptr->header.is_dirty); assert(entry_ptr->header.size == new_size); - entry_ptr->dirty = TRUE; + entry_ptr->dirty = true; entry_ptr->local_len = new_size; /* touch up version. */ @@ -3575,16 +3575,16 @@ resize_entry(int32_t idx, size_t new_size) * look up the address of the metadata cache, and then instruct * the cache to omit sanity checks on dxpl IDs. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, int metadata_write_strategy) { - hbool_t success = FALSE; /* will set to TRUE if appropriate. */ - hbool_t enable_rpt_fcn = FALSE; + bool success = false; /* will set to true if appropriate. */ + bool enable_rpt_fcn = false; hid_t fid = -1; H5AC_cache_config_t config; H5AC_cache_config_t test_config; @@ -3634,12 +3634,12 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr } } else { - cache_ptr->ignore_tags = TRUE; + cache_ptr->ignore_tags = true; *fid_ptr = fid; *file_ptr_ptr = file_ptr; *cache_ptr_ptr = cache_ptr; H5C_stats__reset(cache_ptr); - success = TRUE; + success = true; } if (success) { @@ -3727,7 +3727,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr if (actual_base_addr == HADDR_UNDEF) { - success = FALSE; + success = false; nerrors++; if (verbose) { @@ -3740,7 +3740,7 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr * actual_base_addr is <= BASE_ADDR. This should only happen * if the size of the superblock is increase. */ - success = FALSE; + success = false; nerrors++; if (verbose) { @@ -3819,9 +3819,9 @@ setup_cache_for_test(hid_t *fid_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr static void verify_writes(unsigned num_writes, haddr_t *written_entries_tbl) { - const hbool_t report = FALSE; - hbool_t proceed = TRUE; - unsigned u = 0; + const bool report = false; + bool proceed = true; + unsigned u = 0; assert(world_mpi_rank != world_server_mpi_rank); assert((num_writes == 0) || (written_entries_tbl != NULL)); @@ -3833,7 +3833,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl) if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - proceed = FALSE; + proceed = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: barrier 1 failed.\n", world_mpi_rank, __func__); @@ -3856,7 +3856,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl) if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - proceed = FALSE; + proceed = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: barrier 2 failed.\n", world_mpi_rank, __func__); @@ -3892,7 +3892,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl) if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - proceed = FALSE; + proceed = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: barrier 3 failed.\n", world_mpi_rank, __func__); @@ -3919,7 +3919,7 @@ verify_writes(unsigned num_writes, haddr_t *written_entries_tbl) static void setup_rand(void) { - hbool_t use_predefined_seeds = FALSE; + bool use_predefined_seeds = false; int num_predefined_seeds = 3; unsigned predefined_seeds[3] = {18669, 89925, 12577}; unsigned seed; @@ -3967,22 +3967,22 @@ setup_rand(void) * To do this, we must close the file, and delete if if * possible. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool take_down_cache(hid_t fid, H5C_t *cache_ptr) { - hbool_t success = TRUE; /* will set to FALSE if appropriate. */ + bool success = true; /* will set to false if appropriate. */ /* flush the file -- this should write out any remaining test * entries in the cache. */ if ((success) && (H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0)) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: H5Fflush() failed.\n", world_mpi_rank, __func__); @@ -3998,7 +3998,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr) if (H5AC__set_sync_point_done_callback(cache_ptr, NULL) != SUCCEED) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank, @@ -4010,7 +4010,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr) /* close the file */ if ((success) && (H5Fclose(fid) < 0)) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: H5Fclose() failed.\n", world_mpi_rank, __func__); @@ -4018,7 +4018,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr) } /* Pop API context */ - H5CX_pop(FALSE); + H5CX_pop(false); if (success) { @@ -4026,7 +4026,7 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr) if (HDremove(filenames[0]) < 0) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: HDremove() failed.\n", world_mpi_rank, __func__); @@ -4053,20 +4053,20 @@ take_down_cache(hid_t fid, H5C_t *cache_ptr) * indicated entry has been read since the last time the * server counters were reset. * - * Return TRUE if successful, and if the supplied expected + * Return true if successful, and if the supplied expected * number of reads matches the number of reads reported by * the server process. * - * Return FALSE and flag an error otherwise. + * Return false and flag an error otherwise. * - * Return: TRUE if successful, FALSE otherwise. + * Return: true if successful, false otherwise. * *------------------------------------------------------------------------- */ -static hbool_t +static bool verify_entry_reads(haddr_t addr, int expected_entry_reads) { - hbool_t success = TRUE; + bool success = true; int reported_entry_reads = 0; struct mssg_t mssg; @@ -4083,10 +4083,10 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads) mssg.count = 0; /* not used */ mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4098,7 +4098,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads) if (!recv_mssg(&mssg, REQ_ENTRY_READS_RPLY_CODE)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4112,7 +4112,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads) (mssg.magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad data in req entry reads reply.\n", world_mpi_rank, __func__); } @@ -4128,7 +4128,7 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads) if (reported_entry_reads != expected_entry_reads) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: rep/exp entry 0x%" PRIxHADDR " reads mismatch (%d/%d).\n", world_mpi_rank, __func__, addr, reported_entry_reads, expected_entry_reads); @@ -4147,20 +4147,20 @@ verify_entry_reads(haddr_t addr, int expected_entry_reads) * indicated entry has been written since the last time the * server counters were reset. * - * Return TRUE if successful, and if the supplied expected + * Return true if successful, and if the supplied expected * number of reads matches the number of reads reported by * the server process. * - * Return FALSE and flag an error otherwise. + * Return false and flag an error otherwise. * - * Return: TRUE if successful, FALSE otherwise. + * Return: true if successful, false otherwise. * *------------------------------------------------------------------------- */ -static hbool_t +static bool verify_entry_writes(haddr_t addr, int expected_entry_writes) { - hbool_t success = TRUE; + bool success = true; int reported_entry_writes = 0; struct mssg_t mssg; @@ -4177,10 +4177,10 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes) mssg.count = 0; /* not used */ mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4192,7 +4192,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes) if (!recv_mssg(&mssg, REQ_ENTRY_WRITES_RPLY_CODE)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4206,7 +4206,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes) (mssg.magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad data in req entry writes reply.\n", world_mpi_rank, __func__); } @@ -4222,7 +4222,7 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes) if (reported_entry_writes != expected_entry_writes) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: rep/exp entry 0x%llx writes mismatch (%d/%d).\n", world_mpi_rank, __func__, (long long)addr, reported_entry_writes, expected_entry_writes); @@ -4242,19 +4242,19 @@ verify_entry_writes(haddr_t addr, int expected_entry_writes) * server counter reset, and compare this value with the supplied * expected value. * - * If the values match, return TRUE. + * If the values match, return true. * - * If the values don't match, flag an error and return FALSE. + * If the values don't match, flag an error and return false. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool verify_total_reads(int expected_total_reads) { - hbool_t success = TRUE; /* will set to FALSE if appropriate. */ + bool success = true; /* will set to false if appropriate. */ long reported_total_reads; struct mssg_t mssg; @@ -4271,10 +4271,10 @@ verify_total_reads(int expected_total_reads) mssg.count = 0; mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4286,7 +4286,7 @@ verify_total_reads(int expected_total_reads) if (!recv_mssg(&mssg, REQ_TTL_READS_RPLY_CODE)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4296,7 +4296,7 @@ verify_total_reads(int expected_total_reads) (mssg.ver != 0) || (mssg.magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad data in req total reads reply.\n", world_mpi_rank, __func__); } @@ -4312,7 +4312,7 @@ verify_total_reads(int expected_total_reads) if (reported_total_reads != expected_total_reads) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: reported/expected total reads mismatch (%ld/%d).\n", world_mpi_rank, __func__, reported_total_reads, expected_total_reads); @@ -4332,19 +4332,19 @@ verify_total_reads(int expected_total_reads) * server counter reset, and compare this value with the supplied * expected value. * - * If the values match, return TRUE. + * If the values match, return true. * - * If the values don't match, flag an error and return FALSE. + * If the values don't match, flag an error and return false. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool verify_total_writes(unsigned expected_total_writes) { - hbool_t success = TRUE; /* will set to FALSE if appropriate. */ + bool success = true; /* will set to false if appropriate. */ unsigned reported_total_writes; struct mssg_t mssg; @@ -4361,10 +4361,10 @@ verify_total_writes(unsigned expected_total_writes) mssg.count = 0; mssg.magic = MSSG_MAGIC; - if (!send_mssg(&mssg, FALSE)) { + if (!send_mssg(&mssg, false)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: send_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4376,7 +4376,7 @@ verify_total_writes(unsigned expected_total_writes) if (!recv_mssg(&mssg, REQ_TTL_WRITES_RPLY_CODE)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: recv_mssg() failed.\n", world_mpi_rank, __func__); } @@ -4386,7 +4386,7 @@ verify_total_writes(unsigned expected_total_writes) (mssg.ver != 0) || (mssg.magic != MSSG_MAGIC)) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: Bad data in req total reads reply.\n", world_mpi_rank, __func__); } @@ -4402,7 +4402,7 @@ verify_total_writes(unsigned expected_total_writes) if (reported_total_writes != expected_total_writes) { nerrors++; - success = FALSE; + success = false; if (verbose) { fprintf(stdout, "%d:%s: reported/expected total writes mismatch (%u/%u).\n", world_mpi_rank, __func__, reported_total_writes, expected_total_writes); @@ -4446,7 +4446,7 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags) if (dirtied) { (entry_ptr->ver)++; - entry_ptr->dirty = TRUE; + entry_ptr->dirty = true; } result = H5AC_unprotect(file_ptr, &(types[0]), entry_ptr->base_addr, (void *)(&(entry_ptr->header)), @@ -4464,7 +4464,7 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags) } else { - entry_ptr->locked = FALSE; + entry_ptr->locked = false; } assert(((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE); @@ -4492,7 +4492,7 @@ unlock_entry(H5F_t *file_ptr, int32_t idx, unsigned int flags) * *****************************************************************************/ static void -unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t via_unprotect) +unpin_entry(H5F_t *file_ptr, int32_t idx, bool global, bool dirty, bool via_unprotect) { herr_t result; unsigned int flags = H5AC__UNPIN_ENTRY_FLAG; @@ -4544,11 +4544,11 @@ unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t if (global) { - entry_ptr->global_pinned = FALSE; + entry_ptr->global_pinned = false; } else { - entry_ptr->local_pinned = FALSE; + entry_ptr->local_pinned = false; } } @@ -4566,15 +4566,15 @@ unpin_entry(H5F_t *file_ptr, int32_t idx, hbool_t global, hbool_t dirty, hbool_t * * Purpose: Quick smoke check for the server process. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool server_smoke_check(void) { - hbool_t success = TRUE; + bool success = true; int max_nerrors; struct mssg_t mssg; @@ -4611,7 +4611,7 @@ server_smoke_check(void) mssg.count = 0; mssg.magic = MSSG_MAGIC; - if (!(success = send_mssg(&mssg, FALSE))) { + if (!(success = send_mssg(&mssg, false))) { nerrors++; if (verbose) { @@ -4643,7 +4643,7 @@ server_smoke_check(void) (mssg.len != data[world_mpi_rank].len) || (mssg.ver != data[world_mpi_rank].ver) || (mssg.magic != MSSG_MAGIC)) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: Bad data in write req ack.\n", world_mpi_rank, __func__); @@ -4658,7 +4658,7 @@ server_smoke_check(void) /* barrier to allow all writes to complete */ if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: barrier 1 failed.\n", world_mpi_rank, __func__); @@ -4689,7 +4689,7 @@ server_smoke_check(void) /* barrier to allow all writes to complete */ if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - success = FALSE; + success = false; nerrors++; if (verbose) { @@ -4710,7 +4710,7 @@ server_smoke_check(void) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -4743,7 +4743,7 @@ server_smoke_check(void) (mssg.len != data[world_mpi_rank].len) || (mssg.ver != data[world_mpi_rank].ver) || (mssg.magic != MSSG_MAGIC)) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: Bad data in read req reply.\n", world_mpi_rank, __func__); @@ -4754,7 +4754,7 @@ server_smoke_check(void) /* barrier to allow all writes to complete */ if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - success = FALSE; + success = false; nerrors++; if (verbose) { fprintf(stdout, "%d:%s: barrier 3 failed.\n", world_mpi_rank, __func__); @@ -4784,7 +4784,7 @@ server_smoke_check(void) if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - success = FALSE; + success = false; nerrors++; if (verbose) { @@ -4800,7 +4800,7 @@ server_smoke_check(void) if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - success = FALSE; + success = false; nerrors++; if (verbose) { @@ -4831,7 +4831,7 @@ server_smoke_check(void) if (MPI_SUCCESS != MPI_Barrier(file_mpi_comm)) { - success = FALSE; + success = false; nerrors++; if (verbose) { @@ -4852,7 +4852,7 @@ server_smoke_check(void) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -4891,15 +4891,15 @@ server_smoke_check(void) * * Purpose: First smoke check for the parallel cache. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_1(int metadata_write_strategy) { - hbool_t success = TRUE; + bool success = true; int i; int max_nerrors; hid_t fid = -1; @@ -5011,7 +5011,7 @@ smoke_check_1(int metadata_write_strategy) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -5053,15 +5053,15 @@ smoke_check_1(int metadata_write_strategy) * Introduce random reads, but keep all processes with roughly * the same work load. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_2(int metadata_write_strategy) { - hbool_t success = TRUE; + bool success = true; int i; int max_nerrors; hid_t fid = -1; @@ -5129,10 +5129,10 @@ smoke_check_2(int metadata_write_strategy) for (i = 0; i < (virt_num_data_entries / 2); i += 61) { /* Make sure we don't step on any locally pinned entries */ if (data[i].local_pinned) { - unpin_entry(file_ptr, i, FALSE, FALSE, FALSE); + unpin_entry(file_ptr, i, false, false, false); } - pin_entry(file_ptr, i, TRUE, FALSE); + pin_entry(file_ptr, i, true, false); } for (i = (virt_num_data_entries / 2) - 1; i >= 0; i -= 2) { @@ -5149,7 +5149,7 @@ smoke_check_2(int metadata_write_strategy) } /* we can't move pinned entries, so release any local pins now. */ - local_unpin_all_entries(file_ptr, FALSE); + local_unpin_all_entries(file_ptr, false); /* Move the first half of the entries... */ for (i = 0; i < (virt_num_data_entries / 2); i++) { @@ -5168,10 +5168,10 @@ smoke_check_2(int metadata_write_strategy) } for (i = 0; i < (virt_num_data_entries / 2); i += 61) { - hbool_t via_unprotect = ((((unsigned)i) & 0x01) == 0); - hbool_t dirty = ((((unsigned)i) & 0x02) == 0); + bool via_unprotect = ((((unsigned)i) & 0x01) == 0); + bool dirty = ((((unsigned)i) & 0x02) == 0); - unpin_entry(file_ptr, i, TRUE, dirty, via_unprotect); + unpin_entry(file_ptr, i, true, dirty, via_unprotect); } if (fid >= 0) { @@ -5207,7 +5207,7 @@ smoke_check_2(int metadata_write_strategy) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -5252,15 +5252,15 @@ smoke_check_2(int metadata_write_strategy) * In this test, load process 0 heavily, and the other * processes lightly. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_3(int metadata_write_strategy) { - hbool_t success = TRUE; + bool success = true; int i; int max_nerrors; int min_count; @@ -5341,13 +5341,13 @@ smoke_check_3(int metadata_write_strategy) if (i % 59 == 0) { - hbool_t dirty = ((i % 2) == 0); + bool dirty = ((i % 2) == 0); if (data[i].local_pinned) { - unpin_entry(file_ptr, i, FALSE, FALSE, FALSE); + unpin_entry(file_ptr, i, false, false, false); } - pin_entry(file_ptr, i, TRUE, dirty); + pin_entry(file_ptr, i, true, dirty); assert(!dirty || data[i].header.is_dirty); assert(data[i].header.is_pinned); @@ -5384,13 +5384,13 @@ smoke_check_3(int metadata_write_strategy) for (i = (virt_num_data_entries / 2) - 1; i >= 0; i--) { if ((i >= (virt_num_data_entries / 4)) && (i % 59 == 0)) { - hbool_t via_unprotect = ((((unsigned)i) & 0x02) == 0); - hbool_t dirty = ((((unsigned)i) & 0x04) == 0); + bool via_unprotect = ((((unsigned)i) & 0x02) == 0); + bool dirty = ((((unsigned)i) & 0x04) == 0); assert(data[i].global_pinned); assert(!data[i].local_pinned); - unpin_entry(file_ptr, i, TRUE, dirty, via_unprotect); + unpin_entry(file_ptr, i, true, dirty, via_unprotect); } if (i % 2 == 0) { @@ -5415,7 +5415,7 @@ smoke_check_3(int metadata_write_strategy) } /* we can't move pinned entries, so release any local pins now. */ - local_unpin_all_entries(file_ptr, FALSE); + local_unpin_all_entries(file_ptr, false); min_count = 10 / (file_mpi_rank + 1); max_count = min_count + 100; @@ -5455,7 +5455,7 @@ smoke_check_3(int metadata_write_strategy) } /* release any local pins before we take down the cache. */ - local_unpin_all_entries(file_ptr, FALSE); + local_unpin_all_entries(file_ptr, false); if (fid >= 0) { @@ -5490,7 +5490,7 @@ smoke_check_3(int metadata_write_strategy) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -5535,15 +5535,15 @@ smoke_check_3(int metadata_write_strategy) * In this test, load process 0 lightly, and the other * processes heavily. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_4(int metadata_write_strategy) { - hbool_t success = TRUE; + bool success = true; int i; int max_nerrors; int min_count; @@ -5631,18 +5631,18 @@ smoke_check_4(int metadata_write_strategy) * entries are in fact pinned (which unpin_entry() should do). */ insert_entry(cache_ptr, file_ptr, i, H5C__PIN_ENTRY_FLAG); - unpin_entry(file_ptr, i, TRUE, FALSE, FALSE); + unpin_entry(file_ptr, i, true, false, false); } if (i % 59 == 0) { - hbool_t dirty = ((i % 2) == 0); + bool dirty = ((i % 2) == 0); if (data[i].local_pinned) { - unpin_entry(file_ptr, i, FALSE, FALSE, FALSE); + unpin_entry(file_ptr, i, false, false, false); } - pin_entry(file_ptr, i, TRUE, dirty); + pin_entry(file_ptr, i, true, dirty); assert(!dirty || data[i].header.is_dirty); assert(data[i].header.is_pinned); @@ -5675,13 +5675,13 @@ smoke_check_4(int metadata_write_strategy) for (i = (virt_num_data_entries / 2) - 1; i >= 0; i--) { if ((i >= (virt_num_data_entries / 4)) && (i % 59 == 0)) { - hbool_t via_unprotect = ((((unsigned)i) & 0x02) == 0); - hbool_t dirty = ((((unsigned)i) & 0x04) == 0); + bool via_unprotect = ((((unsigned)i) & 0x02) == 0); + bool dirty = ((((unsigned)i) & 0x04) == 0); assert(data[i].global_pinned); assert(!data[i].local_pinned); - unpin_entry(file_ptr, i, TRUE, dirty, via_unprotect); + unpin_entry(file_ptr, i, true, dirty, via_unprotect); } if (i % 2 == 0) { @@ -5702,7 +5702,7 @@ smoke_check_4(int metadata_write_strategy) } /* we can't move pinned entries, so release any local pins now. */ - local_unpin_all_entries(file_ptr, FALSE); + local_unpin_all_entries(file_ptr, false); min_count = 10 * (file_mpi_rank % 4); max_count = min_count + 100; @@ -5772,7 +5772,7 @@ smoke_check_4(int metadata_write_strategy) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -5812,15 +5812,15 @@ smoke_check_4(int metadata_write_strategy) * Purpose: Similar to smoke check 1, but modified to verify that * H5AC_mark_entry_dirty() works in the parallel case. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_5(int metadata_write_strategy) { - hbool_t success = TRUE; + bool success = true; int i; int max_nerrors; hid_t fid = -1; @@ -5910,7 +5910,7 @@ smoke_check_5(int metadata_write_strategy) } for (i = (virt_num_data_entries / 2) - 1; i >= (virt_num_data_entries / 4); i--) { - pin_entry(file_ptr, i, TRUE, FALSE); + pin_entry(file_ptr, i, true, false); if (i % 2 == 0) { if (i % 8 <= 4) { @@ -5926,7 +5926,7 @@ smoke_check_5(int metadata_write_strategy) } } - unpin_entry(file_ptr, i, TRUE, FALSE, FALSE); + unpin_entry(file_ptr, i, true, false, false); } if (fid >= 0) { @@ -5962,7 +5962,7 @@ smoke_check_5(int metadata_write_strategy) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -6025,15 +6025,15 @@ smoke_check_5(int metadata_write_strategy) * - H5AC_expunge_entry() * - H5AC_resize_entry() * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool trace_file_check(int metadata_write_strategy) { - hbool_t success = TRUE; + bool success = true; const char *((*expected_output)[]) = NULL; const char *expected_output_0[] = {"### HDF5 metadata cache trace file version 1 ###\n", @@ -6090,7 +6090,7 @@ trace_file_check(int metadata_write_strategy) NULL}; char buffer[256]; char trace_file_name[64]; - hbool_t done = FALSE; + bool done = false; int i; int max_nerrors; size_t expected_line_len; @@ -6168,7 +6168,7 @@ trace_file_check(int metadata_write_strategy) __func__); } else { - config.open_trace_file = TRUE; + config.open_trace_file = true; strcpy(config.trace_file_name, "t_cache_trace.txt"); if (H5AC_set_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) { @@ -6189,19 +6189,19 @@ trace_file_check(int metadata_write_strategy) unlock_entry(file_ptr, 0, H5AC__NO_FLAGS_SET); lock_entry(file_ptr, 1); - pin_protected_entry(1, TRUE); + pin_protected_entry(1, true); unlock_entry(file_ptr, 1, H5AC__NO_FLAGS_SET); - unpin_entry(file_ptr, 1, TRUE, FALSE, FALSE); + unpin_entry(file_ptr, 1, true, false, false); expunge_entry(file_ptr, 1); lock_entry(file_ptr, 2); - pin_protected_entry(2, TRUE); + pin_protected_entry(2, true); unlock_entry(file_ptr, 2, H5AC__NO_FLAGS_SET); mark_entry_dirty(2); resize_entry(2, data[2].len / 2); resize_entry(2, data[2].len); - unpin_entry(file_ptr, 2, TRUE, FALSE, FALSE); + unpin_entry(file_ptr, 2, true, false, false); move_entry(file_ptr, 0, 20); move_entry(file_ptr, 0, 20); @@ -6221,8 +6221,8 @@ trace_file_check(int metadata_write_strategy) __func__); } else { - config.open_trace_file = FALSE; - config.close_trace_file = TRUE; + config.open_trace_file = false; + config.close_trace_file = true; config.trace_file_name[0] = '\0'; if (H5AC_set_cache_auto_resize_config(cache_ptr, &config) != SUCCEED) { @@ -6263,7 +6263,7 @@ trace_file_check(int metadata_write_strategy) mssg.magic = MSSG_MAGIC; if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { nerrors++; @@ -6301,7 +6301,7 @@ trace_file_check(int metadata_write_strategy) if ((actual_line_len == 0) || (expected_line_len == 0)) { if ((actual_line_len == 0) && (expected_line_len == 0)) { /* Both ran out at the same time - we're done */ - done = TRUE; + done = true; } else { /* One ran out before the other - BADNESS */ @@ -6398,17 +6398,17 @@ trace_file_check(int metadata_write_strategy) * * Purpose: Sixth smoke check for the parallel cache. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_6(int metadata_write_strategy) { H5P_coll_md_read_flag_t md_reads_file_flag; - hbool_t md_reads_context_flag; - hbool_t success = TRUE; + bool md_reads_context_flag; + bool success = true; int i; int max_nerrors; hid_t fid = -1; @@ -6471,7 +6471,7 @@ smoke_check_6(int metadata_write_strategy) /* insert the first half collectively */ md_reads_file_flag = H5P_USER_TRUE; - md_reads_context_flag = TRUE; + md_reads_context_flag = true; H5F_set_coll_metadata_reads(file_ptr, &md_reads_file_flag, &md_reads_context_flag); for (i = 0; i < virt_num_data_entries / 2; i++) { struct datum *entry_ptr; @@ -6479,7 +6479,7 @@ smoke_check_6(int metadata_write_strategy) insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - if (TRUE != entry_ptr->header.coll_access) { + if (true != entry_ptr->header.coll_access) { nerrors++; if (verbose) { fprintf(stdout, "%d:%s: Entry inserted not marked as collective.\n", world_mpi_rank, @@ -6496,7 +6496,7 @@ smoke_check_6(int metadata_write_strategy) /* insert the other half independently */ md_reads_file_flag = H5P_USER_FALSE; - md_reads_context_flag = FALSE; + md_reads_context_flag = false; H5F_set_coll_metadata_reads(file_ptr, &md_reads_file_flag, &md_reads_context_flag); for (i = virt_num_data_entries / 2; i < virt_num_data_entries; i++) { struct datum *entry_ptr; @@ -6504,7 +6504,7 @@ smoke_check_6(int metadata_write_strategy) insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - if (FALSE != entry_ptr->header.coll_access) { + if (false != entry_ptr->header.coll_access) { nerrors++; if (verbose) { fprintf(stdout, "%d:%s: Entry inserted independently marked as collective.\n", @@ -6528,7 +6528,7 @@ smoke_check_6(int metadata_write_strategy) /* Protect the first half of the entries collectively */ md_reads_file_flag = H5P_USER_TRUE; - md_reads_context_flag = TRUE; + md_reads_context_flag = true; H5F_set_coll_metadata_reads(file_ptr, &md_reads_file_flag, &md_reads_context_flag); for (i = 0; i < (virt_num_data_entries / 2); i++) { struct datum *entry_ptr; @@ -6536,7 +6536,7 @@ smoke_check_6(int metadata_write_strategy) lock_entry(file_ptr, i); - if (TRUE != entry_ptr->header.coll_access) { + if (true != entry_ptr->header.coll_access) { nerrors++; if (verbose) { fprintf(stdout, "%d:%s: Entry protected not marked as collective.\n", world_mpi_rank, @@ -6552,7 +6552,7 @@ smoke_check_6(int metadata_write_strategy) /* protect the other half independently */ md_reads_file_flag = H5P_USER_FALSE; - md_reads_context_flag = FALSE; + md_reads_context_flag = false; H5F_set_coll_metadata_reads(file_ptr, &md_reads_file_flag, &md_reads_context_flag); for (i = virt_num_data_entries / 2; i < virt_num_data_entries; i++) { struct datum *entry_ptr; @@ -6560,7 +6560,7 @@ smoke_check_6(int metadata_write_strategy) lock_entry(file_ptr, i); - if (FALSE != entry_ptr->header.coll_access) { + if (false != entry_ptr->header.coll_access) { nerrors++; if (verbose) { fprintf(stdout, "%d:%s: Entry inserted independently marked as collective.\n", @@ -6611,7 +6611,7 @@ smoke_check_6(int metadata_write_strategy) if (success) { - success = send_mssg(&mssg, FALSE); + success = send_mssg(&mssg, false); if (!success) { @@ -6816,7 +6816,7 @@ main(int argc, char **argv) #endif /* enable the collective metadata read property */ if (world_mpi_rank != world_server_mpi_rank) { - if (H5Pset_all_coll_metadata_ops(fapl, TRUE) < 0) { + if (H5Pset_all_coll_metadata_ops(fapl, true) < 0) { nerrors++; if (verbose) { diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index f1f6f5d..d103cf7 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -39,12 +39,11 @@ static void create_data_sets(hid_t file_id, int min_dset, int max_dset); static void delete_data_sets(hid_t file_id, int min_dset, int max_dset); #endif -static void open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, - const hbool_t read_only, const hbool_t set_mdci_fapl, const hbool_t config_fsm, - const hbool_t enable_page_buffer, const char *hdf_file_name, - const unsigned cache_image_flags, hid_t *file_id_ptr, H5F_t **file_ptr_ptr, - H5C_t **cache_ptr_ptr, MPI_Comm comm, MPI_Info info, int l_facc_type, - const hbool_t all_coll_metadata_ops, const hbool_t coll_metadata_write, +static void open_hdf5_file(const bool create_file, const bool mdci_sbem_expected, const bool read_only, + const bool set_mdci_fapl, const bool config_fsm, const bool enable_page_buffer, + const char *hdf_file_name, const unsigned cache_image_flags, hid_t *file_id_ptr, + H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, MPI_Comm comm, MPI_Info info, + int l_facc_type, const bool all_coll_metadata_ops, const bool coll_metadata_write, const int md_write_strat); static void verify_data_sets(hid_t file_id, int min_dset, int max_dset); @@ -56,14 +55,14 @@ static void par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, in static void par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank); static void par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank); -static hbool_t serial_insert_cache_image(int file_name_idx, int mpi_size); -static void serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size); +static bool serial_insert_cache_image(int file_name_idx, int mpi_size); +static void serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size); /* top level test function declarations */ static unsigned verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank); static unsigned verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank); -static hbool_t smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size); +static bool smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size); /****************************************************************************/ /***************************** Utility Functions ****************************/ @@ -129,7 +128,7 @@ construct_test_file(int test_file_index) { const char *fcn_name = "construct_test_file()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -139,7 +138,7 @@ construct_test_file(int test_file_index) MPI_Comm dummy_comm = MPI_COMM_WORLD; MPI_Info dummy_info = MPI_INFO_NULL; - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -151,7 +150,7 @@ construct_test_file(int test_file_index) if (h5_fixname(FILENAMES[test_file_index], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -168,12 +167,12 @@ construct_test_file(int test_file_index) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ TRUE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ true, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -182,8 +181,8 @@ construct_test_file(int test_file_index) /* comm */ dummy_comm, /* info */ dummy_info, /* l_facc_type */ 0, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ 0); } @@ -202,7 +201,7 @@ construct_test_file(int test_file_index) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -217,7 +216,7 @@ construct_test_file(int test_file_index) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -235,12 +234,12 @@ construct_test_file(int test_file_index) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -249,8 +248,8 @@ construct_test_file(int test_file_index) /* comm */ dummy_comm, /* info */ dummy_info, /* l_facc_type */ 0, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ 0); } @@ -269,7 +268,7 @@ construct_test_file(int test_file_index) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(1)."; } } @@ -284,7 +283,7 @@ construct_test_file(int test_file_index) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -302,12 +301,12 @@ construct_test_file(int test_file_index) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -316,8 +315,8 @@ construct_test_file(int test_file_index) /* comm */ dummy_comm, /* info */ dummy_info, /* l_facc_type */ 0, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ 0); } @@ -339,7 +338,7 @@ construct_test_file(int test_file_index) if (cache_ptr->images_loaded == 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -354,7 +353,7 @@ construct_test_file(int test_file_index) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -366,16 +365,16 @@ construct_test_file(int test_file_index) /*------------------------------------------------------------------------- * Function: create_data_sets() * - * Purpose: If pass is TRUE on entry, create the specified data sets + * Purpose: If pass is true on entry, create the specified data sets * in the indicated file. * * Data sets and their contents must be well know, as we * will verify that they contain the expected data later. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -387,9 +386,9 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) { const char *fcn_name = "create_data_sets()"; char dset_name[64]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l, m; int data_chunk[CHUNK_SIZE][CHUNK_SIZE]; @@ -425,7 +424,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (dataspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } @@ -441,7 +440,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (properties < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate() failed."; } } @@ -450,7 +449,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (H5Pset_chunk(properties, 2, chunk_size) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_chunk() failed."; } } @@ -464,7 +463,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (dataset_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dcreate() failed."; } } @@ -476,7 +475,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (filespace_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -497,7 +496,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -516,7 +515,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -547,7 +546,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk H5Sselect_hyperslab() failed."; } @@ -557,7 +556,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dwrite() failed."; } m++; @@ -588,7 +587,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -600,7 +599,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } } @@ -608,13 +607,13 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -630,7 +629,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -654,7 +653,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Sclose(filespace_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose() failed."; } i++; @@ -665,7 +664,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Dclose(dataset_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose() failed."; } i++; @@ -676,7 +675,7 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) if (H5Sclose(memspace_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } } @@ -688,17 +687,17 @@ create_data_sets(hid_t file_id, int min_dset, int max_dset) /*------------------------------------------------------------------------- * Function: delete_data_sets() * - * Purpose: If pass is TRUE on entry, verify and then delete the + * Purpose: If pass is true on entry, verify and then delete the * dataset(s) indicated by min_dset and max_dset in the * indicated file. * * Data sets and their contents must be well know, as we * will verify that they contain the expected data later. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -715,7 +714,7 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset) { const char * fcn_name = "delete_data_sets()"; char dset_name[64]; - hbool_t show_progress = FALSE; + bool show_progress = false; int cp = 0; int i; @@ -743,7 +742,7 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset) if ( H5Ldelete(file_id, dset_name, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Ldelete() failed."; } @@ -765,32 +764,32 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset) * and test to see if it has a metadata cache image superblock * extension message. * - * Set pass to FALSE and issue a suitable failure + * Set pass to false and issue a suitable failure * message if either the file contains a metadata cache image - * superblock extension and mdci_sbem_expected is TRUE, or + * superblock extension and mdci_sbem_expected is true, or * vice versa. * - * If mdci_sbem_expected is TRUE, also verify that the metadata + * If mdci_sbem_expected is true, also verify that the metadata * cache has been advised of this. * - * If read_only is TRUE, open the file read only. Otherwise + * If read_only is true, open the file read only. Otherwise * open the file read/write. * - * If set_mdci_fapl is TRUE, set the metadata cache image + * If set_mdci_fapl is true, set the metadata cache image * FAPL entry when opening the file, and verify that the * metadata cache is notified. * - * If config_fsm is TRUE, setup the persistent free space + * If config_fsm is true, setup the persistent free space * manager. Note that this flag may only be set if - * create_file is also TRUE. + * create_file is also true. * * Return pointers to the cache data structure and file data * structures. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -798,16 +797,15 @@ delete_data_sets(hid_t file_id, int min_dset, int max_dset) */ static void -open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, const hbool_t read_only, - const hbool_t set_mdci_fapl, const hbool_t config_fsm, const hbool_t enable_page_buffer, +open_hdf5_file(const bool create_file, const bool mdci_sbem_expected, const bool read_only, + const bool set_mdci_fapl, const bool config_fsm, const bool enable_page_buffer, const char *hdf_file_name, const unsigned cache_image_flags, hid_t *file_id_ptr, H5F_t **file_ptr_ptr, H5C_t **cache_ptr_ptr, MPI_Comm comm, MPI_Info info, int l_facc_type, - const hbool_t all_coll_metadata_ops, const hbool_t coll_metadata_write, - const int md_write_strat) + const bool all_coll_metadata_ops, const bool coll_metadata_write, const int md_write_strat) { const char *fcn_name = "open_hdf5_file()"; - hbool_t show_progress = FALSE; - hbool_t verbose = FALSE; + bool show_progress = false; + bool verbose = false; int cp = 0; hid_t fapl_id = -1; hid_t fcpl_id = -1; @@ -816,7 +814,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; H5C_cache_image_ctl_t image_ctl; - H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, + H5AC_cache_image_config_t cache_image_config = {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE}; assert(!create_file || config_fsm); @@ -835,7 +833,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons failure_mssg = "Bad param(s) on entry to open_hdf5_file().\n"; - pass = FALSE; + pass = false; } else if (verbose) { @@ -853,7 +851,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (fapl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate() failed.\n"; } } @@ -866,7 +864,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_libver_bounds() failed.\n"; } } @@ -881,16 +879,16 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_image_config() failed.\n"; } if ((cache_image_config.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (cache_image_config.generate_image != FALSE) || - (cache_image_config.save_resize_status != FALSE) || + (cache_image_config.generate_image != false) || + (cache_image_config.save_resize_status != false) || (cache_image_config.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected default cache image config.\n"; } } @@ -902,15 +900,15 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if ((pass) && (set_mdci_fapl)) { /* set cache image config fields to taste */ - cache_image_config.generate_image = TRUE; - cache_image_config.save_resize_status = FALSE; + cache_image_config.generate_image = true; + cache_image_config.save_resize_status = false; cache_image_config.entry_ageout = H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE; result = H5Pset_mdc_image_config(fapl_id, &cache_image_config); if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_image_config() failed.\n"; } } @@ -925,15 +923,15 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (fcpl_id <= 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed."; } } if ((pass) && (config_fsm)) { - if (H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) == FAIL) { - pass = FALSE; + if (H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) == FAIL) { + pass = false; failure_mssg = "H5Pset_file_space_strategy() failed.\n"; } } @@ -942,7 +940,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pset_file_space_page_size(fcpl_id, PAGE_SIZE) == FAIL) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_file_space_page_size() failed.\n"; } } @@ -955,7 +953,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pset_page_buffer_size(fapl_id, PB_SIZE, 0, 0) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_page_buffer_size() failed.\n"; } } @@ -968,7 +966,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons /* set Parallel access with communicator */ if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_fapl_mpio() failed.\n"; } } @@ -980,7 +978,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pset_all_coll_metadata_ops(fapl_id, all_coll_metadata_ops) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_all_coll_metadata_ops() failed.\n"; } } @@ -992,7 +990,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pset_coll_metadata_write(fapl_id, coll_metadata_write) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_coll_metadata_write() failed.\n"; } } @@ -1009,7 +1007,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pget_mdc_config(fapl_id, &mdc_config) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget_mdc_config() failed.\n"; } @@ -1017,7 +1015,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5Pset_mdc_config(fapl_id, &mdc_config) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_mdc_config() failed.\n"; } } @@ -1050,7 +1048,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (file_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() or H5Fopen() failed.\n"; } else { @@ -1059,7 +1057,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; if (verbose) { @@ -1079,7 +1077,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (file_ptr->shared->cache == NULL) { - pass = FALSE; + pass = false; failure_mssg = "can't get cache pointer(1).\n"; } else { @@ -1099,13 +1097,13 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if ((file_ptr->shared->page_buf) && ((!enable_page_buffer) || (l_facc_type == FACC_MPIO))) { - pass = FALSE; + pass = false; failure_mssg = "page buffer unexpectedly enabled."; } else if ((file_ptr->shared->page_buf != NULL) && ((enable_page_buffer) || (l_facc_type != FACC_MPIO))) { - pass = FALSE; + pass = false; failure_mssg = "page buffer unexpectedly disabled."; } } @@ -1124,7 +1122,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5C__get_cache_image_config(cache_ptr, &image_ctl) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error returned by H5C__get_cache_image_config()."; } } @@ -1139,22 +1137,22 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (read_only) { if ((image_ctl.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (image_ctl.generate_image != FALSE) || (image_ctl.save_resize_status != FALSE) || + (image_ctl.generate_image != false) || (image_ctl.save_resize_status != false) || (image_ctl.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE) || (image_ctl.flags != H5C_CI__ALL_FLAGS)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected image_ctl values(1).\n"; } } else { if ((image_ctl.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (image_ctl.generate_image != TRUE) || (image_ctl.save_resize_status != FALSE) || + (image_ctl.generate_image != true) || (image_ctl.save_resize_status != false) || (image_ctl.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE) || (image_ctl.flags != H5C_CI__ALL_FLAGS)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected image_ctl values(2).\n"; } } @@ -1162,11 +1160,11 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons else { if ((image_ctl.version != H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION) || - (image_ctl.generate_image != FALSE) || (image_ctl.save_resize_status != FALSE) || + (image_ctl.generate_image != false) || (image_ctl.save_resize_status != false) || (image_ctl.entry_ageout != H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE) || (image_ctl.flags != H5C_CI__ALL_FLAGS)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected image_ctl values(3).\n"; } } @@ -1181,7 +1179,7 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (H5C_set_cache_image_config(file_ptr, cache_ptr, &image_ctl) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error returned by H5C_set_cache_image_config()."; } } @@ -1191,9 +1189,9 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (pass) { - if (cache_ptr->close_warning_received == TRUE) { + if (cache_ptr->close_warning_received == true) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value of close_warning_received.\n"; } @@ -1201,26 +1199,26 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons if (read_only) { - if ((cache_ptr->load_image != TRUE) || (cache_ptr->delete_image != FALSE)) { + if ((cache_ptr->load_image != true) || (cache_ptr->delete_image != false)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message not present?\n"; } } else { - if ((cache_ptr->load_image != TRUE) || (cache_ptr->delete_image != TRUE)) { + if ((cache_ptr->load_image != true) || (cache_ptr->delete_image != true)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message not present?\n"; } } } else { - if ((cache_ptr->load_image == TRUE) || (cache_ptr->delete_image == TRUE)) { + if ((cache_ptr->load_image == true) || (cache_ptr->delete_image == true)) { - pass = FALSE; + pass = false; failure_mssg = "mdci sb extension message present?\n"; } } @@ -1253,10 +1251,10 @@ open_hdf5_file(const hbool_t create_file, const hbool_t mdci_sbem_expected, cons * Purpose: Collectively create a chunked dataset, and fill it with * known values. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -1268,9 +1266,9 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) { const char *fcn_name = "par_create_dataset()"; char dset_name[256]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l; int data_chunk[1][CHUNK_SIZE][CHUNK_SIZE]; @@ -1306,7 +1304,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (dataspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -1324,7 +1322,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (dcpl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_DATASET_CREATE) failed."; } } @@ -1340,7 +1338,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (H5Pset_chunk(dcpl_id, 3, chunk_size) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_chunk() failed."; } } @@ -1356,7 +1354,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (dset_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dcreate() failed."; } } @@ -1371,7 +1369,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (filespace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -1389,7 +1387,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -1410,7 +1408,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -1425,7 +1423,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (dxpl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_DATASET_XFER) failed."; } } @@ -1437,7 +1435,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_dxpl_mpio() failed."; } } @@ -1476,7 +1474,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk H5Sselect_hyperslab() failed."; } @@ -1488,7 +1486,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dwrite() failed."; } @@ -1522,7 +1520,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -1533,7 +1531,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "chunk read failed."; } } @@ -1541,13 +1539,13 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[0][k][l] != ((DSET_SIZE * DSET_SIZE * mpi_rank) + (DSET_SIZE * (i + k)) + j + l + dset_num)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -1564,7 +1562,7 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -1584,42 +1582,42 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) /* close the data space */ if ((pass) && (H5Sclose(dataspace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(dataspace_id) failed."; } /* close the file space */ if ((pass) && (H5Sclose(filespace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace_id) failed."; } /* close the dataset */ if ((pass) && (H5Dclose(dset_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id) failed."; } /* close the mem space */ if ((pass) && (H5Sclose(memspace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } /* close the dataset creation property list */ if ((pass) && (H5Pclose(dcpl_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(dcpl) failed."; } /* close the data access property list */ if ((pass) && (H5Pclose(dxpl_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(dxpl) failed."; } @@ -1635,10 +1633,10 @@ par_create_dataset(int dset_num, hid_t file_id, int mpi_rank, int mpi_size) * * Purpose: Collectively delete the specified dataset. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -1650,7 +1648,7 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank) { const char *fcn_name = "par_delete_dataset()"; char dset_name[256]; - hbool_t show_progress = FALSE; + bool show_progress = false; int cp = 0; show_progress = (show_progress && (mpi_rank == 0)); @@ -1676,7 +1674,7 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank) if (H5Ldelete(file_id, dset_name, H5P_DEFAULT) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Ldelete() failed."; } } @@ -1699,10 +1697,10 @@ par_delete_dataset(int dset_num, hid_t file_id, int mpi_rank) * All processes wait until the child process completes, and * then return. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -1741,10 +1739,10 @@ par_insert_cache_image(int file_name_idx, int mpi_rank, int mpi_size) * * Purpose: Collectively verify the contents of a chunked dataset. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -1756,9 +1754,9 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) { const char *fcn_name = "par_verify_dataset()"; char dset_name[256]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l; int data_chunk[1][CHUNK_SIZE][CHUNK_SIZE]; @@ -1789,7 +1787,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (dset_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dopen2() failed."; } } @@ -1801,7 +1799,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (filespace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -1819,7 +1817,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -1840,7 +1838,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -1855,7 +1853,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (dxpl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_DATASET_XFER) failed."; } } @@ -1867,7 +1865,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_dxpl_mpio() failed."; } } @@ -1892,7 +1890,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -1903,7 +1901,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "chunk read failed."; } } @@ -1911,13 +1909,13 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[0][k][l] != ((DSET_SIZE * DSET_SIZE * mpi_rank) + (DSET_SIZE * (i + k)) + j + l + dset_num)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -1934,7 +1932,7 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -1954,28 +1952,28 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) /* close the file space */ if ((pass) && (H5Sclose(filespace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace_id) failed."; } /* close the dataset */ if ((pass) && (H5Dclose(dset_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id) failed."; } /* close the mem space */ if ((pass) && (H5Sclose(memspace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } /* close the data access property list */ if ((pass) && (H5Pclose(dxpl_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(dxpl) failed."; } @@ -1995,19 +1993,19 @@ par_verify_dataset(int dset_num, hid_t file_id, int mpi_rank) * of the file before closing. * * On failure, print an appropriate error message and - * return FALSE. + * return false. * - * Return: TRUE if succussful, FALSE otherwise. + * Return: true if succussful, false otherwise. * *------------------------------------------------------------------------- */ -static hbool_t +static bool serial_insert_cache_image(int file_name_idx, int mpi_size) { const char *fcn_name = "serial_insert_cache_image()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; int cp = 0; int i; int num_dsets = PAR_NUM_DSETS; @@ -2017,7 +2015,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) MPI_Comm dummy_comm = MPI_COMM_WORLD; MPI_Info dummy_info = MPI_INFO_NULL; - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -2029,7 +2027,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) if (h5_fixname(FILENAMES[file_name_idx], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; fprintf(stdout, "h5_fixname() failed.\n"); } } @@ -2042,12 +2040,12 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ TRUE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ true, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -2056,8 +2054,8 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) /* comm */ dummy_comm, /* info */ dummy_info, /* l_facc_type */ 0, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ 1); } @@ -2082,7 +2080,7 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2099,10 +2097,10 @@ serial_insert_cache_image(int file_name_idx, int mpi_size) * * Purpose: Verify the contents of a chunked dataset. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2114,9 +2112,9 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) { const char *fcn_name = "serial_verify_dataset()"; char dset_name[256]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l, m; int data_chunk[1][CHUNK_SIZE][CHUNK_SIZE]; @@ -2143,7 +2141,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (dset_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dopen2() failed."; } } @@ -2155,7 +2153,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (filespace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -2173,7 +2171,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -2194,7 +2192,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -2221,7 +2219,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -2233,7 +2231,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "chunk read failed."; } } @@ -2241,14 +2239,14 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (l = 0; l < CHUNK_SIZE; l++) { for (m = 0; m < CHUNK_SIZE; m++) { if (data_chunk[0][l][m] != ((DSET_SIZE * DSET_SIZE * i) + (DSET_SIZE * (j + l)) + k + m + dset_num)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -2265,7 +2263,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -2287,21 +2285,21 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) /* close the file space */ if ((pass) && (H5Sclose(filespace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace_id) failed."; } /* close the dataset */ if ((pass) && (H5Dclose(dset_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id) failed."; } /* close the mem space */ if ((pass) && (H5Sclose(memspace_id) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } @@ -2315,7 +2313,7 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) /*------------------------------------------------------------------------- * Function: verify_data_sets() * - * Purpose: If pass is TRUE on entry, verify that the data sets in the + * Purpose: If pass is true on entry, verify that the data sets in the * file exist and contain the expected data. * * Note that these data sets were created by @@ -2323,10 +2321,10 @@ serial_verify_dataset(int dset_num, hid_t file_id, int mpi_size) * function must be reflected in this function, and * vise-versa. * - * On failure, set pass to FALSE, and set failure_mssg + * On failure, set pass to false, and set failure_mssg * to point to an appropriate failure message. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2338,9 +2336,9 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) { const char *fcn_name = "verify_data_sets()"; char dset_name[64]; - hbool_t show_progress = FALSE; - hbool_t valid_chunk; - hbool_t verbose = FALSE; + bool show_progress = false; + bool valid_chunk; + bool verbose = false; int cp = 0; int i, j, k, l, m; int data_chunk[CHUNK_SIZE][CHUNK_SIZE]; @@ -2374,7 +2372,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (dataset_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dopen2() failed."; } } @@ -2386,7 +2384,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (filespace_ids[i] < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space() failed."; } } @@ -2407,7 +2405,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (memspace_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple() failed."; } } @@ -2426,7 +2424,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed."; } } @@ -2451,7 +2449,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } @@ -2463,7 +2461,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (status < 0) { - pass = FALSE; + pass = false; failure_mssg = "disk hyperslab create failed."; } } @@ -2471,13 +2469,13 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) /* validate the slab */ if (pass) { - valid_chunk = TRUE; + valid_chunk = true; for (k = 0; k < CHUNK_SIZE; k++) { for (l = 0; l < CHUNK_SIZE; l++) { if (data_chunk[k][l] != ((DSET_SIZE * DSET_SIZE * m) + (DSET_SIZE * (i + k)) + j + l)) { - valid_chunk = FALSE; + valid_chunk = false; if (verbose) { @@ -2493,7 +2491,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (!valid_chunk) { - pass = FALSE; + pass = false; failure_mssg = "slab validation failed."; if (verbose) { @@ -2517,7 +2515,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Sclose(filespace_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose() failed."; } i++; @@ -2528,7 +2526,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) while ((pass) && (i <= max_dset)) { if (H5Dclose(dataset_ids[i]) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose() failed."; } i++; @@ -2539,7 +2537,7 @@ verify_data_sets(hid_t file_id, int min_dset, int max_dset) if (H5Sclose(memspace_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace_id) failed."; } } @@ -2592,13 +2590,13 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) { const char *fcn_name = "verify_cache_image_RO()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; int cp = 0; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -2614,7 +2612,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) default: TESTING("parallel CI load test -- unknown md write -- R/o"); - pass = FALSE; + pass = false; break; } } @@ -2629,7 +2627,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (h5_fixname(FILENAMES[file_name_id], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -2644,12 +2642,12 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -2658,8 +2656,8 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) /* comm */ MPI_COMM_WORLD, /* info */ MPI_INFO_NULL, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ md_write_strat); } @@ -2686,7 +2684,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (((mpi_rank == 0) && (cache_ptr->images_read != 1)) || ((mpi_rank > 0) && (cache_ptr->images_read != 0))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected images_read."; } } @@ -2707,7 +2705,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "Image not loaded?."; } } @@ -2722,7 +2720,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2734,12 +2732,12 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -2748,8 +2746,8 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) /* comm */ MPI_COMM_WORLD, /* info */ MPI_INFO_NULL, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ md_write_strat); } @@ -2768,7 +2766,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block not loaded(2)."; } } @@ -2780,7 +2778,7 @@ verify_cache_image_RO(int file_name_id, int md_write_strat, int mpi_rank) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2852,13 +2850,13 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) { const char *fcn_name = "verify_cache_imageRW()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; int cp = 0; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -2874,7 +2872,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) default: TESTING("parallel CI load test -- unknown md write -- R/W"); - pass = FALSE; + pass = false; break; } } @@ -2889,7 +2887,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (h5_fixname(FILENAMES[file_name_id], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -2909,12 +2907,12 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -2923,8 +2921,8 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) /* comm */ MPI_COMM_WORLD, /* info */ MPI_INFO_NULL, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ md_write_strat); } @@ -2950,7 +2948,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (((mpi_rank == 0) && (cache_ptr->images_read != 1)) || ((mpi_rank > 0) && (cache_ptr->images_read != 0))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected images_read."; } } @@ -2971,7 +2969,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "Image not loaded?."; } } @@ -2986,7 +2984,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -2998,12 +2996,12 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3012,8 +3010,8 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) /* comm */ MPI_COMM_WORLD, /* info */ MPI_INFO_NULL, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ FALSE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ false, /* md_write_strat */ md_write_strat); } @@ -3032,7 +3030,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (cache_ptr->images_loaded != 0) { - pass = FALSE; + pass = false; failure_mssg = "metadata cache image block loaded(1)."; } } @@ -3044,7 +3042,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3061,7 +3059,7 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) if ((mpi_rank == 0) && (HDremove(filename) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -3104,17 +3102,17 @@ verify_cache_image_RW(int file_name_id, int md_write_strat, int mpi_rank) * of the test will have to be re-worked when and if page * buffering is supported in parallel. * - * Return: Success: TRUE + * Return: Success: true * - * Failure: FALSE + * Failure: false * *****************************************************************************/ -static hbool_t +static bool smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) { const char *fcn_name = "smoke_check_1()"; char filename[512]; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t file_id = -1; H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -3124,7 +3122,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) int test_file_index = 2; h5_stat_size_t file_size; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -3141,7 +3139,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (h5_fixname(FILENAMES[test_file_index], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -3156,12 +3154,12 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (pass) { - open_hdf5_file(/* create_file */ TRUE, - /* mdci_sbem_expected */ FALSE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ TRUE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ true, + /* mdci_sbem_expected */ false, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ true, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3170,8 +3168,8 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) /* comm */ mpi_comm, /* info */ mpi_info, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ TRUE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ true, /* md_write_strat */ 1); } @@ -3205,7 +3203,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed.\n"; } } @@ -3227,12 +3225,12 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ TRUE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ true, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3241,8 +3239,8 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) /* comm */ mpi_comm, /* info */ mpi_info, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ TRUE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ true, /* md_write_strat */ 1); } @@ -3274,7 +3272,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (((mpi_rank == 0) && (cache_ptr->images_read != 1)) || ((mpi_rank > 0) && (cache_ptr->images_read != 0))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected images_read."; } } @@ -3295,7 +3293,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "Image not loaded?."; } } @@ -3310,7 +3308,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed."; } } @@ -3322,12 +3320,12 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (pass) { - open_hdf5_file(/* create_file */ FALSE, - /* mdci_sbem_expected */ TRUE, - /* read_only */ FALSE, - /* set_mdci_fapl */ FALSE, - /* config_fsm */ FALSE, - /* enable_page_buffer */ FALSE, + open_hdf5_file(/* create_file */ false, + /* mdci_sbem_expected */ true, + /* read_only */ false, + /* set_mdci_fapl */ false, + /* config_fsm */ false, + /* enable_page_buffer */ false, /* hdf_file_name */ filename, /* cache_image_flags */ H5C_CI__ALL_FLAGS, /* file_id_ptr */ &file_id, @@ -3336,8 +3334,8 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) /* comm */ mpi_comm, /* info */ mpi_info, /* l_facc_type */ FACC_MPIO, - /* all_coll_metadata_ops */ FALSE, - /* coll_metadata_write */ TRUE, + /* all_coll_metadata_ops */ false, + /* coll_metadata_write */ true, /* md_write_strat */ 1); } @@ -3369,7 +3367,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (((mpi_rank == 0) && (cache_ptr->images_read != 1)) || ((mpi_rank > 0) && (cache_ptr->images_read != 0))) { - pass = FALSE; + pass = false; failure_mssg = "unexpected images_read."; } } @@ -3390,7 +3388,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (cache_ptr->images_loaded != 1) { - pass = FALSE; + pass = false; failure_mssg = "Image not loaded?."; } } @@ -3417,7 +3415,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose() failed."; } } @@ -3438,12 +3436,12 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if ((file_size = h5_get_file_size(filename, H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "h5_get_file_size() failed."; } else if (file_size > 20 * 1024) { - pass = FALSE; + pass = false; failure_mssg = "unexpectedly large file size."; } } @@ -3460,7 +3458,7 @@ smoke_check_1(MPI_Comm mpi_comm, MPI_Info mpi_info, int mpi_rank, int mpi_size) if ((mpi_rank == 0) && (HDremove(filename) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } diff --git a/testpar/t_dset.c b/testpar/t_dset.c index f328bea..789d9a0 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -2902,10 +2902,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; @@ -3444,8 +3444,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; @@ -3827,7 +3827,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; @@ -3907,7 +3907,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"); @@ -3930,7 +3930,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) */ @@ -3951,7 +3951,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); @@ -4021,11 +4021,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/t_file.c b/testpar/t_file.c index 55a9d6e..67e6999 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -129,7 +129,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); @@ -160,7 +160,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); @@ -190,7 +190,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); @@ -199,7 +199,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); @@ -288,9 +288,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; } } @@ -300,7 +300,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); @@ -309,7 +309,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); @@ -422,9 +422,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); @@ -449,7 +449,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); @@ -461,14 +461,14 @@ 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), ""); cache_ptr = f->shared->cache; - cache_ptr->ignore_tags = TRUE; + cache_ptr->ignore_tags = true; H5C_stats__reset(cache_ptr); config.version = H5AC__CURR_CACHE_CONFIG_VERSION; @@ -577,9 +577,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); @@ -605,7 +605,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; @@ -624,7 +624,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), ""); @@ -711,7 +711,7 @@ open_file(const char *filename, hid_t fapl, int metadata_write_strategy, hsize_t entry_ptr = cache_ptr->index[i]; while (entry_ptr != NULL) { - 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); @@ -739,9 +739,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); @@ -760,7 +760,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; @@ -817,7 +817,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"); @@ -825,7 +825,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. @@ -835,7 +835,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. @@ -845,7 +845,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); @@ -856,12 +856,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"); @@ -877,12 +877,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"); @@ -891,10 +891,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), "H5Fopen succeeded"); @@ -904,12 +904,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); @@ -924,12 +924,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); @@ -980,7 +980,7 @@ test_delete(void) /* Verify that the file is an HDF5 file */ is_accessible = H5Fis_accessible(filename, fapl_id); - VRFY((TRUE == is_accessible), "H5Fis_accessible"); + VRFY((true == is_accessible), "H5Fis_accessible"); /* Delete the file */ ret = H5Fdelete(filename, fapl_id); @@ -1044,7 +1044,7 @@ test_invalid_libver_bounds_file_close_assert(void) fcpl_id = H5Pcreate(H5P_FILE_CREATE); VRFY((fcpl_id != H5I_INVALID_HID), "H5Pcreate"); - ret = H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, TRUE, 1); + ret = H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, true, 1); VRFY((SUCCEED == ret), "H5Pset_file_space_strategy"); /* create the file */ diff --git a/testpar/t_file_image.c b/testpar/t_file_image.c index 471494c..a4d5d39 100644 --- a/testpar/t_file_image.c +++ b/testpar/t_file_image.c @@ -77,7 +77,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 */ @@ -95,7 +95,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); @@ -184,7 +184,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); @@ -200,7 +200,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"); @@ -218,10 +218,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); @@ -266,7 +266,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); @@ -283,7 +283,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"); @@ -301,15 +301,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/t_filter_read.c b/testpar/t_filter_read.c index 6d19b76..01695ab 100644 --- a/testpar/t_filter_read.c +++ b/testpar/t_filter_read.c @@ -145,7 +145,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/t_filters_parallel.c b/testpar/t_filters_parallel.c index bfe306c..cff45b6 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -8641,8 +8641,8 @@ main(int argc, char **argv) VRFY((fapl_id >= 0), "FAPL creation succeeded"); VRFY((H5Pset_fapl_mpio(fapl_id, comm, info) >= 0), "Set FAPL MPIO succeeded"); - VRFY((H5Pset_all_coll_metadata_ops(fapl_id, TRUE) >= 0), "H5Pset_all_coll_metadata_ops succeeded"); - VRFY((H5Pset_coll_metadata_write(fapl_id, TRUE) >= 0), "H5Pset_coll_metadata_write succeeded"); + VRFY((H5Pset_all_coll_metadata_ops(fapl_id, true) >= 0), "H5Pset_all_coll_metadata_ops succeeded"); + VRFY((H5Pset_coll_metadata_write(fapl_id, true) >= 0), "H5Pset_coll_metadata_write succeeded"); VRFY((H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) >= 0), "Set libver bounds succeeded"); @@ -8653,7 +8653,7 @@ main(int argc, char **argv) fcpl_id = H5Pcreate(H5P_FILE_CREATE); VRFY((fcpl_id >= 0), "FCPL creation succeeded"); - VRFY((H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, TRUE, 1) >= 0), + VRFY((H5Pset_file_space_strategy(fcpl_id, H5F_FSPACE_STRATEGY_PAGE, true, 1) >= 0), "H5Pset_file_space_strategy succeeded"); VRFY((h5_fixname(FILENAME[0], fapl_id, filenames[0], sizeof(filenames[0])) != NULL), diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index bc6305e..eabd762 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -224,7 +224,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(); @@ -314,10 +314,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 */ @@ -588,7 +588,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); @@ -656,13 +656,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 */ @@ -746,13 +746,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 */ @@ -936,7 +936,7 @@ independent_group_read(void) MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); 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"); @@ -1516,7 +1516,7 @@ io_mode_confusion(void) */ const char *fcn_name = "io_mode_confusion"; - const hbool_t verbose = FALSE; + const bool verbose = false; const H5Ptest_param_t *pt; char *filename; @@ -1765,8 +1765,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 @@ -1843,7 +1843,7 @@ rr_obj_hdr_flush_confusion_writer(MPI_Comm comm) /* test bed related variables */ const char *fcn_name = "rr_obj_hdr_flush_confusion_writer"; - const hbool_t verbose = FALSE; + const bool verbose = false; const H5Ptest_param_t *pt; char *filename; @@ -2222,7 +2222,7 @@ rr_obj_hdr_flush_confusion_reader(MPI_Comm comm) /* test bed related variables */ const char *fcn_name = "rr_obj_hdr_flush_confusion_reader"; - const hbool_t verbose = FALSE; + const bool verbose = false; const H5Ptest_param_t *pt; char *filename; diff --git a/testpar/t_pmulti_dset.c b/testpar/t_pmulti_dset.c index 8d7fdef..3740f77 100644 --- a/testpar/t_pmulti_dset.c +++ b/testpar/t_pmulti_dset.c @@ -68,8 +68,8 @@ unsigned seed; int nerrors = 0; /* Whether these filters are available */ -htri_t deflate_avail = FALSE; -htri_t fletcher32_avail = FALSE; +htri_t deflate_avail = false; +htri_t fletcher32_avail = false; /*------------------------------------------------------------------------- * Function: test_pmdset @@ -119,9 +119,9 @@ test_pmdset(size_t niter, unsigned flags) unsigned *efbufi[MAX_DSETS][MAX_DSET_X]; unsigned char *dset_usage; unsigned char *dset_usagei[MAX_DSETS][MAX_DSET_X]; - hbool_t do_read; - hbool_t last_read; - hbool_t overlap; + bool do_read; + bool last_read; + bool overlap; hsize_t start[MAX_HS][3]; hsize_t count[MAX_HS][3]; hsize_t points[3 * MAX_POINTS]; @@ -276,7 +276,7 @@ test_pmdset(size_t niter, unsigned flags) /* Create datasets */ for (j = 0; j < ndsets; j++) { - hbool_t use_chunk = + bool use_chunk = (flags & MDSET_FLAG_CHUNK) || ((flags & MDSET_FLAG_MLAYOUT) && (j == 1 || j == 2)); /* Generate file dataspace */ @@ -318,14 +318,14 @@ test_pmdset(size_t niter, unsigned flags) /* Initialize expected file buffer */ (void)memset(efbuf, 0, buf_size); - /* Set last_read to TRUE so we don't reopen the file on the first + /* Set last_read to true so we don't reopen the file on the first * iteration */ - last_read = TRUE; + last_read = true; /* Perform read/write operations */ for (j = 0; j < OPS_PER_FILE; j++) { /* Decide whether to read or write */ - do_read = (hbool_t)(HDrandom() % 2); + do_read = (bool)(HDrandom() % 2); /* Barrier to ensure processes have finished the previous operation */ @@ -398,7 +398,7 @@ test_pmdset(size_t niter, unsigned flags) : dset_dims[k][1]; /* Determine maximum hyperslab size in Y */ for (m = 0; m < nhs; m++) { - overlap = TRUE; + overlap = true; for (n = 0; overlap && (n < MAX_SEL_RETRIES); n++) { /* Generate hyperslab */ count[m][0] = (hsize_t)(((hsize_t)HDrandom() % max_hs_x) + 1); @@ -411,13 +411,13 @@ test_pmdset(size_t niter, unsigned flags) : (hsize_t)HDrandom() % (dset_dims[k][1] - count[m][1] + 1); /* If writing, check for overlap with other processes */ - overlap = FALSE; + overlap = false; if (!do_read) for (o = start[m][0]; (o < (start[m][0] + count[m][0])) && !overlap; o++) for (p = start[m][1]; (p < (start[m][1] + count[m][1])) && !overlap; p++) if (dset_usagei[k][o][p]) - overlap = TRUE; + overlap = true; } /* end for */ /* If we did not find a non-overlapping hyperslab @@ -470,7 +470,7 @@ test_pmdset(size_t niter, unsigned flags) /* Generate points */ for (m = 0; m < npoints; m++) { - overlap = TRUE; + overlap = true; for (n = 0; overlap && (n < MAX_SEL_RETRIES); n++) { /* Generate point */ points[2 * m] = (unsigned)((hsize_t)HDrandom() % dset_dims[k][0]); @@ -478,9 +478,9 @@ test_pmdset(size_t niter, unsigned flags) /* Check for overlap with other processes (write) or this process * (always) */ - overlap = FALSE; + overlap = false; if (dset_usagei[k][points[2 * m]][points[(2 * m) + 1]]) - overlap = TRUE; + overlap = true; } /* end for */ /* If we did not find a non-overlapping point quit diff --git a/testpar/t_pread.c b/testpar/t_pread.c index 1aefcec..5fefcf3 100644 --- a/testpar/t_pread.c +++ b/testpar/t_pread.c @@ -34,7 +34,7 @@ const char *FILENAMES[NFILENAME + 1] = {"reloc_t_pread_data_file", "reloc_t_prea #define LIMIT_NPROC 6 -hbool_t pass = TRUE; +bool pass = true; static const char *random_hdf5_text = "Now is the time for all first-time-users of HDF5 to read their \ manual or go thru the tutorials!\n\ While you\'re at it, now is also the time to read up on MPI-IO."; @@ -105,17 +105,17 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) float nextValue; float *data_slice = NULL; - pass = TRUE; + pass = true; assert(comm != MPI_COMM_NULL); if ((MPI_Comm_rank(comm, &group_rank)) != MPI_SUCCESS) { - pass = FALSE; + pass = false; failure_mssg = "generate_test_file: MPI_Comm_rank failed.\n"; } if ((MPI_Comm_size(comm, &group_size)) != MPI_SUCCESS) { - pass = FALSE; + pass = false; failure_mssg = "generate_test_file: MPI_Comm_size failed.\n"; } @@ -151,7 +151,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* Assign the 'data_filename' */ if (h5_fixname(group_filename, H5P_DEFAULT, data_filename, sizeof(data_filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname(0) failed.\n"; } } @@ -159,7 +159,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* setup data to write */ if (pass) { if ((data_slice = (float *)malloc(COUNT * sizeof(float))) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "malloc of data_slice failed.\n"; } } @@ -176,25 +176,25 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* Initialize a file creation template */ if (pass) { if ((fctmpl = H5Pcreate(H5P_FILE_CREATE)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_CREATE) failed.\n"; } else if (H5Pset_userblock(fctmpl, 512) != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_userblock(,size) failed.\n"; } } /* setup FAPL */ if (pass) { if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n"; } } if (pass) { if ((H5Pset_fapl_mpio(fapl_id, comm, MPI_INFO_NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_fapl_mpio() failed\n"; } } @@ -202,7 +202,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* create the data file */ if (pass) { if ((file_id = H5Fcreate(data_filename, H5F_ACC_TRUNC, fctmpl, fapl_id)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fcreate() failed.\n"; } } @@ -210,14 +210,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* create and write the dataset */ if (pass) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_DATASET_XFER) failed.\n"; } } if (pass) { if ((H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_dxpl_mpio() failed.\n"; } } @@ -225,7 +225,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { dims[0] = COUNT; if ((memspace = H5Screate_simple(1, dims, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple(1, dims, NULL) failed (1).\n"; } } @@ -233,7 +233,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { dims[0] *= (hsize_t)group_size; if ((filespace = H5Screate_simple(1, dims, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple(1, dims, NULL) failed (2).\n"; } } @@ -241,7 +241,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { offset = (hsize_t)group_rank * (hsize_t)COUNT; if ((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, &offset, NULL, &count, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed.\n"; } } @@ -249,14 +249,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { if ((dset_id = H5Dcreate2(file_id, "dataset0", H5T_NATIVE_FLOAT, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dcreate2() failed.\n"; } } if (pass) { if ((H5Dwrite(dset_id, H5T_NATIVE_FLOAT, memspace, filespace, dxpl_id, data_slice)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dwrite() failed.\n"; } } @@ -266,14 +266,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate() failed.\n"; } } if (pass) { if ((H5Pset_chunk(dcpl_id, 1, chunk)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_chunk() failed.\n"; } } @@ -282,27 +282,27 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if ((dset_id_ch = H5Dcreate2(file_id, "dataset0_chunked", H5T_NATIVE_FLOAT, filespace, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dcreate2() failed.\n"; } } if (pass) { if ((H5Dwrite(dset_id_ch, H5T_NATIVE_FLOAT, memspace, filespace, dxpl_id, data_slice)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dwrite() failed.\n"; } } if (pass || (dcpl_id != -1)) { if (H5Pclose(dcpl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(dcpl_id) failed.\n"; } } if (pass || (dset_id_ch != -1)) { if (H5Dclose(dset_id_ch) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id_ch) failed.\n"; } } @@ -310,49 +310,49 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* close file, etc. */ if (pass || (dset_id != -1)) { if (H5Dclose(dset_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id) failed.\n"; } } if (pass || (memspace != -1)) { if (H5Sclose(memspace) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace) failed.\n"; } } if (pass || (filespace != -1)) { if (H5Sclose(filespace) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace) failed.\n"; } } if (pass || (file_id != -1)) { if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose(file_id) failed.\n"; } } if (pass || (dxpl_id != -1)) { if (H5Pclose(dxpl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(dxpl_id) failed.\n"; } } if (pass || (fapl_id != -1)) { if (H5Pclose(fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(fapl_id) failed.\n"; } } if (pass || (fctmpl != -1)) { if (H5Pclose(fctmpl) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(fctmpl) failed.\n"; } } @@ -383,7 +383,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { if ((header = HDopen(data_filename, O_WRONLY)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDopen(data_filename, O_WRONLY) failed.\n"; } } @@ -391,14 +391,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) if (pass) { HDlseek(header, 0, SEEK_SET); if (HDwrite(header, text_to_write, bytes_to_write) < 0) { - pass = FALSE; + pass = false; failure_mssg = "Unable to write user text into file.\n"; } } if (pass || (header > 0)) { if (HDclose(header) < 0) { - pass = FALSE; + pass = false; failure_mssg = "HDclose() failed.\n"; } } @@ -413,12 +413,12 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id) /* This is a global all reduce (NOT group specific) */ if (MPI_Allreduce(&local_failure, &global_failures, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD) != MPI_SUCCESS) { if (pass) { - pass = FALSE; + pass = false; failure_mssg = "MPI_Allreduce() failed.\n"; } } else if ((pass) && (global_failures > 0)) { - pass = FALSE; + pass = false; failure_mssg = "One or more processes report failure.\n"; } @@ -503,17 +503,17 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) float nextValue; float *data_slice = NULL; - pass = TRUE; + pass = true; assert(comm != MPI_COMM_NULL); if ((MPI_Comm_rank(comm, &group_rank)) != MPI_SUCCESS) { - pass = FALSE; + pass = false; failure_mssg = "test_parallel_read: MPI_Comm_rank failed.\n"; } if ((MPI_Comm_size(comm, &group_size)) != MPI_SUCCESS) { - pass = FALSE; + pass = false; failure_mssg = "test_parallel_read: MPI_Comm_size failed.\n"; } @@ -529,7 +529,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* allocate space for the data_slice array */ if (pass) { if ((data_slice = (float *)malloc(COUNT * sizeof(float))) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "malloc of data_slice failed.\n"; } } @@ -551,7 +551,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (h5_fixname(group_filename, H5P_DEFAULT, reloc_data_filename, sizeof(reloc_data_filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname(1) failed.\n"; } } @@ -559,14 +559,14 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* setup FAPL */ if (pass) { if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_FILE_ACCESS) failed.\n"; } } if (pass) { if ((H5Pset_fapl_mpio(fapl_id, comm, MPI_INFO_NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_fapl_mpio() failed\n"; } } @@ -574,7 +574,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* open the file -- should have user block, exercising the optimization */ if (pass) { if ((file_id = H5Fopen(reloc_data_filename, H5F_ACC_RDONLY, fapl_id)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fopen() failed\n"; } } @@ -582,7 +582,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* open the data set */ if (pass) { if ((dset_id = H5Dopen2(file_id, "dataset0", H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dopen2() failed\n"; } } @@ -590,7 +590,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* open the chunked data set */ if (pass) { if ((dset_id_ch = H5Dopen2(file_id, "dataset0_chunked", H5P_DEFAULT)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dopen2() failed\n"; } } @@ -599,7 +599,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass) { dims[0] = count; if ((memspace = H5Screate_simple(1, dims, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple(1, dims, NULL) failed\n"; } } @@ -607,7 +607,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* setup filespace */ if (pass) { if ((filespace = H5Dget_space(dset_id)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space(dataset) failed\n"; } } @@ -615,7 +615,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass) { offset = (hsize_t)group_rank * count; if ((H5Sselect_hyperslab(filespace, H5S_SELECT_SET, &offset, NULL, &count, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed\n"; } } @@ -623,7 +623,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* read this processes section of the data */ if (pass) { if ((H5Dread(dset_id, H5T_NATIVE_FLOAT, memspace, filespace, H5P_DEFAULT, data_slice)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dread() failed\n"; } } @@ -638,7 +638,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) * the compiler. */ if ((data_slice[i] > nextValue) || (data_slice[i] < nextValue)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected dset contents.\n"; } nextValue += 1; @@ -648,14 +648,14 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass || (memspace != -1)) { if (H5Sclose(memspace) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace) failed.\n"; } } if (pass || (filespace != -1)) { if (H5Sclose(filespace) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace) failed.\n"; } } @@ -674,49 +674,49 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (group_size <= LIMIT_NPROC) { #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - hbool_t prop_value; + bool prop_value; #endif /* H5_HAVE_INSTRUMENTED_LIBRARY */ if ((filespace = H5Dget_space(dset_id)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_space failed.\n"; } if ((dset_size = H5Sget_simple_extent_npoints(filespace)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sget_simple_extent_npoints failed.\n"; } if ((filetype = H5Dget_type(dset_id)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dget_type failed.\n"; } if ((filetype_size = H5Tget_size(filetype)) == 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Tget_size failed.\n"; } if (H5Tclose(filetype) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Tclose failed.\n"; }; if ((data_slice = (float *)malloc((size_t)dset_size * filetype_size)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "malloc of data_slice failed.\n"; } if (pass) { if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_DATASET_XFER) failed.\n"; } } if (pass) { if ((H5Pset_dxpl_mpio(dxpl_id, H5FD_MPIO_COLLECTIVE)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_dxpl_mpio() failed.\n"; } } @@ -726,7 +726,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) prop_value = H5D_XFER_COLL_RANK0_BCAST_DEF; if (H5Pinsert2(dxpl_id, H5D_XFER_COLL_RANK0_BCAST_NAME, H5D_XFER_COLL_RANK0_BCAST_SIZE, &prop_value, NULL, NULL, NULL, NULL, NULL, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pinsert2() failed\n"; } } @@ -735,21 +735,21 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* read H5S_ALL section */ if (pass) { if ((H5Dread(dset_id, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id, data_slice)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dread() failed\n"; } } #ifdef H5_HAVE_INSTRUMENTED_LIBRARY if (pass) { - prop_value = FALSE; + prop_value = false; if (H5Pget(dxpl_id, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget() failed\n"; } if (pass) { - if (prop_value != TRUE) { - pass = FALSE; + if (prop_value != true) { + pass = false; failure_mssg = "rank 0 Bcast optimization was mistakenly not performed\n"; } } @@ -773,7 +773,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) * the compiler. */ if ((data_slice[i] > nextValue) || (data_slice[i] < nextValue)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected dset contents.\n"; } nextValue += 1; @@ -787,7 +787,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass) { prop_value = H5D_XFER_COLL_RANK0_BCAST_DEF; if (H5Pset(dxpl_id, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset() failed\n"; } } @@ -798,21 +798,21 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) } if (pass) { if ((H5Dread(dset_id_ch, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, dxpl_id, data_slice)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dread() failed\n"; } } #ifdef H5_HAVE_INSTRUMENTED_LIBRARY if (pass) { - prop_value = FALSE; + prop_value = false; if (H5Pget(dxpl_id, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget() failed\n"; } if (pass) { - if (prop_value == TRUE) { - pass = FALSE; + if (prop_value == true) { + pass = false; failure_mssg = "rank 0 Bcast optimization was mistakenly performed for chunked dataset\n"; } } @@ -836,7 +836,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) * the compiler. */ if ((data_slice[i] > nextValue) || (data_slice[i] < nextValue)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected chunked dset contents.\n"; } nextValue += 1; @@ -846,7 +846,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass || (filespace != -1)) { if (H5Sclose(filespace) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(filespace) failed.\n"; } } @@ -862,7 +862,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) */ if ((data_slice = (float *)malloc((size_t)(dset_size * 2) * filetype_size)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "malloc of data_slice failed.\n"; } @@ -870,14 +870,14 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass) { dims[0] = (hsize_t)dset_size * 2; if ((memspace = H5Screate_simple(1, dims, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Screate_simple(1, dims, NULL) failed\n"; } } if (pass) { offset = (hsize_t)dset_size; if ((H5Sselect_hyperslab(memspace, H5S_SELECT_SET, &offset, NULL, &offset, NULL)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sselect_hyperslab() failed\n"; } } @@ -886,7 +886,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass) { prop_value = H5D_XFER_COLL_RANK0_BCAST_DEF; if (H5Pset(dxpl_id, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset() failed\n"; } } @@ -895,21 +895,21 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* read this processes section of the data */ if (pass) { if ((H5Dread(dset_id, H5T_NATIVE_FLOAT, memspace, H5S_ALL, dxpl_id, data_slice)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dread() failed\n"; } } #ifdef H5_HAVE_INSTRUMENTED_LIBRARY if (pass) { - prop_value = FALSE; + prop_value = false; if (H5Pget(dxpl_id, H5D_XFER_COLL_RANK0_BCAST_NAME, &prop_value) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pget() failed\n"; } if (pass) { - if (prop_value != TRUE) { - pass = FALSE; + if (prop_value != true) { + pass = false; failure_mssg = "rank 0 Bcast optimization was mistakenly not performed\n"; } } @@ -933,7 +933,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) * the compiler. */ if ((data_slice[i] > nextValue) || (data_slice[i] < nextValue)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected dset contents.\n"; } nextValue += 1; @@ -943,7 +943,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass || (memspace != -1)) { if (H5Sclose(memspace) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Sclose(memspace) failed.\n"; } } @@ -956,7 +956,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (pass || (dxpl_id != -1)) { if (H5Pclose(dxpl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(dxpl_id) failed.\n"; } } @@ -965,28 +965,28 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) /* close file, etc. */ if (pass || (dset_id != -1)) { if (H5Dclose(dset_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id) failed.\n"; } } if (pass || (dset_id_ch != -1)) { if (H5Dclose(dset_id_ch) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Dclose(dset_id_ch) failed.\n"; } } if (pass || (file_id != -1)) { if (H5Fclose(file_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fclose(file_id) failed.\n"; } } if (pass || (fapl_id != -1)) { if (H5Pclose(fapl_id) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pclose(fapl_id) failed.\n"; } } @@ -999,12 +999,12 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id) if (MPI_Allreduce(&local_failure, &global_failures, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD) != MPI_SUCCESS) { if (pass) { - pass = FALSE; + pass = false; failure_mssg = "MPI_Allreduce() failed.\n"; } } else if ((pass) && (global_failures > 0)) { - pass = FALSE; + pass = false; failure_mssg = "One or more processes report failure.\n"; } diff --git a/testpar/t_prop.c b/testpar/t_prop.c index c6eb99c..1cd5152 100644 --- a/testpar/t_prop.c +++ b/testpar/t_prop.c @@ -114,12 +114,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), @@ -128,7 +128,7 @@ test_plist_ed(void) H5C_incr__threshold, 0.8, 3.0, - TRUE, + true, (8 * 1024 * 1024), H5C_flash_incr__add_space, 2.0, @@ -136,10 +136,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), H5AC__DEFAULT_METADATA_WRITE_STRATEGY}; @@ -285,7 +285,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); @@ -594,10 +594,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/t_select_io_dset.c b/testpar/t_select_io_dset.c index daeacf0..698160e 100644 --- a/testpar/t_select_io_dset.c +++ b/testpar/t_select_io_dset.c @@ -153,7 +153,7 @@ set_dxpl(hid_t dxpl, H5D_selection_io_mode_t select_io_mode, H5FD_mpio_xfer_t mp P_TEST_ERROR; if (mwbuf) - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) P_TEST_ERROR; } /* set_dxpl() */ @@ -3407,7 +3407,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_ hid_t sid = H5I_INVALID_HID; hsize_t dims[1]; hsize_t cdims[1]; - hbool_t is_chunked = FALSE; + bool is_chunked = false; hid_t tid = H5T_NATIVE_INT; uint32_t no_selection_io_cause_write = 0; uint32_t no_selection_io_cause_read = 0; @@ -3464,7 +3464,7 @@ test_no_selection_io_cause_mode(const char *filename, hid_t fapl, uint32_t test_ P_TEST_ERROR; if (test_mode & TEST_IN_PLACE_TCONV) { - if (H5Pset_modify_write_buf(dxpl, TRUE) < 0) + if (H5Pset_modify_write_buf(dxpl, true) < 0) P_TEST_ERROR; } /* In-place type conversion for read doesn't require modify_write_buf */ @@ -3972,14 +3972,14 @@ main(int argc, char *argv[]) P_TEST_ERROR; /* Test with contiguous or chunked dataset */ - for (chunked = FALSE; chunked <= TRUE; chunked++) { + for (chunked = false; chunked <= true; chunked++) { /* Data transforms only apply to integer or floating-point datasets */ /* therefore, not all tests are run with data transform */ - for (dtrans = FALSE; dtrans <= TRUE; dtrans++) { + for (dtrans = false; dtrans <= true; dtrans++) { /* Test with and without modify_write_buf turned on */ - for (mwbuf = FALSE; mwbuf <= TRUE; mwbuf++) { + for (mwbuf = false; mwbuf <= true; mwbuf++) { if (MAINPROCESS) { /* Print configuration message */ diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 6587190..2882c36 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -112,14 +112,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 */ @@ -452,7 +452,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; @@ -460,12 +460,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 */ @@ -523,7 +523,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; @@ -531,12 +531,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); @@ -684,7 +684,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 */ @@ -806,7 +806,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 @@ -824,7 +824,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 * @@ -836,7 +836,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 */ @@ -845,7 +845,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)++; } @@ -892,7 +892,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 */ @@ -1035,7 +1035,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 @@ -1071,7 +1071,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++; } @@ -1079,7 +1079,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 */ @@ -1088,7 +1088,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)++; } @@ -1137,7 +1137,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 */ @@ -1301,7 +1301,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. */ @@ -1324,7 +1324,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 = @@ -1345,7 +1345,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++; } @@ -1353,7 +1353,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 */ @@ -1362,7 +1362,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)++; } @@ -1413,7 +1413,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 */ @@ -1584,7 +1584,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 @@ -1632,7 +1632,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++; @@ -1641,7 +1641,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 */ @@ -1649,7 +1649,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)++; } @@ -1683,7 +1683,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) { @@ -1924,7 +1924,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, express_test, &skips, + large_rank, false, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped); test_num++; break; @@ -1935,7 +1935,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, express_test, &skips, + large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped); test_num++; break; @@ -1946,7 +1946,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, express_test, &skips, + large_rank, false, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped); test_num++; break; @@ -1957,14 +1957,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, express_test, &skips, + large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped); 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) */ @@ -2019,7 +2019,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; @@ -2222,7 +2222,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]), @@ -2294,7 +2294,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 @@ -2347,17 +2347,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 */ @@ -2449,7 +2449,7 @@ do { if (*val_ptr != expected_value) { - good_data = FALSE; + good_data = false; } /* zero out buffer for re-use */ @@ -2457,7 +2457,7 @@ do { } else if (*val_ptr != 0) { - good_data = FALSE; + good_data = false; /* zero out buffer for re-use */ *val_ptr = 0; @@ -2519,7 +2519,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 */ @@ -2671,7 +2671,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 @@ -2702,9 +2702,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)++; } @@ -2751,7 +2751,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; @@ -2893,7 +2893,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 @@ -2911,7 +2911,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 = @@ -2951,7 +2951,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 */ @@ -2960,13 +2960,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; @@ -2974,7 +2974,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 */ @@ -2983,7 +2983,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)++; } @@ -3034,7 +3034,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; @@ -3215,7 +3215,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 @@ -3252,33 +3252,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)++; } @@ -3329,7 +3329,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; @@ -3506,7 +3506,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 @@ -3546,33 +3546,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)++; } @@ -3607,9 +3607,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) + 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) { #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG @@ -3838,7 +3838,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); test_num++; @@ -3849,7 +3849,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, + test_num, edge_size, checker_edge_size, chunk_edge_size, small_rank, large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped); test_num++; break; @@ -3859,7 +3859,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); test_num++; @@ -3870,14 +3870,14 @@ 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, + test_num, edge_size, checker_edge_size, chunk_edge_size, small_rank, large_rank, true, dset_type, express_test, &skips, max_skips, &total_tests, &tests_run, &tests_skipped); 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) */ @@ -4159,9 +4159,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/t_span_tree.c b/testpar/t_span_tree.c index 4950bc8..317f889 100644 --- a/testpar/t_span_tree.c +++ b/testpar/t_span_tree.c @@ -894,7 +894,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; @@ -1116,7 +1116,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]), @@ -1192,7 +1192,7 @@ 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 @@ -1245,20 +1245,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 */ @@ -1351,7 +1351,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 re-use */ @@ -1359,7 +1359,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 re-use */ *val_ptr = 0; @@ -1408,7 +1408,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 @@ -1418,8 +1418,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; @@ -1761,10 +1761,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 @@ -1791,7 +1791,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; @@ -1799,7 +1799,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; @@ -1807,7 +1807,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); @@ -1915,10 +1915,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 @@ -1952,7 +1952,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; @@ -1960,7 +1960,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; @@ -1968,7 +1968,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 *****/ @@ -2006,7 +2006,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); @@ -2021,7 +2021,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]) + @@ -2040,14 +2040,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 @@ -2056,11 +2056,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; @@ -2068,14 +2068,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 @@ -2103,7 +2103,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); @@ -2118,7 +2118,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]) + @@ -2140,14 +2140,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 @@ -2156,11 +2156,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; @@ -2175,14 +2175,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); @@ -2258,10 +2258,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; @@ -2301,7 +2301,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; @@ -2427,7 +2427,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]; @@ -2435,10 +2435,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/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 8a3c10e..76d2992 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -86,7 +86,7 @@ int curr_nerrors = 0; typedef void (*test_func)(void); /* Utility functions */ -static hid_t create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, hbool_t custom_config, +static hid_t create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, bool custom_config, H5FD_subfiling_params_t *custom_cfg, int32_t thread_pool_size); /* Test functions */ @@ -125,7 +125,7 @@ static test_func tests[] = { * --------------------------------------------------------------------------- */ static hid_t -create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, hbool_t custom_config, +create_subfiling_ioc_fapl(MPI_Comm comm, MPI_Info info, bool custom_config, H5FD_subfiling_params_t *custom_cfg, int32_t thread_pool_size) { H5FD_subfiling_config_t subfiling_conf; @@ -200,7 +200,7 @@ test_create_and_close(void) TESTING_2("file creation and immediate close"); /* Get a default Subfiling FAPL */ - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fcreate(SUBF_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); @@ -302,7 +302,7 @@ test_config_file(void) cfg.stripe_size = (stripe_size_g > 0) ? stripe_size_g : stripe_size; cfg.stripe_count = num_iocs_g > 1 ? (num_iocs_g / 2) : 1; - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, TRUE, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fcreate(SUBF_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); @@ -518,7 +518,7 @@ test_stripe_sizes(void) c_write_buf = write_buf; - fapl_id = create_subfiling_ioc_fapl(MPI_COMM_SELF, MPI_INFO_NULL, TRUE, &cfg, + fapl_id = create_subfiling_ioc_fapl(MPI_COMM_SELF, MPI_INFO_NULL, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); @@ -656,7 +656,7 @@ test_stripe_sizes(void) cfg.stripe_count = num_iocs_g; - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, TRUE, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); /* Create and close file with H5Fcreate to setup superblock */ @@ -965,7 +965,7 @@ test_selection_strategies(void) if (num_active_ranks < mpi_size) file_comm = MPI_COMM_SELF; - fapl_id = create_subfiling_ioc_fapl(file_comm, info_g, TRUE, &cfg, + fapl_id = create_subfiling_ioc_fapl(file_comm, info_g, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); @@ -1079,7 +1079,7 @@ test_read_different_stripe_size(void) cfg.stripe_size = (stripe_size_g > 0) ? stripe_size_g : 1048576; cfg.stripe_count = num_iocs_g; - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, TRUE, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fcreate(SUBF_FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id); @@ -1163,7 +1163,7 @@ test_read_different_stripe_size(void) cfg.stripe_size += (cfg.stripe_size / 2); cfg.stripe_count *= 2; - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, TRUE, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fopen(SUBF_FILENAME, H5F_ACC_RDONLY, fapl_id); @@ -1317,7 +1317,7 @@ test_subfiling_precreate_rank_0(void) cfg.stripe_size = (stripe_size_g > 0) ? stripe_size_g : H5FD_SUBFILING_DEFAULT_STRIPE_SIZE; cfg.stripe_count = num_iocs_g; - fapl_id = create_subfiling_ioc_fapl(MPI_COMM_SELF, MPI_INFO_NULL, TRUE, &cfg, + fapl_id = create_subfiling_ioc_fapl(MPI_COMM_SELF, MPI_INFO_NULL, true, &cfg, H5FD_IOC_DEFAULT_THREAD_POOL_SIZE); VRFY((fapl_id >= 0), "FAPL creation succeeded"); @@ -1395,7 +1395,7 @@ test_subfiling_precreate_rank_0(void) /* Open the file on all ranks */ - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fopen(SUBF_FILENAME, H5F_ACC_RDONLY, fapl_id); @@ -1481,7 +1481,7 @@ test_subfiling_write_many_read_one(void) TESTING_2("reading back file with single MPI rank"); /* Get a default Subfiling FAPL */ - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); /* Create file on all ranks */ @@ -1541,7 +1541,7 @@ test_subfiling_write_many_read_one(void) VRFY((mpi_code_g == MPI_SUCCESS), "MPI_Barrier succeeded"); if (MAINPROCESS) { - fapl_id = create_subfiling_ioc_fapl(MPI_COMM_SELF, MPI_INFO_NULL, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(MPI_COMM_SELF, MPI_INFO_NULL, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fopen(SUBF_FILENAME, H5F_ACC_RDONLY, fapl_id); @@ -1606,7 +1606,7 @@ test_subfiling_write_many_read_few(void) hsize_t start[1]; hsize_t count[1]; hsize_t dset_dims[1]; - hbool_t reading_file = FALSE; + bool reading_file = false; size_t target_size; hid_t file_id = H5I_INVALID_HID; hid_t fapl_id = H5I_INVALID_HID; @@ -1637,7 +1637,7 @@ test_subfiling_write_many_read_few(void) } /* Get a default Subfiling FAPL */ - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); /* Create file on all ranks */ @@ -1717,17 +1717,17 @@ test_subfiling_write_many_read_few(void) } if (color) - reading_file = TRUE; + reading_file = true; } else { if (node_local_rank == 0) { sub_comm = ioc_comm; - reading_file = TRUE; + reading_file = true; } } if (reading_file) { - fapl_id = create_subfiling_ioc_fapl(sub_comm, MPI_INFO_NULL, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(sub_comm, MPI_INFO_NULL, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); file_id = H5Fopen(SUBF_FILENAME, H5F_ACC_RDONLY, fapl_id); @@ -1848,7 +1848,7 @@ test_subfiling_h5fuse(void) } /* Get a default Subfiling FAPL */ - fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, FALSE, NULL, 0); + fapl_id = create_subfiling_ioc_fapl(comm_g, info_g, false, NULL, 0); VRFY((fapl_id >= 0), "FAPL creation succeeded"); /* Create file on all ranks */ @@ -2117,10 +2117,10 @@ int main(int argc, char **argv) { unsigned seed; - hbool_t must_unset_stripe_size_env = FALSE; - hbool_t must_unset_ioc_per_node_env = FALSE; - hbool_t must_unset_ioc_thread_count_env = FALSE; - hbool_t must_unset_config_dir_env = FALSE; + bool must_unset_stripe_size_env = false; + bool must_unset_ioc_per_node_env = false; + bool must_unset_ioc_thread_count_env = false; + bool must_unset_config_dir_env = false; char *env_value = NULL; int required = MPI_THREAD_MULTIPLE; int provided = 0; @@ -2317,7 +2317,7 @@ main(int argc, char **argv) goto exit; } - must_unset_stripe_size_env = TRUE; + must_unset_stripe_size_env = true; } if (ioc_per_node_g < 0) { const char *ioc_per_node_str; @@ -2334,7 +2334,7 @@ main(int argc, char **argv) goto exit; } - must_unset_ioc_per_node_env = TRUE; + must_unset_ioc_per_node_env = true; } if (ioc_thread_pool_size_g < 0) { if (HDsetenv(H5FD_IOC_THREAD_POOL_SIZE, "2", 1) < 0) { @@ -2344,7 +2344,7 @@ main(int argc, char **argv) goto exit; } - must_unset_ioc_thread_count_env = TRUE; + must_unset_ioc_thread_count_env = true; } if (!(env_value = HDgetenv(H5FD_SUBFILING_CONFIG_FILE_PREFIX))) { @@ -2397,7 +2397,7 @@ main(int argc, char **argv) } } - must_unset_config_dir_env = TRUE; + must_unset_config_dir_env = true; } /* Grab values from environment variables */ diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c index 5e9070d..d1950a9 100644 --- a/testpar/t_vfd.c +++ b/testpar/t_vfd.c @@ -29,8 +29,8 @@ static MPI_Comm comm = MPI_COMM_WORLD; static MPI_Info info = MPI_INFO_NULL; -hbool_t pass = TRUE; /* set to FALSE on error */ -hbool_t disp_failure_mssgs = TRUE; /* global force display of failure messages */ +bool pass = true; /* set to false on error */ +bool disp_failure_mssgs = true; /* global force display of failure messages */ const char *failure_mssg = NULL; const char *FILENAMES[] = {"mpio_vfd_test_file_0", /*0*/ @@ -170,7 +170,7 @@ int *erbufs[2] = {NULL, NULL}; /* Array of expected read buffers */ static herr_t test_selection_io_read_verify(hid_t dxpl, int mpi_rank, hsize_t start[], hsize_t block[], H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t mem_spaces[], hid_t file_spaces[], haddr_t offsets[], size_t element_sizes[], - uint32_t rbufcount, int *erb[], hbool_t shorten_rbufs); + uint32_t rbufcount, int *erb[], bool shorten_rbufs); static herr_t test_selection_io_write(hid_t dxpl, H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t mem_spaces[], hid_t file_spaces[], haddr_t offsets[], @@ -218,9 +218,9 @@ alloc_and_init_file_images(int mpi_size) int buf_len; size_t buf_size; int i; - hbool_t show_progress = FALSE; + bool show_progress = false; - pass = TRUE; + pass = true; if (show_progress) fprintf(stdout, "%s: cp = %d, pass = %d.\n", fcn_name, cp++, pass); @@ -240,7 +240,7 @@ alloc_and_init_file_images(int mpi_size) if ((!increasing_fi_buf) || (!decreasing_fi_buf) || (!negative_fi_buf) || (!zero_fi_buf) || (!read_fi_buf)) { - pass = FALSE; + pass = false; failure_mssg = "Can't allocate one or more file image buffers."; } } @@ -348,7 +348,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x const char *fcn_name = "setup_vfd_test_file()"; char filename[512]; int cp = 0; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ unsigned flags = 0; /* file open flags */ @@ -368,7 +368,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (h5_fixname(FILENAMES[file_name_id], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -381,7 +381,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - pass = FALSE; + pass = false; failure_mssg = "Can't create fapl."; } } @@ -392,7 +392,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (H5Pset_fapl_mpio(fapl_id, comm, info) < 0) { - pass = FALSE; + pass = false; failure_mssg = "Can't set mpio fapl."; } } @@ -408,7 +408,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x /* magic = */ H5FD_SUBFILING_FAPL_MAGIC, /* version = */ H5FD_SUBFILING_CURR_FAPL_VERSION, /* ioc_fapl_id = */ H5P_DEFAULT, /* will over write? */ - /* require_ioc = */ TRUE, + /* require_ioc = */ true, /* shared_cfg = */ shared_conf, }; H5FD_ioc_config_t ioc_config = { @@ -420,21 +420,21 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if ((pass) && ((ioc_fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "Can't create ioc fapl."; } /* set the MPI communicator and info in the FAPL */ if (H5Pset_mpi_params(ioc_fapl, comm, info) < 0) { - pass = FALSE; + pass = false; failure_mssg = "Can't set MPI communicator and info in IOC fapl."; } /* set the MPI communicator and info in the FAPL */ if (H5Pset_mpi_params(fapl_id, comm, info) < 0) { - pass = FALSE; + pass = false; failure_mssg = "Can't set MPI communicator and info in subfiling fapl."; } @@ -444,7 +444,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x /* Get subfiling VFD defaults */ if ((pass) && (H5Pget_fapl_subfiling(fapl_id, &subfiling_conf) == FAIL)) { - pass = FALSE; + pass = false; failure_mssg = "Can't get sub-filing VFD defaults."; } @@ -453,14 +453,14 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x /* Get IOC VFD defaults */ if ((pass) && ((H5Pget_fapl_ioc(ioc_fapl, &ioc_config) == FAIL))) { - pass = FALSE; + pass = false; failure_mssg = "Can't get IOC VFD defaults."; } /* Now we can set the IOC fapl. */ if ((pass) && ((H5Pset_fapl_ioc(ioc_fapl, &ioc_config) == FAIL))) { - pass = FALSE; + pass = false; failure_mssg = "Can't set IOC fapl."; } } @@ -468,7 +468,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if ((pass) && ((H5Pset_fapl_sec2(ioc_fapl) == FAIL))) { - pass = FALSE; + pass = false; failure_mssg = "Can't set sec2 fapl."; } } @@ -479,13 +479,13 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x /* Now we can set the SUBFILING fapl before returning. */ if ((pass) && (H5Pset_fapl_subfiling(fapl_id, &subfiling_conf) == FAIL)) { - pass = FALSE; + pass = false; failure_mssg = "Can't set subfiling fapl."; } } #endif else { - pass = FALSE; + pass = false; failure_mssg = "un-supported VFD"; } } @@ -498,7 +498,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (h5_fixname(FILENAMES[file_name_id], H5P_DEFAULT, filename, sizeof(filename)) == NULL) { - pass = FALSE; + pass = false; failure_mssg = "h5_fixname() failed.\n"; } } @@ -514,7 +514,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (NULL == (lf = H5FDopen(filename, flags, fapl_id, HADDR_UNDEF))) { - pass = FALSE; + pass = false; failure_mssg = "H5FDopen() failed.\n"; } } @@ -530,7 +530,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (H5FDset_eoa(lf, H5FD_MEM_DEFAULT, eoa) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDset_eoa() failed.\n"; } } @@ -544,7 +544,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (dxpl_id < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pcreate(H5P_DATASET_XFER) failed."; } } @@ -556,7 +556,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (H5Pset_dxpl_mpio(dxpl_id, xfer_mode) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_dxpl_mpio() failed."; } } @@ -568,7 +568,7 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x if (H5Pset_dxpl_mpio_collective_opt(dxpl_id, coll_opt_mode) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Pset_dxpl_mpio() failed."; } } @@ -612,7 +612,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap { const char *fcn_name = "takedown_vfd_test_file()"; int cp = 0; - hbool_t show_progress = FALSE; + bool show_progress = false; assert(lf_ptr); assert(fapl_id_ptr); @@ -629,7 +629,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap if (H5FDclose(*lf_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDclose() failed.\n"; } } @@ -647,7 +647,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap if ((mpi_rank == 0) && (HDremove(filename) < 0)) { - pass = FALSE; + pass = false; failure_mssg = "HDremove() failed.\n"; } } @@ -661,7 +661,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap /* Close the fapl */ if (H5Pclose(*fapl_id_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't close fapl.\n"; } @@ -671,7 +671,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap /* Close the dxpl */ if (H5Pclose(*dxpl_id_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "can't close dxpl.\n"; } @@ -718,7 +718,7 @@ takedown_vfd_test_file(int mpi_rank, char *filename, H5FD_t **lf_ptr, hid_t *fap * * 7) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -731,7 +731,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ char test_title[120]; char filename[512]; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -743,7 +743,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ size_t sizes[1]; void *bufs[1]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -797,7 +797,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDwrite(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)increasing_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite() on rank 0 failed.\n"; } } @@ -837,7 +837,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDread_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread_vector() failed.\n"; } @@ -847,7 +847,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[i] != 0) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in read_fi_buf (1).\n"; break; } @@ -856,7 +856,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[i] != increasing_fi_buf[i]) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in read_fi_buf (2).\n"; break; } @@ -948,7 +948,7 @@ vector_read_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ * * 11) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -961,7 +961,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ char test_title[120]; char filename[512]; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -973,7 +973,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ size_t sizes[1]; void *bufs[1]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -1027,7 +1027,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDwrite(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)decreasing_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite() on rank 0 failed.\n"; } } @@ -1076,7 +1076,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDread_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread_vector() failed.\n"; } } @@ -1115,7 +1115,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDread_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread_vector() failed.\n"; } } @@ -1138,7 +1138,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[i] != 0) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in read_fi_buf (1).\n"; break; } @@ -1147,7 +1147,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[i] != decreasing_fi_buf[i]) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in read_fi_buf (2).\n"; break; } @@ -1245,7 +1245,7 @@ vector_read_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ * * 9) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -1262,7 +1262,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ int32_t buf_2[(INTS_PER_RANK / 4) + 1]; int32_t buf_3[(INTS_PER_RANK / 4) + 1]; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -1274,7 +1274,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ size_t sizes[4]; void *bufs[4]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -1328,7 +1328,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDwrite(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)negative_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite() on rank 0 failed.\n"; } } @@ -1420,7 +1420,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDread_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread_vector() failed.\n"; } } @@ -1441,7 +1441,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (((mpi_rank % 2 == 0) && (buf_0[i] != negative_fi_buf[base_index + i])) || ((mpi_rank % 2 == 1) && (buf_3[i] != negative_fi_buf[base_index + i]))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in buf (1).\n"; } } @@ -1453,7 +1453,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (((mpi_rank % 2 == 0) && (buf_1[i] != negative_fi_buf[base_index + i])) || ((mpi_rank % 2 == 1) && (buf_2[i] != negative_fi_buf[base_index + i]))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in buf (2).\n"; } } @@ -1465,7 +1465,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (((mpi_rank % 2 == 0) && (buf_2[i] != negative_fi_buf[base_index + i])) || ((mpi_rank % 2 == 1) && (buf_1[i] != negative_fi_buf[base_index + i]))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in buf (3).\n"; } } @@ -1477,7 +1477,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (((mpi_rank % 2 == 0) && (buf_3[i] != negative_fi_buf[base_index + i])) || ((mpi_rank % 2 == 1) && (buf_0[i] != negative_fi_buf[base_index + i]))) { - pass = FALSE; + pass = false; failure_mssg = "Unexpected value in buf (4).\n"; } } @@ -1598,7 +1598,7 @@ vector_read_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ * * 9) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -1612,7 +1612,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ char filename[512]; haddr_t eoa; haddr_t base_addr; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -1627,7 +1627,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ size_t sizes[4]; void *bufs[4]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -1681,7 +1681,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDwrite(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)increasing_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite() on rank 0 failed.\n"; } } @@ -1808,7 +1808,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDread_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread_vector() failed (1).\n"; } } @@ -1842,7 +1842,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.1)"; fprintf(stdout, "\nread_fi_buf[%d] = %d, increasing_fi_buf[%d] = %d\n", j, read_fi_buf[j], j, increasing_fi_buf[j]); @@ -1852,7 +1852,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.2)"; } } @@ -1860,7 +1860,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.3)"; } } @@ -1868,7 +1868,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.4)"; } } @@ -1879,7 +1879,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2.1)"; } } @@ -1887,7 +1887,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2.2)"; } } @@ -1895,7 +1895,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2.3)"; } } @@ -1906,7 +1906,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3.1)"; } } @@ -1914,7 +1914,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3.2)"; } } @@ -1923,19 +1923,19 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ case 3: if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (4)"; } break; default: - assert(FALSE); /* should be un-reachable */ + assert(false); /* should be un-reachable */ break; } } else if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (5)"; } } /* end for loop */ @@ -2026,7 +2026,7 @@ vector_read_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ * * 9) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -2040,7 +2040,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ char filename[512]; haddr_t eoa; haddr_t base_addr; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -2054,7 +2054,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ size_t sizes[2]; void *bufs[(INTS_PER_RANK / 16) + 1]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -2108,7 +2108,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDwrite(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)increasing_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite() on rank 0 failed.\n"; } } @@ -2168,7 +2168,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (H5FDread_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread_vector() failed (1).\n"; } } @@ -2193,13 +2193,13 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1)"; } } else if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2)"; } } /* end for loop */ @@ -2265,7 +2265,7 @@ vector_read_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer_ * * 6) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -2278,7 +2278,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer char test_title[120]; char filename[512]; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -2290,7 +2290,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[1]; const void *bufs[1]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -2347,7 +2347,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed.\n"; } } @@ -2373,7 +2373,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -2381,7 +2381,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[i] != increasing_fi_buf[i]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file"; break; } @@ -2451,7 +2451,7 @@ vector_write_test_1(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer * * 5) Close the test file. On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -2464,7 +2464,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer char test_title[120]; char filename[512]; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -2477,7 +2477,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[1]; const void *bufs[1]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -2539,7 +2539,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (1).\n"; } } @@ -2547,7 +2547,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, 0, NULL, NULL, NULL, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (2).\n"; } } @@ -2566,7 +2566,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, 0, NULL, NULL, NULL, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (3).\n"; } } @@ -2580,7 +2580,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (4).\n"; } } @@ -2607,7 +2607,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -2619,7 +2619,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file"; break; } @@ -2631,7 +2631,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != negative_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file"; break; } @@ -2700,7 +2700,7 @@ vector_write_test_2(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer * * 5) Close the test file. On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -2717,7 +2717,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer int ints_per_write; size_t bytes_per_write; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -2730,7 +2730,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[4]; const void *bufs[4]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -2810,7 +2810,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (1).\n"; } } @@ -2838,7 +2838,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -2850,7 +2850,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1)"; break; } @@ -2862,7 +2862,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != decreasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2)"; break; } @@ -2874,7 +2874,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != negative_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3)"; break; } @@ -2886,7 +2886,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != zero_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3)"; break; } @@ -2960,7 +2960,7 @@ vector_write_test_3(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer * * 5) Close the test file. On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -2977,7 +2977,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer int ints_per_write; size_t bytes_per_write; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -2990,7 +2990,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[4]; const void *bufs[4]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -3071,7 +3071,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (1).\n"; } } @@ -3099,7 +3099,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -3111,7 +3111,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != zero_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1)"; break; } @@ -3123,7 +3123,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != negative_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2)"; break; } @@ -3135,7 +3135,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != decreasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3)"; break; } @@ -3147,7 +3147,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3)"; break; } @@ -3258,7 +3258,7 @@ vector_write_test_4(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer * * 7) Close the test file. On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -3273,7 +3273,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer haddr_t base_addr; int base_index; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -3287,7 +3287,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[4]; const void *bufs[4]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -3343,7 +3343,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed.\n"; } } @@ -3460,7 +3460,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (1).\n"; } } @@ -3487,7 +3487,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -3506,7 +3506,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != negative_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.1)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -3517,7 +3517,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != decreasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.2)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -3528,7 +3528,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.3)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -3539,7 +3539,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1.4)"; } } @@ -3550,7 +3550,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2.1)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -3561,7 +3561,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != decreasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2.2)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -3572,7 +3572,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2.3)"; } } @@ -3583,7 +3583,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != negative_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3.1)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -3594,7 +3594,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (3.2)"; } } @@ -3603,13 +3603,13 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer case 3: if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (4)"; } break; default: - assert(FALSE); /* should be un-reachable */ + assert(false); /* should be un-reachable */ break; } } @@ -3694,7 +3694,7 @@ vector_write_test_5(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer * * 9) On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -3708,7 +3708,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer char filename[512]; haddr_t eoa; haddr_t base_addr; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -3721,7 +3721,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[2]; const void *bufs[(INTS_PER_RANK / 16) + 1]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -3774,7 +3774,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)zero_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite() on rank 0 failed.\n"; } } @@ -3822,7 +3822,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (1).\n"; } } @@ -3847,7 +3847,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -3857,13 +3857,13 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[i] != increasing_fi_buf[i]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1)"; } } else if (read_fi_buf[i] != zero_fi_buf[i]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2)"; } } @@ -3948,7 +3948,7 @@ vector_write_test_6(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer * * 7) Close the test file. On rank 0, delete the test file. * - * Return: FALSE on success, TRUE if any errors are detected. + * Return: false on success, true if any errors are detected. * *------------------------------------------------------------------------- */ @@ -3964,7 +3964,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer haddr_t addr_increment; int base_index; haddr_t eoa; - hbool_t show_progress = FALSE; + bool show_progress = false; hid_t fapl_id = -1; /* file access property list ID */ hid_t dxpl_id = -1; /* data access property list ID */ H5FD_t *lf = NULL; /* VFD struct ptr */ @@ -3978,7 +3978,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer size_t sizes[8]; const void *bufs[8]; - pass = TRUE; + pass = true; if (mpi_rank == 0) { @@ -4031,7 +4031,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed.\n"; } } @@ -4064,7 +4064,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDwrite_vector(lf, dxpl_id, count, types, addrs, sizes, bufs) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDwrite_vector() failed (1).\n"; } } @@ -4090,7 +4090,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (H5FDread(lf, H5FD_MEM_DRAW, H5P_DEFAULT, (haddr_t)0, image_size, (void *)read_fi_buf) < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5FDread() failed.\n"; } @@ -4106,7 +4106,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != increasing_fi_buf[j]) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (1)"; printf("\nread_fi_buf[%d] = %d, %d expected.\n", j, read_fi_buf[j], @@ -4117,7 +4117,7 @@ vector_write_test_7(int file_name_id, int mpi_rank, int mpi_size, H5FD_mpio_xfer if (read_fi_buf[j] != 0) { - pass = FALSE; + pass = false; failure_mssg = "unexpected data read from file (2)"; printf("\nread_fi_buf[%d] = %d, 0 expected.\n", j, read_fi_buf[j]); @@ -4355,7 +4355,7 @@ static herr_t test_selection_io_read_verify(hid_t dxpl, int mpi_rank, hsize_t start[], hsize_t block[], H5FD_t *lf, H5FD_mem_t type, uint32_t count, hid_t mem_spaces[], hid_t file_spaces[], haddr_t offsets[], size_t element_sizes[], uint32_t rbufcount, int *erb[], - hbool_t shorten_rbufs) + bool shorten_rbufs) { int *rbuf1 = NULL; int *rbuf2 = NULL; @@ -4578,7 +4578,7 @@ test_selection_io_types_shorten(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dx /* Read and verify */ if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 2, mem_spaces, - file_spaces, addrs, element_sizes, 2, (int **)erbufs, FALSE) < 0) + file_spaces, addrs, element_sizes, 2, (int **)erbufs, false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -4630,7 +4630,7 @@ test_selection_io_types_shorten(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dx /* Read entire file buffer and verify */ if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 2, mem_spaces, - file_spaces, addrs, element_sizes, 2, (int **)fbufs, FALSE) < 0) + file_spaces, addrs, element_sizes, 2, (int **)fbufs, false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -4745,7 +4745,7 @@ test_selection_io_types_shorten(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dx /* Read and verify */ if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 2, mem_spaces, file_spaces, addrs, element_sizes, 1, (int **)&erbufs[1], - shorten_element_sizes ? TRUE : FALSE) < 0) + shorten_element_sizes ? true : false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -4789,7 +4789,7 @@ test_selection_io_types_shorten(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dx verify_start[1] = start[0] * block[1]; verify_block[1] = (block[0] * block[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 2, mem_spaces, - file_spaces, addrs, element_sizes, 2, (int **)fbufs, FALSE) < 0) + file_spaces, addrs, element_sizes, 2, (int **)fbufs, false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -4892,7 +4892,7 @@ test_selection_io_types_1d_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl verify_block[0] = (count[0] * stride[0]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&erbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -4929,7 +4929,7 @@ test_selection_io_types_1d_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl verify_block[0] = block[0]; if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&fbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -4985,7 +4985,7 @@ test_selection_io_types_1d_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl verify_block[0] = (count[0] * count[1] * stride[0]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&erbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5024,7 +5024,7 @@ test_selection_io_types_1d_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl verify_block[0] = (block[0] * block[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&fbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5094,7 +5094,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (block[0] * block[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&fbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5146,7 +5146,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (count[0] * count[1] * stride[0]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&erbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5178,7 +5178,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (block[0] * block[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&fbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5228,7 +5228,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (count[0] * count[1] * stride[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&erbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5260,7 +5260,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (block[0] * block[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&fbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5326,7 +5326,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (count[0] * count[1] * stride[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&erbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5358,7 +5358,7 @@ test_selection_io_types_2d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (block[0] * block[1]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[1], &file_spaces[1], &addrs[1], element_sizes, 1, (int **)&fbufs[1], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5422,7 +5422,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&fbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5468,7 +5468,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (count[0] * stride[0]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&erbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5496,7 +5496,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = block[0]; if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&fbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5542,7 +5542,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = count[0]; if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&erbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5570,7 +5570,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = block[0]; if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&fbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5616,7 +5616,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = (count[0] * stride[0]); if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&erbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); @@ -5644,7 +5644,7 @@ test_selection_io_types_1d(int mpi_rank, int mpi_size, H5FD_t *lf, hid_t dxpl, H verify_block[0] = block[0]; if (test_selection_io_read_verify(dxpl, mpi_rank, verify_start, verify_block, lf, type, 1, &mem_spaces[0], &file_spaces[0], &addrs[0], element_sizes, 1, (int **)&fbufs[0], - FALSE) < 0) + false) < 0) P_TEST_ERROR; MPI_Barrier(comm); diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 0b94be9..fcdf8fe 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -267,9 +267,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), "H5Pset_fapl_mpio succeeded"); - ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE); + ret = H5Pset_all_coll_metadata_ops(ret_pl, true); VRFY((ret >= 0), "H5Pset_all_coll_metadata_ops succeeded"); - ret = H5Pset_coll_metadata_write(ret_pl, TRUE); + ret = H5Pset_coll_metadata_write(ret_pl, true); VRFY((ret >= 0), "H5Pset_coll_metadata_write succeeded"); return (ret_pl); } diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h index 631ad44..6ac8080 100644 --- a/testpar/testphdf5.h +++ b/testpar/testphdf5.h @@ -27,12 +27,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 */ @@ -82,8 +82,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" |