diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-04-23 12:31:21 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-04-23 12:31:21 (GMT) |
commit | d534a4dd0d1e646c531a31a5eb04842dfde5f470 (patch) | |
tree | 47b946b229d929139cf0fcad389e790d6a382e70 /src/H5Fprivate.h | |
parent | 94dd2f5b3d93c2e14ef2491e70a09a836affdf4c (diff) | |
download | hdf5-d534a4dd0d1e646c531a31a5eb04842dfde5f470.zip hdf5-d534a4dd0d1e646c531a31a5eb04842dfde5f470.tar.gz hdf5-d534a4dd0d1e646c531a31a5eb04842dfde5f470.tar.bz2 |
[svn-r1204] Changes since 19990415
----------------------
./config/depend.in
Fixed automatic dependencies. We were storing dependencies for
*.o files instead of *.lo files after shared libraries were
added.
./config/gnu-flags
./config/linux-gnulibc1
Moved `-march=pentiumpro -mcpu=pentiumpro -malign-double' from
the linux file to this file and caused it to depend on the CPU
name. This fixes one of Elena's bugs.
./src/H5B.c
./src/H5Bprivate.h
./src/H5D.c
./src/H5Dprivate.h
./src/H5Dpublic.h
./src/H5F.c
./src/H5Farray.c
./src/H5Fistore.c
./src/H5Fmpio.c
./src/H5Fprivate.h
./src/H5Fpublic.h
./src/H5Gnode.c
./src/H5P.c
./src/H5RA.c
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Smpio.c
./src/H5Spoint.c
./src/H5Sprivate.h
./src/H5Tpublic.h
./test/istore.c
Added an H5Dget_storage_size() function that reports the
amount of storage allocated for raw data in a dataset.
Changed H5D_xfer_* to H5F_xfer_* because these properties are
more general than datasets. This also allows some of the
lower-level I/O functions to get this information easier.
./src/H5S.c
./src/H5Sall.c
Added two new functions H5S_all_read() and H5S_all_write()
which are optimizations that copy data directly between file
and memory without having to go through the scatter gather
step. This knocks quite a bit of time off the I/O and
reading/writing entire datasets is a fairly common operation.
./tools/h5ls.c
Reports the logical size of data, the allocated size of data,
and the percent utilization.
./MANIFEST
Removed old pablo files, added new files. Snapshots should now
start to work again.
./src/H5D.c
./src/H5Fmpio.c
Removed two warnings signed vs. unsigned comparisons and check
for overflow.
Diffstat (limited to 'src/H5Fprivate.h')
-rw-r--r-- | src/H5Fprivate.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 55048b3..0d46f07 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -512,6 +512,18 @@ typedef struct H5F_t { H5F_mtab_t mtab; /* File mount table */ } H5F_t; +/* Dataset transfer property list */ +typedef struct H5F_xfer_t { + size_t buf_size; /*max temp buffer size */ + void *tconv_buf; /*type conversion buffer or null */ + void *bkg_buf; /*background buffer or null */ + H5T_bkg_t need_bkg; /*type of background buffer needed */ + double split_ratios[3];/*B-tree node splitting ratios */ + uintn cache_hyper; /*cache hyperslab blocks during I/O? */ + uintn block_limit; /*largest hyperslab block to cache */ + H5D_transfer_t xfer_mode; /*independent or collective transfer */ +} H5F_xfer_t; + #ifdef NOT_YET #define H5F_ENCODE_OFFSET(f,p,o) (H5F_SIZEOF_ADDR(f)==4 ? UINT32ENCODE(p,o) \ : H5F_SIZEOF_ADDR(f)==8 ? UINT64ENCODE(p,o) \ @@ -556,13 +568,14 @@ typedef struct H5F_t { struct H5O_layout_t; struct H5O_efl_t; struct H5O_pline_t; -struct H5D_xfer_t; +struct H5F_xfer_t; struct H5O_fill_t; struct H5G_entry_t; /* library variables */ __DLLVAR__ const H5F_create_t H5F_create_dflt; __DLLVAR__ H5F_access_t H5F_access_dflt; +__DLLVAR__ const H5F_xfer_t H5F_xfer_dflt; __DLLVAR__ const H5F_mprop_t H5F_mount_dflt; #ifdef HAVE_PARALLEL @@ -588,7 +601,7 @@ __DLL__ herr_t H5F_mountpoint(struct H5G_entry_t *find/*in,out*/); /* Functions that operate on array storage */ __DLL__ herr_t H5F_arr_create(H5F_t *f, struct H5O_layout_t *layout /*in,out*/); -__DLL__ herr_t H5F_arr_read (H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_arr_read (H5F_t *f, const struct H5F_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, @@ -597,7 +610,7 @@ __DLL__ herr_t H5F_arr_read (H5F_t *f, const struct H5D_xfer_t *xfer, const hsize_t mem_size[], const hssize_t mem_offset[], const hssize_t file_offset[], void *_buf/*out*/); -__DLL__ herr_t H5F_arr_write (H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_arr_write (H5F_t *f, const struct H5F_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, @@ -611,16 +624,17 @@ __DLL__ herr_t H5F_arr_write (H5F_t *f, const struct H5D_xfer_t *xfer, __DLL__ herr_t H5F_istore_init (H5F_t *f); __DLL__ herr_t H5F_istore_flush (H5F_t *f, hbool_t preempt); __DLL__ herr_t H5F_istore_dest (H5F_t *f); +__DLL__ hsize_t H5F_istore_allocated(H5F_t *f, int ndims, haddr_t *addr); __DLL__ herr_t H5F_istore_stats (H5F_t *f, hbool_t headers); __DLL__ herr_t H5F_istore_create(H5F_t *f, struct H5O_layout_t *layout/*in,out*/); -__DLL__ herr_t H5F_istore_read(H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_istore_read(H5F_t *f, const struct H5F_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, const hssize_t offset[], const hsize_t size[], void *buf/*out*/); -__DLL__ herr_t H5F_istore_write(H5F_t *f, const struct H5D_xfer_t *xfer, +__DLL__ herr_t H5F_istore_write(H5F_t *f, const struct H5F_xfer_t *xfer, const struct H5O_layout_t *layout, const struct H5O_pline_t *pline, const struct H5O_fill_t *fill, |