summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2010-02-16 17:23:38 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2010-02-16 17:23:38 (GMT)
commitfeae1cb35ffd0199e9fa03d97f66100919e4094d (patch)
tree04f0297afa6831a48974196db64df75abbbe7972 /test
parentbbd0b5515888c00ce4ed5f4c7af635d5c9aa2490 (diff)
downloadhdf5-feae1cb35ffd0199e9fa03d97f66100919e4094d.zip
hdf5-feae1cb35ffd0199e9fa03d97f66100919e4094d.tar.gz
hdf5-feae1cb35ffd0199e9fa03d97f66100919e4094d.tar.bz2
[svn-r18263] Purpose: Fix bug in b-tree code
Description: In certain cases, removal of an object in a v1 b-tree would cause the leftmost key in the right neighbor to be overwritten. While this did not pose a problem for group b-trees, with chunked datasets it would overwrite the offset value of the neighbor's leftmost child, causing corruption. Reworked the code to differentiate between b-trees whose children are fundamentally associated with their left key and those who are associated with their right key. Tested: jam, linew, amani (h5committest)
Diffstat (limited to 'test')
-rw-r--r--test/set_extent.c982
1 files changed, 544 insertions, 438 deletions
diff --git a/test/set_extent.c b/test/set_extent.c
index c65e7d0..b35af8e 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -20,6 +20,8 @@
* Purpose: Tests the H5Dset_extent call
*/
+#include <time.h>
+#include <stdlib.h>
#include "hdf5.h"
#include "h5test.h"
@@ -36,6 +38,7 @@ const char *FILENAME[] = {
"set_extent3",
"set_extent4",
"set_extent5",
+ "set_extent6",
NULL
};
@@ -43,6 +46,22 @@ const char *FILENAME[] = {
#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_ALL (CONFIG_COMPRESS + CONFIG_FILL \
+ + CONFIG_EARLY_ALLOC)
+#define FILL_VALUE -1
+#define DO_RANKS_PRINT_CONFIG(TEST) { \
+ printf(" Config:\n"); \
+ printf(" Test: %s\n", TEST); \
+ printf(" Compression: %s\n", (config & CONFIG_COMPRESS ? "yes" \
+ : "no")); \
+ printf(" Fill value: %s\n", (do_fillvalue ? "yes" : "no")); \
+ printf(" Early allocation: %s\n", (config & CONFIG_EARLY_ALLOC \
+ ? "yes" : "no")); \
+} /* end DO_RANKS_PRINT_CONFIG */
+
#define RANK1 1
#define RANK2 2
#define RANK3 3
@@ -56,28 +75,36 @@ const char *FILENAME[] = {
#define DIME1 7
#define DIME2 7
#define ISTORE_IK 64
+#define RAND4_NITER 100
+#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 */
static int do_ranks( hid_t fapl );
static int do_layouts( hid_t fapl );
-static int test_rank1( hbool_t do_compress,
+static int test_rank1( hid_t fapl,
+ hid_t dcpl,
hbool_t do_fill_value,
- hbool_t set_istore_k,
- H5D_fill_time_t fill_time,
- hid_t fapl);
-static int test_rank2( hbool_t do_compress,
+ hbool_t set_istore_k);
+static int test_rank2( hid_t fapl,
+ hid_t dcpl,
hbool_t do_fill_value,
- hbool_t set_istore_k,
- H5D_fill_time_t fill_time,
- hid_t fapl);
-static int test_rank3( hbool_t do_compress,
+ hbool_t set_istore_k);
+static int test_rank3( hid_t fapl,
+ hid_t dcpl,
hbool_t do_fill_value,
- hbool_t set_istore_k,
- H5D_fill_time_t fill_time,
- hid_t fapl);
+ hbool_t set_istore_k);
+static int test_random_rank4( hid_t fapl,
+ hid_t dcpl,
+ hbool_t do_fillvalue);
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
@@ -92,6 +119,9 @@ int main( void )
hbool_t chunk_cache; /* Whether to enable chunk caching */
int nerrors = 0;
+ /* Initialize random number seed */
+ HDsrandom((unsigned)HDtime(NULL));
+
h5_reset();
fapl = h5_fileaccess();
@@ -177,148 +207,140 @@ error:
static int do_ranks( hid_t fapl )
{
- hbool_t do_compress = 0;
- hbool_t do_fillvalue = 0;
- hbool_t set_istore_k = 0;
-
-
- TESTING_2("with fill value, no compression");
-
- do_fillvalue = 1;
-
- if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
- {
- goto error;
- }
-
-
-
- PASSED();
-
-
- TESTING_2("no fill value, no compression");
-
- do_fillvalue = 0;
-
- if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ERROR, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ERROR, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ERROR, fapl ) < 0)
- {
- goto error;
- }
-
+ hbool_t do_fillvalue = 0;
+ hid_t dcpl = -1;
+ int fillvalue = FILL_VALUE;
+ unsigned config;
+ TESTING_2("datasets with ranks 1 to 4 (all configurations)");
- PASSED();
-
- TESTING_2("with fill value, with compression");
+ /* Loop over different configurations for tests */
+ for(config=0; config<=CONFIG_ALL; config++) {
+ /* Create DCPL and add appropriate settings */
+ if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+ TEST_ERROR
+ if(config & CONFIG_COMPRESS) {
#ifdef H5_HAVE_FILTER_DEFLATE
+ if(H5Pset_deflate(dcpl, 9) < 0)
+ TEST_ERROR
+#else /* H5_HAVE_FILTER_DEFLATE */
+ if(H5Pclose(dcpl) < 0)
+ TEST_ERROR
+ continue;
+#endif /* H5_HAVE_FILTER_DEFLATE */
+ } /* end if */
- do_compress = 1;
- do_fillvalue = 1;
-
- if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
- {
- goto error;
- }
-
-
- PASSED();
-#else
- SKIPPED();
-#endif
-
- TESTING_2("no fill value, with compression");
-
-#ifdef H5_HAVE_FILTER_DEFLATE
+ if(config & CONFIG_FILL) {
+ do_fillvalue = TRUE;
+ if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0)
+ TEST_ERROR
+ } /* end if */
+ else
+ do_fillvalue = FALSE;
- do_fillvalue = 0;
+ if(config & CONFIG_EARLY_ALLOC)
+ if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+ TEST_ERROR
- if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ERROR, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ERROR, fapl ) < 0)
- {
- goto error;
- }
- if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ERROR, fapl ) < 0)
- {
- goto error;
- }
+ /* Run tests */
+ if(do_fillvalue) {
+ unsigned ifset;
- PASSED();
-#else
- SKIPPED();
-#endif
+ /* Iterate over different fill times */
+ 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
+
+ if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 1")
+ printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+ : "H5D_FILL_TIME_ALLOC"));
+ goto error;
+ } /* end if */
+ if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 2")
+ printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+ : "H5D_FILL_TIME_ALLOC"));
+ goto error;
+ } /* end if */
+ if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 3")
+ printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+ : "H5D_FILL_TIME_ALLOC"));
+ goto error;
+ } /* end if */
+ if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree")
+ printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET"
+ : "H5D_FILL_TIME_ALLOC"));
+ goto error;
+ } /* 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)
+ TEST_ERROR
- TESTING_2("with non-default indexed storage B-tree");
+ if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 1")
+ goto error;
+ } /* end if */
+ if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 2")
+ goto error;
+ } /* end if */
+ if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 3")
+ goto error;
+ } /* end if */
+ if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0)
+ {
+ DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree")
+ goto error;
+ } /* end if */
+ } /* end else */
- do_fillvalue = 1;
- set_istore_k = 1;
+ /* The rank 4 test expects the fill value to be written only if
+ * defined */
+ if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_IFSET) < 0)
+ TEST_ERROR
- if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
- {
- goto error;
- }
+ if(test_random_rank4(fapl, dcpl, do_fillvalue) < 0) {
+ DO_RANKS_PRINT_CONFIG("Randomized rank 4")
+ goto error;
+ } /* end if */
+ /* Close dcpl */
+ if(H5Pclose(dcpl) < 0)
+ TEST_ERROR
+ } /* end for */
PASSED();
-
return 0;
-
error:
+ H5E_BEGIN_TRY {
+ H5Pclose(dcpl);
+ } H5E_END_TRY
+
return -1;
-}
+} /* end do_ranks */
/*-------------------------------------------------------------------------
@@ -328,7 +350,7 @@ error:
static int do_layouts( hid_t fapl )
{
- TESTING_2("storage layout use");
+ TESTING("storage layout use");
if (test_layouts( H5D_COMPACT, fapl ) < 0)
{
@@ -353,17 +375,16 @@ error:
*-------------------------------------------------------------------------
*/
-static int test_rank1( hbool_t do_compress,
+static int test_rank1( hid_t fapl,
+ hid_t dcpl,
hbool_t do_fill_value,
- hbool_t set_istore_k,
- H5D_fill_time_t fill_time,
- hid_t fapl)
+ hbool_t set_istore_k)
{
hid_t fid=-1;
hid_t did=-1;
hid_t sid=-1;
- hid_t dcpl=-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 */
@@ -376,13 +397,12 @@ static int test_rank1( hbool_t do_compress,
int buf_e[DIME0];
int buf_r[DIM0];
int i;
- int fillvalue = 1;
int comp_value;
char filename[NAME_BUF_SIZE];
if ( do_fill_value )
{
- comp_value = fillvalue;
+ comp_value = FILL_VALUE;
}
else
{
@@ -399,7 +419,7 @@ static int test_rank1( hbool_t do_compress,
/* create a file creation property list */
if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
{
- goto error;
+ TEST_ERROR
}
if ( set_istore_k )
@@ -407,7 +427,7 @@ static int test_rank1( hbool_t do_compress,
/* set non-default indexed storage B-tree internal 'K' value */
if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
{
- goto error;
+ TEST_ERROR
}
}
@@ -415,57 +435,29 @@ static int test_rank1( hbool_t do_compress,
h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* close property list */
if(H5Pclose(fcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
/* create the data space with unlimited dimensions. */
if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* modify dataset creation properties, i.e. enable chunking. */
- if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
- {
- goto error;
- }
- if (H5Pset_chunk(dcpl, RANK1, dims_c) < 0)
- {
- goto error;
- }
- if ( do_fill_value )
- {
- if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0)
- {
- goto error;
- }
-
- if(H5Pset_fill_time(dcpl, fill_time) < 0)
- {
- goto error;
- }
- }
- else
+ if ((my_dcpl = H5Pcopy (dcpl)) < 0)
{
-
- if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
- {
- goto error;
- }
-
+ TEST_ERROR
}
- if (do_compress)
+ if (H5Pset_chunk(my_dcpl, RANK1, dims_c) < 0)
{
- if(H5Pset_deflate(dcpl, 9) < 0)
- {
- goto error;
- }
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -474,15 +466,15 @@ static int test_rank1( hbool_t do_compress,
*/
/* create a dataset */
- if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+ if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* write */
if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -501,7 +493,7 @@ static int test_rank1( hbool_t do_compress,
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -512,24 +504,24 @@ static int test_rank1( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_e) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -537,12 +529,12 @@ static int test_rank1( hbool_t do_compress,
for( i = 0; i < RANK1; i++ )
{
if (dims_r[i] != dims_e[i])
- goto error;
+ TEST_ERROR
}
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
- goto error;
+ TEST_ERROR
@@ -570,13 +562,13 @@ static int test_rank1( hbool_t do_compress,
{
printf("buf_e[%d] = %d\n", i, buf_e[i]);
printf("value = %d\n", comp_value);
- goto error;
+ TEST_ERROR
}
}
else
{
if(buf_e[i] != buf_o[i])
- goto error;
+ TEST_ERROR
}
}
@@ -592,31 +584,31 @@ static int test_rank1( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_s) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK1; i++ )
{
if (dims_r[i] != dims_s[i])
- goto error;
+ TEST_ERROR
}
@@ -627,21 +619,21 @@ static int test_rank1( hbool_t do_compress,
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose(fid) < 0)
{
- goto error;
+ TEST_ERROR
}
if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
{
- goto error;
+ TEST_ERROR
}
if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
{
- goto error;
+ TEST_ERROR
}
@@ -657,7 +649,7 @@ static int test_rank1( hbool_t do_compress,
/* read */
if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
{
- goto error;
+ TEST_ERROR
}
#if defined (H5_SET_EXTENT_DEBUG)
@@ -682,7 +674,7 @@ static int test_rank1( hbool_t do_compress,
{
printf("buf_s[%d] = %d\n", i, buf_s[i]);
printf("buf_o[%d] = %d\n", i, buf_o[i]);
- goto error;
+ TEST_ERROR
}
}
@@ -695,24 +687,24 @@ static int test_rank1( hbool_t do_compress,
/* set new dimensions for the array */
if (H5Dset_extent(did, dims_o) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions. */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -720,13 +712,13 @@ static int test_rank1( hbool_t do_compress,
for( i = 0; i < RANK1; i++ )
{
if (dims_r[i] != dims_o[i])
- goto error;
+ TEST_ERROR
}
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
- goto error;
+ TEST_ERROR
#if defined (H5_SET_EXTENT_DEBUG)
printf("\n");
@@ -751,13 +743,13 @@ static int test_rank1( hbool_t do_compress,
{
printf("buf_r[%d] = %d\n", i, buf_r[i] );
printf("value = %d\n", comp_value);
- goto error;
+ TEST_ERROR
}
}
else
{
if(buf_r[i] != buf_o[i])
- goto error;
+ TEST_ERROR
}
}
@@ -773,31 +765,31 @@ static int test_rank1( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_s) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK1; i++ )
{
if (dims_r[i] != dims_s[i])
- goto error;
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -807,7 +799,7 @@ static int test_rank1( hbool_t do_compress,
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -822,28 +814,28 @@ static int test_rank1( hbool_t do_compress,
if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
{
- goto error;
+ TEST_ERROR
}
- if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+ if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* set new dimensions for the array */
dims_o[ 0 ] = 0;
if (H5Dset_extent( did , dims_o ) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -855,14 +847,14 @@ static int test_rank1( hbool_t do_compress,
*/
- if (H5Pclose(dcpl) < 0)
+ if (H5Pclose(my_dcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose( fid ) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -876,7 +868,7 @@ error:
{
H5Dclose( did );
H5Sclose( sid );
- H5Pclose( dcpl );
+ H5Pclose( my_dcpl );
H5Pclose( fcpl );
H5Fclose( fid );
} H5E_END_TRY;
@@ -889,17 +881,16 @@ error:
*-------------------------------------------------------------------------
*/
-static int test_rank2( hbool_t do_compress,
+static int test_rank2( hid_t fapl,
+ hid_t dcpl,
hbool_t do_fill_value,
- hbool_t set_istore_k,
- H5D_fill_time_t fill_time,
- hid_t fapl)
+ hbool_t set_istore_k)
{
hid_t fid=-1;
hid_t did=-1;
hid_t sid=-1;
- hid_t dcpl=-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 */
@@ -912,13 +903,12 @@ static int test_rank2( hbool_t do_compress,
int buf_e[DIME0][DIME1];
int buf_r[DIM0][DIM1];
int i, j;
- int fillvalue = 1;
int comp_value;
char filename[NAME_BUF_SIZE];
if ( do_fill_value )
{
- comp_value = fillvalue;
+ comp_value = FILL_VALUE;
}
else
{
@@ -937,7 +927,7 @@ static int test_rank2( hbool_t do_compress,
/* create a file creation property list */
if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
{
- goto error;
+ TEST_ERROR
}
if ( set_istore_k )
@@ -945,7 +935,7 @@ static int test_rank2( hbool_t do_compress,
/* set non-default indexed storage B-tree internal 'K' value */
if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
{
- goto error;
+ TEST_ERROR
}
}
@@ -954,7 +944,7 @@ static int test_rank2( hbool_t do_compress,
h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -962,45 +952,17 @@ static int test_rank2( hbool_t do_compress,
/* create the data space with unlimited dimensions. */
if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* modify dataset creation properties, i.e. enable chunking. */
- if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+ if ((my_dcpl = H5Pcopy (dcpl)) < 0)
{
- goto error;
+ TEST_ERROR
}
- if (H5Pset_chunk(dcpl, RANK2, dims_c) < 0)
+ if (H5Pset_chunk(my_dcpl, RANK2, dims_c) < 0)
{
- goto error;
- }
- if ( do_fill_value )
- {
- if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0)
- {
- goto error;
- }
-
- if(H5Pset_fill_time(dcpl, fill_time) < 0)
- {
- goto error;
- }
- }
- else
- {
-
- if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
- {
- goto error;
- }
-
- }
- if (do_compress)
- {
- if(H5Pset_deflate(dcpl, 9) < 0)
- {
- goto error;
- }
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -1022,15 +984,15 @@ static int test_rank2( hbool_t do_compress,
*/
/* create a dataset */
- if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+ if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* write */
if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1050,7 +1012,7 @@ static int test_rank2( hbool_t do_compress,
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -1071,24 +1033,24 @@ static int test_rank2( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_e) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1096,12 +1058,12 @@ static int test_rank2( hbool_t do_compress,
for( i = 0; i < RANK2; i++ )
{
if (dims_r[i] != dims_e[i])
- goto error;
+ TEST_ERROR
}
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
- goto error;
+ TEST_ERROR
@@ -1131,13 +1093,13 @@ static int test_rank2( hbool_t do_compress,
{
printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
printf("value = %d\n", comp_value);
- goto error;
+ TEST_ERROR
}
}
else
{
if(buf_e[i][j] != buf_o[i][j])
- goto error;
+ TEST_ERROR
}
}
}
@@ -1164,31 +1126,31 @@ static int test_rank2( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_s) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK2; i++ )
{
if (dims_r[i] != dims_s[i])
- goto error;
+ TEST_ERROR
}
@@ -1199,21 +1161,21 @@ static int test_rank2( hbool_t do_compress,
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose(fid) < 0)
{
- goto error;
+ TEST_ERROR
}
if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
{
- goto error;
+ TEST_ERROR
}
if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
{
- goto error;
+ TEST_ERROR
}
@@ -1229,7 +1191,7 @@ static int test_rank2( hbool_t do_compress,
/* read */
if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
{
- goto error;
+ TEST_ERROR
}
#if defined (H5_SET_EXTENT_DEBUG2)
@@ -1256,7 +1218,7 @@ static int test_rank2( hbool_t do_compress,
{
printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
- goto error;
+ TEST_ERROR
}
}
}
@@ -1277,31 +1239,31 @@ static int test_rank2( hbool_t do_compress,
/* set new dimensions for the array */
if (H5Dset_extent(did, dims_o) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions. */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK2; i++ )
{
if (dims_r[i] != dims_o[i])
- goto error;
+ TEST_ERROR
}
@@ -1312,7 +1274,7 @@ static int test_rank2( hbool_t do_compress,
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
- goto error;
+ TEST_ERROR
#if defined (H5_SET_EXTENT_DEBUG2)
printf("\n");
@@ -1339,13 +1301,13 @@ static int test_rank2( hbool_t do_compress,
{
printf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
printf("value = %d\n", comp_value);
- goto error;
+ TEST_ERROR
}
}
else
{
if(buf_r[i][j] != buf_o[i][j])
- goto error;
+ TEST_ERROR
}
}
}
@@ -1362,31 +1324,31 @@ static int test_rank2( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_s) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK2; i++ )
{
if (dims_r[i] != dims_s[i])
- goto error;
+ TEST_ERROR
}
@@ -1397,7 +1359,7 @@ static int test_rank2( hbool_t do_compress,
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1409,29 +1371,29 @@ static int test_rank2( hbool_t do_compress,
if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
{
- goto error;
+ TEST_ERROR
}
- if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+ if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* set new dimensions for the array */
dims_o[ 0 ] = 0;
dims_o[ 1 ] = 0;
if (H5Dset_extent( did , dims_o ) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1443,20 +1405,20 @@ static int test_rank2( hbool_t do_compress,
*/
- if (H5Pclose(dcpl) < 0)
+ if (H5Pclose(my_dcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
/* close file creation property list */
if(H5Pclose(fcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose( fid ) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1470,7 +1432,7 @@ error:
{
H5Dclose( did );
H5Sclose( sid );
- H5Pclose( dcpl );
+ H5Pclose( my_dcpl );
H5Pclose( fcpl );
H5Fclose( fid );
} H5E_END_TRY;
@@ -1486,17 +1448,16 @@ error:
*-------------------------------------------------------------------------
*/
-static int test_rank3( hbool_t do_compress,
+static int test_rank3( hid_t fapl,
+ hid_t dcpl,
hbool_t do_fill_value,
- hbool_t set_istore_k,
- H5D_fill_time_t fill_time,
- hid_t fapl)
+ hbool_t set_istore_k)
{
hid_t fid=-1;
hid_t did=-1;
hid_t sid=-1;
- hid_t dcpl=-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 */
@@ -1509,13 +1470,12 @@ static int test_rank3( hbool_t do_compress,
int buf_e[DIME0][DIME1][DIME2];
int buf_r[DIM0][DIM1][DIM2];
int i, j, k;
- int fillvalue = 1;
int comp_value;
char filename[NAME_BUF_SIZE];
if ( do_fill_value )
{
- comp_value = fillvalue;
+ comp_value = FILL_VALUE;
}
else
{
@@ -1537,7 +1497,7 @@ static int test_rank3( hbool_t do_compress,
/* create a file creation property list */
if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
{
- goto error;
+ TEST_ERROR
}
if ( set_istore_k )
@@ -1545,7 +1505,7 @@ static int test_rank3( hbool_t do_compress,
/* set non-default indexed storage B-tree internal 'K' value */
if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
{
- goto error;
+ TEST_ERROR
}
}
@@ -1553,57 +1513,29 @@ static int test_rank3( hbool_t do_compress,
h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* close property list */
if(H5Pclose(fcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
/* create the data space with unlimited dimensions. */
if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* modify dataset creation properties, i.e. enable chunking. */
- if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+ if ((my_dcpl = H5Pcopy (dcpl)) < 0)
{
- goto error;
+ TEST_ERROR
}
- if (H5Pset_chunk(dcpl, RANK3, dims_c) < 0)
+ if (H5Pset_chunk(my_dcpl, RANK3, dims_c) < 0)
{
- goto error;
- }
- if ( do_fill_value )
- {
- if (H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0)
- {
- goto error;
- }
-
- if(H5Pset_fill_time(dcpl, fill_time) < 0)
- {
- goto error;
- }
- }
- else
- {
-
- if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
- {
- goto error;
- }
-
- }
- if (do_compress)
- {
- if(H5Pset_deflate(dcpl, 9) < 0)
- {
- goto error;
- }
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -1612,15 +1544,15 @@ static int test_rank3( hbool_t do_compress,
*/
/* create a dataset */
- if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+ if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* write */
if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1646,7 +1578,7 @@ static int test_rank3( hbool_t do_compress,
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -1658,24 +1590,24 @@ static int test_rank3( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_e) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -1683,12 +1615,12 @@ static int test_rank3( hbool_t do_compress,
for( i = 0; i < RANK3; i++ )
{
if (dims_r[i] != dims_e[i])
- goto error;
+ TEST_ERROR
}
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
- goto error;
+ TEST_ERROR
@@ -1726,13 +1658,13 @@ static int test_rank3( hbool_t do_compress,
{
printf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k] );
printf("value = %d\n", comp_value);
- goto error;
+ TEST_ERROR
}
}
else
{
if(buf_e[i][j][k] != buf_o[i][j][k] )
- goto error;
+ TEST_ERROR
}
}
}
@@ -1749,31 +1681,31 @@ static int test_rank3( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_s) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK3; i++ )
{
if (dims_r[i] != dims_s[i])
- goto error;
+ TEST_ERROR
}
@@ -1784,21 +1716,21 @@ static int test_rank3( hbool_t do_compress,
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose(fid) < 0)
{
- goto error;
+ TEST_ERROR
}
if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
{
- goto error;
+ TEST_ERROR
}
if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
{
- goto error;
+ TEST_ERROR
}
@@ -1814,7 +1746,7 @@ static int test_rank3( hbool_t do_compress,
/* read */
if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
{
- goto error;
+ TEST_ERROR
}
#if defined (H5_SET_EXTENT_DEBUG3)
@@ -1849,7 +1781,7 @@ static int test_rank3( hbool_t do_compress,
{
printf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k] );
printf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k] );
- goto error;
+ TEST_ERROR
}
}
}
@@ -1864,36 +1796,36 @@ static int test_rank3( hbool_t do_compress,
/* set new dimensions for the array */
if (H5Dset_extent(did, dims_o) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions. */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK3; i++ )
{
if (dims_r[i] != dims_o[i])
- goto error;
+ TEST_ERROR
}
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
- goto error;
+ TEST_ERROR
#if defined (H5_SET_EXTENT_DEBUG3)
printf("\n");
@@ -1929,13 +1861,13 @@ static int test_rank3( hbool_t do_compress,
{
printf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k] );
printf("value = %d\n", comp_value);
- goto error;
+ TEST_ERROR
}
}
else
{
if(buf_r[i][j][k] != buf_o[i][j][k])
- goto error;
+ TEST_ERROR
}
}
}
@@ -1955,31 +1887,31 @@ static int test_rank3( hbool_t do_compress,
/* set new dimensions for the array. */
if (H5Dset_extent(did , dims_s) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK3; i++ )
{
if (dims_r[i] != dims_s[i])
- goto error;
+ TEST_ERROR
}
@@ -1991,7 +1923,7 @@ static int test_rank3( hbool_t do_compress,
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -2003,11 +1935,11 @@ static int test_rank3( hbool_t do_compress,
if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
{
- goto error;
+ TEST_ERROR
}
- if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+ if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, my_dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* set new dimensions for the array */
dims_o[ 0 ] = 0;
@@ -2015,18 +1947,18 @@ static int test_rank3( hbool_t do_compress,
dims_o[ 2 ] = 0;
if (H5Dset_extent( did , dims_o ) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -2038,14 +1970,14 @@ static int test_rank3( hbool_t do_compress,
*/
- if (H5Pclose(dcpl) < 0)
+ if (H5Pclose(my_dcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose( fid ) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -2059,7 +1991,7 @@ error:
{
H5Dclose( did );
H5Sclose( sid );
- H5Pclose( dcpl );
+ H5Pclose( my_dcpl );
H5Pclose( fcpl );
H5Fclose( fid );
} H5E_END_TRY;
@@ -2109,7 +2041,7 @@ static int test_external( hid_t fapl )
}
}
- TESTING_2("external file use");
+ TESTING("external file use");
/* create a new file */
h5_fixname(FILENAME[3], fapl, filename, sizeof filename);
@@ -2418,6 +2350,7 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
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 */
@@ -2440,36 +2373,36 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
h5_fixname(FILENAME[4], fapl, filename, sizeof filename);
if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* create the data space with unlimited dimensions. */
if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* modify dataset creation properties */
if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Pset_layout (dcpl, layout) < 0)
{
- goto error;
+ TEST_ERROR
}
/* create a dataset */
if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* write */
if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -2489,7 +2422,7 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/*-------------------------------------------------------------------------
@@ -2501,31 +2434,31 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
H5E_BEGIN_TRY
{
- if (H5Dset_extent(did , dims_e) == SUCCEED)
- {
- goto error;
- }
+ ret = H5Dset_extent(did , dims_e);
} H5E_END_TRY;
+ if(ret >= 0)
+ TEST_ERROR
+
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -2533,12 +2466,12 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
for( i = 0; i < RANK2; i++ )
{
if (dims_r[i] != dims_o[i])
- goto error;
+ TEST_ERROR
}
/* read */
if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
- goto error;
+ TEST_ERROR
@@ -2565,36 +2498,36 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
H5E_BEGIN_TRY
{
- if (H5Dset_extent(did , dims_s) == SUCCEED)
- {
- goto error;
- }
+ ret = H5Dset_extent(did , dims_s);
} H5E_END_TRY;
+ if(ret >= 0)
+ TEST_ERROR
+
/* get the space */
if ((sid = H5Dget_space(did)) < 0)
{
- goto error;
+ TEST_ERROR
}
/* get dimensions */
if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Sclose(sid) < 0)
{
- goto error;
+ TEST_ERROR
}
/* check dimensions */
for( i = 0; i < RANK2; i++ )
{
if (dims_r[i] != dims_o[i])
- goto error;
+ TEST_ERROR
}
@@ -2606,7 +2539,7 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
/* read */
if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r ) < 0)
{
- goto error;
+ TEST_ERROR
}
#if defined (H5_SET_EXTENT_DEBUG4)
@@ -2630,17 +2563,17 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
if (H5Dclose(did) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Pclose(dcpl) < 0)
{
- goto error;
+ TEST_ERROR
}
if (H5Fclose( fid ) < 0)
{
- goto error;
+ TEST_ERROR
}
@@ -2661,3 +2594,176 @@ error:
}
+
+/*-------------------------------------------------------------------------
+ * Function: test_random_rank4
+ *
+ * Purpose: Test expanding and shrinking a rank 4 dataset in a
+ * randomized fashion. Verifies that data is preserved (and
+ * filled, if do_fillvalue is true) as expected.
+ *
+ * Return: Success: 0
+ * Failure: -1
+ *
+ * Programmer: Neil Fortner
+ * Monday, January 11, 2010
+ *
+ *-------------------------------------------------------------------------
+ */
+static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue )
+{
+ 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]; /* Dataset's dimensions */
+ hsize_t old_dims[4]; /* Old dataset dimensions */
+ 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 */
+ 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);
+ if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+ TEST_ERROR
+
+ /* Generate random chunk dimensions, 2-6 */
+ for(i=0; i<4; i++)
+ cdims[i] = (hsize_t)((HDrandom() % 5) + 2);
+
+ /* Generate initial dataset size, 1-10 */
+ for(i=0; i<4; i++) {
+ dims[i] = (hsize_t)((HDrandom() % 10) + 1);
+ dim_log[0][i] = dims[i];
+ } /* end for */
+
+ /* Create dataset */
+ if((fspace = H5Screate_simple(4, dims, mdims)) < 0)
+ TEST_ERROR
+ if((my_dcpl = H5Pcopy(dcpl)) < 0)
+ TEST_ERROR
+ if(H5Pset_chunk(my_dcpl, 4, cdims) < 0)
+ TEST_ERROR
+ if((dset = H5Dcreate2(file, "dset", H5T_NATIVE_INT, fspace, H5P_DEFAULT,
+ my_dcpl, H5P_DEFAULT)) < 0)
+ TEST_ERROR
+ if(H5Sclose(fspace) < 0)
+ TEST_ERROR
+
+ /* Create memory space, and set initial selection */
+ if((mspace = H5Screate_simple(4, mdims, NULL)) < 0)
+ TEST_ERROR
+ if(H5Sselect_hyperslab(mspace, H5S_SELECT_SET, start, NULL, dims, NULL)
+ < 0)
+ TEST_ERROR
+
+ /* Main loop */
+ for(i=0; i<RAND4_NITER; i++) {
+ /* Generate random write buffer */
+ 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)
+
+ /* Generate new dataset size, 1-10 */
+ for(j=0; j<4; j++) {
+ old_dims[j] = dims[j];
+ dims[j] = (hsize_t)((HDrandom() % 10) + 1);
+ dim_log[i+1][j] = dims[j];
+ } /* end for */
+
+ /* Resize dataset */
+ if(H5Dset_extent(dset, dims) < 0)
+ RAND4_FAIL_DUMP(i+2, -1, -1, -1, -1)
+
+ /* 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)
+
+ /* 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 >= old_dims[0] || k >= old_dims[1]
+ || l >= old_dims[2] || m >= old_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)
+ } /* end if */
+ else {
+ for(j=0; j<MIN(dims[0],old_dims[0]); j++)
+ for(k=0; k<MIN(dims[1],old_dims[1]); k++)
+ for(l=0; l<MIN(dims[2],old_dims[2]); l++)
+ for(m=0; m<MIN(dims[3],old_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 for */
+
+ /* Close */
+ if(H5Sclose(mspace) < 0)
+ TEST_ERROR
+ if(H5Pclose(my_dcpl) < 0)
+ TEST_ERROR
+ if(H5Dclose(dset) < 0)
+ TEST_ERROR
+ if(H5Fclose(file) < 0)
+ TEST_ERROR
+
+ return 0;
+
+error:
+ H5E_BEGIN_TRY {
+ H5Sclose(fspace);
+ H5Sclose(mspace);
+ H5Pclose(dcpl);
+ H5Dclose(dset);
+ H5Fclose(file);
+ } H5E_END_TRY
+ return -1;
+} /* end test_random_rank4 */
+
+/*
+ * 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 )
+{
+ unsigned i;
+
+ printf(" Chunk dimensions: ( %u, %u, %u, %u )\n", (unsigned)cdims[0],
+ (unsigned)cdims[1], (unsigned)cdims[2], (unsigned)cdims[3]);
+ printf(" Log of dataset dimensions (oldest first):\n");
+ for(i=0; i<ndim_sets; i++)
+ printf(" 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)
+ printf(" First incorrect value read: ( %d, %d, %d, %d )\n", j, k, l,
+ m);
+
+ return;
+} /* end test_random_rank4_dump */
+