diff options
| -rw-r--r-- | MANIFEST | 7 | ||||
| -rw-r--r-- | tools/h5dump/h5dumptst.c | 63 | ||||
| -rwxr-xr-x | tools/h5dump/testh5dump.sh | 1 | ||||
| -rw-r--r-- | tools/testfiles/tmulti-b.h5 | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-g.h5 | 0 | ||||
| -rw-r--r-- | tools/testfiles/tmulti-l.h5 | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-o.h5 | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-r.h5 | bin | 0 -> 600 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti-s.h5 | bin | 0 -> 2048 bytes | |||
| -rw-r--r-- | tools/testfiles/tmulti.ddl | 23 |
10 files changed, 94 insertions, 0 deletions
@@ -1112,6 +1112,13 @@ ./tools/testfiles/tloop.h5 ./tools/testfiles/tloop2.h5 ./tools/testfiles/tmany.h5 +./tools/testfiles/tmulti-b.h5 +./tools/testfiles/tmulti.ddl +./tools/testfiles/tmulti-g.h5 +./tools/testfiles/tmulti-l.h5 +./tools/testfiles/tmulti-o.h5 +./tools/testfiles/tmulti-r.h5 +./tools/testfiles/tmulti-s.h5 ./tools/testfiles/tnestcomp-1.ddl ./tools/testfiles/tnestedcomp.h5 ./tools/testfiles/tobjref.h5 diff --git a/tools/h5dump/h5dumptst.c b/tools/h5dump/h5dumptst.c index 0eff5d2..d26c4b8 100644 --- a/tools/h5dump/h5dumptst.c +++ b/tools/h5dump/h5dumptst.c @@ -1,4 +1,11 @@ /* + * Copyright (C) 2001, 2002 + * National Center for Supercomputing Applications + * All rights reserved. + * + */ + +/* * Generate the binary hdf5 files for the h5dump tests. * Usage: just execute the program without any arguments will * generate all the binary hdf5 files in the local directory. @@ -47,6 +54,7 @@ #define FILE33 "tgrp_comments.h5" #define FILE34 "tsplit_file" #define FILE35 "tfamily%05d.h5" +#define FILE36 "tmulti" #define LENSTR 50 #define LENSTR2 11 @@ -2749,6 +2757,60 @@ void test_family(void) H5Pclose(fapl); } +static const char *multi_letters = "msbrglo"; + +static +void test_multi(void) +{ + hid_t fapl, fid, space, dataset; + hsize_t dims[2]; + int i, j, dset[10][15]; + + /* Multi-file driver, general case of the split driver */ + H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES]; + hid_t memb_fapl[H5FD_MEM_NTYPES]; + const char *memb_name[H5FD_MEM_NTYPES]; + char sv[H5FD_MEM_NTYPES][1024]; + haddr_t memb_addr[H5FD_MEM_NTYPES]; + + fapl = H5Pcreate(H5P_FILE_ACCESS); + + HDmemset(memb_map, 0, sizeof memb_map); + HDmemset(memb_fapl, 0, sizeof memb_fapl); + HDmemset((void *)(&memb_name[0]), 0, sizeof memb_name); + HDmemset(memb_addr, 0, sizeof memb_addr); + + assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); + + for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; ++mt) { + memb_fapl[mt] = H5P_DEFAULT; + sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]); + memb_name[mt] = sv[mt]; + memb_addr[mt] = MAX(mt - 1,0) * (HADDR_MAX / 10); + } + + H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, + memb_addr, FALSE); + + fid = H5Fcreate(FILE36, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); + + /* create dataset */ + dims[0] = 10; + dims[1] = 15; + space = H5Screate_simple(2, dims, NULL); + dataset = H5Dcreate(fid, "/dset1", H5T_STD_I32BE, space, H5P_DEFAULT); + + for (i = 0; i < 10; i++) + for (j = 0; j < 15; j++) + dset[i][j] = i + j; + + H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset); + H5Sclose(space); + H5Dclose(dataset); + H5Fclose(fid); + H5Pclose(fapl); +} + int main(void) { test_group(); @@ -2796,6 +2858,7 @@ int main(void) test_group_comments(); test_split_file(); test_family(); + test_multi(); return 0; } diff --git a/tools/h5dump/testh5dump.sh b/tools/h5dump/testh5dump.sh index 18f72d8..fb3a929 100755 --- a/tools/h5dump/testh5dump.sh +++ b/tools/h5dump/testh5dump.sh @@ -156,6 +156,7 @@ TOOLTEST tdset2-1s.ddl -d "/dset1[;3 2;4 4;1 4]" tdset2.h5 # test the --filedriver flag TOOLTEST tsplit_file.ddl --filedriver=split tsplit_file TOOLTEST tfamily.ddl --filedriver=family tfamily%05d.h5 +TOOLTEST tmulti.ddl --filedriver=multi tmulti # test XML TOOLTEST tall.h5.xml --xml tall.h5 diff --git a/tools/testfiles/tmulti-b.h5 b/tools/testfiles/tmulti-b.h5 Binary files differnew file mode 100644 index 0000000..3f5d51f --- /dev/null +++ b/tools/testfiles/tmulti-b.h5 diff --git a/tools/testfiles/tmulti-g.h5 b/tools/testfiles/tmulti-g.h5 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tools/testfiles/tmulti-g.h5 diff --git a/tools/testfiles/tmulti-l.h5 b/tools/testfiles/tmulti-l.h5 Binary files differnew file mode 100644 index 0000000..8b01fc6 --- /dev/null +++ b/tools/testfiles/tmulti-l.h5 diff --git a/tools/testfiles/tmulti-o.h5 b/tools/testfiles/tmulti-o.h5 Binary files differnew file mode 100644 index 0000000..35c1998 --- /dev/null +++ b/tools/testfiles/tmulti-o.h5 diff --git a/tools/testfiles/tmulti-r.h5 b/tools/testfiles/tmulti-r.h5 Binary files differnew file mode 100644 index 0000000..eb08e79 --- /dev/null +++ b/tools/testfiles/tmulti-r.h5 diff --git a/tools/testfiles/tmulti-s.h5 b/tools/testfiles/tmulti-s.h5 Binary files differnew file mode 100644 index 0000000..5b4ef20 --- /dev/null +++ b/tools/testfiles/tmulti-s.h5 diff --git a/tools/testfiles/tmulti.ddl b/tools/testfiles/tmulti.ddl new file mode 100644 index 0000000..050b674 --- /dev/null +++ b/tools/testfiles/tmulti.ddl @@ -0,0 +1,23 @@ +############################# +Expected output for 'h5dump --filedriver=multi tmulti' +############################# +HDF5 "tmulti" { +GROUP "/" { + DATASET "dset1" { + DATATYPE H5T_STD_I32BE + DATASPACE SIMPLE { ( 10, 15 ) / ( 10, 15 ) } + DATA { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + } + } +} +} |