Combo set of async and other changes (#161)

* 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

* Apply patch for dynamically registering optional VOL operations

* (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.

* Remove H5Dwait & H5Fwait (moved to the async connector).  Added H5atclose
routine.  Updated 'optional op' operations.

* Fix missed merge marker, and reformatted line

* Update API tracing infrastructure for H5atclose callback

* Clean up some warnings

* Normalize against develop branch

* Correct level of indirection

* Add doxygen info for H5is_library_terminating and regression tests for it and H5atclose

* Relocate prototype (and doxygen info) for H5Aclose

* Align w/changes on develop

* Move group package initialization code to H5Gint.c, and update tracing macros

* Change non-static function declarations to be static

* Correct GCC diagnostic macro

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

* Finish moving API routines that invoke VOL framework to main source files.

* Fix position of H5Fmount and H5Funmount

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

* Add wrappers for dynamically registered optional operations

* Fix typo

* Update doxygen comment for H5atclose with additional detail.

* Add H5VL\*_vararg versions of H5VL routines that use va_list parameters

* Implement and test H5S_BLOCK

* 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

* Finish another iteration on public H5ES routines, along with running the code reformatter

* Another round of reformatting

* 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)

* Remove H5Dwait and H5Fwait calls, which were incorrectly brought back in

* Tiny cleanup of H5Lcreate_hard_async

* Run source formatter

* Allow for canceled operation in wait_cb

* Attempt to fix switch on string value

* Re-run source formatter

* Add H5S_BLOCK testfile to CMake clean target

* Add H5Pset_vol_async API routine and 'get_cap_flags' VOL introspection callback

* Clean up warnings

* Add H5P(set\|get)_vol_implicit_async API routines to allow \/ disallow implicit asynchronous operations (default is disallowed)

* Run formatting script

* Remove H5VL_REQUEST_WAIT\*

* Warning cleanup

* Eliminate strdup()s on statically allocated strings

* Warning cleanup

* Split H5VLrestore_lib_state into H5VLstart_lib_state and H5VLrestore_lib_state, and rename H5VLreset_lib_state to H5VLfinish_lib_state.

* Duplicate strings when building err_info to return to applicatin

* Move connector author routines into seperate header files, all included in the new hdf5dev.h header

* Run bin/trace to add TRACE macros

* Allow H5ES_NONE as a valid, but no-op, parameter to all H5ES API routines that accept an event set ID

* Clean up formatting

* Remove H5Pset/get_vol_implicit_async

* Clean up warning

* Remove H5Pget_vol_async and replace with more generic H5Pget_vol_cap_flags

* Clean up warnings

* Add H5ESfree_err_info convenience routine

* Fix typo

* Correct matching for cached VOL plugins

* Add developer header file

* Update for C99 compatibility

* Add missing trace macro

* Stop clang-format from messing with the trace macros.  Don't set up VOL wrappers for 'infrastructure' objects like requests and blobs

* Fix warning about formatting a directory

* Clean up formatting for H5E_BEGIN_TRY / H5E_END_TRY

* Reduce scope of H5ES__close

* Enable CMake checks for various types on MacOS

* Clean up properly when H5CX_retrieve_state() fails.  Also clean up many compiler warnings.

* Committing clang-format changes

* Merge from develop

* Fix mis-placed assert

* Remove commented-out code

* Re-add macro for unsetenv on Windows (I think it accidentally was merged out)

* Strengthen sanity check from error report to assertion

* Committing clang-format changes

* Add units to the comments for a few fields

* Switch 'get execution time' operation for async request tokens to be an optional operation and query if connector supports operation before retrieving it.

* Committing clang-format changes

* Remove H5ESget_time_estimate

* Committing clang-format changes

* Create developer header for datatype routines and move type conversion register/unregister routines there.

* Simplify internal H5VL_setup_name_args and H5VL_setup_idx_args routines

* Add H5VLlink_optional_op, allowing dynamicly registered optional operations for the link VOL subclass, also added H5VL_loc_params argument to the link 'optional' callback to allow them to work correctly.

* Run bin/format_source on current code

* Add H5VLobject_optional_op, allowing dynamicly registered optional operations for the object VOL subclass, also added H5VL_loc_params argument to the object 'optional' callback to allow them to work correctly.

* Run bin/format_source on current code

* Committing clang-format changes

* Revert "Switch 'get execution time' operation for async request tokens to be an optional operation and query if connector supports operation before retrieving it."

This reverts commit 5ac92014da2682bdba62d7a2524b8d90e38f6b19.

* Committing clang-format changes

* Convert attribute 'get' operation to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.

* Update tracing macros

* Convert attribute 'specific' operation to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.

* Convert dataset 'get' and 'specific' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.  Also, minor tweaks to attribute 'get' and 'specific' operation parameters.

* Convert datatype 'get' and 'specific' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.  Also, minor tweaks to H5O_refresh_metadata arguments.

* Reduce warnings

* Reduce warnings

* Track change to datatype 'get' callback

* Fix bug with file pointer getting invalidated when object closed

* Reformat source

* Convert file and group VOL classes 'get' and 'specific' operations to use
struct-of-tagged-union pattern for VOL callback arguments, instead of using
varargs.  Also small cleanup to the attribute get name operation.  Also moved
'mount' and 'unmount' operations to be group specific operations, instead of
file specific, to better align with their behavior (mounted files are on
groups, so a group is what is operated on).

* Remove remainder of merge conflict marking

* Convert link VOL class 'create' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.

* Remove some unused local variables

* Convert link VOL class 'get' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.  Also refactor 'get name by idx' routines to return actual length of name with a parameter instead of the return value, and move some callback context structs for the link interface from the private header file into the source code module, to reduce their visibility scope.

* Update tracing macros

* Convert link VOL class 'specific' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.

* Convert object VOL class 'get' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.

* Convert object VOL class 'specific' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.  Also refactor H5G_loc_exists, et al, to return 'exists' flag in a parameter and errors with the function return value, instead of overloading both into the return value.  And, corrected logic error in test/links.c around non-existant objects in a file.

* Convert request VOL class 'specific' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.

* Convert blob VOL class 'specific' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.  Also removes the H5VL_BLOB_GETSIZE operation, as it's unused in the library and the blob ID size for a container is now returned with H5VL_FILE_GET_CONT_INFO.

* Add 'const' to several parameters that are only queried.

* Convert all VOL classes' 'optional' operations to use struct-of-tagged-union pattern for VOL callback arguments, instead of using varargs.  Convert several 'get' routines to return the length of an array in a parameter instead of combining it into the return value.  Move several routines to be in less public namespace.  Correct direct_chunk test to verify that parameters aren't modified on error.

* Switch get/specific/optional VOL callback argument structures to be 'async-friendly'.  Also other minor cleanups and bug-fixes.

* Add H5Pset_dataset_io_hyperslab_selection / H5S_PLIST feature, to allow skipping H5Dget_space + H5Sselect_hyperslab for async operation

* Add dynamic optional operations for request objects

* Update dynamic operation test for optional request operations

* Update a comment for an operation argument

* Run trace and format_source scripts

* Committing clang-format changes

* Committing clang-format changes

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>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 390 insertions, 13 deletions

diff --git a/src/H5VLnative.h b/src/H5VLnative.h
index 4a46e9e..fe8ede2 100644
--- a/src/H5VLnative.h
+++ b/src/H5VLnative.h
@@ -18,6 +18,7 @@
 #define H5VLnative_H
 
 /* Public headers needed by this file */
+#include "H5Apublic.h"  /* Attributes                           */
 #include "H5VLpublic.h" /* Virtual Object Layer                 */
 
 /*****************/
@@ -39,21 +40,140 @@
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 #define H5VL_NATIVE_ATTR_ITERATE_OLD 0 /* H5Aiterate (deprecated routine) */
 #endif                                 /* H5_NO_DEPRECATED_SYMBOLS */
+/* NOTE: If values over 1023 are added, the H5VL_RESERVED_NATIVE_OPTIONAL macro
+ *      must be updated.
+ */
+
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+/* Parameters for attribute 'iterate old' operation */
+typedef struct H5VL_native_attr_iterate_old_t {
+    hid_t           loc_id;
+    unsigned *      attr_num;
+    H5A_operator1_t op;
+    void *          op_data;
+} H5VL_native_attr_iterate_old_t;
+
+/* Parameters for native connector's attribute 'optional' operations */
+typedef union H5VL_native_attr_optional_args_t {
+    /* H5VL_NATIVE_ATTR_ITERATE_OLD */
+    H5VL_native_attr_iterate_old_t iterate_old;
+} H5VL_native_attr_optional_args_t;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /* Values for native VOL connector dataset optional VOL operations */
 /* NOTE: If new values are added here, the H5VL__native_introspect_opt_query
  *      routine must be updated.
  */
-#define H5VL_NATIVE_DATASET_FORMAT_CONVERT          0 /* H5Dformat_convert (internal) */
-#define H5VL_NATIVE_DATASET_GET_CHUNK_INDEX_TYPE    1 /* H5Dget_chunk_index_type      */
-#define H5VL_NATIVE_DATASET_GET_CHUNK_STORAGE_SIZE  2 /* H5Dget_chunk_storage_size    */
-#define H5VL_NATIVE_DATASET_GET_NUM_CHUNKS          3 /* H5Dget_num_chunks            */
-#define H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_IDX   4 /* H5Dget_chunk_info            */
-#define H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_COORD 5 /* H5Dget_chunk_info_by_coord   */
-#define H5VL_NATIVE_DATASET_CHUNK_READ              6 /* H5Dchunk_read                */
-#define H5VL_NATIVE_DATASET_CHUNK_WRITE             7 /* H5Dchunk_write               */
-#define H5VL_NATIVE_DATASET_GET_VLEN_BUF_SIZE       8 /* H5Dvlen_get_buf_size         */
-#define H5VL_NATIVE_DATASET_GET_OFFSET              9 /* H5Dget_offset                */
+#define H5VL_NATIVE_DATASET_FORMAT_CONVERT          0  /* H5Dformat_convert (internal) */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_INDEX_TYPE    1  /* H5Dget_chunk_index_type      */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_STORAGE_SIZE  2  /* H5Dget_chunk_storage_size    */
+#define H5VL_NATIVE_DATASET_GET_NUM_CHUNKS          3  /* H5Dget_num_chunks            */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_IDX   4  /* H5Dget_chunk_info            */
+#define H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_COORD 5  /* H5Dget_chunk_info_by_coord   */
+#define H5VL_NATIVE_DATASET_CHUNK_READ              6  /* H5Dchunk_read                */
+#define H5VL_NATIVE_DATASET_CHUNK_WRITE             7  /* H5Dchunk_write               */
+#define H5VL_NATIVE_DATASET_GET_VLEN_BUF_SIZE       8  /* H5Dvlen_get_buf_size         */
+#define H5VL_NATIVE_DATASET_GET_OFFSET              9  /* H5Dget_offset                */
+#define H5VL_NATIVE_DATASET_CHUNK_ITER              10 /* H5Dget_offset                */
+/* NOTE: If values over 1023 are added, the H5VL_RESERVED_NATIVE_OPTIONAL macro
+ *      must be updated.
+ */
+
+/* Parameters for native connector's dataset 'chunk read' operation */
+typedef struct H5VL_native_dataset_chunk_read_t {
+    const hsize_t *offset;
+    uint32_t       filters;
+    void *         buf;
+} H5VL_native_dataset_chunk_read_t;
+
+/* Parameters for native connector's dataset 'chunk write' operation */
+typedef struct H5VL_native_dataset_chunk_write_t {
+    const hsize_t *offset;
+    uint32_t       filters;
+    uint32_t       size;
+    const void *   buf;
+} H5VL_native_dataset_chunk_write_t;
+
+/* Parameters for native connector's dataset 'get vlen buf size' operation */
+typedef struct H5VL_native_dataset_get_vlen_buf_size_t {
+    hid_t    type_id;
+    hid_t    space_id;
+    hsize_t *size; /* Size of variable-length data buffer (OUT) */
+} H5VL_native_dataset_get_vlen_buf_size_t;
+
+/* Parameters for native connector's dataset 'get chunk storage size' operation */
+typedef struct H5VL_native_dataset_get_chunk_storage_size_t {
+    const hsize_t *offset; /* Offset of chunk */
+    hsize_t *      size;   /* Size of chunk (OUT) */
+} H5VL_native_dataset_get_chunk_storage_size_t;
+
+/* Parameters for native connector's dataset 'get num chunks' operation */
+typedef struct H5VL_native_dataset_get_num_chunks_t {
+    hid_t    space_id; /* Space selection */
+    hsize_t *nchunks;  /* # of chunk for space selection (OUT) */
+} H5VL_native_dataset_get_num_chunks_t;
+
+/* Parameters for native connector's dataset 'get chunk info by idx' operation */
+typedef struct H5VL_native_dataset_get_chunk_info_by_idx_t {
+    hid_t     space_id;    /* Space selection */
+    hsize_t   chk_index;   /* Chunk index within space */
+    hsize_t * offset;      /* Chunk coordinates (OUT) */
+    unsigned *filter_mask; /* Filter mask for chunk (OUT) */
+    haddr_t * addr;        /* Address of chunk in file (OUT) */
+    hsize_t * size;        /* Size of chunk in file (OUT) */
+} H5VL_native_dataset_get_chunk_info_by_idx_t;
+
+/* Parameters for native connector's dataset 'get chunk info by coord' operation */
+typedef struct H5VL_native_dataset_get_chunk_info_by_coord_t {
+    const hsize_t *offset;      /* Chunk coordinates */
+    unsigned *     filter_mask; /* Filter mask for chunk (OUT) */
+    haddr_t *      addr;        /* Address of chunk in file (OUT) */
+    hsize_t *      size;        /* Size of chunk in file (OUT) */
+} H5VL_native_dataset_get_chunk_info_by_coord_t;
+
+/* Parameters for native connector's dataset 'optional' operations */
+typedef union H5VL_native_dataset_optional_args_t {
+    /* H5VL_NATIVE_DATASET_FORMAT_CONVERT */
+    /* No args */
+
+    /* H5VL_NATIVE_DATASET_GET_CHUNK_INDEX_TYPE */
+    struct {
+        H5D_chunk_index_t *idx_type; /* Type of chunk index (OUT) */
+    } get_chunk_idx_type;
+
+    /* H5VL_NATIVE_DATASET_GET_CHUNK_STORAGE_SIZE */
+    H5VL_native_dataset_get_chunk_storage_size_t get_chunk_storage_size;
+
+    /* H5VL_NATIVE_DATASET_GET_NUM_CHUNKS */
+    H5VL_native_dataset_get_num_chunks_t get_num_chunks;
+
+    /* H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_IDX */
+    H5VL_native_dataset_get_chunk_info_by_idx_t get_chunk_info_by_idx;
+
+    /* H5VL_NATIVE_DATASET_GET_CHUNK_INFO_BY_COORD */
+    H5VL_native_dataset_get_chunk_info_by_coord_t get_chunk_info_by_coord;
+
+    /* H5VL_NATIVE_DATASET_CHUNK_READ */
+    H5VL_native_dataset_chunk_read_t chunk_read;
+
+    /* H5VL_NATIVE_DATASET_CHUNK_WRITE */
+    H5VL_native_dataset_chunk_write_t chunk_write;
+
+    /* H5VL_NATIVE_DATASET_GET_VLEN_BUF_SIZE */
+    H5VL_native_dataset_get_vlen_buf_size_t get_vlen_buf_size;
+
+    /* H5VL_NATIVE_DATASET_GET_OFFSET */
+    struct {
+        haddr_t *offset; /* Contiguous dataset's offset in the file (OUT) */
+    } get_offset;
+
+    /* H5VL_NATIVE_DATASET_CHUNK_ITER */
+    struct {
+        H5D_chunk_iter_op_t op;      /* Chunk iteration callback */
+        void *              op_data; /* Context to pass to iteration callback */
+    } chunk_iter;
+
+} H5VL_native_dataset_optional_args_t;
 
 /* Values for native VOL connector file optional VOL operations */
 /* NOTE: If new values are added here, the H5VL__native_introspect_opt_query
@@ -85,9 +205,195 @@
 #define H5VL_NATIVE_FILE_SET_LIBVER_BOUNDS            23 /* H5Fset_latest_format/libver_bounds   */
 #define H5VL_NATIVE_FILE_GET_MIN_DSET_OHDR_FLAG       24 /* H5Fget_dset_no_attrs_hint            */
 #define H5VL_NATIVE_FILE_SET_MIN_DSET_OHDR_FLAG       25 /* H5Fset_dset_no_attrs_hint            */
-#define H5VL_NATIVE_FILE_GET_MPI_ATOMICITY            26 /* H5Fget_mpi_atomicity                 */
-#define H5VL_NATIVE_FILE_SET_MPI_ATOMICITY            27 /* H5Fset_mpi_atomicity                 */
-#define H5VL_NATIVE_FILE_POST_OPEN                    28 /* Adjust file after open, with wrapping context */
+#ifdef H5_HAVE_PARALLEL
+#define H5VL_NATIVE_FILE_GET_MPI_ATOMICITY 26 /* H5Fget_mpi_atomicity                 */
+#define H5VL_NATIVE_FILE_SET_MPI_ATOMICITY 27 /* H5Fset_mpi_atomicity                 */
+#endif                                        /* H5_HAVE_PARALLEL */
+#define H5VL_NATIVE_FILE_POST_OPEN 28         /* Adjust file after open, with wrapping context */
+/* NOTE: If values over 1023 are added, the H5VL_RESERVED_NATIVE_OPTIONAL macro
+ *      must be updated.
+ */
+
+/* Parameters for native connector's file 'get file image' operation */
+typedef struct H5VL_native_file_get_file_image_t {
+    size_t  buf_size;  /* Size of file image buffer */
+    void *  buf;       /* Buffer for file image (OUT) */
+    size_t *image_len; /* Size of file image (OUT) */
+} H5VL_native_file_get_file_image_t;
+
+/* Parameters for native connector's file 'get free sections' operation */
+typedef struct H5VL_native_file_get_free_sections_t {
+    H5F_mem_t        type;       /* Type of file memory to query */
+    H5F_sect_info_t *sect_info;  /* Array of sections (OUT) */
+    size_t           nsects;     /* Size of section array */
+    size_t *         sect_count; /* Actual # of sections of type (OUT) */
+} H5VL_native_file_get_free_sections_t;
+
+/* Parameters for native connector's file 'get freespace' operation */
+typedef struct H5VL_native_file_get_freespace_t {
+    hsize_t *size; /* Size of free space (OUT) */
+} H5VL_native_file_get_freespace_t;
+
+/* Parameters for native connector's file 'get info' operation */
+typedef struct H5VL_native_file_get_info_t {
+    H5I_type_t   type;  /* Type of object */
+    H5F_info2_t *finfo; /* Pointer to file info (OUT) */
+} H5VL_native_file_get_info_t;
+
+/* Parameters for native connector's file 'get metadata cache size' operation */
+typedef struct H5VL_native_file_get_mdc_size_t {
+    size_t *  max_size;        /* Maximum amount of cached data (OUT) */
+    size_t *  min_clean_size;  /* Minimum amount of cached data to keep clean (OUT) */
+    size_t *  cur_size;        /* Current amount of cached data (OUT) */
+    uint32_t *cur_num_entries; /* Current # of cached entries (OUT) */
+} H5VL_native_file_get_mdc_size_t;
+
+/* Parameters for native connector's file 'get VFD handle' operation */
+typedef struct H5VL_native_file_get_vfd_handle_t {
+    hid_t  fapl_id;
+    void **file_handle; /* File handle from VFD (OUT) */
+} H5VL_native_file_get_vfd_handle_t;
+
+/* Parameters for native connector's file 'get MDC logging status' operation */
+typedef struct H5VL_native_file_get_mdc_logging_status_t {
+    hbool_t *is_enabled;           /* Whether logging is enabled (OUT) */
+    hbool_t *is_currently_logging; /* Whether currently logging (OUT) */
+} H5VL_native_file_get_mdc_logging_status_t;
+
+/* Parameters for native connector's file 'get page buffering stats' operation */
+typedef struct H5VL_native_file_get_page_buffering_stats_t {
+    unsigned *accesses;  /* Metadata/raw data page access counts (OUT) */
+    unsigned *hits;      /* Metadata/raw data page hit counts (OUT) */
+    unsigned *misses;    /* Metadata/raw data page miss counts (OUT) */
+    unsigned *evictions; /* Metadata/raw data page eviction counts (OUT) */
+    unsigned *bypasses;  /* Metadata/raw data page bypass counts (OUT) */
+} H5VL_native_file_get_page_buffering_stats_t;
+
+/* Parameters for native connector's file 'get MDC image info' operation */
+typedef struct H5VL_native_file_get_mdc_image_info_t {
+    haddr_t *addr; /* Address of image (OUT) */
+    hsize_t *len;  /* Length of image (OUT) */
+} H5VL_native_file_get_mdc_image_info_t;
+
+/* Parameters for native connector's file 'set libver bounds' operation */
+typedef struct H5VL_native_file_set_libver_bounds_t {
+    H5F_libver_t low;  /* Lowest version possible */
+    H5F_libver_t high; /* Highest version possible */
+} H5VL_native_file_set_libver_bounds_t;
+
+/* Parameters for native connector's file 'optional' operations */
+typedef union H5VL_native_file_optional_args_t {
+    /* H5VL_NATIVE_FILE_CLEAR_ELINK_CACHE */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_GET_FILE_IMAGE */
+    H5VL_native_file_get_file_image_t get_file_image;
+
+    /* H5VL_NATIVE_FILE_GET_FREE_SECTIONS */
+    H5VL_native_file_get_free_sections_t get_free_sections;
+
+    /* H5VL_NATIVE_FILE_GET_FREE_SPACE */
+    H5VL_native_file_get_freespace_t get_freespace;
+
+    /* H5VL_NATIVE_FILE_GET_INFO */
+    H5VL_native_file_get_info_t get_info;
+
+    /* H5VL_NATIVE_FILE_GET_MDC_CONF */
+    struct {
+        H5AC_cache_config_t *config; /* Pointer to MDC config (OUT) */
+    } get_mdc_config;
+
+    /* H5VL_NATIVE_FILE_GET_MDC_HR */
+    struct {
+        double *hit_rate; /* Metadata cache hit rate (OUT) */
+    } get_mdc_hit_rate;
+
+    /* H5VL_NATIVE_FILE_GET_MDC_SIZE */
+    H5VL_native_file_get_mdc_size_t get_mdc_size;
+
+    /* H5VL_NATIVE_FILE_GET_SIZE */
+    struct {
+        hsize_t *size; /* Size of file (OUT) */
+    } get_size;
+
+    /* H5VL_NATIVE_FILE_GET_VFD_HANDLE */
+    H5VL_native_file_get_vfd_handle_t get_vfd_handle;
+
+    /* H5VL_NATIVE_FILE_RESET_MDC_HIT_RATE */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_SET_MDC_CONFIG */
+    struct {
+        const H5AC_cache_config_t *config; /* Pointer to new MDC config */
+    } set_mdc_config;
+
+    /* H5VL_NATIVE_FILE_GET_METADATA_READ_RETRY_INFO */
+    struct {
+        H5F_retry_info_t *info; /* Pointer to metadata read retry info (OUT) */
+    } get_metadata_read_retry_info;
+
+    /* H5VL_NATIVE_FILE_START_SWMR_WRITE */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_START_MDC_LOGGING */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_STOP_MDC_LOGGING */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_GET_MDC_LOGGING_STATUS */
+    H5VL_native_file_get_mdc_logging_status_t get_mdc_logging_status;
+
+    /* H5VL_NATIVE_FILE_FORMAT_CONVERT */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_RESET_PAGE_BUFFERING_STATS */
+    /* No args */
+
+    /* H5VL_NATIVE_FILE_GET_PAGE_BUFFERING_STATS */
+    H5VL_native_file_get_page_buffering_stats_t get_page_buffering_stats;
+
+    /* H5VL_NATIVE_FILE_GET_MDC_IMAGE_INFO */
+    H5VL_native_file_get_mdc_image_info_t get_mdc_image_info;
+
+    /* H5VL_NATIVE_FILE_GET_EOA */
+    struct {
+        haddr_t *eoa; /* End of allocated file address space (OUT) */
+    } get_eoa;
+
+    /* H5VL_NATIVE_FILE_INCR_FILESIZE */
+    struct {
+        hsize_t increment; /* Amount to increment file size */
+    } increment_filesize;
+
+    /* H5VL_NATIVE_FILE_SET_LIBVER_BOUNDS */
+    H5VL_native_file_set_libver_bounds_t set_libver_bounds;
+
+    /* H5VL_NATIVE_FILE_GET_MIN_DSET_OHDR_FLAG */
+    struct {
+        hbool_t *minimize; /* Flag whether dataset object headers are minimal (OUT) */
+    } get_min_dset_ohdr_flag;
+
+    /* H5VL_NATIVE_FILE_SET_MIN_DSET_OHDR_FLAG */
+    struct {
+        hbool_t minimize; /* Flag whether dataset object headers should be minimal */
+    } set_min_dset_ohdr_flag;
+
+#ifdef H5_HAVE_PARALLEL
+    /* H5VL_NATIVE_FILE_GET_MPI_ATOMICITY */
+    struct {
+        hbool_t *flag; /* Flag whether MPI atomicity is set for files (OUT) */
+    } get_mpi_atomicity;
+
+    /* H5VL_NATIVE_FILE_SET_MPI_ATOMICITY */
+    struct {
+        hbool_t flag; /* Flag whether to set MPI atomicity for files */
+    } set_mpi_atomicity;
+#endif /* H5_HAVE_PARALLEL */
+
+    /* H5VL_NATIVE_FILE_POST_OPEN */
+    /* No args */
+} H5VL_native_file_optional_args_t;
 
 /* Values for native VOL connector group optional VOL operations */
 /* NOTE: If new values are added here, the H5VL__native_introspect_opt_query
@@ -97,6 +403,36 @@
 #define H5VL_NATIVE_GROUP_ITERATE_OLD 0 /* HG5Giterate (deprecated routine) */
 #define H5VL_NATIVE_GROUP_GET_OBJINFO 1 /* HG5Gget_objinfo (deprecated routine) */
 #endif                                  /* H5_NO_DEPRECATED_SYMBOLS */
+/* NOTE: If values over 1023 are added, the H5VL_RESERVED_NATIVE_OPTIONAL macro
+ *      must be updated.
+ */
+
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+/* Parameters for group 'iterate old' operation */
+typedef struct H5VL_native_group_iterate_old_t {
+    H5VL_loc_params_t loc_params; /* Location parameters for iteration */
+    hsize_t           idx;        /* Index of link to begin iteration at */
+    hsize_t *         last_obj;   /* Index of last link looked at (OUT) */
+    H5G_iterate_t     op;         /* Group (link) operator callback */
+    void *            op_data;    /* Context to pass to iterator callback */
+} H5VL_native_group_iterate_old_t;
+
+/* Parameters for group 'get objinfo' operation */
+typedef struct H5VL_native_group_get_objinfo_t {
+    H5VL_loc_params_t loc_params;  /* Location parameters for iteration */
+    hbool_t           follow_link; /* Whether to follow links for query */
+    H5G_stat_t *      statbuf;     /* Pointer to object info struct (OUT) */
+} H5VL_native_group_get_objinfo_t;
+
+/* Parameters for native connector's group 'optional' operations */
+typedef union H5VL_native_group_optional_args_t {
+    /* H5VL_NATIVE_GROUP_ITERATE_OLD */
+    H5VL_native_group_iterate_old_t iterate_old;
+
+    /* H5VL_NATIVE_GROUP_GET_OBJINFO */
+    H5VL_native_group_get_objinfo_t get_objinfo;
+} H5VL_native_group_optional_args_t;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 /* Values for native VOL connector object optional VOL operations */
 /* NOTE: If new values are added here, the H5VL__native_introspect_opt_query
@@ -108,6 +444,47 @@
 #define H5VL_NATIVE_OBJECT_ENABLE_MDC_FLUSHES       3 /* H5Oenable_mdc_flushes                        */
 #define H5VL_NATIVE_OBJECT_ARE_MDC_FLUSHES_DISABLED 4 /* H5Oare_mdc_flushes_disabled                  */
 #define H5VL_NATIVE_OBJECT_GET_NATIVE_INFO          5 /* H5Oget_native_info(_by_idx, _by_name)        */
+/* NOTE: If values over 1023 are added, the H5VL_RESERVED_NATIVE_OPTIONAL macro
+ *      must be updated.
+ */
+
+/* Parameters for native connector's object 'get comment' operation */
+typedef struct H5VL_native_object_get_comment_t {
+    size_t  buf_size;    /* Size of comment buffer */
+    void *  buf;         /* Buffer for comment (OUT) */
+    size_t *comment_len; /* Actual size of comment (OUT) */
+} H5VL_native_object_get_comment_t;
+
+/* Parameters for object 'get native info' operation */
+typedef struct H5VL_native_object_get_native_info_t {
+    unsigned           fields; /* Fields to retrieve */
+    H5O_native_info_t *ninfo;  /* Native info (OUT) */
+} H5VL_native_object_get_native_info_t;
+
+/* Parameters for native connector's object 'optional' operations */
+typedef union H5VL_native_object_optional_args_t {
+    /* H5VL_NATIVE_OBJECT_GET_COMMENT */
+    H5VL_native_object_get_comment_t get_comment;
+
+    /* H5VL_NATIVE_OBJECT_SET_COMMENT */
+    struct {
+        const char *comment; /* Comment string to set for the object (IN) */
+    } set_comment;
+
+    /* H5VL_NATIVE_OBJECT_DISABLE_MDC_FLUSHES */
+    /* No args */
+
+    /* H5VL_NATIVE_OBJECT_ENABLE_MDC_FLUSHES */
+    /* No args */
+
+    /* H5VL_NATIVE_OBJECT_ARE_MDC_FLUSHES_DISABLED */
+    struct {
+        hbool_t *flag; /* Flag whether metadata cache flushes are disabled for this object (OUT) */
+    } are_mdc_flushes_disabled;
+
+    /* H5VL_NATIVE_OBJECT_GET_NATIVE_INFO */
+    H5VL_native_object_get_native_info_t get_native_info;
+} H5VL_native_object_optional_args_t;
 
 /*******************/
 /* Public Typedefs */