December 2012 - Triton-commits - mailman3.cels.anl.gov

branch, ticket-227, updated. 74b8e33eec7df647fb7127de152e017d0cf10830
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 74b8e33eec7df647fb7127de152e017d0cf10830 (commit) via 78345dba9a48194fc55fee8a5a9b299a67b6dc78 (commit) from d24812d9828c40287b63b2ba19ce0646702da769 (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 74b8e33eec7df647fb7127de152e017d0cf10830 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 12:43:19 2012 -0500 note bug in test program commit 78345dba9a48194fc55fee8a5a9b299a67b6dc78 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 12:28:13 2012 -0500 bug fix to tosd_read ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tests/tosd1.ae | 5 ++++- code/src/transactional-osd/transactional-osd.ae | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tests/tosd1.ae b/code/src/transactional-osd/tests/tosd1.ae index 20494a6..51b5ad0 100644 --- a/code/src/transactional-osd/tests/tosd1.ae +++ b/code/src/transactional-osd/tests/tosd1.ae @@ -218,7 +218,10 @@ static __blocking int do_tosd_test(void) } /********************************************************/ - printf("reading a single aligned buffer...\n"); + /* TODO: default alignment is 4096, not 512, so this does not produce an + * aligned read now. + */ + printf("reading a single aligned buffer (NOT REALLY: this test is broken)...\n"); buffer_offsets[0] = buffer; buffer_szs[0] = 512; obj_offsets[0] = 1024; diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 00c7c84..aea2f3e 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -1455,10 +1455,10 @@ static __blocking triton_ret_t read_segment( /* copy out of scratch buffer */ copy_ptr = scratch_buffer; copy_ptr += (lme.log_offset - scratch_offset); - memcpy(mem_offset, copy_ptr, size); + memcpy(mem_offset, copy_ptr, lme.size); } - *amt_read = size; + *amt_read = lme.size; fd_cache_put(fd_entry); free(scratch_buffer); hooks/post-receive --

1 0

