[svn-r25537] VOL framework changes.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 0f840e0..efc443d 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -174,7 +174,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
 
     /* commit the datatype through the VOL */
     if (NULL == (dt = H5VL_datatype_commit(obj, loc_params, vol_plugin, name, type_id, lcpl_id, 
-                                           tcpl_id, tapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
+                                           tcpl_id, tapl_id, H5AC_dxpl_id, H5_REQUEST_NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
     /* attach the vol object created using the commit call to the 
@@ -337,7 +337,7 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id)
 
     /* commite the datatype through the VOL */
     if (NULL == (dt = H5VL_datatype_commit(obj, loc_params, vol_plugin, NULL, type_id, H5P_DEFAULT, 
-                                           tcpl_id, tapl_id, H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
+                                           tcpl_id, tapl_id, H5AC_dxpl_id, H5_REQUEST_NULL)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
     /* set the committed type object to the VOL pluging pointer in the H5T_t struct */
@@ -621,7 +621,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
 
     /* Create the datatype through the VOL */
     if(NULL == (dt = H5VL_datatype_open(obj, loc_params, vol_plugin, name, tapl_id, 
-                                        H5AC_dxpl_id, H5_EVENT_STACK_NULL)))
+                                        H5AC_dxpl_id, H5_REQUEST_NULL)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open datatype")
 
     /* Get an atom for the datatype */
@@ -630,7 +630,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
 
 done:
     if (ret_value < 0 && dt)
-        if(H5VL_datatype_close (dt, vol_plugin, H5AC_dxpl_id, H5_EVENT_STACK_NULL) < 0)
+        if(H5VL_datatype_close (dt, vol_plugin, H5AC_dxpl_id, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release dataset")
     FUNC_LEAVE_API(ret_value)
 } /* end H5Topen2() */
@@ -695,7 +695,7 @@ H5Tget_create_plist(hid_t dtype_id)
 
         /* get the rest of the plist through the VOL */
         if(H5VL_datatype_get(type, vol_plugin, H5VL_DATATYPE_GET_TCPL, 
-                             H5AC_dxpl_id, H5_EVENT_STACK_NULL, &ret_value) < 0)
+                             H5AC_ind_dxpl_id, H5_REQUEST_NULL, &ret_value) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get datatype")
     } /* end if */
 
@@ -959,18 +959,18 @@ H5VL_create_datatype(void *dt_obj, H5VL_t *vol_plugin, hbool_t app_ref)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* get required buf size for encoding the datatype */
-    if((nalloc = H5VL_datatype_get_binary(dt_obj, vol_plugin, NULL, 0, 
-                                          H5AC_dxpl_id, H5_EVENT_STACK_NULL)) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get datatype size")
+    if(H5VL_datatype_get(dt_obj, vol_plugin, H5VL_DATATYPE_GET_BINARY, 
+                         H5AC_dxpl_id, H5_REQUEST_NULL, &nalloc, NULL, 0) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get datatype serialized size")
 
     /* allocate buffer to store binary description of the datatype */
     if (NULL == (buf = (void *) H5MM_malloc ((size_t)nalloc)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't allocate space for datatype")
 
     /* get binary description of the datatype */
-    if((nalloc = H5VL_datatype_get_binary(dt_obj, vol_plugin, buf, (size_t) nalloc, 
-                                          H5AC_dxpl_id, H5_EVENT_STACK_NULL)) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get datatype size")
+    if(H5VL_datatype_get(dt_obj, vol_plugin, H5VL_DATATYPE_GET_BINARY, 
+                         H5AC_dxpl_id, H5_REQUEST_NULL, &nalloc, buf, (size_t)nalloc) < 0)
+        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get serialized datatype")
 
     if(NULL == (dt = H5T_decode(buf)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't decode datatype")
@@ -1011,7 +1011,7 @@ H5T_close_datatype(void *type, H5VL_t *vol_plugin)
 
     /* Close the datatype through the VOL*/
     if (NULL != dt->vol_obj)
-        if((ret_value = H5VL_datatype_close(dt->vol_obj, vol_plugin, H5AC_dxpl_id, H5_EVENT_STACK_NULL)) < 0)
+        if((ret_value = H5VL_datatype_close(dt->vol_obj, vol_plugin, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CLOSEERROR, FAIL, "unable to close datatype")
 
 done: