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 e06bcf8166d1d2437aff14a0d3096dfff3ae45f3 (commit) via a6a05c3999030344dc303e222760b493ac03e7ad (commit) from f0dd98c6b6dc871259b256b588dfc9b0f3468645 (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 e06bcf8166d1d2437aff14a0d3096dfff3ae45f3 Author: Phil Carns <[email protected]> Date: Wed Sep 22 12:30:59 2010 -0400 fix some warnings by including rosd_module.h commit a6a05c3999030344dc303e222760b493ac03e7ad Author: Phil Carns <[email protected]> Date: Wed Sep 22 12:17:56 2010 -0400 update rosd create/remove interfaces ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/replicated-osd.aer | 9 +++++---- code/src/replicated-osd/replicated-osd.haer | 17 +++++++++++++++-- .../src/replicated-osd/tests/rosd-create-bench.aer | 18 ++++++++++++------ code/src/replicated-osd/tests/rosd1.aer | 10 +++++++--- code/src/replicated-osd/tests/rosd2.aer | 10 +++++++--- code/src/replicated-osd/tests/rosd3.aer | 10 +++++++--- 6 files changed, 53 insertions(+), 21 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/replicated-osd.aer b/code/src/replicated-osd/replicated-osd.aer index b735a99..1098cb9 100644 --- a/code/src/replicated-osd/replicated-osd.aer +++ b/code/src/replicated-osd/replicated-osd.aer @@ -26,6 +26,7 @@ #include "src/zeroconf/zeroconf.h" #include "src/aesop/hints.h" #include "src/replicated-osd/rosd-utils.h" +#include "src/replicated-osd/replicated-osd.haer" #if 0 #include "src/net/mpi/mpi.hae" @@ -35,7 +36,7 @@ #include "src/versioned-osd/prototype/versioned-osd.hae" __remote __blocking triton_ret_t rosd_create( - uint128_t in_oid, + struct rosd_create_req* req, int32_t* out_nothing ) { @@ -58,7 +59,7 @@ __remote __blocking triton_ret_t rosd_create( } } - tret = vosd_create(in_oid, niid); + tret = vosd_create(req->oid, niid); if(tret == TRITON_ERR_NIID_DONE) { /* this operation is already done */ @@ -74,7 +75,7 @@ __remote __blocking triton_ret_t rosd_create( } __remote __blocking triton_ret_t rosd_remove( - uint128_t in_oid, + struct rosd_remove_req* req, int32_t* out_nothing ) { @@ -97,7 +98,7 @@ __remote __blocking triton_ret_t rosd_remove( } } - tret = vosd_remove(in_oid, niid); + tret = vosd_remove(req->oid, niid); if(tret == TRITON_ERR_NIID_DONE) { /* this operation is already done */ diff --git a/code/src/replicated-osd/replicated-osd.haer b/code/src/replicated-osd/replicated-osd.haer index 1d08191..5900aac 100644 --- a/code/src/replicated-osd/replicated-osd.haer +++ b/code/src/replicated-osd/replicated-osd.haer @@ -18,19 +18,32 @@ #include "src/common/triton-error.h" #include "src/aesop/aesop.h" +__remote struct rosd_create_req +{ + uint128_t oid; + uint32_t flags; + uint32_t replication_factor; +}; + /** * Creates a new object */ __remote __blocking triton_ret_t rosd_create( - uint128_t in_oid, + struct rosd_create_req* req, int32_t* out_nothing ); +__remote struct rosd_remove_req +{ + uint128_t oid; + uint32_t flags; +}; + /** * Removes an object */ __remote __blocking triton_ret_t rosd_remove( - uint128_t in_oid, + struct rosd_remove_req* req, int32_t* out_nothing ); diff --git a/code/src/replicated-osd/tests/rosd-create-bench.aer b/code/src/replicated-osd/tests/rosd-create-bench.aer index 576ca48..194cef0 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.aer +++ b/code/src/replicated-osd/tests/rosd-create-bench.aer @@ -20,9 +20,8 @@ #include "src/replicated-osd/replicated-osd.haer" #include "src/versioned-osd/prototype/versioned-osd.hae" #include "src/versioned-osd/prototype/bdb-throttle.hae" - -/* TODO: where is this file? */ -/* #include "src/replicated-osd/rosd_module.h" */ +/* TODO: this seems like the wrong place for this file to land */ +#include "rosd_module.h" #include "mpi.h" @@ -95,6 +94,7 @@ __blocking void do_remote_remove(void) pwait { pprivate int i; + pprivate struct rosd_remove_req req; for(i=0; i<nconcurrent; i++) { @@ -104,11 +104,13 @@ __blocking void do_remote_remove(void) while(oid.l < nobjects) { oid.l++; + req.oid = oid; + req.flags = 0; triton_mutex_unlock(&oid_mutex); - ret = remote_rosd_remove(svr, oid, &out); + ret = remote_rosd_remove(svr, &req, &out); if(ret != TRITON_SUCCESS) { - fprintf(stderr, "Error: rosd_create() failure.\n"); + fprintf(stderr, "Error: rosd_remove() failure.\n"); } triton_mutex_lock(&oid_mutex); } @@ -139,6 +141,7 @@ __blocking void do_remote_test(void) pwait { pprivate int i; + pprivate struct rosd_create_req req; for(i=0; i<nconcurrent; i++) { @@ -148,8 +151,11 @@ __blocking void do_remote_test(void) while(oid.l < nobjects) { oid.l++; + req.oid = oid; triton_mutex_unlock(&oid_mutex); - ret = remote_rosd_create(svr, oid, &out); + req.flags = 0; + req.replication_factor = 1; + ret = remote_rosd_create(svr, &req, &out); if(ret != TRITON_SUCCESS) { fprintf(stderr, "Error: rosd_create() failure.\n"); diff --git a/code/src/replicated-osd/tests/rosd1.aer b/code/src/replicated-osd/tests/rosd1.aer index 5d23f44..3e0932e 100644 --- a/code/src/replicated-osd/tests/rosd1.aer +++ b/code/src/replicated-osd/tests/rosd1.aer @@ -17,8 +17,8 @@ #include "src/replicated-osd/replicated-osd.haer" #include "src/versioned-osd/prototype/versioned-osd.hae" -/* TODO: where is this file? */ -/* #include "src/replicated-osd/rosd_module.h" */ +/* TODO: this seems like the wrong place for this file to land */ +#include "rosd_module.h" #include "mpi.h" @@ -32,6 +32,7 @@ __blocking void do_remote_test(void) uint128_t oid; int32_t out; triton_node_t svr; + struct rosd_create_req req; MPI_Comm_rank(MPI_COMM_WORLD, &rank); @@ -54,7 +55,10 @@ __blocking void do_remote_test(void) oid = triton_uint128_from_uint64(rank); - ret = remote_rosd_create(svr, oid, &out); + req.oid = oid; + req.flags = 0; + req.replication_factor = 1; + ret = remote_rosd_create(svr, &req, &out); if(ret != TRITON_SUCCESS) { fprintf(stderr, "Error: rosd_create() failure.\n"); diff --git a/code/src/replicated-osd/tests/rosd2.aer b/code/src/replicated-osd/tests/rosd2.aer index 6e44872..849cd85 100644 --- a/code/src/replicated-osd/tests/rosd2.aer +++ b/code/src/replicated-osd/tests/rosd2.aer @@ -24,8 +24,8 @@ #include "src/replicated-osd/replicated-osd.haer" #include "src/versioned-osd/prototype/versioned-osd.hae" -/* TODO: where is this file? */ -/* #include "src/replicated-osd/rosd_module.h" */ +/* TODO: this seems like the wrong place for this file to land */ +#include "rosd_module.h" #include "mpi.h" @@ -92,6 +92,7 @@ __blocking triton_ret_t create_objects(int rank, int n) triton_node_t svr; uint128_t oid; int32_t out; + struct rosd_create_req req; for (i = 0; i < n; i++) { @@ -101,7 +102,10 @@ __blocking triton_ret_t create_objects(int rank, int n) printf("name: %s\n", name); svr = triton_node_lookup(mpi_msg_ctx, name); - ret = remote_rosd_create(svr, oid, &out); + req.oid = oid; + req.flags = 0; + req.replication_factor = 1; + ret = remote_rosd_create(svr, &req, &out); if(ret != TRITON_SUCCESS) { fprintf(stderr, "Error: rosd_create() failure.\n"); diff --git a/code/src/replicated-osd/tests/rosd3.aer b/code/src/replicated-osd/tests/rosd3.aer index e9443fc..df1ddcf 100644 --- a/code/src/replicated-osd/tests/rosd3.aer +++ b/code/src/replicated-osd/tests/rosd3.aer @@ -24,8 +24,8 @@ #include "src/replicated-osd/replicated-osd.haer" #include "src/versioned-osd/prototype/versioned-osd.hae" -/* TODO: where is this file? */ -/* #include "src/replicated-osd/rosd_module.h" */ +/* TODO: this seems like the wrong place for this file to land */ +#include "rosd_module.h" #include "mpi.h" @@ -92,6 +92,7 @@ __blocking triton_ret_t create_objects(int rank, int n) triton_node_t svr; uint128_t oid; int32_t out; + struct rosd_create_req req; for (i = 0; i < n; i++) { @@ -105,7 +106,10 @@ __blocking triton_ret_t create_objects(int rank, int n) printf("lookup (%i.%i) -> (%i.%i)\n", oid.u, oid.l, svr.u, svr.l); - ret = remote_rosd_create(svr, oid, &out); + req.oid = oid; + req.flags = 0; + req.replication_factor = 1; + ret = remote_rosd_create(svr, &req, &out); if(ret != TRITON_SUCCESS) { fprintf(stderr, "Error: rosd_create() failure.\n"); hooks/post-receive -- Triton Repository