Commit d8f821d9 authored by Matthieu Dorier's avatar Matthieu Dorier

corrected bug

parent 6cd75051
...@@ -140,7 +140,6 @@ int bake_provider_register( ...@@ -140,7 +140,6 @@ int bake_provider_register(
bake_create_write_persist_in_t, bake_create_write_persist_out_t, bake_create_write_persist_in_t, bake_create_write_persist_out_t,
bake_create_write_persist_ult, provider_id, abt_pool); bake_create_write_persist_ult, provider_id, abt_pool);
margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL); margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL);
tmp_svr_ctx->bake_create_write_persist_id = rpc_id;
rpc_id = MARGO_REGISTER_PROVIDER(mid, "bake_get_size_rpc", rpc_id = MARGO_REGISTER_PROVIDER(mid, "bake_get_size_rpc",
bake_get_size_in_t, bake_get_size_out_t, bake_get_size_in_t, bake_get_size_out_t,
bake_get_size_ult, provider_id, abt_pool); bake_get_size_ult, provider_id, abt_pool);
...@@ -169,6 +168,17 @@ int bake_provider_register( ...@@ -169,6 +168,17 @@ int bake_provider_register(
provider_id, abt_pool); provider_id, abt_pool);
margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL); margo_register_data(mid, rpc_id, (void*)tmp_svr_ctx, NULL);
/* get a client-side version of the bake_create_write_persist RPC */
hg_bool_t flag;
margo_registered_name(mid, "bake_create_write_persist_rpc", &rpc_id, &flag);
if(flag) {
tmp_svr_ctx->bake_create_write_persist_id = rpc_id;
} else {
tmp_svr_ctx->bake_create_write_persist_id =
MARGO_REGISTER(mid, "bake_create_write_persist_rpc",
bake_create_write_persist_in_t, bake_create_write_persist_out_t, 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);
...@@ -1223,7 +1233,7 @@ static void bake_migrate_ult(hg_handle_t handle) ...@@ -1223,7 +1233,7 @@ static void bake_migrate_ult(hg_handle_t handle)
return; return;
} }
hret = margo_get_output(handle, &cwp_out); hret = margo_get_output(cwp_handle, &cwp_out);
if(hret != HG_SUCCESS) if(hret != HG_SUCCESS)
{ {
out.ret = BAKE_ERR_MERCURY; out.ret = BAKE_ERR_MERCURY;
......
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