branch, ticket-227, updated. 6097a924d94cb7eff63acc00804240d227d04296
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 <[email protected]> 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 --
participants (1)
-
noreply@mcs.anl.gov