diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2013-10-10 13:21:07 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2013-10-10 13:21:07 (GMT) |
commit | dfd9816c8d5ea707dfb2a19adad3176c7a15c5d2 (patch) | |
tree | 2444b8b5f3311512f8ab2df0691ab571ee0ab122 /test/swmr_generator.c | |
parent | 39fc26566e18ac81c43986ed2013676e2918ded2 (diff) | |
download | hdf5-dfd9816c8d5ea707dfb2a19adad3176c7a15c5d2.zip hdf5-dfd9816c8d5ea707dfb2a19adad3176c7a15c5d2.tar.gz hdf5-dfd9816c8d5ea707dfb2a19adad3176c7a15c5d2.tar.bz2 |
[svn-r24279] Merge of r24278 from revise_chunks.
Changes the MD cache so that writing v-1 B-tree nodes under SWMR
semantics will fail.
Tested on: jam (previously tested on more platforms)
Diffstat (limited to 'test/swmr_generator.c')
-rw-r--r-- | test/swmr_generator.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/swmr_generator.c b/test/swmr_generator.c index bad992b..6946184 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -102,10 +102,14 @@ gen_skeleton(const char *filename, unsigned verbose, unsigned swmr_write, if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) return -1; - /* Select the correct index type */ - if(strcmp(index_type, "b1")) - if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) - return -1; + /* We ALWAYS select the latest file format for SWMR */ + if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) + return -1; + + /* There are two chunk indexes tested here. + * With one unlimited dimension, we get the extensible array index + * type, with two unlimited dimensions, we get a v-2 B-tree. + */ if(!strcmp(index_type, "b2")) max_dims[0] = H5S_UNLIMITED; @@ -243,7 +247,7 @@ usage(void) printf("\n"); printf("<deflate compression level> should be -1 (for no compression) or 0-9\n"); printf("\n"); - printf("<index type> should be b1, b2, fa, or ea (fa not yet implemented)\n"); + printf("<index type> should be b2 or ea\n"); printf("\n"); printf("Defaults to verbose (no '-q' given), no SWMR_WRITE mode (no '-s' given) no\n"); printf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n"); @@ -280,8 +284,7 @@ int main(int argc, const char *argv[]) /* Chunk index type */ case 'i': index_type = argv[u + 1]; - if(strcmp(index_type, "b1") - && strcmp(index_type, "ea") + if(strcmp(index_type, "ea") && strcmp(index_type, "b2")) usage(); u += 2; |