Merge all of my changes from merge-back-to-feature-vfd_swmr-attempt-1,

including the merge of `hdffv/hdf5/develop`, back to the branch that Vailin and
I share.

Now I need to put this branch on a fork with a less confusing name than
vchoi_fork!

tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl

@@ -11,6 +11,6 @@ File space page size: 4096 bytes
 Summary of file space information:
   File metadata: 1602 bytes
   Raw data: 400 bytes
-  Amount/Percent of tracked free space: 6307 bytes/38.5%
-  Unaccounted space: 8075 bytes
-Total space: 16384 bytes
+  Amount/Percent of tracked free space: 6190 bytes/75.6%
+  Unaccounted space: 0 bytes
+Total space: 8192 bytes

tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl

@@ -11,6 +11,6 @@ File space page size: 4096 bytes
 Summary of file space information:
   File metadata: 1485 bytes
   Raw data: 400 bytes
-  Amount/Percent of tracked free space: 680 bytes/26.5%
+  Amount/Percent of tracked free space: 563 bytes/23.0%
   Unaccounted space: 0 bytes
-Total space: 2565 bytes
+Total space: 2448 bytes

tools/test/h5repack/testfiles/h5repack-help.txt

@@ -6,13 +6,17 @@ usage: h5repack [OPTIONS] file1 file2
    -v, --verbose           Verbose mode, print object information
    -V, --version           Print version number and exit
    -n, --native            Use a native HDF5 type when repacking
-   --enable-error-stack    Prints messages from the HDF5 error stack as they occur
+   --enable-error-stack    Prints messages from the HDF5 error stack as they
+                           occur
    -L, --latest            Use latest version of file format
-                           This option will take precedence over the -j and -k options
-   --low=BOUND             The low bound for library release versions to use when creating
-                           objects in the file (default is H5F_LIBVER_EARLIEST)
-   --high=BOUND            The high bound for library release versions to use when creating
-                           objects in the file (default is H5F_LIBVER_LATEST)
+                           This option will take precedence over the options
+                           --low and --high
+   --low=BOUND             The low bound for library release versions to use
+                           when creating objects in the file
+                           (default is H5F_LIBVER_EARLIEST)
+   --high=BOUND            The high bound for library release versions to use
+                           when creating objects in the file
+                           (default is H5F_LIBVER_LATEST)
    -c L1, --compact=L1     Maximum number of links in header messages
    -d L2, --indexed=L2     Minimum number of links in the indexed format
    -s S[:F], --ssize=S[:F] Shared object header message minimum size
@@ -27,10 +31,14 @@ usage: h5repack [OPTIONS] file1 file2
    -z Z, --sort_order=Z    Sort groups and attributes by order Z
    -f FILT, --filter=FILT  Filter type
    -l LAYT, --layout=LAYT  Layout type
-   -S FS_STRATEGY, --fs_strategy=FS_STRATEGY  File space management strategy for H5Pset_file_space_strategy
-   -P FS_PERSIST, --fs_persist=FS_PERSIST  Persisting or not persisting free-space for H5Pset_file_space_strategy
-   -T FS_THRESHOLD, --fs_threshold=FS_THRESHOLD   Free-space section threshold for H5Pset_file_space_strategy
-   -G FS_PAGESIZE, --fs_pagesize=FS_PAGESIZE   File space page size for H5Pset_file_space_page_size
+   -S FS_STRATEGY, --fs_strategy=FS_STRATEGY  File space management strategy for
+                           H5Pset_file_space_strategy
+   -P FS_PERSIST, --fs_persist=FS_PERSIST  Persisting or not persisting free-
+                           space for H5Pset_file_space_strategy
+   -T FS_THRESHOLD, --fs_threshold=FS_THRESHOLD   Free-space section threshold
+                           for H5Pset_file_space_strategy
+   -G FS_PAGESIZE, --fs_pagesize=FS_PAGESIZE   File space page size for
+                           H5Pset_file_space_page_size
 
     M - is an integer greater than 1, size of dataset in bytes (default is 0)
     E - is a filename.
@@ -38,40 +46,51 @@ usage: h5repack [OPTIONS] file1 file2
     U - is a filename.
     T - is an integer
     A - is an integer greater than zero
-    Q - is the sort index type for the input file. It can be "name" or "creation_order" (default)
-    Z - is the sort order type for the input file. It can be "descending" or "ascending" (default)
+    Q - is the sort index type for the input file. It can be "name" or
+        "creation_order" (default)
+    Z - is the sort order type for the input file. It can be "descending" or
+        "ascending" (default)
     B - is the user block size, any value that is 512 or greater and is
         a power of 2 (1024 default)
     F - is the shared object header message type, any of <dspace|dtype|fill|
         pline|attr>. If F is not specified, S applies to all messages
 
-    BOUND is an integer indicating the library release versions to use when creating
-          objects in the file (see H5Pset_libver_bounds()):
+    BOUND is an integer indicating the library release versions to use when
+          creating objects in the file (see H5Pset_libver_bounds()):
         0: This is H5F_LIBVER_EARLIEST in H5F_libver_t struct
         1: This is H5F_LIBVER_V18 in H5F_libver_t struct
         2: This is H5F_LIBVER_V110 in H5F_libver_t struct
