summaryrefslogtreecommitdiffstats
path: root/src/H5Flow.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/H5Flow.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/H5Flow.c')
-rw-r--r--src/H5Flow.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/H5Flow.c b/src/H5Flow.c
index 48c6168..caeb8a5 100644
--- a/src/H5Flow.c
+++ b/src/H5Flow.c
@@ -216,8 +216,8 @@ H5F_low_close(H5F_low_t *lf, const H5F_access_t *access_parms)
*/
herr_t
H5F_low_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*/)
{
herr_t ret_value = FAIL;
@@ -228,7 +228,7 @@ H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms,
assert(buf);
if (lf->type->read) {
- if ((ret_value = (lf->type->read) (lf, access_parms, xfer_mode,
+ if ((ret_value = (lf->type->read) (lf, access_parms, xfer_parms,
addr, size, buf)) < 0) {
HRETURN_ERROR(H5E_IO, H5E_READERROR, ret_value, "read failed");
}
@@ -271,8 +271,8 @@ H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms,
*/
herr_t
H5F_low_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)
{
herr_t ret_value = FAIL;
haddr_t tmp_addr;
@@ -320,7 +320,7 @@ H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms,
/* Write the data */
if (lf->type->write) {
- if ((ret_value = (lf->type->write) (lf, access_parms, xfer_mode,
+ if ((ret_value = (lf->type->write) (lf, access_parms, xfer_parms,
addr, size, buf)) < 0) {
HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, ret_value, "write failed");
}
@@ -372,12 +372,13 @@ H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms)
if (addr_defined(&(lf->eof)) && H5F_addr_gt(&(lf->eof), &last_byte)) {
last_byte = lf->eof;
last_byte.offset -= 1;
- if (H5F_low_read(lf, access_parms, H5D_XFER_DFLT, &last_byte,
+ if (H5F_low_read(lf, access_parms, &H5F_xfer_dflt, &last_byte,
1, buf) >= 0) {
#ifdef HAVE_PARALLEL
H5F_mpio_tas_allsame( lf, TRUE ); /* only p0 will write */
#endif /* HAVE_PARALLEL */
- H5F_low_write(lf, access_parms, H5D_XFER_DFLT, &last_byte, 1, buf);
+ H5F_low_write(lf, access_parms, &H5F_xfer_dflt, &last_byte,
+ 1, buf);
}
}
/* Invoke the subclass the flush method */