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

branch, ticket-227, updated. dc144eb605eb4378c6c26866e7e83f7590846b44
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 dc144eb605eb4378c6c26866e7e83f7590846b44 (commit) via 0339f4d8dab93cc70db906886f5941e276646460 (commit) from 3a010f8e2dbf0f51c0550aea53b60f667451f74f (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 dc144eb605eb4378c6c26866e7e83f7590846b44 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 23:07:43 2013 -0400 bug fix commit 0339f4d8dab93cc70db906886f5941e276646460 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 23:00:35 2013 -0400 more debugging prints ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-client.ae | 7 +++++++ code/src/remote/mercury-engine.ae | 3 ++- code/src/remote/mercury-rpc-example.ae | 4 ++++ 3 files changed, 13 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-client.ae b/code/src/remote/mercury-client.ae index ee6b964..117a3aa 100644 --- a/code/src/remote/mercury-client.ae +++ b/code/src/remote/mercury-client.ae @@ -21,6 +21,8 @@ __blocking int remote_triton_mercury_rpc_timer(na_addr_t addr, int msec) triton_mercury_rpc_timer_in_struct.msec = msec; + printf("Calling HG_Forward().\n"); + fflush(NULL); ret = HG_Forward(addr, rpc_timer_id, &triton_mercury_rpc_timer_in_struct, &triton_mercury_rpc_timer_out_struct, &request); if(ret != HG_SUCCESS) @@ -28,9 +30,14 @@ __blocking int remote_triton_mercury_rpc_timer(na_addr_t addr, int msec) fprintf(stderr, "Error: HG_Forward() failure.\n"); return(-1); } + printf("Finished HG_Forward().\n"); + fflush(NULL); + printf("Calling triton_mercury_wait().\n"); + fflush(NULL); tret = triton_mercury_wait(request); triton_error_assert(tret); + printf("Finished triton_mercury_wait().\n"); return(triton_mercury_rpc_timer_out_struct.ret); } diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index 9048695..e7ac1e5 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -209,10 +209,11 @@ static void* svr_thread_fn(void* foo) if(hg_ret != HG_SUCCESS) { + /* fprintf(stderr, "Error: HG_Handler_process() failure.\n"); */ /* TODO: confirm return codes here. It looks like this function * might return failure if it just didn't find a new request? */ - /* fprintf(stderr, "Error: HG_Handler_process() failure.\n"); */ + hg_ret = HG_SUCCESS; } triton_mutex_lock(&shutdown_mutex); diff --git a/code/src/remote/mercury-rpc-example.ae b/code/src/remote/mercury-rpc-example.ae index 483a968..9cc1618 100644 --- a/code/src/remote/mercury-rpc-example.ae +++ b/code/src/remote/mercury-rpc-example.ae @@ -30,6 +30,7 @@ static __blocking void triton_mercury_rpc_timer(hg_handle_t handle) msec = triton_mercury_rpc_timer_in_struct.msec; printf("Called triton_mercury_rpc_timer with msec: %d\n", msec); + fflush(NULL); /* here is the real work; in this case just a timer */ ret = aesop_timer(msec); @@ -60,6 +61,9 @@ int server_triton_mercury_rpc_timer(hg_handle_t handle) ae_hints_t hints; ae_op_id_t op_id; + printf("Called server_triton_mercury_rpc_timer()\n"); + fflush(NULL); + ae_hints_init(&hints); ret = ext_post_blocking(triton_mercury_rpc_timer, cb, NULL, &hints, hooks/post-receive --

1 0

branch, ticket-227, updated. 3a010f8e2dbf0f51c0550aea53b60f667451f74f
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 3a010f8e2dbf0f51c0550aea53b60f667451f74f (commit) via 0bc76916886c404d948fd4c1838b75c4c7320c8b (commit) from 6097a924d94cb7eff63acc00804240d227d04296 (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 3a010f8e2dbf0f51c0550aea53b60f667451f74f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 22:50:40 2013 -0400 fill in rest of client test doesn't work yet commit 0bc76916886c404d948fd4c1838b75c4c7320c8b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 22:42:44 2013 -0400 incremental progress on client test ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-client.ae | 59 ++++++++++++++++++++++++++++++++---- code/src/remote/mercury-engine.ae | 6 +++- code/src/remote/mercury-engine.hae | 2 + 3 files changed, 60 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-client.ae b/code/src/remote/mercury-client.ae index 7cd4768..ee6b964 100644 --- a/code/src/remote/mercury-client.ae +++ b/code/src/remote/mercury-client.ae @@ -9,16 +9,63 @@ #include "src/remote/mercury-engine.hae" #include "src/remote/mercury-rpc-example.hae" +hg_id_t rpc_timer_id; + +__blocking int remote_triton_mercury_rpc_timer(na_addr_t addr, int msec) +{ + triton_mercury_rpc_timer_in_t triton_mercury_rpc_timer_in_struct; + triton_mercury_rpc_timer_out_t triton_mercury_rpc_timer_out_struct; + hg_request_t request; + int ret; + triton_ret_t tret; + + triton_mercury_rpc_timer_in_struct.msec = msec; + + ret = HG_Forward(addr, rpc_timer_id, &triton_mercury_rpc_timer_in_struct, + &triton_mercury_rpc_timer_out_struct, &request); + if(ret != HG_SUCCESS) + { + fprintf(stderr, "Error: HG_Forward() failure.\n"); + return(-1); + } + + tret = triton_mercury_wait(request); + triton_error_assert(tret); + + return(triton_mercury_rpc_timer_out_struct.ret); +} + __blocking int aesop_main(int argc, char **argv) { - triton_ret_t ret; - int aeret; + triton_ret_t tret; + int ret; + int msec; + na_addr_t addr; + + if(argc != 2) + { + fprintf(stderr, "Usage: %s <timer milliseconds>\n", argv[0]); + return(-1); + } + + ret = sscanf(argv[1], "%d", &msec); + if(ret != 1) + { + fprintf(stderr, "Usage: %s <timer milliseconds>\n", argv[0]); + return(-1); + } + + tret = triton_mercury_engine_init(TRITON_MERCURY_CLIENT); + triton_error_assert(tret); + + rpc_timer_id = MERCURY_REGISTER("triton_mercury_rpc_timer", + triton_mercury_rpc_timer_in_t, triton_mercury_rpc_timer_out_t); - ret = triton_mercury_engine_init(TRITON_MERCURY_CLIENT); - triton_error_assert(ret); + ret = triton_mercury_addr_lookup("tcp://localhost:3344", &addr); + assert(ret == HG_SUCCESS); - /* TODO: put call function to issue RPC */ - sleep(1); + ret = remote_triton_mercury_rpc_timer(addr, msec); + printf("rpc returned %d\n", ret); triton_mercury_engine_finalize(); diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index 51688ce..9048695 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -25,6 +25,7 @@ static pthread_t client_tid; static triton_mutex_t shutdown_mutex = TRITON_MUTEX_INITIALIZER; static int shutting_down = 0; static int g_flags = 0; +static na_class_t *network_class = NULL; static void* svr_thread_fn(void* foo); static void* client_thread_fn(void* foo); @@ -79,7 +80,6 @@ __blocking triton_ret_t triton_mercury_wait(hg_request_t request) triton_ret_t triton_mercury_engine_init(int flags) { - na_class_t *network_class = NULL; int hg_ret; int ret; @@ -274,4 +274,8 @@ static void* client_thread_fn(void* foo) return(NULL); } +int triton_mercury_addr_lookup(const char* name, na_addr_t* addr) +{ + return(NA_Addr_lookup(network_class, name, addr)); +} diff --git a/code/src/remote/mercury-engine.hae b/code/src/remote/mercury-engine.hae index 3ea3b3e..ad16fd9 100644 --- a/code/src/remote/mercury-engine.hae +++ b/code/src/remote/mercury-engine.hae @@ -15,4 +15,6 @@ void triton_mercury_engine_finalize(void); __blocking triton_ret_t triton_mercury_wait(hg_request_t request); +int triton_mercury_addr_lookup(const char* name, na_addr_t* addr); + #endif hooks/post-receive --

1 0

branch, ticket-227, updated. 6097a924d94cb7eff63acc00804240d227d04296
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 6097a924d94cb7eff63acc00804240d227d04296 (commit) from 5c669a2dca6f32c17c72ccba7f7bce1d4d7e28fe (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 6097a924d94cb7eff63acc00804240d227d04296 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 22:11:52 2013 -0400 skeleton for mercury client test ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-client.ae | 36 ++++++++++++++++++++++++++++++++++++ code/src/remote/mercury-svr.ae | 2 -- code/src/remote/module.mk.in | 3 ++- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 code/src/remote/mercury-client.ae Diff of changes: diff --git a/code/src/remote/mercury-client.ae b/code/src/remote/mercury-client.ae new file mode 100644 index 0000000..7cd4768 --- /dev/null +++ b/code/src/remote/mercury-client.ae @@ -0,0 +1,36 @@ +#include <stdio.h> +#include <errno.h> +#include <assert.h> +#include <stdio.h> +#include <unistd.h> + +#include <aesop/aesop.h> +#include "src/zeroconf/zeroconf.h" +#include "src/remote/mercury-engine.hae" +#include "src/remote/mercury-rpc-example.hae" + +__blocking int aesop_main(int argc, char **argv) +{ + triton_ret_t ret; + int aeret; + + ret = triton_mercury_engine_init(TRITON_MERCURY_CLIENT); + triton_error_assert(ret); + + /* TODO: put call function to issue RPC */ + sleep(1); + + triton_mercury_engine_finalize(); + + return(0); +} +aesop_main_set(aesop_main); + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ft=c ts=8 sts=4 sw=4 expandtab + */ diff --git a/code/src/remote/mercury-svr.ae b/code/src/remote/mercury-svr.ae index b173146..1afd539 100644 --- a/code/src/remote/mercury-svr.ae +++ b/code/src/remote/mercury-svr.ae @@ -11,8 +11,6 @@ #include "src/common/resources/signal/signal.hae" #include "src/remote/mercury-rpc-example.hae" -#define RUNTIME 10 - __blocking int aesop_main(int argc, char **argv) { triton_ret_t ret; diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index acaced9..540d036 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -18,8 +18,9 @@ AESOP_HDR += $(DIR_REMOTE)/mercury-engine.hae AESOP_HDR += $(DIR_REMOTE)/mercury-rpc-example.hae AELIBSRC += $(DIR_REMOTE)/mercury-engine.ae AELIBSRC += $(DIR_REMOTE)/mercury-rpc-example.ae +AETESTSRC += $(DIR_REMOTE)/mercury-svr.ae +AETESTSRC += $(DIR_REMOTE)/mercury-client.ae endif AERLIBSRC += $(DIR_REMOTE)/core.aer -AETESTSRC += $(DIR_REMOTE)/mercury-svr.ae hooks/post-receive --

1 0

branch, ticket-227, updated. 5c669a2dca6f32c17c72ccba7f7bce1d4d7e28fe
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 5c669a2dca6f32c17c72ccba7f7bce1d4d7e28fe (commit) from aa4f6e103a466eadc1cf677e9ed0ad2493a30f89 (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 5c669a2dca6f32c17c72ccba7f7bce1d4d7e28fe Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 22:04:55 2013 -0400 draft implementation of __blocking mercury wait untested ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-engine.ae | 100 +++++++++++++++++++++++++++++++++-- code/src/remote/mercury-engine.hae | 4 ++ 2 files changed, 98 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index 9785829..51688ce 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -6,6 +6,7 @@ #include <pthread.h> #include <aesop/aesop.h> +#include <aesop/sem.hae> #include <triton-thread.h> #include "src/common/triton-error.h" #include "src/remote/mercury-engine.hae" @@ -28,6 +29,54 @@ static int g_flags = 0; static void* svr_thread_fn(void* foo); static void* client_thread_fn(void* foo); +struct merc_op +{ + hg_request_t request; + aesop_sem_t sem; + triton_list_link_t link; +}; +static TRITON_LIST_DEFINE(merc_op_queue); +static triton_mutex_t merc_op_mutex = TRITON_MUTEX_INITIALIZER; +static triton_cond_t merc_op_cond = TRITON_COND_INITIALIZER; + +__blocking triton_ret_t triton_mercury_wait(hg_request_t request) +{ + struct merc_op* op; + int ret; + + op = malloc(sizeof(*op)); + if(!op) + { + return(TRITON_ERR_NOMEM); + } + + op->request = request; + aesop_sem_init(&op->sem, 0); + triton_list_link_clear(&op->link); + + triton_mutex_lock(&merc_op_mutex); + triton_list_add_back(&op->link, &merc_op_queue); + triton_cond_signal(&merc_op_cond); + triton_mutex_unlock(&merc_op_mutex); + + /* wait until request has been serviced */ + ret = aesop_sem_down(&op->sem); + + triton_mutex_lock(&merc_op_mutex); + if(triton_list_return_list(&op->link)) + triton_list_del(&op->link); + triton_mutex_unlock(&merc_op_mutex); + + free(op); + + if(ret == AE_SUCCESS) + return(TRITON_SUCCESS); + else if(ret == AE_ERR_CANCELLED) + return(TRITON_ERR_CANCELED); + + return(TRITON_ERR_UNKNOWN); +} + triton_ret_t triton_mercury_engine_init(int flags) { na_class_t *network_class = NULL; @@ -42,6 +91,13 @@ triton_ret_t triton_mercury_engine_init(int flags) if (!module_refcount) { + ret = aesop_sem_module_init(); + if(ret != 0) + { + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } + /* TODO: fix error handling throughout, especially if server startup * succeeds but client startup fails */ @@ -55,6 +111,7 @@ triton_ret_t triton_mercury_engine_init(int flags) { fprintf(stderr, "Error: HG_Handler_init() failure.\n"); triton_mutex_unlock(&module_lock); + aesop_sem_module_finalize(); return(TRITON_ERR_UNKNOWN); } @@ -63,6 +120,7 @@ triton_ret_t triton_mercury_engine_init(int flags) { HG_Handler_finalize(); triton_mutex_unlock(&module_lock); + aesop_sem_module_finalize(); return(TRITON_ERR_UNKNOWN); } } @@ -77,6 +135,7 @@ triton_ret_t triton_mercury_engine_init(int flags) { fprintf(stderr, "Error: HG_Init() failure.\n"); triton_mutex_unlock(&module_lock); + aesop_sem_module_finalize(); return(TRITON_ERR_UNKNOWN); } @@ -85,6 +144,7 @@ triton_ret_t triton_mercury_engine_init(int flags) { HG_Handler_finalize(); triton_mutex_unlock(&module_lock); + aesop_sem_module_finalize(); return(TRITON_ERR_UNKNOWN); } } @@ -108,6 +168,8 @@ void triton_mercury_engine_finalize(void) triton_mutex_lock(&shutdown_mutex); shutting_down = 1; triton_mutex_unlock(&shutdown_mutex); + + triton_cond_signal(&merc_op_cond); if(g_flags & TRITON_MERCURY_CLIENT) { @@ -116,7 +178,6 @@ void triton_mercury_engine_finalize(void) hg_ret = HG_Finalize(); if (hg_ret != HG_SUCCESS) { fprintf(stderr, "Error: HG_Finalize() failure.\n"); - return; } } @@ -127,9 +188,9 @@ void triton_mercury_engine_finalize(void) hg_ret = HG_Handler_finalize(); if (hg_ret != HG_SUCCESS) { fprintf(stderr, "Error: HG_Handler_finalize() failure.\n"); - return; } } + aesop_sem_module_finalize(); } triton_mutex_unlock(&module_lock); } @@ -166,16 +227,43 @@ static void* svr_thread_fn(void* foo) static void* client_thread_fn(void* foo) { int hg_ret = HG_SUCCESS; + struct merc_op* op; + triton_list_link_t* tmp_link; + hg_status_t status; triton_mutex_lock(&shutdown_mutex); while(!shutting_down && hg_ret == HG_SUCCESS) { triton_mutex_unlock(&shutdown_mutex); - /* TODO: here we need to process the queue of pending mercury - * requests and do aesop semaphore stuff - */ - sleep(1); + triton_mutex_lock(&merc_op_mutex); + tmp_link = triton_stack_pop(&merc_op_queue); + if(!tmp_link) + triton_cond_wait(&merc_op_cond, &merc_op_mutex); + triton_mutex_unlock(&merc_op_mutex); + + if(tmp_link) + { + op = triton_list_get_entry(tmp_link, struct merc_op, link); + hg_ret = HG_Wait(op->request, 10, &status); + if(hg_ret != HG_SUCCESS) + { + /* TODO: error handling */ + assert(0); + } + if(!status) + { + /* put back in queue, at back */ + triton_mutex_lock(&merc_op_mutex); + triton_list_add_back(&op->link, &merc_op_queue); + triton_mutex_unlock(&merc_op_mutex); + } + else + { + /* done */ + aesop_sem_up(&op->sem); + } + } triton_mutex_lock(&shutdown_mutex); } diff --git a/code/src/remote/mercury-engine.hae b/code/src/remote/mercury-engine.hae index 27c1d67..3ea3b3e 100644 --- a/code/src/remote/mercury-engine.hae +++ b/code/src/remote/mercury-engine.hae @@ -2,8 +2,10 @@ #define __MERCURY_ENGINE_HAE__ #include <aesop/aesop.h> +#include <mercury_handler.h> #include "src/common/triton-error.h" + #define TRITON_MERCURY_SVR 1 #define TRITON_MERCURY_CLIENT 2 @@ -11,4 +13,6 @@ triton_ret_t triton_mercury_engine_init(int flags); void triton_mercury_engine_finalize(void); +__blocking triton_ret_t triton_mercury_wait(hg_request_t request); + #endif hooks/post-receive --

1 0

branch, ticket-227, updated. aa4f6e103a466eadc1cf677e9ed0ad2493a30f89
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 aa4f6e103a466eadc1cf677e9ed0ad2493a30f89 (commit) from 36f49c03afec3b4b68d58b75fd898a95d886eff2 (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 aa4f6e103a466eadc1cf677e9ed0ad2493a30f89 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 16:36:13 2013 -0400 stub in thread for client engine ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-engine.ae | 78 ++++++++++++++++++++++++++++++++---- code/src/remote/mercury-engine.hae | 2 +- 2 files changed, 71 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index b3387a9..9785829 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -20,11 +20,13 @@ static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; static int module_refcount = 0; static pthread_t svr_tid; -static triton_mutex_t svr_mutex = TRITON_MUTEX_INITIALIZER; +static pthread_t client_tid; +static triton_mutex_t shutdown_mutex = TRITON_MUTEX_INITIALIZER; static int shutting_down = 0; static int g_flags = 0; static void* svr_thread_fn(void* foo); +static void* client_thread_fn(void* foo); triton_ret_t triton_mercury_engine_init(int flags) { @@ -40,6 +42,9 @@ triton_ret_t triton_mercury_engine_init(int flags) if (!module_refcount) { + /* TODO: fix error handling throughout, especially if server startup + * succeeds but client startup fails + */ if(g_flags & TRITON_MERCURY_SVR) { /* Initialize the interface */ @@ -61,6 +66,29 @@ triton_ret_t triton_mercury_engine_init(int flags) return(TRITON_ERR_UNKNOWN); } } + if(!(g_flags & TRITON_MERCURY_SVR) && (g_flags & TRITON_MERCURY_CLIENT)) + { + network_class = NA_BMI_Init(NULL, NULL, 0); + } + if(g_flags & TRITON_MERCURY_CLIENT) + { + hg_ret = HG_Init(network_class); + if (hg_ret != HG_SUCCESS) + { + fprintf(stderr, "Error: HG_Init() failure.\n"); + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } + + ret = pthread_create(&client_tid, NULL, client_thread_fn, NULL); + if(ret != 0) + { + HG_Handler_finalize(); + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } + } + } module_refcount++; triton_mutex_unlock(&module_lock); @@ -77,9 +105,20 @@ void triton_mercury_engine_finalize(void) if (!module_refcount) { - triton_mutex_lock(&svr_mutex); + triton_mutex_lock(&shutdown_mutex); shutting_down = 1; - triton_mutex_unlock(&svr_mutex); + triton_mutex_unlock(&shutdown_mutex); + + if(g_flags & TRITON_MERCURY_CLIENT) + { + pthread_join(svr_tid, NULL); + + hg_ret = HG_Finalize(); + if (hg_ret != HG_SUCCESS) { + fprintf(stderr, "Error: HG_Finalize() failure.\n"); + return; + } + } if(g_flags & TRITON_MERCURY_SVR) { @@ -87,7 +126,7 @@ void triton_mercury_engine_finalize(void) hg_ret = HG_Handler_finalize(); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not finalize function shipper handler\n"); + fprintf(stderr, "Error: HG_Handler_finalize() failure.\n"); return; } } @@ -99,10 +138,10 @@ static void* svr_thread_fn(void* foo) { int hg_ret = HG_SUCCESS; - triton_mutex_lock(&svr_mutex); + triton_mutex_lock(&shutdown_mutex); while(!shutting_down && hg_ret == HG_SUCCESS) { - triton_mutex_unlock(&svr_mutex); + triton_mutex_unlock(&shutdown_mutex); /* TODO: confirm what the timeout value should be here */ hg_ret = HG_Handler_process(1, HG_STATUS_IGNORE); @@ -115,11 +154,34 @@ static void* svr_thread_fn(void* foo) /* fprintf(stderr, "Error: HG_Handler_process() failure.\n"); */ } - triton_mutex_lock(&svr_mutex); + triton_mutex_lock(&shutdown_mutex); + } + + shutting_down = 0; + triton_mutex_unlock(&shutdown_mutex); + + return(NULL); +} + +static void* client_thread_fn(void* foo) +{ + int hg_ret = HG_SUCCESS; + + triton_mutex_lock(&shutdown_mutex); + while(!shutting_down && hg_ret == HG_SUCCESS) + { + triton_mutex_unlock(&shutdown_mutex); + + /* TODO: here we need to process the queue of pending mercury + * requests and do aesop semaphore stuff + */ + sleep(1); + + triton_mutex_lock(&shutdown_mutex); } shutting_down = 0; - triton_mutex_unlock(&svr_mutex); + triton_mutex_unlock(&shutdown_mutex); return(NULL); } diff --git a/code/src/remote/mercury-engine.hae b/code/src/remote/mercury-engine.hae index 0cb13c5..27c1d67 100644 --- a/code/src/remote/mercury-engine.hae +++ b/code/src/remote/mercury-engine.hae @@ -5,7 +5,7 @@ #include "src/common/triton-error.h" #define TRITON_MERCURY_SVR 1 -#define TRITON_MERCURY_CLIENT 1 +#define TRITON_MERCURY_CLIENT 2 triton_ret_t triton_mercury_engine_init(int flags); hooks/post-receive --

1 0

branch, ticket-227, updated. 36f49c03afec3b4b68d58b75fd898a95d886eff2
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 36f49c03afec3b4b68d58b75fd898a95d886eff2 (commit) via fa71b47155dcf8ec1d8dd321b59803ffb63e6ad0 (commit) from b9926afb604f51ec2ee694182bd982ab8f970a13 (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 36f49c03afec3b4b68d58b75fd898a95d886eff2 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 15:57:03 2013 -0400 fix init order and switch back to signal shutdown commit fa71b47155dcf8ec1d8dd321b59803ffb63e6ad0 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 15:50:29 2013 -0400 reorg a little bit for client/server operation ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-engine.ae | 78 ++++++++++++++++++++---------------- code/src/remote/mercury-engine.hae | 7 ++- code/src/remote/mercury-svr.ae | 23 +++-------- 3 files changed, 55 insertions(+), 53 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index b6ba129..b3387a9 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -19,40 +19,47 @@ static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; static int module_refcount = 0; -static pthread_t tid; -static triton_mutex_t thread_mutex = TRITON_MUTEX_INITIALIZER; +static pthread_t svr_tid; +static triton_mutex_t svr_mutex = TRITON_MUTEX_INITIALIZER; static int shutting_down = 0; +static int g_flags = 0; -static void* thread_fn(void* foo); +static void* svr_thread_fn(void* foo); -triton_ret_t triton_mercury_svr_init(void) +triton_ret_t triton_mercury_engine_init(int flags) { na_class_t *network_class = NULL; int hg_ret; int ret; + g_flags = flags; + + assert((g_flags & TRITON_MERCURY_SVR) || (g_flags & TRITON_MERCURY_CLIENT)); + triton_mutex_lock(&module_lock); if (!module_refcount) { - - /* Initialize the interface */ - network_class = NA_BMI_Init("bmi_tcp", "tcp://localhost:3344", BMI_INIT_SERVER); - - hg_ret = HG_Handler_init(network_class); - if (hg_ret != HG_SUCCESS) + if(g_flags & TRITON_MERCURY_SVR) { - fprintf(stderr, "Error: HG_Handler_init() failure.\n"); - triton_mutex_unlock(&module_lock); - return(TRITON_ERR_UNKNOWN); - } - - ret = pthread_create(&tid, NULL, thread_fn, NULL); - if(ret != 0) - { - HG_Handler_finalize(); - triton_mutex_unlock(&module_lock); - return(TRITON_ERR_UNKNOWN); + /* Initialize the interface */ + network_class = NA_BMI_Init("bmi_tcp", "tcp://localhost:3344", BMI_INIT_SERVER); + + hg_ret = HG_Handler_init(network_class); + if (hg_ret != HG_SUCCESS) + { + fprintf(stderr, "Error: HG_Handler_init() failure.\n"); + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } + + ret = pthread_create(&svr_tid, NULL, svr_thread_fn, NULL); + if(ret != 0) + { + HG_Handler_finalize(); + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } } } module_refcount++; @@ -61,7 +68,7 @@ triton_ret_t triton_mercury_svr_init(void) return(TRITON_SUCCESS); } -void triton_mercury_svr_finalize(void) +void triton_mercury_engine_finalize(void) { int hg_ret; @@ -70,29 +77,32 @@ void triton_mercury_svr_finalize(void) if (!module_refcount) { - triton_mutex_lock(&thread_mutex); + triton_mutex_lock(&svr_mutex); shutting_down = 1; - triton_mutex_unlock(&thread_mutex); + triton_mutex_unlock(&svr_mutex); - pthread_join(tid, NULL); + if(g_flags & TRITON_MERCURY_SVR) + { + pthread_join(svr_tid, NULL); - hg_ret = HG_Handler_finalize(); - if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not finalize function shipper handler\n"); - return; + hg_ret = HG_Handler_finalize(); + if (hg_ret != HG_SUCCESS) { + fprintf(stderr, "Could not finalize function shipper handler\n"); + return; + } } } triton_mutex_unlock(&module_lock); } -static void* thread_fn(void* foo) +static void* svr_thread_fn(void* foo) { int hg_ret = HG_SUCCESS; - triton_mutex_lock(&thread_mutex); + triton_mutex_lock(&svr_mutex); while(!shutting_down && hg_ret == HG_SUCCESS) { - triton_mutex_unlock(&thread_mutex); + triton_mutex_unlock(&svr_mutex); /* TODO: confirm what the timeout value should be here */ hg_ret = HG_Handler_process(1, HG_STATUS_IGNORE); @@ -105,11 +115,11 @@ static void* thread_fn(void* foo) /* fprintf(stderr, "Error: HG_Handler_process() failure.\n"); */ } - triton_mutex_lock(&thread_mutex); + triton_mutex_lock(&svr_mutex); } shutting_down = 0; - triton_mutex_unlock(&thread_mutex); + triton_mutex_unlock(&svr_mutex); return(NULL); } diff --git a/code/src/remote/mercury-engine.hae b/code/src/remote/mercury-engine.hae index f5c6f5a..0cb13c5 100644 --- a/code/src/remote/mercury-engine.hae +++ b/code/src/remote/mercury-engine.hae @@ -4,8 +4,11 @@ #include <aesop/aesop.h> #include "src/common/triton-error.h" -triton_ret_t triton_mercury_svr_init(void); +#define TRITON_MERCURY_SVR 1 +#define TRITON_MERCURY_CLIENT 1 -void triton_mercury_svr_finalize(void); +triton_ret_t triton_mercury_engine_init(int flags); + +void triton_mercury_engine_finalize(void); #endif diff --git a/code/src/remote/mercury-svr.ae b/code/src/remote/mercury-svr.ae index 2ca0bad..b173146 100644 --- a/code/src/remote/mercury-svr.ae +++ b/code/src/remote/mercury-svr.ae @@ -18,18 +18,15 @@ __blocking int aesop_main(int argc, char **argv) triton_ret_t ret; int aeret; - aeret = aesop_timer_init(); - assert(aeret == 0); - - /* TODO: why doesn't this signal stuff work? */ -#if 0 ret = triton_signal_init(); triton_error_assert(ret); triton_signal_track(SIGINT); -#endif - ret = triton_mercury_svr_init(); + aeret = aesop_timer_init(); + assert(aeret == 0); + + ret = triton_mercury_engine_init(TRITON_MERCURY_SVR); triton_error_assert(ret); MERCURY_HANDLER_REGISTER("triton_mercury_rpc_timer", @@ -37,24 +34,16 @@ __blocking int aesop_main(int argc, char **argv) triton_mercury_rpc_timer_in_t, triton_mercury_rpc_timer_out_t); -#if 0 printf("Server up and running until ctrl-c\n"); fflush(NULL); triton_signal_wait(SIGINT); -#else - printf("Server up and running for %d seconds....\n", RUNTIME); - fflush(NULL); - aesop_timer(RUNTIME*1000); -#endif printf("Server shutting down cleanly.\n"); fflush(NULL); - triton_mercury_svr_finalize(); -#if 0 - triton_signal_finalize(); -#endif + triton_mercury_engine_finalize(); aesop_timer_finalize(); + triton_signal_finalize(); return(0); } hooks/post-receive --

1 0

branch, ticket-227, updated. b9926afb604f51ec2ee694182bd982ab8f970a13
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 b9926afb604f51ec2ee694182bd982ab8f970a13 (commit) via 038e08d33c3265a72a41fe6b6581cc683526f092 (commit) via d14a6a4c27ca2bb43a748f8568316304bec166dd (commit) from 0c4a0fdcc3175e34bd09ec9aa755ef560e54f6cd (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 b9926afb604f51ec2ee694182bd982ab8f970a13 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 14:40:20 2013 -0400 timer instead of signal to keep server running commit 038e08d33c3265a72a41fe6b6581cc683526f092 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 14:29:43 2013 -0400 register rpc handler commit d14a6a4c27ca2bb43a748f8568316304bec166dd Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 14:22:34 2013 -0400 initialize timer ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-rpc-example.ae | 2 +- code/src/remote/mercury-rpc-example.hae | 3 +- code/src/remote/mercury-svr.ae | 47 +++++++++++++++++++++---------- 3 files changed, 34 insertions(+), 18 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-rpc-example.ae b/code/src/remote/mercury-rpc-example.ae index bb6bf21..483a968 100644 --- a/code/src/remote/mercury-rpc-example.ae +++ b/code/src/remote/mercury-rpc-example.ae @@ -54,7 +54,7 @@ static void cb(void *user_ptr) /* ae_poll_break(); */ } -static int server_triton_mercury_rpc_timer(hg_handle_t handle) +int server_triton_mercury_rpc_timer(hg_handle_t handle) { int ret; ae_hints_t hints; diff --git a/code/src/remote/mercury-rpc-example.hae b/code/src/remote/mercury-rpc-example.hae index dd5d6e9..e2db37f 100644 --- a/code/src/remote/mercury-rpc-example.hae +++ b/code/src/remote/mercury-rpc-example.hae @@ -12,8 +12,7 @@ #error Mercury must be configured with boost preprocessor support #endif -/* prototype of function to be shipped */ -/* int triton_mercury_rpc_timer(int msec); */ +int server_triton_mercury_rpc_timer(hg_handle_t handle); /* generate input and output structs */ MERCURY_GEN_PROC(triton_mercury_rpc_timer_in_t, ((int32_t)(msec))) diff --git a/code/src/remote/mercury-svr.ae b/code/src/remote/mercury-svr.ae index 3f538f2..2ca0bad 100644 --- a/code/src/remote/mercury-svr.ae +++ b/code/src/remote/mercury-svr.ae @@ -5,41 +5,58 @@ #include <signal.h> #include <aesop/aesop.h> +#include <aesop/timer.hae> #include "src/zeroconf/zeroconf.h" #include "src/remote/mercury-engine.hae" #include "src/common/resources/signal/signal.hae" +#include "src/remote/mercury-rpc-example.hae" -static __blocking int run_server(void) -{ - - triton_signal_wait(SIGINT); - - return 0; -} +#define RUNTIME 10 __blocking int aesop_main(int argc, char **argv) { triton_ret_t ret; - int test_ret; + int aeret; + + aeret = aesop_timer_init(); + assert(aeret == 0); + /* TODO: why doesn't this signal stuff work? */ +#if 0 ret = triton_signal_init(); triton_error_assert(ret); - + triton_signal_track(SIGINT); +#endif ret = triton_mercury_svr_init(); triton_error_assert(ret); - test_ret = run_server(); - if(test_ret == 0) - printf("Test success.\n"); - else - printf("Test failure.\n"); + MERCURY_HANDLER_REGISTER("triton_mercury_rpc_timer", + server_triton_mercury_rpc_timer, + triton_mercury_rpc_timer_in_t, + triton_mercury_rpc_timer_out_t); + +#if 0 + printf("Server up and running until ctrl-c\n"); + fflush(NULL); + triton_signal_wait(SIGINT); +#else + printf("Server up and running for %d seconds....\n", RUNTIME); + fflush(NULL); + aesop_timer(RUNTIME*1000); +#endif + + printf("Server shutting down cleanly.\n"); + fflush(NULL); triton_mercury_svr_finalize(); +#if 0 triton_signal_finalize(); +#endif + aesop_timer_finalize(); - return test_ret; + return(0); } aesop_main_set(aesop_main); hooks/post-receive --

1 0

branch, ticket-227, updated. 0c4a0fdcc3175e34bd09ec9aa755ef560e54f6cd
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 0c4a0fdcc3175e34bd09ec9aa755ef560e54f6cd (commit) from ae953e8e6134952d578ed67290e7b05747bece69 (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 0c4a0fdcc3175e34bd09ec9aa755ef560e54f6cd Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 14:12:26 2013 -0400 example __blocking function as rpc handler untested; need to write a client ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-rpc-example.ae | 63 +++++++++++++++++++++++++++++++ code/src/remote/mercury-rpc-example.hae | 2 +- 2 files changed, 64 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-rpc-example.ae b/code/src/remote/mercury-rpc-example.ae index e4c3889..bb6bf21 100644 --- a/code/src/remote/mercury-rpc-example.ae +++ b/code/src/remote/mercury-rpc-example.ae @@ -6,7 +6,70 @@ #include <pthread.h> #include <aesop/aesop.h> +#include <aesop/timer.hae> #include <triton-thread.h> #include "src/common/triton-error.h" #include "src/remote/mercury-rpc-example.hae" +static __blocking void triton_mercury_rpc_timer(hg_handle_t handle) +{ + triton_mercury_rpc_timer_in_t triton_mercury_rpc_timer_in_struct; + triton_mercury_rpc_timer_out_t triton_mercury_rpc_timer_out_struct; + int msec; + int ret = 0; + + /* Get input struct */ + ret = HG_Handler_get_input(handle, &triton_mercury_rpc_timer_in_struct); + if (ret != HG_SUCCESS) + { + fprintf(stderr, "Error: could not get input struct\n"); + /* TODO: what to do here? */ + assert(0); + } + + msec = triton_mercury_rpc_timer_in_struct.msec; + + printf("Called triton_mercury_rpc_timer with msec: %d\n", msec); + /* here is the real work; in this case just a timer */ + ret = aesop_timer(msec); + + /* Fill output structure */ + triton_mercury_rpc_timer_out_struct.ret = ret; + + /* Free handle and send response back */ + ret = HG_Handler_start_output(handle, &triton_mercury_rpc_timer_out_struct); + if (ret != HG_SUCCESS) + { + fprintf(stderr, "Error: could not respond\n"); + /* TODO: what to do here? */ + assert(0); + } + + return; +} + +static void cb(void *user_ptr) +{ + /* TODO: do we really need to do anything here? */ + /* ae_poll_break(); */ +} + +static int server_triton_mercury_rpc_timer(hg_handle_t handle) +{ + int ret; + ae_hints_t hints; + ae_op_id_t op_id; + + ae_hints_init(&hints); + + ret = ext_post_blocking(triton_mercury_rpc_timer, cb, NULL, &hints, + &op_id, handle); + if(ret != AE_SUCCESS && ret != AE_IMMEDIATE_COMPLETION) + { + return(HG_FAIL); + } + + return(HG_SUCCESS); +} + + diff --git a/code/src/remote/mercury-rpc-example.hae b/code/src/remote/mercury-rpc-example.hae index 55f8831..dd5d6e9 100644 --- a/code/src/remote/mercury-rpc-example.hae +++ b/code/src/remote/mercury-rpc-example.hae @@ -13,7 +13,7 @@ #endif /* prototype of function to be shipped */ -int triton_mercury_rpc_timer(int msec); +/* int triton_mercury_rpc_timer(int msec); */ /* generate input and output structs */ MERCURY_GEN_PROC(triton_mercury_rpc_timer_in_t, ((int32_t)(msec))) hooks/post-receive --

1 0

branch, ticket-227, updated. ae953e8e6134952d578ed67290e7b05747bece69
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 ae953e8e6134952d578ed67290e7b05747bece69 (commit) via 63b1ddd6ba91e68c406d75c9fc6af0cbf662e4e4 (commit) from 7717ae2d6a917e704b92d4f3a43f7f28d000ffd2 (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 ae953e8e6134952d578ed67290e7b05747bece69 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 12:02:57 2013 -0400 stubs for example rpc function code commit 63b1ddd6ba91e68c406d75c9fc6af0cbf662e4e4 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 11:42:04 2013 -0400 fix cut and paste error ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-engine.ae | 4 ++-- code/src/remote/mercury-engine.hae | 4 ++-- code/src/remote/mercury-rpc-example.ae | 12 ++++++++++++ code/src/remote/mercury-rpc-example.hae | 22 ++++++++++++++++++++++ code/src/remote/module.mk.in | 2 ++ 5 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 code/src/remote/mercury-rpc-example.ae create mode 100644 code/src/remote/mercury-rpc-example.hae Diff of changes: diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index 0e589a4..b6ba129 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -10,8 +10,8 @@ #include "src/common/triton-error.h" #include "src/remote/mercury-engine.hae" -#include "mercury_handler.h" -#include "na_bmi.h" +#include <mercury_handler.h> +#include <na_bmi.h> /* TODO: configurable transport and address */ /* TODO: replace fprintf() calls */ diff --git a/code/src/remote/mercury-engine.hae b/code/src/remote/mercury-engine.hae index cd954ee..f5c6f5a 100644 --- a/code/src/remote/mercury-engine.hae +++ b/code/src/remote/mercury-engine.hae @@ -1,5 +1,5 @@ -#ifndef __REMOTE_HAE__ -#define __REMOTE_HAE__ +#ifndef __MERCURY_ENGINE_HAE__ +#define __MERCURY_ENGINE_HAE__ #include <aesop/aesop.h> #include "src/common/triton-error.h" diff --git a/code/src/remote/mercury-rpc-example.ae b/code/src/remote/mercury-rpc-example.ae new file mode 100644 index 0000000..e4c3889 --- /dev/null +++ b/code/src/remote/mercury-rpc-example.ae @@ -0,0 +1,12 @@ + +#include <stdio.h> +#include <stdlib.h> +#include <assert.h> +#include <unistd.h> +#include <pthread.h> + +#include <aesop/aesop.h> +#include <triton-thread.h> +#include "src/common/triton-error.h" +#include "src/remote/mercury-rpc-example.hae" + diff --git a/code/src/remote/mercury-rpc-example.hae b/code/src/remote/mercury-rpc-example.hae new file mode 100644 index 0000000..55f8831 --- /dev/null +++ b/code/src/remote/mercury-rpc-example.hae @@ -0,0 +1,22 @@ +#ifndef __MERCURY_RPC_EXAMPLE_HAE__ +#define __MERCURY_RPC_EXAMPLE_HAE__ + +#include <aesop/aesop.h> +#include <mercury_macros.h> +#include <mercury_proc.h> + +#include "src/common/triton-error.h" + +/* TODO: check for this at configure time instead */ +#ifndef MERCURY_HAS_BOOST +#error Mercury must be configured with boost preprocessor support +#endif + +/* prototype of function to be shipped */ +int triton_mercury_rpc_timer(int msec); + +/* generate input and output structs */ +MERCURY_GEN_PROC(triton_mercury_rpc_timer_in_t, ((int32_t)(msec))) +MERCURY_GEN_PROC(triton_mercury_rpc_timer_out_t, ((int32_t)(ret))) + +#endif diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index 1da1b53..acaced9 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -15,7 +15,9 @@ AELIBSRC += $(DIR_REMOTE)/message.ae \ ifneq (,$(USE_MERCURY)) AESOP_HDR += $(DIR_REMOTE)/mercury-engine.hae +AESOP_HDR += $(DIR_REMOTE)/mercury-rpc-example.hae AELIBSRC += $(DIR_REMOTE)/mercury-engine.ae +AELIBSRC += $(DIR_REMOTE)/mercury-rpc-example.ae endif AERLIBSRC += $(DIR_REMOTE)/core.aer hooks/post-receive --

1 0

branch, ticket-227, updated. 7717ae2d6a917e704b92d4f3a43f7f28d000ffd2
by noreply＠mcs.anl.gov 27 Jun '13

27 Jun '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 7717ae2d6a917e704b92d4f3a43f7f28d000ffd2 (commit) from 3950b983465668b3c74a23e14403fd89d56edde6 (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 7717ae2d6a917e704b92d4f3a43f7f28d000ffd2 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jun 27 11:36:40 2013 -0400 thread to drive mercury server-side engine ----------------------------------------------------------------------- Summary of changes: code/src/remote/mercury-engine.ae | 59 +++++++++++++++++++++++++++++++++--- code/src/remote/mercury-svr.ae | 3 +- 2 files changed, 56 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/remote/mercury-engine.ae b/code/src/remote/mercury-engine.ae index 60b2215..0e589a4 100644 --- a/code/src/remote/mercury-engine.ae +++ b/code/src/remote/mercury-engine.ae @@ -3,6 +3,7 @@ #include <stdlib.h> #include <assert.h> #include <unistd.h> +#include <pthread.h> #include <aesop/aesop.h> #include <triton-thread.h> @@ -18,10 +19,17 @@ static triton_mutex_t module_lock = TRITON_MUTEX_INITIALIZER; static int module_refcount = 0; +static pthread_t tid; +static triton_mutex_t thread_mutex = TRITON_MUTEX_INITIALIZER; +static int shutting_down = 0; + +static void* thread_fn(void* foo); + triton_ret_t triton_mercury_svr_init(void) { na_class_t *network_class = NULL; int hg_ret; + int ret; triton_mutex_lock(&module_lock); @@ -34,12 +42,18 @@ triton_ret_t triton_mercury_svr_init(void) hg_ret = HG_Handler_init(network_class); if (hg_ret != HG_SUCCESS) { - fprintf(stderr, "Could not initialize function shipper handler\n"); + fprintf(stderr, "Error: HG_Handler_init() failure.\n"); + triton_mutex_unlock(&module_lock); + return(TRITON_ERR_UNKNOWN); + } + + ret = pthread_create(&tid, NULL, thread_fn, NULL); + if(ret != 0) + { + HG_Handler_finalize(); + triton_mutex_unlock(&module_lock); return(TRITON_ERR_UNKNOWN); } - - /* TODO: start thread to run Handler_process() */ - } module_refcount++; triton_mutex_unlock(&module_lock); @@ -56,7 +70,11 @@ void triton_mercury_svr_finalize(void) if (!module_refcount) { - /* TODO: stop thread */ + triton_mutex_lock(&thread_mutex); + shutting_down = 1; + triton_mutex_unlock(&thread_mutex); + + pthread_join(tid, NULL); hg_ret = HG_Handler_finalize(); if (hg_ret != HG_SUCCESS) { @@ -66,3 +84,34 @@ void triton_mercury_svr_finalize(void) } triton_mutex_unlock(&module_lock); } + +static void* thread_fn(void* foo) +{ + int hg_ret = HG_SUCCESS; + + triton_mutex_lock(&thread_mutex); + while(!shutting_down && hg_ret == HG_SUCCESS) + { + triton_mutex_unlock(&thread_mutex); + + /* TODO: confirm what the timeout value should be here */ + hg_ret = HG_Handler_process(1, HG_STATUS_IGNORE); + + if(hg_ret != HG_SUCCESS) + { + /* TODO: confirm return codes here. It looks like this function + * might return failure if it just didn't find a new request? + */ + /* fprintf(stderr, "Error: HG_Handler_process() failure.\n"); */ + } + + triton_mutex_lock(&thread_mutex); + } + + shutting_down = 0; + triton_mutex_unlock(&thread_mutex); + + return(NULL); +} + + diff --git a/code/src/remote/mercury-svr.ae b/code/src/remote/mercury-svr.ae index 89e78d0..3f538f2 100644 --- a/code/src/remote/mercury-svr.ae +++ b/code/src/remote/mercury-svr.ae @@ -11,7 +11,6 @@ static __blocking int run_server(void) { - triton_signal_track(SIGINT); triton_signal_wait(SIGINT); @@ -26,6 +25,8 @@ __blocking int aesop_main(int argc, char **argv) ret = triton_signal_init(); triton_error_assert(ret); + triton_signal_track(SIGINT); + ret = triton_mercury_svr_init(); triton_error_assert(ret); hooks/post-receive --

1 0