Implement attribute read/write. Added examples for this. Added

optional snapshot parameter to h5dsm_file_open.c.  Other minor
fixes/cleanup.

4 files changed, 218 insertions, 3 deletions

diff --git a/examples/h5dsm_attr_read.c b/examples/h5dsm_attr_read.c
new file mode 100644
index 0000000..8909535
--- /dev/null
+++ b/examples/h5dsm_attr_read.c
@@ -0,0 +1,106 @@
+#include "h5dsm_example.h"
+#include <time.h>
+
+int main(int argc, char *argv[]) {
+    uuid_t pool_uuid;
+    char *pool_grp = NULL;
+    hid_t file = -1, obj = -1, attr = -1, fapl = -1;
+    int buf[4][6];
+    int i, j;
+    H5VL_daosm_snap_id_t snap_id;
+
+    (void)MPI_Init(&argc, &argv);
+    (void)daos_init();
+
+    /* Seed random number generator */
+    srand(time(NULL));
+
+    if(argc < 6 || argc > 7)
+        PRINTF_ERROR("argc must be 6 or 7\n");
+
+    /* Parse UUID */
+    if(0 != uuid_parse(argv[1], pool_uuid))
+        ERROR;
+
+    /* Set up FAPL */
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        ERROR;
+    if(H5Pset_fapl_daosm(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, pool_uuid, pool_grp) < 0)
+        ERROR;
+
+    /* Open snapshot if specified */
+    if(argc == 7) {
+        snap_id = (H5VL_daosm_snap_id_t)atoi(argv[6]);
+        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(argv[2], H5F_ACC_RDONLY, fapl)) < 0)
+        ERROR;
+
+    /* Open object */
+    if(!strcmp(argv[3], "-d") || !strcmp(argv[3], "-D")) {
+        if((obj = H5Dopen2(file, argv[4], H5P_DEFAULT)) < 0)
+            ERROR;
+    }
+    else {
+        if(strcmp(argv[3], "-g") && strcmp(argv[3], "-G"))
+            PRINTF_ERROR("argv[3] must be -d, -D, -g, or -G\n");
+        if((obj = H5Gopen2(file, argv[4], H5P_DEFAULT)) < 0)
+            ERROR;
+    }
+
+    /* Open attribute */
+    if((attr = H5Aopen(obj, argv[5], H5P_DEFAULT)) < 0)
+        ERROR;
+
+    printf("Reading attribute\n");
+
+    /* Initialize buffer */
+    for(i = 0; i < 4; i++)
+        for(j = 0; j < 6; j++)
+            buf[i][j] = -1;
+
+    /* Read data */
+    if(H5Aread(attr, H5T_NATIVE_INT, buf) < 0)
+        ERROR;
+
+    /* Print buffer */
+    printf("Successfully read data. Buffer is:\n");
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 6; j++)
+            printf("%d ", buf[i][j]);
+        printf("\n");
+    }
+
+    /* Close */
+    if(H5Aclose(attr) < 0)
+        ERROR;
+    if(H5Oclose(obj) < 0)
+        ERROR;
+    if(H5Fclose(file) < 0)
+        ERROR;
+    if(H5Pclose(fapl) < 0)
+        ERROR;
+
+    printf("Success\n");
+
+    (void)daos_fini();
+    (void)MPI_Finalize();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Aclose(attr);
+        H5Oclose(obj);
+        H5Fclose(file);
+        H5Pclose(fapl);
+    } H5E_END_TRY;
+
+    (void)daos_fini();
+    (void)MPI_Finalize();
+    return 1;
+}
+
diff --git a/examples/h5dsm_attr_write.c b/examples/h5dsm_attr_write.c
new file mode 100644
index 0000000..15f5ad1
--- /dev/null
+++ b/examples/h5dsm_attr_write.c
@@ -0,0 +1,100 @@
+#include "h5dsm_example.h"
+#include <time.h>
+
+int main(int argc, char *argv[]) {
+    uuid_t pool_uuid;
+    char *pool_grp = NULL;
+    hid_t file = -1, obj = -1, attr = -1, fapl = -1;
+    H5VL_daosm_snap_id_t snap_id;
+    int buf[4][6];
+    int i, j;
+
+    (void)MPI_Init(&argc, &argv);
+    (void)daos_init();
+
+    /* Seed random number generator */
+    srand(time(NULL));
+
+    if(argc < 6 || argc > 7)
+        PRINTF_ERROR("argc must be 6 or 7\n");
+
+    /* Parse UUID */
+    if(0 != uuid_parse(argv[1], pool_uuid))
+        ERROR;
+
+    /* Set up FAPL */
+    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        ERROR;
+    if(H5Pset_fapl_daosm(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, pool_uuid, pool_grp) < 0)
+        ERROR;
+
+    /* Open file */
+    if((file = H5Fopen(argv[2], H5F_ACC_RDWR, fapl)) < 0)
+        ERROR;
+
+    /* Open object */
+    if(!strcmp(argv[3], "-d") || !strcmp(argv[3], "-D")) {
+        if((obj = H5Dopen2(file, argv[4], H5P_DEFAULT)) < 0)
+            ERROR;
+    }
+    else {
+        if(strcmp(argv[3], "-g") && strcmp(argv[3], "-G"))
+            PRINTF_ERROR("argv[3] must be -d, -D, -g, or -G\n");
+        if((obj = H5Gopen2(file, argv[4], H5P_DEFAULT)) < 0)
+            ERROR;
+    }
+
+    /* Open attribute */
+    if((attr = H5Aopen(obj, argv[5], H5P_DEFAULT)) < 0)
+        ERROR;
+
+    /* Fill and print buffer */
+    printf("Writing data. Buffer is:\n");
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 6; j++) {
+            buf[i][j] = rand() % 10;
+            printf("%d ", buf[i][j]);
+        }
+        printf("\n");
+    }
+
+    /* Write data */
+    if(H5Awrite(attr, H5T_NATIVE_INT, buf) < 0)
+        ERROR;
+
+    /* Save snapshot if requested */
+    if(argc == 7) {
+        if(H5VLdaosm_snap_create(file, &snap_id) < 0)
+            ERROR;
+        printf("Saved snapshot: snap_id = %llu\n", (long long unsigned)snap_id);
+    } /* end if */
+
+    /* Close */
+    if(H5Aclose(attr) < 0)
+        ERROR;
+    if(H5Oclose(obj) < 0)
+        ERROR;
+    if(H5Fclose(file) < 0)
+        ERROR;
+    if(H5Pclose(fapl) < 0)
+        ERROR;
+
+    printf("Success\n");
+
+    (void)daos_fini();
+    (void)MPI_Finalize();
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Aclose(attr);
+        H5Oclose(obj);
+        H5Fclose(file);
+        H5Pclose(fapl);
+    } H5E_END_TRY;
+
+    (void)daos_fini();
+    (void)MPI_Finalize();
+    return 1;
+}
+
diff --git a/examples/h5dsm_dset_read.c b/examples/h5dsm_dset_read.c
index 18d41d8..21a811a 100644
--- a/examples/h5dsm_dset_read.c
+++ b/examples/h5dsm_dset_read.c
@@ -44,7 +44,7 @@ int main(int argc, char *argv[]) {
     if((dset = H5Dopen2(file, argv[3], H5P_DEFAULT)) < 0)
         ERROR;
 
-    printf("Reading dataset");
+    printf("Reading dataset\n");
 
     /* Initialize buffer */
     for(i = 0; i < 4; i++)
diff --git a/examples/h5dsm_file_open.c b/examples/h5dsm_file_open.c
index b3846d0..3a1d399 100644
--- a/examples/h5dsm_file_open.c
+++ b/examples/h5dsm_file_open.c
@@ -4,12 +4,13 @@ int main(int argc, char *argv[]) {
     uuid_t pool_uuid;
     char *pool_grp = NULL;
     hid_t file = -1, fapl = -1;
+    H5VL_daosm_snap_id_t snap_id;
 
     (void)MPI_Init(&argc, &argv);
     (void)daos_init();
 
-    if(argc != 3)
-        PRINTF_ERROR("argc != 3\n");
+    if(argc < 3 || argc > 4)
+        PRINTF_ERROR("argc must be 3 or 4\n");
 
     /* Parse UUID */
     if(0 != uuid_parse(argv[1], pool_uuid))
@@ -21,6 +22,14 @@ 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 == 4) {
+        snap_id = (H5VL_daosm_snap_id_t)atoi(argv[3]);
+        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_RDONLY, fapl, NULL)) < 0)
         ERROR;