[svn-r24775] - update use of H5Fclose_ff to add the persist flag.

- fix bug in prefetch test (need to persist before prefetch).

12 files changed, 22 insertions, 17 deletions

diff --git a/examples/h5ff_client_M6.2_demo.c b/examples/h5ff_client_M6.2_demo.c
index 03a9e0f..f36892c 100644
--- a/examples/h5ff_client_M6.2_demo.c
+++ b/examples/h5ff_client_M6.2_demo.c
@@ -464,7 +464,7 @@ int main( int argc, char **argv ) {
 

    /* Close the file, then barrier to make sure all have closed it. */

    fprintf( stderr, "M6.2-r%d: close the container (Step 17)\n", my_rank );

-   ret = H5Fclose_ff( file_id, H5_EVENT_STACK_NULL ); ASSERT_RET;

+   ret = H5Fclose_ff( file_id, 1, H5_EVENT_STACK_NULL ); ASSERT_RET;

 

    MPI_Barrier( MPI_COMM_WORLD );

 

@@ -510,7 +510,7 @@ int main( int argc, char **argv ) {
 

    /* Close 2 H5 Objects that are still open */

    fprintf( stderr, "M6.2-r%d: close all h5 objects that are still open\n", my_rank );

-   ret = H5Fclose_ff( file_id, H5_EVENT_STACK_NULL ); ASSERT_RET;

+   ret = H5Fclose_ff( file_id, 1, H5_EVENT_STACK_NULL ); ASSERT_RET;

    ret = H5Pclose( fapl_id ); ASSERT_RET;

 

    fprintf( stderr, "M6.2-r%d: Finalize EFF stack\n", my_rank );

diff --git a/examples/h5ff_client_analysis.c b/examples/h5ff_client_analysis.c
index 26ff8a7..df375f1 100644
--- a/examples/h5ff_client_analysis.c
+++ b/examples/h5ff_client_analysis.c
@@ -208,7 +208,7 @@ write_dataset(const char *file_name, const char *dataset_name,
     ret = H5Fclose(file_id);
     assert(0 == ret);
 #else
-    ret = H5Fclose_ff(file_id, H5_EVENT_STACK_NULL);
+    ret = H5Fclose_ff(file_id, 0, H5_EVENT_STACK_NULL);
     assert(0 == ret);
 #endif
 }
diff --git a/examples/h5ff_client_attr.c b/examples/h5ff_client_attr.c
index b9c4857..095d1bd 100644
--- a/examples/h5ff_client_attr.c
+++ b/examples/h5ff_client_attr.c
@@ -301,7 +301,7 @@ int main(int argc, char **argv) {
     ret = H5Pclose(fapl_id);
     assert(ret == 0);
 
-    H5Fclose_ff(file_id, H5_EVENT_STACK_NULL);
+    H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL);
 
     H5ESget_count(e_stack, &num_events);
     H5ESwait_all(e_stack, &status);
diff --git a/examples/h5ff_client_dset.c b/examples/h5ff_client_dset.c
index 694e14a..181a619 100644
--- a/examples/h5ff_client_dset.c
+++ b/examples/h5ff_client_dset.c
@@ -573,7 +573,7 @@ int main(int argc, char **argv) {
     ret = H5Gclose_ff(gid1, e_stack);
     assert(ret == 0);
 
-    H5Fclose_ff(file_id, H5_EVENT_STACK_NULL);
+    H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL);
 
     H5ESget_count(e_stack, &num_events);
 
diff --git a/examples/h5ff_client_evict_deltas.c b/examples/h5ff_client_evict_deltas.c
index 00c2aa8..f47a39b 100644
--- a/examples/h5ff_client_evict_deltas.c
+++ b/examples/h5ff_client_evict_deltas.c
@@ -218,6 +218,9 @@ int main(int argc, char **argv) {
 

         ret = H5Devict_ff(did, 2, H5P_DEFAULT, H5_EVENT_STACK_NULL);

         assert(0 == ret);

+

+        ret = H5Mevict_ff(map, 2, H5P_DEFAULT, H5_EVENT_STACK_NULL);

+        assert(0 == ret);

     }

 

     MPI_Barrier(MPI_COMM_WORLD);

@@ -240,7 +243,7 @@ int main(int argc, char **argv) {
 

     /* closing the container also acts as a wait all on all pending requests 

        on the container. */

-    assert(H5Fclose_ff(file_id, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL) == 0);

 

     H5Sclose(sid);

     H5Pclose(fapl_id);

diff --git a/examples/h5ff_client_links.c b/examples/h5ff_client_links.c
index a643cda..390bbd4 100644
--- a/examples/h5ff_client_links.c
+++ b/examples/h5ff_client_links.c
@@ -281,7 +281,7 @@ int main(int argc, char **argv) {
 

     /* closing the container also acts as a wait all on all pending requests 

        on the container. */

-    assert(H5Fclose_ff(file_id, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL) == 0);

 

     /* wait on all requests and print completion status */

     H5ESget_count(e_stack, &num_events);

diff --git a/examples/h5ff_client_map.c b/examples/h5ff_client_map.c
index 8574d42..a1fa6f0 100644
--- a/examples/h5ff_client_map.c
+++ b/examples/h5ff_client_map.c
@@ -456,7 +456,7 @@ int main(int argc, char **argv) {
 

     /* closing the container also acts as a wait all on all pending requests 

        on the container. */

-    assert(H5Fclose_ff(file_id, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL) == 0);

 

     fprintf(stderr, "\n*****************************************************************************************************************\n");

     fprintf(stderr, "Wait on everything in ES and check Results of operations in ES\n");

diff --git a/examples/h5ff_client_multiple_cont.c b/examples/h5ff_client_multiple_cont.c
index 1bc57d6..d7d54f1 100644
--- a/examples/h5ff_client_multiple_cont.c
+++ b/examples/h5ff_client_multiple_cont.c
@@ -377,8 +377,8 @@ int main(int argc, char **argv) {
     ret = H5RCclose(rid2);

     assert(0 == ret);

 

-    assert(H5Fclose_ff(fid1, H5_EVENT_STACK_NULL) == 0);

-    assert(H5Fclose_ff(fid2, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(fid1, 1, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(fid2, 1, H5_EVENT_STACK_NULL) == 0);

 

     /* wait on all requests and print completion status */

     H5ESget_count(e_stack, &num_events);

diff --git a/examples/h5ff_client_obj.c b/examples/h5ff_client_obj.c
index 9051751..59e64f6 100644
--- a/examples/h5ff_client_obj.c
+++ b/examples/h5ff_client_obj.c
@@ -283,7 +283,7 @@ int main(int argc, char **argv) {
 

     /* closing the container also acts as a wait all on all pending requests 

        on the container. */

-    assert(H5Fclose_ff(file_id, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL) == 0);

 

     assert(exists);

 

diff --git a/examples/h5ff_client_prefetch.c b/examples/h5ff_client_prefetch.c
index f2f4917..d3c119a 100644
--- a/examples/h5ff_client_prefetch.c
+++ b/examples/h5ff_client_prefetch.c
@@ -207,6 +207,11 @@ int main(int argc, char **argv) {
         assert(rid2 > 0);

     }

 

+    if(0 == my_rank) {

+        ret = H5RCpersist(rid2, H5_EVENT_STACK_NULL);

+        assert(ret == 0);

+    }

+

     gid = H5Oopen_ff(file_id, "G1", H5P_DEFAULT, rid2);

     assert(gid);

     dtid = H5Oopen_ff(file_id, "DT1", H5P_DEFAULT, rid2);

@@ -267,15 +272,12 @@ int main(int argc, char **argv) {
         assert(0 == ret);

         H5Pclose(dapl_id);

 

-#if 0

         mapl_id = H5Pcreate (H5P_MAP_ACCESS);

         ret = H5Pset_evict_replica(mapl_id, map_replica);

         assert(0 == ret);

         ret = H5Mevict_ff(map, 2, mapl_id, H5_EVENT_STACK_NULL);

         assert(0 == ret);

         H5Pclose(mapl_id);

-#endif

-

     }

 

     MPI_Barrier(MPI_COMM_WORLD);

@@ -304,7 +306,7 @@ int main(int argc, char **argv) {
 

     /* closing the container also acts as a wait all on all pending requests 

        on the container. */

-    assert(H5Fclose_ff(file_id, H5_EVENT_STACK_NULL) == 0);

+    assert(H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL) == 0);

 

     H5Sclose(sid);

     H5Pclose(fapl_id);

diff --git a/examples/h5ff_client_view.c b/examples/h5ff_client_view.c
index c3620f6..0cf0169 100644
--- a/examples/h5ff_client_view.c
+++ b/examples/h5ff_client_view.c
@@ -401,7 +401,7 @@ test_view(const char *file_name, const char *dataset_name,
     MPI_Barrier(MPI_COMM_WORLD);
 
     /* Close the file. */
-    ret = H5Fclose_ff(file_id, H5_EVENT_STACK_NULL);
+    ret = H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL);
     assert(0 == ret);
 }
 
diff --git a/examples/h5ff_client_vl_data.c b/examples/h5ff_client_vl_data.c
index b82f40c..c08230d 100644
--- a/examples/h5ff_client_vl_data.c
+++ b/examples/h5ff_client_vl_data.c
@@ -299,7 +299,7 @@ int main(int argc, char **argv) {
     ret = H5Dclose_ff(did2, e_stack);
     assert(ret == 0);
 
-    H5Fclose_ff(file_id, H5_EVENT_STACK_NULL);
+    H5Fclose_ff(file_id, 1, H5_EVENT_STACK_NULL);
 
     H5ESget_count(e_stack, &num_events);
     H5ESwait_all(e_stack, &status);