diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-02-19 18:19:48 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-02-19 18:19:48 (GMT) |
commit | b24130dcf051e6f569612c0a9b13d2168c6213c0 (patch) | |
tree | 607e5fc4db5da70f6584c9567f28ef9b88faeae1 /src/H5Flow.c | |
parent | 5b8d25d3c6db32d04213978500dca99dd1794d77 (diff) | |
download | hdf5-b24130dcf051e6f569612c0a9b13d2168c6213c0.zip hdf5-b24130dcf051e6f569612c0a9b13d2168c6213c0.tar.gz hdf5-b24130dcf051e6f569612c0a9b13d2168c6213c0.tar.bz2 |
[svn-r290] Changes since 19980206
----------------------
./configure.in
./src/H5Fprivate.h
./src/H5Fsec2.c
We now detect and use lseek64() on systems that have it (e.g.,
Irix64) and are able to generate >2GB files on Irix XFS file
systems (and anything else that supports large files). This
change also removed some warning messages from the Irix `-64'
compiler.
> $ ls -l istore.h5
> -rw-r--r-- 1 matzke meshtv 8605436856 Feb 17 14:03 istore.h5
./configure.in
./src/H5Fprivate.h
./src/H5Fstdio.h
We now detect and use fseek64() on systems that have it (e.g.,
Irix64) and are able to generate >2GB files on Irix XFS file
systems (and anything else that supports large files). This
change also removed some warning messages from the Iris `-64'
compiler.
./src/H5E.c
./src/H5Epublic.h
Added the H5E_OVERFLOW error to signal file address overflow.
./src/H5Fpublic.h
./examples/h5_chunk_read.c
./examples/h5_compound.c
./examples/h5_extend_write.c
./examples/h5_group.c
./examples/h5_read.c
./examples/h5_write.c
./html/Datasets.html
./html/Files.html
./html/H5.api.html
./html/H5.intro.html
./html/H5.sample_code.html
./html/ph5example.c
./html/review1.html
./test/cmpd_dset.c
./test/dsets.c
./test/extend.c
./test/tfile.c
./test/th5p.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
./testpar/phdf5.c
Renamed file access constants to follow the naming scheme.
Also changed the base names a little to be more accurate as to
what they do. The old names H5ACC_WRITE and H5ACC_OVERWRITE
will temporarily work.
H5ACC_DEFAULT --> H5F_ACC_RDONLY for H5Fopen()
H5ACC_DEFAULT --> H5F_ACC_EXCL for H5Fcreate()
H5ACC_WRITE --> H5F_ACC_RDWR
H5ACC_OVERWRITE --> H5F_ACC_TRUNC
Albert or Kim: The H5ACC_INDEPENDENT and H5ACC_COLLECTIVE
macros in H5Fpublic.h should be an enum typedef and have names
more like H5F_MPIO_INDEPENDENT and H5F_MPIO_COLLECTIVE. Also
change the access_mode argument of H5Cset_mpio().
H5Fcreate() and H5Fopen() are more strict now about which
flags are acceptable for the operation.
./src/H5Fprivate.h
./src/H5F.c
./src/H5C.c
Changed the file access template to make it more general. A
union contains a struct for each type of low-level driver and
the default template is initialized at run-time.
./src/H5Fpublic.h
./src/H5F.c
Added H5Fget_access_template() and cleaned up
H5Fget_create_template().
./src/H5C.c
The H5Cset_mpi() no longer trashes the file access template
when an error is detected. We check for errors and *then*
update the file access template.
Added H5C_close() so Albert and Kim have a place to release
the MPI communicator and info from the file access property
list.
Kim or Albert: I notice in H5Cset_mpi() you copy the MPI
communicator. Do you need to do something similar in
H5C_copy()?
./src/H5F.c
Added more error checking for the file creation and access
property lists because it used to be possible to make the
library dump core by swapping the creation and access property
list ID numbers of H5Fcreate().
./test/istore.c
./test/tfile.c
./test/th5p.c
./test/theap.c
./test/tohdr.c
./test/tstab.c
./testpar/testphdf5.c
One must pass H5C_DEFAULT as the file creation or access
property list in order to get the default property list. It
is no longer possible to pass zero or any other arbitrary bad
object ID.
./src/H5Fcore.c
./src/H5Ffamly.c
./src/H5Flow.c
./src/H5Fmpio.c
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5MF.c
The file access property list is passed to all H5F_low_...()
functions and to the drivers.
./src/H5Fcore.c
The block size can be set at run time on a per-file basis
instead of at compile time across all files. The "5000 items in
a group test" now takes 1.6 seconds.
./src/H5private.h
Removed inclusion of mpi.h and mpio.h since they're included
from H5public.h.
./src/H5Cpublic.h
./src/H5C.c
Added H5Cset_stdio(), H5Cset_sec2(), H5Cset_core(),
H5Cset_split(), and H5Cset_family() in addition to the
H5Cset_mpio() that Kim and Albert already wrote. We still
need the H5Cget_driver() and an H5Cget...() counterpart for
each of those functions. The split and family drivers still
need a little work but I'm checking this in anyway.
Diffstat (limited to 'src/H5Flow.c')
-rw-r--r-- | src/H5Flow.c | 110 |
1 files changed, 88 insertions, 22 deletions
diff --git a/src/H5Flow.c b/src/H5Flow.c index edafc1f..6455571 100644 --- a/src/H5Flow.c +++ b/src/H5Flow.c @@ -23,6 +23,67 @@ #define PABLO_MASK H5F_low static hbool_t interface_initialize_g = FALSE; #define INTERFACE_INIT NULL + + +/*------------------------------------------------------------------------- + * Function: H5F_low_class + * + * Purpose: Given a driver identifier return the class pointer for that + * low-level driver. + * + * Return: Success: A low-level driver class pointer. + * + * Failure: NULL + * + * Programmer: Robb Matzke + * Wednesday, February 18, 1998 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +const H5F_low_class_t * +H5F_low_class (H5F_driver_t driver) +{ + const H5F_low_class_t *type = NULL; + + FUNC_ENTER (H5F_low_class, NULL); + + switch (driver) { + case H5F_LOW_STDIO: + type = H5F_LOW_STDIO_g; + break; + + case H5F_LOW_SEC2: + type = H5F_LOW_SEC2_g; + break; + + case H5F_LOW_CORE: + type = H5F_LOW_CORE_g; + break; + +#ifdef HAVE_PARALLEL + case H5F_LOW_MPIO: + type = H5F_LOW_MPIO_g; + break; +#endif + + case H5F_LOW_SPLIT: + type = H5F_LOW_SPLIT_g; + break; + + case H5F_LOW_FAMILY: + type = H5F_LOW_FAMILY_g; + break; + + default: + HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, NULL, + "unknown low-level driver"); + } + + FUNC_LEAVE (type); +} + /*------------------------------------------------------------------------- * Function: H5F_low_open @@ -67,9 +128,10 @@ static hbool_t interface_initialize_g = FALSE; * *------------------------------------------------------------------------- */ -H5F_low_t * -H5F_low_open(const H5F_low_class_t *type, const char *name, uintn flags, - H5F_search_t *key /*out */ ) +H5F_low_t * +H5F_low_open(const H5F_low_class_t *type, const char *name, + const H5F_access_t *access_parms, uintn flags, + H5F_search_t *key/*out*/) { H5F_low_t *lf = NULL; @@ -78,7 +140,7 @@ H5F_low_open(const H5F_low_class_t *type, const char *name, uintn flags, assert(type && type->open); assert(name && *name); - if (NULL == (lf = (type->open) (name, flags, key))) { + if (NULL == (lf = (type->open) (name, access_parms, flags, key))) { HRETURN_ERROR(H5E_IO, H5E_CANTOPENFILE, NULL, "open failed"); } lf->type = type; @@ -114,13 +176,13 @@ H5F_low_open(const H5F_low_class_t *type, const char *name, uintn flags, * *------------------------------------------------------------------------- */ -H5F_low_t * -H5F_low_close(H5F_low_t *lf) +H5F_low_t * +H5F_low_close(H5F_low_t *lf, const H5F_access_t *access_parms) { FUNC_ENTER(H5F_low_close, NULL); if (lf) { - if ((lf->type->close) (lf) < 0) { + if ((lf->type->close) (lf, access_parms) < 0) { H5MM_xfree(lf); HRETURN_ERROR(H5E_IO, H5E_CLOSEERROR, NULL, "close failed"); } @@ -156,8 +218,8 @@ H5F_low_close(H5F_low_t *lf) *------------------------------------------------------------------------- */ herr_t -H5F_low_read(H5F_low_t *lf, const haddr_t *addr, size_t size, - uint8 *buf /*out */ ) +H5F_low_read(H5F_low_t *lf, const H5F_access_t *access_parms, + const haddr_t *addr, size_t size, uint8 *buf/*out*/) { herr_t ret_value = FAIL; @@ -168,7 +230,8 @@ H5F_low_read(H5F_low_t *lf, const haddr_t *addr, size_t size, assert(buf); if (lf->type->read) { - if ((ret_value = (lf->type->read) (lf, addr, size, buf)) < 0) { + if ((ret_value = (lf->type->read) (lf, access_parms, addr, size, + buf)) < 0) { HRETURN_ERROR(H5E_IO, H5E_READERROR, ret_value, "read failed"); } } else { @@ -204,8 +267,8 @@ H5F_low_read(H5F_low_t *lf, const haddr_t *addr, size_t size, *------------------------------------------------------------------------- */ herr_t -H5F_low_write(H5F_low_t *lf, const haddr_t *addr, size_t size, - const uint8 *buf) +H5F_low_write(H5F_low_t *lf, const H5F_access_t *access_parms, + const haddr_t *addr, size_t size, const uint8 *buf) { herr_t ret_value = FAIL; haddr_t tmp_addr; @@ -225,7 +288,8 @@ H5F_low_write(H5F_low_t *lf, const haddr_t *addr, size_t size, } /* Write the data */ if (lf->type->write) { - if ((ret_value = (lf->type->write) (lf, addr, size, buf)) < 0) { + if ((ret_value = (lf->type->write) (lf, access_parms, addr, size, + buf)) < 0) { HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, ret_value, "write failed"); } } else { @@ -260,7 +324,7 @@ H5F_low_write(H5F_low_t *lf, const haddr_t *addr, size_t size, *------------------------------------------------------------------------- */ herr_t -H5F_low_flush(H5F_low_t *lf) +H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms) { haddr_t last_byte; uint8 buf[1]; @@ -274,13 +338,13 @@ H5F_low_flush(H5F_low_t *lf) 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, &last_byte, 1, buf) >= 0) { - H5F_low_write(lf, &last_byte, 1, buf); + if (H5F_low_read(lf, access_parms, &last_byte, 1, buf) >= 0) { + H5F_low_write(lf, access_parms, &last_byte, 1, buf); } } /* Invoke the subclass the flush method */ if (lf->type->flush) { - if ((lf->type->flush) (lf) < 0) { + if ((lf->type->flush) (lf, access_parms) < 0) { HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low level flush failed"); } @@ -372,8 +436,9 @@ H5F_low_size(H5F_low_t *lf, haddr_t *eof /*out */ ) *------------------------------------------------------------------------- */ hbool_t -H5F_low_access(const H5F_low_class_t *type, const char *name, int mode, - H5F_search_t *key /*out */ ) +H5F_low_access(const H5F_low_class_t *type, const char *name, + const H5F_access_t *access_parms, int mode, + H5F_search_t *key/*out*/) { hbool_t ret_value; struct stat sb; @@ -382,7 +447,7 @@ H5F_low_access(const H5F_low_class_t *type, const char *name, int mode, assert(type); if (type->access) { - ret_value = (type->access) (name, mode, key /*out */ ); + ret_value = (type->access) (name, access_parms, mode, key /*out*/); } else { ret_value = (0 == access(name, mode) ? TRUE : FALSE); @@ -418,7 +483,8 @@ H5F_low_access(const H5F_low_class_t *type, const char *name, int mode, *------------------------------------------------------------------------- */ herr_t -H5F_low_extend(H5F_low_t *lf, intn op, size_t size, haddr_t *addr /*out */ ) +H5F_low_extend(H5F_low_t *lf, const H5F_access_t *access_parms, intn op, + size_t size, haddr_t *addr/*out*/) { FUNC_ENTER(H5F_low_alloc, FAIL); @@ -427,7 +493,7 @@ H5F_low_extend(H5F_low_t *lf, intn op, size_t size, haddr_t *addr /*out */ ) assert(addr); if (lf->type->extend) { - if ((lf->type->extend) (lf, op, size, addr /*out */ ) < 0) { + if ((lf->type->extend) (lf, access_parms, op, size, addr/*out*/) < 0) { HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to extend file"); } |