Final merge of page buffering branch to develop

1 files changed, 131 insertions, 87 deletions

diff --git a/test/dsets.c b/test/dsets.c
index 39b7c22..c090174 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -633,7 +633,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_userblock_offset(const char *env_h5_drvr, hid_t fapl)
+test_userblock_offset(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
 {
     char                filename[FILENAME_BUF_SIZE];
     hid_t		file = -1, fcpl = -1, dataset = -1, space = -1;
@@ -651,6 +651,9 @@ test_userblock_offset(const char *env_h5_drvr, hid_t fapl)
 
         if((fcpl=H5Pcreate(H5P_FILE_CREATE)) < 0) goto error;
         if(H5Pset_userblock(fcpl, (hsize_t)USER_BLOCK) < 0) goto error;
+	if(new_format)
+	    if(H5Pset_file_space_page_size(fcpl, (hsize_t)USER_BLOCK) < 0) 
+		goto error;
 
         if((file=H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
             goto error;
@@ -12658,18 +12661,24 @@ main(void)
 {
     char		filename[FILENAME_BUF_SIZE];
     hid_t		file, grp, fapl, fapl2;
+    hid_t fcpl = -1, fcpl2 = -1;
     unsigned new_format;
+    unsigned paged;
     int mdc_nelmts;
     size_t rdcc_nelmts;
     size_t rdcc_nbytes;
     double rdcc_w0;
     int	nerrors = 0;
     const char *envval;
+    hbool_t contig_addr_vfd;    /* Whether VFD used has a contigous address space */
 
     /* Don't run this test using certain file drivers */
     envval = HDgetenv("HDF5_DRIVER");
     if(envval == NULL)
-        envval = "sec2";
+        envval = "nomatch";
+
+    /* Current VFD that does not support contigous address space */
+    contig_addr_vfd = (hbool_t)(HDstrcmp(envval, "split") && HDstrcmp(envval, "multi"));
 
     /* Set the random # seed */
     HDsrandom((unsigned)HDtime(NULL));
@@ -12691,101 +12700,136 @@ main(void)
     /* Set the "use the latest version of the format" bounds for creating objects in the file */
     if(H5Pset_libver_bounds(fapl2, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR
 
+    /* create a file creation property list */
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        TEST_ERROR
+    if((fcpl2 = H5Pcopy(fcpl)) < 0) TEST_ERROR
+
+    /* Set file space strategy to paged aggregation and persisting free-space */
+    if(H5Pset_file_space_strategy(fcpl2, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0)
+        TEST_ERROR
+
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
 
-    /* Test with old & new format groups */
-    for(new_format = FALSE; new_format <= TRUE; new_format++) {
-        hid_t my_fapl;
+    /* Test with paged aggregation enabled or not */
+    for(paged = FALSE; paged <= TRUE; paged++) {
 
-        /* Set the FAPL for the type of format */
-        if(new_format) {
-            puts("\nTesting with new file format:");
-            my_fapl = fapl2;
-        } /* end if */
-        else {
-            puts("Testing with old file format:");
-            my_fapl = fapl;
-        } /* end else */
+        /* Temporary: skip testing for multi/split drivers:
+             fail file create when persisting free-space or using paged aggregation strategy */
+        if(!contig_addr_vfd && paged)
+            continue;
 
-        /* Create the file for this test */
-        if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, my_fapl)) < 0)
-            goto error;
+        /* Test with old & new format groups */
+        for(new_format = FALSE; new_format <= TRUE; new_format++) {
+            hid_t my_fapl, my_fcpl;
+
+            /* Set the FAPL for the type of format */
+            if(new_format) {
+                my_fapl = fapl2;
+                if(paged) {
+                    my_fcpl = fcpl2;
+                    puts("\nTesting with new file format and paged aggregation");
+                } else {
+                    my_fcpl = fcpl;
+                    puts("\nTesting with new file format and non-paged aggregation");
+                }
+            } /* end if */
+            else {
+                my_fapl = fapl;
+                if(paged) {
+                    my_fcpl = fcpl2;
+                    puts("Testing with old file format and paged aggregation:");
+                } else {
+                    my_fcpl = fcpl;
+                    puts("Testing with old file format and non-paged aggregation:");
+                }
+            } /* end else */
 
-        /* Cause the library to emit initial messages */
-        if((grp = H5Gcreate2(file, "emit diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            goto error;
-        if(H5Oset_comment(grp, "Causes diagnostic messages to be emitted") < 0)
-            goto error;
-        if(H5Gclose(grp) < 0)
-            goto error;
+            /* Create the file for this test */
+            if((file = H5Fcreate(filename, H5F_ACC_TRUNC, my_fcpl, my_fapl)) < 0)
+                goto error;
+
+            /* Cause the library to emit initial messages */
+            if((grp = H5Gcreate2(file, "emit diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                goto error;
+            if(H5Oset_comment(grp, "Causes diagnostic messages to be emitted") < 0)
+                goto error;
+            if(H5Gclose(grp) < 0)
+                goto error;
+
+            nerrors += (test_create(file) < 0 			? 1 : 0);
+            nerrors += (test_simple_io(envval, my_fapl) < 0		? 1 : 0);
+            nerrors += (test_compact_io(my_fapl) < 0  		? 1 : 0);
+            nerrors += (test_max_compact(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_conv_buffer(file) < 0			? 1 : 0);
+            nerrors += (test_tconv(file) < 0			? 1 : 0);
+            nerrors += (test_filters(file, my_fapl) < 0		? 1 : 0);
+            nerrors += (test_onebyte_shuffle(file) < 0 		? 1 : 0);
+            nerrors += (test_nbit_int(file) < 0 		        ? 1 : 0);
+            nerrors += (test_nbit_float(file) < 0         	        ? 1 : 0);
+            nerrors += (test_nbit_double(file) < 0         	        ? 1 : 0);
+            nerrors += (test_nbit_array(file) < 0 		        ? 1 : 0);
+            nerrors += (test_nbit_compound(file) < 0 		? 1 : 0);
+            nerrors += (test_nbit_compound_2(file) < 0 		? 1 : 0);
+            nerrors += (test_nbit_compound_3(file) < 0 		? 1 : 0);
+            nerrors += (test_nbit_int_size(file) < 0 		? 1 : 0);
+            nerrors += (test_nbit_flt_size(file) < 0 		? 1 : 0);
+            nerrors += (test_scaleoffset_int(file) < 0 		? 1 : 0);
+            nerrors += (test_scaleoffset_int_2(file) < 0 	        ? 1 : 0);
+            nerrors += (test_scaleoffset_float(file) < 0 	        ? 1 : 0);
+            nerrors += (test_scaleoffset_float_2(file) < 0 	        ? 1 : 0);
+            nerrors += (test_scaleoffset_double(file) < 0 	        ? 1 : 0);
+            nerrors += (test_scaleoffset_double_2(file) < 0 	? 1 : 0);
+            nerrors += (test_multiopen (file) < 0		        ? 1 : 0);
+            nerrors += (test_types(file) < 0       		        ? 1 : 0);
+            nerrors += (test_userblock_offset(envval, my_fapl, new_format) < 0  ? 1 : 0);
+            nerrors += (test_missing_filter(file) < 0		? 1 : 0);
+            nerrors += (test_can_apply(file) < 0		        ? 1 : 0);
+            nerrors += (test_can_apply2(file) < 0		        ? 1 : 0);
+            nerrors += (test_set_local(my_fapl) < 0	        	? 1 : 0);
+            nerrors += (test_can_apply_szip(file) < 0		? 1 : 0);
+            nerrors += (test_compare_dcpl(file) < 0		        ? 1 : 0);
+            nerrors += (test_copy_dcpl(file, my_fapl) < 0	        ? 1 : 0);
+            nerrors += (test_filter_delete(file) < 0		? 1 : 0);
+            nerrors += (test_filters_endianess() < 0	        ? 1 : 0);
+            nerrors += (test_zero_dims(file) < 0		        ? 1 : 0);
+            nerrors += (test_missing_chunk(file) < 0		? 1 : 0);
+            nerrors += (test_random_chunks(my_fapl) < 0		? 1 : 0);
 
-        nerrors += (test_create(file) < 0 			? 1 : 0);
-        nerrors += (test_simple_io(envval, my_fapl) < 0		? 1 : 0);
-        nerrors += (test_compact_io(my_fapl) < 0  		? 1 : 0);
-        nerrors += (test_max_compact(my_fapl) < 0  		? 1 : 0);
-        nerrors += (test_conv_buffer(file) < 0		        ? 1 : 0);
-        nerrors += (test_tconv(file) < 0			? 1 : 0);
-        nerrors += (test_filters(file, my_fapl) < 0		? 1 : 0);
-        nerrors += (test_onebyte_shuffle(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_int(file) < 0 		        ? 1 : 0);
-        nerrors += (test_nbit_float(file) < 0         	        ? 1 : 0);
-        nerrors += (test_nbit_double(file) < 0         	        ? 1 : 0);
-        nerrors += (test_nbit_array(file) < 0 		        ? 1 : 0);
-        nerrors += (test_nbit_compound(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_compound_2(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_compound_3(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_int_size(file) < 0 		? 1 : 0);
-        nerrors += (test_nbit_flt_size(file) < 0 		? 1 : 0);
-        nerrors += (test_scaleoffset_int(file) < 0 		? 1 : 0);
-        nerrors += (test_scaleoffset_int_2(file) < 0 	        ? 1 : 0);
-        nerrors += (test_scaleoffset_float(file) < 0 	        ? 1 : 0);
-        nerrors += (test_scaleoffset_float_2(file) < 0 	        ? 1 : 0);
-        nerrors += (test_scaleoffset_double(file) < 0 	        ? 1 : 0);
-        nerrors += (test_scaleoffset_double_2(file) < 0 	? 1 : 0);
-        nerrors += (test_multiopen (file) < 0		        ? 1 : 0);
-        nerrors += (test_types(file) < 0       		        ? 1 : 0);
-        nerrors += (test_userblock_offset(envval, my_fapl) < 0  ? 1 : 0);
-        nerrors += (test_missing_filter(file) < 0		? 1 : 0);
-        nerrors += (test_can_apply(file) < 0		        ? 1 : 0);
-        nerrors += (test_can_apply2(file) < 0		        ? 1 : 0);
-        nerrors += (test_set_local(my_fapl) < 0		        ? 1 : 0);
-        nerrors += (test_can_apply_szip(file) < 0		? 1 : 0);
-        nerrors += (test_compare_dcpl(file) < 0		        ? 1 : 0);
-        nerrors += (test_copy_dcpl(file, my_fapl) < 0	        ? 1 : 0);
-        nerrors += (test_filter_delete(file) < 0		? 1 : 0);
-        nerrors += (test_filters_endianess() < 0	        ? 1 : 0);
-        nerrors += (test_zero_dims(file) < 0		        ? 1 : 0);
-        nerrors += (test_missing_chunk(file) < 0		? 1 : 0);
-        nerrors += (test_random_chunks(my_fapl) < 0		? 1 : 0);
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        nerrors += (test_deprec(file) < 0			? 1 : 0);
+            nerrors += (test_deprec(file) < 0			? 1 : 0);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
-        nerrors += (test_huge_chunks(my_fapl) < 0		? 1 : 0);
-        nerrors += (test_chunk_cache(my_fapl) < 0		? 1 : 0);
-        nerrors += (test_big_chunks_bypass_cache(my_fapl) < 0   ? 1 : 0);
-        nerrors += (test_chunk_fast(envval, my_fapl) < 0	? 1 : 0);
-        nerrors += (test_reopen_chunk_fast(my_fapl) < 0		? 1 : 0);
-        nerrors += (test_chunk_fast_bug1(my_fapl) < 0           ? 1 : 0);
-        nerrors += (test_chunk_expand(my_fapl) < 0		? 1 : 0);
-        nerrors += (test_layout_extend(my_fapl) < 0		? 1 : 0);
-        nerrors += (test_fixed_array(my_fapl) < 0		? 1 : 0);
-        nerrors += (test_idx_compatible() < 0			? 1 : 0);
-        nerrors += (test_unfiltered_edge_chunks(my_fapl) < 0    ? 1 : 0);
-        nerrors += (test_single_chunk(my_fapl) < 0              ? 1 : 0);	
-        nerrors += (test_large_chunk_shrink(my_fapl) < 0        ? 1 : 0);
-        nerrors += (test_zero_dim_dset(my_fapl) < 0             ? 1 : 0);
-        nerrors += (test_swmr_non_latest(envval, my_fapl) < 0   ? 1 : 0);
-        nerrors += (test_earray_hdr_fd(envval, my_fapl) < 0     ? 1 : 0);
-        nerrors += (test_farray_hdr_fd(envval, my_fapl) < 0     ? 1 : 0);
-        nerrors += (test_bt2_hdr_fd(envval, my_fapl) < 0        ? 1 : 0);
-        nerrors += (test_storage_size(my_fapl) < 0              ? 1 : 0);
-
-        if(H5Fclose(file) < 0)
-            goto error;
-    } /* end for */
 
-    /* Close 2nd FAPL */
+            nerrors += (test_huge_chunks(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_chunk_cache(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_big_chunks_bypass_cache(my_fapl) < 0   ? 1 : 0);
+            nerrors += (test_chunk_fast(envval, my_fapl) < 0	? 1 : 0);
+            nerrors += (test_reopen_chunk_fast(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_chunk_fast_bug1(my_fapl) < 0           ? 1 : 0);
+            nerrors += (test_chunk_expand(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_layout_extend(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_fixed_array(my_fapl) < 0		? 1 : 0);
+            nerrors += (test_idx_compatible() < 0			? 1 : 0);
+            nerrors += (test_unfiltered_edge_chunks(my_fapl) < 0    ? 1 : 0);
+            nerrors += (test_single_chunk(my_fapl) < 0              ? 1 : 0);	
+            nerrors += (test_large_chunk_shrink(my_fapl) < 0        ? 1 : 0);
+            nerrors += (test_zero_dim_dset(my_fapl) < 0             ? 1 : 0);
+            nerrors += (test_storage_size(my_fapl) < 0              ? 1 : 0);
+
+            nerrors += (test_swmr_non_latest(envval, my_fapl) < 0   ? 1 : 0);
+            nerrors += (test_earray_hdr_fd(envval, my_fapl) < 0     ? 1 : 0);
+            nerrors += (test_farray_hdr_fd(envval, my_fapl) < 0     ? 1 : 0);
+            nerrors += (test_bt2_hdr_fd(envval, my_fapl) < 0        ? 1 : 0);
+
+            if(H5Fclose(file) < 0)
+                goto error;
+        } /* end for new_format */
+    } /* end for paged */
+
+    /* Close property lists */
     if(H5Pclose(fapl2) < 0) TEST_ERROR
+    if(H5Pclose(fcpl) < 0) TEST_ERROR
+    if(H5Pclose(fcpl2) < 0) TEST_ERROR
 
     /* Tests that do not use files */
     nerrors += (test_scatter() < 0                          ? 1 : 0);