Commit c27912a8 authored by Philip Carns's avatar Philip Carns
Browse files

updated to new margo api

parent 171e2263
...@@ -203,14 +203,12 @@ int main(int argc, char **argv) ...@@ -203,14 +203,12 @@ int main(int argc, char **argv)
if(rank == 1 && g_opts.mercury_timeout_server != UINT_MAX) if(rank == 1 && g_opts.mercury_timeout_server != UINT_MAX)
margo_set_param(mid, MARGO_PARAM_PROGRESS_TIMEOUT_UB, &g_opts.mercury_timeout_server); margo_set_param(mid, MARGO_PARAM_PROGRESS_TIMEOUT_UB, &g_opts.mercury_timeout_server);
g_bw_id = MARGO_REGISTER_MPLEX( g_bw_id = MARGO_REGISTER(
mid, mid,
"bw_rpc", "bw_rpc",
bw_rpc_in_t, bw_rpc_in_t,
bw_rpc_out_t, bw_rpc_out_t,
bw_ult, bw_ult);
MARGO_DEFAULT_MPLEX_ID,
NULL);
/* set up group */ /* set up group */
ret = ssg_init(mid); ret = ssg_init(mid);
......
...@@ -159,14 +159,12 @@ int main(int argc, char **argv) ...@@ -159,14 +159,12 @@ int main(int argc, char **argv)
if(rank == 1 && g_opts.mercury_timeout_server != UINT_MAX) if(rank == 1 && g_opts.mercury_timeout_server != UINT_MAX)
margo_set_param(mid, MARGO_PARAM_PROGRESS_TIMEOUT_UB, &g_opts.mercury_timeout_server); margo_set_param(mid, MARGO_PARAM_PROGRESS_TIMEOUT_UB, &g_opts.mercury_timeout_server);
noop_id = MARGO_REGISTER_MPLEX( noop_id = MARGO_REGISTER(
mid, mid,
"noop_rpc", "noop_rpc",
void, void,
void, void,
noop_ult, noop_ult);
MARGO_DEFAULT_MPLEX_ID,
NULL);
/* set up group */ /* set up group */
ret = ssg_init(mid); ret = ssg_init(mid);
......
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