summaryrefslogtreecommitdiffstats
path: root/src/H5Fprivate.h
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-01-16 19:52:04 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-01-16 19:52:04 (GMT)
commit74618e3670ed6c8db4c01dd30d1d7bba70447027 (patch)
tree7cb9ab8c0802eb8a46edc885dd8d6167a3c98d24 /src/H5Fprivate.h
parente59138031958a1ceb6105de0e1b222f85f2ac017 (diff)
downloadhdf5-74618e3670ed6c8db4c01dd30d1d7bba70447027.zip
hdf5-74618e3670ed6c8db4c01dd30d1d7bba70447027.tar.gz
hdf5-74618e3670ed6c8db4c01dd30d1d7bba70447027.tar.bz2
[svn-r155] Changes since 19980114
---------------------- ./html/Datasets.html Removed some archaic comments about data spaces. Fixed example code. ./MANIFEST ./html/H5.format.html ./src/H5O.c ./src/H5Oprivate.h ./src/H5Ocstore.c [DELETED] ./src/H5Oistore.c [DELETED] ./src/H5Olayout.c [NEW] ./src/Makefile.in ./test/istore.c Replaced H5O_CSTORE and H5O_ISTORE messages with a more general H5O_LAYOUT message. ./src/H5D.c ./src/H5Dprivate.h ./src/H5Dpublic.h A little more work on the pipeline. Access to the file data is through the new H5F_arr_read() and H5F_arr_write() which do I/O on hyperslabs of byte arrays and don't depend on data layout. This should simplify the I/O pipeline quite a bit. I also added another argument to H5Dread() and H5Dwrite() to describe the hyerslab of the file array on which I/O is occuring. We discussed this at last week's meeting. ./src/H5Farray.c [NEW] Added functions that sit on top of H5F_block_read() and H5F_istore_read() and implement a common set of functions between all layouts. This means I/O of hyperslabs of byte-arrays in the file to arrays of bytes in memory. When operating on arrays of elements (>1byte) then we just add another dimension. That is, a 10x20 array of int32 becomes a 10x20x4 array of bytes. [This is the area I'll be working on most of next week to implement partial I/O for contiguous data and to improve performance for chunked data.] ./src/H5Fistore.c ./src/H5Fprivate.h Replaced the H5F_istore_t data type with the layout message H5O_layout_t which looks almost the same. Eventually I'd like to rename `istore' to `chunked' everywhere and use `istore' for 1-d storage where the chunks are all different sizes like in the small object heap where each object is a chunk. ./src/H5V.c Changed ISTORE to LAYOUT in one place. ./test/dsets.c Fixed for extra argument to H5Dread() and H5Dwrite().
Diffstat (limited to 'src/H5Fprivate.h')
-rw-r--r--src/H5Fprivate.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 8ec0ab6..acf2e80 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -395,7 +395,7 @@ typedef struct H5F_t {
case 2: UINT16DECODE(p,l); break; \
}
-struct H5O_istore_t; /*forward decl for prototype arguments*/
+struct H5O_layout_t; /*forward decl for prototype arguments*/
/* library variables */
extern const H5F_create_t H5F_create_dflt;
@@ -408,13 +408,21 @@ herr_t H5F_close (H5F_t *f);
herr_t H5F_debug (H5F_t *f, const haddr_t *addr, FILE *stream, intn indent,
intn fwidth);
+/* Functions that operate on array storage */
+herr_t H5F_arr_create (H5F_t *f, struct H5O_layout_t *layout/*in,out*/);
+herr_t H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
+ const size_t offset[], const size_t size[],
+ void *buf/*out*/);
+herr_t H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout,
+ const size_t offset[], const size_t size[],
+ const void *buf);
+
/* Functions that operate on indexed storage */
-herr_t H5F_istore_create (H5F_t *f, struct H5O_istore_t *istore,
- uintn ndims, const size_t alignment[]);
-herr_t H5F_istore_read (H5F_t *f, const struct H5O_istore_t *mesg,
+herr_t H5F_istore_create (H5F_t *f, struct H5O_layout_t *layout/*in,out*/);
+herr_t H5F_istore_read (H5F_t *f, const struct H5O_layout_t *layout,
const size_t offset[], const size_t size[],
- void *buf);
-herr_t H5F_istore_write (H5F_t *f, const struct H5O_istore_t *mesg,
+ void *buf/*out*/);
+herr_t H5F_istore_write (H5F_t *f, const struct H5O_layout_t *layout,
const size_t offset[], const size_t size[],
const void *buf);