Commit 9e21efe4 authored by Jonathan Jenkins's avatar Jonathan Jenkins

remove unneeded arguments

parent d74e817a
...@@ -122,7 +122,7 @@ int main(int argc, char **argv) ...@@ -122,7 +122,7 @@ int main(int argc, char **argv)
* because this is a pure client that will not be servicing rpc requests. * because this is a pure client that will not be servicing rpc requests.
*/ */
/***************************************/ /***************************************/
mid = margo_init(progress_pool, ABT_POOL_NULL, hg_context, hg_class); mid = margo_init(progress_pool, ABT_POOL_NULL, hg_context);
/* register RPC */ /* register RPC */
my_rpc_id = MERCURY_REGISTER(hg_class, "my_rpc", my_rpc_in_t, my_rpc_out_t, my_rpc_id = MERCURY_REGISTER(hg_class, "my_rpc", my_rpc_in_t, my_rpc_out_t,
...@@ -131,7 +131,7 @@ int main(int argc, char **argv) ...@@ -131,7 +131,7 @@ int main(int argc, char **argv)
NULL); NULL);
/* find addr for server */ /* find addr for server */
ret = margo_addr_lookup(mid, hg_context, argv[1], &svr_addr); ret = margo_addr_lookup(mid, argv[1], &svr_addr);
assert(ret == 0); assert(ret == 0);
for(i=0; i<4; i++) for(i=0; i<4; i++)
......
...@@ -122,7 +122,7 @@ int main(int argc, char **argv) ...@@ -122,7 +122,7 @@ int main(int argc, char **argv)
* because this is a pure client that will not be servicing rpc requests. * because this is a pure client that will not be servicing rpc requests.
*/ */
/***************************************/ /***************************************/
mid = margo_init(progress_pool, ABT_POOL_NULL, hg_context, hg_class); mid = margo_init(progress_pool, ABT_POOL_NULL, hg_context);
/* register RPC */ /* register RPC */
my_rpc_id = MERCURY_REGISTER(hg_class, "my_rpc", my_rpc_in_t, my_rpc_out_t, my_rpc_id = MERCURY_REGISTER(hg_class, "my_rpc", my_rpc_in_t, my_rpc_out_t,
...@@ -131,7 +131,7 @@ int main(int argc, char **argv) ...@@ -131,7 +131,7 @@ int main(int argc, char **argv)
NULL); NULL);
/* find addr for server */ /* find addr for server */
ret = margo_addr_lookup(mid, hg_context, argv[1], &svr_addr); ret = margo_addr_lookup(mid, argv[1], &svr_addr);
assert(ret == 0); assert(ret == 0);
for(i=0; i<4; i++) for(i=0; i<4; i++)
......
...@@ -55,7 +55,7 @@ static void my_rpc_ult(hg_handle_t handle) ...@@ -55,7 +55,7 @@ static void my_rpc_ult(hg_handle_t handle)
mid = margo_hg_class_to_instance(hgi->hg_class); mid = margo_hg_class_to_instance(hgi->hg_class);
/* do bulk transfer from client to server */ /* do bulk transfer from client to server */
ret = margo_bulk_transfer(mid, hgi->context, HG_BULK_PULL, ret = margo_bulk_transfer(mid, HG_BULK_PULL,
hgi->addr, in.bulk_handle, 0, hgi->addr, in.bulk_handle, 0,
bulk_handle, 0, size); bulk_handle, 0, size);
assert(ret == 0); assert(ret == 0);
......
...@@ -89,7 +89,7 @@ int main(int argc, char **argv) ...@@ -89,7 +89,7 @@ int main(int argc, char **argv)
* communication. * communication.
*/ */
/***************************************/ /***************************************/
mid = margo_init(handler_pool, handler_pool, hg_context, hg_class); mid = margo_init(handler_pool, handler_pool, hg_context);
assert(mid); assert(mid);
/* register RPC */ /* register RPC */
......
...@@ -113,9 +113,9 @@ int main(int argc, char **argv) ...@@ -113,9 +113,9 @@ int main(int argc, char **argv)
*/ */
/***************************************/ /***************************************/
if(single_pool_mode) if(single_pool_mode)
mid = margo_init(handler_pool, handler_pool, hg_context, hg_class); mid = margo_init(handler_pool, handler_pool, hg_context);
else else
mid = margo_init(progress_pool, handler_pool, hg_context, hg_class); mid = margo_init(progress_pool, handler_pool, hg_context);
assert(mid); assert(mid);
/* register RPC */ /* register RPC */
......
...@@ -103,7 +103,7 @@ int main(int argc, char **argv) ...@@ -103,7 +103,7 @@ int main(int argc, char **argv)
/* use a single pool for progress and sleeper threads */ /* use a single pool for progress and sleeper threads */
/* NOTE: we don't use RPC handlers, so no need for an RPC pool */ /* NOTE: we don't use RPC handlers, so no need for an RPC pool */
/***************************************/ /***************************************/
mid = margo_init(pool, ABT_POOL_NULL, hg_context, hg_class); mid = margo_init(pool, ABT_POOL_NULL, hg_context);
for(i=0; i<4; i++) for(i=0; i<4; i++)
{ {
t_ids[i] = i; t_ids[i] = i;
......
...@@ -31,7 +31,7 @@ typedef struct margo_instance* margo_instance_id; ...@@ -31,7 +31,7 @@ typedef struct margo_instance* margo_instance_id;
* @returns margo instance id on success, NULL upon error * @returns margo instance id on success, NULL upon error
*/ */
margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool, margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool,
hg_context_t *hg_context, hg_class_t *hg_class); hg_context_t *hg_context);
/** /**
* Shuts down margo library and its underlying evfibers and mercury resources * Shuts down margo library and its underlying evfibers and mercury resources
...@@ -133,7 +133,6 @@ hg_return_t margo_respond( ...@@ -133,7 +133,6 @@ hg_return_t margo_respond(
*/ */
hg_return_t margo_bulk_transfer( hg_return_t margo_bulk_transfer(
margo_instance_id mid, margo_instance_id mid,
hg_context_t *context,
hg_bulk_op_t op, hg_bulk_op_t op,
hg_addr_t origin_addr, hg_addr_t origin_addr,
hg_bulk_t origin_handle, hg_bulk_t origin_handle,
...@@ -150,7 +149,6 @@ hg_return_t margo_bulk_transfer( ...@@ -150,7 +149,6 @@ hg_return_t margo_bulk_transfer(
*/ */
hg_return_t margo_addr_lookup( hg_return_t margo_addr_lookup(
margo_instance_id mid, margo_instance_id mid,
hg_context_t *context,
const char *name, const char *name,
hg_addr_t *addr); hg_addr_t *addr);
......
...@@ -61,7 +61,7 @@ struct handler_entry ...@@ -61,7 +61,7 @@ struct handler_entry
}; };
margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool, margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool,
hg_context_t *hg_context, hg_class_t *hg_class) hg_context_t *hg_context)
{ {
int ret; int ret;
struct margo_instance *mid; struct margo_instance *mid;
...@@ -79,7 +79,7 @@ margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool, ...@@ -79,7 +79,7 @@ margo_instance_id margo_init(ABT_pool progress_pool, ABT_pool handler_pool,
mid->progress_pool = progress_pool; mid->progress_pool = progress_pool;
mid->handler_pool = handler_pool; mid->handler_pool = handler_pool;
mid->hg_class = hg_class; mid->hg_class = HG_Context_get_class(hg_context);
mid->hg_context = hg_context; mid->hg_context = hg_context;
ret = margo_timer_instance_init(mid); ret = margo_timer_instance_init(mid);
...@@ -411,7 +411,6 @@ static hg_return_t margo_addr_lookup_cb(const struct hg_cb_info *info) ...@@ -411,7 +411,6 @@ static hg_return_t margo_addr_lookup_cb(const struct hg_cb_info *info)
hg_return_t margo_addr_lookup( hg_return_t margo_addr_lookup(
margo_instance_id mid, margo_instance_id mid,
hg_context_t *context,
const char *name, const char *name,
hg_addr_t *addr) hg_addr_t *addr)
{ {
...@@ -426,7 +425,7 @@ hg_return_t margo_addr_lookup( ...@@ -426,7 +425,7 @@ hg_return_t margo_addr_lookup(
return(HG_NOMEM_ERROR); return(HG_NOMEM_ERROR);
} }
nret = HG_Addr_lookup(context, margo_addr_lookup_cb, nret = HG_Addr_lookup(mid->hg_context, margo_addr_lookup_cb,
&eventual, name, HG_OP_ID_IGNORE); &eventual, name, HG_OP_ID_IGNORE);
if(nret == 0) if(nret == 0)
{ {
...@@ -442,7 +441,6 @@ hg_return_t margo_addr_lookup( ...@@ -442,7 +441,6 @@ hg_return_t margo_addr_lookup(
hg_return_t margo_bulk_transfer( hg_return_t margo_bulk_transfer(
margo_instance_id mid, margo_instance_id mid,
hg_context_t *context,
hg_bulk_op_t op, hg_bulk_op_t op,
hg_addr_t origin_addr, hg_addr_t origin_addr,
hg_bulk_t origin_handle, hg_bulk_t origin_handle,
...@@ -462,9 +460,9 @@ hg_return_t margo_bulk_transfer( ...@@ -462,9 +460,9 @@ hg_return_t margo_bulk_transfer(
return(HG_NOMEM_ERROR); return(HG_NOMEM_ERROR);
} }
hret = HG_Bulk_transfer(context, margo_bulk_transfer_cb, &eventual, op, hret = HG_Bulk_transfer(mid->hg_context, margo_bulk_transfer_cb,
origin_addr, origin_handle, origin_offset, local_handle, local_offset, &eventual, op, origin_addr, origin_handle, origin_offset, local_handle,
size, HG_OP_ID_IGNORE); local_offset, size, HG_OP_ID_IGNORE);
if(hret == 0) if(hret == 0)
{ {
ABT_eventual_wait(eventual, (void**)&waited_hret); ABT_eventual_wait(eventual, (void**)&waited_hret);
......
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