Squashed commit of the token_refactoring branch:

1 files changed, 360 insertions, 121 deletions

diff --git a/src/H5O.c b/src/H5O.c
index cd577cb..d943e37 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -102,7 +102,7 @@
 hid_t
 H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5I_type_t      opened_type;
     void           *opened_obj  = NULL;
     H5VL_loc_params_t loc_params;
@@ -171,7 +171,7 @@ hid_t
 H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5_iter_order_t order, hsize_t n, hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5I_type_t opened_type;
     void *opened_obj = NULL;
     H5VL_loc_params_t loc_params;
@@ -217,57 +217,34 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Oopen_by_addr
+ * Function:    H5Oopen_by_token
  *
- * Purpose:	Warning! This function is EXTREMELY DANGEROUS!
- *              Improper use can lead to FILE CORRUPTION, INACCESSIBLE DATA,
- *              and other VERY BAD THINGS!
- *
- *              This function opens an object using its address within the
- *              HDF5 file, similar to an HDF5 hard link. The open object
- *              is identical to an object opened with H5Oopen() and should
- *              be closed with H5Oclose() or a type-specific closing
- *              function (such as H5Gclose() ).
- *
- *              This function is very dangerous if called on an invalid
- *              address. For this reason, H5Oincr_refcount() should be
- *              used to prevent HDF5 from deleting any object that is
- *              referenced by address (e.g. by a user-defined link).
- *              H5Odecr_refcount() should be used when the object is
- *              no longer being referenced by address (e.g. when the UD link
- *              is deleted).
- *
- *              The address of the HDF5 file on disk has no effect on
- *              H5Oopen_by_addr(), nor does the use of any unusual file
- *              drivers. The "address" is really the offset within the
- *              HDF5 file, and HDF5's file drivers will transparently
- *              map this to an address on disk for the filesystem.
+ * Purpose:     Same as H5Oopen_by_addr, but uses VOL-independent tokens.
  *
- * Return:	Success:	An open object identifier
- *		Failure:	H5I_INVALID_HID
+ * Return:      Success:    An open object identifier
+ *              Failure:    H5I_INVALID_HID
  *
- * Programmer:	James Laird
- *		July 14 2006
+ * Programmer:  Dana Robinson
+ *              Winter 2019
  *
  *-------------------------------------------------------------------------
  */
 hid_t
-H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
+H5Oopen_by_token(hid_t loc_id, H5O_token_t token)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5I_type_t vol_obj_type = H5I_BADID;/* Object type of loc_id */
     H5I_type_t opened_type;             /* Opened object type */
     void *opened_obj = NULL;            /* Opened object */
     H5VL_loc_params_t loc_params;       /* Location parameters */
-    H5VL_token_t obj_token = {0};       /* Object token */
-    hid_t file_id = H5I_INVALID_HID;    /* File ID */
-    void *vol_obj_file = NULL;          /* Object token of file_id */
-    H5F_t *f = NULL;
-    uint8_t *p = NULL;
     hid_t ret_value = H5I_INVALID_HID;  /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
-    H5TRACE2("i", "ia", loc_id, addr);
+    H5TRACE2("i", "ik", loc_id, token);
+
+    /* Check args */
+    if(H5O_IS_TOKEN_UNDEF(token))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5I_INVALID_HID, "can't open H5O_TOKEN_UNDEF")
 
     /* Get the location object */
     if(NULL == (vol_obj = (H5VL_object_t *)H5I_object(loc_id)))
