February 2013 - Triton-commits - mailman3.cels.anl.gov

branch, ticket-227, updated. 61e39beb8d7d8903dc367d3005f4f24999915cc8
by noreply＠mcs.anl.gov 28 Feb '13

28 Feb '13

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 61e39beb8d7d8903dc367d3005f4f24999915cc8 (commit) from 1b9ca34a1ce327c8a4fdd02f76f7a2cc677be1fe (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 61e39beb8d7d8903dc367d3005f4f24999915cc8 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 28 15:59:34 2013 -0500 update to reflect removal of aesop contexts ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/scheduling/sched.c | 14 ++++++------ code/src/common/resources/signal/signal.c | 27 ++++-------------------- code/src/kv/kv.c | 28 +++++++++++++------------- code/src/net/triton-message.hae | 3 +- 4 files changed, 27 insertions(+), 45 deletions(-) Diff of changes: diff --git a/code/src/common/resources/scheduling/sched.c b/code/src/common/resources/scheduling/sched.c index 86cef3e..574be98 100644 --- a/code/src/common/resources/scheduling/sched.c +++ b/code/src/common/resources/scheduling/sched.c @@ -97,7 +97,7 @@ triton_ret_t triton_sched_notify_all(triton_sched_t sched) if(found_ops) { - ae_resource_request_poll(op->ctx, triton_sched_resource_id); + ae_resource_request_poll(triton_sched_resource_id); } return TRITON_SUCCESS; @@ -116,7 +116,7 @@ triton_ret_t triton_sched_notify_next(triton_sched_t sched) /* add op to done queue */ triton_mutex_lock(&sched_done_mutex); ae_ops_enqueue(op, &sched_done_queue); - ae_resource_request_poll(op->ctx, triton_sched_resource_id); + ae_resource_request_poll(triton_sched_resource_id); triton_mutex_unlock(&sched_done_mutex); } return TRITON_SUCCESS; @@ -129,13 +129,13 @@ triton_ret_t triton_sched_notify_specific(triton_sched_t sched, triton_sched_id_ triton_mutex_lock(&sched_done_mutex); ae_ops_enqueue(&id->op, &sched_done_queue); - ae_resource_request_poll(id->op.ctx, triton_sched_resource_id); + ae_resource_request_poll(triton_sched_resource_id); triton_mutex_unlock(&sched_done_mutex); return TRITON_SUCCESS; } -static int triton_sched_cancel(ae_context_t context, ae_op_id_t op_id) +static int triton_sched_cancel(ae_op_id_t op_id) { int resource_id; triton_sched_id_t *rid; @@ -154,7 +154,7 @@ static int triton_sched_cancel(ae_context_t context, ae_op_id_t op_id) rid->state = TRITON_SCHED_STATE_CANCELED; triton_mutex_lock(&sched_done_mutex); ae_ops_enqueue(&rid->op, &sched_done_queue); - ae_resource_request_poll(rid->op.ctx, triton_sched_resource_id); + ae_resource_request_poll(triton_sched_resource_id); triton_mutex_unlock(&sched_done_mutex); ret = AE_SUCCESS; } @@ -166,7 +166,7 @@ static int triton_sched_cancel(ae_context_t context, ae_op_id_t op_id) return ret; } -static int triton_sched_poll(ae_context_t context, void *arg) +static int triton_sched_poll(void *arg) { struct ae_op *op; struct triton_sched_id_s *result; @@ -220,7 +220,7 @@ static int triton_sched_poll(ae_context_t context, void *arg) static struct ae_resource triton_sched_resource = { .resource_name = "sched", - .poll_context = triton_sched_poll, + .poll = triton_sched_poll, .cancel = triton_sched_cancel }; diff --git a/code/src/common/resources/signal/signal.c b/code/src/common/resources/signal/signal.c index 56290a1..b418798 100644 --- a/code/src/common/resources/signal/signal.c +++ b/code/src/common/resources/signal/signal.c @@ -169,7 +169,7 @@ ae_define_post(triton_ret_t, triton_signal_wait, int signum) return AE_SUCCESS; } -static int triton_signal_poll(ae_context_t context, void *arg) +static int triton_signal_poll(void *arg) { triton_mutex_lock (&signal_mutex); int normal_completion; @@ -213,8 +213,7 @@ static int triton_signal_poll(ae_context_t context, void *arg) return AE_SUCCESS; } -static int triton_signal_cancel(ae_context_t triton_ctx, - ae_op_id_t op_id) +static int triton_signal_cancel(ae_op_id_t op_id) { int resource_id; struct ae_op * op; @@ -233,10 +232,6 @@ static int triton_signal_cancel(ae_context_t triton_ctx, return AE_ERR_INVALID; } - // need to make a copy here since as soon as we release the lock this op - // might go away. - ae_context_t context = sig->op.ctx; - sig->tret = TRITON_ERR_CANCELED; triton_list_del (&sig->link); triton_list_add_back (&sig->link, &signal_completed); @@ -244,13 +239,7 @@ static int triton_signal_cancel(ae_context_t triton_ctx, triton_mutex_unlock (&signal_mutex); // We don't complete operations (see cancel docs) so request a poll - // Problem here: how to ensure the context is still valid? - // When releasing the lock, poll might already be running meaning the whole - // context might be released. - // At the same time we have to release the lock before requesting the poll - // to avoid deadlock (unless request_poll is guaranteed not to block or - // call callbacks/poll functions before returning) - ae_resource_request_poll(context, triton_signal_resource_id); + ae_resource_request_poll(triton_signal_resource_id); return AE_SUCCESS; } @@ -280,7 +269,7 @@ void triton_signal_pulse (void) struct ae_resource triton_signal_resource = { .resource_name = "signal", - .poll_context = triton_signal_poll, + .poll = triton_signal_poll, .cancel = triton_signal_cancel }; @@ -420,25 +409,19 @@ static void * signal_thread_main (void * d) const int need_poll = !triton_list_empty (&signal_completed); - ae_context_t context; - if (need_poll) { const signal_op_t * sig = triton_list_get_entry ( triton_list_peek_front (&signal_completed), signal_op_t, link); - - context = sig->op.ctx; } triton_mutex_unlock (&signal_mutex); if (need_poll) { - // Note: we don't keep track of specific context - poll will complete - // them all - ae_resource_request_poll (context, triton_signal_resource_id); + ae_resource_request_poll (triton_signal_resource_id); } }; diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index e6e9cae..483c3f9 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -34,7 +34,7 @@ static void cb(void *user_ptr, triton_ret_t ret) struct completion *c = (struct completion *)user_ptr; c->ret = ret; c->done = 1; - ae_poll_break(NULL); + ae_poll_break(); } static void write_hostfile (size_t count, int fd) @@ -58,7 +58,7 @@ triton_ret_t triton_kv_client_start(void) ae_hints_init(&hints); ret = ext_post_blocking(triton_kv_client_start_internal, cb, &c, &hints, - NULL, &op_id, &c.ret); + &op_id, &c.ret); if(ret == AE_SUCCESS) return(TRITON_SUCCESS); @@ -88,7 +88,7 @@ triton_ret_t triton_kv_server_start(kv_op_id* id) ae_hints_init(&(*id)->hints); ret = ext_post_blocking(triton_kv_server_start_internal, cb, &(*id)->c, &(*id)->hints, - NULL, &op_id, &(*id)->c.ret); + &op_id, &(*id)->c.ret); if(ret == AE_SUCCESS) return(TRITON_SUCCESS); @@ -118,7 +118,7 @@ triton_ret_t triton_kv_server_wait (kv_op_id id) while (!id->c.done) { - ae_poll(NULL, KV_AE_POLL_TIMEOUT); + ae_poll(KV_AE_POLL_TIMEOUT); } ae_hints_destroy(&id->hints); @@ -157,13 +157,13 @@ triton_ret_t triton_kv_server_stop (void) ae_hints_init(&hints); ret = ext_post_blocking(triton_kv_server_stop_internal, cb, &c, &hints, - NULL, &op_id, &c.ret); + &op_id, &c.ret); if(ret == AE_SUCCESS) { while(!c.done) { - ae_poll(NULL, KV_AE_POLL_TIMEOUT); + ae_poll(KV_AE_POLL_TIMEOUT); } } else if(ret == AE_IMMEDIATE_COMPLETION) @@ -204,14 +204,14 @@ triton_ret_t triton_kv_init (size_t servercount, int is_server, const char *kvst c.done = 0; ae_hints_init(&hints); - ret = ext_post_blocking(triton_kv_init_internal, cb, &c, &hints, NULL, &op_id, + ret = ext_post_blocking(triton_kv_init_internal, cb, &c, &hints, &op_id, &c.ret, &filename[0], is_server); if(ret == AE_SUCCESS) { while(!c.done) { - ae_poll(NULL, KV_AE_POLL_TIMEOUT); + ae_poll(KV_AE_POLL_TIMEOUT); } close (fd); } @@ -249,14 +249,14 @@ triton_ret_t triton_kv_get(const char * key, void * value, ae_hints_init(&hints); - ret = ext_post_blocking(triton_kv_get_internal, cb, &c, &hints, NULL, + ret = ext_post_blocking(triton_kv_get_internal, cb, &c, &hints, &op_id, &c.ret, key, value, value_sz); if(ret == AE_SUCCESS) { while(!c.done) { - ae_poll(NULL, KV_AE_POLL_TIMEOUT); + ae_poll(KV_AE_POLL_TIMEOUT); } } else if(ret == AE_IMMEDIATE_COMPLETION) @@ -279,13 +279,13 @@ triton_ret_t triton_kv_put(const char * key, void * value, size_t value_sz) ae_hints_t hints; ae_hints_init(&hints); - ret = ext_post_blocking(triton_kv_put_internal, cb, &c, &hints, NULL, &op_id, + ret = ext_post_blocking(triton_kv_put_internal, cb, &c, &hints, &op_id, &c.ret, key, value, value_sz); if(ret == AE_SUCCESS) { while(!c.done) { - ae_poll(NULL, KV_AE_POLL_TIMEOUT); + ae_poll(KV_AE_POLL_TIMEOUT); } } else if(ret == AE_IMMEDIATE_COMPLETION) @@ -308,13 +308,13 @@ triton_ret_t triton_kv_remove(const char *key) ae_hints_t hints; ae_hints_init(&hints); - ret = ext_post_blocking(triton_kv_remove_internal, cb, &c, &hints, NULL, &op_id, + ret = ext_post_blocking(triton_kv_remove_internal, cb, &c, &hints, &op_id, &c.ret, key); if(ret == AE_SUCCESS) { while(!c.done) { - ae_poll(NULL, KV_AE_POLL_TIMEOUT); + ae_poll(KV_AE_POLL_TIMEOUT); } } else if(ret == AE_IMMEDIATE_COMPLETION) diff --git a/code/src/net/triton-message.hae b/code/src/net/triton-message.hae index 0554ea0..a910b92 100644 --- a/code/src/net/triton-message.hae +++ b/code/src/net/triton-message.hae @@ -32,8 +32,7 @@ typedef int32_t triton_msg_tag_t; * * At the moment, the MPI method simply creates a new communicator for each new group * that gets added. Various interfaces could create separate groups and send messages - * using different groups on different ae_context_t variables, allowing for separate - * polling of the different groups through the different aesop contexts. + * using different groups. */ struct triton_msg_group; hooks/post-receive --

1 0

branch, ticket-227, updated. 1b9ca34a1ce327c8a4fdd02f76f7a2cc677be1fe
by noreply＠mcs.anl.gov 26 Feb '13

26 Feb '13

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 1b9ca34a1ce327c8a4fdd02f76f7a2cc677be1fe (commit) from 64589bdf5efbb6c815517752e2819abdf6898a49 (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 1b9ca34a1ce327c8a4fdd02f76f7a2cc677be1fe Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 26 16:21:05 2013 -0500 more safety against aesop callback finalizing MPI ----------------------------------------------------------------------- Summary of changes: code/src/net/mpi/mpi-method.ae | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) Diff of changes: diff --git a/code/src/net/mpi/mpi-method.ae b/code/src/net/mpi/mpi-method.ae index cb6f20b..fb0d1c1 100644 --- a/code/src/net/mpi/mpi-method.ae +++ b/code/src/net/mpi/mpi-method.ae @@ -1683,23 +1683,33 @@ static void internal_finalize( void) { int i; + int mpi_finalized; triton_msg_method_unregister("mpi"); - if (group_table != NULL) + MPI_Finalized(&mpi_finalized); + + /* NOTE: this is a workaround; we can't cleanly make any further MPI + * calls if an aesop callback has already executed a direct call to + * MPI_Finalize() before we reach this point. + */ + if(!mpi_finalized) { - triton_hash_destroy_and_finalize(group_table, - struct triton_mpi_group, - link, - group_entry_free); - group_table = NULL; + if (group_table != NULL) + { + triton_hash_destroy_and_finalize(group_table, + struct triton_mpi_group, + link, + group_entry_free); + group_table = NULL; + } + for (i = 0; i < mpi_global_data.size; i++) + MPI_Win_free(&mpi_global_data.wins[i]); + free(mpi_global_data.one_sided_memory); + triton_assert(mpi_global_data.mem_range_head->next == NULL); + free(mpi_global_data.mem_range_head); + triton_mutex_destroy(&mpi_global_data.mutex); } - for (i = 0; i < mpi_global_data.size; i++) - MPI_Win_free(&mpi_global_data.wins[i]); - free(mpi_global_data.one_sided_memory); - triton_assert(mpi_global_data.mem_range_head->next == NULL); - free(mpi_global_data.mem_range_head); - triton_mutex_destroy(&mpi_global_data.mutex); triton_msg_finalize(); aesop_sem_module_finalize(); hooks/post-receive --

1 0

branch, ticket-227, updated. 64589bdf5efbb6c815517752e2819abdf6898a49
by noreply＠mcs.anl.gov 26 Feb '13

26 Feb '13

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 64589bdf5efbb6c815517752e2819abdf6898a49 (commit) via 5e7f5252a1000752995df1c0fdd76975a85912b6 (commit) from f2ba3a347c9f6354e67f5a20b38068ae125b9a82 (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 64589bdf5efbb6c815517752e2819abdf6898a49 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 26 16:07:01 2013 -0500 put worker thread in charge of freeing datatypes commit 5e7f5252a1000752995df1c0fdd76975a85912b6 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 26 14:58:27 2013 -0500 use MPI_Finalize() to check for callback race ----------------------------------------------------------------------- Summary of changes: code/src/net/mpi/mpi-method.ae | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/net/mpi/mpi-method.ae b/code/src/net/mpi/mpi-method.ae index e440d52..cb6f20b 100644 --- a/code/src/net/mpi/mpi-method.ae +++ b/code/src/net/mpi/mpi-method.ae @@ -273,6 +273,7 @@ static __blocking triton_ret_t mpi_send( group_entry = triton_hash_get_entry(groupl, struct triton_mpi_group, link); nb_req->bytes_received = 0; + nb_req->dtype = hind_type; ret = MPI_Isend(MPI_BOTTOM, 1, hind_type, (int)to, tag, group_entry->comm, &nb_req->request); if(ret != MPI_SUCCESS) @@ -331,7 +332,6 @@ static __blocking triton_ret_t mpi_send( triton_mutex_unlock(&thread_mutex); free(offsets); - MPI_Type_free(&hind_type); return(tret); } @@ -456,7 +456,6 @@ static __blocking triton_ret_t mpi_recv( triton_mutex_unlock(&thread_mutex); free(offsets); - MPI_Type_free(&hind_type); return TRITON_SUCCESS; } @@ -583,7 +582,6 @@ static __blocking triton_ret_t mpi_recv_any( triton_mutex_unlock(&thread_mutex); free(offsets); - MPI_Type_free(&hind_type); return TRITON_SUCCESS; } @@ -1775,6 +1773,7 @@ static void* thread_fn(void* arg) int outcount; int i; int cancelled; + int mpi_finalized = 0; /* initialize arrays */ realloc_if_needed(1); @@ -1816,7 +1815,15 @@ static void* thread_fn(void* arg) */ for(i = outcount-1; i >= 0; i--) { - if(index_array[i] == 0 && !thread_stop_flag) + /* NOTE: this is a workaround to a peculiar aesop callback race + * condition. It is possible for the aesop_sem_down() call + * below to invoke an aesop callback that runs MPI_Finalize() in + * the caller's code context. In that case we can no longer + * safely make any MPI_* calls here. + */ + MPI_Finalized(&mpi_finalized); + + if(index_array[i] == 0 && !thread_stop_flag && !mpi_finalized) { /* special message from self to wait up MPI_Waitsome(). * Ignore the status and post a new recv to take its place @@ -1830,7 +1837,7 @@ static void* thread_fn(void* arg) { nb_req = nb_req_array[index_array[i]]; /* figure out return code */ - if(thread_stop_flag) + if(thread_stop_flag || mpi_finalized) cancelled = 1; else MPI_Test_cancelled(&status_array[i], &cancelled); @@ -1874,6 +1881,9 @@ static void* thread_fn(void* arg) } array_size--; + if(!thread_stop_flag && !mpi_finalized) + MPI_Type_free(&nb_req->dtype); + aesop_sem_up(&nb_req->sem); } } hooks/post-receive --

1 0

branch, ticket-227, updated. f2ba3a347c9f6354e67f5a20b38068ae125b9a82
by noreply＠mcs.anl.gov 26 Feb '13

26 Feb '13

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 f2ba3a347c9f6354e67f5a20b38068ae125b9a82 (commit) from 729991f6b7bd139e794ea2498fa76a60160ed475 (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 f2ba3a347c9f6354e67f5a20b38068ae125b9a82 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 26 14:14:19 2013 -0500 use aesop_clear_cancel() to wait for cancellation ----------------------------------------------------------------------- Summary of changes: code/src/net/mpi/mpi-method.ae | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) Diff of changes: diff --git a/code/src/net/mpi/mpi-method.ae b/code/src/net/mpi/mpi-method.ae index 813b8bf..e440d52 100644 --- a/code/src/net/mpi/mpi-method.ae +++ b/code/src/net/mpi/mpi-method.ae @@ -308,14 +308,17 @@ static __blocking triton_ret_t mpi_send( /* operation cancelled */ /* It could be on the posted_queue or on the inflight_queue at this * point. Either way we still have to call MPI_Cancel() and allow - * MPI_Waitsome() to complete the operation. We use an - * uncancellable wait here, because we cannot safely return from - * this function until the buffers are safe for re-use. + * MPI_Waitsome() to complete the operation. + * + * We clear the aesop cancel flag here to allow a second + * sem_down() call to block until the cancellation is complete. We + * do not expect this block of code to be cancelled again. */ MPI_Cancel(&nb_req->request); triton_mutex_unlock(&thread_mutex); - ret = aesop_sem_down_with_flags(&nb_req->sem, AESOP_SEM_FLAG_NOCANCEL); + aesop_clear_cancel(); + ret = aesop_sem_down(&nb_req->sem); assert(ret == 0); triton_mutex_lock(&thread_mutex); @@ -430,14 +433,17 @@ static __blocking triton_ret_t mpi_recv( /* operation cancelled */ /* It could be on the posted_queue or on the inflight_queue at this * point. Either way we still have to call MPI_Cancel() and allow - * MPI_Waitsome() to complete the operation. We use an - * uncancellable wait here, because we cannot safely return from - * this function until the buffers are safe for re-use. + * MPI_Waitsome() to complete the operation. + * + * We clear the aesop cancel flag here to allow a second + * sem_down() call to block until the cancellation is complete. We + * do not expect this block of code to be cancelled again. */ MPI_Cancel(&nb_req->request); triton_mutex_unlock(&thread_mutex); - ret = aesop_sem_down_with_flags(&nb_req->sem, AESOP_SEM_FLAG_NOCANCEL); + aesop_clear_cancel(); + ret = aesop_sem_down(&nb_req->sem); assert(ret == 0); triton_mutex_lock(&thread_mutex); @@ -554,14 +560,17 @@ static __blocking triton_ret_t mpi_recv_any( /* operation cancelled */ /* It could be on the posted_queue or on the inflight_queue at this * point. Either way we still have to call MPI_Cancel() and allow - * MPI_Waitsome() to complete the operation. We use an - * uncancellable wait here, because we cannot safely return from - * this function until the buffers are safe for re-use. + * MPI_Waitsome() to complete the operation. + * + * We clear the aesop cancel flag here to allow a second + * sem_down() call to block until the cancellation is complete. We + * do not expect this block of code to be cancelled again. */ MPI_Cancel(&nb_req->request); triton_mutex_unlock(&thread_mutex); - ret = aesop_sem_down_with_flags(&nb_req->sem, AESOP_SEM_FLAG_NOCANCEL); + aesop_clear_cancel(); + ret = aesop_sem_down(&nb_req->sem); assert(ret == 0); triton_mutex_lock(&thread_mutex); hooks/post-receive --

1 0

branch, ticket-227, updated. 729991f6b7bd139e794ea2498fa76a60160ed475
by noreply＠mcs.anl.gov 25 Feb '13

25 Feb '13

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 729991f6b7bd139e794ea2498fa76a60160ed475 (commit) from b42f1e3234dcf325d0be6d457bdaab78863d67e7 (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 729991f6b7bd139e794ea2498fa76a60160ed475 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 25 16:50:01 2013 -0500 remove some old unused aesop stuff ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 1 - code/src/aesop/examples/TODO | 7 --- code/src/aesop/examples/module.mk.in | 6 -- code/src/aesop/examples/rpc-invoke.ae | 96 --------------------------------- code/src/aesop/module.mk.in | 15 ----- 5 files changed, 0 insertions(+), 125 deletions(-) delete mode 100644 code/src/aesop/examples/TODO delete mode 100644 code/src/aesop/examples/module.mk.in delete mode 100644 code/src/aesop/examples/rpc-invoke.ae delete mode 100644 code/src/aesop/module.mk.in Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index 0f20ed6..97999d1 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -409,7 +409,6 @@ AC_CHECK_LIB([crypto], [SHA1], [], AC_CONFIG_FILES([maint/aercc], [chmod +x maint/aercc]) AC_OUTPUT([Makefile -src/aesop/module.mk src/aesop/parser/module.mk src/common/module.mk src/common/tests/module.mk diff --git a/code/src/aesop/examples/TODO b/code/src/aesop/examples/TODO deleted file mode 100644 index 440a78b..0000000 --- a/code/src/aesop/examples/TODO +++ /dev/null @@ -1,7 +0,0 @@ - - -timeout/retry -flow pipelining -invoking blocking functions based on runtime state (server handling unexpected requests) - - diff --git a/code/src/aesop/examples/module.mk.in b/code/src/aesop/examples/module.mk.in deleted file mode 100644 index d6aabb9..0000000 --- a/code/src/aesop/examples/module.mk.in +++ /dev/null @@ -1,6 +0,0 @@ -DIR := src/aesop/examples - -AETESTSRC += $(DIR)/rpc-invoke.ae - -MODLIBS_$(DIR) := -lpthread -MODLINKWITH_$(DIR) := src/aesop/parser/tests/blocking/btest-impl.o diff --git a/code/src/aesop/examples/rpc-invoke.ae b/code/src/aesop/examples/rpc-invoke.ae deleted file mode 100644 index 09b4f25..0000000 --- a/code/src/aesop/examples/rpc-invoke.ae +++ /dev/null @@ -1,96 +0,0 @@ - -#include <aesop/aesop.h> -#include "src/aesop/parser/tests/blocking/btest.hae" -#include <aesop/timer.hae> - -__blocking static int rpc_invoke() -{ - int a = 0; - int randval, val, ret; - - randval = btest_random(); - val = randval % 3; - printf("RANDOM VALUE: %d\n", val); - if(0 == val) - { - ret = btest1(&a); - } - else if(1 == val) - { - ret = btest2(&a); - } - else if(2 == val) - { - ret = btest3(&a); - } - - assert(ret == 0); - assert((a-1) == val); - return randval; -} - -__blocking static void invoke_many(int count) -{ - pwait - { - int i; - for(i = 0; i < count; ++i) - { - pbranch { rpc_invoke(); } - } - } -} - -static int running = 1; - -__blocking static void many_looping() -{ - pwait - { - int i; - - /* startup 100 looping invocations */ - i = 0; - while(i < 100) - { - pbranch - { - int j = 0; - - while(running) - { - rpc_invoke(); - printf("invoke: %d, %d\n", i, j++); - } - } - ++i; - } - - /* let those loop for a bit */ - pbranch - { - aesop_timer(10000); - running = 0; - } - } -} -__blocking int aesop_main(int argc, char **argv) -{ - pwait - { - pprivate int i; - - for(i = 0; i < 100; ++i) - { - pbranch { rpc_invoke(); } - } - } - - invoke_many(200); - - many_looping(); - - return 0; -} -btest_main_set(aesop_main); - diff --git a/code/src/aesop/module.mk.in b/code/src/aesop/module.mk.in deleted file mode 100644 index 79a99ae..0000000 --- a/code/src/aesop/module.mk.in +++ /dev/null @@ -1,15 +0,0 @@ -DIR := src/aesop - -# AESOP_SRC := $(DIR)/opcache.c \ - $(DIR)/aesop.c \ - $(DIR)/resource.c \ - $(DIR)/hints.c \ - $(DIR)/ae-ctl.c - -AESOP_OBJS := $(patsubst %.c,%.o,$(AESOP_SRC)) - -AESOP_A = $(AESOP)/libaesop.a - -# $(AESOP_A): $(AESOP_OBJS) -# $(Q) " AR $(@)" -# $(E) ar rcs $(@) $(AESOP_OBJS) hooks/post-receive --

1 0

branch, ticket-227, updated. b42f1e3234dcf325d0be6d457bdaab78863d67e7
by noreply＠mcs.anl.gov 25 Feb '13

25 Feb '13

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 b42f1e3234dcf325d0be6d457bdaab78863d67e7 (commit) from 4fbd43013bf28dbeb817ba7be6ef5ee9d98530fa (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 b42f1e3234dcf325d0be6d457bdaab78863d67e7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 25 16:36:33 2013 -0500 enable cancellation tests for signal resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/signal/tests/simple.ae | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Diff of changes: diff --git a/code/src/common/resources/signal/tests/simple.ae b/code/src/common/resources/signal/tests/simple.ae index 9b24b2c..863298a 100644 --- a/code/src/common/resources/signal/tests/simple.ae +++ b/code/src/common/resources/signal/tests/simple.ae @@ -8,10 +8,6 @@ __blocking int signalself () { - int ret; - - ret = 1; - pwait { pbranch @@ -39,14 +35,12 @@ __blocking int signalself () } printf ("All done!\n"); - return ret; + return(0); } __blocking int test_cancel () { - int ret; - - ret = 0; + int ret = 0; pwait { @@ -59,6 +53,9 @@ __blocking int test_cancel () if (triton_error_equal (tret, TRITON_ERR_CANCELED)) { printf ("Signal wait cancelled :-)\n"); + } + else + { ret = 1; } //aesop_cancel_branches(); @@ -70,7 +67,7 @@ __blocking int test_cancel () aesop_timer (500); printf ("Cancelling triton_signal_wait()...\n"); - //aesop_cancel_branches (); + aesop_cancel_branches (); } } return ret; @@ -94,7 +91,10 @@ __blocking int aesop_main(int argc, char **argv) triton_signal_pulse (); ret = signalself(); - // ret = !ret || test_cancel (); + assert(ret == 0); + + ret = test_cancel (); + assert(ret == 0); aesop_timer_finalize(); triton_signal_finalize(); hooks/post-receive --

1 0

branch, ticket-227, updated. 4fbd43013bf28dbeb817ba7be6ef5ee9d98530fa
by noreply＠mcs.anl.gov 25 Feb '13

25 Feb '13

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 4fbd43013bf28dbeb817ba7be6ef5ee9d98530fa (commit) from e15c902b1cb952f26404dc804cb173dda3a0d085 (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 4fbd43013bf28dbeb817ba7be6ef5ee9d98530fa Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 25 16:27:16 2013 -0500 check cancellation on signal post ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/signal/signal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/common/resources/signal/signal.c b/code/src/common/resources/signal/signal.c index 52132d7..56290a1 100644 --- a/code/src/common/resources/signal/signal.c +++ b/code/src/common/resources/signal/signal.c @@ -135,6 +135,12 @@ ae_define_post(triton_ret_t, triton_signal_wait, int signum) struct ae_op * op; signal_op_t * new_op; + if(ae_resource_is_cancelled()) + { + *__ae_retval = TRITON_ERR_CANCELED; + return AE_IMMEDIATE_COMPLETION; + } + check_init (); new_op = malloc(sizeof(*new_op)); hooks/post-receive --

1 0

branch, ticket-227, updated. e15c902b1cb952f26404dc804cb173dda3a0d085
by noreply＠mcs.anl.gov 25 Feb '13

25 Feb '13

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 e15c902b1cb952f26404dc804cb173dda3a0d085 (commit) from 6d4affdc7228cc20c739818968d245356aba39b4 (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 e15c902b1cb952f26404dc804cb173dda3a0d085 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 25 16:21:37 2013 -0500 avoid use of opcache in signal resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/signal/signal.c | 41 ++++++++++------------------- 1 files changed, 14 insertions(+), 27 deletions(-) Diff of changes: diff --git a/code/src/common/resources/signal/signal.c b/code/src/common/resources/signal/signal.c index c74f0be..52132d7 100644 --- a/code/src/common/resources/signal/signal.c +++ b/code/src/common/resources/signal/signal.c @@ -1,6 +1,5 @@ #include <aesop/aesop.h> #include <aesop/op.h> -#include <aesop/opcache.h> #include <aesop/resource.h> #include "src/common/resources/signal/signal.h" #include "src/common/triton-init.h" @@ -14,15 +13,11 @@ #include <unistd.h> #include <sched.h> -/* Size of initial opcache */ -#define SIGNAL_DEFAULT_SIZE 1 - /* NOTE: not using libev since libev only supports signals in the default * event loop. However, since the event loops are not thread safe it is hard * to share the default loop. */ -static ae_opcache_t signal_opcache = NULL; static int triton_signal_resource_id; static pthread_t signal_thread; @@ -140,23 +135,21 @@ ae_define_post(triton_ret_t, triton_signal_wait, int signum) struct ae_op * op; signal_op_t * new_op; - if(!signal_opcache) - { - triton_err(triton_log_default, "Error: signal resource not initialized."); - assert(0); - } + check_init (); + + new_op = malloc(sizeof(*new_op)); + if(!new_op) + return(AE_ERR_NOMEM); - op = ae_opcache_get(signal_opcache); + op = &new_op->op; ae_op_fill(op); - new_op = ae_op_entry(op, signal_op_t, op); new_op->op_id = ae_id_gen(triton_signal_resource_id, (intptr_t) op); new_op->tret = TRITON_SUCCESS; new_op->signal = signum; *__ae_op_id = new_op->op_id; - triton_mutex_lock (&signal_mutex); triton_list_link_clear (&new_op->link); @@ -173,6 +166,7 @@ ae_define_post(triton_ret_t, triton_signal_wait, int signum) static int triton_signal_poll(ae_context_t context, void *arg) { triton_mutex_lock (&signal_mutex); + int normal_completion; if (triton_list_empty (&signal_completed)) { @@ -198,9 +192,13 @@ static int triton_signal_poll(ae_context_t context, void *arg) signal_op_t * sig = triton_list_get_entry (current, signal_op_t, link); - // calls callback and return op entry to the cache - ae_opcache_complete_op(signal_opcache, &sig->op, triton_ret_t, - sig->tret); + normal_completion = ae_op_complete(&sig->op); + /* TODO: see aethread.c comments; it isn't clear how to get + * ae_op_complete to return 0. + */ + assert(normal_completion); + ae_op_execute(&sig->op, triton_ret_t, sig->tret); + free(sig); } triton_list_clear (&todo); @@ -463,15 +461,6 @@ triton_ret_t triton_signal_init (void) triton_debug_add_mask ("triton.signal", &signal_debug_mask, "Signal resource"); - ret = AE_OPCACHE_INIT (signal_op_t, op, SIGNAL_DEFAULT_SIZE, - &signal_opcache); - if (ret != AE_SUCCESS) - { - triton_mutex_unlock (&signal_refcount_mutex); - triton_debug_finalize(); - return TRITON_ERR_UNKNOWN; - } - signal_shutdown = 0; triton_list_init (&signal_active); triton_list_init (&signal_completed); @@ -510,7 +499,6 @@ triton_ret_t triton_signal_init (void) signal_shutdown = 1; wakeup_thread (); pthread_join(signal_thread, NULL); - ae_opcache_destroy(signal_opcache); triton_debug_finalize(); } } @@ -540,7 +528,6 @@ void triton_signal_finalize (void) triton_list_destroy (&signal_completed); ae_resource_unregister(triton_signal_resource_id); - ae_opcache_destroy(signal_opcache); triton_debug_finalize(); } hooks/post-receive --

1 0

branch, ticket-227, updated. 6d4affdc7228cc20c739818968d245356aba39b4
by noreply＠mcs.anl.gov 25 Feb '13

25 Feb '13

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 6d4affdc7228cc20c739818968d245356aba39b4 (commit) from 8bbcf2a1c1deb536cb4e5921c636421808df045b (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 6d4affdc7228cc20c739818968d245356aba39b4 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 25 16:06:14 2013 -0500 fix init dependencies in signal resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/signal/signal.c | 15 +++++++++++++++ code/src/common/resources/signal/tests/simple.ae | 10 ++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/common/resources/signal/signal.c b/code/src/common/resources/signal/signal.c index ca60b2a..c74f0be 100644 --- a/code/src/common/resources/signal/signal.c +++ b/code/src/common/resources/signal/signal.c @@ -453,6 +453,12 @@ triton_ret_t triton_signal_init (void) if (! signal_refcount++) { + tret = triton_debug_init(); + if(tret != TRITON_SUCCESS) + { + triton_mutex_unlock(&signal_refcount_mutex); + return(tret); + } triton_debug_add_mask ("triton.signal", &signal_debug_mask, "Signal resource"); @@ -462,6 +468,7 @@ triton_ret_t triton_signal_init (void) if (ret != AE_SUCCESS) { triton_mutex_unlock (&signal_refcount_mutex); + triton_debug_finalize(); return TRITON_ERR_UNKNOWN; } @@ -498,7 +505,14 @@ triton_ret_t triton_signal_init (void) ret = ae_resource_register (&triton_signal_resource, &triton_signal_resource_id); if(ret != 0) + { tret = TRITON_ERR_UNKNOWN; + signal_shutdown = 1; + wakeup_thread (); + pthread_join(signal_thread, NULL); + ae_opcache_destroy(signal_opcache); + triton_debug_finalize(); + } } triton_mutex_unlock (&signal_refcount_mutex); @@ -528,6 +542,7 @@ void triton_signal_finalize (void) ae_resource_unregister(triton_signal_resource_id); ae_opcache_destroy(signal_opcache); + triton_debug_finalize(); } triton_mutex_unlock (&signal_refcount_mutex); diff --git a/code/src/common/resources/signal/tests/simple.ae b/code/src/common/resources/signal/tests/simple.ae index a572b54..9b24b2c 100644 --- a/code/src/common/resources/signal/tests/simple.ae +++ b/code/src/common/resources/signal/tests/simple.ae @@ -78,7 +78,13 @@ __blocking int test_cancel () __blocking int aesop_main(int argc, char **argv) { - triton_signal_init (); + triton_ret_t tret; + int ret; + + tret = triton_signal_init (); + triton_error_assert(tret); + ret = aesop_timer_init(); + assert(ret == 0); // Disable the signal handler for SIGINT so we can wait for the signal // (instead of calling the signal handler) @@ -87,10 +93,10 @@ __blocking int aesop_main(int argc, char **argv) // Wait until the mask is updated triton_signal_pulse (); - int ret; ret = signalself(); // ret = !ret || test_cancel (); + aesop_timer_finalize(); triton_signal_finalize(); return ret; hooks/post-receive --

1 0

branch, ticket-227, updated. 8bbcf2a1c1deb536cb4e5921c636421808df045b
by noreply＠mcs.anl.gov 25 Feb '13

25 Feb '13

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 8bbcf2a1c1deb536cb4e5921c636421808df045b (commit) from 43c2975cef24c0e60107485359eb0caa5aa3a09f (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 8bbcf2a1c1deb536cb4e5921c636421808df045b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 25 15:55:57 2013 -0500 tweak init check in signal resource ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/signal/signal.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/common/resources/signal/signal.c b/code/src/common/resources/signal/signal.c index 9821716..ca60b2a 100644 --- a/code/src/common/resources/signal/signal.c +++ b/code/src/common/resources/signal/signal.c @@ -76,11 +76,15 @@ static void wakeup_thread () static void check_init () { - if (!signal_opcache) + triton_mutex_lock (&signal_refcount_mutex); + if (!signal_refcount) { triton_err(triton_log_default, "Error: signal resource not initialized."); assert(0 && "Signal resource not initialized!"); } + triton_mutex_unlock (&signal_refcount_mutex); + + return; } void triton_signal_track (int signum) hooks/post-receive --

1 0