summaryrefslogtreecommitdiffstats
path: root/src/H5Fsplit.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-04-26 13:33:38 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-04-26 13:33:38 (GMT)
commite987b73f58ecea72d034ae39a70ad5d5c3bec9ab (patch)
tree49d8cd6b0bb10d435d1836bc974fe28f34929e34 /src/H5Fsplit.c
parent53da2a393f542b046faccba5171689f6f34d89cf (diff)
downloadhdf5-e987b73f58ecea72d034ae39a70ad5d5c3bec9ab.zip
hdf5-e987b73f58ecea72d034ae39a70ad5d5c3bec9ab.tar.gz
hdf5-e987b73f58ecea72d034ae39a70ad5d5c3bec9ab.tar.bz2
[svn-r1216] Changes since 19990423
---------------------- ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5Farray.c ./src/H5Fcore.c ./src/H5Ffamily.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5Fmpio.c ./src/H5Fprivate.h ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c Changed H5F_block_read/write() to take a file transfer property list instead of just a parallel I/O mode. This will allow us to pass additional parameters to the I/O functions without having so many arguments to worry about. This fixes a bug I introduced last Friday for parallel HDF5 ./src/H5B.c Fixed decoding of B-tree keys when iterating through the leaves of the B-tree. This fixes a bug for applications that are adding new entries to groups and also listing the groups.
Diffstat (limited to 'src/H5Fsplit.c')
-rw-r--r--src/H5Fsplit.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/H5Fsplit.c b/src/H5Fsplit.c
index e719129..13dcc06 100644
--- a/src/H5Fsplit.c
+++ b/src/H5Fsplit.c
@@ -33,11 +33,10 @@ static H5F_low_t *H5F_split_open(const char *name,
H5F_search_t *key/*out*/);
static herr_t H5F_split_close(H5F_low_t *lf, const H5F_access_t *access_parms);
static herr_t H5F_split_read(H5F_low_t *lf, const H5F_access_t *access_parms,
- const H5D_transfer_t xfer_mode,
- const haddr_t *addr, size_t size,
- uint8_t *buf/*out*/);
+ const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+ size_t size, uint8_t *buf/*out*/);
static herr_t H5F_split_write(H5F_low_t *lf, const H5F_access_t *access_parms,
- const H5D_transfer_t xfer_mode,
+ const H5F_xfer_t *xfer_parms,
const haddr_t *addr, size_t size,
const uint8_t *buf);
static herr_t H5F_split_flush(H5F_low_t *lf, const H5F_access_t *access_parms);
@@ -212,8 +211,8 @@ H5F_split_close(H5F_low_t *lf, const H5F_access_t *access_parms)
*/
static herr_t
H5F_split_read(H5F_low_t *lf, const H5F_access_t *access_parms,
- const H5D_transfer_t xfer_mode,
- const haddr_t *addr, size_t size, uint8_t *buf/*out*/)
+ const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+ size_t size, uint8_t *buf/*out*/)
{
haddr_t tmp_addr;
H5F_low_t *sub = NULL;
@@ -225,7 +224,8 @@ H5F_split_read(H5F_low_t *lf, const H5F_access_t *access_parms,
assert(lf);
assert(addr && H5F_addr_defined(addr));
assert(buf);
- assert(xfer_mode != H5D_XFER_COLLECTIVE); /* no collective support */
+ /* no collective support */
+ assert(xfer_parms->xfer_mode != H5D_XFER_COLLECTIVE);
/* Which file to we actually read from? */
if (addr->offset & lf->u.split.mask) {
@@ -239,7 +239,8 @@ H5F_split_read(H5F_low_t *lf, const H5F_access_t *access_parms,
}
/* Read the data */
- status = H5F_low_read(sub, sub_parms, xfer_mode, &tmp_addr, size, buf/*out*/);
+ status = H5F_low_read(sub, sub_parms, xfer_parms, &tmp_addr, size,
+ buf/*out*/);
FUNC_LEAVE(status);
}
@@ -262,8 +263,8 @@ H5F_split_read(H5F_low_t *lf, const H5F_access_t *access_parms,
*/
static herr_t
H5F_split_write(H5F_low_t *lf, const H5F_access_t *access_parms,
- const H5D_transfer_t xfer_mode,
- const haddr_t *addr, size_t size, const uint8_t *buf)
+ const H5F_xfer_t *xfer_parms, const haddr_t *addr,
+ size_t size, const uint8_t *buf)
{
haddr_t tmp_addr;
H5F_low_t *sub = NULL;
@@ -275,7 +276,8 @@ H5F_split_write(H5F_low_t *lf, const H5F_access_t *access_parms,
assert(lf);
assert(addr && H5F_addr_defined(addr));
assert(buf);
- assert(xfer_mode != H5D_XFER_COLLECTIVE); /* no collective support */
+ /* no collective support */
+ assert(xfer_parms->xfer_mode != H5D_XFER_COLLECTIVE);
/* Which file to we actually write to? */
if (addr->offset & lf->u.split.mask) {
@@ -289,7 +291,7 @@ H5F_split_write(H5F_low_t *lf, const H5F_access_t *access_parms,
}
/* Write the data */
- status = H5F_low_write(sub, sub_parms, xfer_mode, &tmp_addr, size, buf);
+ status = H5F_low_write(sub, sub_parms, xfer_parms, &tmp_addr, size, buf);
FUNC_LEAVE(status);
}