Commit bc8327d3 authored by Shane Snyder's avatar Shane Snyder
Browse files

free group id in hg proc routine

parent 71102045
......@@ -316,21 +316,15 @@ hg_return_t hg_proc_ssg_group_id_t(
hret = HG_NOMEM_ERROR;
return hret;
}
memset(*group_descriptor, 0, sizeof(**group_descriptor));
hret = hg_proc_ssg_group_descriptor_t(proc, *group_descriptor);
if (hret != HG_SUCCESS)
{
hret = HG_PROTOCOL_ERROR;
return hret;
}
/* make sure to invalidate the group descriptor owner status -- this
* will be set later when the owner attempts to join or attach the group
*/
(*group_descriptor)->owner_status = SSG_OWNER_IS_UNASSOCIATED;
break;
case HG_FREE:
/* XXX XXX XXX */
#if 0
hret = hg_proc_ssg_group_descriptor_t(proc, *group_descriptor);
if (hret != HG_SUCCESS)
{
......@@ -338,7 +332,6 @@ hg_return_t hg_proc_ssg_group_id_t(
return hret;
}
free(*group_descriptor);
#endif
hret = HG_SUCCESS;
break;
default:
......
......@@ -241,6 +241,7 @@ static void group_id_forward_recv_ult(hg_handle_t handle)
{
const struct hg_info *info;
struct group_id_forward_context *group_id_forward_ctx;
ssg_group_id_t tmp_g_id;
hg_return_t hret;
info = HG_Get_info(handle);
......@@ -249,12 +250,14 @@ static void group_id_forward_recv_ult(hg_handle_t handle)
info->hg_class, info->id);
DIE_IF(group_id_forward_ctx == NULL, "HG_Registered_data");
hret = HG_Get_input(handle, group_id_forward_ctx->g_id_p);
hret = HG_Get_input(handle, &tmp_g_id);
DIE_IF(hret != HG_SUCCESS, "HG_Get_input");
*(group_id_forward_ctx->g_id_p) = ssg_group_id_dup(tmp_g_id);
margo_respond(group_id_forward_ctx->mid, handle, NULL);
HG_Free_input(handle, group_id_forward_ctx->g_id_p);
HG_Free_input(handle, &tmp_g_id);
HG_Destroy(handle);
return;
}
......
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