Commit dc4d8934 authored by Shane Snyder's avatar Shane Snyder

fixes for new margo api changes

parent f67c5641
...@@ -847,12 +847,11 @@ int bake_remove( ...@@ -847,12 +847,11 @@ int bake_remove(
hret = margo_create(provider->client->mid, provider->addr, hret = margo_create(provider->client->mid, provider->addr,
provider->client->bake_remove_id, &handle); provider->client->bake_remove_id, &handle);
margo_set_target_id(handle, provider->mplex_id);
if(hret != HG_SUCCESS) if(hret != HG_SUCCESS)
return(-1); return(-1);
hret = margo_forward(handle, &in); hret = margo_provider_forward(provider->provider_id, handle, &in);
if(hret != HG_SUCCESS) if(hret != HG_SUCCESS)
{ {
margo_destroy(handle); margo_destroy(handle);
...@@ -868,6 +867,7 @@ int bake_remove( ...@@ -868,6 +867,7 @@ int bake_remove(
ret = out.ret; ret = out.ret;
margo_free_output(handle, &out);
margo_destroy(handle); margo_destroy(handle);
return(ret); return(ret);
} }
...@@ -143,8 +143,7 @@ int bake_provider_register( ...@@ -143,8 +143,7 @@ int bake_provider_register(
rpc_id = MARGO_REGISTER_PROVIDER(mid, "bake_remove_rpc", rpc_id = MARGO_REGISTER_PROVIDER(mid, "bake_remove_rpc",
bake_remove_in_t, bake_remove_out_t, bake_remove_ult, bake_remove_in_t, bake_remove_out_t, bake_remove_ult,
provider_id, abt_pool); provider_id, abt_pool);
margo_register_data(mid, rpc_id, mplex_id, (void*)tmp_svr_ctx, NULL); margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL);
/* install the bake server finalize callback */ /* install the bake server finalize callback */
margo_push_finalize_callback(mid, &bake_server_finalize_cb, tmp_svr_ctx); margo_push_finalize_callback(mid, &bake_server_finalize_cb, tmp_svr_ctx);
...@@ -933,9 +932,8 @@ static void bake_remove_ult(hg_handle_t handle) ...@@ -933,9 +932,8 @@ static void bake_remove_ult(hg_handle_t handle)
margo_instance_id mid = margo_hg_handle_get_instance(handle); margo_instance_id mid = margo_hg_handle_get_instance(handle);
assert(mid); assert(mid);
const struct hg_info* hgi = margo_get_info(handle); const struct hg_info* info = margo_get_info(handle);
bake_provider_t svr_ctx = bake_provider_t svr_ctx = margo_registered_data(mid, info->id);
margo_registered_data_mplex(mid, hgi->id, hgi->target_id);
if(!svr_ctx) { if(!svr_ctx) {
out.ret = -1; out.ret = -1;
margo_respond(handle, &out); margo_respond(handle, &out);
......
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