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 5134a2a83e4f38d8fcf54aed17663b7f45dbf6d0 (commit) via dc0e5753eb278857e88aea368500d1c8fed0297c (commit) from 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf (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 5134a2a83e4f38d8fcf54aed17663b7f45dbf6d0 Merge: dc0e5753eb278857e88aea368500d1c8fed0297c 2ed72cc03cbfd1e27808e15ee69b38053e8bfabf Author: Kevin Harms <[email protected]> Date: Wed Jun 8 12:30:18 2011 -0500 Merge branch 'master' of git.mcs.anl.gov:triton commit dc0e5753eb278857e88aea368500d1c8fed0297c Author: Kevin Harms <[email protected]> Date: Wed Jun 8 12:29:35 2011 -0500 Fix echo-server.ae to use standard triton style initialization. ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 120154b..9a8d46c 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -4,6 +4,7 @@ #include "src/common/resources/timer/timer.hae" #include "src/socket/test/echo-server.h" #include "src/versioned-osd/prototype/file-resource/file-resource.hae" +#include "src/common/triton-debug.h" #include <sys/types.h> #include <sys/socket.h> @@ -33,11 +34,11 @@ static __blocking void handleConnection( int written; struct test_request req; struct test_response resp; - int end_loop = 1; + int end_loop = 0; int file_fd; int error_code; - resp.error_code = 0; + resp.error_code = 42; // printf("New connection (fd %i)!\n", fd); @@ -181,7 +182,6 @@ static __blocking void handleConnection( else { triton_error_print(ret, "error on file_open"); - break; } ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) @@ -273,9 +273,11 @@ int main( ae_hints_t hints; ae_op_id_t op_id; - triton_aesocket_init(); - triton_timer_init(); - ae_context_create(&ctx, "timer", "aesocket"); + triton_init("triton.vosd.file", + "triton.resource.timer", + "triton.resource.aesocket"); + + ae_context_create(&ctx, "timer", "aesocket", "file"); ae_hints_init(&hints); ret = ae_post_blocking(dotest, done_callback, NULL, &hints, ctx, &op_id, @@ -292,8 +294,8 @@ int main( ae_hints_destroy(&hints); ae_context_destroy(ctx); - triton_timer_finalize(); - triton_aesocket_finalize(); + + triton_finalize(); return cb_ret; } hooks/post-receive -- Triton Repository