summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-09-28 13:56:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-09-28 13:56:22 (GMT)
commitefbadc2165e1a7a614615a0668badb9b859becdc (patch)
tree9e210635fc8ad267fedc39ff731baed3d4f8c249
parent4b13ea45720211e6b3cd01b793259fc21a41b6be (diff)
downloadhdf5-efbadc2165e1a7a614615a0668badb9b859becdc.zip
hdf5-efbadc2165e1a7a614615a0668badb9b859becdc.tar.gz
hdf5-efbadc2165e1a7a614615a0668badb9b859becdc.tar.bz2
[svn-r4488] Purpose:
Fix on Kludge Description: Forgot another chunk of parallel I/O code that needed to change for the generic property list kludge... :-/ Platforms tested: Parallel Linux 2.2.18smp (eirene)
-rw-r--r--src/H5FDmpio.c8
-rw-r--r--src/H5P.c5
-rw-r--r--src/H5Smpio.c2
3 files changed, 8 insertions, 7 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 15cc6b8..76a6662 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -341,7 +341,7 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
/* Check arguments */
if (H5I_GENPROP_LST != H5I_get_type(dxpl_id) ||
- TRUE!=H5Pisa_class(dxpl_id,H5P_DATASET_XFER_NEW))
+ TRUE!=H5Pisa_class(dxpl_id,H5P_DATASET_XFER))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
if (H5FD_MPIO_INDEPENDENT!=xfer_mode &&
H5FD_MPIO_COLLECTIVE!=xfer_mode)
@@ -385,7 +385,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
H5TRACE2("e","ix",dxpl_id,xfer_mode);
if (H5I_GENPROP_LST != H5I_get_type(dxpl_id) ||
- TRUE!=H5Pisa_class(dxpl_id,H5P_DATASET_XFER_NEW))
+ TRUE!=H5Pisa_class(dxpl_id,H5P_DATASET_XFER))
HRETURN_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
if (H5FD_MPIO!=H5P_get_driver(dxpl_id))
HRETURN_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver");
@@ -1086,7 +1086,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
assert(H5FD_MPIO==file->pub.driver_id);
/* Make certain we have the correct type of property list */
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER_NEW));
+ assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
/* some numeric conversions */
if (haddr_to_MPIOff(addr, &mpi_off/*out*/)<0)
@@ -1342,7 +1342,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t ad
assert(H5FD_MPIO==file->pub.driver_id);
/* Make certain we have the correct type of property list */
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER_NEW));
+ assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
/* some numeric conversions */
if (haddr_to_MPIOff(addr, &mpi_off)<0)
diff --git a/src/H5P.c b/src/H5P.c
index e1edc1b..2372cc7 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -334,7 +334,7 @@ H5Pcreate(hid_t type)
H5P_class_t_old old_type;
FUNC_ENTER(H5Pcreate, FAIL);
- H5TRACE1("i","p",type);
+ H5TRACE1("i","i",type);
/* Kludge to detect generic property creations and divert them to the */
/* generic property list creation routine - QAK */
@@ -559,7 +559,7 @@ H5Pget_class(hid_t plist_id)
hid_t ret_value = H5P_NO_CLASS;
FUNC_ENTER(H5Pget_class, H5P_NO_CLASS);
- H5TRACE1("p","i",plist_id);
+ H5TRACE1("i","i",plist_id);
ret_value = H5P_get_class(plist_id);
FUNC_LEAVE(ret_value);
@@ -7080,6 +7080,7 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name)
herr_t ret_value=SUCCEED; /* return value */
FUNC_ENTER (H5Pcopy_prop, FAIL);
+ H5TRACE3("e","iis",dst_id,src_id,name);
/* Check arguments. */
if ((H5I_GENPROP_LST != H5I_get_type(src_id) && H5I_GENPROP_CLS != H5I_get_type(src_id))
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 6968b47..9829744 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -578,7 +578,7 @@ H5S_mpio_spaces_xfer(H5F_t *f, const struct H5O_layout_t *layout,
assert (IS_H5FD_MPIO(f));
/* Make certain we have the correct type of property list */
assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id));
- assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER_NEW));
+ assert(TRUE==H5Pisa_class(dxpl_id,H5P_DATASET_XFER));
/* INCOMPLETE!!! rky 980816 */
/* Currently can only handle H5D_CONTIGUOUS layout */