@@ -277,39 +254,21 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
     if((vol_obj_type = H5I_get_type(loc_id)) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier")
 
-    /* Get the file for the object */
-    if((file_id = H5F_get_file_id(vol_obj, vol_obj_type, FALSE)) < 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not a file or file object")
-
-    /* Retrieve VOL object */
-    if(NULL == (vol_obj_file = H5VL_vol_object(file_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid location identifier")
-
-    /* Retrieve file from VOL object */
-    if(NULL == (f = (H5F_t *)H5VL_object_data((const H5VL_object_t *)vol_obj_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "invalid VOL object")
-
-    /* This is a native specific routine that requires serialization of the token */
-    p = (uint8_t *)&obj_token;
-    H5F_addr_encode(f, &p, addr);
-
     loc_params.type = H5VL_OBJECT_BY_TOKEN;
-    loc_params.loc_data.loc_by_token.token = &obj_token;
+    loc_params.loc_data.loc_by_token.token = &token;
     loc_params.obj_type = vol_obj_type;
 
     /* Open the object */
     if(NULL == (opened_obj = H5VL_object_open(vol_obj, &loc_params, &opened_type, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open object")
 
-    /* Register the dataset ID */
+    /* Register the object's ID */
     if((ret_value = H5VL_register(opened_type, opened_obj, vol_obj->connector, TRUE)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to atomize object handle")
 
 done:
-    if(file_id != H5I_INVALID_HID && H5I_dec_ref(file_id) < 0)
-        HDONE_ERROR(H5E_REFERENCE, H5E_CANTDEC, H5I_INVALID_HID, "unable to decrement refcount on file")
     FUNC_LEAVE_API(ret_value)
-} /* end H5Oopen_by_addr() */
+} /* end H5Oopen_by_token() */
 
 
 /*-------------------------------------------------------------------------
@@ -337,9 +296,9 @@ herr_t
 H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
     hid_t lapl_id)
 {
-    H5VL_object_t    *vol_obj1 = NULL;        /* object token of obj_id */
-    H5VL_object_t    *vol_obj2 = NULL;        /* object token of new_loc_id */
-    H5VL_object_t     tmp_vol_obj;            /* Temporary object token of */
+    H5VL_object_t    *vol_obj1 = NULL;        /* object of obj_id */
+    H5VL_object_t    *vol_obj2 = NULL;        /* object of new_loc_id */
+    H5VL_object_t     tmp_vol_obj;            /* Temporary object */
     H5VL_loc_params_t loc_params1;
     H5VL_loc_params_t loc_params2;
     herr_t         ret_value = SUCCEED;       /* Return value */
@@ -429,7 +388,7 @@ done:
 herr_t
 H5Oincr_refcount(hid_t object_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t      ret_value = SUCCEED;
 
@@ -479,7 +438,7 @@ done:
 herr_t
 H5Odecr_refcount(hid_t object_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t      ret_value = SUCCEED;	/* Return value */
 
@@ -522,7 +481,7 @@ done:
 htri_t
 H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     htri_t      ret_value = FAIL;       /* Return value */
 
@@ -559,23 +518,21 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Oget_info2
+ * Function:    H5Oget_info3
  *
  * Purpose:     Retrieve information about an object.
  *
- *              NOTE: Add a parameter "fields" to indicate selection of object info.
- *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:  Neil Fortner
- *              July 7 2010
+ * Programmer:  Dana Robinson
+ *              Fall 2019
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Oget_info2(hid_t loc_id, H5O_info_t *oinfo, unsigned fields)
+H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t   loc_params;
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -597,33 +554,31 @@ H5Oget_info2(hid_t loc_id, H5O_info_t *oinfo, unsigned fields)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Retrieve the object's information */
-    if(H5VL_object_optional(vol_obj, H5VL_NATIVE_OBJECT_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, oinfo, fields) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get info for object")
+    if(H5VL_object_get(vol_obj, &loc_params, H5VL_OBJECT_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, oinfo, fields) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get data model info for object")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Oget_info2() */
+} /* end H5Oget_info3() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Oget_info_by_name2
+ * Function:    H5Oget_info_by_name3
  *
  * Purpose:     Retrieve information about an object
  *
- *              NOTE: Add a parameter "fields" to indicate selection of object info.
- *
  * Return:      SUCCEED/FAIL
  *
- * Programmer:  Neil Fortner
- *              July 7 2010
+ * Programmer:  Dana Robinson
+ *              Fall 2019
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Oget_info_by_name2(hid_t loc_id, const char *name, H5O_info_t *oinfo,
-    unsigned fields, hid_t lapl_id)
+H5Oget_info_by_name3(hid_t loc_id, const char *name,
+    H5O_info2_t *oinfo, unsigned fields, hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -655,35 +610,33 @@ H5Oget_info_by_name2(hid_t loc_id, const char *name, H5O_info_t *oinfo,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Retrieve the object's information */
-    if(H5VL_object_optional(vol_obj, H5VL_NATIVE_OBJECT_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, oinfo, fields) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get info for object: '%s'", name)
+    if(H5VL_object_get(vol_obj, &loc_params, H5VL_OBJECT_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, oinfo, fields) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get data model info for object")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Oget_info_by_name2() */
+} /* end H5Oget_info_by_name3() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Oget_info_by_idx2
- *
- * Purpose:     Retrieve information about an object, according to the order
- *              of an index.
+ * Function:    H5Oget_info_by_idx3
  *
- *              NOTE: Add a parameter "fields" to indicate selection of object info.
+ * Purpose:     Retrieve information about an object, according to
+ *              the order of an index.
  *
  * Return:      Success:	Non-negative
  *              Failure:	Negative
  *
- * Programmer:	Quincey Koziol
- *              November 26 2006
+ * Programmer:	Dana Robinson
+ *              Fall 2019
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo, unsigned fields, hid_t lapl_id)
+H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+    H5_iter_order_t order, hsize_t n, H5O_info2_t *oinfo, unsigned fields, hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -720,12 +673,176 @@ H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index_t idx_type,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Retrieve the object's information */
-    if(H5VL_object_optional(vol_obj, H5VL_NATIVE_OBJECT_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, oinfo, fields) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get info for object")
+    if(H5VL_object_get(vol_obj, &loc_params, H5VL_OBJECT_GET_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, oinfo, fields) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get data model info for object")
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Oget_info_by_idx2() */
+} /* end H5Oget_info_by_idx3() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5Oget_native_info
+ *
+ * Purpose:     Retrieve native file format information about an object.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ * Programmer:  Dana Robinson
+ *              Fall 2019
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Oget_native_info(hid_t loc_id, H5O_native_info_t *oinfo, unsigned fields)
+{
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
+    H5VL_loc_params_t   loc_params;
+    herr_t      ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE3("e", "i*xIu", loc_id, oinfo, fields);
+
+    /* Check args */
+    if(!oinfo)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "oinfo parameter cannot be NULL")
+    if(fields & ~H5O_NATIVE_INFO_ALL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid fields")
+
+    /* Set location struct fields */
+    loc_params.type         = H5VL_OBJECT_BY_SELF;
+    loc_params.obj_type     = H5I_get_type(loc_id);
+
+    /* Get the location object */
+    if(NULL == (vol_obj = H5VL_vol_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+
+    /* Retrieve the object's information */
+    if(H5VL_object_optional(vol_obj, H5VL_NATIVE_OBJECT_GET_NATIVE_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, oinfo, fields) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get native file format info for object")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Oget_native_info() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5Oget_native_info_by_name
+ *
+ * Purpose:     Retrieve native file format information about an object
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ * Programmer:  Dana Robinson
+ *              Fall 2019
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Oget_native_info_by_name(hid_t loc_id, const char *name, H5O_native_info_t *oinfo,
+    unsigned fields, hid_t lapl_id)
+{
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
+    H5VL_loc_params_t loc_params;
+    herr_t      ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE5("e", "i*s*xIui", loc_id, name, oinfo, fields, lapl_id);
+
+    /* Check args */
+    if(!name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "name parameter cannot be NULL")
+    if(!*name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "name parameter cannot be an empty string")
+    if(!oinfo)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "oinfo parameter cannot be NULL")
+    if(fields & ~H5O_NATIVE_INFO_ALL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid fields")
+
+    /* Verify access property list and set up collective metadata if appropriate */
+    if(H5CX_set_apl(&lapl_id, H5P_CLS_LACC, loc_id, FALSE) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set access property list info")
+
+    /* Fill out location struct */
+    loc_params.type                         = H5VL_OBJECT_BY_NAME;
+    loc_params.loc_data.loc_by_name.name    = name;
+    loc_params.loc_data.loc_by_name.lapl_id = lapl_id;
+    loc_params.obj_type                     = H5I_get_type(loc_id);
+
+    /* Get the location object */
+    if(NULL == (vol_obj = H5VL_vol_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+
+    /* Retrieve the object's information */
+    if(H5VL_object_optional(vol_obj, H5VL_NATIVE_OBJECT_GET_NATIVE_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, oinfo, fields) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get native file format info for object: '%s'", name)
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Oget_native_info_by_name() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5Oget_native_info_by_idx
+ *
+ * Purpose:     Retrieve native file format information about an object,
+ *              according to the order of an index.
+ *
+ * Return:      Success:	Non-negative
+ *              Failure:	Negative
+ *
+ * Programmer:	Dana Robinson
+ *              Fall 2019
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+    H5_iter_order_t order, hsize_t n, H5O_native_info_t *oinfo, unsigned fields, hid_t lapl_id)
+{
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
+    H5VL_loc_params_t loc_params;
+    herr_t      ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE8("e", "i*sIiIoh*xIui", loc_id, group_name, idx_type, order, n, oinfo,
+             fields, lapl_id);
+
+    /* Check args */
+    if(!group_name || !*group_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
+    if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index type specified")
+    if(order <= H5_ITER_UNKNOWN || order >= H5_ITER_N)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid iteration order specified")
+    if(!oinfo)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
+    if(fields & ~H5O_NATIVE_INFO_ALL)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid fields")
+
+    /* Verify access property list and set up collective metadata if appropriate */
+    if(H5CX_set_apl(&lapl_id, H5P_CLS_LACC, loc_id, FALSE) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set access property list info")
+
+    loc_params.type = H5VL_OBJECT_BY_IDX;
+    loc_params.loc_data.loc_by_idx.name = group_name;
+    loc_params.loc_data.loc_by_idx.idx_type = idx_type;
+    loc_params.loc_data.loc_by_idx.order = order;
+    loc_params.loc_data.loc_by_idx.n = n;
+    loc_params.loc_data.loc_by_idx.lapl_id = lapl_id;
+    loc_params.obj_type = H5I_get_type(loc_id);
+
+    /* Get the location object */
+    if(NULL == (vol_obj = H5VL_vol_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+
+    /* Retrieve the object's information */
+    if(H5VL_object_optional(vol_obj, H5VL_NATIVE_OBJECT_GET_NATIVE_INFO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, &loc_params, oinfo, fields) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get native file format info for object")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Oget_native_info_by_idx() */
 
 
 /*-------------------------------------------------------------------------
@@ -748,7 +865,7 @@ done:
 herr_t
 H5Oset_comment(hid_t obj_id, const char *comment)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -797,7 +914,7 @@ herr_t
 H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment,
     hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -850,9 +967,9 @@ done:
 ssize_t
 H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
-    ssize_t     ret_value = -1;              /* Return value */
+    ssize_t     ret_value = -1;         /* Return value */
 
     FUNC_ENTER_API((-1))
     H5TRACE3("Zs", "i*sz", obj_id, comment, bufsize);
@@ -894,9 +1011,9 @@ ssize_t
 H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t bufsize,
     hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t loc_params;
-    ssize_t     ret_value = -1;              /* Return value */
+    ssize_t     ret_value = -1;         /* Return value */
 
     FUNC_ENTER_API((-1))
     H5TRACE5("Zs", "i*s*szi", loc_id, name, comment, bufsize, lapl_id);
@@ -929,7 +1046,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Ovisit2
+ * Function:    H5Ovisit3
  *
  * Purpose:     Recursively visit an object and all the objects reachable
  *              from it.  If the starting object is a group, all the objects
@@ -964,12 +1081,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
-    H5O_iterate_t op, void *op_data, unsigned fields)
+H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
+    H5O_iterate2_t op, void *op_data, unsigned fields)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
     H5VL_loc_params_t   loc_params;
-    herr_t              ret_value;              /* Return value */
+    herr_t              ret_value;      /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE6("e", "iIiIox*xIu", obj_id, idx_type, order, op, op_data, fields);
@@ -998,11 +1115,11 @@ H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Ovisit2() */
+} /* end H5Ovisit3() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Ovisit_by_name2
+ * Function:    H5Ovisit_by_name3
  *
  * Purpose:     Recursively visit an object and all the objects reachable
  *              from it.  If the starting object is a group, all the objects
@@ -1037,12 +1154,12 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Ovisit_by_name2(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5O_iterate_t op, void *op_data, unsigned fields, hid_t lapl_id)
+H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+    H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields, hid_t lapl_id)
 {
-    H5VL_object_t *vol_obj;             /* Object token of loc_id */
-    H5VL_loc_params_t   loc_params; 
-    herr_t              ret_value;              /* Return value */
+    H5VL_object_t *vol_obj;             /* Object of loc_id */
+    H5VL_loc_params_t   loc_params;
+    herr_t              ret_value;      /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE8("e", "i*sIiIox*xIui", loc_id, obj_name, idx_type, order, op, op_data,
@@ -1082,7 +1199,7 @@ H5Ovisit_by_name2(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Ovisit_by_name2() */
+} /* end H5Ovisit_by_name3() */
 
 
 /*-------------------------------------------------------------------------
@@ -1187,7 +1304,7 @@ done:
 herr_t
 H5Odisable_mdc_flushes(hid_t object_id)
 {
-    H5VL_object_t       *vol_obj;               /* Object token of loc_id */
+    H5VL_object_t       *vol_obj;               /* Object of loc_id */
     H5VL_loc_params_t   loc_params;             /* Location parameters */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
@@ -1256,7 +1373,7 @@ done:
 herr_t
 H5Oenable_mdc_flushes(hid_t object_id)
 {
-    H5VL_object_t       *vol_obj;               /* Object token of loc_id */
+    H5VL_object_t       *vol_obj;               /* Object of loc_id */
     H5VL_loc_params_t   loc_params;             /* Location parameters */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
@@ -1330,7 +1447,7 @@ done:
 herr_t
 H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled)
 {
-    H5VL_object_t       *vol_obj;               /* Object token of loc_id */
+    H5VL_object_t       *vol_obj;               /* Object of loc_id */
     H5VL_loc_params_t   loc_params;             /* Location parameters */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
@@ -1361,3 +1478,125 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Oare_mdc_flushes_disabled() */
 
+
+/*---------------------------------------------------------------------------
+ * Function:    H5Otoken_cmp
+ *
+ * Purpose:     Compares two VOL connector object tokens
+ *
+ * Note:        Both object tokens must be from the same VOL connector class
+ *
+ * Return:      Success:    Non-negative, with *cmp_value set to positive if
+ *                          token1 is greater than token2, negative if token2
+ *                          is greater than token1 and zero if token1 and
+ *                          token2 are equal.
+ *              Failure:    Negative
+ *
+ *---------------------------------------------------------------------------
+ */
+herr_t
+H5Otoken_cmp(hid_t loc_id, const H5O_token_t *token1, const H5O_token_t *token2,
+    int *cmp_value)
+{
+    H5VL_object_t *vol_obj;         /* VOL object for ID */
+    herr_t ret_value = SUCCEED;     /* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE4("e", "i*k*k*Is", loc_id, token1, token2, cmp_value);
+
+    /* Get the location object */
+    if(NULL == (vol_obj = H5VL_vol_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+    if(NULL == cmp_value)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid cmp_value pointer")
+
+    /* Compare the two tokens */
+    if(H5VL_token_cmp(vol_obj, token1, token2, cmp_value) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_CANTCOMPARE, FAIL, "object token comparison failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Otoken_cmp() */
+
+
+/*---------------------------------------------------------------------------
+ * Function:    H5Otoken_to_str
+ *
+ * Purpose:     Serialize a connector's object token into a string
+ *
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
+ *
+ *---------------------------------------------------------------------------
+ */
+herr_t
+H5Otoken_to_str(hid_t loc_id, const H5O_token_t *token, char **token_str)
+{
+    H5VL_object_t *vol_obj;             /* VOL object for ID */
+    H5I_type_t vol_obj_type;            /* VOL object's type */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE3("e", "i*k**s", loc_id, token, token_str);
+
+    /* Get the location object */
+    if(NULL == (vol_obj = H5VL_vol_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+    if(NULL == token)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid token pointer")
+    if(NULL == token_str)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid token string pointer")
+
+    /* Get object type */
+    if((vol_obj_type = H5I_get_type(loc_id)) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't get underlying VOL object type")
+
+    /* Serialize the token */
+    if(H5VL_token_to_str(vol_obj, vol_obj_type, token, token_str) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_CANTSERIALIZE, FAIL, "object token serialization failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Otoken_to_str() */
+
+
+/*---------------------------------------------------------------------------
+ * Function:    H5Otoken_from_str
+ *
+ * Purpose:     Deserialize a string into a connector object token
+ *
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
+ *
+ *---------------------------------------------------------------------------
+ */
+herr_t
+H5Otoken_from_str(hid_t loc_id, const char *token_str, H5O_token_t *token)
+{
+    H5VL_object_t *vol_obj;             /* VOL object for ID */
+    H5I_type_t vol_obj_type;            /* VOL object's type */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE3("e", "i*s*k", loc_id, token_str, token);
+
+    /* Get the location object */
+    if(NULL == (vol_obj = H5VL_vol_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+    if(NULL == token)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid token pointer")
+    if(NULL == token_str)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid token string pointer")
+
+    /* Get object type */
+    if((vol_obj_type = H5I_get_type(loc_id)) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't get underlying VOL object type")
+
+    /* Deserialize the token */
+    if(H5VL_token_from_str(vol_obj, vol_obj_type, token_str, token) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_CANTUNSERIALIZE, FAIL, "object token deserialization failed")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* end H5Otoken_from_str() */
+