summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2014-02-28 14:32:49 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2014-02-28 14:32:49 (GMT)
commit1521d020e11e4fbf761528569d0776a196f221f5 (patch)
tree1a2072d03ee42b1ed2e1ba34ba1faf9a81fb60b5
parent33ba70ccb9f17fe048348cbe1893a868bd72cfb5 (diff)
downloadhdf5-1521d020e11e4fbf761528569d0776a196f221f5.zip
hdf5-1521d020e11e4fbf761528569d0776a196f221f5.tar.gz
hdf5-1521d020e11e4fbf761528569d0776a196f221f5.tar.bz2
[svn-r24750] rename plist routine to set replica tag for eviction.
-rw-r--r--src/H5VLiod.c14
-rw-r--r--src/H5VLiod.h4
-rw-r--r--src/H5VLiod_common.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/H5VLiod.c b/src/H5VLiod.c
index fa8f843..8eea4b2 100644
--- a/src/H5VLiod.c
+++ b/src/H5VLiod.c
@@ -1058,7 +1058,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5Pset_lapl_replica_id
+ * Function: H5Pset_evict_replica
*
* Purpose: Set the replica ID to be used when accessing an object
* using this access plist.
@@ -1071,7 +1071,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pset_lapl_replica_id(hid_t lapl_id, hrpl_t replica_id)
+H5Pset_evict_replica(hid_t lapl_id, hrpl_t replica_id)
{
H5P_genplist_t *plist = NULL; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
@@ -1092,11 +1092,11 @@ H5Pset_lapl_replica_id(hid_t lapl_id, hrpl_t replica_id)
done:
FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_lapl_replica_id() */
+} /* end H5Pset_evict_replica() */
/*-------------------------------------------------------------------------
- * Function: H5Pget_lapl_replica_id
+ * Function: H5Pget_evict_replica
*
* Purpose: Retrieve the replica ID from this access plist.
*
@@ -1108,7 +1108,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Pget_lapl_replica_id(hid_t lapl_id, hrpl_t *replica_id/*out*/)
+H5Pget_evict_replica(hid_t lapl_id, hrpl_t *replica_id/*out*/)
{
H5P_genplist_t *plist = NULL; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
@@ -1126,7 +1126,7 @@ H5Pget_lapl_replica_id(hid_t lapl_id, hrpl_t *replica_id/*out*/)
done:
FUNC_LEAVE_API(ret_value)
-} /* end H5Pget_lapl_replica_id() */
+} /* end H5Pget_evict_replica() */
/*-------------------------------------------------------------------------
@@ -9636,7 +9636,7 @@ H5VL_iod_evict(void *_obj, uint64_t c_version, hid_t apl_id, void **req)
input.coh = obj->file->remote_file.coh;
input.rcxt_num = c_version;
input.cs_scope = obj->file->md_integrity_scope;
- input.apl_id = apl_id;
+ //input.apl_id = apl_id;
switch(obj->obj_type) {
case H5I_DATASET:
diff --git a/src/H5VLiod.h b/src/H5VLiod.h
index c29d234..e2d03a7 100644
--- a/src/H5VLiod.h
+++ b/src/H5VLiod.h
@@ -57,8 +57,8 @@ H5_DLL herr_t EFF_start_server(MPI_Comm comm, MPI_Info info);
H5_DLL herr_t EFF_init(MPI_Comm comm, MPI_Info info);
H5_DLL herr_t EFF_finalize(void);
-H5_DLL herr_t H5Pset_lapl_replica_id(hid_t lapl_id, hrpl_t replica_id);
-H5_DLL herr_t H5Pget_lapl_replica_id(hid_t lapl_id, hrpl_t *replica_id);
+H5_DLL herr_t H5Pset_evict_replica(hid_t lapl_id, hrpl_t replica_id);
+H5_DLL herr_t H5Pget_evict_replica(hid_t lapl_id, hrpl_t *replica_id);
H5_DLL herr_t H5Pset_ocpl_enable_checksum(hid_t ocpl_id, hbool_t flag);
H5_DLL herr_t H5Pget_ocpl_enable_checksum(hid_t ocpl_id, hbool_t *flag);
H5_DLL herr_t H5Pset_dxpl_checksum(hid_t dxpl_id, uint64_t value);
diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h
index b1118a6..36e13ac 100644
--- a/src/H5VLiod_common.h
+++ b/src/H5VLiod_common.h
@@ -741,7 +741,7 @@ MERCURY_GEN_PROC(evict_in_t,
((uint32_t)(cs_scope))
((uint64_t)(rcxt_num))
((hrpl_t)(replica_id))
- ((hid_t)(apl_id))
+ //((hid_t)(apl_id))
((int32_t)(obj_type))
((iod_handles_t)(iod_oh))
((iod_obj_id_t)(iod_id)))