diff options
Diffstat (limited to 'test/evict_on_close.c')
| -rw-r--r-- | test/evict_on_close.c | 515 |
1 files changed, 251 insertions, 264 deletions
diff --git a/test/evict_on_close.c b/test/evict_on_close.c index 9f6607a..fb88826 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -16,23 +16,22 @@ * are located in cache.c. */ -#define H5C_FRIEND /*suppress error about including H5Cpkg */ -#define H5D_FRIEND /*suppress error about including H5Dpkg */ +#define H5C_FRIEND /*suppress error about including H5Cpkg */ +#define H5D_FRIEND /*suppress error about including H5Dpkg */ #define H5D_TESTING -#define H5F_FRIEND /*suppress error about including H5Fpkg */ +#define H5F_FRIEND /*suppress error about including H5Fpkg */ #define H5F_TESTING -#define H5G_FRIEND /*suppress error about including H5Gpkg */ -#define H5I_FRIEND /*suppress error about including H5Ipkg */ +#define H5G_FRIEND /*suppress error about including H5Gpkg */ +#define H5I_FRIEND /*suppress error about including H5Ipkg */ #define H5I_TESTING - #include "h5test.h" #include "H5Cpkg.h" #include "H5Dpkg.h" #include "H5Fpkg.h" #include "H5Gpkg.h" #include "H5Ipkg.h" -#include "H5VLprivate.h" /* Virtual Object Layer */ +#include "H5VLprivate.h" /* Virtual Object Layer */ /* Evict on close is not supported under parallel at this time. * In the meantime, we just run a simple check that EoC can't be @@ -44,42 +43,39 @@ /* (Requires debug build of the library) */ /* #define EOC_MANUAL_INSPECTION */ -const char *FILENAMES[] = { - "evict-on-close", /* 0 */ - NULL -}; -#define FILENAME_BUF_SIZE 1024 +const char *FILENAMES[] = {"evict-on-close", /* 0 */ + NULL}; +#define FILENAME_BUF_SIZE 1024 /* Group names */ -#define GROUP_OLD_STYLE_NAME "old_style_groups" -#define GROUP_NEW_STYLE_NAME "new_style_groups" +#define GROUP_OLD_STYLE_NAME "old_style_groups" +#define GROUP_NEW_STYLE_NAME "new_style_groups" /* Dataset names */ -#define DSET_COMPACT_NAME "compact" -#define DSET_CONTIGUOUS_NAME "contiguous" -#define DSET_BTREE_NAME "v1_btree" -#define DSET_EARRAY_NAME "earray" -#define DSET_BT2_NAME "v2_btree" -#define DSET_FARRAY_NAME "farray" -#define DSET_SINGLE_NAME "single" +#define DSET_COMPACT_NAME "compact" +#define DSET_CONTIGUOUS_NAME "contiguous" +#define DSET_BTREE_NAME "v1_btree" +#define DSET_EARRAY_NAME "earray" +#define DSET_BT2_NAME "v2_btree" +#define DSET_FARRAY_NAME "farray" +#define DSET_SINGLE_NAME "single" /* Number of data elements in a dataset */ -#define NELEMENTS 1024 +#define NELEMENTS 1024 /* Number of subgroups in each style of group */ -#define NSUBGROUPS 128 +#define NSUBGROUPS 128 /* Max size of subgroup name, not including NULL */ -#define SUBGROUP_NAME_SIZE 16 +#define SUBGROUP_NAME_SIZE 16 /* Prototypes */ static hbool_t verify_tag_not_in_cache(const H5F_t *f, haddr_t tag); -static herr_t check_evict_on_close_api(void); -static hid_t generate_eoc_test_file(hid_t fapl_id); -static herr_t check_dset_scheme(hid_t fid, const char *dset_name); -static herr_t check_group_layout(hid_t fid, const char *group_name); +static herr_t check_evict_on_close_api(void); +static hid_t generate_eoc_test_file(hid_t fapl_id); +static herr_t check_dset_scheme(hid_t fid, const char *dset_name); +static herr_t check_group_layout(hid_t fid, const char *group_name); - /*------------------------------------------------------------------------- * Function: verify_tag_not_in_cache() * @@ -93,18 +89,18 @@ static herr_t check_group_layout(hid_t fid, const char *group_name); static H5_ATTR_PURE hbool_t verify_tag_not_in_cache(const H5F_t *f, haddr_t tag) { - H5C_t *cache_ptr = NULL; /* cache pointer */ - int i = 0; /* iterator */ + H5C_t *cache_ptr = NULL; /* cache pointer */ + int i = 0; /* iterator */ /* Get Internal Cache Pointers */ cache_ptr = f->shared->cache; - for(i = 0; i < H5C__HASH_TABLE_LEN; i++) { - H5C_cache_entry_t *entry_ptr; /* entry pointer */ + for (i = 0; i < H5C__HASH_TABLE_LEN; i++) { + H5C_cache_entry_t *entry_ptr; /* entry pointer */ entry_ptr = cache_ptr->index[i]; - while(entry_ptr != NULL) { - if(tag == entry_ptr->tag_info->tag) + while (entry_ptr != NULL) { + if (tag == entry_ptr->tag_info->tag) return TRUE; else entry_ptr = entry_ptr->ht_next; @@ -114,7 +110,6 @@ verify_tag_not_in_cache(const H5F_t *f, haddr_t tag) return FALSE; } /* end verify_tag_not_in_cache() */ - /*------------------------------------------------------------------------- * Function: generate_eoc_test_file() * @@ -128,22 +123,22 @@ verify_tag_not_in_cache(const H5F_t *f, haddr_t tag) static hid_t generate_eoc_test_file(hid_t fapl_id) { - char filename[FILENAME_BUF_SIZE]; /* decorated file name */ - hid_t fid = -1; /* file ID (returned) */ - hid_t fapl_copy_id = -1; /* ID of copied fapl */ - hid_t gid1 = -1, gid2 = -1; /* group IDs */ - hid_t sid = -1; /* dataspace ID */ - hid_t dcpl_id = -1; /* dataset creation plist */ - hid_t did = -1; /* dataset ID */ - int rank; /* # of array dimensions */ - hsize_t current_dims[2]; /* current dataset size */ - hsize_t maximum_dims[2]; /* maximum dataset size */ - hsize_t chunk_dims[2]; /* chunk dimensions */ - H5D_chunk_index_t idx_type; /* dataset chunk index type */ - H5D_layout_t layout_type; /* dataset layout type */ - int *data = NULL; /* buffer for fake data */ - int n; /* # of data elements */ - int i; /* iterator (# subgroups) */ + char filename[FILENAME_BUF_SIZE]; /* decorated file name */ + hid_t fid = -1; /* file ID (returned) */ + hid_t fapl_copy_id = -1; /* ID of copied fapl */ + hid_t gid1 = -1, gid2 = -1; /* group IDs */ + hid_t sid = -1; /* dataspace ID */ + hid_t dcpl_id = -1; /* dataset creation plist */ + hid_t did = -1; /* dataset ID */ + int rank; /* # of array dimensions */ + hsize_t current_dims[2]; /* current dataset size */ + hsize_t maximum_dims[2]; /* maximum dataset size */ + hsize_t chunk_dims[2]; /* chunk dimensions */ + H5D_chunk_index_t idx_type; /* dataset chunk index type */ + H5D_layout_t layout_type; /* dataset layout type */ + int * data = NULL; /* buffer for fake data */ + int n; /* # of data elements */ + int i; /* iterator (# subgroups) */ TESTING("generating evict-on-close test file"); @@ -151,20 +146,19 @@ generate_eoc_test_file(hid_t fapl_id) h5_fixname(FILENAMES[0], fapl_id, filename, sizeof(filename)); /* Copy the fapl and set the latest file format */ - if((fapl_copy_id = H5Pcopy(fapl_id)) < 0) + if ((fapl_copy_id = H5Pcopy(fapl_id)) < 0) TEST_ERROR; - if(H5Pset_libver_bounds(fapl_copy_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + if (H5Pset_libver_bounds(fapl_copy_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR; /* Create a data buffer for dataset writes */ - if(NULL == (data = (int *)HDcalloc(NELEMENTS, sizeof(int)))) + if (NULL == (data = (int *)HDcalloc(NELEMENTS, sizeof(int)))) TEST_ERROR; /* Create file */ - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0) TEST_ERROR; - /*******************************************/ /* CREATE OBJECTS WITH THE OLD FILE FORMAT */ /*******************************************/ @@ -182,25 +176,25 @@ generate_eoc_test_file(hid_t fapl_id) * ensure that the file data structures for groups include * multiple cache entries. */ - if((gid1 = H5Gcreate2(fid, GROUP_OLD_STYLE_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((gid1 = H5Gcreate2(fid, GROUP_OLD_STYLE_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create sub-groups */ - for(i = 0; i < NSUBGROUPS; i++) { + for (i = 0; i < NSUBGROUPS; i++) { char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); - if(HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) + if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR - if((gid2 = H5Gcreate2(gid1, subgroup_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((gid2 = H5Gcreate2(gid1, subgroup_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; - if(H5Gclose(gid2) < 0) + if (H5Gclose(gid2) < 0) TEST_ERROR; } - if(H5Gclose(gid1) < 0) + if (H5Gclose(gid1) < 0) TEST_ERROR; /********************************************************************/ @@ -216,53 +210,52 @@ generate_eoc_test_file(hid_t fapl_id) /********************/ /* Create dataspace */ - n = NELEMENTS; - rank = 1; + n = NELEMENTS; + rank = 1; current_dims[0] = (hsize_t)n; maximum_dims[0] = H5S_UNLIMITED; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dcpl and set up chunking */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; chunk_dims[0] = 1; - if(H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) + if (H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_BTREE_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_BTREE_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; /* Ensure we're using the correct chunk indexing scheme */ - if(H5D__layout_idx_type_test(did, &idx_type) < 0) + if (H5D__layout_idx_type_test(did, &idx_type) < 0) TEST_ERROR; - if(idx_type != H5D_CHUNK_IDX_BTREE) + if (idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using version 1 B-tree as the chunk index"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; - if(H5Pclose(dcpl_id) < 0) + if (H5Pclose(dcpl_id) < 0) TEST_ERROR; - /**********************************************/ /* CREATE OBJECTS WITH THE LATEST FILE FORMAT */ /**********************************************/ /* Close the file */ - if(H5Fclose(fid) < 0) + if (H5Fclose(fid) < 0) TEST_ERROR; /* Reopen the file with the "latest file format" fapl */ - if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl_copy_id)) < 0) + if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl_copy_id)) < 0) TEST_ERROR; /*******************/ @@ -278,25 +271,25 @@ generate_eoc_test_file(hid_t fapl_id) * ensure that the file data structures for groups include * multiple cache entries. */ - if((gid1 = H5Gcreate2(fid, GROUP_NEW_STYLE_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((gid1 = H5Gcreate2(fid, GROUP_NEW_STYLE_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; /* Create sub-groups */ - for(i = 0; i < NSUBGROUPS; i++) { + for (i = 0; i < NSUBGROUPS; i++) { char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); - if(HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) + if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR - if((gid2 = H5Gcreate2(gid1, subgroup_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((gid2 = H5Gcreate2(gid1, subgroup_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; - if(H5Gclose(gid2) < 0) + if (H5Gclose(gid2) < 0) TEST_ERROR; } - if(H5Gclose(gid1) < 0) + if (H5Gclose(gid1) < 0) TEST_ERROR; /********************************************************************/ @@ -308,40 +301,40 @@ generate_eoc_test_file(hid_t fapl_id) /********************/ /* Create dataspace */ - n = NELEMENTS; - rank = 1; + n = NELEMENTS; + rank = 1; current_dims[0] = (hsize_t)n; maximum_dims[0] = H5S_UNLIMITED; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dcpl and set up chunking */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; chunk_dims[0] = 1; - if(H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) + if (H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_EARRAY_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_EARRAY_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; /* Ensure we're using the correct chunk indexing scheme */ - if(H5D__layout_idx_type_test(did, &idx_type) < 0) + if (H5D__layout_idx_type_test(did, &idx_type) < 0) TEST_ERROR; - if(idx_type != H5D_CHUNK_IDX_EARRAY) + if (idx_type != H5D_CHUNK_IDX_EARRAY) FAIL_PUTS_ERROR("should be using extensible array as the chunk index"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; - if(H5Pclose(dcpl_id) < 0) + if (H5Pclose(dcpl_id) < 0) TEST_ERROR; /********************/ @@ -349,43 +342,43 @@ generate_eoc_test_file(hid_t fapl_id) /********************/ /* Create dataspace */ - n = NELEMENTS; - rank = 2; + n = NELEMENTS; + rank = 2; current_dims[0] = (hsize_t)2; - current_dims[1] = (hsize_t)(n/2); + current_dims[1] = (hsize_t)(n / 2); maximum_dims[0] = H5S_UNLIMITED; maximum_dims[1] = H5S_UNLIMITED; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dcpl and set up chunking */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; chunk_dims[0] = 1; chunk_dims[1] = 1; - if(H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) + if (H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_BT2_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_BT2_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; /* Ensure we're using the correct chunk indexing scheme */ - if(H5D__layout_idx_type_test(did, &idx_type) < 0) + if (H5D__layout_idx_type_test(did, &idx_type) < 0) TEST_ERROR; - if(idx_type != H5D_CHUNK_IDX_BT2) + if (idx_type != H5D_CHUNK_IDX_BT2) FAIL_PUTS_ERROR("should be using version 2 B-tree as the chunk index"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; - if(H5Pclose(dcpl_id) < 0) + if (H5Pclose(dcpl_id) < 0) TEST_ERROR; /***************/ @@ -393,41 +386,41 @@ generate_eoc_test_file(hid_t fapl_id) /***************/ /* Create dataspace */ - n = NELEMENTS; - rank = 1; + n = NELEMENTS; + rank = 1; current_dims[0] = (hsize_t)n; maximum_dims[0] = (hsize_t)n; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dcpl and set up chunking */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; chunk_dims[0] = 1; chunk_dims[1] = 1; - if(H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) + if (H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_FARRAY_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_FARRAY_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; /* Ensure we're using the correct chunk indexing scheme */ - if(H5D__layout_idx_type_test(did, &idx_type) < 0) + if (H5D__layout_idx_type_test(did, &idx_type) < 0) TEST_ERROR; - if(idx_type != H5D_CHUNK_IDX_FARRAY) + if (idx_type != H5D_CHUNK_IDX_FARRAY) FAIL_PUTS_ERROR("should be using fixed array as the chunk index"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; - if(H5Pclose(dcpl_id) < 0) + if (H5Pclose(dcpl_id) < 0) TEST_ERROR; /****************/ @@ -435,41 +428,41 @@ generate_eoc_test_file(hid_t fapl_id) /****************/ /* Create dataspace */ - n = NELEMENTS; - rank = 1; + n = NELEMENTS; + rank = 1; current_dims[0] = (hsize_t)n; maximum_dims[0] = (hsize_t)n; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dcpl and set up chunking */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; chunk_dims[0] = (hsize_t)n; chunk_dims[1] = (hsize_t)n; - if(H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) + if (H5Pset_chunk(dcpl_id, rank, chunk_dims) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_SINGLE_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_SINGLE_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR; /* Ensure we're using the correct chunk indexing scheme */ - if(H5D__layout_idx_type_test(did, &idx_type) < 0) + if (H5D__layout_idx_type_test(did, &idx_type) < 0) TEST_ERROR; - if(idx_type != H5D_CHUNK_IDX_SINGLE) + if (idx_type != H5D_CHUNK_IDX_SINGLE) FAIL_PUTS_ERROR("should be using single chunk as the chunk index"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; - if(H5Pclose(dcpl_id) < 0) + if (H5Pclose(dcpl_id) < 0) TEST_ERROR; /**************/ @@ -477,31 +470,32 @@ generate_eoc_test_file(hid_t fapl_id) /**************/ /* Create dataspace */ - n = NELEMENTS; - rank = 1; + n = NELEMENTS; + rank = 1; current_dims[0] = (hsize_t)n; maximum_dims[0] = (hsize_t)n; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_CONTIGUOUS_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_CONTIGUOUS_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, + H5P_DEFAULT)) < 0) TEST_ERROR; /* Ensure we're using the correct layout scheme */ - if(H5D__layout_type_test(did, &layout_type) < 0) + if (H5D__layout_type_test(did, &layout_type) < 0) TEST_ERROR; - if(layout_type != H5D_CONTIGUOUS) + if (layout_type != H5D_CONTIGUOUS) FAIL_PUTS_ERROR("should be using contiguous layout"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; /***********/ @@ -509,39 +503,40 @@ generate_eoc_test_file(hid_t fapl_id) /***********/ /* Create dataspace */ - n = 1; - rank = 1; + n = 1; + rank = 1; current_dims[0] = (hsize_t)n; maximum_dims[0] = (hsize_t)n; - if((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) + if ((sid = H5Screate_simple(rank, current_dims, maximum_dims)) < 0) TEST_ERROR; /* Create dcpl and set up compact layout */ - if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR; - if(H5Pset_layout(dcpl_id, H5D_COMPACT) < 0) + if (H5Pset_layout(dcpl_id, H5D_COMPACT) < 0) TEST_ERROR; /* Create dataset */ - if((did = H5Dcreate2(fid, DSET_COMPACT_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, DSET_COMPACT_NAME, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < + 0) TEST_ERROR; /* Ensure we're using the correct layout scheme */ - if(H5D__layout_type_test(did, &layout_type) < 0) + if (H5D__layout_type_test(did, &layout_type) < 0) TEST_ERROR; - if(layout_type != H5D_COMPACT) + if (layout_type != H5D_COMPACT) FAIL_PUTS_ERROR("should be using compact layout"); /* Write a bunch of fake data */ - if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Close IDs for this dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR; - if(H5Pclose(dcpl_id) < 0) + if (H5Pclose(dcpl_id) < 0) TEST_ERROR; /********/ @@ -549,7 +544,7 @@ generate_eoc_test_file(hid_t fapl_id) /********/ /* Close/free everything else */ - if(H5Pclose(fapl_copy_id) < 0) + if (H5Pclose(fapl_copy_id) < 0) TEST_ERROR; HDfree(data); @@ -558,7 +553,8 @@ generate_eoc_test_file(hid_t fapl_id) return fid; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Gclose(gid1); H5Gclose(gid2); H5Fclose(fid); @@ -566,7 +562,8 @@ error: H5Sclose(sid); H5Pclose(dcpl_id); H5Pclose(fapl_copy_id); - } H5E_END_TRY; + } + H5E_END_TRY; HDfree(data); @@ -575,7 +572,6 @@ error: } /* end generate_eoc_test_file() */ - /*------------------------------------------------------------------------- * Function: check_group_layout() * @@ -589,17 +585,17 @@ error: static herr_t check_group_layout(hid_t fid, const char *group_name) { - H5F_t *file_ptr = NULL; /* ptr to internal file struct */ - hid_t gid1 = -1, gid2 = -1; /* group IDs */ - H5G_t *grp_ptr = NULL; /* ptr to internal group struct */ - haddr_t tag1, tag2; /* MD cache tags for groups */ - uint32_t before, during, after; /* cache sizes */ - int i; /* iterator */ + H5F_t * file_ptr = NULL; /* ptr to internal file struct */ + hid_t gid1 = -1, gid2 = -1; /* group IDs */ + H5G_t * grp_ptr = NULL; /* ptr to internal group struct */ + haddr_t tag1, tag2; /* MD cache tags for groups */ + uint32_t before, during, after; /* cache sizes */ + int i; /* iterator */ /* NOTE: The TESTING() macro is called in main() */ /* Get a pointer to the file struct */ - if(NULL == (file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE))) + if (NULL == (file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE))) TEST_ERROR; /* Record the number of cache entries */ @@ -607,39 +603,38 @@ check_group_layout(hid_t fid, const char *group_name) #ifdef EOC_MANUAL_INSPECTION HDprintf("\nCACHE BEFORE GROUP OPEN:\n"); - if(H5AC_dump_cache(file_ptr) < 0) + if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; HDprintf("NUMBER OF CACHE ENTRIES: %u\n", before); #endif /* Open the main group and get its tag */ - if((gid1 = H5Gopen2(fid, group_name, H5P_DEFAULT)) < 0) + if ((gid1 = H5Gopen2(fid, group_name, H5P_DEFAULT)) < 0) TEST_ERROR; - if(NULL == (grp_ptr = (H5G_t *)H5VL_object_verify(gid1, H5I_GROUP))) + if (NULL == (grp_ptr = (H5G_t *)H5VL_object_verify(gid1, H5I_GROUP))) TEST_ERROR; tag1 = grp_ptr->oloc.addr; - /* Open and close all sub-groups */ - for(i = 0; i < NSUBGROUPS; i++) { + for (i = 0; i < NSUBGROUPS; i++) { char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); - if(HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) + if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR - if((gid2 = H5Gopen2(gid1, subgroup_name, H5P_DEFAULT)) < 0) + if ((gid2 = H5Gopen2(gid1, subgroup_name, H5P_DEFAULT)) < 0) TEST_ERROR; - if(NULL == (grp_ptr = (H5G_t *)H5VL_object_verify(gid2, H5I_GROUP))) + if (NULL == (grp_ptr = (H5G_t *)H5VL_object_verify(gid2, H5I_GROUP))) TEST_ERROR; tag2 = grp_ptr->oloc.addr; - if(H5Gclose(gid2) < 0) + if (H5Gclose(gid2) < 0) TEST_ERROR; - if(TRUE == verify_tag_not_in_cache(file_ptr, tag2)) + if (TRUE == verify_tag_not_in_cache(file_ptr, tag2)) TEST_ERROR; } /* end for */ @@ -648,14 +643,14 @@ check_group_layout(hid_t fid, const char *group_name) #ifdef EOC_MANUAL_INSPECTION HDprintf("\nCACHE AFTER OPENING GROUPS (WHILE OPEN):\n"); - if(H5AC_dump_cache(file_ptr) < 0) + if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; HDprintf("MAIN GROUP TAG: %#X\n", tag1); HDprintf("NUMBER OF CACHE ENTRIES: %u\n", during); #endif /* Close the main group */ - if(H5Gclose(gid1) < 0) + if (H5Gclose(gid1) < 0) TEST_ERROR; /* Record the number of cache entries */ @@ -663,33 +658,34 @@ check_group_layout(hid_t fid, const char *group_name) #ifdef EOC_MANUAL_INSPECTION HDprintf("\nCACHE AFTER CLOSING GROUPS:\n"); - if(H5AC_dump_cache(file_ptr) < 0) + if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; HDprintf("NUMBER OF CACHE ENTRIES: %u\n", after); #endif /* Ensure that the cache does not contain entries with the tag */ - if(TRUE == verify_tag_not_in_cache(file_ptr, tag1)) + if (TRUE == verify_tag_not_in_cache(file_ptr, tag1)) TEST_ERROR; /* Compare the number of cache entries */ - if(before != after || before == during) + if (before != after || before == during) TEST_ERROR; PASSED(); return SUCCEED; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Gclose(gid1); H5Gclose(gid2); - } H5E_END_TRY; + } + H5E_END_TRY; H5_FAILED(); return FAIL; } /* end check_group_layout() */ - /*------------------------------------------------------------------------- * Function: check_dset_scheme() * @@ -703,21 +699,21 @@ error: static herr_t check_dset_scheme(hid_t fid, const char *dset_name) { - H5F_t *file_ptr = NULL; /* ptr to internal file struct */ - hid_t did = -1; /* dataset ID */ - H5D_t *dset_ptr = NULL; /* ptr to internal dset struct */ - haddr_t tag; /* MD cache tag for dataset */ - int *data = NULL; /* buffer for fake data */ - uint32_t before, during, after; /* cache sizes */ + H5F_t * file_ptr = NULL; /* ptr to internal file struct */ + hid_t did = -1; /* dataset ID */ + H5D_t * dset_ptr = NULL; /* ptr to internal dset struct */ + haddr_t tag; /* MD cache tag for dataset */ + int * data = NULL; /* buffer for fake data */ + uint32_t before, during, after; /* cache sizes */ /* NOTE: The TESTING() macro is called in main() */ /* Get a pointer to the file struct */ - if(NULL == (file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE))) + if (NULL == (file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE))) TEST_ERROR; /* Create the data buffer */ - if(NULL == (data = (int *)HDcalloc(NELEMENTS, sizeof(int)))) + if (NULL == (data = (int *)HDcalloc(NELEMENTS, sizeof(int)))) TEST_ERROR; /* Record the number of cache entries */ @@ -725,22 +721,22 @@ check_dset_scheme(hid_t fid, const char *dset_name) #ifdef EOC_MANUAL_INSPECTION HDprintf("\nCACHE BEFORE DATASET OPEN:\n"); - if(H5AC_dump_cache(file_ptr) < 0) + if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; HDprintf("NUMBER OF CACHE ENTRIES: %u\n", before); #endif /* Open dataset and get the metadata tag */ - if((did = H5Dopen2(fid, dset_name, H5P_DEFAULT)) < 0) + if ((did = H5Dopen2(fid, dset_name, H5P_DEFAULT)) < 0) TEST_ERROR; - if(NULL == (dset_ptr = (H5D_t *)H5VL_object_verify(did, H5I_DATASET))) + if (NULL == (dset_ptr = (H5D_t *)H5VL_object_verify(did, H5I_DATASET))) TEST_ERROR; tag = dset_ptr->oloc.addr; /* Read data from the dataset so the cache gets populated with chunk entries * and the like. */ - if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) + if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR; /* Record the number of cache entries */ @@ -748,14 +744,14 @@ check_dset_scheme(hid_t fid, const char *dset_name) #ifdef EOC_MANUAL_INSPECTION HDprintf("\nCACHE AFTER DATA READ (WHILE OPEN):\n"); - if(H5AC_dump_cache(file_ptr) < 0) + if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; HDprintf("TAG: %#X\n", tag); HDprintf("NUMBER OF CACHE ENTRIES: %u\n", during); #endif /* Close the dataset */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR; /* Record the number of cache entries */ @@ -763,17 +759,17 @@ check_dset_scheme(hid_t fid, const char *dset_name) #ifdef EOC_MANUAL_INSPECTION HDprintf("\nCACHE AFTER DATASET CLOSE:\n"); - if(H5AC_dump_cache(file_ptr) < 0) + if (H5AC_dump_cache(file_ptr) < 0) TEST_ERROR; HDprintf("NUMBER OF CACHE ENTRIES: %u\n", after); #endif /* Ensure that the cache does not contain entries with the tag */ - if(TRUE == verify_tag_not_in_cache(file_ptr, tag)) + if (TRUE == verify_tag_not_in_cache(file_ptr, tag)) TEST_ERROR; /* Compare the number of cache entries */ - if(before != after || before == during) + if (before != after || before == during) TEST_ERROR; HDfree(data); @@ -782,16 +778,14 @@ check_dset_scheme(hid_t fid, const char *dset_name) return SUCCEED; error: - H5E_BEGIN_TRY { - H5Dclose(did); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Dclose(did); } + H5E_END_TRY; H5_FAILED(); return FAIL; } /* check_dset_scheme() */ - /*------------------------------------------------------------------------- * Function: check_evict_on_close_api() * @@ -805,63 +799,61 @@ error: static herr_t check_evict_on_close_api(void) { - hid_t fapl_id = -1; - hid_t dapl_id = -1; - hbool_t evict_on_close; - herr_t status; + hid_t fapl_id = -1; + hid_t dapl_id = -1; + hbool_t evict_on_close; + herr_t status; TESTING("evict on close API"); /* Create a fapl */ - if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) + if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; /* Check the default */ evict_on_close = TRUE; - if(H5Pget_evict_on_close(fapl_id, &evict_on_close) < 0) + if (H5Pget_evict_on_close(fapl_id, &evict_on_close) < 0) TEST_ERROR; - if(evict_on_close != FALSE) + if (evict_on_close != FALSE) FAIL_PUTS_ERROR("Incorrect default evict on close value."); /* Set the evict on close property */ evict_on_close = TRUE; - if(H5Pset_evict_on_close(fapl_id, evict_on_close) < 0) + if (H5Pset_evict_on_close(fapl_id, evict_on_close) < 0) TEST_ERROR; /* Make sure we can get it back out */ evict_on_close = FALSE; - if(H5Pget_evict_on_close(fapl_id, &evict_on_close) < 0) + if (H5Pget_evict_on_close(fapl_id, &evict_on_close) < 0) TEST_ERROR; - if(evict_on_close != TRUE) + if (evict_on_close != TRUE) FAIL_PUTS_ERROR("Incorrect evict on close value."); /* close fapl */ - if(H5Pclose(fapl_id) < 0) + if (H5Pclose(fapl_id) < 0) TEST_ERROR; /**********************************************/ /* Trying passing in a non-fapl property list */ /**********************************************/ - if((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) + if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) TEST_ERROR; /* ensure using an incorrect access plist fails */ - H5E_BEGIN_TRY { - status = H5Pset_evict_on_close(dapl_id, evict_on_close); - } H5E_END_TRY; - if(status >= 0) + H5E_BEGIN_TRY { status = H5Pset_evict_on_close(dapl_id, evict_on_close); } + H5E_END_TRY; + if (status >= 0) FAIL_PUTS_ERROR("H5Pset_evict_on_close() accepted invalid access plist."); /* ensure an invalid plist fails */ - H5E_BEGIN_TRY { - status = H5Pget_evict_on_close(H5I_INVALID_HID, &evict_on_close); - } H5E_END_TRY; - if(status >= 0) + H5E_BEGIN_TRY { status = H5Pget_evict_on_close(H5I_INVALID_HID, &evict_on_close); } + H5E_END_TRY; + if (status >= 0) FAIL_PUTS_ERROR("H5Pget_evict_on_close() accepted invalid hid_t."); /* close dapl */ - if(H5Pclose(dapl_id) < 0) + if (H5Pclose(dapl_id) < 0) TEST_ERROR; PASSED(); @@ -873,7 +865,6 @@ error: } /* check_evict_on_close_api() */ - /*------------------------------------------------------------------------- * Function: main * @@ -884,9 +875,9 @@ error: int main(void) { - hid_t fapl_id = -1; /* VFD-specific fapl */ - hid_t fid = -1; /* file ID */ - unsigned nerrors = 0; /* number of test errors */ + hid_t fapl_id = -1; /* VFD-specific fapl */ + hid_t fid = -1; /* file ID */ + unsigned nerrors = 0; /* number of test errors */ HDprintf("Testing evict-on-close cache behavior\n"); @@ -897,19 +888,19 @@ main(void) nerrors += check_evict_on_close_api() < 0 ? 1 : 0; /* Set up VFD-specific fapl */ - if((fapl_id = h5_fileaccess()) < 0) { + if ((fapl_id = h5_fileaccess()) < 0) { nerrors++; PUTS_ERROR("Unable to get VFD-specific fapl\n"); } /* end if */ /* Set evict-on-close property */ - if(H5Pset_evict_on_close(fapl_id, TRUE) < 0) { + if (H5Pset_evict_on_close(fapl_id, TRUE) < 0) { nerrors++; PUTS_ERROR("Unable to set evict-on-close property\n"); } /* end if */ /* Generate the test file */ - if((fid = generate_eoc_test_file(fapl_id)) < 0) { + if ((fid = generate_eoc_test_file(fapl_id)) < 0) { nerrors++; PUTS_ERROR("Unable to generate test file\n"); } /* end if */ @@ -918,42 +909,42 @@ main(void) * PASSED() and H5_FAILED() are handled in check_configuration() */ TESTING("evict on close with version 1 B-tree chunk index"); - nerrors += check_dset_scheme(fid, DSET_BTREE_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_BTREE_NAME) < 0 ? 1 : 0; TESTING("evict on close with extensible array chunk index"); - nerrors += check_dset_scheme(fid, DSET_EARRAY_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_EARRAY_NAME) < 0 ? 1 : 0; TESTING("evict on close with version 2 B-tree chunk index"); - nerrors += check_dset_scheme(fid, DSET_BT2_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_BT2_NAME) < 0 ? 1 : 0; TESTING("evict on close with fixed array chunk index"); - nerrors += check_dset_scheme(fid, DSET_FARRAY_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_FARRAY_NAME) < 0 ? 1 : 0; TESTING("evict on close with \'single chunk\' chunk index"); - nerrors += check_dset_scheme(fid, DSET_SINGLE_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_SINGLE_NAME) < 0 ? 1 : 0; TESTING("evict on close with contiguous layout"); - nerrors += check_dset_scheme(fid, DSET_CONTIGUOUS_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_CONTIGUOUS_NAME) < 0 ? 1 : 0; TESTING("evict on close with compact layout"); - nerrors += check_dset_scheme(fid, DSET_COMPACT_NAME) < 0 ? 1 : 0; + nerrors += check_dset_scheme(fid, DSET_COMPACT_NAME) < 0 ? 1 : 0; /* Run tests with old- and new-style groups * PASSED() and H5_FAILED() are handled in check_configuration() */ TESTING("evict on close with old-style groups"); - nerrors += check_group_layout(fid, GROUP_OLD_STYLE_NAME) < 0 ? 1 : 0; + nerrors += check_group_layout(fid, GROUP_OLD_STYLE_NAME) < 0 ? 1 : 0; TESTING("evict on close with new-style groups"); - nerrors += check_group_layout(fid, GROUP_NEW_STYLE_NAME) < 0 ? 1 : 0; + nerrors += check_group_layout(fid, GROUP_NEW_STYLE_NAME) < 0 ? 1 : 0; /* Close the test file */ - if(H5Fclose(fid) < 0) { + if (H5Fclose(fid) < 0) { nerrors++; PUTS_ERROR("Unable to close the test file.\n"); } /* end if */ /* Clean up files and close the VFD-specific fapl */ h5_delete_all_test_files(FILENAMES, fapl_id); - if(H5Pclose(fapl_id) < 0) { + if (H5Pclose(fapl_id) < 0) { nerrors++; PUTS_ERROR("Unable to close VFD-specific fapl.\n"); } /* end if */ - if(nerrors) + if (nerrors) goto error; HDprintf("All evict-on-close tests passed.\n"); @@ -962,14 +953,15 @@ main(void) error: - HDprintf("***** %u evict-on-close test%s FAILED! *****\n", - nerrors, nerrors > 1 ? "S" : ""); + HDprintf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); h5_delete_all_test_files(FILENAMES, fapl_id); - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Fclose(fid); H5Pclose(fapl_id); - } H5E_END_TRY; + } + H5E_END_TRY; HDexit(EXIT_FAILURE); @@ -977,7 +969,6 @@ error: #else - /*------------------------------------------------------------------------- * Function: check_evict_on_close_parallel_fail() * @@ -991,26 +982,25 @@ error: static herr_t check_evict_on_close_parallel_fail(void) { - hid_t fapl_id = -1; - hbool_t evict_on_close; - herr_t status; + hid_t fapl_id = -1; + hbool_t evict_on_close; + herr_t status; TESTING("evict on close fails in parallel"); /* Create a fapl */ - if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) + if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; /* Set the evict on close property (should fail)*/ evict_on_close = TRUE; - H5E_BEGIN_TRY { - status = H5Pset_evict_on_close(fapl_id, evict_on_close); - } H5E_END_TRY; - if(status >= 0) + H5E_BEGIN_TRY { status = H5Pset_evict_on_close(fapl_id, evict_on_close); } + H5E_END_TRY; + if (status >= 0) FAIL_PUTS_ERROR("H5Pset_evict_on_close() did not fail in parallel HDF5."); /* close fapl */ - if(H5Pclose(fapl_id) < 0) + if (H5Pclose(fapl_id) < 0) TEST_ERROR; PASSED(); @@ -1022,7 +1012,6 @@ error: } /* check_evict_on_close_parallel_fail() */ - /*------------------------------------------------------------------------- * Function: main (parallel version) * @@ -1033,7 +1022,7 @@ error: int main(void) { - unsigned nerrors = 0; /* number of test errors */ + unsigned nerrors = 0; /* number of test errors */ HDprintf("Testing evict-on-close cache behavior\n"); @@ -1043,7 +1032,7 @@ main(void) /* Test that EoC fails in parallel HDF5 */ nerrors += check_evict_on_close_parallel_fail() < 0 ? 1 : 0; - if(nerrors) + if (nerrors) goto error; HDprintf("All evict-on-close tests passed.\n"); @@ -1053,12 +1042,10 @@ main(void) error: - HDprintf("***** %u evict-on-close test%s FAILED! *****\n", - nerrors, nerrors > 1 ? "S" : ""); + HDprintf("***** %u evict-on-close test%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); HDexit(EXIT_FAILURE); } /* main() - parallel */ #endif /* H5_HAVE_PARALLEL */ - |