Implement new transaction model, transactions are now hidden from the

API, H5TR functions have no effect.  Added support for H5Fflush.  Added H5VLdaosm_snap_create and
H5Pset_daosm_snap_open to save and load snapshots.  Added enforcement of
file access flags.  Updated examples.  Other minor fixes/cleanup.

1 files changed, 21 insertions, 15 deletions

diff --git a/examples/h5dsm_dset_r1m.c b/examples/h5dsm_dset_r1m.c
index 89d8b38..762dd2d 100644
--- a/examples/h5dsm_dset_r1m.c
+++ b/examples/h5dsm_dset_r1m.c
@@ -3,11 +3,12 @@
 
 int main(int argc, char *argv[]) {
     uuid_t pool_uuid;
-    char *pool_grp = "daos_tier0";
-    hid_t file = -1, dset = -1, trans = -1, fapl = -1;
+    char *pool_grp = NULL;
+    hid_t file = -1, dset = -1, fapl = -1;
     hid_t nfile = -1, ndset = -1;
     hsize_t dims[1] = {256 * 1024};
     int *buf = NULL, *nbuf = NULL;
+    H5VL_daosm_snap_id_t snap_id;
     int i;
 
     (void)MPI_Init(&argc, &argv);
@@ -16,8 +17,8 @@ int main(int argc, char *argv[]) {
     /* Seed random number generator */
     srand(time(NULL));
 
-    if(argc != 4)
-        PRINTF_ERROR("argc != 4\n");
+    if(argc < 4 || argc > 5)
+        PRINTF_ERROR("argc must be 4 or 5\n");
 
     /* Parse UUID */
     if(0 != uuid_parse(argv[1], pool_uuid))
@@ -29,16 +30,24 @@ int main(int argc, char *argv[]) {
     if(H5Pset_fapl_daosm(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, pool_uuid, pool_grp) < 0)
         ERROR;
 
+    /* Open snapshot if specified */
+    if(argc == 5) {
+        snap_id = (H5VL_daosm_snap_id_t)atoi(argv[4]);
+        printf("Opening snapshot %llu\n", (long long unsigned)snap_id);
+        if(H5Pset_daosm_snap_open(fapl, snap_id) < 0)
+            ERROR;
+    } /* end if */
+
     /* Open file */
-    if((file = H5Fopen_ff(argv[2], H5F_ACC_RDWR, fapl, &trans)) < 0)
+    if((file = H5Fopen(argv[2], H5F_ACC_RDWR, fapl)) < 0)
         ERROR;
 
     /* Open native file */
     if((nfile = H5Fopen(argv[2], H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         ERROR;
 
-    /* Create dataset */
-    if((dset = H5Dopen_ff(file, argv[3], H5P_DEFAULT, trans)) < 0)
+    /* Open dataset */
+    if((dset = H5Dopen2(file, argv[3], H5P_DEFAULT)) < 0)
         ERROR;
 
     /* Open native dataset */
@@ -53,7 +62,7 @@ int main(int argc, char *argv[]) {
 
     /* Read data */
     printf("Reading daos-m dataset\n");
-    if(H5Dread_ff(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf, trans) < 0)
+    if(H5Dread(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         ERROR;
     
     /* Read native data */
@@ -68,13 +77,11 @@ int main(int argc, char *argv[]) {
         printf("Buffers are equal\n");
 
     /* Close */
-    if(H5Dclose_ff(dset, -1) < 0)
+    if(H5Dclose(dset) < 0)
         ERROR;
     if(H5Dclose(ndset) < 0)
         ERROR;
-    if(H5TRclose(trans) < 0)
-        ERROR;
-    if(H5Fclose_ff(file, -1) < 0)
+    if(H5Fclose(file) < 0)
         ERROR;
     if(H5Fclose(nfile) < 0)
         ERROR;
@@ -93,10 +100,9 @@ int main(int argc, char *argv[]) {
 
 error:
     H5E_BEGIN_TRY {
-        H5Dclose_ff(dset, -1);
+        H5Dclose(dset);
         H5Dclose(ndset);
-        H5TRclose(trans);
-        H5Fclose_ff(file, -1);
+        H5Fclose(file);
         H5Fclose(nfile);
         H5Pclose(fapl);
     } H5E_END_TRY;