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 "". The branch, ticket-227 has been updated via dcbbeb6875a913c25b99f876a2761eac9f28be3b (commit) via ac03db772abffef77278340f7cbb647a39d665af (commit) from a78480552b35bf278e0a6254c0891579e48abe70 (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 dcbbeb6875a913c25b99f876a2761eac9f28be3b Author: Phil Carns <[email protected]> Date: Fri Dec 21 10:32:26 2012 -0500 init/finalize debugging in tosd commit ac03db772abffef77278340f7cbb647a39d665af Author: Phil Carns <[email protected]> Date: Fri Dec 21 10:29:41 2012 -0500 partial update to tosd1 for new init setup ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tests/tosd1.ae | 33 ++++++---------------- code/src/transactional-osd/transactional-osd.ae | 23 ++++++++++++++++ 2 files changed, 32 insertions(+), 24 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tests/tosd1.ae b/code/src/transactional-osd/tests/tosd1.ae index dbeb6c0..5da25b1 100644 --- a/code/src/transactional-osd/tests/tosd1.ae +++ b/code/src/transactional-osd/tests/tosd1.ae @@ -628,7 +628,7 @@ static __blocking int do_tosd_test(void) int main(int argc, char *argv[]) { triton_ret_t ret; - ae_context_t ctx; + int ae_ret; ae_hints_t hints; int pc = 0; ae_op_id_t op_id; @@ -649,46 +649,31 @@ int main(int argc, char *argv[]) ret = triton_zeroconf_set("triton.tosd.data_path", "/tmp/tosd/data"); triton_error_assert(ret); - /* test initializing a specific component */ - ret = triton_init("triton.tosd"); + ret = tosd_init(); if(ret != TRITON_SUCCESS) { - triton_perror("triton_init", ret); - return(-1); - } - - ret = ae_context_create(&ctx, "bdb", "file", "sched"); - if(ret != TRITON_SUCCESS) - { - triton_perror("ae_context_create", ret); + triton_perror("tosd_init", ret); return(-1); } done = 0; ae_hints_init(&hints); - ret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); - if(ret == TRITON_SUCCESS) + ae_ret = ae_post_blocking(do_tosd_test, done_callback, NULL, &hints, NULL, &op_id, &do_tosd_test_ret); + if(ret == AE_SUCCESS) { while(done == 0) { pc++; - ae_poll(ctx, 10000); + ae_poll(NULL, 10000); #if 0 printf("polled %d times...\n", pc); #endif } } - triton_error_assert(ret); + assert(ae_ret == AE_SUCCESS); ae_hints_destroy(&hints); - - ret = ae_context_destroy(ctx); - if(ret != TRITON_SUCCESS) - { - triton_perror("ae_context_destroy", ret); - return(-1); - } - - triton_finalize(); + + tosd_finalize(); return do_tosd_test_ret; } diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 869c4c3..4eba97a 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -1478,6 +1478,9 @@ triton_ret_t tosd_init(void) struct timeval tv; unsigned int seed = 0; + tret = triton_debug_init(); + if(tret != TRITON_SUCCESS) + return(tret); /* seed random number generator */ gettimeofday(&tv, NULL); @@ -1488,6 +1491,7 @@ triton_ret_t tosd_init(void) "Output debugging information for the TOSD interface"); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1496,6 +1500,7 @@ triton_ret_t tosd_init(void) "Should the TOSD discard data payloads? yes|no"); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1504,6 +1509,7 @@ triton_ret_t tosd_init(void) "Directory that will contain Berkeley DB files used by the TOSD."); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1512,6 +1518,7 @@ triton_ret_t tosd_init(void) "Directory that will contain raw data stored by the TOSD."); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1520,6 +1527,7 @@ triton_ret_t tosd_init(void) "Highwater mark for Berkeley DB coalescing."); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1528,6 +1536,7 @@ triton_ret_t tosd_init(void) "Highwater mark for data (fsync) coalescing."); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1536,6 +1545,7 @@ triton_ret_t tosd_init(void) "TOSD data on-disk data alignment (directio mode requires block alignment)."); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1544,6 +1554,7 @@ triton_ret_t tosd_init(void) "TOSD initialization flags (DATA_ODIRECT for directio, DATA_SYNC for fsync)."); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } @@ -1552,12 +1563,14 @@ triton_ret_t tosd_init(void) "Rate at which to inject storage errors, from 0.0 to 100.0"); if(tret != TRITON_SUCCESS) { + triton_debug_finalize(); return(tret); } ae_ret = ae_hints_type_register("triton.tosd.insert_errors", 0); if(ae_ret != AE_SUCCESS) { + triton_debug_finalize(); return(TRITON_ERR_UNKNOWN); } @@ -1565,11 +1578,13 @@ triton_ret_t tosd_init(void) if(strlen(tosd_db_path) == 0) { triton_err(triton_log_default, "Error: TOSD initialized without specifying %s\n", db_path_confkey); + triton_debug_finalize(); return(TRITON_ERR_INVAL); } if(strlen(tosd_log_path) == 0) { triton_err(triton_log_default, "Error: TOSD initialized without specifying %s\n", data_path_confkey); + triton_debug_finalize(); return(TRITON_ERR_INVAL); } @@ -1598,12 +1613,16 @@ triton_ret_t tosd_init(void) /* initialize required components */ tret = triton_sched_resource_init(); if(tret != TRITON_SUCCESS) + { + triton_debug_finalize(); return(tret); + } tret = bdb_init(); if(tret != TRITON_SUCCESS) { triton_sched_resource_finalize(); + triton_debug_finalize(); return(tret); } ae_ret = aefile_init(); @@ -1611,6 +1630,7 @@ triton_ret_t tosd_init(void) { bdb_finalize(); triton_sched_resource_finalize(); + triton_debug_finalize(); return(tret); } ae_ret = aesop_timer_init(); @@ -1619,6 +1639,7 @@ triton_ret_t tosd_init(void) aefile_finalize(); bdb_finalize(); triton_sched_resource_finalize(); + triton_debug_finalize(); return(tret); } @@ -1838,6 +1859,8 @@ void tosd_finalize(void) printf("%f\n", time_array[i]); } #endif + + triton_debug_finalize(); return; } hooks/post-receive --