[svn-r773] Changes since 19981019

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

./src/H5Fistore.c
	Improved the hash function so it mixes bits better.  This
	results in a few percent improvement in raw data chunk cache
	efficiency because there are fewer collisions.

./test/chunk.c
	Added #define's for chunk preemption `w0' value and number of
	slots in cache.

./src/H5B.c
	Added some more comments to H5B_insert_helper() and
	H5B_remove_helper()  and also point to some additional
	documentation.

3 files changed, 77 insertions, 61 deletions

diff --git a/test/.distdep b/test/.distdep
index 25cfd63..ffda783 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -1,11 +1,3 @@
-testhdf5.o: \
-   testhdf5.c \
-   testhdf5.h \
-   ../src/H5private.h \
-   ../src/H5public.h \
-   ../src/H5config.h \
-   ../src/H5Eprivate.h \
-   ../src/H5Epublic.h
 tattr.o: \
    tattr.c \
    testhdf5.h \
@@ -103,32 +95,6 @@ tohdr.o: \
    ../src/H5Tprivate.h \
    ../src/H5Tpublic.h \
    ../src/H5Sprivate.h
-trefer.o: \
-   trefer.c \
-   testhdf5.h \
-   ../src/H5private.h \
-   ../src/H5public.h \
-   ../src/H5config.h \
-   ../src/H5Eprivate.h \
-   ../src/H5Epublic.h \
-   ../src/H5Ipublic.h \
-   ../src/hdf5.h \
-   ../src/H5Apublic.h \
-   ../src/H5ACpublic.h \
-   ../src/H5Bpublic.h \
-   ../src/H5Dpublic.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/H5Rpublic.h \
-   ../src/H5RApublic.h \
-   ../src/H5Spublic.h
 tselect.o: \
    tselect.c \
    testhdf5.h \
@@ -486,30 +452,6 @@ links.o: \
    ../src/H5RApublic.h \
    ../src/H5Spublic.h \
    ../src/H5Tpublic.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/H5Rpublic.h \
-   ../src/H5RApublic.h \
-   ../src/H5Spublic.h \
-   ../src/H5Tpublic.h
 bittests.o: \
    bittests.c \
    ../src/H5Tpkg.h \
@@ -598,6 +540,64 @@ unlink.o: \
    ../src/H5Zpublic.h \
    ../src/H5Rpublic.h \
    ../src/H5RApublic.h
+testhdf5.o: \
+   testhdf5.c \
+   testhdf5.h \
+   ../src/H5private.h \
+   ../src/H5public.h \
+   ../src/H5config.h \
+   ../src/H5Eprivate.h \
+   ../src/H5Epublic.h
+trefer.o: \
+   trefer.c \
+   testhdf5.h \
+   ../src/H5private.h \
+   ../src/H5public.h \
+   ../src/H5config.h \
+   ../src/H5Eprivate.h \
+   ../src/H5Epublic.h \
+   ../src/H5Ipublic.h \
+   ../src/hdf5.h \
+   ../src/H5Apublic.h \
+   ../src/H5ACpublic.h \
+   ../src/H5Bpublic.h \
+   ../src/H5Dpublic.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/H5Rpublic.h \
+   ../src/H5RApublic.h \
+   ../src/H5Spublic.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/H5Rpublic.h \
+   ../src/H5RApublic.h \
+   ../src/H5Spublic.h \
+   ../src/H5Tpublic.h
 overhead.o: \
    overhead.c \
    ../src/hdf5.h \
diff --git a/test/chunk.c b/test/chunk.c
index 73a1e1e..92279ac 100644
--- a/test/chunk.c
+++ b/test/chunk.c
@@ -42,7 +42,9 @@
 #define RM_CACHE_DELT	5
 #define RM_START	0.50
 #define RM_END	        5.00
-#define RM_DELTA	0.50
+#define RM_DELTA	0.5
+#define RM_W0		1.0
+#define RM_NRDCC	5210
 
 /* Diagonal test */
 #define DIAG_CACHE_STRT	25
@@ -50,7 +52,9 @@
 #define DIAG_CACHE_DELT	5
 #define DIAG_START	0.50
 #define DIAG_END	5.00
-#define DIAG_DELTA	0.50
+#define DIAG_DELTA	0.5
+/* #define DIAG_W0		0.65 */
+/* #define DIAG_NRDCC		521 */
 
 static size_t	nio_g;
 static hid_t	fapl_g = -1;
@@ -163,6 +167,12 @@ test_rowmaj (int op, hsize_t cache_size, hsize_t io_size)
     double	w0;
 
     H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0);
+#ifdef RM_W0
+    w0 = RM_W0;
+#endif
+#ifdef RM_NRDCC
+    rdcc_nelmts = RM_NRDCC;
+#endif
     H5Pset_cache (fapl_g, mdc_nelmts, rdcc_nelmts,
 		  cache_size*SQUARE (CH_SIZE), w0);
     file = H5Fopen (FILE_NAME, H5F_ACC_RDWR, fapl_g);
@@ -232,6 +242,12 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
     double	w0;
 
     H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0);
+#ifdef DIAG_W0
+    w0 = DIAG_W0;
+#endif
+#ifdef DIAG_NRDCC
+    rdcc_nelmts = DIAG_NRDCC;
+#endif
     H5Pset_cache (fapl_g, mdc_nelmts, rdcc_nelmts,
 		  cache_size*SQUARE (CH_SIZE), w0);
     file = H5Fopen (FILE_NAME, H5F_ACC_RDWR, fapl_g);
diff --git a/test/overhead.c b/test/overhead.c
index 785bfd7..4fdc6d3 100644
--- a/test/overhead.c
+++ b/test/overhead.c
@@ -226,7 +226,7 @@ test(fill_t fill_style, const double splits[],
 
 	/* Determine overhead */
 	if (verbose) {
-	    if (H5Fflush(file)<0) goto error;
+	    if (H5Fflush(file, H5F_SCOPE_LOCAL)<0) goto error;
 	    if (fstat(fd, &sb)<0) goto error;
 	    printf("%4lu %8.3f\n",
 		   (unsigned long)i,