[svn-r5479] Purpose:

    Sync with v1.5 changes.
    (Including the H5_WANT_H5_V1_4_COMPAT code is okay since it will never
    be true in v1.4)
    Did another Dependencies regeneration too.
Platforms tested:
    eirene(pp)

2 files changed, 56 insertions, 46 deletions

diff --git a/perform/Dependencies b/perform/Dependencies
index 7b0e311..1923aaf 100644
--- a/perform/Dependencies
+++ b/perform/Dependencies
@@ -1,40 +1,6 @@
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
 
-chunk.lo: \
-   $(srcdir)/chunk.c \
-   $(top_srcdir)/src/hdf5.h \
-   $(top_srcdir)/src/H5public.h \
-   $(top_builddir)/src/H5pubconf.h \
-   $(top_srcdir)/src/H5api_adpt.h \
-   $(top_srcdir)/src/H5Ipublic.h \
-   $(top_srcdir)/src/H5Apublic.h \
-   $(top_srcdir)/src/H5ACpublic.h \
-   $(top_srcdir)/src/H5Bpublic.h \
-   $(top_srcdir)/src/H5Dpublic.h \
-   $(top_srcdir)/src/H5Epublic.h \
-   $(top_srcdir)/src/H5Fpublic.h \
-   $(top_srcdir)/src/H5FDpublic.h \
-   $(top_srcdir)/src/H5Gpublic.h \
-   $(top_srcdir)/src/H5HGpublic.h \
-   $(top_srcdir)/src/H5HLpublic.h \
-   $(top_srcdir)/src/H5MMpublic.h \
-   $(top_srcdir)/src/H5Opublic.h \
-   $(top_srcdir)/src/H5Ppublic.h \
-   $(top_srcdir)/src/H5Zpublic.h \
-   $(top_srcdir)/src/H5Rpublic.h \
-   $(top_srcdir)/src/H5Spublic.h \
-   $(top_srcdir)/src/H5Tpublic.h \
-   $(top_srcdir)/src/H5FDcore.h \
-   $(top_srcdir)/src/H5FDfamily.h \
-   $(top_srcdir)/src/H5FDmpio.h \
-   $(top_srcdir)/src/H5FDsec2.h \
-   $(top_srcdir)/src/H5FDstdio.h \
-   $(top_srcdir)/src/H5FDsrb.h \
-   $(top_srcdir)/src/H5FDgass.h \
-   $(top_srcdir)/src/H5FDstream.h \
-   $(top_srcdir)/src/H5FDmulti.h \
-   $(top_srcdir)/src/H5FDlog.h
 pio_timer.lo: \
    $(srcdir)/pio_timer.c \
    $(srcdir)/pio_timer.h \
@@ -243,3 +209,37 @@ overhead.lo: \
    $(top_srcdir)/src/H5FDmulti.h \
    $(top_srcdir)/src/H5FDlog.h \
    $(top_srcdir)/src/H5private.h
+chunk.lo: \
+   $(srcdir)/chunk.c \
+   $(top_srcdir)/src/hdf5.h \
+   $(top_srcdir)/src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_srcdir)/src/H5api_adpt.h \
+   $(top_srcdir)/src/H5Ipublic.h \
+   $(top_srcdir)/src/H5Apublic.h \
+   $(top_srcdir)/src/H5ACpublic.h \
+   $(top_srcdir)/src/H5Bpublic.h \
+   $(top_srcdir)/src/H5Dpublic.h \
+   $(top_srcdir)/src/H5Epublic.h \
+   $(top_srcdir)/src/H5Fpublic.h \
+   $(top_srcdir)/src/H5FDpublic.h \
+   $(top_srcdir)/src/H5Gpublic.h \
+   $(top_srcdir)/src/H5HGpublic.h \
+   $(top_srcdir)/src/H5HLpublic.h \
+   $(top_srcdir)/src/H5MMpublic.h \
+   $(top_srcdir)/src/H5Opublic.h \
+   $(top_srcdir)/src/H5Ppublic.h \
+   $(top_srcdir)/src/H5Zpublic.h \
+   $(top_srcdir)/src/H5Rpublic.h \
+   $(top_srcdir)/src/H5Spublic.h \
+   $(top_srcdir)/src/H5Tpublic.h \
+   $(top_srcdir)/src/H5FDcore.h \
+   $(top_srcdir)/src/H5FDfamily.h \
+   $(top_srcdir)/src/H5FDmpio.h \
+   $(top_srcdir)/src/H5FDsec2.h \
+   $(top_srcdir)/src/H5FDstdio.h \
+   $(top_srcdir)/src/H5FDsrb.h \
+   $(top_srcdir)/src/H5FDgass.h \
+   $(top_srcdir)/src/H5FDstream.h \
+   $(top_srcdir)/src/H5FDmulti.h \
+   $(top_srcdir)/src/H5FDlog.h
diff --git a/perform/chunk.c b/perform/chunk.c
index f0ea917..4f3b1cb 100644
--- a/perform/chunk.c
+++ b/perform/chunk.c
@@ -162,13 +162,18 @@ create_dataset (void)
  *-------------------------------------------------------------------------
  */
 static double
