diff options
Diffstat (limited to 'test/set_extent.c')
| -rw-r--r-- | test/set_extent.c | 1886 |
1 files changed, 914 insertions, 972 deletions
diff --git a/test/set_extent.c b/test/set_extent.c index 17bdb1b..133ba48 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -27,122 +27,98 @@ *------------------------------------------------------------------------- */ -const char *FILENAME[] = { - "set_extent1", - "set_extent2", - "set_extent3", - "set_extent4", - "set_extent5", - "set_extent6", - NULL -}; - -#define NAME_BUF_SIZE 1024 +const char *FILENAME[] = {"set_extent1", "set_extent2", "set_extent3", "set_extent4", + "set_extent5", "set_extent6", NULL}; + +#define NAME_BUF_SIZE 1024 #define EXT_FILE_NAME1 "ext1.bin" #define EXT_FILE_NAME2 "ext2.bin" -#define CONFIG_COMPRESS 0x01u -#define CONFIG_FILL 0x02u -#define CONFIG_EARLY_ALLOC 0x04u -#define CONFIG_UNFILT_EDGE 0x08u -#define CONFIG_ALL (CONFIG_COMPRESS + CONFIG_FILL \ - + CONFIG_EARLY_ALLOC + CONFIG_UNFILT_EDGE) -#define FILL_VALUE -1 -#define DO_RANKS_PRINT_CONFIG(TEST) { \ - HDprintf(" Config:\n"); \ - HDprintf(" Test: %s\n", TEST); \ - HDprintf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \ - HDprintf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \ - HDprintf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" \ - : "no")); \ - HDprintf(" Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE \ - ? "disabled" : "enabled")); \ -} /* end DO_RANKS_PRINT_CONFIG */ - -#define RANK1 1 -#define RANK2 2 -#define RANK3 3 -#define DIM0 5 -#define DIM1 5 -#define DIM2 5 -#define DIMS0 3 -#define DIMS1 3 -#define DIMS2 3 -#define DIME0 7 -#define DIME1 7 -#define DIME2 7 -#define ISTORE_IK 64 -#define RAND4_NITER 100 +#define CONFIG_COMPRESS 0x01u +#define CONFIG_FILL 0x02u +#define CONFIG_EARLY_ALLOC 0x04u +#define CONFIG_UNFILT_EDGE 0x08u +#define CONFIG_ALL (CONFIG_COMPRESS + CONFIG_FILL + CONFIG_EARLY_ALLOC + CONFIG_UNFILT_EDGE) +#define FILL_VALUE -1 +#define DO_RANKS_PRINT_CONFIG(TEST) \ + { \ + HDprintf(" Config:\n"); \ + HDprintf(" Test: %s\n", TEST); \ + HDprintf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" : "no")); \ + HDprintf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \ + HDprintf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC ? "yes" : "no")); \ + HDprintf(" Edge chunk filters: %s\n", (config & CONFIG_UNFILT_EDGE ? "disabled" : "enabled")); \ + } /* end DO_RANKS_PRINT_CONFIG */ + +#define RANK1 1 +#define RANK2 2 +#define RANK3 3 +#define DIM0 5 +#define DIM1 5 +#define DIM2 5 +#define DIMS0 3 +#define DIMS1 3 +#define DIMS2 3 +#define DIME0 7 +#define DIME1 7 +#define DIME2 7 +#define ISTORE_IK 64 +#define RAND4_NITER 100 #define RAND4_SPARSE_SWITCH 10 -#define RAND4_FAIL_DUMP(NDIM_SETS, J, K, L, M) { \ - H5_FAILED(); AT(); \ - test_random_rank4_dump(NDIM_SETS, dim_log, cdims, J, K, L, M); \ - goto error; \ -} /* end RAND4_FAIL_DUMP */ -#define RAND4_VL_NITER 40 +#define RAND4_FAIL_DUMP(NDIM_SETS, J, K, L, M) \ + { \ + H5_FAILED(); \ + AT(); \ + test_random_rank4_dump(NDIM_SETS, dim_log, cdims, J, K, L, M); \ + goto error; \ + } /* end RAND4_FAIL_DUMP */ +#define RAND4_VL_NITER 40 #define RAND4_VL_SPARSE_SWITCH 5 typedef enum rank4_index_t { - RANK4_INDEX_BTREE = 0, /* Use b-tree (1/2) as chunk index */ - RANK4_INDEX_FARRAY, /* Use fixed array as chunk index */ - RANK4_INDEX_EARRAY, /* Use extensible array as chunk index */ - RANK4_NINDICES, /* Must be last */ + RANK4_INDEX_BTREE = 0, /* Use b-tree (1/2) as chunk index */ + RANK4_INDEX_FARRAY, /* Use fixed array as chunk index */ + RANK4_INDEX_EARRAY, /* Use extensible array as chunk index */ + RANK4_NINDICES, /* Must be last */ } rank4_index_t; -static int do_ranks( hid_t fapl, hbool_t new_format ); -static int do_layouts( hid_t fapl ); - -static int test_rank1( hid_t fapl, - hid_t dcpl, - hbool_t do_fill_value, - hbool_t disable_edge_filters, - hbool_t set_istore_k); -static int test_rank2( hid_t fapl, - hid_t dcpl, - hbool_t do_fill_value, - hbool_t disable_edge_filters, - hbool_t set_istore_k); -static int test_rank3( hid_t fapl, - hid_t dcpl, - hbool_t do_fill_value, - hbool_t disable_edge_filters, - hbool_t set_istore_k); -static int test_random_rank4( hid_t fapl, - hid_t dcpl, - hbool_t do_fillvalue, - hbool_t disable_edge_filters, - hbool_t do_sparse, - rank4_index_t index_type); -static int test_random_rank4_vl( hid_t fapl, - hid_t dcpl, - hbool_t do_fillvalue, - hbool_t disable_edge_filters, - hbool_t do_sparse, - rank4_index_t index_type); - -static int test_external( hid_t fapl ); -static int test_layouts( H5D_layout_t layout, hid_t fapl ); -static void test_random_rank4_dump( unsigned ndim_sets, hsize_t dim_log[][4], - hsize_t cdims[4], int j, int k, int l, int m ); +static int do_ranks(hid_t fapl, hbool_t new_format); +static int do_layouts(hid_t fapl); + +static int test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, + hbool_t set_istore_k); +static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, + hbool_t set_istore_k); +static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, + hbool_t set_istore_k); +static int test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_edge_filters, + hbool_t do_sparse, rank4_index_t index_type); +static int test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_edge_filters, + hbool_t do_sparse, rank4_index_t index_type); + +static int test_external(hid_t fapl); +static int test_layouts(H5D_layout_t layout, hid_t fapl); +static void test_random_rank4_dump(unsigned ndim_sets, hsize_t dim_log[][4], hsize_t cdims[4], int j, int k, + int l, int m); /*------------------------------------------------------------------------- * main *------------------------------------------------------------------------- */ -int main( void ) +int +main(void) { - hid_t fapl; /* file access property list */ - hid_t fapl2; /* file access property list w/latest format set */ - unsigned new_format; /* Whether to use the latest file format */ - unsigned chunk_cache; /* Whether to enable chunk caching */ - int nerrors = 0; - const char *env_h5_drvr; /* File Driver value from environment */ - hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ - + hid_t fapl; /* file access property list */ + hid_t fapl2; /* file access property list w/latest format set */ + unsigned new_format; /* Whether to use the latest file format */ + unsigned chunk_cache; /* Whether to enable chunk caching */ + int nerrors = 0; + const char *env_h5_drvr; /* File Driver value from environment */ + hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ env_h5_drvr = HDgetenv("HDF5_DRIVER"); - if(env_h5_drvr == NULL) + if (env_h5_drvr == NULL) env_h5_drvr = "nomatch"; /* Current VFD that does not support contigous address space */ contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi")); @@ -154,31 +130,35 @@ int main( void ) fapl = h5_fileaccess(); /* Copy the file access property list */ - if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR + if ((fapl2 = H5Pcopy(fapl)) < 0) + TEST_ERROR /* Set chunk cache so only part of the chunks can be cached on fapl */ - if(H5Pset_cache(fapl, 0, (size_t)8, 256 * sizeof(int), 0.75F) < 0) TEST_ERROR + if (H5Pset_cache(fapl, 0, (size_t)8, 256 * sizeof(int), 0.75F) < 0) + TEST_ERROR /* Disable chunk caching on fapl2 */ - if(H5Pset_cache(fapl2, 0, (size_t)0, (size_t)0, 0.0F) < 0) TEST_ERROR + if (H5Pset_cache(fapl2, 0, (size_t)0, (size_t)0, 0.0F) < 0) + TEST_ERROR /* Set the "use the latest version of the format" bounds for creating objects in the file */ - if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR + if (H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + TEST_ERROR /* Test with old & new format groups */ - for(new_format = FALSE; new_format <= TRUE; new_format++) { + for (new_format = FALSE; new_format <= TRUE; new_format++) { hid_t my_fapl; /* Test chunked datasets with and without chunk cache */ - for(chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) { + for (chunk_cache = FALSE; chunk_cache <= TRUE; chunk_cache++) { /* Output message about the type of format */ - if(new_format) + if (new_format) HDprintf("Testing with new file format"); else HDprintf("Testing with old file format"); /* Set the FAPL for the chunk cache settings */ - if(chunk_cache) { + if (chunk_cache) { HDputs(" and chunk cache enabled:"); my_fapl = fapl; } /* end if */ @@ -188,32 +168,33 @@ int main( void ) } /* end else */ /* Set the FAPL for the type of format */ - if(new_format) { + if (new_format) { /* Set the "use the latest version of the format" bounds for * creating objects in the file */ - if(H5Pset_libver_bounds(my_fapl, H5F_LIBVER_LATEST, - H5F_LIBVER_LATEST) < 0) TEST_ERROR + if (H5Pset_libver_bounds(my_fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + TEST_ERROR } /* end if */ else /* Set the "use the earliest version of the format" bounds for * creating objects in the file */ - if(H5Pset_libver_bounds(my_fapl, H5F_LIBVER_EARLIEST, - H5F_LIBVER_LATEST) < 0) TEST_ERROR + if (H5Pset_libver_bounds(my_fapl, H5F_LIBVER_EARLIEST, H5F_LIBVER_LATEST) < 0) + TEST_ERROR /* Tests which use chunked datasets */ - if(!new_format || (new_format && contig_addr_vfd)) - nerrors += do_ranks( my_fapl, new_format ) < 0 ? 1 : 0; + if (!new_format || (new_format && contig_addr_vfd)) + nerrors += do_ranks(my_fapl, new_format) < 0 ? 1 : 0; } /* end for */ /* Tests which do not use chunked datasets */ - if(!new_format || (new_format && contig_addr_vfd)) { - nerrors += test_external( fapl ) < 0 ? 1 : 0; - nerrors += do_layouts( fapl ) < 0 ? 1 : 0; + if (!new_format || (new_format && contig_addr_vfd)) { + nerrors += test_external(fapl) < 0 ? 1 : 0; + nerrors += do_layouts(fapl) < 0 ? 1 : 0; } } /* end for */ /* Close 2nd FAPL */ - if(H5Pclose(fapl2) < 0) TEST_ERROR + if (H5Pclose(fapl2) < 0) + TEST_ERROR /* Verify symbol table messages are cached */ nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0); @@ -223,7 +204,7 @@ int main( void ) HDremove(EXT_FILE_NAME1); HDremove(EXT_FILE_NAME2); - if(nerrors) + if (nerrors) goto error; HDputs("All H5Dset_extent tests passed."); @@ -231,180 +212,174 @@ int main( void ) error: nerrors = MAX(1, nerrors); - HDprintf("***** %d H5Dset_extent TEST%s FAILED! *****\n", - nerrors, 1 == nerrors ? "" : "S"); + HDprintf("***** %d H5Dset_extent TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); return 1; } - /*------------------------------------------------------------------------- -* test with several ranks -*------------------------------------------------------------------------- -*/ -static int do_ranks( hid_t fapl, hbool_t new_format ) + * test with several ranks + *------------------------------------------------------------------------- + */ +static int +do_ranks(hid_t fapl, hbool_t new_format) { - hbool_t do_fillvalue = FALSE; - hbool_t disable_edge_filters = FALSE; + hbool_t do_fillvalue = FALSE; + hbool_t disable_edge_filters = FALSE; rank4_index_t index_type; - hid_t dcpl = -1; - int fillvalue = FILL_VALUE; - unsigned config; + hid_t dcpl = -1; + int fillvalue = FILL_VALUE; + unsigned config; TESTING_2("datasets with ranks 1 to 4 (all configurations)"); /* Loop over different configurations for tests */ - for(config=0; config<=CONFIG_ALL; config++) { + for (config = 0; config <= CONFIG_ALL; config++) { /* Create DCPL and add appropriate settings */ - if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) + if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR - if(config & CONFIG_COMPRESS) { + if (config & CONFIG_COMPRESS) { #ifdef H5_HAVE_FILTER_DEFLATE - if(H5Pset_deflate(dcpl, 9) < 0) + if (H5Pset_deflate(dcpl, 9) < 0) TEST_ERROR -#else /* H5_HAVE_FILTER_DEFLATE */ - if(H5Pclose(dcpl) < 0) +#else /* H5_HAVE_FILTER_DEFLATE */ + if (H5Pclose(dcpl) < 0) TEST_ERROR continue; -#endif /* H5_HAVE_FILTER_DEFLATE */ +#endif /* H5_HAVE_FILTER_DEFLATE */ } /* end if */ - if(config & CONFIG_FILL) { + if (config & CONFIG_FILL) { do_fillvalue = TRUE; - if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0) + if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0) TEST_ERROR } /* end if */ else do_fillvalue = FALSE; - if(config & CONFIG_EARLY_ALLOC) - if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) + if (config & CONFIG_EARLY_ALLOC) + if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR - if(config & CONFIG_UNFILT_EDGE) + if (config & CONFIG_UNFILT_EDGE) disable_edge_filters = TRUE; else disable_edge_filters = FALSE; /* Run tests */ - if(do_fillvalue) { + if (do_fillvalue) { unsigned ifset; /* Iterate over different fill times */ - for(ifset=0; ifset<=1; ifset++) { - if(ifset) { - if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) + for (ifset = 0; ifset <= 1; ifset++) { + if (ifset) { + if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) TEST_ERROR } /* end if */ - else - if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) - TEST_ERROR + else if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) + TEST_ERROR - if(test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" - : "H5D_FILL_TIME_ALLOC")); + HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" - : "H5D_FILL_TIME_ALLOC")); + HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if(test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" - : "H5D_FILL_TIME_ALLOC")); + HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { + if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") - HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" - : "H5D_FILL_TIME_ALLOC")); + HDprintf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - } /* end for */ - } /* end if */ + } /* end for */ + } /* end if */ else { /* These tests expect fill values to be written even if there is no * fill value defined */ - if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) + if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR - if(test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank1(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") goto error; } /* end if */ - if(test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { + if (test_rank3(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { + if (test_rank2(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") goto error; } /* end if */ - } /* end else */ + } /* end else */ /* The rank 4 test expects the fill value to be written only if * defined */ - if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) + if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0) TEST_ERROR /* Iterate over different index types, but only if using the new format */ - for(index_type = RANK4_INDEX_BTREE; index_type < RANK4_NINDICES; index_type++) { + for (index_type = RANK4_INDEX_BTREE; index_type < RANK4_NINDICES; index_type++) { /* Standard test */ - if(test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { + if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4") HDprintf(" Index: %s\n", index_type == RANK4_INDEX_BTREE - ? "btree" : (index_type == RANK4_INDEX_FARRAY ? "farray" - : "earray")); + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ /* VL test */ - if(test_random_rank4_vl(fapl, dcpl, do_fillvalue, - disable_edge_filters, FALSE, index_type) < 0) { + if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, FALSE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length") HDprintf(" Index: %s\n", index_type == RANK4_INDEX_BTREE - ? "btree" : (index_type == RANK4_INDEX_FARRAY ? "farray" - : "earray")); + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ /* Sparse allocation test (regular and VL) */ - if(!(config & CONFIG_EARLY_ALLOC)) { - if(test_random_rank4(fapl, dcpl, do_fillvalue, - disable_edge_filters, TRUE, index_type) < 0) { + if (!(config & CONFIG_EARLY_ALLOC)) { + if (test_random_rank4(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE, index_type) < 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 with sparse allocation") - HDprintf(" Index: %s\n", index_type == RANK4_INDEX_BTREE - ? "btree" : (index_type == RANK4_INDEX_FARRAY - ? "farray" : "earray")); + HDprintf(" Index: %s\n", + index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ - if(test_random_rank4_vl(fapl, dcpl, do_fillvalue, - disable_edge_filters, TRUE, index_type) < 0) { + if (test_random_rank4_vl(fapl, dcpl, do_fillvalue, disable_edge_filters, TRUE, index_type) < + 0) { DO_RANKS_PRINT_CONFIG("Randomized rank 4 variable length with sparse allocation") - HDprintf(" Index: %s\n", index_type == RANK4_INDEX_BTREE - ? "btree" : (index_type == RANK4_INDEX_FARRAY - ? "farray" : "earray")); + HDprintf(" Index: %s\n", + index_type == RANK4_INDEX_BTREE + ? "btree" + : (index_type == RANK4_INDEX_FARRAY ? "farray" : "earray")); goto error; } /* end if */ - } /* end if */ + } /* end if */ /* Break out if using the old format */ - if(!new_format) + if (!new_format) break; } /* end for */ /* Close dcpl */ - if(H5Pclose(dcpl) < 0) + if (H5Pclose(dcpl) < 0) TEST_ERROR } /* end for */ @@ -413,36 +388,34 @@ static int do_ranks( hid_t fapl, hbool_t new_format ) return 0; error: - H5E_BEGIN_TRY { - H5Pclose(dcpl); - } H5E_END_TRY + H5E_BEGIN_TRY { H5Pclose(dcpl); } + H5E_END_TRY return -1; } /* end do_ranks */ - /*------------------------------------------------------------------------- -* test with different storage layouts -*------------------------------------------------------------------------- -*/ -static int do_layouts( hid_t fapl ) + * test with different storage layouts + *------------------------------------------------------------------------- + */ +static int +do_layouts(hid_t fapl) { - hid_t new_fapl = -1; + hid_t new_fapl = -1; H5F_libver_t low, high; /* Low and high bounds */ - herr_t ret; /* Generic return value */ + herr_t ret; /* Generic return value */ TESTING("storage layout use - tested with all low/high library format bounds"); /* Loop through all the combinations of low/high library format bounds */ - for(low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { - for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { + for (low = H5F_LIBVER_EARLIEST; low < H5F_LIBVER_NBOUNDS; low++) { + for (high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) { /* Copy plist to use locally to avoid modifying the original */ new_fapl = H5Pcopy(fapl); /* Set version bounds */ - H5E_BEGIN_TRY { - ret = H5Pset_libver_bounds(new_fapl, low, high); - } H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5Pset_libver_bounds(new_fapl, low, high); } + H5E_END_TRY; if (ret < 0) /* Invalid low/high combinations */ { @@ -451,26 +424,24 @@ static int do_layouts( hid_t fapl ) continue; } - if (test_layouts( H5D_COMPACT, new_fapl ) < 0) + if (test_layouts(H5D_COMPACT, new_fapl) < 0) goto error; - if (test_layouts( H5D_CONTIGUOUS, new_fapl ) < 0) + if (test_layouts(H5D_CONTIGUOUS, new_fapl) < 0) goto error; if (H5Pclose(new_fapl) < 0) goto error; } /* end for high */ - } /* end for low */ + } /* end for low */ PASSED(); return 0; error: - H5E_BEGIN_TRY - { - H5Pclose(new_fapl); - } H5E_END_TRY; + H5E_BEGIN_TRY { H5Pclose(new_fapl); } + H5E_END_TRY; return -1; } @@ -479,23 +450,20 @@ error: *------------------------------------------------------------------------- */ -static int test_rank1( hid_t fapl, - hid_t dcpl, - hbool_t do_fill_value, - hbool_t disable_edge_filters, - hbool_t set_istore_k) +static int +test_rank1(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) { - hid_t fid=-1; - hid_t did=-1; - hid_t sid=-1; - hid_t my_dcpl=-1; + hid_t fid = -1; + hid_t did = -1; + hid_t sid = -1; + hid_t my_dcpl = -1; hid_t fcpl; - hsize_t dims_o[RANK1] = {DIM0}; /* original dimensions */ - hsize_t dims_s[RANK1] = {DIMS0}; /* shrinking dimensions */ - hsize_t dims_e[RANK1] = {DIME0}; /* extended dimensions */ - hsize_t dims_c[RANK1] = {2}; /* chunk dimensions */ - hsize_t dims_r[RANK1]; /* read dimensions */ + hsize_t dims_o[RANK1] = {DIM0}; /* original dimensions */ + hsize_t dims_s[RANK1] = {DIMS0}; /* shrinking dimensions */ + hsize_t dims_e[RANK1] = {DIME0}; /* extended dimensions */ + hsize_t dims_c[RANK1] = {2}; /* chunk dimensions */ + hsize_t dims_r[RANK1]; /* read dimensions */ hsize_t maxdims[RANK1] = {H5S_UNLIMITED}; int buf_o[DIM0]; int buf_s[DIMS0]; @@ -505,43 +473,43 @@ static int test_rank1( hid_t fapl, int comp_value; char filename[NAME_BUF_SIZE]; - if(do_fill_value) + if (do_fill_value) comp_value = FILL_VALUE; else comp_value = 0; - for(i = 0; i < DIM0; i++ ) + for (i = 0; i < DIM0; i++) buf_o[i] = 2; /* create a file creation property list */ - if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) + if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR /* set non-default indexed storage B-tree internal 'K' value */ - if(set_istore_k) - if(H5Pset_istore_k(fcpl,ISTORE_IK) < 0) + if (set_istore_k) + if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) TEST_ERROR /* create a new file */ h5_fixname(FILENAME[0], fapl, filename, sizeof filename); - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) + if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) TEST_ERROR /* close property list */ - if(H5Pclose(fcpl) < 0) + if (H5Pclose(fcpl) < 0) TEST_ERROR /* create the data space with unlimited dimensions. */ - if((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0) + if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0) TEST_ERROR /* modify dataset creation properties, i.e. enable chunking. */ - if((my_dcpl = H5Pcopy (dcpl)) < 0) + if ((my_dcpl = H5Pcopy(dcpl)) < 0) TEST_ERROR - if(H5Pset_chunk(my_dcpl, RANK1, dims_c) < 0) + if (H5Pset_chunk(my_dcpl, RANK1, dims_c) < 0) TEST_ERROR - if(disable_edge_filters) - if(H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) + if (disable_edge_filters) + if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) TEST_ERROR /*------------------------------------------------------------------------- @@ -550,21 +518,21 @@ static int test_rank1( hid_t fapl, */ /* create a dataset */ - if((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) TEST_ERROR /* write */ - if(H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) + if (H5Dwrite(did, H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n buf_o: "); - for (i = 0; i < (int)dims_o[0]; i++ ) + for (i = 0; i < (int)dims_o[0]; i++) HDprintf("%d ", buf_o[i]); HDprintf("\n"); #endif - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR /*------------------------------------------------------------------------- @@ -573,22 +541,22 @@ static int test_rank1( hid_t fapl, */ /* set new dimensions for the array. */ - if(H5Dset_extent(did , dims_e) < 0) + if (H5Dset_extent(did, dims_e) < 0) TEST_ERROR /* get the space */ - if((sid = H5Dget_space(did)) < 0) + if ((sid = H5Dget_space(did)) < 0) TEST_ERROR /* get dimensions */ - if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) + if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) TEST_ERROR - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR /* check dimensions */ - for( i = 0; i < RANK1; i++ ) + for (i = 0; i < RANK1; i++) if (dims_r[i] != dims_e[i]) TEST_ERROR @@ -596,89 +564,85 @@ static int test_rank1( hid_t fapl, if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) TEST_ERROR - -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n buf_e: "); - for (i = 0; i < (int)dims_r[0]; i++ ) + for (i = 0; i < (int)dims_r[0]; i++) HDprintf("%d ", buf_e[i]); HDprintf("\n"); #endif /* compare the read array with the expanded array */ - for (i = 0; i < (int)dims_r[0]; i++ ) - if(i >= DIM0) { - if(buf_e[i] != comp_value) { + for (i = 0; i < (int)dims_r[0]; i++) + if (i >= DIM0) { + if (buf_e[i] != comp_value) { HDprintf("buf_e[%d] = %d\n", i, buf_e[i]); HDprintf("expected = %d\n", comp_value); TEST_ERROR } /* end if */ - } /* end if */ + } /* end if */ else { - if(buf_e[i] != buf_o[i]) + if (buf_e[i] != buf_o[i]) TEST_ERROR } /* end else */ - - /*------------------------------------------------------------------------- * shrink *------------------------------------------------------------------------- */ /* set new dimensions for the array. */ - if(H5Dset_extent(did , dims_s) < 0) + if (H5Dset_extent(did, dims_s) < 0) TEST_ERROR /* get the space */ - if((sid = H5Dget_space(did)) < 0) + if ((sid = H5Dget_space(did)) < 0) TEST_ERROR /* get dimensions */ - if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) + if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) TEST_ERROR - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR /* check dimensions */ - for( i = 0; i < RANK1; i++ ) + for (i = 0; i < RANK1; i++) if (dims_r[i] != dims_s[i]) TEST_ERROR /* for this case we close and reopen file */ - if(set_istore_k) { - if(H5Dclose(did) < 0) + if (set_istore_k) { + if (H5Dclose(did) < 0) TEST_ERROR - if(H5Fclose(fid) < 0) + if (H5Fclose(fid) < 0) TEST_ERROR - if((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0) + if ((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR - if((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0) + if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) TEST_ERROR } /* end if */ - /*------------------------------------------------------------------------- * read *------------------------------------------------------------------------- */ /* read */ - if(H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0) + if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n dims_r: "); - for (i = 0; i < (int)dims_r[0]; i++ ) + for (i = 0; i < (int)dims_r[0]; i++) HDprintf("%d ", buf_s[i]); HDprintf("\n"); #endif /* compare the read array with the shrinked array */ - for( i = 0; i < (int)dims_r[0]; i++ ) - if(buf_s[i] != buf_o[i]) { + for (i = 0; i < (int)dims_r[0]; i++) + if (buf_s[i] != buf_o[i]) { HDprintf("buf_s[%d] = %d\n", i, buf_s[i]); HDprintf("buf_o[%d] = %d\n", i, buf_o[i]); TEST_ERROR @@ -690,51 +654,50 @@ static int test_rank1( hid_t fapl, */ /* set new dimensions for the array */ - if(H5Dset_extent(did, dims_o) < 0) + if (H5Dset_extent(did, dims_o) < 0) TEST_ERROR /* get the space */ - if((sid = H5Dget_space(did)) < 0) + if ((sid = H5Dget_space(did)) < 0) TEST_ERROR /* get dimensions. */ - if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) + if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) TEST_ERROR - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR /* check dimensions */ - for( i = 0; i < RANK1; i++ ) + for (i = 0; i < RANK1; i++) if (dims_r[i] != dims_o[i]) TEST_ERROR /* read */ - if(H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) + if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n dims_r: "); - for (i = 0; i < (int)dims_r[0]; i++ ) + for (i = 0; i < (int)dims_r[0]; i++) HDprintf("%d ", buf_r[i]); HDprintf("\n"); #endif /* compare the read array with the original array */ - for(i = 0; i < (int)dims_r[0]; i++ ) - if(i >= DIMS0 ) { - if(buf_r[i] != comp_value) { - HDprintf("buf_r[%d] = %d\n", i, buf_r[i] ); + for (i = 0; i < (int)dims_r[0]; i++) + if (i >= DIMS0) { + if (buf_r[i] != comp_value) { + HDprintf("buf_r[%d] = %d\n", i, buf_r[i]); HDprintf("expected = %d\n", comp_value); TEST_ERROR } /* end if */ - } /* end if */ + } /* end if */ else { - if(buf_r[i] != buf_o[i]) + if (buf_r[i] != buf_o[i]) TEST_ERROR } /* end else */ - /*------------------------------------------------------------------------- * shrink to 0 *------------------------------------------------------------------------- @@ -743,22 +706,22 @@ static int test_rank1( hid_t fapl, dims_s[0] = 0; /* set new dimensions for the array. */ - if(H5Dset_extent(did , dims_s) < 0) + if (H5Dset_extent(did, dims_s) < 0) TEST_ERROR /* get the space */ - if((sid = H5Dget_space(did)) < 0) + if ((sid = H5Dget_space(did)) < 0) TEST_ERROR /* get dimensions */ - if(H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) + if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) TEST_ERROR - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR /* check dimensions */ - for( i = 0; i < RANK1; i++ ) - if(dims_r[i] != dims_s[i]) + for (i = 0; i < RANK1; i++) + if (dims_r[i] != dims_s[i]) TEST_ERROR /*------------------------------------------------------------------------- @@ -766,7 +729,7 @@ static int test_rank1( hid_t fapl, *------------------------------------------------------------------------- */ - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR /*------------------------------------------------------------------------- @@ -774,29 +737,28 @@ static int test_rank1( hid_t fapl, *------------------------------------------------------------------------- */ - - if((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0) + if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0) TEST_ERROR - if((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) + if ((did = H5Dcreate2(fid, "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) TEST_ERROR /* set new dimensions for the array */ - dims_o[ 0 ] = 0; - if(H5Dset_extent( did , dims_o ) < 0) + dims_o[0] = 0; + if (H5Dset_extent(did, dims_o) < 0) TEST_ERROR - if(H5Dclose(did) < 0) + if (H5Dclose(did) < 0) TEST_ERROR - if(H5Sclose(sid) < 0) + if (H5Sclose(sid) < 0) TEST_ERROR /*------------------------------------------------------------------------- * close property list *------------------------------------------------------------------------- */ - if(H5Pclose(my_dcpl) < 0) + if (H5Pclose(my_dcpl) < 0) TEST_ERROR - if(H5Fclose(fid) < 0) + if (H5Fclose(fid) < 0) TEST_ERROR return 0; @@ -805,12 +767,13 @@ error: H5E_BEGIN_TRY { - H5Dclose( did ); - H5Sclose( sid ); - H5Pclose( my_dcpl ); - H5Pclose( fcpl ); - H5Fclose( fid ); - } H5E_END_TRY; + H5Dclose(did); + H5Sclose(sid); + H5Pclose(my_dcpl); + H5Pclose(fcpl); + H5Fclose(fid); + } + H5E_END_TRY; return -1; } /* end test_rank1() */ @@ -820,30 +783,33 @@ error: *------------------------------------------------------------------------- */ -static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) { - - hid_t fid = -1; - hid_t did = -1; - hid_t sid = -1; - hid_t my_dcpl = -1; - hid_t fcpl; - hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */ - hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */ - hsize_t dims_e[RANK2] = { DIME0, DIME1 }; /* extended dimensions */ - hsize_t dims_c[RANK2] = { 2, 2 }; /* chunk dimensions */ - hsize_t dims_r[RANK2]; /* read dimensions */ - hsize_t maxdims[RANK2] = { H5S_UNLIMITED, H5S_UNLIMITED }; - int buf_o[DIM0][DIM1]; - int buf_s[DIMS0][DIMS1]; - int buf_e[DIME0][DIME1]; - int buf_r[DIM0][DIM1]; - int i, j; - int comp_value; - char filename[NAME_BUF_SIZE]; +static int +test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) +{ + + hid_t fid = -1; + hid_t did = -1; + hid_t sid = -1; + hid_t my_dcpl = -1; + hid_t fcpl; + hsize_t dims_o[RANK2] = {DIM0, DIM1}; /* original dimensions */ + hsize_t dims_s[RANK2] = {DIMS0, DIMS1}; /* shrinking dimensions */ + hsize_t dims_e[RANK2] = {DIME0, DIME1}; /* extended dimensions */ + hsize_t dims_c[RANK2] = {2, 2}; /* chunk dimensions */ + hsize_t dims_r[RANK2]; /* read dimensions */ + hsize_t maxdims[RANK2] = {H5S_UNLIMITED, H5S_UNLIMITED}; + int buf_o[DIM0][DIM1]; + int buf_s[DIMS0][DIMS1]; + int buf_e[DIME0][DIME1]; + int buf_r[DIM0][DIM1]; + int i, j; + int comp_value; + char filename[NAME_BUF_SIZE]; if (do_fill_value) { comp_value = FILL_VALUE; - } else { + } + else { comp_value = 0; } @@ -863,7 +829,6 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) { TEST_ERROR } - } /* create a new file */ @@ -888,25 +853,25 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) TEST_ERROR - /*------------------------------------------------------------------------- - * Procedure 1 - * a. Write an array AxB. These are the dimensions for creating the dataset - * b. Define a greater array CxD where C > A and D > B - * c. Read data back - * d. Verify if new dimensions are C and D - * e. Verify if data from A to C and B to D is what it is to be expected - * - * original data is - * - * 2 2 2 2 - * 2 2 2 2 - * 2 2 2 2 - * 2 2 2 2 - * - *------------------------------------------------------------------------- - */ - - /* create a dataset */ + /*------------------------------------------------------------------------- + * Procedure 1 + * a. Write an array AxB. These are the dimensions for creating the dataset + * b. Define a greater array CxD where C > A and D > B + * c. Read data back + * d. Verify if new dimensions are C and D + * e. Verify if data from A to C and B to D is what it is to be expected + * + * original data is + * + * 2 2 2 2 + * 2 2 2 2 + * 2 2 2 2 + * 2 2 2 2 + * + *------------------------------------------------------------------------- + */ + + /* create a dataset */ if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) { TEST_ERROR } @@ -916,10 +881,10 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis TEST_ERROR } -#if defined (H5_SET_EXTENT_DEBUG2) +#if defined(H5_SET_EXTENT_DEBUG2) HDprintf("\n"); - for (i = 0; i < (int)dims_o[0]; i++ ) { - for (j = 0; j < (int)dims_o[1]; j++ ) { + for (i = 0; i < (int)dims_o[0]; i++) { + for (j = 0; j < (int)dims_o[1]; j++) { HDprintf("%d ", buf_o[i][j]); } HDprintf("\n"); @@ -931,19 +896,19 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * set new dimensions for the array; expand it - * data is now, extended space was initialized with fill value or default value - * - * 2 2 2 2 1 1 1 - * 2 2 2 2 1 1 1 - * 2 2 2 2 1 1 1 - * 2 2 2 2 1 1 1 - * 1 1 1 1 1 1 1 - * 1 1 1 1 1 1 1 - * 1 1 1 1 1 1 1 - * - *------------------------------------------------------------------------- - */ + * set new dimensions for the array; expand it + * data is now, extended space was initialized with fill value or default value + * + * 2 2 2 2 1 1 1 + * 2 2 2 2 1 1 1 + * 2 2 2 2 1 1 1 + * 2 2 2 2 1 1 1 + * 1 1 1 1 1 1 1 + * 1 1 1 1 1 1 1 + * 1 1 1 1 1 1 1 + * + *------------------------------------------------------------------------- + */ /* set new dimensions for the array. */ if (H5Dset_extent(did, dims_e) < 0) { @@ -974,26 +939,27 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG2) +#if defined(H5_SET_EXTENT_DEBUG2) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_e[i][j]); } HDprintf("\n"); } #endif - /* compare the read array with the expanded array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { + /* compare the read array with the expanded array */ + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { if (i >= DIM0 || j >= DIM1) { if (buf_e[i][j] != comp_value) { HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]); HDprintf("value = %d\n", comp_value); TEST_ERROR } - } else { + } + else { if (buf_e[i][j] != buf_o[i][j]) TEST_ERROR } @@ -1001,20 +967,20 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * - * Procedure 2 - * a. Define a smaller array ExF where E < A and F < B - * b. Read data back - * c. Verify if new dimensions are E and F - * d. Verify if data up until E and F is what to be expected - * - * data is now - * - * 2 2 - * 2 2 - * - *------------------------------------------------------------------------- - */ + * + * Procedure 2 + * a. Define a smaller array ExF where E < A and F < B + * b. Read data back + * c. Verify if new dimensions are E and F + * d. Verify if data up until E and F is what to be expected + * + * data is now + * + * 2 2 + * 2 2 + * + *------------------------------------------------------------------------- + */ /* set new dimensions for the array. */ if (H5Dset_extent(did, dims_s) < 0) { @@ -1058,23 +1024,22 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) { TEST_ERROR } - } /*------------------------------------------------------------------------- - * read - *------------------------------------------------------------------------- - */ + * read + *------------------------------------------------------------------------- + */ /* read */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) { TEST_ERROR } -#if defined (H5_SET_EXTENT_DEBUG2) +#if defined(H5_SET_EXTENT_DEBUG2) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_s[i][j]); } HDprintf("\n"); @@ -1082,8 +1047,8 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis #endif /* compare the read array with the shrinked array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { if (buf_s[i][j] != buf_o[i][j]) { HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]); HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]); @@ -1093,16 +1058,16 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * set new dimensions for the array; expand it back to original size - * data is now, extended space was initialized with fill value or default value - * - * 2 2 1 1 - * 2 2 1 1 - * 1 1 1 1 - * 1 1 1 1 - * - *------------------------------------------------------------------------- - */ + * set new dimensions for the array; expand it back to original size + * data is now, extended space was initialized with fill value or default value + * + * 2 2 1 1 + * 2 2 1 1 + * 1 1 1 1 + * 1 1 1 1 + * + *------------------------------------------------------------------------- + */ /* set new dimensions for the array */ if (H5Dset_extent(did, dims_o) < 0) { @@ -1130,34 +1095,35 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * read - *------------------------------------------------------------------------- - */ + * read + *------------------------------------------------------------------------- + */ /* read */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG2) +#if defined(H5_SET_EXTENT_DEBUG2) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_r[i][j]); } HDprintf("\n"); } #endif - /* compare the read array with the original array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { + /* compare the read array with the original array */ + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { if (i >= DIMS0 || j >= DIMS1) { if (buf_r[i][j] != comp_value) { HDprintf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]); HDprintf("value = %d\n", comp_value); TEST_ERROR } - } else { + } + else { if (buf_r[i][j] != buf_o[i][j]) TEST_ERROR } @@ -1165,10 +1131,10 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * shrink to 0 - * - *------------------------------------------------------------------------- - */ + * shrink to 0 + * + *------------------------------------------------------------------------- + */ dims_s[0] = 0; dims_s[1] = 0; @@ -1199,11 +1165,11 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * expand then shrink to 0 in dimension 1 while expanding again in - * dimension 0 - * - *------------------------------------------------------------------------- - */ + * expand then shrink to 0 in dimension 1 while expanding again in + * dimension 0 + * + *------------------------------------------------------------------------- + */ /* expand to original dimensions for the array. */ if (H5Dset_extent(did, dims_o) < 0) { @@ -1239,18 +1205,18 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * close dataset - *------------------------------------------------------------------------- - */ + * close dataset + *------------------------------------------------------------------------- + */ if (H5Dclose(did) < 0) { TEST_ERROR } /*------------------------------------------------------------------------- - * test a dataset with non initialized chunks - *------------------------------------------------------------------------- - */ + * test a dataset with non initialized chunks + *------------------------------------------------------------------------- + */ if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) { TEST_ERROR @@ -1273,9 +1239,9 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * close property list - *------------------------------------------------------------------------- - */ + * close property list + *------------------------------------------------------------------------- + */ if (H5Pclose(my_dcpl) < 0) { TEST_ERROR @@ -1292,18 +1258,18 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis return 0; - error: +error: H5E_BEGIN_TRY - { - H5Dclose(did); - H5Sclose(sid); - H5Pclose(my_dcpl); - H5Pclose(fcpl); - H5Fclose(fid); - }H5E_END_TRY; + { + H5Dclose(did); + H5Sclose(sid); + H5Pclose(my_dcpl); + H5Pclose(fcpl); + H5Fclose(fid); + } + H5E_END_TRY; return -1; - } /*------------------------------------------------------------------------- @@ -1311,30 +1277,33 @@ static int test_rank2(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis *------------------------------------------------------------------------- */ -static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) { - - hid_t fid = -1; - hid_t did = -1; - hid_t sid = -1; - hid_t my_dcpl = -1; - hid_t fcpl; - hsize_t dims_o[RANK3] = { DIM0, DIM1, DIM2 }; /* original dimensions */ - hsize_t dims_s[RANK3] = { DIMS0, DIMS1, DIMS2 }; /* shrinking dimensions */ - hsize_t dims_e[RANK3] = { DIME0, DIME1, DIME2 }; /* extended dimensions */ - hsize_t dims_c[RANK3] = { 2, 2, 2 }; /* chunk dimensions */ - hsize_t dims_r[RANK3]; /* read dimensions */ - hsize_t maxdims[RANK3] = { H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED }; - int buf_o[DIM0][DIM1][DIM2]; - int buf_s[DIMS0][DIMS1][DIMS2]; - int buf_e[DIME0][DIME1][DIME2]; - int buf_r[DIM0][DIM1][DIM2]; - int i, j, k; - int comp_value; - char filename[NAME_BUF_SIZE]; +static int +test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t disable_edge_filters, hbool_t set_istore_k) +{ + + hid_t fid = -1; + hid_t did = -1; + hid_t sid = -1; + hid_t my_dcpl = -1; + hid_t fcpl; + hsize_t dims_o[RANK3] = {DIM0, DIM1, DIM2}; /* original dimensions */ + hsize_t dims_s[RANK3] = {DIMS0, DIMS1, DIMS2}; /* shrinking dimensions */ + hsize_t dims_e[RANK3] = {DIME0, DIME1, DIME2}; /* extended dimensions */ + hsize_t dims_c[RANK3] = {2, 2, 2}; /* chunk dimensions */ + hsize_t dims_r[RANK3]; /* read dimensions */ + hsize_t maxdims[RANK3] = {H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED}; + int buf_o[DIM0][DIM1][DIM2]; + int buf_s[DIMS0][DIMS1][DIMS2]; + int buf_e[DIME0][DIME1][DIME2]; + int buf_r[DIM0][DIM1][DIM2]; + int i, j, k; + int comp_value; + char filename[NAME_BUF_SIZE]; if (do_fill_value) { comp_value = FILL_VALUE; - } else { + } + else { comp_value = 0; } @@ -1356,7 +1325,6 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Pset_istore_k(fcpl, ISTORE_IK) < 0) { TEST_ERROR } - } /* create a new file */ h5_fixname(FILENAME[2], fapl, filename, sizeof filename); @@ -1385,12 +1353,12 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) TEST_ERROR - /*------------------------------------------------------------------------- - * create, write array - *------------------------------------------------------------------------- - */ + /*------------------------------------------------------------------------- + * create, write array + *------------------------------------------------------------------------- + */ - /* create a dataset */ + /* create a dataset */ if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) { TEST_ERROR } @@ -1400,17 +1368,16 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis TEST_ERROR } -#if defined (H5_SET_EXTENT_DEBUG3) +#if defined(H5_SET_EXTENT_DEBUG3) HDprintf("\n"); - for (i = 0; i < (int)dims_o[0]; i++ ) { - for (j = 0; j < (int)dims_o[1]; j++ ) { - for( k = 0; k < (int)dims_o[2]; k++ ) { + for (i = 0; i < (int)dims_o[0]; i++) { + for (j = 0; j < (int)dims_o[1]; j++) { + for (k = 0; k < (int)dims_o[2]; k++) { HDprintf("%d ", buf_o[i][j][k]); } HDprintf("[%d] ", j); } HDprintf("\n"); - } HDprintf("\n"); #endif @@ -1420,10 +1387,10 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * set new dimensions for the array; expand it - * - *------------------------------------------------------------------------- - */ + * set new dimensions for the array; expand it + * + *------------------------------------------------------------------------- + */ /* set new dimensions for the array. */ if (H5Dset_extent(did, dims_e) < 0) { @@ -1454,32 +1421,32 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG3) +#if defined(H5_SET_EXTENT_DEBUG3) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { - for( k = 0; k < (int)dims_r[2]; k++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { + for (k = 0; k < (int)dims_r[2]; k++) { HDprintf("%d ", buf_e[i][j][k]); } HDprintf("[%d] ", j); } HDprintf("\n"); - } HDprintf("\n"); #endif - /* compare the read array with the expanded array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { - for (k = 0; k < (int) dims_r[2]; k++) { + /* compare the read array with the expanded array */ + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { + for (k = 0; k < (int)dims_r[2]; k++) { if (i >= DIM0 || j >= DIM1 || k >= DIM2) { if (buf_e[i][j][k] != comp_value) { HDprintf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k]); HDprintf("value = %d\n", comp_value); TEST_ERROR } - } else { + } + else { if (buf_e[i][j][k] != buf_o[i][j][k]) TEST_ERROR } @@ -1488,9 +1455,9 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * shrink - *------------------------------------------------------------------------- - */ + * shrink + *------------------------------------------------------------------------- + */ /* set new dimensions for the array. */ if (H5Dset_extent(did, dims_s) < 0) { @@ -1534,38 +1501,36 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if ((did = H5Dopen2(fid, "dset1", H5P_DEFAULT)) < 0) { TEST_ERROR } - } /*------------------------------------------------------------------------- - * read - *------------------------------------------------------------------------- - */ + * read + *------------------------------------------------------------------------- + */ /* read */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) { TEST_ERROR } -#if defined (H5_SET_EXTENT_DEBUG3) +#if defined(H5_SET_EXTENT_DEBUG3) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { - for( k = 0; k < (int)dims_r[2]; k++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { + for (k = 0; k < (int)dims_r[2]; k++) { HDprintf("%d ", buf_s[i][j][k]); } - HDprintf("[%d] ", j); + HDprintf("[%d] ", j); } HDprintf("\n"); - } HDprintf("\n"); #endif /* compare the read array with the shrinked array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { - for (k = 0; k < (int) dims_r[2]; k++) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { + for (k = 0; k < (int)dims_r[2]; k++) { if (buf_s[i][j][k] != buf_o[i][j][k]) { HDprintf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k]); HDprintf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k]); @@ -1576,9 +1541,9 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * set new dimensions for the array; expand it back to original size - *------------------------------------------------------------------------- - */ + * set new dimensions for the array; expand it back to original size + *------------------------------------------------------------------------- + */ /* set new dimensions for the array */ if (H5Dset_extent(did, dims_o) < 0) { @@ -1609,33 +1574,33 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG3) +#if defined(H5_SET_EXTENT_DEBUG3) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { - for( k = 0; k < (int)dims_r[2]; k++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { + for (k = 0; k < (int)dims_r[2]; k++) { HDprintf("%d ", buf_r[i][j][k]); } - HDprintf("[%d] ", j); + HDprintf("[%d] ", j); } HDprintf("\n"); - } HDprintf("\n"); #endif - /* compare the read array with the original array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { - for (k = 0; k < (int) dims_r[2]; k++) { + /* compare the read array with the original array */ + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { + for (k = 0; k < (int)dims_r[2]; k++) { if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2) { if (buf_r[i][j][k] != comp_value) { HDprintf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k]); HDprintf("value = %d\n", comp_value); TEST_ERROR } - } else { + } + else { if (buf_r[i][j][k] != buf_o[i][j][k]) TEST_ERROR } @@ -1644,10 +1609,10 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * shrink to 0 - * - *------------------------------------------------------------------------- - */ + * shrink to 0 + * + *------------------------------------------------------------------------- + */ dims_s[0] = 0; dims_s[1] = 0; @@ -1679,18 +1644,18 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * close dataset - *------------------------------------------------------------------------- - */ + * close dataset + *------------------------------------------------------------------------- + */ if (H5Dclose(did) < 0) { TEST_ERROR } /*------------------------------------------------------------------------- - * test a dataset with non initialized chunks - *------------------------------------------------------------------------- - */ + * test a dataset with non initialized chunks + *------------------------------------------------------------------------- + */ if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) { TEST_ERROR @@ -1714,9 +1679,9 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis } /*------------------------------------------------------------------------- - * close property list - *------------------------------------------------------------------------- - */ + * close property list + *------------------------------------------------------------------------- + */ if (H5Pclose(my_dcpl) < 0) { TEST_ERROR @@ -1728,49 +1693,51 @@ static int test_rank3(hid_t fapl, hid_t dcpl, hbool_t do_fill_value, hbool_t dis return 0; - error: +error: H5E_BEGIN_TRY - { - H5Dclose(did); - H5Sclose(sid); - H5Pclose(my_dcpl); - H5Pclose(fcpl); - H5Fclose(fid); - }H5E_END_TRY; + { + H5Dclose(did); + H5Sclose(sid); + H5Pclose(my_dcpl); + H5Pclose(fcpl); + H5Fclose(fid); + } + H5E_END_TRY; return -1; - } /*------------------------------------------------------------------------- * test usage with external storage *------------------------------------------------------------------------- */ -static int test_external(hid_t fapl) { - - hid_t fid = -1; - hid_t did = -1; - hid_t sid = -1; - hid_t dcpl = -1; - hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */ - hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */ - hsize_t dims_e[RANK2] = { DIME0, DIM1 }; /* extended dimensions, dimension 1 is the original */ - hsize_t dims_r[RANK2]; /* read dimensions */ - hsize_t maxdims[RANK2] = { DIME0, DIM1 }; /* only the first dimension can be extendible */ - int buf_o[DIM0][DIM1]; /* original buffer, for writing */ - int buf_s[DIMS0][DIMS1]; /* shrinked buffer, for reading */ - int buf_e[DIME0][DIM1]; /* extended buffer, for writing, dimension 1 is the original */ - int buf_ro[DIM0][DIM1]; /* original buffer for reading */ - int i, j; - int comp_value = 0; - char filename[NAME_BUF_SIZE]; +static int +test_external(hid_t fapl) +{ + + hid_t fid = -1; + hid_t did = -1; + hid_t sid = -1; + hid_t dcpl = -1; + hsize_t dims_o[RANK2] = {DIM0, DIM1}; /* original dimensions */ + hsize_t dims_s[RANK2] = {DIMS0, DIMS1}; /* shrinking dimensions */ + hsize_t dims_e[RANK2] = {DIME0, DIM1}; /* extended dimensions, dimension 1 is the original */ + hsize_t dims_r[RANK2]; /* read dimensions */ + hsize_t maxdims[RANK2] = {DIME0, DIM1}; /* only the first dimension can be extendible */ + int buf_o[DIM0][DIM1]; /* original buffer, for writing */ + int buf_s[DIMS0][DIMS1]; /* shrinked buffer, for reading */ + int buf_e[DIME0][DIM1]; /* extended buffer, for writing, dimension 1 is the original */ + int buf_ro[DIM0][DIM1]; /* original buffer for reading */ + int i, j; + int comp_value = 0; + char filename[NAME_BUF_SIZE]; hsize_t size; /* number of bytes reserved in the file for the data */ hsize_t max_size[2]; max_size[0] = dims_e[0]; max_size[1] = dims_e[1]; - size = max_size[0] * max_size[1] * sizeof(int) / 2; + size = max_size[0] * max_size[1] * sizeof(int) / 2; for (i = 0; i < DIM0; i++) { for (j = 0; j < DIM1; j++) { @@ -1785,39 +1752,38 @@ static int test_external(hid_t fapl) { if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR - /* modify dataset creation properties */ + /* modify dataset creation properties */ if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR - if (H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t) 0, size) < 0) + if (H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t)0, size) < 0) FAIL_STACK_ERROR - if (H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t) 0, size) < 0) + if (H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t)0, size) < 0) FAIL_STACK_ERROR - { - - char name[256]; /*external file name */ - off_t file_offset; /*external file offset */ - hsize_t file_size; /*sizeof external file segment */ + { - if (H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset, &file_size) < 0) - FAIL_STACK_ERROR + char name[256]; /*external file name */ + off_t file_offset; /*external file offset */ + hsize_t file_size; /*sizeof external file segment */ - } + if (H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset, &file_size) < 0) + FAIL_STACK_ERROR + } /*------------------------------------------------------------------------- - * Write an array AxB. These are the dimensions for creating the dataset - * - * original data is - * - * 2 2 2 2 - * 2 2 2 2 - * 2 2 2 2 - * 2 2 2 2 - * - *------------------------------------------------------------------------- - */ + * Write an array AxB. These are the dimensions for creating the dataset + * + * original data is + * + * 2 2 2 2 + * 2 2 2 2 + * 2 2 2 2 + * 2 2 2 2 + * + *------------------------------------------------------------------------- + */ /* create the data space with unlimited dimensions. */ if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) @@ -1829,61 +1795,61 @@ static int test_external(hid_t fapl) { if (H5Sclose(sid) < 0) FAIL_STACK_ERROR - /*------------------------------------------------------------------------- - * read - *------------------------------------------------------------------------- - */ + /*------------------------------------------------------------------------- + * read + *------------------------------------------------------------------------- + */ - /* read */ + /* read */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ro) < 0) FAIL_STACK_ERROR -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n"); - for (i = 0; i < (int)dims_o[0]; i++ ) { - for (j = 0; j < (int)dims_o[1]; j++ ) { + for (i = 0; i < (int)dims_o[0]; i++) { + for (j = 0; j < (int)dims_o[1]; j++) { HDprintf("%d ", buf_ro[i][j]); } HDprintf("\n"); } #endif - /*------------------------------------------------------------------------- - * expand - *------------------------------------------------------------------------- - */ - - /*------------------------------------------------------------------------- - * set new dimensions for the array; expand it - * data is now, extended space was initialized with default value - * - * 2 2 2 2 - * 2 2 2 2 - * 2 2 2 2 - * 2 2 2 2 - * 0 0 0 0 - * 0 0 0 0 - * 0 0 0 0 - * - *------------------------------------------------------------------------- - */ - - /* set new dimensions for the array. */ + /*------------------------------------------------------------------------- + * expand + *------------------------------------------------------------------------- + */ + + /*------------------------------------------------------------------------- + * set new dimensions for the array; expand it + * data is now, extended space was initialized with default value + * + * 2 2 2 2 + * 2 2 2 2 + * 2 2 2 2 + * 2 2 2 2 + * 0 0 0 0 + * 0 0 0 0 + * 0 0 0 0 + * + *------------------------------------------------------------------------- + */ + + /* set new dimensions for the array. */ if (H5Dset_extent(did, dims_e) < 0) FAIL_STACK_ERROR - /* get the space */ + /* get the space */ if ((sid = H5Dget_space(did)) < 0) FAIL_STACK_ERROR - /* get dimensions */ + /* get dimensions */ if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) FAIL_STACK_ERROR if (H5Sclose(sid) < 0) FAIL_STACK_ERROR - /* check dimensions */ + /* check dimensions */ for (i = 0; i < RANK2; i++) { if (dims_r[i] != dims_e[i]) TEST_ERROR @@ -1893,26 +1859,27 @@ static int test_external(hid_t fapl) { if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) FAIL_STACK_ERROR -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_e[i][j]); } HDprintf("\n"); } #endif - /* compare the read array with the expanded array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { + /* compare the read array with the expanded array */ + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { if (i >= DIM0 || j >= DIM1) { if (buf_e[i][j] != comp_value) { HDprintf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]); HDprintf("value = %d\n", comp_value); TEST_ERROR } - } else { + } + else { if (buf_e[i][j] != buf_o[i][j]) TEST_ERROR } @@ -1920,59 +1887,59 @@ static int test_external(hid_t fapl) { } /*------------------------------------------------------------------------- - * shrink - * - * data is now - * - * 2 2 - * 2 2 - * - *------------------------------------------------------------------------- - */ + * shrink + * + * data is now + * + * 2 2 + * 2 2 + * + *------------------------------------------------------------------------- + */ /* set new dimensions for the array. */ if (H5Dset_extent(did, dims_s) < 0) FAIL_STACK_ERROR - /* get the space */ + /* get the space */ if ((sid = H5Dget_space(did)) < 0) FAIL_STACK_ERROR - /* get dimensions */ + /* get dimensions */ if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) FAIL_STACK_ERROR if (H5Sclose(sid) < 0) FAIL_STACK_ERROR - /* check dimensions */ + /* check dimensions */ for (i = 0; i < RANK2; i++) { if (dims_r[i] != dims_s[i]) TEST_ERROR } /*------------------------------------------------------------------------- - * read - *------------------------------------------------------------------------- - */ + * read + *------------------------------------------------------------------------- + */ /* read */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s) < 0) FAIL_STACK_ERROR -#if defined (H5_SET_EXTENT_DEBUG) +#if defined(H5_SET_EXTENT_DEBUG) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_s[i][j]); } HDprintf("\n"); } #endif - /* compare the read array with the shrinked array */ - for (i = 0; i < (int) dims_r[0]; i++) { - for (j = 0; j < (int) dims_r[1]; j++) { + /* compare the read array with the shrinked array */ + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { if (buf_s[i][j] != buf_o[i][j]) { HDprintf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]); HDprintf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]); @@ -1982,27 +1949,27 @@ static int test_external(hid_t fapl) { } /*------------------------------------------------------------------------- - * negative test - * try to extend dimension above maximum - *------------------------------------------------------------------------- - */ + * negative test + * try to extend dimension above maximum + *------------------------------------------------------------------------- + */ dims_e[1] = DIME1; H5E_BEGIN_TRY - { - - /* set new dimensions for the array. */ - if (H5Dset_extent(did, dims_e) == SUCCEED) { - TEST_ERROR - } + { - }H5E_END_TRY; + /* set new dimensions for the array. */ + if (H5Dset_extent(did, dims_e) == SUCCEED) { + TEST_ERROR + } + } + H5E_END_TRY; /*------------------------------------------------------------------------- - * close property list - *------------------------------------------------------------------------- - */ + * close property list + *------------------------------------------------------------------------- + */ if (H5Pclose(dcpl) < 0) FAIL_STACK_ERROR @@ -2017,15 +1984,16 @@ static int test_external(hid_t fapl) { return 0; - error: +error: H5E_BEGIN_TRY - { - H5Dclose(did); - H5Sclose(sid); - H5Pclose(dcpl); - H5Fclose(fid); - }H5E_END_TRY; + { + H5Dclose(did); + H5Sclose(sid); + H5Pclose(dcpl); + H5Fclose(fid); + } + H5E_END_TRY; return -1; } @@ -2033,21 +2001,23 @@ static int test_external(hid_t fapl) { * test usage with layouts compact and contiguous *------------------------------------------------------------------------- */ -static int test_layouts(H5D_layout_t layout, hid_t fapl) { - - hid_t fid = -1; - hid_t did = -1; - hid_t sid = -1; - hid_t dcpl = -1; - herr_t ret; - hsize_t dims_o[RANK2] = { DIM0, DIM1 }; /* original dimensions */ - hsize_t dims_s[RANK2] = { DIMS0, DIMS1 }; /* shrinking dimensions */ - hsize_t dims_e[RANK2] = { DIME0, DIME1 }; /* extended dimensions */ - hsize_t dims_r[RANK2]; /* read dimensions */ - int buf_o[DIM0][DIM1]; - int buf_r[DIM0][DIM1]; - int i, j; - char filename[NAME_BUF_SIZE]; +static int +test_layouts(H5D_layout_t layout, hid_t fapl) +{ + + hid_t fid = -1; + hid_t did = -1; + hid_t sid = -1; + hid_t dcpl = -1; + herr_t ret; + hsize_t dims_o[RANK2] = {DIM0, DIM1}; /* original dimensions */ + hsize_t dims_s[RANK2] = {DIMS0, DIMS1}; /* shrinking dimensions */ + hsize_t dims_e[RANK2] = {DIME0, DIME1}; /* extended dimensions */ + hsize_t dims_r[RANK2]; /* read dimensions */ + int buf_o[DIM0][DIM1]; + int buf_r[DIM0][DIM1]; + int i, j; + char filename[NAME_BUF_SIZE]; for (i = 0; i < DIM0; i++) { for (j = 0; j < DIM1; j++) { @@ -2085,10 +2055,10 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { TEST_ERROR } -#if defined (H5_SET_EXTENT_DEBUG4) +#if defined(H5_SET_EXTENT_DEBUG4) HDprintf("\n"); - for (i = 0; i < (int)dims_o[0]; i++ ) { - for (j = 0; j < (int)dims_o[1]; j++ ) { + for (i = 0; i < (int)dims_o[0]; i++) { + for (j = 0; j < (int)dims_o[1]; j++) { HDprintf("%d ", buf_o[i][j]); } HDprintf("\n"); @@ -2100,22 +2070,18 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { } /*------------------------------------------------------------------------- - * negative test - * try to extend dimension - *------------------------------------------------------------------------- - */ - - H5E_BEGIN_TRY - { - - ret = H5Dset_extent(did, dims_e); + * negative test + * try to extend dimension + *------------------------------------------------------------------------- + */ - }H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5Dset_extent(did, dims_e); } + H5E_END_TRY; if (ret >= 0) TEST_ERROR - /* get the space */ + /* get the space */ if ((sid = H5Dget_space(did)) < 0) { TEST_ERROR } @@ -2139,33 +2105,29 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) TEST_ERROR -#if defined (H5_SET_EXTENT_DEBUG4) +#if defined(H5_SET_EXTENT_DEBUG4) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_r[i][j]); } HDprintf("\n"); } #endif - /*------------------------------------------------------------------------- - * negative test - * try to shrink dimension - *------------------------------------------------------------------------- - */ - - H5E_BEGIN_TRY - { - - ret = H5Dset_extent(did, dims_s); + /*------------------------------------------------------------------------- + * negative test + * try to shrink dimension + *------------------------------------------------------------------------- + */ - }H5E_END_TRY; + H5E_BEGIN_TRY { ret = H5Dset_extent(did, dims_s); } + H5E_END_TRY; if (ret >= 0) TEST_ERROR - /* get the space */ + /* get the space */ if ((sid = H5Dget_space(did)) < 0) { TEST_ERROR } @@ -2186,19 +2148,19 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { } /*------------------------------------------------------------------------- - * read - *------------------------------------------------------------------------- - */ + * read + *------------------------------------------------------------------------- + */ /* read */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) { TEST_ERROR } -#if defined (H5_SET_EXTENT_DEBUG4) +#if defined(H5_SET_EXTENT_DEBUG4) HDprintf("\n"); - for (i = 0; i < (int)dims_r[0]; i++ ) { - for (j = 0; j < (int)dims_r[1]; j++ ) { + for (i = 0; i < (int)dims_r[0]; i++) { + for (j = 0; j < (int)dims_r[1]; j++) { HDprintf("%d ", buf_r[i][j]); } HDprintf("\n"); @@ -2206,9 +2168,9 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { #endif /*------------------------------------------------------------------------- - * close - *------------------------------------------------------------------------- - */ + * close + *------------------------------------------------------------------------- + */ if (H5Dclose(did) < 0) { TEST_ERROR @@ -2224,20 +2186,19 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { return 0; - error: +error: H5E_BEGIN_TRY - { - H5Dclose(did); - H5Sclose(sid); - H5Pclose(dcpl); - H5Fclose(fid); - }H5E_END_TRY; + { + H5Dclose(did); + H5Sclose(sid); + H5Pclose(dcpl); + H5Fclose(fid); + } + H5E_END_TRY; return -1; - } - /*------------------------------------------------------------------------- * Function: test_random_rank4 * @@ -2253,31 +2214,31 @@ static int test_layouts(H5D_layout_t layout, hid_t fapl) { * *------------------------------------------------------------------------- */ -static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, - hbool_t disable_edge_filters, hbool_t do_sparse, - rank4_index_t index_type ) +static int +test_random_rank4(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_edge_filters, + hbool_t do_sparse, rank4_index_t index_type) { - hid_t file = -1; - hid_t dset = -1; - hid_t fspace = -1; - hid_t mspace = -1; - hid_t my_dcpl = -1; - hsize_t dims[4] = {10, 10, 10, 10}; /* Dataset's dimensions */ - hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum dimensions */ - hsize_t old_dims[4]; /* Old dataset dimensions */ - hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ - hsize_t *valid_dims = old_dims; /* Dimensions of region still containing written data */ - hsize_t cdims[4]; /* Chunk dimensions */ - const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ - const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslabe operations on memory */ - static int rbuf[10][10][10][10]; /* Read buffer */ - static int wbuf[10][10][10][10]; /* Write buffer */ - static hsize_t dim_log[RAND4_NITER+1][4]; /* Log of dataset dimensions */ - hbool_t zero_dim = FALSE; /* Whether a dimension is 0 */ - hbool_t writing = TRUE; /* Whether we're writing to the dset */ - unsigned scalar_iter; /* Iteration to shrink dset to 1x1x1x1 */ - volatile unsigned i, j, k, l, m; /* Local indices */ - char filename[NAME_BUF_SIZE]; + hid_t file = -1; + hid_t dset = -1; + hid_t fspace = -1; + hid_t mspace = -1; + hid_t my_dcpl = -1; + hsize_t dims[4] = {10, 10, 10, 10}; /* Dataset's dimensions */ + hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum dimensions */ + hsize_t old_dims[4]; /* Old dataset dimensions */ + hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ + hsize_t * valid_dims = old_dims; /* Dimensions of region still containing written data */ + hsize_t cdims[4]; /* Chunk dimensions */ + const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ + const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslabe operations on memory */ + static int rbuf[10][10][10][10]; /* Read buffer */ + static int wbuf[10][10][10][10]; /* Write buffer */ + static hsize_t dim_log[RAND4_NITER + 1][4]; /* Log of dataset dimensions */ + hbool_t zero_dim = FALSE; /* Whether a dimension is 0 */ + hbool_t writing = TRUE; /* Whether we're writing to the dset */ + unsigned scalar_iter; /* Iteration to shrink dset to 1x1x1x1 */ + volatile unsigned i, j, k, l, m; /* Local indices */ + char filename[NAME_BUF_SIZE]; /* create a new file */ h5_fixname(FILENAME[4], fapl, filename, sizeof filename); @@ -2285,14 +2246,14 @@ static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, TEST_ERROR /* Set maximum dimensions as appropriate for index type */ - if(index_type == RANK4_INDEX_BTREE) - for(i=0; i<4; i++) + if (index_type == RANK4_INDEX_BTREE) + for (i = 0; i < 4; i++) max_dims[i] = H5S_UNLIMITED; - else if(index_type == RANK4_INDEX_EARRAY) + else if (index_type == RANK4_INDEX_EARRAY) max_dims[1] = H5S_UNLIMITED; /* Generate random chunk dimensions, 2-4 */ - for(i=0; i<4; i++) + for (i = 0; i < 4; i++) cdims[i] = (hsize_t)((HDrandom() % 3) + 2); /* Pick iteration to shrink dataset to 1x1x1x1 */ @@ -2300,142 +2261,136 @@ static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, /* Generate initial dataset size, 1-10, unless using fixed array index or * scalar_iter is 0 */ - for(i=0; i<4; i++) { - dims[i] = (hsize_t)(index_type != RANK4_INDEX_FARRAY - ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); + for (i = 0; i < 4; i++) { + dims[i] = (hsize_t)( + index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); dim_log[0][i] = dims[i]; } /* end for */ /* Create dataset */ - if((fspace = H5Screate_simple(4, dims, max_dims)) < 0) + if ((fspace = H5Screate_simple(4, dims, max_dims)) < 0) TEST_ERROR - if((my_dcpl = H5Pcopy(dcpl)) < 0) + if ((my_dcpl = H5Pcopy(dcpl)) < 0) TEST_ERROR - if(H5Pset_chunk(my_dcpl, 4, cdims) < 0) + if (H5Pset_chunk(my_dcpl, 4, cdims) < 0) TEST_ERROR - if(disable_edge_filters) - if(H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) + if (disable_edge_filters) + if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) TEST_ERROR - if((dset = H5Dcreate2(file, "dset", H5T_NATIVE_INT, fspace, H5P_DEFAULT, - my_dcpl, H5P_DEFAULT)) < 0) + if ((dset = H5Dcreate2(file, "dset", H5T_NATIVE_INT, fspace, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Sclose(fspace) < 0) + if (H5Sclose(fspace) < 0) TEST_ERROR /* Create memory space, and set initial selection */ - if((mspace = H5Screate_simple(4, mdims, NULL)) < 0) + if ((mspace = H5Screate_simple(4, mdims, NULL)) < 0) TEST_ERROR - if(H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL) - < 0) + if (H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) TEST_ERROR /* Main loop */ - for(i=0; i<RAND4_NITER; i++) { + for (i = 0; i < RAND4_NITER; i++) { /* Generate random write buffer */ - if(writing && !zero_dim) { - for(j=0; j<dims[0]; j++) - for(k=0; k<dims[1]; k++) - for(l=0; l<dims[2]; l++) - for(m=0; m<dims[3]; m++) + if (writing && !zero_dim) { + for (j = 0; j < dims[0]; j++) + for (k = 0; k < dims[1]; k++) + for (l = 0; l < dims[2]; l++) + for (m = 0; m < dims[3]; m++) wbuf[j][k][l][m] = HDrandom(); /* Write data */ - if(H5Dwrite(dset, H5T_NATIVE_INT, mspace, H5S_ALL, H5P_DEFAULT, - wbuf) < 0) - RAND4_FAIL_DUMP(i+1, -1, -1, -1, -1) + if (H5Dwrite(dset, H5T_NATIVE_INT, mspace, H5S_ALL, H5P_DEFAULT, wbuf) < 0) + RAND4_FAIL_DUMP(i + 1, -1, -1, -1, -1) } /* end if */ /* Generate new dataset size, 0-10 (0 much less likely). If i is * scalar_iter, set all dims to 1. */ zero_dim = FALSE; - for(j=0; j<4; j++) { + for (j = 0; j < 4; j++) { old_dims[j] = dims[j]; - if((dims[j] = (hsize_t)(i == scalar_iter ? 1 : (HDrandom() % 11))) - == 0) - if((dims[j] = (hsize_t)(HDrandom() % 11)) == 0) + if ((dims[j] = (hsize_t)(i == scalar_iter ? 1 : (HDrandom() % 11))) == 0) + if ((dims[j] = (hsize_t)(HDrandom() % 11)) == 0) zero_dim = TRUE; - dim_log[i+1][j] = dims[j]; + dim_log[i + 1][j] = dims[j]; } /* end for */ /* If writing is disabled, update min_unwritten_dims */ - if(!writing) - for(j=0; j<4; j++) - if(old_dims[j] < min_unwritten_dims[j]) + if (!writing) + for (j = 0; j < 4; j++) + if (old_dims[j] < min_unwritten_dims[j]) min_unwritten_dims[j] = old_dims[j]; /* Resize dataset */ - if(H5Dset_extent(dset, dims) < 0) - RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1) + if (H5Dset_extent(dset, dims) < 0) + RAND4_FAIL_DUMP(i + 2, -1, -1, -1, -1) - if(!zero_dim) { + if (!zero_dim) { /* Read data from resized dataset */ - if(H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, - NULL) < 0) - RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1) - if(H5Dread(dset, H5T_NATIVE_INT, mspace, H5S_ALL, H5P_DEFAULT, rbuf) - < 0) - RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1) + if (H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) + RAND4_FAIL_DUMP(i + 2, -1, -1, -1, -1) + if (H5Dread(dset, H5T_NATIVE_INT, mspace, H5S_ALL, H5P_DEFAULT, rbuf) < 0) + RAND4_FAIL_DUMP(i + 2, -1, -1, -1, -1) /* Verify correctness of read data */ - if(do_fillvalue) { - for(j=0; j<dims[0]; j++) - for(k=0; k<dims[1]; k++) - for(l=0; l<dims[2]; l++) - for(m=0; m<dims[3]; m++) - if(j >= valid_dims[0] || k >= valid_dims[1] - || l >= valid_dims[2] - || m >= valid_dims[3]) { - if(FILL_VALUE != rbuf[j][k][l][m]) - RAND4_FAIL_DUMP(i+2, (int)j, (int)k, (int)l, (int)m) + if (do_fillvalue) { + for (j = 0; j < dims[0]; j++) + for (k = 0; k < dims[1]; k++) + for (l = 0; l < dims[2]; l++) + for (m = 0; m < dims[3]; m++) + if (j >= valid_dims[0] || k >= valid_dims[1] || l >= valid_dims[2] || + m >= valid_dims[3]) { + if (FILL_VALUE != rbuf[j][k][l][m]) + RAND4_FAIL_DUMP(i + 2, (int)j, (int)k, (int)l, (int)m) } /* end if */ - else - if(wbuf[j][k][l][m] != rbuf[j][k][l][m]) - RAND4_FAIL_DUMP(i+2, (int)j, (int)k, (int)l, (int)m) + else if (wbuf[j][k][l][m] != rbuf[j][k][l][m]) + RAND4_FAIL_DUMP(i + 2, (int)j, (int)k, (int)l, (int)m) } /* end if */ else { - for(j=0; j<MIN(dims[0],valid_dims[0]); j++) - for(k=0; k<MIN(dims[1],valid_dims[1]); k++) - for(l=0; l<MIN(dims[2],valid_dims[2]); l++) - for(m=0; m<MIN(dims[3],valid_dims[3]); m++) - if(wbuf[j][k][l][m] != rbuf[j][k][l][m]) - RAND4_FAIL_DUMP(i+2, (int)j, (int)k, (int)l, (int)m) + for (j = 0; j < MIN(dims[0], valid_dims[0]); j++) + for (k = 0; k < MIN(dims[1], valid_dims[1]); k++) + for (l = 0; l < MIN(dims[2], valid_dims[2]); l++) + for (m = 0; m < MIN(dims[3], valid_dims[3]); m++) + if (wbuf[j][k][l][m] != rbuf[j][k][l][m]) + RAND4_FAIL_DUMP(i + 2, (int)j, (int)k, (int)l, (int)m) } /* end else */ - } /* end if */ + } /* end if */ /* Handle the switch between writing and not writing */ - if(do_sparse && !(i % RAND4_SPARSE_SWITCH)) { + if (do_sparse && !(i % RAND4_SPARSE_SWITCH)) { writing = !writing; - if(!writing) { - for(j=0; j<4; j++) + if (!writing) { + for (j = 0; j < 4; j++) min_unwritten_dims[j] = old_dims[j]; valid_dims = min_unwritten_dims; } /* end if */ else valid_dims = old_dims; } /* end if */ - } /* end for */ + } /* end for */ /* Close */ - if(H5Sclose(mspace) < 0) + if (H5Sclose(mspace) < 0) TEST_ERROR - if(H5Pclose(my_dcpl) < 0) + if (H5Pclose(my_dcpl) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) + if (H5Dclose(dset) < 0) TEST_ERROR - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR return 0; error: - H5E_BEGIN_TRY { + H5E_BEGIN_TRY + { H5Sclose(fspace); H5Sclose(mspace); H5Pclose(dcpl); H5Dclose(dset); H5Fclose(file); - } H5E_END_TRY + } + H5E_END_TRY return -1; } /* end test_random_rank4 */ @@ -2455,55 +2410,55 @@ error: * *------------------------------------------------------------------------- */ -static int test_random_rank4_vl( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, - hbool_t disable_edge_filters, hbool_t do_sparse, - rank4_index_t index_type ) +static int +test_random_rank4_vl(hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, hbool_t disable_edge_filters, + hbool_t do_sparse, rank4_index_t index_type) { - hid_t file = -1; - hid_t dset = -1; - hid_t type = -1; - hid_t fspace = -1; - hid_t mspace = -1; - hid_t my_dcpl = -1; - hsize_t dims[4] = {10, 10, 10, 10}; /* Dataset's dimensions */ - hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum dimensions */ - hsize_t old_dims[4]; /* Old dataset dimensions */ - hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ - hsize_t *valid_dims = old_dims; /* Dimensions of region still containing written data */ - hsize_t cdims[4]; /* Chunk dimensions */ - const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ - const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslab operations on memory */ - static hvl_t rbuf[10][10][10][10]; /* Read buffer */ - static hvl_t wbuf[10][10][10][10]; /* Write buffer */ - static hsize_t dim_log[RAND4_NITER+1][4]; /* Log of dataset dimensions */ - hbool_t zero_dim = FALSE; /* Whether a dimension is 0 */ - hbool_t writing = TRUE; /* Whether we're writing to the dset */ - hvl_t fill_value; /* Fill value */ - unsigned scalar_iter; /* Iteration to shrink dset to 1x1x1x1 */ - volatile unsigned i, j, k, l, m; /* Local indices */ - char filename[NAME_BUF_SIZE]; + hid_t file = -1; + hid_t dset = -1; + hid_t type = -1; + hid_t fspace = -1; + hid_t mspace = -1; + hid_t my_dcpl = -1; + hsize_t dims[4] = {10, 10, 10, 10}; /* Dataset's dimensions */ + hsize_t max_dims[4] = {10, 10, 10, 10}; /* Maximum dimensions */ + hsize_t old_dims[4]; /* Old dataset dimensions */ + hsize_t min_unwritten_dims[4]; /* Minimum dimensions since last write */ + hsize_t * valid_dims = old_dims; /* Dimensions of region still containing written data */ + hsize_t cdims[4]; /* Chunk dimensions */ + const hsize_t mdims[4] = {10, 10, 10, 10}; /* Memory buffer dimensions */ + const hsize_t start[4] = {0, 0, 0, 0}; /* Start for hyperslab operations on memory */ + static hvl_t rbuf[10][10][10][10]; /* Read buffer */ + static hvl_t wbuf[10][10][10][10]; /* Write buffer */ + static hsize_t dim_log[RAND4_NITER + 1][4]; /* Log of dataset dimensions */ + hbool_t zero_dim = FALSE; /* Whether a dimension is 0 */ + hbool_t writing = TRUE; /* Whether we're writing to the dset */ + hvl_t fill_value; /* Fill value */ + unsigned scalar_iter; /* Iteration to shrink dset to 1x1x1x1 */ + volatile unsigned i, j, k, l, m; /* Local indices */ + char filename[NAME_BUF_SIZE]; /* Initialize fill value buffers so they aren't freed in case of an error */ fill_value.len = 0; - fill_value.p = NULL; - for(i=0; i<dims[0]; i++) - for(j=0; j<dims[1]; j++) - for(k=0; k<dims[2]; k++) - for(l=0; l<dims[3]; l++) { + fill_value.p = NULL; + for (i = 0; i < dims[0]; i++) + for (j = 0; j < dims[1]; j++) + for (k = 0; k < dims[2]; k++) + for (l = 0; l < dims[3]; l++) { rbuf[i][j][k][l].len = 0; - rbuf[i][j][k][l].p = NULL; + rbuf[i][j][k][l].p = NULL; wbuf[i][j][k][l].len = 0; - wbuf[i][j][k][l].p = NULL; + wbuf[i][j][k][l].p = NULL; } /* end for */ /* Allocate space for VL write buffers, since these never need to be * reallocated */ - for(i=0; i<dims[0]; i++) - for(j=0; j<dims[1]; j++) - for(k=0; k<dims[2]; k++) - for(l=0; l<dims[3]; l++) { + for (i = 0; i < dims[0]; i++) + for (j = 0; j < dims[1]; j++) + for (k = 0; k < dims[2]; k++) + for (l = 0; l < dims[3]; l++) { wbuf[i][j][k][l].len = 2; - if(NULL == (wbuf[i][j][k][l].p = HDmalloc(2 * sizeof(int)))) + if (NULL == (wbuf[i][j][k][l].p = HDmalloc(2 * sizeof(int)))) TEST_ERROR; } /* end for */ @@ -2513,18 +2468,18 @@ static int test_random_rank4_vl( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, TEST_ERROR /* Create VL type */ - if((type = H5Tvlen_create(H5T_NATIVE_INT)) < 0) + if ((type = H5Tvlen_create(H5T_NATIVE_INT)) < 0) TEST_ERROR /* Set maximum dimensions as appropriate for index type */ - if(index_type == RANK4_INDEX_BTREE) - for(i=0; i<4; i++) + if (index_type == RANK4_INDEX_BTREE) + for (i = 0; i < 4; i++) max_dims[i] = H5S_UNLIMITED; - else if(index_type == RANK4_INDEX_EARRAY) + else if (index_type == RANK4_INDEX_EARRAY) max_dims[1] = H5S_UNLIMITED; /* Generate random chunk dimensions, 2-4 */ - for(i=0; i<4; i++) + for (i = 0; i < 4; i++) cdims[i] = (hsize_t)((HDrandom() % 3) + 2); /* Pick iteration to shrink dataset to 1x1x1x1 */ @@ -2532,179 +2487,167 @@ static int test_random_rank4_vl( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, /* Generate initial dataset size, 1-10, unless using fixed array index or * scalar_iter is 0 */ - for(i=0; i<4; i++) { - dims[i] = (hsize_t)(index_type != RANK4_INDEX_FARRAY - ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); + for (i = 0; i < 4; i++) { + dims[i] = (hsize_t)( + index_type != RANK4_INDEX_FARRAY ? (0 == scalar_iter ? 1 : ((HDrandom() % 10) + 1)) : 10); dim_log[0][i] = dims[i]; } /* end for */ /* Make a copy of the dcpl */ - if((my_dcpl = H5Pcopy(dcpl)) < 0) + if ((my_dcpl = H5Pcopy(dcpl)) < 0) TEST_ERROR /* Create VL fill value, if requested */ - if(do_fillvalue) { + if (do_fillvalue) { fill_value.len = 2; - if(NULL == (fill_value.p = HDmalloc(2 * sizeof(int)))) - TEST_ERROR - ((int *)fill_value.p)[0] = 1; + if (NULL == (fill_value.p = HDmalloc(2 * sizeof(int)))) + TEST_ERROR((int *)fill_value.p)[0] = 1; ((int *)fill_value.p)[1] = 2; - if(H5Pset_fill_value(my_dcpl, type, &fill_value) < 0) + if (H5Pset_fill_value(my_dcpl, type, &fill_value) < 0) TEST_ERROR } /* end if */ /* Create dataset */ - if((fspace = H5Screate_simple(4, dims, max_dims)) < 0) + if ((fspace = H5Screate_simple(4, dims, max_dims)) < 0) TEST_ERROR - if(H5Pset_chunk(my_dcpl, 4, cdims) < 0) + if (H5Pset_chunk(my_dcpl, 4, cdims) < 0) TEST_ERROR - if(disable_edge_filters) - if(H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) + if (disable_edge_filters) + if (H5Pset_chunk_opts(my_dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0) TEST_ERROR - if((dset = H5Dcreate2(file, "dset", type, fspace, H5P_DEFAULT, my_dcpl, - H5P_DEFAULT)) < 0) + if ((dset = H5Dcreate2(file, "dset", type, fspace, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0) TEST_ERROR - if(H5Sclose(fspace) < 0) + if (H5Sclose(fspace) < 0) TEST_ERROR /* Create memory space, and set initial selection */ - if((mspace = H5Screate_simple(4, mdims, NULL)) < 0) + if ((mspace = H5Screate_simple(4, mdims, NULL)) < 0) TEST_ERROR - if(H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL) - < 0) + if (H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) TEST_ERROR /* Main loop */ - for(i=0; i<RAND4_VL_NITER; i++) { + for (i = 0; i < RAND4_VL_NITER; i++) { /* Generate random write buffer */ - if(writing && !zero_dim) { - for(j=0; j<dims[0]; j++) - for(k=0; k<dims[1]; k++) - for(l=0; l<dims[2]; l++) - for(m=0; m<dims[3]; m++) { + if (writing && !zero_dim) { + for (j = 0; j < dims[0]; j++) + for (k = 0; k < dims[1]; k++) + for (l = 0; l < dims[2]; l++) + for (m = 0; m < dims[3]; m++) { ((int *)wbuf[j][k][l][m].p)[0] = HDrandom(); ((int *)wbuf[j][k][l][m].p)[1] = HDrandom(); } /* end for */ /* Write data */ - if(H5Dwrite(dset, type, mspace, H5S_ALL, H5P_DEFAULT, wbuf) < 0) - RAND4_FAIL_DUMP(i+1, -1, -1, -1, -1) + if (H5Dwrite(dset, type, mspace, H5S_ALL, H5P_DEFAULT, wbuf) < 0) + RAND4_FAIL_DUMP(i + 1, -1, -1, -1, -1) } /* end if */ /* Generate new dataset size, 0-10 (0 much less likely). If i is * scalar_iter, set all dims to 1. */ zero_dim = FALSE; - for(j=0; j<4; j++) { + for (j = 0; j < 4; j++) { old_dims[j] = dims[j]; - if((dims[j] = (hsize_t)(i == scalar_iter ? 1 : (HDrandom() % 11))) - == 0) - if((dims[j] = (hsize_t)(HDrandom() % 11)) == 0) + if ((dims[j] = (hsize_t)(i == scalar_iter ? 1 : (HDrandom() % 11))) == 0) + if ((dims[j] = (hsize_t)(HDrandom() % 11)) == 0) zero_dim = TRUE; - dim_log[i+1][j] = dims[j]; + dim_log[i + 1][j] = dims[j]; } /* end for */ /* If writing is disabled, update min_unwritten_dims */ - if(!writing) - for(j=0; j<4; j++) - if(old_dims[j] < min_unwritten_dims[j]) + if (!writing) + for (j = 0; j < 4; j++) + if (old_dims[j] < min_unwritten_dims[j]) min_unwritten_dims[j] = old_dims[j]; /* Resize dataset */ - if(H5Dset_extent(dset, dims) < 0) - RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1) + if (H5Dset_extent(dset, dims) < 0) + RAND4_FAIL_DUMP(i + 2, -1, -1, -1, -1) - if(!zero_dim) { + if (!zero_dim) { /* Read data from resized dataset */ - if(H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, - NULL) < 0) - RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1) - if(H5Dread(dset, type, mspace, H5S_ALL, H5P_DEFAULT, rbuf) < 0) - RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1) + if (H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) + RAND4_FAIL_DUMP(i + 2, -1, -1, -1, -1) + if (H5Dread(dset, type, mspace, H5S_ALL, H5P_DEFAULT, rbuf) < 0) + RAND4_FAIL_DUMP(i + 2, -1, -1, -1, -1) /* Verify correctness of read data */ - if(do_fillvalue) { - for(j=0; j<dims[0]; j++) - for(k=0; k<dims[1]; k++) - for(l=0; l<dims[2]; l++) - for(m=0; m<dims[3]; m++) - if(j >= valid_dims[0] || k >= valid_dims[1] - || l >= valid_dims[2] - || m >= valid_dims[3]) { - if(((int *)fill_value.p)[0] - != ((int *)rbuf[j][k][l][m].p)[0] - || ((int *)fill_value.p)[1] - != ((int *)rbuf[j][k][l][m].p)[1]) - RAND4_FAIL_DUMP(i+2, (int)j, (int)k, (int)l, (int)m) + if (do_fillvalue) { + for (j = 0; j < dims[0]; j++) + for (k = 0; k < dims[1]; k++) + for (l = 0; l < dims[2]; l++) + for (m = 0; m < dims[3]; m++) + if (j >= valid_dims[0] || k >= valid_dims[1] || l >= valid_dims[2] || + m >= valid_dims[3]) { + if (((int *)fill_value.p)[0] != ((int *)rbuf[j][k][l][m].p)[0] || + ((int *)fill_value.p)[1] != ((int *)rbuf[j][k][l][m].p)[1]) + RAND4_FAIL_DUMP(i + 2, (int)j, (int)k, (int)l, (int)m) } /* end if */ - else - if(((int *)wbuf[j][k][l][m].p)[0] - != ((int *)rbuf[j][k][l][m].p)[0] - || ((int *)wbuf[j][k][l][m].p)[1] - != ((int *)rbuf[j][k][l][m].p)[1]) - RAND4_FAIL_DUMP(i+2, (int)j, (int)k, (int)l, (int)m) + else if (((int *)wbuf[j][k][l][m].p)[0] != ((int *)rbuf[j][k][l][m].p)[0] || + ((int *)wbuf[j][k][l][m].p)[1] != ((int *)rbuf[j][k][l][m].p)[1]) + RAND4_FAIL_DUMP(i + 2, (int)j, (int)k, (int)l, (int)m) } /* end if */ else { - for(j=0; j<MIN(dims[0],valid_dims[0]); j++) - for(k=0; k<MIN(dims[1],valid_dims[1]); k++) - for(l=0; l<MIN(dims[2],valid_dims[2]); l++) - for(m=0; m<MIN(dims[3],valid_dims[3]); m++) - if(((int *)wbuf[j][k][l][m].p)[0] - != ((int *)rbuf[j][k][l][m].p)[0] - || ((int *)wbuf[j][k][l][m].p)[1] - != ((int *)rbuf[j][k][l][m].p)[1]) - RAND4_FAIL_DUMP(i+2, (int)j, (int)k, (int)l, (int)m) + for (j = 0; j < MIN(dims[0], valid_dims[0]); j++) + for (k = 0; k < MIN(dims[1], valid_dims[1]); k++) + for (l = 0; l < MIN(dims[2], valid_dims[2]); l++) + for (m = 0; m < MIN(dims[3], valid_dims[3]); m++) + if (((int *)wbuf[j][k][l][m].p)[0] != ((int *)rbuf[j][k][l][m].p)[0] || + ((int *)wbuf[j][k][l][m].p)[1] != ((int *)rbuf[j][k][l][m].p)[1]) + RAND4_FAIL_DUMP(i + 2, (int)j, (int)k, (int)l, (int)m) } /* end else */ /* Free read buffer */ - if(H5Treclaim(type, mspace, H5P_DEFAULT, rbuf) < 0) + if (H5Treclaim(type, mspace, H5P_DEFAULT, rbuf) < 0) TEST_ERROR } /* end if */ /* Handle the switch between writing and not writing */ - if(do_sparse && !(i % RAND4_VL_SPARSE_SWITCH)) { + if (do_sparse && !(i % RAND4_VL_SPARSE_SWITCH)) { writing = !writing; - if(!writing) { - for(j=0; j<4; j++) + if (!writing) { + for (j = 0; j < 4; j++) min_unwritten_dims[j] = old_dims[j]; valid_dims = min_unwritten_dims; } /* end if */ else valid_dims = old_dims; } /* end if */ - } /* end for */ + } /* end for */ /* Close */ - if(H5Sselect_all(mspace) < 0) + if (H5Sselect_all(mspace) < 0) TEST_ERROR - if(H5Treclaim(type, mspace, H5P_DEFAULT, wbuf) < 0) + if (H5Treclaim(type, mspace, H5P_DEFAULT, wbuf) < 0) TEST_ERROR free(fill_value.p); - if(H5Sclose(mspace) < 0) + if (H5Sclose(mspace) < 0) TEST_ERROR - if(H5Pclose(my_dcpl) < 0) + if (H5Pclose(my_dcpl) < 0) TEST_ERROR - if(H5Dclose(dset) < 0) + if (H5Dclose(dset) < 0) TEST_ERROR - if(H5Tclose(type) < 0) + if (H5Tclose(type) < 0) TEST_ERROR - if(H5Fclose(file) < 0) + if (H5Fclose(file) < 0) TEST_ERROR return 0; error: - H5E_BEGIN_TRY { - for(i=0; i<dims[0]; i++) - for(j=0; j<dims[1]; j++) - for(k=0; k<dims[2]; k++) - for(l=0; l<dims[3]; l++) { - if(rbuf[i][j][k][l].p) + H5E_BEGIN_TRY + { + for (i = 0; i < dims[0]; i++) + for (j = 0; j < dims[1]; j++) + for (k = 0; k < dims[2]; k++) + for (l = 0; l < dims[3]; l++) { + if (rbuf[i][j][k][l].p) HDfree(rbuf[i][j][k][l].p); - if(wbuf[i][j][k][l].p) + if (wbuf[i][j][k][l].p) HDfree(wbuf[i][j][k][l].p); } /* end for */ - if(fill_value.p) + if (fill_value.p) HDfree(fill_value.p); H5Sclose(fspace); H5Sclose(mspace); @@ -2712,7 +2655,8 @@ error: H5Dclose(dset); H5Tclose(type); H5Fclose(file); - } H5E_END_TRY + } + H5E_END_TRY return -1; } /* end test_random_rank4_vl */ @@ -2720,21 +2664,19 @@ error: * test_random_rank4_dump: Dump debugging info from test_random_rank4 to screen * after failure. */ -static void test_random_rank4_dump( unsigned ndim_sets, hsize_t dim_log[][4], - hsize_t cdims[4], int j, int k, int l, int m ) +static void +test_random_rank4_dump(unsigned ndim_sets, hsize_t dim_log[][4], hsize_t cdims[4], int j, int k, int l, int m) { unsigned i; - HDprintf(" Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], - (unsigned)cdims[1], (unsigned)cdims[2], (unsigned)cdims[3]); + HDprintf(" Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0], (unsigned)cdims[1], + (unsigned)cdims[2], (unsigned)cdims[3]); HDprintf(" Log of dataset dimensions (oldest first):\n"); - for(i=0; i<ndim_sets; i++) - HDprintf(" Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, - (unsigned)dim_log[i][0], (unsigned)dim_log[i][1], - (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]); - if(j>=0) + for (i = 0; i < ndim_sets; i++) + HDprintf(" Iteration %-3u: ( %2u, %2u, %2u, %2u )\n", i, (unsigned)dim_log[i][0], + (unsigned)dim_log[i][1], (unsigned)dim_log[i][2], (unsigned)dim_log[i][3]); + if (j >= 0) HDprintf(" First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l, m); return; } /* end test_random_rank4_dump */ - |