[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().

1 files changed, 9 insertions, 19 deletions

diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index fade4b4..cf23fc6 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -109,28 +109,18 @@ extern const H5O_class_t H5O_DTYPE[1];
 /* operates on an H5T_t struct */
 
 /*
- * Contiguous Data Storage Message.
+ * Data Layout Message
  */
-#define H5O_CSTORE_ID		0x0005
-extern const H5O_class_t H5O_CSTORE[1];
+#define H5O_LAYOUT_ID		0x0008
+#define H5O_LAYOUT_NDIMS	32
+extern const H5O_class_t H5O_LAYOUT[1];
 
-typedef struct H5O_cstore_t {
-   haddr_t	addr;
-   size_t	size;
-} H5O_cstore_t;
-
-/*
- * Indexed Data Storage Message.
- */
-#define H5O_ISTORE_ID		0x0008
-#define H5O_ISTORE_NDIMS	32
-extern const H5O_class_t H5O_ISTORE[1];
-
-typedef struct H5O_istore_t {
-   haddr_t	btree_addr;		/*file address of B-tree	*/
+typedef struct H5O_layout_t {
+   int		type;			/*type of layout, H5D_layout_t	*/
+   haddr_t	addr;			/*file address of data or B-tree*/
    uintn	ndims;			/*num dimensions in stored data	*/
-   size_t	alignment[H5O_ISTORE_NDIMS];	/*algn in logical space	*/
-} H5O_istore_t;
+   size_t	dim[H5O_LAYOUT_NDIMS];	/*size of data or chunk		*/
+} H5O_layout_t;
 
 /*
  * External File List Message