-test_rowmaj (int op, hsize_t cache_size, hsize_t io_size)
+test_rowmaj (int op, size_t cache_size, size_t io_size)
 {
     hid_t	file, dset, mem_space, file_space;
     signed char	*buf = calloc (1, (size_t)(SQUARE(io_size)));
     hsize_t	i, j, hs_size[2];
     hssize_t	hs_offset[2];
+#ifdef H5_WANT_H5_V1_4_COMPAT
     int		mdc_nelmts, rdcc_nelmts;
+#else /* H5_WANT_H5_V1_4_COMPAT */
+    int		mdc_nelmts;
+    size_t	rdcc_nelmts;
+#endif /* H5_WANT_H5_V1_4_COMPAT */
     double	w0;
 
     H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0);
@@ -237,14 +242,19 @@ test_rowmaj (int op, hsize_t cache_size, hsize_t io_size)
  *-------------------------------------------------------------------------
  */
 static double
-test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
+test_diag (int op, size_t cache_size, size_t io_size, size_t offset)
 {
     hid_t	file, dset, mem_space, file_space;
     hsize_t	i, hs_size[2];
     hsize_t	nio = 0;
     hssize_t	hs_offset[2];
     signed char	*buf = calloc (1, (size_t)(SQUARE (io_size)));
+#ifdef H5_WANT_H5_V1_4_COMPAT
     int		mdc_nelmts, rdcc_nelmts;
+#else /* H5_WANT_H5_V1_4_COMPAT */
+    int		mdc_nelmts;
+    size_t	rdcc_nelmts;
+#endif /* H5_WANT_H5_V1_4_COMPAT */
     double	w0;
 
     H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0);
@@ -312,10 +322,10 @@ test_diag (int op, hsize_t cache_size, hsize_t io_size, hsize_t offset)
 int
 main (void)
 {
-    hsize_t	io_size;
+    size_t	io_size;
     double	effic, io_percent;
     FILE	*f, *d;
-    int		cache_size;
+    size_t	cache_size;
     double	w0;
 
     /*
@@ -360,8 +370,8 @@ main (void)
 	 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);
+	    io_size = MAX (1, (size_t)(CH_SIZE*io_percent));
+	    printf ("Rowmaj-rd %8d %8.2f", (int)cache_size, io_percent);
 	    fflush (stdout);
 	    effic = test_rowmaj (READ, cache_size, io_size);
 	    printf (" %8.2f\n", effic);
@@ -406,8 +416,8 @@ main (void)
 	 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);
+	    io_size = MAX (1, (size_t)(CH_SIZE*io_percent));
+	    printf ("Rowmaj-wr %8d %8.2f", (int)cache_size, io_percent);
 	    fflush (stdout);
 	    effic = test_rowmaj (WRITE, cache_size, io_size);
 	    printf (" %8.2f\n", effic);
@@ -451,8 +461,8 @@ main (void)
 	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);
+	    io_size = MAX (1, (size_t)(CH_SIZE*io_percent));
+	    printf ("Diag-rd   %8d %8.2f", (int)cache_size, io_percent);
 	    fflush (stdout);
 	    effic = test_diag (READ, cache_size, io_size, MAX (1, io_size/2));
 	    printf (" %8.2f\n", effic);
@@ -496,8 +506,8 @@ main (void)
 	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);
+	    io_size = MAX (1, (size_t)(CH_SIZE*io_percent));
+	    printf ("Diag-wr   %8d %8.2f", (int)cache_size, io_percent);
 	    fflush (stdout);
 	    effic = test_diag (WRITE, cache_size, io_size, MAX (1, io_size/2));
 	    printf (" %8.2f\n", effic);