diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 1998-04-17 14:52:41 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 1998-04-17 14:52:41 (GMT) |
| commit | d6923f46e0f0969aa0b73eb2c525dc8bf65e610c (patch) | |
| tree | 691107678c0856aac60da073885814f3a672a340 /src/H5Fmpio.c | |
| parent | 4d16aa5ab78589e0e09dcd3072a06b3681bf7d54 (diff) | |
| download | hdf5-d6923f46e0f0969aa0b73eb2c525dc8bf65e610c.zip hdf5-d6923f46e0f0969aa0b73eb2c525dc8bf65e610c.tar.gz hdf5-d6923f46e0f0969aa0b73eb2c525dc8bf65e610c.tar.bz2 | |
[svn-r351] Removed the access_mode argument from H5Pset_mpi which was later
used to open an HDF5 file with MPIO access. The design has changed
to provide access-mode controll (independent or collective access)
as an argument in the H5D read/write calls.
Also removed the macros H5FACC_INDEPENDENT and H5FACC_COLLECTIVE.
The original thinking was to define how a file is independent or
collective access. They are replaced by the enum H5D_transfer_t
with values of H5D_XFER_INDEPENDENT and H5D_XFER_COLLECTIVE.
These values are used in the H5Pset_xfer to setup a data transfer
property list to be used during the H5D read/write calls.
The original access_mode field in the File access structure is
still there. It would be removed soon once the transfer control
can be passed down to the low level I/O routines.
Diffstat (limited to 'src/H5Fmpio.c')
| -rw-r--r-- | src/H5Fmpio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c index 3eea2a5..0818dda 100644 --- a/src/H5Fmpio.c +++ b/src/H5Fmpio.c @@ -47,7 +47,7 @@ #include <H5private.h> #include <H5private.h> #include <H5Eprivate.h> -#include <H5Fprivate.h> +#include <H5Dprivate.h> #include <H5MMprivate.h> #include <sys/types.h> @@ -242,8 +242,8 @@ H5F_mpio_open(const char *name, const H5F_access_t *access_parms, uintn flags, #endif switch (access_parms->u.mpio.access_mode){ - case H5ACC_INDEPENDENT: - case H5ACC_COLLECTIVE: + case H5D_XFER_INDEPENDENT: + case H5D_XFER_COLLECTIVE: /*void*/ break; @@ -420,12 +420,12 @@ H5F_mpio_read(H5F_low_t *lf, const H5F_access_t *access_parms, /* Read the data. */ switch (access_parms->u.mpio.access_mode){ - case H5ACC_INDEPENDENT: + case H5D_XFER_INDEPENDENT: mpierr = MPI_File_read_at ( lf->u.mpio.f, mpi_off, (void*) buf, size_i, MPI_BYTE, &mpi_stat ); break; - case H5ACC_COLLECTIVE: + case H5D_XFER_COLLECTIVE: mpierr = MPI_File_read_at_all ( lf->u.mpio.f, mpi_off, (void*) buf, size_i, MPI_BYTE, &mpi_stat ); break; @@ -536,12 +536,12 @@ H5F_mpio_write(H5F_low_t *lf, const H5F_access_t *access_parms, /* Write the data. */ switch (access_parms->u.mpio.access_mode){ - case H5ACC_INDEPENDENT: + case H5D_XFER_INDEPENDENT: mpierr = MPI_File_write_at ( lf->u.mpio.f, mpi_off, (void*) buf, size_i, MPI_BYTE, &mpi_stat ); break; - case H5ACC_COLLECTIVE: + case H5D_XFER_COLLECTIVE: mpierr = MPI_File_write_at_all( lf->u.mpio.f, mpi_off, (void*) buf, size_i, MPI_BYTE, &mpi_stat ); break; |