From e051b1d313da18a275d949792937a7fbd36d8fbd Mon Sep 17 00:00:00 2001 From: Phil Carns Date: Mon, 15 May 2017 14:26:22 +0200 Subject: [PATCH] adapt to variable name change in Mercury --- examples/multiplex/svc1-client.c | 4 ++-- examples/multiplex/svc1-server.c | 4 ++-- examples/multiplex/svc2-server.c | 4 ++-- include/margo.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/multiplex/svc1-client.c b/examples/multiplex/svc1-client.c index 81745ce..90bc6eb 100644 --- a/examples/multiplex/svc1-client.c +++ b/examples/multiplex/svc1-client.c @@ -57,7 +57,7 @@ void svc1_do_thing(margo_instance_id mid, hg_addr_t svr_addr, uint32_t mplex_id) HG_BULK_READ_ONLY, &in.bulk_handle); assert(ret == 0); - hgi->mplex_id = mplex_id; + hgi->target_id = mplex_id; /* Send rpc. Note that we are also transmitting the bulk handle in the * input struct. It was set above. @@ -105,7 +105,7 @@ void svc1_do_other_thing(margo_instance_id mid, hg_addr_t svr_addr, uint32_t mpl HG_BULK_READ_ONLY, &in.bulk_handle); assert(ret == 0); - hgi->mplex_id = mplex_id; + hgi->target_id = mplex_id; /* Send rpc. Note that we are also transmitting the bulk handle in the * input struct. It was set above. diff --git a/examples/multiplex/svc1-server.c b/examples/multiplex/svc1-server.c index bdad40c..25c6ec6 100644 --- a/examples/multiplex/svc1-server.c +++ b/examples/multiplex/svc1-server.c @@ -33,7 +33,7 @@ static void svc1_do_thing_ult(hg_handle_t handle) ABT_thread_self(&my_ult); my_tid = pthread_self(); printf("svc1: do_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu\n", - hgi->mplex_id, my_ult, my_xstream, my_tid); + hgi->target_id, my_ult, my_xstream, my_tid); out.ret = 0; @@ -92,7 +92,7 @@ static void svc1_do_other_thing_ult(hg_handle_t handle) ABT_thread_self(&my_ult); my_tid = pthread_self(); printf("svc1: do_other_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu\n", - hgi->mplex_id, my_ult, my_xstream, my_tid); + hgi->target_id, my_ult, my_xstream, my_tid); out.ret = 0; diff --git a/examples/multiplex/svc2-server.c b/examples/multiplex/svc2-server.c index 93c5bc6..7c3de4c 100644 --- a/examples/multiplex/svc2-server.c +++ b/examples/multiplex/svc2-server.c @@ -33,7 +33,7 @@ static void svc2_do_thing_ult(hg_handle_t handle) ABT_thread_self(&my_ult); my_tid = pthread_self(); printf("svc2: do_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu\n", - hgi->mplex_id, my_ult, my_xstream, my_tid); + hgi->target_id, my_ult, my_xstream, my_tid); out.ret = 0; @@ -92,7 +92,7 @@ static void svc2_do_other_thing_ult(hg_handle_t handle) ABT_thread_self(&my_ult); my_tid = pthread_self(); printf("svc2: do_other_thing: mplex_id: %u, ult: %p, xstream %p, tid: %lu\n", - hgi->mplex_id, my_ult, my_xstream, my_tid); + hgi->target_id, my_ult, my_xstream, my_tid); out.ret = 0; diff --git a/include/margo.h b/include/margo.h index 2fa11c8..39fa802 100644 --- a/include/margo.h +++ b/include/margo.h @@ -233,7 +233,7 @@ hg_return_t __name##_handler(hg_handle_t handle) { \ const struct hg_info *__hgi; \ __hgi = HG_Get_info(handle); \ __mid = margo_hg_class_to_instance(__hgi->hg_class); \ - __ret = margo_lookup_mplex(__mid, __hgi->id, __hgi->mplex_id, (&__pool)); \ + __ret = margo_lookup_mplex(__mid, __hgi->id, __hgi->target_id, (&__pool)); \ if(__ret != 0) { \ return(HG_INVALID_PARAM); \ }\ -- 2.26.2