Final merge of page buffering branch to develop

1 files changed, 86 insertions, 50 deletions

diff --git a/test/gen_filespace.c b/test/gen_filespace.c
index e0c42e8..52715ae 100644
--- a/test/gen_filespace.c
+++ b/test/gen_filespace.c
@@ -14,69 +14,105 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "hdf5.h"
+#include <assert.h>
 
 #define NELMTS(X)    	(sizeof(X)/sizeof(X[0]))	/* # of elements */
-#define TEST_THRESHOLD2	2             			/* Free space section threshold */
 
 const char *FILENAMES[] = {
-    "filespace_persist.h5",	/* H5F_FILE_SPACE_ALL_PERSIST */
-    "filespace_default.h5",	/* H5F_FILE_SPACE_ALL */
-    "filespace_aggr_vfd.h5",	/* H5F_FILE_SPACE_AGGR_VFD */
-    "filespace_vfd.h5",		/* H5F_FILE_SPACE_VFD */
-    "filespace_threshold.h5"	/* H5F_FILE_SPACE_ALL, non-default threshold */
+    "fsm_aggr_nopersist.h5",	/* H5F_FSPACE_STRATEGY_FSM_AGGR + not persisting free-space */
+    "fsm_aggr_persist.h5",		/* H5F_FSPACE_STRATEGY_FSM_AGGR + persisting free-space */
+    "paged_nopersist.h5",	    /* H5F_FSPACE_STRATEGY_PAGE + not persisting free-space */
+    "paged_persist.h5",		    /* H5F_FSPACE_STRATEGY_PAGE + persisting free-space */
+    "aggr.h5",	                /* H5F_FSPACE_STRATEGY_AGGR */
+    "none.h5"		            /* H5F_FSPACE_STRATEGY_NONE */
 };
 
 #define DATASET		"dset"
 #define NUM_ELMTS	100
+#define FALSE		0
+#define TRUE		1
+#define INC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)+1))
 
 /*
- * Compile and run this program in file-space branch to generate
- * HDF5 files with different kinds of file space strategies
- * Move the HDF5 files to the 1.6 and 1.8 branch for compatibility
- * testing:test_filespace_compatible() will use the files
+ * Compile and run this program in the trunk to generate
+ * HDF5 files with combinations of 4 file space strategies
+ * and persist/not persist free-space.
+ * The library creates the file space info message with "mark if unknown"
+ * in these files.
+ *
+ * Move these files to 1.8 branch for compatibility testing:
+ * test_filespace_compatible() in test/tfile.c will use these files.
+ *
+ * Copy these files from the 1.8 branch back to the trunk for 
+ * compatibility testing via test_filespace_round_compatible() in test/tfile.c.
+ *
  */
-static void gen_file(void)
-{
-    hid_t   	fid;
-    hid_t   	fcpl;
-    hid_t       dataset, space;
-    hsize_t     dim[1];
-    int         data[NUM_ELMTS];
-    size_t      j;			/* Local index variable */
-    int         i;			/* Local index variable */
-    H5F_file_space_type_t fs_type;	/* File space handling strategy */
-
-    for(j = 0, fs_type = H5F_FILE_SPACE_ALL_PERSIST; j < NELMTS(FILENAMES); j++, fs_type = (H5F_file_space_type_t)(fs_type + 1)) {
-	/* Get a copy of the default file creation property */
-	fcpl = H5Pcreate(H5P_FILE_CREATE);
-
-	if(fs_type == H5F_FILE_SPACE_NTYPES) /* last file */
-	    /* Set default strategy but non-default threshold */
-	    H5Pset_file_space(fcpl, H5F_FILE_SPACE_ALL, (hsize_t)TEST_THRESHOLD2);
-	else
-	    /* Set specified file space strategy and free space section threshold */
-	    H5Pset_file_space(fcpl, fs_type, (hsize_t)0);
-
-	/* Create the file with the file space info */
-	fid = H5Fcreate(FILENAMES[j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT);
-
-	dim[0] = NUM_ELMTS;
-	space = H5Screate_simple(1, dim, NULL);
-	dataset = H5Dcreate2(fid, DATASET, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-	for(i = 0; i < NUM_ELMTS; i++)
-	    data[i] = i;
-
-	H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
-	H5Dclose(dataset);
-	H5Sclose(space);
-	H5Fclose(fid);
-    }
-}
-
 int main(void)
 {
-    gen_file();
+    hid_t fid = -1;         /* File ID */
+    hid_t fcpl = -1;        /* File creation property list */
+    hid_t did = -1;         /* Dataset ID */
+    hid_t sid = -1;		    /* Dataspace ID */
+    hsize_t dim[1];			/* Dimension sizes */
+    int data[NUM_ELMTS];	/* Buffer for data */
+    int i, j;			    /* Local index variables */
+    H5F_fspace_strategy_t fs_strategy;	/* File space handling strategy */
+    unsigned fs_persist;     /* Persisting free-space or not */
+
+    j = 0;
+    for(fs_strategy = H5F_FSPACE_STRATEGY_FSM_AGGR; fs_strategy < H5F_FSPACE_STRATEGY_NTYPES; INC_ENUM(H5F_fspace_strategy_t, fs_strategy)) {
+        for(fs_persist = FALSE; fs_persist <= TRUE; fs_persist++) {
+
+            if(fs_persist && fs_strategy >= H5F_FSPACE_STRATEGY_AGGR)
+                continue;
+
+            /* Get a copy of the default file creation property */
+            if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+                goto error;
+
+            if(H5Pset_file_space_strategy(fcpl, fs_strategy, fs_persist, (hsize_t)1) < 0)
+                goto error;
+
+            /* Create the file with the file space info */
+            if((fid = H5Fcreate(FILENAMES[j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
+                goto error;
+
+            /* Create the dataset */
+            dim[0] = NUM_ELMTS;
+            if((sid = H5Screate_simple(1, dim, NULL)) < 0)
+                goto error;
+            if((did = H5Dcreate2(fid, DATASET, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                goto error;
+
+            for(i = 0; i < NUM_ELMTS; i++)
+                data[i] = i;
+
+            /* Write the dataset */
+            if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+                goto error;
+
+            /* Closing */
+            if(H5Dclose(did) < 0)
+                goto error;
+            if(H5Sclose(sid) < 0)
+                goto error;
+            if(H5Fclose(fid) < 0)
+                goto error;
+            if(H5Pclose(fcpl) < 0)
+                goto error;
+            ++j;
+        }
+    }
+    assert(j == NELMTS(FILENAMES));
 
     return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Sclose(did);
+        H5Pclose(fcpl);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
 }