Bring async branch to develop (#166)

* Add H5Fwait, H5Dwait, and other changes for async vol connector

* Revert temporary testing changes

* Add H5Fwait to header file

* Add H5VLreset_lib_state() routine.

* Correct VOL wrap context when retrieving library state for file open & create.

* Manage the API context's VOL connector state as part of the library state.

* Set the 'VOL connector property valid' flag when restoring the library state.

* Don't push new API context on stack when retrieving "current" one.

* Check for NULL VOL wrap context before decrementing refcount on it, when
freeing the API context state.

* Manage recount of underlying connector for VOL wrap context.

* Add H5TSmutex_acquire() and H5TSmutex_release() routines to acquire and
release the global lock on the HDF5 library.

* Update library with new functions related to library global lock

* Add asynchronous token API

* Add new lightweight FUNC_ENTER / LEAVE macros for helping to structure the
threadsafety (H5TS*) routines.

* Sync w/develop

* Initial event set code framework.

* Elaborate on the H5ES routines, starting to add API routines.

Update the "close ID" callbacks to allow asynchronous request tokens to be
passed in from an asynchronous close API call.

Refactor current asynchronous API routines (H5Fopen/H5Fclose and
H5Dread/H5Dread) to use event sets instead of directly working with request
tokens from the application.

Clean up a few other minor warnings & code style issues.

* Implement H5EScreate, H5ESget_count, and H5ESclose.

It should be possible to write a simple application that creates an event
set and uses it with H5Fopen_async, H5Dread_async, H5Dwrite_async, and
H5Fclose_async, then calls H5ESclose (which waits for all async events to
complete).

* Add source file for event set test.

* Refactor sync & async API routines to call common routine.

Move dataset API read / write routines to src/H5D.c, along with all the other
API routines.

Progress on "fake" async VOL connector, for testing.

* Modify async implementation to wrap async requests in a H5VL_object_t
struct so the VOL layer can find the connector when accessing the
request at a later point.

* Free the requests is H5ESclose.  Remove comments implying that request
wait, notify, and cancel callbacks should free the request.

* Fix bug in error handling in H5Fclose.

* Fix bugs in async file routines.  Rename H5VL_create_object_generic to
H5VL_create_object.

* Add explicit async version of H5Fcreate.

* Add more _async routines

* Correct typo for return value from H5Awrite changes

* Add H5EStest and H5ESwait routines

* Updated with API tracing info

* Fix NULL pointer dereference in H5ES__wait

* Add H5is_library_terminating() routine, so that VOL connectors can detect
when the library is shutting down.

* Fix typo

* Remove event from event set's linked list

* Move block of code so that vol_obj is valid

* Avoid setting properties in the DXPL when reseting the library state (and in
the test code).

* Refactor argument tracing to implement new capability for tracing arguments
of non-API routines, with the H5ARG_TRACE macro.   This macro is updated
automatically with the bin/trace script that runs as part of the autogen.sh
process.   Major changes were in src/H5trace.c and bin/trace, with the other
changes being cleanups to the argument lists, to improve their presentation
in the tracing output.

Also - added the "managed string" routines, which can dynamically allocate
strings, appending printf-formatted output to the string efficiently.

* Release memory for managed strings

* Fix printf() formats.

* More printf() format fixes.

* Add H5Eappend_stack routine and regression tests

* Clean up a few missed merge conflicts and update the error stacks.

* Remove unnecessary fork() operations and ten second sleep().

* Restore commented out attribute out, to better enable tracking down the previous failure

* Allow multiple H5ARG_TRACE macros within a routine to be updated

* Switch to using "new" H5ES_insert (which takes the arguments for the caller routine) for all event set operations.  Renames H5ES_insert_new to H5ES_insert and removes the previous H5ES_insert.

* Merge "managed" string routines into "ref-counted" strings, and refactor code to use them.

* Add missing file.

* Add caller's name and arguments to event, for error reporting

* Refactor event set setup for "API common" internal routines

* Checkin async API routines for H5A* and H5G* modules as listed in ID-283.
Fix couple h5dump expected output files due to the changes.

* Add some of the error query routines needed for event sets.

* Refactor to make async setup / teardown and "common" routines cleaner

* (1) Add async APIs to H5L, H5F, and H5D modules
(2) Fix errors in previous checkins of async APIs in H5A and H5G modules
(3) h5dump expected output changes

* Enhance event info, for better error handling

* Change name of temporary vol_obj variable, to help reduce coding errors

* Fix oversight with vol_obj pointer

* Minor code cleanup

* Add missing \'valid\' flag for VOL wrapper context, when restoring the library\'s state

* Run source formatter

* Change H5TSmutex lock and release to include a lock count

* Update error reporting ideas

* Minor updates to improve sanity checking for retrieving / restoring library state

* Updated with feedback from h5py team members

* Refactor internal event set list and event handling, add implementation for H5ESget_err_info

* Change the VOL request subclass callbacks that switch from using "H5ES_status_t" to "H5VL_request_status_t", and also add a H5VL_request_status_t* parameter to the 'cancel' callback in the request subclass.  Also more code quality cleanups to add iterator callbacks to internal event set routines.

* Update API tracing for new H5VL_request_status_t typedef

* Finish converting internal event set operations to use list iterator callbacks, instead of directly accessing the list structure

* Add H5VL_REQUEST_GET_ERR_STACK operation to request subclass, for retrieving a copy of the error stack for a failed asynchronous operation

* Remove 'canceled' event status from Java constants

* Be safer about releasing resources when inserting a newly opened/created object or file into an event set

* Remove H5EStest, add H5ES_WAIT_NONE for 0 timeout, and revise parameters to H5ESwait, to make it more "aggregate".

* Remove H5ES_STATUS_CANCELED from Java wrappers also

* (a) Add async APIs for H5O module as listed in jira issue ID-283.
(b) Remove verification of name parameter in async related routines for H55A and H5L modules
    because it is checked in H5VL_setup* routine.
(c) Modify h5dump expected output due to the async changes.

* Corrections based on PR feedback.

* Further changes to make based on PR feedback.

* Fix missed merge marker, and reformatted line

* Clean up some warnings

* Correct level of indirection

* Relocate prototype (and doxygen info) for H5Aclose

* Change non-static function declarations to be static

* Ensure that H5TSpublic.h header gets installed (#129)

* Add 'wrapper' versions of async calls, to allow language wrappers and layers on top of HDF5 to pass in their application information.

* Switch H5Aexists\*_async and H5Lexists\*_async to use flag to return status, instead of return value.  Make the corresponding changes through most of the v1 and v2 B-tree code.  Clean up warnings in H5public.h and cmpd_dtransform.c.

* Add H5Iregister_future routine and tests.

* Correct return value for H5Lexists_async

* Add H5_DLL macro to public H5ES API routines

* Update supported -> flags parameter for introspect_query callback

* Remove my email address.  Update passthrough VOL connector ID.

* Fix comment for post_open_api_common

* Remove unused non-blocking VOL connector

* Minor cleanup in async branch in preparation for merge to develop

* Update CMake and the Autotools to use the new pass-through VOL ID

* Fix for SWMR daily test failures (#160)

The H5I_register_using_existing_id() call did not initialize the future
ID callbacks, causing the library to segfault when it tried to
resolve those function pointers.

* Added selective async APIs (#150)

* Added selective async APIs

Description:
    Added the following APIs:
        H5Ropen_attr_async
        H5Ropen_object_async
        H5Ropen_region_async

        H5Mcreate_async
        H5Mopen_async
        H5Mput_async
        H5Mget_async
        H5Mclose_async

        H5Tcommit_async
        H5Topen_async
        H5Tcopy_async
        H5Tclose_async
    - Updated an expected output file to include a new internal function
      in the error stack for the failure case.

* Updated async APIs per reviews, including removing async version of
H5Tcopy.

* Removed statements that were added by mistake in the previous commit.

* Fix compile issues in H5M and warnings elsewhere

* Reformat code

* Brings VOL_LIST changes from develop. (#163)

Co-authored-by: Houjun Tang <htang4@lbl.gov>
Co-authored-by: Neil Fortner <nfortne2@hdfgroup.org>
Co-authored-by: vchoi <vchoi@jelly.ad.hdfgroup.org>
Co-authored-by: vchoi-hdfgroup <55293060+vchoi-hdfgroup@users.noreply.github.com>
Co-authored-by: jhendersonHDF <jhenderson@hdfgroup.org>
Co-authored-by: Dana Robinson <derobins@hdfgroup.org>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>

19 files changed, 252 insertions, 198 deletions

diff --git a/tools/src/h5dump/h5dump.h b/tools/src/h5dump/h5dump.h
index b4198ad..9392ca3 100644
--- a/tools/src/h5dump/h5dump.h
+++ b/tools/src/h5dump/h5dump.h
@@ -83,7 +83,7 @@ typedef struct {
 dump_opt_t dump_opts = {TRUE, FALSE, TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE,
                         TRUE, FALSE, FALSE, FALSE, FALSE, TRUE,  FALSE, 0};
 
-#define PACKED_BITS_MAX      8                       /* Maximum number of packed-bits to display */
+#define PACKED_BITS_MAX      8 /* Maximum number of packed-bits to display */
 #define PACKED_BITS_SIZE_MAX (8 * sizeof(long long)) /* Maximum bits size of integer types of packed-bits */
 /* mask list for packed bits */
 unsigned long long packed_mask[PACKED_BITS_MAX]; /* packed bits are restricted to 8*sizeof(llong) bytes */
diff --git a/tools/src/h5dump/h5dump_extern.h b/tools/src/h5dump/h5dump_extern.h
index 6ccd159..56734cf 100644
--- a/tools/src/h5dump/h5dump_extern.h
+++ b/tools/src/h5dump/h5dump_extern.h
@@ -80,7 +80,7 @@ typedef struct {
 } dump_opt_t;
 extern dump_opt_t dump_opts;
 
-#define PACKED_BITS_MAX      8                     /* Maximum number of packed-bits to display */
+#define PACKED_BITS_MAX      8 /* Maximum number of packed-bits to display */
 #define PACKED_BITS_SIZE_MAX 8 * sizeof(long long) /* Maximum bits size of integer types of packed-bits */
 /* mask list for packed bits */
 extern unsigned long long
diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
index 2269c97..8440159 100644
--- a/tools/test/h5dump/errfiles/tall-1.err
+++ b/tools/test/h5dump/errfiles/tall-1.err
@@ -1,34 +1,37 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
index 2269c97..8440159 100644
--- a/tools/test/h5dump/errfiles/tall-2A.err
+++ b/tools/test/h5dump/errfiles/tall-2A.err
@@ -1,34 +1,37 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
index 2269c97..8440159 100644
--- a/tools/test/h5dump/errfiles/tall-2A0.err
+++ b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -1,34 +1,37 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
index 2269c97..8440159 100644
--- a/tools/test/h5dump/errfiles/tall-2B.err
+++ b/tools/test/h5dump/errfiles/tall-2B.err
@@ -1,34 +1,37 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tattr-3.err b/tools/test/h5dump/errfiles/tattr-3.err
index 8481acf..7625965 100644
--- a/tools/test/h5dump/errfiles/tattr-3.err
+++ b/tools/test/h5dump/errfiles/tattr-3.err
@@ -1,20 +1,26 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Aopen(): unable to open attribute: 'attr'
+  #000: (file name) line (number) in H5Aopen(): unable to synchronously open attribute
+    major: Attribute
+    minor: Unable to create file
+  #001: (file name) line (number) in H5A__open_api_common(): unable to open attribute: 'attr'
+    major: Attribute
+    minor: Can't open object
+  #002: (file name) line (number) in H5A__open_common(): unable to open attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_attr_open(): attribute open failed
+  #003: (file name) line (number) in H5VL_attr_open(): attribute open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__attr_open(): attribute open failed
+  #004: (file name) line (number) in H5VL__attr_open(): attribute open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_attr_open(): unable to open attribute: 'attr'
+  #005: (file name) line (number) in H5VL__native_attr_open(): unable to open attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #004: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
+  #006: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #005: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
+  #007: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
     major: Attribute
     minor: Object not found
 h5dump error: unable to open attribute "attr"
diff --git a/tools/test/h5dump/errfiles/tcomp-3.err b/tools/test/h5dump/errfiles/tcomp-3.err
index fc59b0b..650df92 100644
--- a/tools/test/h5dump/errfiles/tcomp-3.err
+++ b/tools/test/h5dump/errfiles/tcomp-3.err
@@ -1,28 +1,31 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Topen2(): unable to open named datatype
+  #000: (file name) line (number) in H5Topen2(): unable to open named datatype synchronously
     major: Datatype
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_datatype_open(): datatype open failed
+  #001: (file name) line (number) in H5T__open_api_common(): unable to open named datatype
+    major: Datatype
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_datatype_open(): datatype open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__datatype_open(): datatype open failed
+  #003: (file name) line (number) in H5VL__datatype_open(): datatype open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_datatype_open(): unable to open named datatype
+  #004: (file name) line (number) in H5VL__native_datatype_open(): unable to open named datatype
     major: Datatype
     minor: Can't open object
-  #004: (file name) line (number) in H5T__open_name(): not found
+  #005: (file name) line (number) in H5T__open_name(): not found
     major: Datatype
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (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
-  #008: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
+  #009: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
     major: Symbol table
     minor: Object not found
diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
index 39bbb0e..051c677 100644
--- a/tools/test/h5dump/errfiles/tdset-2.err
+++ b/tools/test/h5dump/errfiles/tdset-2.err
@@ -1,29 +1,32 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
+  #000: (file name) line (number) in H5Dopen2(): unable to synchronously open dataset
     major: Dataset
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
+  #001: (file name) line (number) in H5D__open_api_common(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
+  #003: (file name) line (number) in H5VL__dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
+  #004: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #004: (file name) line (number) in H5D__open_name(): not found
+  #005: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (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
-  #008: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
+  #009: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
index 5ca94a8..04b129c 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -1,68 +1,74 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
     major: Links
     minor: Unable to open file
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
+    major: Object header
+    minor: Can't open object
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/textlinkfar.err b/tools/test/h5dump/errfiles/textlinkfar.err
index 92bad14..e5b81ce 100644
--- a/tools/test/h5dump/errfiles/textlinkfar.err
+++ b/tools/test/h5dump/errfiles/textlinkfar.err
@@ -1,59 +1,62 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #011: (file name) line (number) in H5O_open_name(): object not found
+  #012: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #012: (file name) line (number) in H5G_loc_find(): can't find object
+  #013: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #013: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #014: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #014: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #015: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #015: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #016: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #016: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #017: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #017: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #018: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #018: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #019: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/textlinksrc.err b/tools/test/h5dump/errfiles/textlinksrc.err
index 92bad14..e5b81ce 100644
--- a/tools/test/h5dump/errfiles/textlinksrc.err
+++ b/tools/test/h5dump/errfiles/textlinksrc.err
@@ -1,59 +1,62 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #011: (file name) line (number) in H5O_open_name(): object not found
+  #012: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #012: (file name) line (number) in H5G_loc_find(): can't find object
+  #013: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #013: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #014: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #014: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #015: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #015: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #016: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #016: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #017: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #017: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #018: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #018: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #019: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tgroup-2.err b/tools/test/h5dump/errfiles/tgroup-2.err
index 27557f3..f9fa0cf 100644
--- a/tools/test/h5dump/errfiles/tgroup-2.err
+++ b/tools/test/h5dump/errfiles/tgroup-2.err
@@ -1,29 +1,32 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Gopen2(): unable to open group
+  #000: (file name) line (number) in H5Gopen2(): unable to synchronously open group
+    major: Symbol table
+    minor: Unable to create file
+  #001: (file name) line (number) in H5G__open_api_common(): unable to open group
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_group_open(): group open failed
+  #002: (file name) line (number) in H5VL_group_open(): group open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__group_open(): group open failed
+  #003: (file name) line (number) in H5VL__group_open(): group open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_group_open(): unable to open group
+  #004: (file name) line (number) in H5VL__native_group_open(): unable to open group
     major: Symbol table
     minor: Can't open object
-  #004: (file name) line (number) in H5G__open_name(): group not found
+  #005: (file name) line (number) in H5G__open_name(): group not found
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (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
-  #008: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
+  #009: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
     major: Symbol table
     minor: Object not found
 h5dump error: unable to open group "/y"
diff --git a/tools/test/h5dump/errfiles/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
index 1fbd47e..182fc31 100644
--- a/tools/test/h5dump/errfiles/torderlinks1.err
+++ b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -1,34 +1,37 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
index 1fbd47e..182fc31 100644
--- a/tools/test/h5dump/errfiles/torderlinks2.err
+++ b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -1,34 +1,37 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Oopen(): unable to open object
+  #000: (file name) line (number) in H5Oopen(): unable to synchronously open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_object_open(): object open failed
+  #001: (file name) line (number) in H5O__open_api_common(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__object_open(): object open failed
+  #003: (file name) line (number) in H5VL__object_open(): object open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
+  #004: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
-  #004: (file name) line (number) in H5O_open_name(): object not found
+  #005: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #010: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find ID information (already closed?)
-  #010: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #011: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
     major: Links
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tperror.err b/tools/test/h5dump/errfiles/tperror.err
index e2f24c1..9e7972a 100644
--- a/tools/test/h5dump/errfiles/tperror.err
+++ b/tools/test/h5dump/errfiles/tperror.err
@@ -1,29 +1,32 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
+  #000: (file name) line (number) in H5Dopen2(): unable to synchronously open dataset
     major: Dataset
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
+  #001: (file name) line (number) in H5D__open_api_common(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
+  #003: (file name) line (number) in H5VL__dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
+  #004: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #004: (file name) line (number) in H5D__open_name(): not found
+  #005: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (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
-  #008: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
+  #009: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tslink-D.err b/tools/test/h5dump/errfiles/tslink-D.err
index e650a33..f465f29 100644
--- a/tools/test/h5dump/errfiles/tslink-D.err
+++ b/tools/test/h5dump/errfiles/tslink-D.err
@@ -1,37 +1,40 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dopen2(): unable to open dataset
+  #000: (file name) line (number) in H5Dopen2(): unable to synchronously open dataset
     major: Dataset
     minor: Can't open object
-  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
+  #001: (file name) line (number) in H5D__open_api_common(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL__dataset_open(): dataset open failed
+  #003: (file name) line (number) in H5VL__dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
+  #004: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #004: (file name) line (number) in H5D__open_name(): not found
+  #005: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #005: (file name) line (number) in H5G_loc_find(): can't find object
+  #006: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #006: (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
-  #007: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #008: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #008: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #009: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #009: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #010: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #010: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #011: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #011: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #012: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 99ceeb3..3caacd2 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -274,8 +274,8 @@ typedef struct s1_t {
 
 /* File 65 macros */
 #define STRATEGY         H5F_FSPACE_STRATEGY_NONE /* File space handling strategy */
-#define THRESHOLD10      10                       /* Free-space section threshold */
-#define FSPACE_PAGE_SIZE 8192                     /* File space page size */
+#define THRESHOLD10      10 /* Free-space section threshold */
+#define FSPACE_PAGE_SIZE 8192 /* File space page size */
 
 /* "FILE66" macros and for FILE69, FILE87 */
 #define F66_XDIM       8
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 6f586cc..3d9f0c2 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -1,44 +1,47 @@
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
+  #000: (file name) line (number) in H5Dcreate2(): unable to synchronously create dataset
     major: Dataset
     minor: Unable to create file
-  #001: (file name) line (number) in H5VL_dataset_create(): dataset create failed
+  #001: (file name) line (number) in H5D__create_api_common(): unable to create dataset
+    major: Dataset
+    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
-  #002: (file name) line (number) in H5VL__dataset_create(): dataset create failed
+  #003: (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
+  #004: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #004: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+  #005: (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
+  #006: (file name) line (number) in H5L_link_object(): unable to create new link to object
     major: Links
     minor: Unable to initialize object
-  #006: (file name) line (number) in H5L__create_real(): can't insert link
+  #007: (file name) line (number) in H5L__create_real(): can't insert link
     major: Links
     minor: Unable to insert object
-  #007: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #008: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #008: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #009: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #009: (file name) line (number) in H5L__link_cb(): unable to create object
+  #010: (file name) line (number) in H5L__link_cb(): unable to create object
     major: Links
     minor: Unable to initialize object
-  #010: (file name) line (number) in H5O_obj_create(): unable to open object
+  #011: (file name) line (number) in H5O_obj_create(): unable to open object
     major: Object header
     minor: Can't open object
-  #011: (file name) line (number) in H5O__dset_create(): unable to create dataset
+  #012: (file name) line (number) in H5O__dset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #012: (file name) line (number) in H5D__create(): unable to construct layout information
+  #013: (file name) line (number) in H5D__create(): unable to construct layout information
     major: Dataset
     minor: Unable to initialize object
-  #013: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
+  #014: (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):