Modify DAOS-M plugin to call daos_pool_connect at plugin initialization

time, using a communicator passed to the initialization function. Add public functions H5VLdaosm_init and H5VLdaosm_term. Apps no longer need to call daos_init and daos_fini. Updated examples. Other minor fixes/cleanup.

1 files changed, 9 insertions, 4 deletions

diff --git a/examples/h5dsm_dset_wpartial.c b/examples/h5dsm_dset_wpartial.c
index 79dc521..0056443 100644
--- a/examples/h5dsm_dset_wpartial.c
+++ b/examples/h5dsm_dset_wpartial.c
@@ -15,7 +15,6 @@ int main(int argc, char *argv[]) {
     int i, j;
 
     (void)MPI_Init(&argc, &argv);
-    (void)daos_init();
 
     MPI_Comm_rank(MPI_COMM_WORLD, &rank);
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
@@ -33,10 +32,14 @@ int main(int argc, char *argv[]) {
     if(0 != uuid_parse(argv[1], pool_uuid))
         ERROR;
 
+    /* Initialize VOL */
+    if(H5VLdaosm_init(MPI_COMM_WORLD, pool_uuid, pool_grp) < 0)
+        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)
+    if(H5Pset_fapl_daosm(fapl, MPI_COMM_WORLD, MPI_INFO_NULL) < 0)
         ERROR;
 
     /* Open file */
@@ -113,9 +116,11 @@ int main(int argc, char *argv[]) {
     if(H5Pclose(fapl) < 0)
         ERROR;
 
+    if(H5VLdaosm_term() < 0)
+        ERROR;
+
     printf("Success\n");
 
-    (void)daos_fini();
     (void)MPI_Finalize();
     return 0;
 
@@ -126,9 +131,9 @@ error:
         H5Sclose(file_space);
         H5Sclose(mem_space);
         H5Pclose(fapl);
+        H5VLdaosm_term();
     } H5E_END_TRY;
 
-    (void)daos_fini();
     (void)MPI_Finalize();
     return 1;
 }