-           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V110 for this release
+        3: This is H5F_LIBVER_V112 in H5F_libver_t struct
+        4: This is H5F_LIBVER_V114 in H5F_libver_t struct
+           (H5F_LIBVER_LATEST is aliased to H5F_LIBVER_V114 for this release
 
     FS_STRATEGY is a string indicating the file space strategy used:
         FSM_AGGR:
-               The mechanisms used in managing file space are free-space managers, aggregators and virtual file driver.
+               The mechanisms used in managing file space are free-space
+               managers, aggregators and virtual file driver.
         PAGE:
-               The mechanisms used in managing file space are free-space managers with embedded paged aggregation and virtual file driver.
+               The mechanisms used in managing file space are free-space
+               managers with embedded paged aggregation and virtual file driver.
         AGGR:
-               The mechanisms used in managing file space are aggregators and virtual file driver.
+               The mechanisms used in managing file space are aggregators and
+               virtual file driver.
         NONE:
-               The mechanisms used in managing file space are virtual file driver.
-        The default strategy when not set is FSM_AGGR without persisting free-space.
+               The mechanisms used in managing file space are virtual file
+               driver.
+        The default strategy when not set is FSM_AGGR without persisting free-
+        space.
 
     FS_PERSIST is 1 to persisting free-space or 0 to not persisting free-space.
       The default when not set is not persisting free-space.
       The value is ignored for AGGR and NONE strategies.
 
-    FS_THRESHOLD is the minimum size (in bytes) of free-space sections to be tracked by the library.
+    FS_THRESHOLD is the minimum size (in bytes) of free-space sections to be
+        tracked by the library.
       The default when not set is 1.
       The value is ignored for AGGR and NONE strategies.
 
-    FS_PAGESIZE is the size (in bytes) >=512 that is used by the library when the file space strategy PAGE is used.
+    FS_PAGESIZE is the size (in bytes) >=512 that is used by the library when
+        the file space strategy PAGE is used.
       The default when not set is 4096.
 
     FILT - is a string with the format:
@@ -99,9 +118,9 @@ usage: h5repack [OPTIONS] file1 file2
         NBIT (no parameter)
         SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type
             is either IN or DS
-        UD=<filter_number,filter_flag,cd_value_count,value_1[,value_2,...,value_N]>
-            required values for filter_number,filter_flag,cd_value_count,value_1
-            optional values for value_2 to value_N
+        UD=<filter_number,filter_flag,cd_value_count,value1[,value2,...,valueN]>
+            Required values: filter_number, filter_flag, cd_value_count, value1
+            Optional values: value2 to valueN
         NONE (no parameter)
 
     LAYT - is a string with the format:
@@ -138,12 +157,7 @@ Examples of use:
 4) h5repack -L -c 10 -s 20:dtype file1 file2
 
    Using latest file format with maximum compact group size of 10 and
-   and minimum shared datatype size of 20
-
-5) h5repack --low=0 --high=1 file1 file2
-
-   Set low=H5F_LIBVER_EARLIEST and high=H5F_LIBVER_V18 via H5Pset_libver_bounds() when
-   creating the repacked file: file2
+   minimum shared datatype size of 20
 
 5) h5repack -f SHUF -f GZIP=1 file1 file2
 
@@ -153,3 +167,8 @@ Examples of use:
 
    Add bzip2 filter to all datasets
 
+7) h5repack --low=0 --high=1 file1 file2
+
+   Set low=H5F_LIBVER_EARLIEST and high=H5F_LIBVER_V18 via
+   H5Pset_libver_bounds() when creating the repacked file, file2
+

tools/test/h5repack/testfiles/h5repack_int32le_1d_ex-0.dat

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst

@@ -2,34 +2,43 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+  #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
+    major: Virtual Object Layer
+    minor: Unable to create file
+  #003: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #002: (file name) line (number) in H5L_link_object(): unable to create new link to object
+  #004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #005: (file name) line (number) in H5L_link_object(): unable to create new link to object
     major: Links
     minor: Unable to initialize object
-  #003: (file name) line (number) in H5L__create_real(): can't insert link
+  #006: (file name) line (number) in H5L__create_real(): can't insert link
     major: Links
     minor: Unable to insert object
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #007: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #006: (file name) line (number) in H5L__link_cb(): unable to create object
+  #009: (file name) line (number) in H5L__link_cb(): unable to create object
     major: Links
     minor: Unable to initialize object
-  #007: (file name) line (number) in H5O_obj_create(): unable to open object
+  #010: (file name) line (number) in H5O_obj_create(): unable to open object
     major: Object header
     minor: Can't open object
-  #008: (file name) line (number) in H5O__dset_create(): unable to create dataset
+  #011: (file name) line (number) in H5O__dset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #009: (file name) line (number) in H5D__create(): unable to construct layout information
+  #012: (file name) line (number) in H5D__create(): unable to construct layout information
     major: Dataset
     minor: Unable to initialize object
-  #010: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
+  #013: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
     major: Dataset
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):

tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl

@@ -11,7 +11,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {
@@ -99,7 +99,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 11 3 }
+            PARAMS { 9 1 13 0 }
          }
       }
       FILLVALUE {

tools/test/h5repack/testfiles/h5repack_uint8be_ex-1.dat

@@ -0,0 +1 @@
+@ｿBｽDｻFｹHｷJｵLｳNｱPｯRｭTｫVｩXｧZ･\｣^｡`歟拇嫻冑曜浜渡叢俊衡久悦<E4B985><E682A6>ミ<EFBFBD>

tools/test/h5repack/testfiles/h5repack_uint8be_ex-2.dat

@@ -0,0 +1 @@
+€‚}„{†yˆwŠuŒsŽq<C5BD>o’m”k–i˜gšeœcža _¢]¤[¦Y¨WªU¬S®Q°O²M´K¶I¸GºE¼C¾A

tools/test/h5repack/testfiles/h5repack_uint8be_ex-3.dat

@@ -0,0 +1 @@
+А?В=Д;Ж9И7К5М3О1Р/Т-Ф+Ц)Ш'Ъ%Ь#Ю!авджикморт