From 0d329f87ffbf20794ec419a19a9d0991ab8ee551 Mon Sep 17 00:00:00 2001
From: Shane Snyder <ssnyder@mcs.anl.gov>
Date: Fri, 15 Jun 2018 14:16:48 -0500
Subject: [PATCH] new fn for generating sparse member ids

---
 src/ssg-internal.h |  7 +++++++
 src/ssg.c          | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/ssg-internal.h b/src/ssg-internal.h
index fa7ecd0..a84b9ea 100644
--- a/src/ssg-internal.h
+++ b/src/ssg-internal.h
@@ -105,6 +105,13 @@ enum ssg_group_descriptor_owner_status
 
 #define ssg_hashlittle2 hashlittle2
 extern void hashlittle2(const void *key, size_t length, uint32_t *pc, uint32_t *pb);
+static inline ssg_hash64_str(const char * str)
+    uint32_t lower, upper;
+    uint64_t hash;
+    ssg_hashlittle2(__str, strlen(__str), &lower, &upper);
+    hash = lower + (((uint64_t)upper)<<32);
+    return hash;
+}
 
 void ssg_register_rpcs(
     void);
diff --git a/src/ssg.c b/src/ssg.c
index fd82a09..3ede971 100644
--- a/src/ssg.c
+++ b/src/ssg.c
@@ -53,6 +53,8 @@ static int ssg_group_view_create(
     const char * const group_addr_strs[], int group_size,
     hg_addr_t self_addr, ssg_member_id_t * self_id,
     ssg_group_view_t * view);
+static ssg_member_id_t ssg_gen_member_id(
+    const char * addr_str);
 static void ssg_group_view_destroy(
     ssg_group_view_t * view);
 static void ssg_group_destroy_internal(
@@ -132,7 +134,6 @@ ssg_group_id_t ssg_group_create(
     ssg_membership_update_cb update_cb,
     void * update_cb_dat)
 {
-    uint32_t upper, lower;
     uint64_t name_hash;
     hg_addr_t self_addr = HG_ADDR_NULL;
     ssg_group_descriptor_t *tmp_descriptor;
@@ -143,8 +144,7 @@ ssg_group_id_t ssg_group_create(
 
     if (!ssg_inst) return group_id;
 
-    ssg_hashlittle2(group_name, strlen(group_name), &lower, &upper);
-    name_hash = lower + (((uint64_t)upper)<<32);
+    name_hash = ssg_hash64_str(group_name);
 
     /* generate a unique ID for this group  */
     tmp_descriptor = ssg_group_descriptor_create(name_hash, group_addr_strs[0],
@@ -1153,7 +1153,15 @@ fini:
 static ssg_member_id_t ssg_gen_member_id(
     const char * addr_str)
 {
-    return SSG_MEMBER_ID_INVALID;
+    char tmp[64] = {0};
+    ssg_member_id_t id = (ssg_member_id_t)ssg_hash64_str(addr_str);
+    while (id == SSG_MEMBER_ID_INVALID)
+    {
+        if (tmp[0] == 0) strncpy(tmp, addr_str, 63);
+        tmp[0]++;
+        id = (ssg_member_id_t)ssg_hash64_str(tmp);
+    }
+    return id;
 }
 
 
-- 
GitLab