[svn-r789] Changes since 19981023

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

./MANIFEST
./test/Makefile.in
./test/flush1.c			[NEW]
./test/flush2.c			[NEW]
	Test to see if calling H5Fflush() results in a consistent
	file.

./src/H5.c
./src/H5A.c
./src/H5D.c
./src/H5Fistore.c
./src/H5I.c
./src/H5S.c
./src/H5Shyper.c
./src/H5Sselect.c
./src/H5TB.c
	Changed comparisons against SUCCEED and FAIL to >=0 and <0 in
	about 15 places.

./src/H5.c
./src/H5V.c
./src/H5detect.c
./src/H5private.h
./src/H5public.h
./test/big.c
./test/chunk.c
./test/cmpd_dset.c
./test/dsets.c
./test/dtypes.c
./test/external.c
./test/fillval.c
./test/iopipe.c
./test/links.c
./test/mount.c
./test/mtime.c
./test/ragged.c
./test/shtype.c
./test/unlink.c
	Removed ^M from the end of lines inserted on broken OS's ;-)

./src/H5private.h
	Changed c++ comments to c comments.

./src/H5R.c
	Added tracing macros.

6 files changed, 299 insertions, 11 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 3b43e76..98f4af0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -12,7 +12,7 @@ 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.
 TESTS=testhdf5 gheap hyperslab istore bittests dtypes dsets cmpd_dset extend \
-      external shtype links unlink big mtime fillval mount
+      external shtype links unlink big mtime fillval mount flush1 flush2
 TIMINGS=iopipe chunk ragged overhead
 
 # Temporary files
@@ -25,17 +25,18 @@ MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5  \
 	    shtype2a.h5 shtype2b.h5 shtype3.h5 links.h5 chunk.h5 big.data    \
 	    big[0-9][0-9][0-9][0-9][0-9].h5 dtypes1.h5 dtypes2.h5 tattr.h5   \
 	    tselect.h5 mtime.h5 ragged.h5 grptime.h5 unlink.h5 overhead.h5   \
-	    fillval_[0-9].h5 mount_[0-9].h5 trefer.h5
+	    fillval_[0-9].h5 mount_[0-9].h5 trefer.h5 flush.h5
 CLEAN=$(TIMINGS)
 
 # Source and object files for programs...  The TEST_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.
-TEST_SRC=testhdf5.c tattr.c tfile.c theap.c tmeta.c tohdr.c trefer.c tselect.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 chunk.c bittests.c \
-    mtime.c ragged.c unlink.c overhead.c fillval.c mount.c
+TEST_SRC=testhdf5.c tattr.c tfile.c theap.c tmeta.c tohdr.c trefer.c         \
+    tselect.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  \
+    chunk.c bittests.c mtime.c ragged.c unlink.c overhead.c fillval.c        \
+    mount.c flush1.c flush2.c
 TEST_OBJ=$(TEST_SRC:.c=.o)
 
 # Private header files (not to be installed)...
@@ -119,4 +120,10 @@ fillval: fillval.o ../src/libhdf5.a
 mount: mount.o ../src/libhdf5.a
 	$(CC) $(CFLAGS) -o $@ mount.o ../src/libhdf5.a $(LIBS)
 
+flush1: flush1.o ../src/libhdf5.a
+	$(CC) $(CFLAGS) -o $@ flush1.o ../src/libhdf5.a $(LIBS)
+
+flush2: flush2.o ../src/libhdf5.a
+	$(CC) $(CFLAGS) -o $@ flush2.o ../src/libhdf5.a $(LIBS)
+
 @CONCLUDE@
diff --git a/test/chunk.c b/test/chunk.c
index c0cbb9f..5af7d46 100644
--- a/test/chunk.c
+++ b/test/chunk.c
@@ -47,9 +47,9 @@
 #define RM_CACHE_DELT	5
 #define RM_START	0.50
 #define RM_END	        5.00
-#define RM_DELTA	0.5
-#define RM_W0		1.0
-#define RM_NRDCC	5210
+#define RM_DELTA	0.50
+#define RM_W0		0.0
+#define RM_NRDCC	521
 
 /* Diagonal test */
 #define DIAG_CACHE_STRT	25