branch, ticket-227, updated. d24812d9828c40287b63b2ba19ce0646702da769
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 d24812d9828c40287b63b2ba19ce0646702da769 (commit) via acce22500c760ac4f05ee904495451918ab7a296 (commit) from ca22e856885df225d60c15d635def3793f9f2d15 (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 d24812d9828c40287b63b2ba19ce0646702da769 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:36:38 2012 -0500 avoid using triton_init_check() commit acce22500c760ac4f05ee904495451918ab7a296 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:34:18 2012 -0500 force triton_init_check() failures for now ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-init.c | 5 +++++ code/src/transactional-osd/transactional-osd.ae | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) Diff of changes: diff --git a/code/src/common/triton-init.c b/code/src/common/triton-init.c index 5b10cd4..f236713 100644 --- a/code/src/common/triton-init.c +++ b/code/src/common/triton-init.c @@ -364,6 +364,11 @@ triton_ret_t triton_init_check(const char *interface) struct triton_hash_link *link; struct init_entry *entry; + /* TODO: this function is obsolete- remove it once callers have been + * updated + */ + assert(0); + link = triton_hash_search(init_table, interface); if(!link) { diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 61f404a..00c7c84 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -53,15 +53,12 @@ #define TOSD_MIN(__a, __b) ((__a) < (__b) ? (__a) : (__b)) #define TOSD_MAX(__a, __b) ((__a) > (__b) ? (__a) : (__b)) +/* TODO: check to see module refcount > 1 also */ #define TOSD_CHECK() \ do {\ float __threshold; \ int __errs; \ - triton_ret_t __tmp_tret; \ int ae_ret; \ - __tmp_tret = triton_init_check("triton.tosd"); \ - if(__tmp_tret != TRITON_SUCCESS) \ - return(__tmp_tret); \ if(insert_errors_at_rate > 0) { \ __threshold = random(); \ __threshold /= (float)RAND_MAX; \ @@ -3607,11 +3604,14 @@ static triton_ret_t db_path_updater(const char *key, const char *value) { assert(!strcmp(key, db_path_confkey)); + /* TODO: check module ref count here instead */ +#if 0 if(triton_init_check("triton.tosd") == TRITON_SUCCESS) { triton_err(triton_log_default, "Error: %s parameter cannot be modified after TOSD has been initialized.\n", db_path_confkey); return TRITON_ERR_INVAL; } +#endif if(tosd_db_path) free(tosd_db_path); @@ -3633,11 +3633,14 @@ static triton_ret_t data_path_updater(const char *key, const char *value) { assert(!strcmp(key, data_path_confkey)); + /* TODO: check module ref count here instead */ +#if 0 if(triton_init_check("triton.tosd") == TRITON_SUCCESS) { triton_err(triton_log_default, "Error: %s parameter cannot be modified after TOSD has been initialized.\n", data_path_confkey); return TRITON_ERR_INVAL; } +#endif if(tosd_log_path) free(tosd_log_path); hooks/post-receive --

1 0

branch, ticket-227, updated. ca22e856885df225d60c15d635def3793f9f2d15
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 ca22e856885df225d60c15d635def3793f9f2d15 (commit) from 704f239c85d3f655318e480a19cdcd252d29ffef (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 ca22e856885df225d60c15d635def3793f9f2d15 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:29:57 2012 -0500 convert tosd1 to use aesop_main_set() ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tests/tosd1.ae | 54 +++++------------------------ 1 files changed, 9 insertions(+), 45 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tests/tosd1.ae b/code/src/transactional-osd/tests/tosd1.ae index 5da25b1..20494a6 100644 --- a/code/src/transactional-osd/tests/tosd1.ae +++ b/code/src/transactional-osd/tests/tosd1.ae @@ -9,18 +9,6 @@ #include <aesop/hints.h> static void triton_perror(const char *s, triton_ret_t ret); -static int done; -static int do_tosd_test_ret; - -static void done_callback(void *up, int ret) -{ - ae_context_t ctx = (ae_context_t)up; - - do_tosd_test_ret = ret; - done = 1; - - ae_poll_break(ctx); -} static __blocking int do_tosd_test(void) { @@ -625,24 +613,10 @@ static __blocking int do_tosd_test(void) return 0; } -int main(int argc, char *argv[]) +__blocking int aesop_main(int argc, char **argv) { triton_ret_t ret; - int ae_ret; - ae_hints_t hints; - int pc = 0; - ae_op_id_t op_id; - - /* test setting zeroconf params before init */ -#if 0 - /* this one is supposed to fail */ - ret = triton_zeroconf_set("foobar", "kaboom!"); - triton_error_assert(ret); - - /* this one should work */ - ret = triton_zeroconf_set("triton.bdb.progress_mode", "1"); - triton_error_assert(ret); -#endif + int test_ret; ret = triton_zeroconf_set("triton.tosd.db_path", "/tmp/tosd"); triton_error_assert(ret); @@ -656,27 +630,17 @@ int main(int argc, char *argv[]) return(-1); } - done = 0; - ae_hints_init(&hints); - 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(NULL, 10000); -#if 0 - printf("polled %d times...\n", pc); -#endif - } - } - assert(ae_ret == AE_SUCCESS); - ae_hints_destroy(&hints); + test_ret = do_tosd_test(); + if(test_ret == 0) + printf("Test success.\n"); + else + printf("Test failure.\n"); tosd_finalize(); - return do_tosd_test_ret; + return test_ret; } +aesop_main_set(aesop_main); static void triton_perror(const char *s, triton_ret_t ret) { hooks/post-receive --

1 0

branch, ticket-227, updated. 704f239c85d3f655318e480a19cdcd252d29ffef
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 704f239c85d3f655318e480a19cdcd252d29ffef (commit) from c794ec00acd38a023a93217c5415fffda842970a (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 704f239c85d3f655318e480a19cdcd252d29ffef Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:24:29 2012 -0500 bug fix ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/bdb/bdb-resource.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/common/resources/bdb/bdb-resource.c b/code/src/common/resources/bdb/bdb-resource.c index 1f59b49..c1ebe4c 100644 --- a/code/src/common/resources/bdb/bdb-resource.c +++ b/code/src/common/resources/bdb/bdb-resource.c @@ -487,7 +487,7 @@ triton_ret_t bdb_init(void) } ae_ret = ae_resource_register(&triton_bdb_resource, &triton_bdb_resource_id); - if(ret != AE_SUCCESS) + if(ae_ret != AE_SUCCESS) { triton_debug_finalize(); ae_opcache_destroy(bdb_opcache); hooks/post-receive --

1 0

branch, ticket-227, updated. c794ec00acd38a023a93217c5415fffda842970a
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 c794ec00acd38a023a93217c5415fffda842970a (commit) via 1b1571861ea0e4e26d544c9707bd9e88faf39ade (commit) via 8bc0cc630fccbb3a98e53514e26f8b1201ecc213 (commit) from dcbbeb6875a913c25b99f876a2761eac9f28be3b (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 c794ec00acd38a023a93217c5415fffda842970a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:14:21 2012 -0500 comments commit 1b1571861ea0e4e26d544c9707bd9e88faf39ade Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:13:11 2012 -0500 fix sched resource ref counting commit 8bc0cc630fccbb3a98e53514e26f8b1201ecc213 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 11:10:16 2012 -0500 fix warnings and types in sched resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/scheduling/sched.c | 63 +++++++++++++++-------- code/src/transactional-osd/transactional-osd.ae | 3 + 2 files changed, 44 insertions(+), 22 deletions(-) Diff of changes: diff --git a/code/src/common/resources/scheduling/sched.c b/code/src/common/resources/scheduling/sched.c index 5adbb40..52c36ae 100644 --- a/code/src/common/resources/scheduling/sched.c +++ b/code/src/common/resources/scheduling/sched.c @@ -16,8 +16,9 @@ static ae_opcache_t sched_opcache; static triton_mutex_t sched_done_mutex; static ae_ops_t sched_done_queue; - static int triton_sched_resource_id; +static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; +static int module_refcount = 0; triton_ret_t triton_sched_init(triton_sched_t *sched) { @@ -64,7 +65,7 @@ ae_define_post(triton_ret_t, triton_sched_obj_wait, triton_sched_t sched, triton triton_mutex_unlock(result->mutex); *__ae_op_id = result->op_id; - return TRITON_SUCCESS; + return AE_SUCCESS; } triton_ret_t triton_sched_notify_all(triton_sched_t sched) @@ -128,11 +129,13 @@ triton_ret_t triton_sched_notify_specific(triton_sched_t sched, triton_sched_id_ return TRITON_SUCCESS; } -static triton_ret_t triton_sched_cancel(ae_context_t context, ae_op_id_t op_id) +static int triton_sched_cancel(ae_context_t context, ae_op_id_t op_id) { int resource_id; triton_sched_id_t *rid; intptr_t tmp_ptr; + + /* TODO: what error codes should this function return? */ tmp_ptr = ae_id_lookup(op_id, &resource_id); rid = (triton_sched_id_t *)tmp_ptr; @@ -150,10 +153,10 @@ static triton_ret_t triton_sched_cancel(ae_context_t context, ae_op_id_t op_id) triton_mutex_unlock(&sched_done_mutex); } triton_mutex_unlock(rid->mutex); - return TRITON_SUCCESS; + return AE_SUCCESS; } -static triton_ret_t triton_sched_poll(ae_context_t context) +static int triton_sched_poll(ae_context_t context, void *arg) { struct ae_op *op; struct triton_sched_id_s *result; @@ -193,7 +196,7 @@ static triton_ret_t triton_sched_poll(ae_context_t context) } triton_mutex_unlock(&sched_done_mutex); - return TRITON_SUCCESS; + return AE_SUCCESS; } static struct ae_resource triton_sched_resource = @@ -203,32 +206,48 @@ static struct ae_resource triton_sched_resource = .cancel = triton_sched_cancel }; -__attribute__((constructor)) void triton_sched_resource_init_register(void); - -__attribute__((constructor)) void triton_sched_resource_init_register(void) -{ - triton_init_register("triton.resource.sched", triton_sched_resource_init, triton_sched_resource_finalize, NULL, "aesop.control"); -} - triton_ret_t triton_sched_resource_init(void) { - triton_ret_t ret; + int ret; + + triton_mutex_lock(&module_lock); - ret = AE_OPCACHE_INIT(struct triton_sched_id_s, op, 1024, &sched_opcache); - if(ret != TRITON_SUCCESS) + if(!module_refcount) { - return ret; + ret = AE_OPCACHE_INIT(struct triton_sched_id_s, op, 1024, &sched_opcache); + if(ret != AE_SUCCESS) + { + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } + + ae_ops_init(&sched_done_queue); + triton_mutex_init(&sched_done_mutex, NULL); + + ret = ae_resource_register(&triton_sched_resource, &triton_sched_resource_id); + if(ret!= AE_SUCCESS) + { + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } } + module_refcount++; + triton_mutex_unlock(&module_lock); - ae_ops_init(&sched_done_queue); - triton_mutex_init(&sched_done_mutex, NULL); - return ae_resource_register(&triton_sched_resource, &triton_sched_resource_id); + return(TRITON_SUCCESS); } void triton_sched_resource_finalize(void) { - ae_resource_unregister(triton_sched_resource_id); - ae_opcache_destroy(sched_opcache); + triton_mutex_lock(&module_lock); + module_refcount--; + + if(!module_refcount) + { + ae_resource_unregister(triton_sched_resource_id); + ae_opcache_destroy(sched_opcache); + } + triton_mutex_unlock(&module_lock); } /* diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 4eba97a..61f404a 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; + /* TODO: init reference counting! */ + /* TODO: this function should be refactored */ + tret = triton_debug_init(); if(tret != TRITON_SUCCESS) return(tret); hooks/post-receive --

1 0

branch, ticket-227, updated. dcbbeb6875a913c25b99f876a2761eac9f28be3b
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 <carns(a)mcs.anl.gov> Date: Fri Dec 21 10:32:26 2012 -0500 init/finalize debugging in tosd commit ac03db772abffef77278340f7cbb647a39d665af Author: Phil Carns <carns(a)mcs.anl.gov> 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 --

1 0

branch, ticket-227, updated. a78480552b35bf278e0a6254c0891579e48abe70
by noreply＠mcs.anl.gov 21 Dec '12

21 Dec '12

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 a78480552b35bf278e0a6254c0891579e48abe70 (commit) from efe9ed9084852fb6cf555dffdbef953a51dd4c6c (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 a78480552b35bf278e0a6254c0891579e48abe70 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 21 09:45:45 2012 -0500 fix tosd init setup ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/transactional-osd.ae | 39 +++++++++++++++++++--- 1 files changed, 33 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index add0668..869c4c3 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -98,7 +98,6 @@ static triton_ret_t data_coal_updater(const char *key, const char *value); static triton_ret_t align_updater(const char *key, const char *value); static triton_ret_t flags_updater(const char *key, const char *value); static triton_ret_t error_rate_updater(const char *key, const char *value); -__attribute__((constructor)) void triton_tosd_init_register(void); static triton_debug_mask_t tosd_mask; static char* tosd_db_path = NULL; @@ -1479,6 +1478,7 @@ triton_ret_t tosd_init(void) struct timeval tv; unsigned int seed = 0; + /* seed random number generator */ gettimeofday(&tv, NULL); seed += tv.tv_usec; @@ -1595,6 +1595,33 @@ triton_ret_t tosd_init(void) if((global_flags & TOSD_INIT_FLAG_DATA_ODIRECT) && (global_alignment != 4096)) printf("WARNING: TOSD using directio, but alignment is not 4096.\n"); + /* initialize required components */ + tret = triton_sched_resource_init(); + if(tret != TRITON_SUCCESS) + return(tret); + + tret = bdb_init(); + if(tret != TRITON_SUCCESS) + { + triton_sched_resource_finalize(); + return(tret); + } + ae_ret = aefile_init(); + if(ae_ret != 0) + { + bdb_finalize(); + triton_sched_resource_finalize(); + return(tret); + } + ae_ret = aesop_timer_init(); + if(ae_ret != 0) + { + aefile_finalize(); + bdb_finalize(); + triton_sched_resource_finalize(); + return(tret); + } + tret = triton_sched_init(&coalesce_sched); if(tret != TRITON_SUCCESS) { @@ -1795,6 +1822,11 @@ void tosd_finalize(void) if(envp) envp->close(envp, 0); + aesop_timer_finalize(); + aefile_finalize(); + bdb_finalize(); + triton_sched_resource_finalize(); + if(tosd_db_path) free(tosd_db_path); if(tosd_log_path) @@ -1809,11 +1841,6 @@ void tosd_finalize(void) return; } -__attribute__((constructor)) void triton_tosd_init_register(void) -{ - triton_init_register("triton.tosd", tosd_init, tosd_finalize, NULL, - "triton.resource.sched", "triton.tosd.bdb", "triton.tosd.file", "triton.resource.timer"); -} #if 0 hooks/post-receive --

1 0

branch, ticket-227, updated. efe9ed9084852fb6cf555dffdbef953a51dd4c6c
by noreply＠mcs.anl.gov 14 Dec '12

14 Dec '12

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 efe9ed9084852fb6cf555dffdbef953a51dd4c6c (commit) via ff3fc525a3cb52eb1c76c56fb7653ff97fa98832 (commit) via 7e1b4864f5b155f310b8291e8aa4da32828ead1a (commit) via ceb77281ded400639b264c6120e50f07a19f0872 (commit) via c4915a33ded97e9195a0217947c49c00661ccc72 (commit) from eb9b77a5f3b0cd4a46af31bc4e2b72217ec72805 (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 efe9ed9084852fb6cf555dffdbef953a51dd4c6c Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 17:21:52 2012 -0500 remember to finalize triton-debug in bdb rsc commit ff3fc525a3cb52eb1c76c56fb7653ff97fa98832 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 17:20:24 2012 -0500 init zeroconf from triton-debug commit 7e1b4864f5b155f310b8291e8aa4da32828ead1a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 17:18:19 2012 -0500 clean up init functions in zeroconf component commit ceb77281ded400639b264c6120e50f07a19f0872 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 17:10:25 2012 -0500 initialize triton debugging in bdb resource commit c4915a33ded97e9195a0217947c49c00661ccc72 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 17:08:42 2012 -0500 clean up init functinos for triton-debug ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/bdb/bdb-resource.c | 17 +++- code/src/common/triton-debug.c | 140 +++++++++++--------------- code/src/common/triton-debug.h | 3 + code/src/zeroconf/zeroconf.c | 48 ++++++--- code/src/zeroconf/zeroconf.h | 3 + 5 files changed, 111 insertions(+), 100 deletions(-) Diff of changes: diff --git a/code/src/common/resources/bdb/bdb-resource.c b/code/src/common/resources/bdb/bdb-resource.c index 91128cc..1f59b49 100644 --- a/code/src/common/resources/bdb/bdb-resource.c +++ b/code/src/common/resources/bdb/bdb-resource.c @@ -429,13 +429,19 @@ triton_ret_t bdb_init(void) if (! bdb_refcount++ ) { - /* @TODO: Need to call init function for dependencies*/ + ret = triton_debug_init(); + if(ret != TRITON_SUCCESS) + { + triton_mutex_unlock (&bdb_ref_mutex); + return(ret); + } /* register a debugging mask for use in this resource */ ret = triton_debug_add_mask("bdb.resource", &bdb_r_mask, "Output debugging information for the Berkeley DB resources"); if(ret != TRITON_SUCCESS) { + triton_debug_finalize(); triton_mutex_unlock (&bdb_ref_mutex); return(ret); } @@ -445,6 +451,7 @@ triton_ret_t bdb_init(void) "Progress mode for BDB transactions (THREAD_PER_OP or THREAD_PER_TXN"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { + triton_debug_finalize(); triton_mutex_unlock (&bdb_ref_mutex); return(ret); } @@ -454,6 +461,7 @@ triton_ret_t bdb_init(void) "Progress mode for flushing BDB data (IN_PLACE, POLL, THREAD_PER_OP, or ONE_THREAD"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { + triton_debug_finalize(); triton_mutex_unlock (&bdb_ref_mutex); return(ret); } @@ -465,6 +473,7 @@ triton_ret_t bdb_init(void) &bdb_opcache); if(ae_ret != AE_SUCCESS) { + triton_debug_finalize(); triton_mutex_unlock (&bdb_ref_mutex); return(TRITON_ERR_UNKNOWN); } @@ -472,6 +481,7 @@ triton_ret_t bdb_init(void) txn_thread_table = triton_hash_init(txn_compare, triton_hash_ptr_hash, 200); if(!txn_thread_table) { + triton_debug_finalize(); triton_mutex_unlock (&bdb_ref_mutex); return(TRITON_ERR_NOMEM); } @@ -479,8 +489,9 @@ triton_ret_t bdb_init(void) ae_ret = ae_resource_register(&triton_bdb_resource, &triton_bdb_resource_id); if(ret != AE_SUCCESS) { - triton_mutex_unlock (&bdb_ref_mutex); + triton_debug_finalize(); ae_opcache_destroy(bdb_opcache); + triton_mutex_unlock (&bdb_ref_mutex); return(TRITON_ERR_UNKNOWN); } } @@ -503,7 +514,7 @@ void bdb_finalize(void) triton_debug(bdb_r_mask, "bdb deadlock_counter: %lu\n", deadlock_counter); - /* @TODO: Need to call finalize function for dependencies*/ + triton_debug_finalize(); } triton_mutex_unlock (&bdb_ref_mutex); diff --git a/code/src/common/triton-debug.c b/code/src/common/triton-debug.c index 7c6bca5..b32bebf 100644 --- a/code/src/common/triton-debug.c +++ b/code/src/common/triton-debug.c @@ -8,6 +8,9 @@ #include "src/common/triton-init.h" #include "src/zeroconf/zeroconf.h" +static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; +static int module_refcount = 0; + static struct triton_hash_table *triton_debug_mask_table = NULL; static triton_list_t triton_debug_full_masks; @@ -31,7 +34,6 @@ extern char* __progname_full; #define triton_debug_set(value) triton_bitarray_set(triton_debug_enabled_minor, value-1) static FILE *triton_debug_fp = NULL; -static char *triton_debug_enabled_str = NULL; static uint64_t triton_debug_major_mask_count = 0; static uint64_t triton_debug_mask_count = 0; @@ -63,22 +65,6 @@ static int triton_debug_compare(const void *k, struct triton_hash_link *llink) return !strcmp(k, entry->mask); } -static triton_ret_t triton_debug_init(void); -static void triton_debug_finalize(void); -static triton_ret_t triton_debug_init_stage2(void); - -__attribute__((constructor)) void triton_debug_init_register(void); - -__attribute__((constructor)) void triton_debug_init_register(void) -{ - triton_init_register( - "triton.debug", - triton_debug_init, - triton_debug_finalize, - triton_debug_init_stage2, - "triton.zeroconf"); -} - static triton_ret_t debug_file_updater(const char *key, const char *value) { assert(!strcmp(key, "triton.debug.file")); @@ -91,35 +77,56 @@ static triton_ret_t debug_mask_updater(const char *key, const char *value) return triton_debug_enable(NULL, value); } -static triton_ret_t triton_debug_init(void) +triton_ret_t triton_debug_init(void) { triton_ret_t ret; - triton_debug_mask_table = triton_hash_init(triton_debug_compare, triton_hash_strhash, bj_hashsize(10)); - if(!triton_debug_mask_table) + triton_mutex_lock(&module_lock); + + if(!module_refcount) { - return TRITON_ERR_NOMEM; - } + ret = triton_zeroconf_init(); + if(ret != TRITON_SUCCESS) + { + triton_mutex_unlock(&module_lock); + return(ret); + } + + triton_debug_mask_table = triton_hash_init(triton_debug_compare, triton_hash_strhash, bj_hashsize(10)); + if(!triton_debug_mask_table) + { + triton_zeroconf_finalize(); + triton_mutex_unlock(&module_lock); + return TRITON_ERR_NOMEM; + } - triton_list_init(&triton_debug_full_masks); + triton_list_init(&triton_debug_full_masks); - ret = triton_zeroconf_register("triton.debug.file", "/dev/stderr", debug_file_updater, - "Debug file to direct all debug output"); - if(ret != TRITON_SUCCESS) - { - return ret; - } + ret = triton_zeroconf_register("triton.debug.file", "/dev/stderr", debug_file_updater, + "Debug file to direct all debug output"); + if(ret != TRITON_SUCCESS) + { + triton_zeroconf_finalize(); + triton_mutex_unlock(&module_lock); + return ret; + } - ret = triton_zeroconf_register("triton.debug.masks", "none", debug_mask_updater, - "Debug mask to enable debugging of various triton components"); - if(ret != TRITON_SUCCESS) - { - return ret; + ret = triton_zeroconf_register("triton.debug.masks", "none", debug_mask_updater, + "Debug mask to enable debugging of various triton components"); + if(ret != TRITON_SUCCESS) + { + triton_zeroconf_finalize(); + triton_mutex_unlock(&module_lock); + return ret; + } } + module_refcount++; + triton_mutex_unlock(&module_lock); return TRITON_SUCCESS; } +#if 0 static void print_masks(FILE *fp) { struct triton_debug_mask_full_entry *entry, *safe; @@ -132,30 +139,7 @@ static void print_masks(FILE *fp) entry->description ? entry->description : ""); } } - -static triton_ret_t triton_debug_init_stage2(void) -{ - char *current_masks; - - if(triton_debug_enabled_str && !strcasecmp(triton_debug_enabled_str, "show")) - { - /* output all registered masks */ - print_masks(triton_debug_fp); - return triton_error_wrap(TRITON_ERR_INVAL, TRITON_ADDR_NULL, "User requested all the debug masks"); - } - - if(!triton_debug_enabled_str) - { - return TRITON_SUCCESS; - } - - current_masks = strdup(triton_debug_enabled_str); - /* reset the current mask, since we now have all masks registered and can properly handle negated masks */ - triton_debug_enable(NULL, current_masks); - - free(current_masks); - return TRITON_SUCCESS; -} +#endif static void mask_entry_free(void *e) { @@ -164,20 +148,28 @@ static void mask_entry_free(void *e) free(entry); } -static void triton_debug_finalize(void) +void triton_debug_finalize(void) { - struct triton_debug_mask_full_entry *entry, *safe; + triton_mutex_lock(&module_lock); + module_refcount--; - triton_hash_destroy_and_finalize( - triton_debug_mask_table, struct triton_debug_mask_entry, link, mask_entry_free); - - triton_list_for_each_entry(entry, safe, &triton_debug_full_masks, struct triton_debug_mask_full_entry, link) + if(!module_refcount) { - triton_list_del(&entry->link); - if(entry->string) free(entry->string); - if(entry->description) free(entry->description); - free(entry); + struct triton_debug_mask_full_entry *entry, *safe; + + triton_hash_destroy_and_finalize( + triton_debug_mask_table, struct triton_debug_mask_entry, link, mask_entry_free); + + triton_list_for_each_entry(entry, safe, &triton_debug_full_masks, struct triton_debug_mask_full_entry, link) + { + triton_list_del(&entry->link); + if(entry->string) free(entry->string); + if(entry->description) free(entry->description); + free(entry); + } + triton_zeroconf_finalize(); } + triton_mutex_unlock(&module_lock); } static triton_ret_t triton_idebug_add_mask(int major, char *str, uint32_t *value, char *parent) @@ -660,13 +652,6 @@ triton_ret_t triton_debug_enable(const char *file, const char *masks) } } - if(!strcasecmp(masks, "show")) - { - /* don't do anything for show, handled by init_stage2 */ - triton_debug_enabled_str = strdup(masks); - return TRITON_SUCCESS; - } - if(!strcasecmp(masks, "all")) { triton_debug_enabled_none = 0; @@ -716,11 +701,6 @@ triton_ret_t triton_debug_enable(const char *file, const char *masks) } while(s); free(tmpmasks); - if(triton_debug_enabled_str) - { - free(triton_debug_enabled_str); - } - triton_debug_enabled_str = strdup(masks); return TRITON_SUCCESS; } diff --git a/code/src/common/triton-debug.h b/code/src/common/triton-debug.h index 51c7ec1..1beca11 100644 --- a/code/src/common/triton-debug.h +++ b/code/src/common/triton-debug.h @@ -18,6 +18,9 @@ typedef struct #include "src/common/triton-error.h" +void triton_debug_finalize(void); +triton_ret_t triton_debug_init(void); + /** * Add a mask to the debugging system. A debug mask is a string consisting of * '.' separated components, allowing for a hierarchy within components. diff --git a/code/src/zeroconf/zeroconf.c b/code/src/zeroconf/zeroconf.c index 483820e..922aee8 100644 --- a/code/src/zeroconf/zeroconf.c +++ b/code/src/zeroconf/zeroconf.c @@ -5,9 +5,11 @@ #include <aesop/triton-list.h> #include "src/common/triton-log.h" +static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; +static int module_refcount = 0; + static struct triton_hash_table *zeroconf_table = NULL; static TRITON_LIST_DEFINE(pre_init_keys); -int initialized = 0; struct zeroconf_kv { @@ -38,19 +40,25 @@ static int zc_compare(const void *key, struct triton_hash_link *link) #include "src/common/triton-init.h" #include "src/common/triton-debug.h" -static triton_ret_t triton_zeroconf_init(void) +triton_ret_t triton_zeroconf_init(void) { - zeroconf_table = triton_hash_init(zc_compare, triton_hash_strhash, 4096); - if(zeroconf_table == NULL) + triton_mutex_lock(&module_lock); + if(!module_refcount) { - return TRITON_ERR_NOMEM; + zeroconf_table = triton_hash_init(zc_compare, triton_hash_strhash, 4096); + if(zeroconf_table == NULL) + { + triton_mutex_unlock(&module_lock); + return TRITON_ERR_NOMEM; + } } - - initialized = 1; + module_refcount++; + triton_mutex_unlock(&module_lock); return TRITON_SUCCESS; } +#if 0 /* The main purpose of the stage 2 init function is to safety check that any * zeroconf parameters that were explicitly set prior to initialization * eventually got used by some component. @@ -73,6 +81,7 @@ static triton_ret_t triton_zeroconf_init_stage2(void) return(tret); } +#endif static void zc_entry_destroy(void *z) @@ -84,17 +93,16 @@ static void zc_entry_destroy(void *z) free(zce); } -static void triton_zeroconf_finalize(void) +void triton_zeroconf_finalize(void) { - triton_hash_destroy_and_finalize(zeroconf_table, struct zc_entry, link, zc_entry_destroy); - initialized = 0; -} + triton_mutex_lock(&module_lock); + module_refcount--; -__attribute__((constructor)) void triton_zeroconf_init_register(void); - -__attribute__((constructor)) void triton_zeroconf_init_register(void) -{ - triton_init_register("triton.zeroconf", triton_zeroconf_init, triton_zeroconf_finalize, triton_zeroconf_init_stage2); + if(!module_refcount) + { + triton_hash_destroy_and_finalize(zeroconf_table, struct zc_entry, link, zc_entry_destroy); + } + triton_mutex_unlock(&module_lock); } const char * triton_zeroconf_get(const char *key) @@ -118,7 +126,8 @@ triton_ret_t triton_zeroconf_set(const char *key, const char *value) struct zc_entry *zce; struct pre_init_entry* pi_entry; - if(!initialized) + triton_mutex_lock(&module_lock); + if(!module_refcount) { /* zeroconf has not been started yet; queue up this key/value pair * to be processed later @@ -126,12 +135,14 @@ triton_ret_t triton_zeroconf_set(const char *key, const char *value) pi_entry = malloc(sizeof(*pi_entry)); if(!pi_entry) { + triton_mutex_unlock(&module_lock); return(TRITON_ERR_NOMEM); } pi_entry->kv.key = strdup(key); if(!pi_entry->kv.key) { free(pi_entry); + triton_mutex_unlock(&module_lock); return(TRITON_ERR_NOMEM); } pi_entry->kv.value = strdup(value); @@ -139,12 +150,15 @@ triton_ret_t triton_zeroconf_set(const char *key, const char *value) { free(pi_entry->kv.key); free(pi_entry); + triton_mutex_unlock(&module_lock); return(TRITON_ERR_NOMEM); } triton_list_link_clear(&pi_entry->list_link); triton_list_add_back(&pi_entry->list_link, &pre_init_keys); + triton_mutex_unlock(&module_lock); return(TRITON_SUCCESS); } + triton_mutex_unlock(&module_lock); link = triton_hash_search(zeroconf_table, key); if(!link) diff --git a/code/src/zeroconf/zeroconf.h b/code/src/zeroconf/zeroconf.h index 3f4a2b7..cf035a9 100644 --- a/code/src/zeroconf/zeroconf.h +++ b/code/src/zeroconf/zeroconf.h @@ -6,6 +6,9 @@ /* TODO: make this a real zero config interface */ +triton_ret_t triton_zeroconf_init(void); +void triton_zeroconf_finalize(void); + triton_ret_t triton_zeroconf_register(const char *key, const char *init_value, triton_ret_t (*update_callback)(const char *key, const char *value), const char *info); const char * triton_zeroconf_get(const char *key); hooks/post-receive --

1 0

branch, ticket-227, updated. eb9b77a5f3b0cd4a46af31bc4e2b72217ec72805
by noreply＠mcs.anl.gov 14 Dec '12

14 Dec '12

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 eb9b77a5f3b0cd4a46af31bc4e2b72217ec72805 (commit) from f345b919dfa942c0c65dd78833431d7e4f52e050 (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 eb9b77a5f3b0cd4a46af31bc4e2b72217ec72805 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 16:52:21 2012 -0500 fix bdb resource warnings ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/bdb/bdb-resource.c | 37 +++++++++++++------------ 1 files changed, 19 insertions(+), 18 deletions(-) Diff of changes: diff --git a/code/src/common/resources/bdb/bdb-resource.c b/code/src/common/resources/bdb/bdb-resource.c index 539179d..91128cc 100644 --- a/code/src/common/resources/bdb/bdb-resource.c +++ b/code/src/common/resources/bdb/bdb-resource.c @@ -245,7 +245,7 @@ static void* thread_fn(void* foo) /* equivalent to bdb_launch_op(), except that it executes the operation * immediately rather than asynchronously */ -static triton_ret_t bdb_launch_op_here(struct ae_op *op, triton_ret_t *retval) +static int bdb_launch_op_here(struct ae_op *op, triton_ret_t *retval) { struct bdb_op* b_op = ae_op_entry(op, struct bdb_op, op); @@ -259,10 +259,10 @@ static triton_ret_t bdb_launch_op_here(struct ae_op *op, triton_ret_t *retval) /* do immediate completion of the operation */ if(retval) *retval = b_op->return_code; ae_opcache_put(bdb_opcache, op); - return TRITON_IMMEDIATE_COMPLETION; + return AE_IMMEDIATE_COMPLETION; } -static triton_ret_t bdb_launch_op( +static int bdb_launch_op( struct ae_op *op, enum bdb_progress_mode mode, DB_TXN* txn, triton_ret_t *retval) { pthread_t tid; @@ -297,7 +297,7 @@ static triton_ret_t bdb_launch_op( if(!tmp_entry) { triton_mutex_unlock(&bdb_mutex); - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); } tmp_entry->txn = txn; ae_ops_init(&tmp_entry->oplist); @@ -315,8 +315,8 @@ static triton_ret_t bdb_launch_op( thread_per_txn_fn, tmp_entry); if(tret != TRITON_SUCCESS) { - /* TODO: error handling */ - return(tret); + triton_error_destroy(tret); + return(AE_ERR_SYSTEM); } } else @@ -348,15 +348,16 @@ static triton_ret_t bdb_launch_op( if(tret != TRITON_SUCCESS) { ae_ops_del(op); - return(tret); + triton_error_destroy(tret); + return(AE_ERR_SYSTEM); } break; default: - return(TRITON_ERR_INVAL); + return(AE_ERR_INVALID); break; } - return(TRITON_SUCCESS); + return(AE_SUCCESS); } static int bdb_poll(ae_context_t context, void* user_data) @@ -460,12 +461,12 @@ triton_ret_t bdb_init(void) ae_ops_init(&bdb_poll_oplist); ae_ops_init(&bdb_thread_oplist); - ret = AE_OPCACHE_INIT(struct bdb_op, op, BDB_DEFAULT_OPCACHE_SIZE, + ae_ret = AE_OPCACHE_INIT(struct bdb_op, op, BDB_DEFAULT_OPCACHE_SIZE, &bdb_opcache); - if(ret != TRITON_SUCCESS) + if(ae_ret != AE_SUCCESS) { triton_mutex_unlock (&bdb_ref_mutex); - return(ret); + return(TRITON_ERR_UNKNOWN); } txn_thread_table = triton_hash_init(txn_compare, triton_hash_ptr_hash, 200); @@ -548,7 +549,7 @@ ae_define_post(triton_ret_t, bdb_log_flush, op = ae_opcache_get(bdb_opcache); if(!op) - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); ae_op_fill(op); b_op = ae_op_entry(op, struct bdb_op, op); @@ -659,7 +660,7 @@ ae_define_post(triton_ret_t, bdb_txn_commit, op = ae_opcache_get(bdb_opcache); if(!op) - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); ae_op_fill(op); b_op = ae_op_entry(op, struct bdb_op, op); @@ -700,7 +701,7 @@ ae_define_post(triton_ret_t, bdb_txn_abort, op = ae_opcache_get(bdb_opcache); if(!op) - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); ae_op_fill(op); b_op = ae_op_entry(op, struct bdb_op, op); @@ -845,7 +846,7 @@ ae_define_post(triton_ret_t, bdb_cursor_del, op = ae_opcache_get(bdb_opcache); if(!op) - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); ae_op_fill(op); b_op = ae_op_entry(op, struct bdb_op, op); @@ -928,7 +929,7 @@ ae_define_post(triton_ret_t, bdb_put, op = ae_opcache_get(bdb_opcache); if(!op) - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); ae_op_fill(op); b_op = ae_op_entry(op, struct bdb_op, op); @@ -978,7 +979,7 @@ ae_define_post(triton_ret_t, bdb_del, op = ae_opcache_get(bdb_opcache); if(!op) - return(TRITON_ERR_NOMEM); + return(AE_ERR_NOMEM); ae_op_fill(op); b_op = ae_op_entry(op, struct bdb_op, op); hooks/post-receive --

1 0

branch, ticket-227, updated. f345b919dfa942c0c65dd78833431d7e4f52e050
by noreply＠mcs.anl.gov 14 Dec '12

14 Dec '12

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 f345b919dfa942c0c65dd78833431d7e4f52e050 (commit) via b6db762bccd8ec11b64fb9f990ef85c9e0d8d280 (commit) via a161cdaaf59cb93639397e412a47c59b6f3b45dd (commit) from 5cb630979958f7597c5a519092b304807a3aa6d7 (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 f345b919dfa942c0c65dd78833431d7e4f52e050 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 15:56:15 2012 -0500 fix function prototypes in bdb-resource.c commit b6db762bccd8ec11b64fb9f990ef85c9e0d8d280 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 15:52:26 2012 -0500 fix bdb_init locking commit a161cdaaf59cb93639397e412a47c59b6f3b45dd Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Dec 14 15:50:35 2012 -0500 full remove init registration from bdb resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/bdb/bdb-resource.c | 31 ++++++++++++------------- 1 files changed, 15 insertions(+), 16 deletions(-) Diff of changes: diff --git a/code/src/common/resources/bdb/bdb-resource.c b/code/src/common/resources/bdb/bdb-resource.c index aafa62b..539179d 100644 --- a/code/src/common/resources/bdb/bdb-resource.c +++ b/code/src/common/resources/bdb/bdb-resource.c @@ -161,7 +161,6 @@ static int cursor_work_fn(struct ae_op* op); static int txn_checkpoint_work_fn(struct ae_op* op); static int log_flush_work_fn(struct ae_op* op); static triton_ret_t progress_mode_updater(const char *key, const char *value); -__attribute__((constructor)) void triton_bdb_init_register(void); static triton_ret_t start_detached_thread(pthread_t* tid, void *(*start_routine)(void*), void * arg); static int txn_compare(const void *key, struct triton_hash_link *hash_link); @@ -360,7 +359,7 @@ static triton_ret_t bdb_launch_op( return(TRITON_SUCCESS); } -static triton_ret_t bdb_poll(ae_context_t context) +static int bdb_poll(ae_context_t context, void* user_data) { struct ae_op *a_op; struct bdb_op *b_op; @@ -373,7 +372,7 @@ static triton_ret_t bdb_poll(ae_context_t context) { triton_mutex_unlock(&bdb_mutex); /* nothing to work on */ - return(TRITON_SUCCESS); + return(AE_SUCCESS); } triton_mutex_unlock(&bdb_mutex); @@ -396,15 +395,19 @@ static triton_ret_t bdb_poll(ae_context_t context) ae_resource_request_poll(a_op->ctx, triton_bdb_resource_id); } - return TRITON_SUCCESS; + return AE_SUCCESS; } -static triton_ret_t bdb_cancel(ae_context_t triton_ctx, ae_op_id_t op_id) +static int bdb_cancel(ae_context_t triton_ctx, ae_op_id_t op_id) { /* TODO: maybe come back and at least figure out if the operation is on * the queue? If so we can cancel it, otherwise we do nothing. */ - return TRITON_SUCCESS; + + /* TODO: this code needs to be fixed! Return code should depend on + * result of cancel???? + */ + return AE_SUCCESS; } struct ae_resource triton_bdb_resource = @@ -432,6 +435,7 @@ triton_ret_t bdb_init(void) "Output debugging information for the Berkeley DB resources"); if(ret != TRITON_SUCCESS) { + triton_mutex_unlock (&bdb_ref_mutex); return(ret); } @@ -440,6 +444,7 @@ triton_ret_t bdb_init(void) "Progress mode for BDB transactions (THREAD_PER_OP or THREAD_PER_TXN"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { + triton_mutex_unlock (&bdb_ref_mutex); return(ret); } @@ -448,6 +453,7 @@ triton_ret_t bdb_init(void) "Progress mode for flushing BDB data (IN_PLACE, POLL, THREAD_PER_OP, or ONE_THREAD"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { + triton_mutex_unlock (&bdb_ref_mutex); return(ret); } @@ -458,18 +464,21 @@ triton_ret_t bdb_init(void) &bdb_opcache); if(ret != TRITON_SUCCESS) { + triton_mutex_unlock (&bdb_ref_mutex); return(ret); } txn_thread_table = triton_hash_init(txn_compare, triton_hash_ptr_hash, 200); if(!txn_thread_table) { + triton_mutex_unlock (&bdb_ref_mutex); return(TRITON_ERR_NOMEM); } ae_ret = ae_resource_register(&triton_bdb_resource, &triton_bdb_resource_id); if(ret != AE_SUCCESS) { + triton_mutex_unlock (&bdb_ref_mutex); ae_opcache_destroy(bdb_opcache); return(TRITON_ERR_UNKNOWN); } @@ -493,25 +502,15 @@ void bdb_finalize(void) triton_debug(bdb_r_mask, "bdb deadlock_counter: %lu\n", deadlock_counter); - /* @TODO: Need to call finalize function for dependencies*/ } - triton_mutex_unlock (&bdb_ref_mutex); return; } -/* -__attribute__((constructor)) void triton_bdb_init_register(void) -{ - triton_init_register("triton.tosd.bdb", bdb_init, bdb_finalize, NULL, - "triton.debug", "aesop.control", "triton.zeroconf"); -} -*/ - ae_define_post(triton_ret_t, bdb_txn_begin, DB_ENV *env, DB_TXN *parent, hooks/post-receive --

1 0