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 "Triton Repository". The branch, master has been updated via bcf4e8ebed31de7c63951928641843288486c87d (commit) via c2e29a4b0d109ddfaea091b385e3f342b227ce66 (commit) from 28d4d10650608a5612a3fbd96f1b372e8f321a62 (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 bcf4e8ebed31de7c63951928641843288486c87d Author: slang <[email protected]> Date: Mon Nov 29 21:42:03 2010 -0600 add args check commit c2e29a4b0d109ddfaea091b385e3f342b227ce66 Author: slang <[email protected]> Date: Mon Nov 29 21:41:22 2010 -0600 add client-server.hae ----------------------------------------------------------------------- Summary of changes: code/src/remote/client-server.hae | 15 +++++++++++++++ code/src/remote/tests/test-client-server.aer | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 code/src/remote/client-server.hae Diff of changes: diff --git a/code/src/remote/client-server.hae b/code/src/remote/client-server.hae new file mode 100644 index 0000000..c1eb95a --- /dev/null +++ b/code/src/remote/client-server.hae @@ -0,0 +1,15 @@ + +#ifndef __CLIENT_SERVER_HAE__ +#define __CLIENT_SERVER_HAE__ + +#include "src/aesop/aesop.h" +#include "src/remote/message.hae" + +__blocking triton_ret_t triton_client_server( + __blocking triton_ret_t (*client_init)(aer_remote_ctx_t rctx, triton_addr_t you), + __blocking triton_ret_t (*client_run)(aer_remote_ctx_t rctx, triton_addr_t you), + int client_count, + __blocking triton_ret_t (*server_init)(aer_remote_ctx_t rctx, triton_addr_t you), + int server_count); + +#endif diff --git a/code/src/remote/tests/test-client-server.aer b/code/src/remote/tests/test-client-server.aer index 57e7bde..1aeb6cb 100644 --- a/code/src/remote/tests/test-client-server.aer +++ b/code/src/remote/tests/test-client-server.aer @@ -3,8 +3,8 @@ #include "src/aesop/hints.h" #include "src/remote/service.hae" #include "src/remote/client-server.hae" -#include "mpi.h" +#include "mpi.h" __remote __blocking triton_ret_t myremote(uint32_t rank, uint32_t *out) { @@ -60,9 +60,13 @@ __blocking int aesop_main(int argc, char **argv) int client_count, server_count; triton_ret_t ret; + if(argc < 3) + { + printf("client_count: %d\nserver_count: %d\n", client_count, server_count); + return -1; + } client_count = atoi(argv[1]); server_count = atoi(argv[2]); - printf("client_count: %d\nserver_count: %d\n", client_count, server_count); triton_error_assert(ae_hints_type_register("myclient_count", 0, &aer_encoder_uint32_t)); triton_error_assert(ae_hints_type_register("myserver_count", 0, &aer_encoder_uint32_t)); hooks/post-receive -- Triton Repository