[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, 276 insertions, 0 deletions

diff --git a/src/H5Olayout.c b/src/H5Olayout.c
new file mode 100644
index 0000000..0d1ed2e
--- /dev/null
+++ b/src/H5Olayout.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 1997 NCSA
+ *                    All rights reserved.
+ *
+ * Programmer: 	Robb Matzke <matzke@llnl.gov>
+ *             	Wednesday, October  8, 1997
+ *
+ * Purpose:	Messages related to data layout.
+ */
+#include <H5private.h>
+#include <H5Dprivate.h>
+#include <H5Eprivate.h>
+#include <H5MMprivate.h>
+#include <H5Oprivate.h>
+
+/* PRIVATE PROTOTYPES */
+static void *H5O_layout_decode (H5F_t *f, size_t raw_size, const uint8 *p);
+static herr_t H5O_layout_encode (H5F_t *f, size_t size, uint8 *p,
+				 const void *_mesg);
+static void *H5O_layout_copy (const void *_mesg, void *_dest);
+static size_t H5O_layout_size (H5F_t *f, const void *_mesg);
+static herr_t H5O_layout_debug (H5F_t *f, const void *_mesg, FILE *stream,
+				intn indent, intn fwidth);
+
+/* This message derives from H5O */
+const H5O_class_t H5O_LAYOUT[1] = {{
+   H5O_LAYOUT_ID, 			/*message id number		*/
+   "layout", 				/*message name for debugging	*/
+   sizeof(H5O_layout_t), 		/*native message size		*/
+   H5O_layout_decode, 			/*decode message		*/
+   H5O_layout_encode, 			/*encode message		*/
+   H5O_layout_copy, 			/*copy the native value		*/
+   H5O_layout_size, 			/*size of message on disk	*/
+   NULL, 				/*reset method			*/
+   H5O_layout_debug, 			/*debug the message		*/
+}};
+
+/* Interface initialization */
+#define PABLO_MASK	H5O_layout_mask
+static hbool_t interface_initialize_g = FALSE;
+#define INTERFACE_INIT	NULL
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_layout_decode
+ *
+ * Purpose:	Decode an data layout message and return a pointer to a
+ *		new one created with malloc().
+ *
+ * Return:	Success:	Ptr to new message in native order.
+ *
+ *		Failure:	NULL
+ *
+ * Programmer:	Robb Matzke
+ *              Wednesday, October  8, 1997
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+H5O_layout_decode (H5F_t *f, size_t raw_size, const uint8 *p)
+{
+   H5O_layout_t *mesg = NULL;
+   intn		i;
+
+   FUNC_ENTER (H5O_layout_decode, NULL);
+
+   /* check args */
+   assert (f);
+   assert (p);
+
+   /* decode */
+   mesg = H5MM_xcalloc (1, sizeof(H5O_layout_t));
+   H5F_addr_decode (f, &p, &(mesg->addr));
+   mesg->ndims = *p++;
+   assert (raw_size == H5O_layout_size (f, mesg));
+
+   /* Layout class */
+   mesg->type = *p++;
+   assert (H5D_CONTIGUOUS==mesg->type || H5D_CHUNKED==mesg->type);
+
+   /* Reserved bytes */
+   p += 6;
+   
+   /* Read the size */
+   for (i=0; i<mesg->ndims; i++) {
+      UINT32DECODE (p, mesg->dim[i]);
+   }
+
+   FUNC_LEAVE (mesg);
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_layout_encode
+ *
+ * Purpose:	Encodes a message.
+ *
+ * Return:	Success:	SUCCEED
+ *
+ *		Failure:	FAIL
+ *
+ * Programmer:	Robb Matzke
+ *              Wednesday, October  8, 1997
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5O_layout_encode (H5F_t *f, size_t raw_size, uint8 *p, const void *_mesg)
+{
+   const H5O_layout_t	*mesg = (const H5O_layout_t *)_mesg;
+   int			i;
+
+   FUNC_ENTER (H5O_layout_encode, FAIL);
+
+   /* check args */
+   assert (f);
+   assert (mesg);
+   assert (mesg->ndims>0 && mesg->ndims<=H5O_LAYOUT_NDIMS);
+   assert (raw_size == H5O_layout_size (f, _mesg)); 
+   assert (p);
+
+   /* data or B-tree address */
+   H5F_addr_encode (f, &p, &(mesg->addr));
+
+   /* number of dimensions */
+   *p++ = mesg->ndims;
+
+   /* layout class */
+   *p++ = mesg->type;
+
+   /* reserved bytes should be zero */
+   for (i=0; i<6; i++) *p++ = 0;
+
+   /* dimension size */
+   for (i=0; i<mesg->ndims; i++) {
+      UINT32ENCODE (p, mesg->dim[i]);
+   }
+
+   FUNC_LEAVE (SUCCEED);
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_layout_copy
+ *
+ * Purpose:	Copies a message from _MESG to _DEST, allocating _DEST if
+ *		necessary.
+ *
+ * Return:	Success:	Ptr to _DEST
+ *
+ *		Failure:	NULL
+ *
+ * Programmer:	Robb Matzke
+ *              Wednesday, October  8, 1997
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static void *
+H5O_layout_copy (const void *_mesg, void *_dest)
+{
+   const H5O_layout_t	*mesg = (const H5O_layout_t *)_mesg;
+   H5O_layout_t		*dest = (H5O_layout_t *)_dest;
+
+   FUNC_ENTER (H5O_layout_copy, NULL);
+
+   /* check args */
+   assert (mesg);
+   if (!dest) dest = H5MM_xcalloc (1, sizeof(H5O_layout_t));
+
+   /* copy */
+   *dest = *mesg;
+
+   FUNC_LEAVE ((void*)dest);
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_layout_size
+ *
+ * Purpose:	Returns the size of the raw message in bytes not counting the
+ *		message type or size fields, but only the data fields.  This
+ *		function doesn't take into account message alignment.
+ *
+ * Return:	Success:	Message data size in bytes
+ *
+ *		Failure:	FAIL
+ *
+ * Programmer:	Robb Matzke
+ *              Wednesday, October  8, 1997
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static size_t
+H5O_layout_size (H5F_t *f, const void *_mesg)
+{
+   const H5O_layout_t 	*mesg = (const H5O_layout_t *)_mesg;
+   size_t		ret_value = FAIL;
+   
+   FUNC_ENTER (H5O_layout_size, FAIL);
+
+   /* check args */
+   assert (f);
+   assert (mesg);
+   assert (mesg->ndims>0 && mesg->ndims<=H5O_LAYOUT_NDIMS);
+
+   ret_value = H5F_SIZEOF_ADDR (f) +		/* B-tree address	*/
+               1 +				/* max dimension index	*/
+	       1 +				/* layout class number	*/
+               6 +				/* reserved bytes	*/
+               mesg->ndims * 4;			/* alignment		*/
+
+   FUNC_LEAVE (ret_value);
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5O_layout_debug
+ *
+ * Purpose:	Prints debugging info for a message.
+ *
+ * Return:	Success:	SUCCEED
+ *
+ *		Failure:	FAIL
+ *
+ * Programmer:	Robb Matzke
+ *              Wednesday, October  8, 1997
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5O_layout_debug (H5F_t *f, const void *_mesg, FILE *stream, intn indent,
+		  intn fwidth)
+{
+   const H5O_layout_t	*mesg = (const H5O_layout_t *)_mesg;
+   intn			i;
+
+   FUNC_ENTER (H5O_layout_debug, FAIL);
+
+   /* check args */
+   assert (f);
+   assert (mesg);
+   assert (stream);
+   assert (indent>=0);
+   assert (fwidth>=0);
+
+   fprintf (stream, "%*s%-*s ", indent, "", fwidth,
+	    H5D_CHUNKED==mesg->type?"B-tree address:":"Data address:");
+   H5F_addr_print (stream, &(mesg->addr));
+   fprintf (stream, "\n");
+   
+   fprintf (stream, "%*s%-*s %lu\n", indent, "", fwidth,
+	    "Number of dimensions:", 
+	    (unsigned long)(mesg->ndims));
+
+   /* Size */
+   fprintf (stream, "%*s%-*s {", indent, "", fwidth,
+	    "Size:");
+   for (i=0; i<mesg->ndims; i++) {
+      fprintf (stream, "%s%lu", i?", ":"",
+	       (unsigned long)(mesg->dim[i]));
+   }
+   fprintf (stream, "}\n");
+
+   FUNC_LEAVE (SUCCEED);
+}
+