[svn-r24749] ad _ff to prefetch & evict routines.

3 files changed, 40 insertions, 40 deletions

diff --git a/src/H5FF.c b/src/H5FF.c
index 13e8573..a4a99e8 100644
--- a/src/H5FF.c
+++ b/src/H5FF.c
@@ -4049,7 +4049,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Dprefetch
+ * Function:	H5Dprefetch_ff
  *
  * Purpose:	Prefetched a Dataset from Central Storage to Burst Buffer.
  *
@@ -4060,7 +4060,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Dprefetch(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
+H5_DLL herr_t H5Dprefetch_ff(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
                           hid_t dapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
@@ -4107,11 +4107,11 @@ H5_DLL herr_t H5Dprefetch(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Dprefetch() */
+} /* end H5Dprefetch_ff() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Devict
+ * Function:	H5Devict_ff
  *
  * Purpose:	Evicts a Dataset from Burst Buffer.
  *
@@ -4122,7 +4122,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Devict(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t estack_id)
+H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -4168,11 +4168,11 @@ H5_DLL herr_t H5Devict(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t e
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Devict() */
+} /* end H5Devict_ff() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Gprefetch
+ * Function:	H5Gprefetch_ff
  *
  * Purpose:	Prefetched a Group from Central Storage to Burst Buffer.
  *
@@ -4183,7 +4183,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Gprefetch(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
+H5_DLL herr_t H5Gprefetch_ff(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
                           hid_t gapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
@@ -4230,11 +4230,11 @@ H5_DLL herr_t H5Gprefetch(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Gprefetch() */
+} /* end H5Gprefetch_ff() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Gevict
+ * Function:	H5Gevict_ff
  *
  * Purpose:	Evicts a Group from Burst Buffer.
  *
@@ -4245,7 +4245,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Gevict(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t estack_id)
+H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -4291,11 +4291,11 @@ H5_DLL herr_t H5Gevict(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t es
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Gevict() */
+} /* end H5Gevict_ff() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Tprefetch
+ * Function:	H5Tprefetch_ff
  *
  * Purpose:	Prefetched a Datatype from Central Storage to Burst Buffer.
  *
@@ -4306,7 +4306,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Tprefetch(hid_t dtype_id, hid_t rcxt_id, hrpl_t *replica_id,
+H5_DLL herr_t H5Tprefetch_ff(hid_t dtype_id, hid_t rcxt_id, hrpl_t *replica_id,
                           hid_t tapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
@@ -4366,11 +4366,11 @@ H5_DLL herr_t H5Tprefetch(hid_t dtype_id, hid_t rcxt_id, hrpl_t *replica_id,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Tprefetch() */
+} /* end H5Tprefetch_ff() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Tevict
+ * Function:	H5Tevict_ff
  *
  * Purpose:	Evicts a Datatype from Burst Buffer.
  *
@@ -4381,7 +4381,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Tevict(hid_t dtype_id, uint64_t c_version, hid_t tapl_id, hid_t estack_id)
+H5_DLL herr_t H5Tevict_ff(hid_t dtype_id, uint64_t c_version, hid_t tapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;  /* pointer to plugin generate requests (Stays NULL if plugin does not support async */
@@ -4440,6 +4440,6 @@ H5_DLL herr_t H5Tevict(hid_t dtype_id, uint64_t c_version, hid_t tapl_id, hid_t
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Tevict() */
+} /* end H5Tevict_ff() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5FFpublic.h b/src/H5FFpublic.h
index 083409d..49ce425 100644
--- a/src/H5FFpublic.h
+++ b/src/H5FFpublic.h
@@ -178,24 +178,24 @@ H5_DLL herr_t H5Oget_info_by_name_ff(hid_t loc_id, const char *object_name,
 H5_DLL herr_t H5Oclose_ff(hid_t object_id, hid_t estack_id);
 
 #if 0
-H5_DLL herr_t H5Aprefetch(hid_t attr_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t aapl_id, hid_t estack_id);
-H5_DLL herr_t H5Aevict(hid_t attr_id, uint64_t c_version, hid_t aapl_id, hid_t estack_id);
+H5_DLL herr_t H5Aprefetch_ff(hid_t attr_id, hid_t rcxt_id, hrpl_t *replica_id,
+                             hid_t aapl_id, hid_t estack_id);
+H5_DLL herr_t H5Aevict_ff(hid_t attr_id, uint64_t c_version, hid_t aapl_id, hid_t estack_id);
 #endif
 
-H5_DLL herr_t H5Gprefetch(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t gapl_id, hid_t estack_id);
-H5_DLL herr_t H5Tprefetch(hid_t type_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t tapl_id, hid_t estack_id);
-H5_DLL herr_t H5Dprefetch(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t dapl_id, hid_t estack_id);
-H5_DLL herr_t H5Mprefetch(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
-                          hid_t mapl_id, hid_t estack_id);
-
-H5_DLL herr_t H5Devict(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t estack_id);
-H5_DLL herr_t H5Mevict(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t estack_id);
-H5_DLL herr_t H5Gevict(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t estack_id);
-H5_DLL herr_t H5Tevict(hid_t type_id, uint64_t c_version, hid_t tapl_id, hid_t estack_id);
+H5_DLL herr_t H5Gprefetch_ff(hid_t grp_id, hid_t rcxt_id, hrpl_t *replica_id,
+                             hid_t gapl_id, hid_t estack_id);
+H5_DLL herr_t H5Tprefetch_ff(hid_t type_id, hid_t rcxt_id, hrpl_t *replica_id,
+                             hid_t tapl_id, hid_t estack_id);
+H5_DLL herr_t H5Dprefetch_ff(hid_t dset_id, hid_t rcxt_id, hrpl_t *replica_id,
+                             hid_t dapl_id, hid_t estack_id);
+H5_DLL herr_t H5Mprefetch_ff(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
+                             hid_t mapl_id, hid_t estack_id);
+
+H5_DLL herr_t H5Devict_ff(hid_t dset_id, uint64_t c_version, hid_t dapl_id, hid_t estack_id);
+H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t estack_id);
+H5_DLL herr_t H5Gevict_ff(hid_t grp_id, uint64_t c_version, hid_t gapl_id, hid_t estack_id);
+H5_DLL herr_t H5Tevict_ff(hid_t type_id, uint64_t c_version, hid_t tapl_id, hid_t estack_id);
 
 /* New Routines for Dynamic Data Structures Use Case (ACG) */
 H5_DLL herr_t H5DOappend(hid_t dataset_id, hid_t dxpl_id, unsigned axis, size_t extension, 
diff --git a/src/H5M.c b/src/H5M.c
index 70f2d6c..69ac7cf 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -949,7 +949,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Mprefetch
+ * Function:	H5Mprefetch_ff
  *
  * Purpose:	Prefetched a Map from Central Storage to Burst Buffer.
  *
@@ -960,7 +960,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Mprefetch(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
+H5_DLL herr_t H5Mprefetch_ff(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
                           hid_t mapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
@@ -1007,11 +1007,11 @@ H5_DLL herr_t H5Mprefetch(hid_t map_id, hid_t rcxt_id, hrpl_t *replica_id,
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Mprefetch() */
+} /* end H5Mprefetch_ff() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Mevict
+ * Function:	H5Mevict_ff
  *
  * Purpose:	Evicts a Map from Burst Buffer.
  *
@@ -1022,7 +1022,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-H5_DLL herr_t H5Mevict(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t estack_id)
+H5_DLL herr_t H5Mevict_ff(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t estack_id)
 {
     H5_priv_request_t  *request = NULL; /* private request struct inserted in event queue */
     void    **req = NULL;       /* pointer to plugin generated request pointer */
@@ -1068,6 +1068,6 @@ H5_DLL herr_t H5Mevict(hid_t map_id, uint64_t c_version, hid_t mapl_id, hid_t es
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Mevict() */
+} /* end H5Mevict_ff() */
 
 #endif /* H5_HAVE_EFF */