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 7e8ef2833dbd18acc367d72a124c7ec53e033fcf (commit) via 69da444aacf28457bcfb29c4ba350bf394765f68 (commit) from 976e5b6f27075ae8974bfbf19d88d343e3f0f062 (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 7e8ef2833dbd18acc367d72a124c7ec53e033fcf Author: Phil Carns <[email protected]> Date: Tue Nov 30 17:16:44 2010 -0500 toggle niid use in vosd create bench commit 69da444aacf28457bcfb29c4ba350bf394765f68 Author: Phil Carns <[email protected]> Date: Tue Nov 30 16:52:52 2010 -0500 bug fix to vosd create bench ----------------------------------------------------------------------- Summary of changes: .../prototype/tests/vosd-bench-create.ae | 59 +++++++++++++++----- 1 files changed, 44 insertions(+), 15 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/tests/vosd-bench-create.ae b/code/src/versioned-osd/prototype/tests/vosd-bench-create.ae index f5e8732..86a0e0a 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-bench-create.ae +++ b/code/src/versioned-osd/prototype/tests/vosd-bench-create.ae @@ -19,6 +19,7 @@ static int concurrent; static int total; static char sync_mode; static int max_seconds = 0; +static int use_niids = 0; triton_mutex_t started_mutex = TRITON_MUTEX_INITIALIZER; int started = 0; @@ -26,6 +27,16 @@ int started = 0; static __blocking int do_vosd_test(void) { triton_ret_t tret; + uint32_t retry_count = 1; + + if(use_niids) + { + /* set hint indicating that all operations in this routines are + * "retries", meaning that the VOSD should honor the niid + */ + tret = aesop_hints_put("triton.remote.retry_count", sizeof(retry_count), &retry_count); + triton_error_assert(tret); + } start_tm = Wtime(); @@ -37,6 +48,7 @@ static __blocking int do_vosd_test(void) pprivate double now; pprivate int done = 0; pprivate uint128_t oid; + pprivate uint64_t niid; for(i=0; i<concurrent; i++) { @@ -48,7 +60,15 @@ static __blocking int do_vosd_test(void) if(started < total) { started++; - triton_uint128_from_uint64(started); + oid = triton_uint128_from_uint64(started); + if(use_niids) + { + niid = started; + } + else + { + niid = 0; + } } else { @@ -59,7 +79,7 @@ static __blocking int do_vosd_test(void) if(!done) { - b_ret = vosd_create(oid, 0); + b_ret = vosd_create(oid, niid); triton_error_assert(b_ret); } } @@ -83,6 +103,14 @@ static void done_callback(void *up, int ret) done = 1; } +static void usage(void) +{ + + fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> <use niids (0|1)>\n"); + fprintf(stderr, " # s for sync, n for no sync\n"); + return; +} + int main(int argc, char *argv[]) { @@ -102,18 +130,16 @@ int main(int argc, char *argv[]) int vosd_init_flags = 0; int i; - if(argc != 8) + if(argc != 9) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> \n"); - fprintf(stderr, " # s for sync, n for no sync\n"); + usage(); return(-1); } ret = sscanf(argv[3], "%d", &total); if(ret != 1 || total < 1) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> \n"); - fprintf(stderr, " # s for sync, n for no sync\n"); + usage(); return(-1); } @@ -121,16 +147,14 @@ int main(int argc, char *argv[]) ret = sscanf(argv[4], "%d", &concurrent); if(ret != 1 || concurrent < 1) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> \n"); - fprintf(stderr, " # s for sync, n for no sync\n"); + usage(); return(-1); } ret = sscanf(argv[5], "%d", &db_highwater); if(ret != 1 || db_highwater < 0) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> \n"); - fprintf(stderr, " # s for sync, n for no sync\n"); + usage(); return(-1); } @@ -138,16 +162,21 @@ int main(int argc, char *argv[]) if(ret != 1 || (sync_mode != 'o' && sync_mode != 's' && sync_mode != 'b' && sync_mode != 'n')) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> \n"); - fprintf(stderr, " # s for sync, n for no sync\n"); + usage(); return(-1); } ret = sscanf(argv[7], "%d", &max_seconds); if(ret != 1 || max_seconds < 0) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> \n"); - fprintf(stderr, " # s for sync, n for no sync\n"); + usage(); + return(-1); + } + + ret = sscanf(argv[8], "%d", &use_niids); + if(ret != 1 || use_niids > 1 || use_niids < 0) + { + usage(); return(-1); } hooks/post-receive -- Triton Repository