Fixing code for new SSG version

brobey · Dec 12, 2019 · 47a7c06 · 47a7c06
1 parent 88e09de
commit 47a7c06
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/sdsdkv-client.h b/src/sdsdkv-client.h
@@ -65,10 +65,10 @@ struct sdsdkv_client : public personality {
     int
     m_ssg_init(void)
     {
-        int rc = ssg_init(m_mid);
+        int rc = ssg_init();
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;
         //
-        rc = ssg_group_observe(m_gid);
+        rc = ssg_group_observe(m_mid, m_gid);
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;
         //
         return SDSDKV_SUCCESS;
@@ -241,7 +241,10 @@ struct sdsdkv_client : public personality {
                  root,
                  m_mpi->get_world_comm()
              );
-        if (rc != SDSDKV_SUCCESS) goto out;
+        if (rc != SDSDKV_SUCCESS) {
+            if (gid_bits) free(gid_bits);
+            return(rc);
+        }
         //
         gid_bits = (char *)calloc(gid_size_ul, sizeof(*gid_bits));
         if (!gid_bits) return SDSDKV_ERR_OOR;
@@ -253,10 +256,14 @@ struct sdsdkv_client : public personality {
                  root,
                  m_mpi->get_world_comm()
              );
-        if (rc != SDSDKV_SUCCESS) goto out;
+        if (rc != SDSDKV_SUCCESS) {
+            if (gid_bits) free(gid_bits);
+            return(rc);
+        }
+        //
+        int num_addrs = 0;
+        ssg_group_id_deserialize(gid_bits, gid_size_ul, &num_addrs, &m_gid);
         //
-        ssg_group_id_deserialize(gid_bits, gid_size_ul, &m_gid);
-    out:
         if (gid_bits) free(gid_bits);
         //
         return rc;

diff --git a/src/sdsdkv-server.h b/src/sdsdkv-server.h
@@ -81,7 +81,7 @@ struct sdsdkv_server : public personality {
     int
     m_ssg_init(void)
     {
-        int rc = ssg_init(m_mid);
+        int rc = ssg_init();
         if (rc != SSG_SUCCESS) return SDSDKV_ERR_SERVICE;
         //
         int world_id = m_mpi->get_world_id();
@@ -214,7 +214,7 @@ struct sdsdkv_server : public personality {
         char *gid_bits = nullptr;
         size_t gid_size = 0;
         //
-        ssg_group_id_serialize(m_gid, &gid_bits, &gid_size);
+        ssg_group_id_serialize(m_gid, SSG_ALL_MEMBERS, &gid_bits, &gid_size);
         if (!gid_bits || gid_size == 0) {
             return SDSDKV_ERR_SERVICE;
         }