Add support for attribute create/open/close. Add examples for attribute

create and open.  It is now possible to H5Gopen the root group.  Other
fixes/refactoring.

3 files changed, 173 insertions, 1 deletions

diff --git a/examples/h5dsm_attr_create.c b/examples/h5dsm_attr_create.c
new file mode 100644
index 0000000..a7e941a
--- /dev/null
+++ b/examples/h5dsm_attr_create.c
@@ -0,0 +1,90 @@
+#include "h5dsm_example.h"
+
+int main(int argc, char *argv[]) {
+    uuid_t pool_uuid;
+    char *pool_grp = NULL;
+    hid_t file = -1, obj = -1, attr = -1, space = -1, fapl = -1;
+    hsize_t dims[2] = {4, 6};
+    H5VL_daosm_snap_id_t snap_id;
+
+    (void)MPI_Init(&argc, &argv);
+    (void)daos_init();
+
+    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;
+
+    /* Set up dataspace */
+    if((space = H5Screate_simple(2, dims, NULL)) < 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;
+    }
+
+    printf("Creating attribute\n");
+
+    /* Create attribute */
+    if((attr = H5Acreate2(obj, argv[5], H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT)) < 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(H5Sclose(space) < 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);
+        H5Sclose(space);
+        H5Pclose(fapl);
+    } H5E_END_TRY;
+
+    (void)daos_fini();
+    (void)MPI_Finalize();
+    return 1;
+}
+
diff --git a/examples/h5dsm_attr_open.c b/examples/h5dsm_attr_open.c
new file mode 100644
index 0000000..dd79f2e
--- /dev/null
+++ b/examples/h5dsm_attr_open.c
@@ -0,0 +1,83 @@
+#include "h5dsm_example.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;
+
+    (void)MPI_Init(&argc, &argv);
+    (void)daos_init();
+
+    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;
+    }
+
+    printf("Opening attribute\n");
+
+    /* Open attribute */
+    if((attr = H5Aopen(obj, argv[5], H5P_DEFAULT)) < 0)
+        ERROR;
+
+    /* 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_open.c b/examples/h5dsm_dset_open.c
index be12e1c..b5b1def 100644
--- a/examples/h5dsm_dset_open.c
+++ b/examples/h5dsm_dset_open.c
@@ -4,7 +4,6 @@ int main(int argc, char *argv[]) {
     uuid_t pool_uuid;
     char *pool_grp = NULL;
     hid_t file = -1, dset = -1, fapl = -1;
-    hsize_t dims[1] = {1};
     H5VL_daosm_snap_id_t snap_id;
 
     (void)MPI_Init(&argc, &argv);