[svn-r400] Changes since 19980513

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

./html/Datasets.html
	Fixed a couple of typos.

./src/H5.c
	Added the `Z' modifier to HDfprintf() for `size_t' sizes.  Use
	it like this:
	   HDfprintf(stderr,"size is %Zd\n", (size_t)x);

./src/H5AC.c
./src/H5F.c
./src/H5Fprivate.h
	The maximum number of meta data objects that can be cached can
	be set from the application (but the library might not honor
	it every time; it's a hint).

./src/H5D.c
	Changed a warning message so it's not so alarming.

./src/H5Fistore.c
	Chunks can be cached.

./src/H5O.c
./src/H5Oprivate.h
	Added H5O_copy() and H5O_free() to copy and free messages.

./src/H5P.c
./src/H5Ppublic.h
	Added H5Pset_cache() and H5Pget_cache() and changed lots of
	"template" to "property list".

./src/H5Z.c
./src/H5Zpublic.h
	Miscellaneous little things to clean up.  Mostly just removed
	H5Z_MAXVAL and added H5Z_USERDEF_MIN and H5Z_USERDEF_MAX.

./MANIFEST
./test/Makefile.in
./test/chunk.c		[NEW]
	Added a performance test for chunk caching.  It looks at the
	amount of I/O instead of timing because timing is partly
	dependent on the chunk size and I wanted a measurement that
	was a function of only the cache size.  Run `chunk' with no
	arguments and then say `gnuplot x-gnuplot' to see the plots
	(press return between plots). Postscript files are created for
	each plot.

./test/big.c
./test/cmpd_dset.c
./test/extend.c
./test/external.c
./test/gheap.c
	Added H5F_ACC_DEBUG so we can see cache performance
	statistics.

8 files changed, 577 insertions, 20 deletions

diff --git a/test/.distdep b/test/.distdep
index bb1cb84..f2e23cd 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -403,3 +403,25 @@ links.o: \
    ../src/H5MMpublic.h \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h
+chunk.o: \
+   chunk.c \
+   ../src/hdf5.h \
+   ../src/H5public.h \
+   ../src/H5config.h \
+   ../src/H5Ipublic.h \
+   ../src/H5Apublic.h \
+   ../src/H5ACpublic.h \
+   ../src/H5Bpublic.h \
+   ../src/H5Dpublic.h \
+   ../src/H5Epublic.h \
+   ../src/H5Fpublic.h \
+   ../src/H5Gpublic.h \
+   ../src/H5HGpublic.h \
+   ../src/H5HLpublic.h \
+   ../src/H5MFpublic.h \
+   ../src/H5MMpublic.h \
+   ../src/H5Opublic.h \
+   ../src/H5Ppublic.h \
+   ../src/H5Zpublic.h \
+   ../src/H5Spublic.h \
+   ../src/H5Tpublic.h
diff --git a/test/Makefile.in b/test/Makefile.in
index aab4e6c..37a01ac 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -12,10 +12,10 @@ CPPFLAGS=-I. -I../src @CPPFLAGS@
 # These are our main targets. They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
 PROGS=testhdf5 gheap hyperslab istore dtypes dsets cmpd_dset extend external \
-      shtype iopipe big links
+      shtype iopipe big links chunk
 TESTS=testhdf5 gheap hyperslab istore dtypes dsets cmpd_dset extend external \
       shtype links
-TIMINGS=iopipe
+TIMINGS=iopipe chunk
 
 # Temporary files
 MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5  \
@@ -24,15 +24,15 @@ MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5  \
 	    extern_2.raw extern_2b.raw extern_3.raw extern_3b.raw            \
 	    extern_4.raw extern_4b.raw iopipe.raw iopipe.h5 gheap0.h5        \
 	    gheap1.h5 gheap2.h5 gheap3.h5 gheap4.h5 shtype0.h5 shtype1.h5    \
-	    shtype2a.h5 shtype2b.h5 shtype3.h5 links.h5
+	    shtype2a.h5 shtype2b.h5 shtype3.h5 links.h5 chunk.h5
 
 # Source and object files for programs...  The PROG_SRC list contains all the
 # source files and is used for things like dependencies, archiving, etc.  The
 # other source lists are for the individual tests, the files of which may
 # overlap with other tests.
 PROG_SRC=testhdf5.c tattr.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5s.c \
-    dtypes.c hyperslab.c istore.c dsets.c cmpd_dset.c extend.c external.c \
-	iopipe.c gheap.c shtype.c big.c links.c
+	dtypes.c hyperslab.c istore.c dsets.c cmpd_dset.c extend.c external.c \
+	iopipe.c gheap.c shtype.c big.c links.c chunk.c
 PROG_OBJ=$(PROG_SRC:.c=.o)
 
 TESTHDF5_SRC=testhdf5.c tattr.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5s.c
@@ -77,6 +77,9 @@ BIG_OBJ=$(BIG_SRC:.c=.o)
 LINKS_SRC=links.c
 LINKS_OBJ=$(LINKS_SRC:.c=.o)
 
+CHUNK_SRC=chunk.c
+CHUNK_OBJ=$(CHUNK_SRC:.c=.o)
+
 # Private header files (not to be installed)...
 PRIVATE_HDR=testhdf5.h
 
@@ -133,4 +136,7 @@ big: $(BIG_OBJ) ../src/libhdf5.a
 links: $(LINKS_OBJ) ../src/libhdf5.a
 	$(CC) $(CFLAGS) -o $@ $(LINKS_OBJ) ../src/libhdf5.a $(LIBS)
 
+chunk: $(CHUNK_OBJ) ../src/libhdf5.a
+	$(CC) $(CFLAGS) -o $@ $(CHUNK_OBJ) ../src/libhdf5.a $(LIBS)
+
 @CONCLUDE@
diff --git a/test/big.c b/test/big.c
index 226eeb0..c45690a 100644
--- a/test/big.c
+++ b/test/big.c
@@ -68,7 +68,7 @@ writer (int wrt_n)
      */
     plist = H5Pcreate (H5P_FILE_ACCESS);
     H5Pset_family (plist, FAMILY_SIZE, H5P_DEFAULT);
-    file = H5Fcreate (FNAME, H5F_ACC_TRUNC, H5P_DEFAULT, plist);
+    file = H5Fcreate (FNAME, H5F_ACC_TRUNC|H5F_ACC_DEBUG, H5P_DEFAULT, plist);
     H5Pclose (plist);
 
     /* Create simple data spaces according to the size specified above. */
@@ -133,7 +133,7 @@ reader (const char *script_name)
     /* Open HDF5 file */
     plist = H5Pcreate (H5P_FILE_ACCESS);
     H5Pset_family (plist, FAMILY_SIZE, H5P_DEFAULT);
-    file = H5Fopen (FNAME, H5F_ACC_RDONLY, plist);
+    file = H5Fopen (FNAME, H5F_ACC_RDONLY|H5F_ACC_DEBUG, plist);
     H5Pclose (plist);
 
     /* Open the dataset */
diff --git a/test/chunk.c b/test/chunk.c
new file mode 100644
index 0000000..35b5b85
--- /dev/null
+++ b/test/chunk.c
@@ -0,0 +1,521 @@
+/*
+ * Copyright (C) 1998 NCSA
+ *                    All rights reserved.
+ *
+ * Programmer:  Robb Matzke <robb@arborea.spizella.com>
+ *              Thursday, May 14, 1998
+ *
+ * Purpose:	Checks the effect of various I/O request sizes and raw data
+ *		cache sizes.  Performance depends on the amount of data read
+ *		from disk, and we use a trick to get that number: a
+ *		compress/uncompress pair that counts the amount of data read.
+ *		Since the data itself is not important, the compression just
+ *		removes a byte and uncompression adds some byte of arbitrary
+ *		value.  The change in size is necessary or the library will
+ *		not store the data as compressed and thus not call the
+ *		uncompression method.
+ */
+#include <assert.h>
+#include <hdf5.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <H5config.h>
+#ifndef HAVE_ATTRIBUTE
+#   undef __attribute__
+#   define __attribute__(X) /*void*/
+#   define __unused__ /*void*/
+#else
+#   define __unused__ __attribute__((unused))
+#endif
+
+#define FILE_NAME	"chunk.h5"
+#define LINESPOINTS	"lines"
+#define CH_SIZE		100		/*squared in terms of bytes    	*/
+#define DS_SIZE		20		/*squared in terms of chunks	*/
+#define ZMETHNO		H5Z_USERDEF_MIN
+#define READ		0
+#define WRITE		1
+#define MIN(X,Y)	((X)<(Y)?(X):(Y))
+#define MAX(X,Y)	((X)>(Y)?(X):(Y))
+#define SQUARE(X)	((X)*(X))
+
+/* The row-major test */
+#define RM_CACHE_STRT	25
+#define RM_CACHE_END	25
+#define RM_CACHE_DELT	5
+#define RM_START	0.20
+#define RM_END	        5.00
+#define RM_DELTA	0.0025
+
+/* Diagonal test */
+#define DIAG_CACHE_STRT	25
+#define DIAG_CACHE_END	25
+#define DIAG_CACHE_DELT	5
+#define DIAG_START	0.20
+#define DIAG_END	5.00
+#define DIAG_DELTA	0.0025
+
+static size_t	nio_g;
+static hid_t	fapl_g = -1;
+
+
+/*-------------------------------------------------------------------------
+ * Function:	count_c
+ *
+ * Purpose:	A bogus compression method that just removes the last byte.
+ *
+ * Return:	Success:	src_nbytes-1
+ *
+ *		Failure:	never fails
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, May 14, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static size_t
+count_c (unsigned int __unused__ flags, size_t __unused__ cd_size,
+	 const void __unused__ *client_data, size_t src_nbytes,
+	 const void *src, size_t __unused__ dst_nbytes, void *dst/*out*/)
+{
+    memcpy (dst, src, src_nbytes-1);
+    nio_g += src_nbytes;
+    return src_nbytes-1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	count_u
+ *
+ * Purpose:	A bogus unompress method that just adds a zero to the end.
+ *
+ * Return:	Success:	src_nbytes+1
+ *
+ *		Failure:	never fails
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, May 14, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static size_t
+count_u (unsigned int __unused__ flags, size_t __unused__ cd_size,
+	 const void __unused__ *client_data, size_t src_nbytes,
+	 const void *src, size_t __unused__ dst_nbytes, void *dst/*out*/)
+{
+    memcpy (dst, src, src_nbytes);
+    ((char*)dst)[src_nbytes] = 0;
+    nio_g += src_nbytes+1;
+    return src_nbytes+1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	create_dataset
+ *
+ * Purpose:	Creates a square dataset with square chunks, registers a
+ *		stupid compress/uncompress pair for counting I/O, and
+ *		initializes the dataset.  The chunk size is in bytes, the
+ *		dataset size is in terms of chunks.
+ *
+ * Return:	void
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, May 14, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static void
+create_dataset (void)
+{
+    hid_t	file, space, dcpl, dset;
+    hsize_t	size[2];
+    char	*buf;
+
+    /* The file */
+    file = H5Fcreate (FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_g);
+
+    /* The data space */
+    size[0] = size[1] = DS_SIZE * CH_SIZE;
+    space = H5Screate_simple (2, size, size);
+
+    /* The storage layout and compression */
+    dcpl = H5Pcreate (H5P_DATASET_CREATE);
+    size[0] = size[1] = CH_SIZE;
+    H5Pset_chunk (dcpl, 2, size);
+    H5Zregister (ZMETHNO, "counter", count_c, count_u);
+    H5Pset_compression (dcpl, ZMETHNO, 0, 0, NULL);
+        
+    /* The dataset */
+    dset = H5Dcreate (file, "dset", H5T_NATIVE_CHAR, space, dcpl);
+    assert (dset>=0);
+
+    /* The data */
+    buf = calloc (1, SQUARE (DS_SIZE*CH_SIZE));
+    H5Dwrite (dset, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
+    free (buf);
+
+    /* Close */
+    H5Dclose (dset);
+    H5Sclose (space);
+    H5Pclose (dcpl);
+    H5Fclose (file);
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_rowmaj
+ *
+ * Purpose:	Reads the entire dataset using the specified size-squared
+ *		I/O requests in row major order.
+ *
+ * Return:	Efficiency: data requested divided by data actually read.
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, May 14, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static double
+test_rowmaj (int op, hsize_t cache_size, hsize_t io_size)
+{
+    hid_t	file, dset, mem_space, file_space;
+    char	*buf = calloc (1, SQUARE(io_size));
+    hsize_t	i, j, hs_size[2];
+    hssize_t	hs_offset[2];
+    int		mdc_nelmts;
+    double	w0;
+
+    H5Pget_cache (fapl_g, &mdc_nelmts, NULL, &w0);
+    H5Pset_cache (fapl_g, mdc_nelmts, cache_size*SQUARE (CH_SIZE), w0);
+    file = H5Fopen (FILE_NAME, H5F_ACC_RDWR, fapl_g);
+    dset = H5Dopen (file, "dset");
+    file_space = H5Dget_space (dset);
+    nio_g = 0;
+
+    for (i=0; i<CH_SIZE*DS_SIZE; i+=io_size) {
+#if 0
+	fprintf (stderr, "%5d\b\b\b\b\b", (int)i);
+	fflush (stderr);
+#endif
+	for (j=0; j<CH_SIZE*DS_SIZE; j+=io_size) {
+	    hs_offset[0] = i;
+	    hs_size[0] = MIN (io_size, CH_SIZE*DS_SIZE-i);
+	    hs_offset[1] = j;
+	    hs_size[1] = MIN (io_size, CH_SIZE*DS_SIZE-j);
+	    mem_space = H5Screate_simple (2, hs_size, hs_size);
+	    H5Sset_hyperslab (file_space, hs_offset, hs_size, NULL);
+
+	    if (READ==op) {
+		H5Dread (dset, H5T_NATIVE_CHAR, mem_space, file_space,
+			 H5P_DEFAULT, buf);
+	    } else {
+		H5Dwrite (dset, H5T_NATIVE_CHAR, mem_space, file_space,
+			  H5P_DEFAULT, buf);
+	    }
+	    H5Sclose (mem_space);
+	}
+    }
+    
+    free (buf); 
+    H5Sclose (file_space);
+    H5Dclose (dset);
+    H5Fclose (file);
+
+    return (double)SQUARE(CH_SIZE*DS_SIZE)/nio_g;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	test_diag
+ *
+ * Purpose:	Reads windows diagonally across the dataset.  Each window is
+ *		offset from the previous window by OFFSET in the x and y
+ *		directions.  The reading ends after the (k,k) value is read
+ *		where k is the maximum index in the dataset.
+ *
+ * Return:	Efficiency.
+ *
+ * Programmer:	Robb Matzke
+ *              Friday, May 15, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static double
+test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
+{
+    hid_t	file, dset, mem_space, file_space;
+    hsize_t	i, hs_size[2], nio=0;
+    hssize_t	hs_offset[2];
+    char	*buf = calloc (1, SQUARE (io_size));
+    int		mdc_nelmts;
+    double	w0;
+
+    H5Pget_cache (fapl_g, &mdc_nelmts, NULL, &w0);
+    H5Pset_cache (fapl_g, mdc_nelmts, cache_size*SQUARE (CH_SIZE), w0);
+    file = H5Fopen (FILE_NAME, H5F_ACC_RDWR, fapl_g);
+    dset = H5Dopen (file, "dset");
+    file_space = H5Dget_space (dset);
+    nio_g = 0;
+    
+    for (i=0, hs_size[0]=io_size; hs_size[0]==io_size; i+=offset) {
+	hs_offset[0] = hs_offset[1] = i;
+	hs_size[0] = hs_size[1] = MIN (io_size, CH_SIZE*DS_SIZE-i);
+	mem_space = H5Screate_simple (2, hs_size, hs_size);
+	H5Sset_hyperslab (file_space, hs_offset, hs_size, NULL);
+	if (READ==op) {
+	    H5Dread (dset, H5T_NATIVE_CHAR, mem_space, file_space,
+		     H5P_DEFAULT, buf);
+	} else {
+	    H5Dwrite (dset, H5T_NATIVE_CHAR, mem_space, file_space,
+		      H5P_DEFAULT, buf);
+	}
+	H5Sclose (mem_space);
+	nio += hs_size[0]*hs_size[1];
+	if (i>0) nio -= SQUARE (io_size-offset);
+    }
+
+    free (buf);
+    H5Sclose (file_space);
+    H5Dclose (dset);
+    H5Fclose (file);
+
+    return (double)nio/nio_g;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ * Purpose:	See file prologue.
+ *
+ * Return:	Success:	
+ *
+ *		Failure:	
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, May 14, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main (void)
+{
+    hsize_t	io_size;
+    double	effic, io_percent;
+    FILE	*f, *d;
+    int		cache_size;
+    double	w0;
+
+    /*
+     * Create a global file access property list.
+     */
+    fapl_g = H5Pcreate (H5P_FILE_ACCESS);
+    H5Pget_cache (fapl_g, NULL, NULL, &w0);
+
+    /* Create the file */
+    create_dataset ();
+    f = fopen ("x-gnuplot", "w");
+
+
+#if 1
+    /*
+     * Test row-major reading of the dataset with various sizes of request
+     * windows.
+     */
+    if (RM_CACHE_STRT==RM_CACHE_END) {
+	fprintf (f, "set yrange [0:1.2]\n");
+	fprintf (f, "set ytics 0, 0.1, 1\n");
+	fprintf (f, "set xlabel \"%s\"\n",
+		 "Request size as a fraction of chunk size");
+	fprintf (f, "set ylabel \"Efficiency\"\n");
+	fprintf (f, "set title \"Cache %d chunks, w0=%g, "
+		 "Size=(total=%d, chunk=%d)\"\n",
+		 RM_CACHE_STRT, w0, DS_SIZE*CH_SIZE, CH_SIZE);
+    } else {
+	fprintf (f, "set autoscale\n");
+	fprintf (f, "set hidden3d\n");
+    }
+
+    fprintf (f, "set terminal postscript\nset output \"x-rowmaj-rd.ps\"\n");
+    fprintf (f, "%s \"x-rowmaj-rd.dat\" title \"RowMaj-Read\" with %s\n",
+	     RM_CACHE_STRT==RM_CACHE_END?"plot":"splot",
+	     LINESPOINTS);
+    fprintf (f, "set terminal x11\nreplot\n");
+    d = fopen ("x-rowmaj-rd.dat", "w");
+    for (cache_size=RM_CACHE_STRT;
+	 cache_size<=RM_CACHE_END;
+	 cache_size+=RM_CACHE_DELT) {
+	for (io_percent=RM_START; io_percent<=RM_END; io_percent+=RM_DELTA) {
+	    io_size = MAX (1, (int)(CH_SIZE*io_percent));
+	    printf ("Rowmaj-rd %8d %8.2f", cache_size, io_percent);
+	    fflush (stdout);
+	    effic = test_rowmaj (READ, cache_size, io_size);
+	    printf (" %8.2f\n", effic);
+	    if (RM_CACHE_STRT==RM_CACHE_END) {
+		fprintf (d, "%g %g\n", io_percent, effic);
+	    } else {
+		fprintf (d, "%g\n", effic);
+	    }
+	}
+	fprintf (d, "\n");
+    }
+    fclose (d);
+    fprintf (f, "pause -1\n");
+#endif
+
+#if 1
+    /*
+     * Test row-major writing of the dataset with various sizes of request
+     * windows.
+     */
+    if (RM_CACHE_STRT==RM_CACHE_END) {
+	fprintf (f, "set yrange [0:1.2]\n");
+	fprintf (f, "set ytics 0, 0.1, 1\n");
+	fprintf (f, "set xlabel \"%s\"\n",
+		 "Request size as a fraction of chunk size");
+	fprintf (f, "set ylabel \"Efficiency\"\n");
+	fprintf (f, "set title \"Cache %d chunks,w0=%g, "
+		 "Size=(total=%d, chunk=%d)\"\n",
+		 RM_CACHE_STRT, w0, DS_SIZE*CH_SIZE, CH_SIZE);
+    } else {
+	fprintf (f, "set autoscale\n");
+	fprintf (f, "set hidden3d\n");
+    }
+
+    fprintf (f, "set terminal postscript\nset output \"x-rowmaj-wr.ps\"\n");
+    fprintf (f, "%s \"x-rowmaj-wr.dat\" title \"RowMaj-Write\" with %s\n",
+	     RM_CACHE_STRT==RM_CACHE_END?"plot":"splot",
+	     LINESPOINTS);
+    fprintf (f, "set terminal x11\nreplot\n");
+    d = fopen ("x-rowmaj-wr.dat", "w");
+    for (cache_size=RM_CACHE_STRT;
+	 cache_size<=RM_CACHE_END;
+	 cache_size+=RM_CACHE_DELT) {
+	for (io_percent=RM_START; io_percent<=RM_END; io_percent+=RM_DELTA) {
+	    io_size = MAX (1, (int)(CH_SIZE*io_percent));
+	    printf ("Rowmaj-wr %8d %8.2f", cache_size, io_percent);
+	    fflush (stdout);
+	    effic = test_rowmaj (WRITE, cache_size, io_size);
+	    printf (" %8.2f\n", effic);
+	    if (RM_CACHE_STRT==RM_CACHE_END) {
+		fprintf (d, "%g %g\n", io_percent, effic);
+	    } else {
+		fprintf (d, "%g\n", effic);
+	    }
+	}
+	fprintf (d, "\n");
+    }
+    fclose (d);
+    fprintf (f, "pause -1\n");
+#endif
+
+#if 1
+    /*
+     * Test diagonal read
+     */
+    if (DIAG_CACHE_STRT==DIAG_CACHE_END) {
+	fprintf (f, "set yrange [0:1.2]\n");
+	fprintf (f, "set ytics 0, 0.1, 1\n");
+	fprintf (f, "set xlabel \"%s\"\n",
+		 "Request size as a fraction of chunk size");
+	fprintf (f, "set ylabel \"Efficiency\"\n");
+	fprintf (f, "set title \"Cache %d chunks,w0=%g, "
+		 "Size=(total=%d, chunk=%d)\"\n",
+		 DIAG_CACHE_STRT, w0, DS_SIZE*CH_SIZE, CH_SIZE);
+    } else {
+	fprintf (f, "set autoscale\n");
+	fprintf (f, "set hidden3d\n");
+    }
+    fprintf (f, "set terminal postscript\nset output \"x-diag-rd.ps\"\n");
+    fprintf (f, "%s \"x-diag-rd.dat\" title \"Diag-Read\" with %s\n",
+	     DIAG_CACHE_STRT==DIAG_CACHE_END?"plot":"splot", LINESPOINTS);
+    fprintf (f, "set terminal x11\nreplot\n");
+    d = fopen ("x-diag-rd.dat", "w");
+    for (cache_size=DIAG_CACHE_STRT;
+	 cache_size<=DIAG_CACHE_END;
+	 cache_size+=DIAG_CACHE_DELT) {
+	for (io_percent=DIAG_START;
+	     io_percent<=DIAG_END;
+	     io_percent+=DIAG_DELTA) {
+	    io_size = MAX (1, (int)(CH_SIZE*io_percent));
+	    printf ("Diag-rd   %8d %8.2f", cache_size, io_percent);
+	    fflush (stdout);
+	    effic = test_diag (READ, cache_size, io_size, MAX (1, io_size/2));
+	    printf (" %8.2f\n", effic);
+	    if (DIAG_CACHE_STRT==DIAG_CACHE_END) {
+		fprintf (d, "%g %g\n", io_percent, effic);
+	    } else {
+		fprintf (d, "%g\n", effic);
+	    }
+	}
+	fprintf (d, "\n");
+    }
+    fclose (d);
+    fprintf (f, "pause -1\n");
+#endif
+
+#if 1
+    /*
+     * Test diagonal write
+     */
+    if (DIAG_CACHE_STRT==DIAG_CACHE_END) {
+	fprintf (f, "set yrange [0:1.2]\n");
+	fprintf (f, "set ytics 0, 0.1, 1\n");
+	fprintf (f, "set xlabel \"%s\"\n",
+		 "Request size as a fraction of chunk size");
+	fprintf (f, "set ylabel \"Efficiency\"\n");
+	fprintf (f, "set title \"Cache %d chunks, w0=%g, "
+		 "Size=(total=%d, chunk=%d)\"\n",
+		 DIAG_CACHE_STRT, w0, DS_SIZE*CH_SIZE, CH_SIZE);
+    } else {
+	fprintf (f, "set autoscale\n");
+	fprintf (f, "set hidden3d\n");
+    }
+    fprintf (f, "set terminal postscript\nset output \"x-diag-wr.ps\"\n");
+    fprintf (f, "%s \"x-diag-wr.dat\" title \"Diag-Write\" with %s\n",
+	     DIAG_CACHE_STRT==DIAG_CACHE_END?"plot":"splot", LINESPOINTS);
+    fprintf (f, "set terminal x11\nreplot\n");
+    d = fopen ("x-diag-wr.dat", "w");
+    for (cache_size=DIAG_CACHE_STRT;
+	 cache_size<=DIAG_CACHE_END;
+	 cache_size+=DIAG_CACHE_DELT) {
+	for (io_percent=DIAG_START;
+	     io_percent<=DIAG_END;
+	     io_percent+=DIAG_DELTA) {
+	    io_size = MAX (1, (int)(CH_SIZE*io_percent));
+	    printf ("Diag-wr   %8d %8.2f", cache_size, io_percent);
+	    fflush (stdout);
+	    effic = test_diag (WRITE, cache_size, io_size, MAX (1, io_size/2));
+	    printf (" %8.2f\n", effic);
+	    if (DIAG_CACHE_STRT==DIAG_CACHE_END) {
+		fprintf (d, "%g %g\n", io_percent, effic);
+	    } else {
+		fprintf (d, "%g\n", effic);
+	    }
+	}
+	fprintf (d, "\n");
+    }
+    fclose (d);
+    fprintf (f, "pause -1\n");
+#endif
+
+
+    H5Pclose (fapl_g);
+    fclose (f);
+    return 0;
+}
+
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index edb3cdc..31492b9 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -131,7 +131,7 @@ main (void)
     hsize_t 		h_sample[2];	/*hyperslab sampling		*/
 
     /* Create the file */
-    file = H5Fcreate ("cmpd_dset.h5", H5F_ACC_TRUNC,
+    file = H5Fcreate ("cmpd_dset.h5", H5F_ACC_TRUNC|H5F_ACC_DEBUG,
 		      H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
 
diff --git a/test/extend.c b/test/extend.c
index 09ce489..7ead138 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -54,7 +54,8 @@ main (void)
     assert (mem_space>=0);
 
     /* Create the file */
-    file = H5Fcreate ("extend.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate ("extend.h5", H5F_ACC_TRUNC|H5F_ACC_DEBUG,
+		      H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
 
     /* Create the dataset which is originally NX by NY */
diff --git a/test/external.c b/test/external.c
index 0694430..49e6d94 100644
--- a/test/external.c
+++ b/test/external.c
@@ -131,7 +131,8 @@ test_1 (void)
      * debugging to be emitted before we start playing games with what the
      * output looks like.
      */
-    file = H5Fcreate ("extern_1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate ("extern_1.h5", H5F_ACC_TRUNC|H5F_ACC_DEBUG,
+		      H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
     grp = H5Gcreate (file, "emit-diagnostics", 8);
     H5Gclose (grp);
@@ -520,7 +521,8 @@ test_2 (void)
      * debugging to be emitted before we start playing games with what the
      * output looks like.
      */
-    file = H5Fcreate ("extern_2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate ("extern_2.h5", H5F_ACC_TRUNC|H5F_ACC_DEBUG,
+		      H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
     grp = H5Gcreate (file, "emit-diagnostics", 8);
     H5Gclose (grp);
@@ -658,7 +660,8 @@ test_3 (void)
     /*
      * Create another file
      */
-    file = H5Fcreate ("extern_3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate ("extern_3.h5", H5F_ACC_TRUNC|H5F_ACC_DEBUG,
+		      H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
 
     /* Create the external file list */
diff --git a/test/gheap.c b/test/gheap.c
index 4183a84..c4a4420 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -91,7 +91,8 @@ test_1 (void)
 
     /* Open a clean file */
     H5Eclear ();
-    f = H5F_open ("gheap1.h5", H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC,
+    f = H5F_open ("gheap1.h5",
+		  H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC|H5F_ACC_DEBUG,
 		  NULL, NULL);
     if (!f) {
 	FAILED ("unable to create file");
@@ -133,8 +134,8 @@ test_1 (void)
 	}
     }
     
-    H5F_close (f);
     puts (" PASSED");
+    H5F_close (f);
     return retval;
 }
 
@@ -173,7 +174,8 @@ test_2 (void)
 
     /* Open a clean file */
     H5Eclear ();
-    f = H5F_open ("gheap2.h5", H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC,
+    f = H5F_open ("gheap2.h5",
+		  H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC|H5F_ACC_DEBUG,
 		  NULL, NULL);
     if (!f) {
 	FAILED ("unable to create file");
@@ -210,8 +212,8 @@ test_2 (void)
 	}
     }
     
-    H5F_close (f);
     puts (" PASSED");
+    H5F_close (f);
     return retval;
 }
 
@@ -249,7 +251,8 @@ test_3 (void)
 
     /* Open a clean file */
     H5Eclear ();
-    f = H5F_open ("gheap3.h5", H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC,
+    f = H5F_open ("gheap3.h5",
+		  H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC|H5F_ACC_DEBUG,
 		  NULL, NULL);
     if (!f) {
 	FAILED ("unable to create file");
@@ -277,8 +280,8 @@ test_3 (void)
 	}
     }
     
-    H5F_close (f);
     puts (" PASSED");
+    H5F_close (f);
     return retval;
 }
 
@@ -317,7 +320,8 @@ test_4 (void)
 
     /* Open a clean file */
     H5Eclear ();
-    f = H5F_open ("gheap4.h5", H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC,
+    f = H5F_open ("gheap4.h5",
+		  H5F_ACC_CREAT|H5F_ACC_RDWR|H5F_ACC_TRUNC|H5F_ACC_DEBUG,
 		  NULL, NULL);
     if (!f) {
 	FAILED ("unable to create file");
@@ -352,8 +356,8 @@ test_4 (void)
 	}
     }
 
-    H5F_close (f);
     puts (" PASSED");
+    H5F_close (f);
     return retval;
 }