[svn-r353] Changes since 19980414

----------------------

./html/Compression.html          [NEW]
./html/Datasets.html
./html/H5.format.html
./html/H5.user.html
        Documented compression.  A couple of the H5P functions aren't
        quite implemented yet but they're coming soon...

./src/H5Dprivate.h
./src/H5E.c
./src/H5Epublic.h
./src/H5Farray.c
./src/H5Fistore.c
./src/H5Fprivate.h
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
./src/H5Ocomp.c         [NEW]
./src/H5Oprivate.h
./src/H5P.c
./src/H5Ppublic.h
./src/H5Sprivate.h
./src/H5Ssimp.c
./src/H5Z.c             [NEW]
./src/H5Zprivate.h      [NEW]
./src/H5Zpublic.h       [NEW]
./src/Makefile.in
./src/hdf5.h
./test/dsets.c
./test/istore.c
        Compression is now mostly working.  Don't try to open a
        compressed dataset though because the compression message
        won't be read.

./html/Datatypes.html
./html/H5.api.html
./src/H5.c
./src/H5private.h
./src/H5D.c
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5Tprivate.h
./src/H5Tpublic.h
        Added timing support.  When compiled with H5T_DEBUG defined
        the library will print conversion bandwidths when the library
        closes.  The H5Tregister functions take a string as the first
        argument so the statistics output is meaningful.

./MANIFEST
        Added new files.

./configure.in
./src/H5config.h.in
        Check for getrusage().  Check for compress2() in libz.a and
        the zlib.h header file.  Added `z' to the debug list.

./src/H5B.c
./src/H5Bprivate.h
./src/H5Gnode.c
./src/debug.c
        Cleaned up some indentation and added support to print istore
        B-trees.  From the debugger, give the B-tree address and the
        dimensionality from the layout message of the object header.

./src/h5ls.c
        The oid is printed as  w:x:y:z where w and x are the file ID
        and y and z are the OID within the file.  You can give z or
        y*2^32+z as an argument to the debugger to print the object
        header for the object.

./src/H5AC.c
        Cleaned up statistics and made them match those reported by
        H5T and H5Z.

./src/H5MM.c
./src/H5MMprivate.h
./src/H5Fistore.c
        Finally got rid of a couple of long-standing const cast
        warnings.

1 files changed, 26 insertions, 7 deletions

diff --git a/src/H5Farray.c b/src/H5Farray.c
index 98d3022..1f2bb6c 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -112,7 +112,7 @@ 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 struct H5O_efl_t *efl,
+	      const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
 	      const hsize_t _hslab_size[], const hsize_t mem_size[],
 	      const hssize_t mem_offset[], const hssize_t file_offset[],
 	      void *_buf/*out*/)
@@ -173,6 +173,14 @@ H5F_arr_read (H5F_t *f, const struct H5O_layout_t *layout,
 			       "negative offsets are not valid");
 	    }
 	}
+
+	/*
+	 * Compression cannot be used for contiguous data.
+	 */
+	if (comp && H5Z_NONE!=comp->method) {
+	    HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL,
+			   "compression is not allowed for contiguous data");
+	}
 	
 	/*
 	 * Calculate the strides needed to walk through the array on disk
@@ -270,7 +278,8 @@ printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
 			       "unable to copy into a proper hyperslab");
 	    }
 	}
-	if (H5F_istore_read (f, layout, file_offset, hslab_size, buf)<0) {
+	if (H5F_istore_read (f, layout, comp, file_offset, hslab_size,
+			     buf)<0) {
 	    HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL, "chunked read failed");
 	}
 	break;
@@ -313,9 +322,10 @@ printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
  */
 herr_t
 H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout,
-	       const struct H5O_efl_t *efl, const hsize_t _hslab_size[],
-	       const hsize_t mem_size[], const hssize_t mem_offset[],
-	       const hssize_t file_offset[], const void *_buf)
+	       const struct H5O_compress_t *comp, const struct H5O_efl_t *efl,
+	       const hsize_t _hslab_size[], const hsize_t mem_size[],
+	       const hssize_t mem_offset[], const hssize_t file_offset[],
+	       const void *_buf)
 {
     const uint8	*buf = (const uint8 *)_buf;	/*cast for arithmetic	*/
     hssize_t	file_stride[H5O_LAYOUT_NDIMS];	/*strides through file	*/
@@ -369,10 +379,18 @@ H5F_arr_write (H5F_t *f, const struct H5O_layout_t *layout,
 	 */
 	for (i=0; i<ndims; i++) {
 	    if (mem_offset[i]<0 || file_offset[i]<0) {
-		HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL,
+		HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
 			       "negative offsets are not valid");
 	    }
 	}
+
+	/*
+	 * Compression cannot be used for contiguous data
+	 */
+	if (comp && H5Z_NONE!=comp->method) {
+	    HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+			   "compression is not allowed for contiguous data");
+	}
 	
 	/*
 	 * Calculate the strides needed to walk through the array on disk.
@@ -471,7 +489,8 @@ printf("nelmts=%lu, min=%lu, max=%lu\n", temp, min, max);
 			       "unable to copy from a proper hyperslab");
 	    }
 	}
-	if (H5F_istore_write (f, layout, file_offset, hslab_size, buf)<0) {
+	if (H5F_istore_write (f, layout, comp, file_offset, hslab_size,
+			      buf)<0) {
 	    HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
 			   "chunked write failed");
 	}