Updating Distributed keyval for SSG changes

brobey · Dec 11, 2019 · 756246d · 756246d
1 parent 896356f
commit 756246d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -35,12 +35,15 @@ spack install --dirty ch-placement
 # Refresh spack environment.
 source spack/share/spack/setup-env.sh
 # Load required modules.
-source <(spack module loads --dependencies sdskeyval ssg ch-placement)
+#spack load -r autoconf
+#spack load -r automake
+#spack load -r libtool
+source <(spack module tcl loads --dependencies sdskeyval ssg ch-placement autoconf automake libtool)
 ```
 
 ### Get and build sdsdkv.
 
 ```
 git clone https://xgitlab.cels.anl.gov/sds/sdsdkv.git
-cd sdsdkv && ./autogen && ./configure CXX=mpic++ && make
+cd sdsdkv && autoreconf --force --install && ./configure CXX=mpic++ && make
 ```
diff --git a/src/sdsdkv-client.h b/src/sdsdkv-client.h
@@ -68,7 +68,7 @@ struct sdsdkv_client : public personality {
         int rc = ssg_init(m_mid);
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;
         //
-        rc = ssg_group_attach(m_gid);
+        rc = ssg_group_observe(m_gid);
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;
         //
         return SDSDKV_SUCCESS;
@@ -80,7 +80,7 @@ struct sdsdkv_client : public personality {
         hg_size_t gsize = ssg_get_group_size(m_gid);
         //
         for (decltype(gsize) i = 0; i < gsize; ++i) {
-            hg_addr_t server_addr = ssg_get_addr(m_gid, i);
+            hg_addr_t server_addr = ssg_get_group_member_addr(m_gid, i);
             if (server_addr == HG_ADDR_NULL) return SDSDKV_ERR_SERVICE;
             m_server_addrs.push_back(server_addr);
             //
@@ -211,7 +211,7 @@ struct sdsdkv_client : public personality {
         }
         sdskv_client_finalize(m_kvcl);
         //
-        rc = ssg_group_detach(m_gid);
+        rc = ssg_group_unobserve(m_gid);
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;
         rc = ssg_group_destroy(m_gid);
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;

diff --git a/src/sdsdkv-personality.h b/src/sdsdkv-personality.h
@@ -81,7 +81,7 @@ class personality {
         : m_mpi(nullptr)
         , m_config(nullptr)
         , m_mid(MARGO_INSTANCE_NULL)
-        , m_gid(SSG_GROUP_ID_NULL) { }
+        , m_gid(SSG_GROUP_ID_INVALID) { }
     //
     virtual
     ~personality(void)

diff --git a/src/sdsdkv-server.h b/src/sdsdkv-server.h
@@ -91,7 +91,7 @@ struct sdsdkv_server : public personality {
                     &group_update_cb,
                     &world_id
                 );
-        if (m_gid == SSG_GROUP_ID_NULL) return SDSDKV_ERR_SERVICE;
+        if (m_gid == SSG_GROUP_ID_INVALID) return SDSDKV_ERR_SERVICE;
         //
         return SDSDKV_SUCCESS;
     }