This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via ce3f272ae76e5197740227463b30a7164da49645 (commit) from 8580fe89a4ae01bc718f7210ae3b38bb078704fa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ce3f272ae76e5197740227463b30a7164da49645 Author: Phil Carns <[email protected]> Date: Thu Oct 28 14:15:16 2010 -0400 hints to grab server context, per Sam's comments ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/replicated-osd.aer | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/replicated-osd.aer b/code/src/replicated-osd/replicated-osd.aer index 377bb15..0980d9d 100644 --- a/code/src/replicated-osd/replicated-osd.aer +++ b/code/src/replicated-osd/replicated-osd.aer @@ -39,8 +39,6 @@ #define REP_FACTOR_FORK 1000 -static aer_remote_ctx_t rctx; - static triton_debug_mask_t rosd_dbg_mask; static triton_ret_t rosd_init(void) @@ -53,13 +51,12 @@ static triton_ret_t rosd_init(void) return(tret); } - /* TODO: replace hardcoded mpi method with zeroconf parameter */ - return aer_remote_ctx_init(&rctx, "triton.remote.retry", "mpi"); + return(TRITON_SUCCESS); } static void rosd_finalize(void) { - aer_remote_ctx_destroy(rctx); + return; } __attribute__((constructor)) void triton_rosd_init_register(void); @@ -181,6 +178,7 @@ __remote __blocking triton_ret_t rosd_create( triton_addr_t* closest; triton_addr_t self; triton_addr_t peer_addr; + aer_remote_ctx_t rctx; self = triton_addr_self("mpi"); @@ -225,6 +223,10 @@ __remote __blocking triton_ret_t rosd_create( triton_debug(rosd_dbg_mask, "ROSD forwarding create of oid %s to %d'th server.\n", oid_str, my_position+1); req->flags |= ROSD_FLAG_S2S; peer_addr = closest[my_position+1]; + aesop_hints_get("triton.remote.context", sizeof(rctx), &rctx); + /* TODO: error check above; we are in trouble if hint not + * found + */ remote_tret = remote_rosd_create(rctx, peer_addr, req, &out); } } @@ -264,6 +266,7 @@ __remote __blocking triton_ret_t rosd_remove( int64_t size; char* buffer_offsets[1]; triton_addr_t self; + aer_remote_ctx_t rctx; self = triton_addr_self("mpi"); @@ -325,6 +328,10 @@ __remote __blocking triton_ret_t rosd_remove( triton_debug(rosd_dbg_mask, "ROSD forwarding remove of oid %s to %d'th server.\n", oid_str, my_position+1); req->flags |= ROSD_FLAG_S2S; peer_addr = closest[my_position+1]; + aesop_hints_get("triton.remote.context", sizeof(rctx), &rctx); + /* TODO: error check above; we are in trouble if hint not + * found + */ remote_tret = remote_rosd_remove(rctx, peer_addr, req, &out); } } @@ -400,6 +407,7 @@ __remote __blocking triton_ret_t rosd_write( int64_t size; char* buffer_offsets[1]; triton_addr_t self; + aer_remote_ctx_t rctx; self = triton_addr_self("mpi"); @@ -477,6 +485,10 @@ __remote __blocking triton_ret_t rosd_write( triton_debug(rosd_dbg_mask, "ROSD forwarding write of oid %s to %d'th server.\n", oid_str, my_position+1); req->flags |= ROSD_FLAG_S2S; peer_addr = closest[my_position+1]; + aesop_hints_get("triton.remote.context", sizeof(rctx), &rctx); + /* TODO: error check above; we are in trouble if hint not + * found + */ remote_tret = remote_rosd_write(rctx, peer_addr, req, &out); } } hooks/post-receive -- Triton Repository