@@ -57,7 +57,7 @@
 #define DIAG_CACHE_DELT	5
 #define DIAG_START	0.50
 #define DIAG_END	5.00
-#define DIAG_DELTA	0.5
+#define DIAG_DELTA	0.50
 /* #define DIAG_W0		0.65 */
 /* #define DIAG_NRDCC		521 */
 
diff --git a/test/flush1.c b/test/flush1.c
new file mode 100644
index 0000000..02ddbca
--- /dev/null
+++ b/test/flush1.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 1998 NCSA
+ *                    All rights reserved.
+ *
+ * Programmer:  Robb Matzke <matzke@llnl.gov>
+ *              Friday, October 23, 1998
+ *
+ * Purpose:	This is the first half of a two-part test that makes sure
+ *		that a file can be read after an application crashes as long
+ *		as the file was flushed first.  We simulate a crash by
+ *		calling _exit(0) since this doesn't flush HDF5 caches but
+ *		still exits with success.
+ */
+#include <hdf5.h>
+#include <stdio.h>
+#include <unistd.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_1	"flush.h5"	/*do not clean up*/
+
+
+
+/*-------------------------------------------------------------------------
+ * Function:	display_error_cb
+ *
+ * Purpose:	Displays the error stack after printing "*FAILED*".
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	-1
+ *
+ * Programmer:	Robb Matzke
+ *		Wednesday, March  4, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+display_error_cb (void __unused__ *client_data)
+{
+    puts ("*FAILED*");
+    H5Eprint (stdout);
+    return 0;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ * Purpose:	Part 1 of a two-part H5Fflush() test.
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	1
+ *
+ * Programmer:	Robb Matzke
+ *              Friday, October 23, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    hid_t	file, dcpl, space, dset, groups, grp;
+    hsize_t	ds_size[2] = {100, 100};
+    hsize_t	ch_size[2] = {5, 5};
+    double	the_data[100][100];
+    hsize_t	i, j;
+    char	name[256];
+
+    printf("%-70s", "Testing H5Fflush (part1)");
+    fflush(stdout);
+    H5Eset_auto(display_error_cb, NULL);
+
+    /* Create the file */
+    if ((file=H5Fcreate(FILE_NAME_1, H5F_ACC_TRUNC,
+			H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
+    
+    /* Create a chunked dataset */
+    if ((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
+    if (H5Pset_chunk(dcpl, 2, ch_size)<0) goto error;
+    if ((space=H5Screate_simple(2, ds_size, NULL))<0) goto error;
+    if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_FLOAT, space, H5P_DEFAULT))<0)
+	goto error;
+
+    /* Write some data */
+    for (i=0; i<ds_size[0]; i++) {
+	for (j=0; j<ds_size[1]; j++) {
+	    the_data[i][j] = (double)i/((double)j+1);
+	}
+    }
+    if (H5Dwrite(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
+		 the_data)<0) goto error;
+
+    /* Create some groups */
+    if ((groups=H5Gcreate(file, "some_groups", 0))<0) goto error;
+    for (i=0; i<100; i++) {
+	sprintf(name, "grp%02u", (unsigned)i);
+	if ((grp=H5Gcreate(groups, name, 0))<0) goto error;
+	if (H5Gclose(grp)<0) goto error;
+    }
+
+    /* Flush and exit without closing the library */
+    if (H5Fflush(file, H5F_SCOPE_GLOBAL)<0) goto error;
+    puts(" PASSED");
+    fflush(stdout);
+    fflush(stderr);
+    _exit(0);
+
+ error:
+    printf("*FAILED*");
+    return 1;
+}
+
+    
+    
+	
diff --git a/test/flush2.c b/test/flush2.c
new file mode 100644
index 0000000..a799619
--- /dev/null
+++ b/test/flush2.c
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 1998 NCSA
+ *                    All rights reserved.
+ *
+ * Programmer:  Robb Matzke <matzke@llnl.gov>
+ *              Friday, October 23, 1998
+ *
+ * Purpose:	This is the second half of a two-part test that makes sure
+ *		that a file can be read after an application crashes as long
+ *		as the file was flushed first.  This half tries to read the
+ *		file created by the first half.
+ */
+#undef NDEBUG
+#include <assert.h>
+#include <hdf5.h>
+#include <math.h>
+#include <stdio.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_1	"flush.h5"
+
+
+
+/*-------------------------------------------------------------------------
+ * Function:	cleanup
+ *
+ * Purpose:	Removes test files
+ *
+ * Return:	void
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, June  4, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static void
+cleanup (void)
+{
+    if (!getenv ("HDF5_NOCLEANUP")) {
+	remove (FILE_NAME_1);
+    }
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	display_error_cb
+ *
+ * Purpose:	Displays the error stack after printing "*FAILED*".
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	-1
+ *
+ * Programmer:	Robb Matzke
+ *		Wednesday, March  4, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+display_error_cb (void __unused__ *client_data)
+{
+    puts ("*FAILED*");
+    H5Eprint (stdout);
+    return 0;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:	main
+ *
+ * Purpose:	Part 1 of a two-part H5Fflush() test.
+ *
+ * Return:	Success:	0
+ *
+ *		Failure:	1
+ *
+ * Programmer:	Robb Matzke
+ *              Friday, October 23, 1998
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+main(void)
+{
+    hid_t	file, space, dset, groups, grp;
+    hsize_t	ds_size[2];
+    double	the_data[100][100], error;
+    hsize_t	i, j;
+    char	name[256];
+
+    printf("%-70s", "Testing H5Fflush (part2)");
+    fflush(stdout);
+    H5Eset_auto(display_error_cb, NULL);
+
+    /* Open the file */
+    if ((file=H5Fopen(FILE_NAME_1, H5F_ACC_RDONLY, H5P_DEFAULT))<0) goto error;
+    
+    /* Open the dataset */
+    if ((dset=H5Dopen(file, "dset"))<0) goto error;
+    if ((space=H5Dget_space(dset))<0) goto error;
+    if (H5Sget_simple_extent_dims(space, ds_size, NULL)<0) goto error;
+    assert(100==ds_size[0] && 100==ds_size[1]);
+
+    /* Read some data */
+    if (H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
+		the_data)<0) goto error;
+    for (i=0; i<ds_size[0]; i++) {
+	for (j=0; j<ds_size[1]; j++) {
+	    error = fabs(the_data[i][j]-(double)i/((double)j+1));
+	    assert(error<0.0001);
+	}
+    }
+
+    /* Open some groups */
+    if ((groups=H5Gopen(file, "some_groups"))<0) goto error;
+    for (i=0; i<100; i++) {
+	sprintf(name, "grp%02u", (unsigned)i);
+	if ((grp=H5Gopen(groups, name))<0) goto error;
+	if (H5Gclose(grp)<0) goto error;
+    }
+
+    if (H5Gclose(groups)<0) goto error;
+    if (H5Dclose(dset)<0) goto error;
+    if (H5Fclose(file)<0) goto error;
+    puts(" PASSED");
+    cleanup();
+    return 0;
+
+ error:
+    printf("*FAILED*");
+    return 1;
+}
+
+    
+    
+	
diff --git a/test/mount.c b/test/mount.c
index 4716795..b6231a8 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -30,6 +30,7 @@
 #undef __unused__
 #define __unused__
 #endif
+
 
 /*-------------------------------------------------------------------------
  * Function:	cleanup
diff --git a/test/ragged.c b/test/ragged.c
index f55d0f9..903a32e 100644
--- a/test/ragged.c
+++ b/test/ragged.c
@@ -200,7 +200,7 @@ ragged_write_all(hid_t ra, hsize_t rows_at_once)
     hsize_t		interval_nelmts;	/*elmts/interval timer	*/
 #else
 	hssize_t 	interval_nelmts;	/*elmts/interval timer	*/
-#endif 
+#endif
     hsize_t		*size=NULL;		/*size of each row	*/
     void		**buf=NULL;		/*buffer for each row	*/
     H5_timer_t		timer, timer_total;	/*performance timers	*/