Commit 0dcb3fdc authored by Shane Snyder's avatar Shane Snyder

don't dup returned group ids

parent f008b9ce
...@@ -152,19 +152,7 @@ ssg_group_id_t ssg_group_create( ...@@ -152,19 +152,7 @@ ssg_group_id_t ssg_group_create(
g = ssg_group_create_internal(group_name, group_addr_strs, g = ssg_group_create_internal(group_name, group_addr_strs,
group_size, update_cb, update_cb_dat); group_size, update_cb, update_cb_dat);
if (g) if (g)
{ g_id = (ssg_group_id_t)g->descriptor;
/* on successful creation, dup the group descriptor and return
* it for the caller to hold on to
*/
g_id = (ssg_group_id_t)ssg_group_descriptor_dup(g->descriptor);
if (g_id == SSG_GROUP_ID_NULL)
{
ABT_rwlock_wrlock(ssg_inst->lock);
HASH_DELETE(hh, ssg_inst->group_table, g);
ABT_rwlock_unlock(ssg_inst->lock);
ssg_group_destroy_internal(g);
}
}
return g_id; return g_id;
} }
...@@ -414,18 +402,7 @@ ssg_group_id_t ssg_group_join( ...@@ -414,18 +402,7 @@ ssg_group_id_t ssg_group_join(
update_cb, update_cb_dat); update_cb, update_cb_dat);
if (g) if (g)
{ {
/* on successful creation, dup the group descriptor and return g_id = (ssg_group_id_t)g->descriptor;
* it for the caller to hold on to
*/
g_id = (ssg_group_id_t)ssg_group_descriptor_dup(g->descriptor);
if (g_id == SSG_GROUP_ID_NULL)
{
ABT_rwlock_wrlock(ssg_inst->lock);
HASH_DELETE(hh, ssg_inst->group_table, g);
ABT_rwlock_unlock(ssg_inst->lock);
ssg_group_destroy_internal(g);
goto fini;
}
/* don't free on success */ /* don't free on success */
group_name = NULL; group_name = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment