January 2011 - Triton-commits - mailman3.cels.anl.gov

Triton Repository branch, master, updated. 0025f00637522d7b48470010e983838ede91db77
by noreply＠mcs.anl.gov 31 Jan '11

31 Jan '11

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 0025f00637522d7b48470010e983838ede91db77 (commit) from e98ff0bfbfcc3628e1ffb00a9a65d56375a82aa1 (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 0025f00637522d7b48470010e983838ede91db77 Author: Kevin Harms <harms(a)harms-desktop.(none)> Date: Mon Jan 31 16:32:30 2011 -0600 Make sure dependencies are not generated when make parserclean is run, add to the .PHONY rule and use double-colon rule. ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index b7c68ba..04cdee1 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -179,7 +179,7 @@ endif # of a file that has the same name as the target. Listing them # here keeps make from accidentally doing too much work (see GNU # make manual). -.PHONY: all clean test_results +.PHONY: all clean parserclean test_results ################################################################ # Find project subdirectories @@ -835,14 +835,14 @@ clean:: $(AESOP_TRHDR) $(REMOTE_TRHDR) $(REMOTE_OBJS_INTERM) $(TESTLIBOBJS) \ $(LIBRARIES) $(TEST_LIBRARIES) $(DEPENDS) $(TEST_RESULTS) $(TEST_OUT) -parserclean: +parserclean:: $(Q) " PARSER CLEAN" $(E)rm -f $(HSBIN) $(HSOBJ) $(HSINT) # this is where we include all of our automatic dependencies. # NOTE: we wrap this in ifneq's in order to prevent the dependencies # from being generated for special targets that don't require them -ifeq (,$(filter clean nodep,$(MAKECMDGOALS))) +ifeq (,$(filter clean parserclean nodep,$(MAKECMDGOALS))) -include $(DEPENDS) endif # add this as a make goal to disable rebuilding deps hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. e98ff0bfbfcc3628e1ffb00a9a65d56375a82aa1
by noreply＠mcs.anl.gov 28 Jan '11

28 Jan '11

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 e98ff0bfbfcc3628e1ffb00a9a65d56375a82aa1 (commit) from 73465db6cae2abd758e204a70a772c91d2b880c3 (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 e98ff0bfbfcc3628e1ffb00a9a65d56375a82aa1 Author: Seung Woo Son <sson(a)mcs.anl.gov> Date: Fri Jan 28 16:30:59 2011 -0600 bug fixes in strong consistency test (kvtest.c) ----------------------------------------------------------------------- Summary of changes: code/src/kv/test/kvtest.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/kv/test/kvtest.c b/code/src/kv/test/kvtest.c index 3c6c55c..be25697 100644 --- a/code/src/kv/test/kvtest.c +++ b/code/src/kv/test/kvtest.c @@ -10,7 +10,9 @@ #include "src/kv/kv.h" -size_t opt_loops = 1024; +/* TODO: for now use some small range number + value like 1024 creates out of memory error */ +size_t opt_loops = 128; static size_t opt_servers = 1; static int opt_verbose = 0; @@ -82,20 +84,20 @@ static void strong_consistency_test (MPI_Comm comm, int commrank, int commsize) size_t i; size_t loops; - for (loops = 0; loops < opt_loops; ++i) + for (loops = 0; loops < opt_loops; ++loops) { for (i=0; i<commsize; ++i) { MPI_Barrier (comm); if (i==commrank) { - triton_kv_put (&key[0], &data[0], sizeof(data)); + check_triton_ret (triton_kv_put (&key[0], &data[0], sizeof(data))); } MPI_Barrier (comm); size_t getsize = sizeof(data); - triton_kv_get (&key[0], &data2[0], &getsize); + check_triton_ret (triton_kv_get (&key[0], &data2[0], &getsize)); if (getsize != sizeof(data)) error ("Keyval was truncated in consistency test?"); @@ -105,7 +107,7 @@ static void strong_consistency_test (MPI_Comm comm, int commrank, int commsize) MPI_Barrier (comm); - if (i == 0) + if (i == commrank) { triton_kv_remove (&key[0]); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 73465db6cae2abd758e204a70a772c91d2b880c3
by noreply＠mcs.anl.gov 28 Jan '11

28 Jan '11

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 73465db6cae2abd758e204a70a772c91d2b880c3 (commit) from 85f702b5f170deac3c516cf86f4d42392c9ac6ce (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 73465db6cae2abd758e204a70a772c91d2b880c3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 28 17:12:10 2011 -0500 remove unecessary test program ----------------------------------------------------------------------- Summary of changes: code/src/aesop/parser/tests/remote/module.mk.in | 9 -- .../parser/tests/remote/test-remote-mpi-immed.aer | 106 -------------------- 2 files changed, 0 insertions(+), 115 deletions(-) delete mode 100644 code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer Diff of changes: diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index fa66988..50c6e41 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -27,15 +27,6 @@ MODLDFLAGS_$(DIR)/test-remote-mpi = $(MPILDFLAGS) MODLIBS_$(DIR)/test-remote-mpi = $(MPILIBS) MODCC_$(DIR)/test-remote-mpi = $(MPICC) -REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_mpi_immed -REMOTE_TESTMODSRC_$(DIR)/test_remote_mpi-immed := $(DIR)/test-remote-mpi-immed.aer -REMOTE_TESTSRC += $(DIR)/test-remote-mpi-immed.aer - -MODCFLAGS_$(DIR)/test-remote-mpi-immed = $(MPICFLAGS) -MODLDFLAGS_$(DIR)/test-remote-mpi-immed = $(MPILDFLAGS) -MODLIBS_$(DIR)/test-remote-mpi-immed = $(MPILIBS) -MODCC_$(DIR)/test-remote-mpi-immed = $(MPICC) - REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_fault REMOTE_TESTMODSRC_$(DIR)/test_remote_fault := $(DIR)/test-remote-fault-injector.aer REMOTE_TESTSRC += $(DIR)/test-remote-fault-injector.aer diff --git a/code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer b/code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer deleted file mode 100644 index 519731e..0000000 --- a/code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer +++ /dev/null @@ -1,106 +0,0 @@ -#include <unistd.h> - -#include "src/common/triton-types.h" -#include "src/aesop/hints.h" -#include "src/aesop/aesop.h" -#include "src/remote/encoding.h" -#include "src/remote/remote.hae" -#include "src/net/triton-message.hae" -#include "src/net/triton-message-method.hae" -#include "src/net/mock/mock-method.h" -#include "src/common/resources/scheduling/sched.hae" -#include "src/common/resources/timer/timer.hae" -#include "src/zeroconf/zeroconf.h" -#include "src/net/mpi/mpi.hae" -#include "src/net/mpi/mpi-method.h" - -#include "src/remote/service.hae" -#include "src/common/triton-init.h" - - -/* normally you don't have to declare this, but we do here because - * it gets declared in <module>_module.h (myclientserver_module.h) - * which is generated by this source file. - */ -triton_ret_t aer_remote_register_test_remote_mpi_immed(void); - -#include "mpi.h" - -__remote __blocking triton_ret_t test_fn(triton_ignore_t* in, triton_ignore_t* out); - -__remote __blocking triton_ret_t test_fn(triton_ignore_t* in, triton_ignore_t* out) -{ - triton_ret_t tret; - - tret = triton_timer(10); - printf("finished timer.\n"); - - return(tret); -} - -__blocking void do_remote_test(aer_remote_ctx_t rctx) -{ - triton_ret_t ret; - int32_t result; - int rank; - const char* svr = "mpi://1"; - triton_addr_t n1; - - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - if(rank == 0) - { - /* need a good way to wait for all the processes, so that - * we know the aer_service_requests calls have been started - * and will be able to receive messages. For now, we just sleep - * for a sec. - */ - ret = triton_timer(1000); - triton_error_assert(ret); - -#if 0 - /* must set the remote context as a hint because we're about to call - * test_fn as a local call - */ - ret = aesop_hints_put("triton.remote.context", sizeof(rctx), &rctx); - triton_error_assert(ret); -#endif - - ret = triton_addr_lookup(svr, &n1); - assert(rctx != NULL); - ret = remote_test_fn(rctx, n1, NULL, NULL); - triton_error_assert(ret); - printf("FINAL RESULT: %d\n", result); - - } - else - { - /* service a single request */ - assert(rctx != NULL); - ret = aer_service_requests(rctx, 1); - } -} - -__blocking int aesop_main(int argc, char **argv) -{ - triton_ret_t ret; - ae_op_id_t op_id; - - ret = aer_remote_register_test_remote_mpi_immed(); - triton_error_assert(ret); - - do_remote_test(AER_DEFAULT_CTX); - - return 0; -} -aesop_main_set(aesop_main, "mpi", "sched", "timer"); - - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - * - * vim: ts=8 sts=4 sw=4 expandtab - */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 85f702b5f170deac3c516cf86f4d42392c9ac6ce
by noreply＠mcs.anl.gov 28 Jan '11

28 Jan '11

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 85f702b5f170deac3c516cf86f4d42392c9ac6ce (commit) via d3ee46c57254aeedbbefa744922bd52f258adc35 (commit) from 9b2c5a04b223e51c55ba91719ed586012f9c6697 (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 85f702b5f170deac3c516cf86f4d42392c9ac6ce Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 28 17:07:59 2011 -0500 fix misc. warnings commit d3ee46c57254aeedbbefa744922bd52f258adc35 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 15:31:56 2011 -0500 fix rosd test program bug, enable noop test ----------------------------------------------------------------------- Summary of changes: code/src/kv/kv-intern.ae | 2 ++ code/src/kv/kv-intern.hae | 2 ++ code/src/kv/kv.c | 4 ++-- code/src/kv/kv.h | 4 +++- code/src/replicated-osd/tests/rosd-create-bench.ae | 6 ++---- 5 files changed, 11 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index f701820..eeba228 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -13,6 +13,8 @@ #include "src/versioned-osd/prototype/versioned-osd.hae" #include "src/fakess/fakess.hae" #include "src/remote/client_server_shutdown_stubs.hae" +#include "src/replicated-osd/rosd_module.h" +#include "src/remote/client_server_shutdown_module.h" __blocking triton_ret_t triton_kv_init_internal(const char * mapfile) { diff --git a/code/src/kv/kv-intern.hae b/code/src/kv/kv-intern.hae index b050e68..5bb9bc0 100644 --- a/code/src/kv/kv-intern.hae +++ b/code/src/kv/kv-intern.hae @@ -8,6 +8,8 @@ /** Delegated to implementation */ +__blocking triton_ret_t triton_kv_server_start_internal(void); +__blocking triton_ret_t triton_kv_server_stop_internal(void); __blocking triton_ret_t triton_kv_init_internal(const char * mapfile); void triton_kv_finalize_internal(void); diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index 33d5bdb..deb18de 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -49,7 +49,7 @@ triton_ret_t triton_kv_server_start (void) ae_op_id_t op_id; ext_post_blocking(triton_kv_server_start_internal, cb, &c, NULL, - NULL, &op_id, NULL); + NULL, &op_id); while(!c.done) { @@ -70,7 +70,7 @@ triton_ret_t triton_kv_server_stop (void) ae_op_id_t op_id; ext_post_blocking(triton_kv_server_stop_internal, cb, &c, NULL, - NULL, &op_id, NULL); + NULL, &op_id); while(!c.done) { diff --git a/code/src/kv/kv.h b/code/src/kv/kv.h index e66b45c..bf07546 100644 --- a/code/src/kv/kv.h +++ b/code/src/kv/kv.h @@ -27,7 +27,9 @@ triton_ret_t triton_kv_server_start(void); /** * Stops all servers, should be called once from a single _client_ process (usually rank 0). */ -triton_ret_t triton_kv_servers_stop(void); +triton_ret_t triton_kv_server_stop(void); + +triton_ret_t triton_kv_server_main (void); #endif diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index 3fcfbc6..504d319 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -573,8 +573,8 @@ int main(int argc, char *argv[]) /* wait a little bit to make sure the server gets started */ sleep(3); -#if 0 /* barrier and start noop test */ + done = 0; mpi_ret = MPI_Barrier(client_comm); assert(mpi_ret == MPI_SUCCESS); if(rank == nservers) @@ -593,9 +593,9 @@ int main(int argc, char *argv[]) noop_elapsed = test_end - test_start; sleep(2); -#endif /* barrier and start create test */ + done = 0; mpi_ret = MPI_Barrier(client_comm); assert(mpi_ret == MPI_SUCCESS); if(rank == nservers) @@ -706,10 +706,8 @@ int main(int argc, char *argv[]) /* first non-server rank */ printf("# <op> <nclients> <nservers> <objs/client> <concurrency> <min> <max> <rate> <niid enabled>\n"); -#if 0 printf("noop\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%d\n", nclients, nservers, nobjects, nconcurrent, noop_min_elapsed_time, noop_elapsed_time, (double)nobjects*(double)(nclients)/noop_elapsed_time, use_niids); -#endif printf("create\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%d\n", nclients, nservers, nobjects, nconcurrent, min_elapsed_time, elapsed_time, (double)nobjects*(double)(nclients)/elapsed_time, use_niids); printf("write\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%d\n", hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 9b2c5a04b223e51c55ba91719ed586012f9c6697
by noreply＠mcs.anl.gov 28 Jan '11

28 Jan '11

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 9b2c5a04b223e51c55ba91719ed586012f9c6697 (commit) via 1d5a882f7db681678994af7747a0ed86212c6a45 (commit) via 5e64f734efcf0b139a1e05554ed6f8bb64a781ed (commit) from 077d0a4e32ad6bab16c3dd9f53f717c11116ffcd (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 9b2c5a04b223e51c55ba91719ed586012f9c6697 Author: Seung Woo Son <sson(a)mcs.anl.gov> Date: Fri Jan 28 15:04:26 2011 -0600 cleanup unused source lines. turn on remove test in simple_test (kvtest.c). restored server polling routine. added server stoping routine. commit 1d5a882f7db681678994af7747a0ed86212c6a45 Author: Seung Woo Son <sson(a)mcs.anl.gov> Date: Fri Jan 28 11:39:55 2011 -0600 moved rosd to from REMOTE_TESTLIB_MODULES to REMOTE_LIB_MODULES kvtest.c to use updated kv apis. commit 5e64f734efcf0b139a1e05554ed6f8bb64a781ed Author: Seung Woo Son <sson(a)mcs.anl.gov> Date: Thu Jan 27 16:34:18 2011 -0600 added RPC listener. added internal server start/stop routine. ----------------------------------------------------------------------- Summary of changes: code/src/kv/kv-intern.ae | 83 +++++++++++++++++++++++++++++----- code/src/kv/kv.c | 40 ++++++++++++++++- code/src/kv/kv.h | 9 +++- code/src/kv/test/kvtest.c | 10 +++-- code/src/kv/test/simpletest.c | 6 +- code/src/replicated-osd/module.mk.in | 2 +- 6 files changed, 128 insertions(+), 22 deletions(-) Diff of changes: diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index 9586156..f701820 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -12,17 +12,18 @@ #include "src/kv/kv-intern.hae" #include "src/versioned-osd/prototype/versioned-osd.hae" #include "src/fakess/fakess.hae" +#include "src/remote/client_server_shutdown_stubs.hae" __blocking triton_ret_t triton_kv_init_internal(const char * mapfile) { - triton_ret_t ret; - - triton_map_init(); - triton_map_file(mapfile); - triton_fakess_init(); - triton_fakess_load_map(); + triton_ret_t ret; - return ret; + triton_map_init(); + triton_map_file(mapfile); + triton_fakess_init(); + triton_fakess_load_map(); + + return ret; } void triton_kv_finalize_internal(void) @@ -32,7 +33,7 @@ void triton_kv_finalize_internal(void) /* TODO: should these be removed? */ static triton_ret_t triton_kv_module_init () { - return(TRITON_SUCCESS); + return(TRITON_SUCCESS); } static void triton_kv_module_finalize (void) @@ -66,12 +67,12 @@ __blocking triton_ret_t triton_kv_get_internal(const char * key, int64_t offset = 0; uint32_t flags = 0; int64_t size = 0; - + triton_string_init(&key_str, key); - + ret = triton_place_hash(&key_str, &oid); triton_error_assert(ret); - + ret = triton_place_lookup(oid, 1, &node); triton_error_assert(ret); @@ -200,6 +201,66 @@ __blocking triton_ret_t triton_kv_remove_internal(const char *key) return ret; } +/** + * \brief internal routine to stop servers + * \todo make sure called by client rank 0? + */ +__blocking triton_ret_t triton_kv_server_stop_internal(void) +{ + triton_ret_t ret; + triton_map_t *mapping; + triton_map_t *scratch; + triton_list_t *map; + triton_addr_t addr; + triton_node_t node; + uint32_t out; + int i; + + /* get all the server addrs */ + ret = triton_map_get(&map); + + pwait + { + triton_list_for_each_entry(mapping, scratch, map, triton_map_t, link) + { + pbranch + { + ret = remote_triton_server_shutdown(AER_DEFAULT_CTX, mapping->addr, 0, &out); + if(ret != TRITON_SUCCESS) + { + aesop_cancel_branches(); + } + } + } + } + + return ret; +} + +/** + * \brief internal routine to start servers + */ +__blocking triton_ret_t triton_kv_server_start_internal(void) +{ + triton_ret_t ret; + + /* register shutdown rpc */ + ret = aer_remote_register_client_server_shutdown(); + if(ret != TRITON_SUCCESS) + { + return ret; + } + + ret = aer_remote_register_rosd(); + if(ret != TRITON_SUCCESS) + { + return ret; + } + + aer_service_engine_start(AER_DEFAULT_CTX); + return TRITON_SUCCESS; +} + /* * Local Variables: * c-basic-offset: 4 diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index cf2f0f5..33d5bdb 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -39,7 +39,45 @@ static void write_hostfile (size_t count, int fd) triton_ret_t triton_kv_server_main (void) { - return ae_poll(NULL, KV_AE_POLL_TIMEOUT); + return ae_poll(NULL, KV_AE_POLL_TIMEOUT); +} + +triton_ret_t triton_kv_server_start (void) +{ + struct completion c; + c.done = 0; + ae_op_id_t op_id; + + ext_post_blocking(triton_kv_server_start_internal, cb, &c, NULL, + NULL, &op_id, NULL); + + while(!c.done) + { + return ae_poll(NULL, KV_AE_POLL_TIMEOUT); + } + + return c.ret; +} + +/** + * \brief a client API for stopping all servers. + * \note should be called once, preferably by client rank 0 + */ +triton_ret_t triton_kv_server_stop (void) +{ + struct completion c; + c.done = 0; + ae_op_id_t op_id; + + ext_post_blocking(triton_kv_server_stop_internal, cb, &c, NULL, + NULL, &op_id, NULL); + + while(!c.done) + { + return ae_poll(NULL, KV_AE_POLL_TIMEOUT); + } + + return c.ret; } triton_ret_t triton_kv_init (size_t servercount, const char *kvstore) diff --git a/code/src/kv/kv.h b/code/src/kv/kv.h index 63b5440..e66b45c 100644 --- a/code/src/kv/kv.h +++ b/code/src/kv/kv.h @@ -20,9 +20,14 @@ triton_ret_t triton_kv_put(const char * key, void * value, size_t value_sz); triton_ret_t triton_kv_remove(const char * key); /** - * Worker function, to be called repeatedly for server processes. + * Worker function, to be called once for server processes. */ -triton_ret_t triton_kv_server_main (void); +triton_ret_t triton_kv_server_start(void); + +/** + * Stops all servers, should be called once from a single _client_ process (usually rank 0). + */ +triton_ret_t triton_kv_servers_stop(void); #endif diff --git a/code/src/kv/test/kvtest.c b/code/src/kv/test/kvtest.c index 2cdfa90..3c6c55c 100644 --- a/code/src/kv/test/kvtest.c +++ b/code/src/kv/test/kvtest.c @@ -214,7 +214,6 @@ static void simple_test (MPI_Comm comm, int commrank, int commsize) MPI_Barrier (comm); write0 (commrank, "done\n"); - /* write0 (commrank, "Testing if kv_remove works... "); for (i=0; i<opt_loops; ++i) @@ -238,7 +237,6 @@ static void simple_test (MPI_Comm comm, int commrank, int commsize) } write0 (commrank, "done\n"); - */ MPI_Barrier (comm); } @@ -258,16 +256,18 @@ static void server_main (MPI_Comm globalcomm, MPI_Comm comm) MPI_Comm_size (comm, &commsize); writev ("Rank %i server starting\n", commrank); - + nb_barrier_handle nbh; nb_barrier_init (&nbh, globalcomm); nb_barrier_signal (nbh); + triton_kv_server_start(); + while (!nb_barrier_test (nbh)) { triton_kv_server_main (); } - + writev ("Rank %i server done\n", commrank); } @@ -566,6 +566,8 @@ int main (int argc, char ** args) /* ============================================= */ write0v (commrank, "Shutting down KV store..."); + if (is_server) + triton_kv_server_stop(); triton_kv_finalize (); /* ============================================= */ diff --git a/code/src/kv/test/simpletest.c b/code/src/kv/test/simpletest.c index 90db3b9..9254091 100644 --- a/code/src/kv/test/simpletest.c +++ b/code/src/kv/test/simpletest.c @@ -105,8 +105,8 @@ static void simpletest () int main (int argc, char ** args) { triton_kv_init (1, "/tmp/vosd"); - simpletest (); - triton_kv_finalize (); + simpletest (); + triton_kv_finalize (); - return EXIT_SUCCESS; + return EXIT_SUCCESS; } diff --git a/code/src/replicated-osd/module.mk.in b/code/src/replicated-osd/module.mk.in index c45faa1..a1c791b 100644 --- a/code/src/replicated-osd/module.mk.in +++ b/code/src/replicated-osd/module.mk.in @@ -6,7 +6,7 @@ AELIBSRC += $(DIR)/rosd-trans-nr-cache.ae ifneq (,$(BUILD_MPI)) LIBSRC += $(DIR)/rosd-utils.c -REMOTE_TESTLIB_MODULES += $(DIR)/rosd +REMOTE_LIB_MODULES += $(DIR)/rosd REMOTE_TESTMODSRC_$(DIR)/rosd := $(DIR)/replicated-osd.aer REMOTE_LIBSRC += $(DIR)/replicated-osd.aer hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 077d0a4e32ad6bab16c3dd9f53f717c11116ffcd
by noreply＠mcs.anl.gov 27 Jan '11

27 Jan '11

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 077d0a4e32ad6bab16c3dd9f53f717c11116ffcd (commit) via a906ea99375915eb53c2587efea37ffcac2b76b2 (commit) via 5c325da4871d92d75645425c9a8b29039d3fa0cb (commit) via fb662e2a00a76b85bbb3d1f53852e3aa021ec71d (commit) via a43a9029fba21dcaf911d17db8cbe352887b812c (commit) from b533ceaa176e5d87914162a45928594dfb6c4367 (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 077d0a4e32ad6bab16c3dd9f53f717c11116ffcd Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 12:13:20 2011 -0500 get rid of busy-spin during kv operations commit a906ea99375915eb53c2587efea37ffcac2b76b2 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 12:12:48 2011 -0500 more efficient emptying of epoll pipes commit 5c325da4871d92d75645425c9a8b29039d3fa0cb Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 12:06:01 2011 -0500 make threaded resources request ae poll too We don't need resource polling to make progress on these resources, but we do need a way to break out of any callers that might be blocking on ae_poll() before looking for some indication of completion. commit fb662e2a00a76b85bbb3d1f53852e3aa021ec71d Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 11:59:28 2011 -0500 get rid of stale code in bdb and file resources commit a43a9029fba21dcaf911d17db8cbe352887b812c Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 11:57:18 2011 -0500 add trivial timing to simpletest ----------------------------------------------------------------------- Summary of changes: code/src/aesop/resource.c | 10 ++++++---- code/src/common/resources/timer/timer.c | 8 ++++++++ code/src/kv/kv.c | 14 ++++++++------ code/src/kv/kv.h | 2 +- code/src/kv/test/simpletest.c | 20 +++++++++++++++++--- .../prototype/bdb-resource/bdb-resource.c | 17 +++++------------ .../prototype/file-resource/file-resource.c | 17 +++++------------ 7 files changed, 50 insertions(+), 38 deletions(-) Diff of changes: diff --git a/code/src/aesop/resource.c b/code/src/aesop/resource.c index d924252..adbaa7a 100644 --- a/code/src/aesop/resource.c +++ b/code/src/aesop/resource.c @@ -304,6 +304,8 @@ void ae_backtrace(void) #include <assert.h> +#define AE_PIPE_READ_SIZE 128 + triton_ret_t ae_poll(ae_context_t context, int millisecs) { triton_ret_t tret; @@ -366,14 +368,14 @@ triton_ret_t ae_poll(ae_context_t context, int millisecs) /* poll each resource that needs attention */ for(i=0; i<event_count; i++) { - char onebyte; + char pipebuf[AE_PIPE_READ_SIZE]; poll_data = (struct ae_poll_data*)events[i].data.ptr; - /* empty the pipe */ + /* empty the pipe (short reads are ok) */ do { - ret = read(poll_data->pipe_fds[0], &onebyte, 1); - } while(ret == 1); + ret = read(poll_data->pipe_fds[0], pipebuf, AE_PIPE_READ_SIZE); + } while(ret >= 1 && ret < AE_PIPE_READ_SIZE); /* we better not get data on this pipe if the resource doesn't * provide a poll function */ diff --git a/code/src/common/resources/timer/timer.c b/code/src/common/resources/timer/timer.c index bf9cc5f..b5e0151 100644 --- a/code/src/common/resources/timer/timer.c +++ b/code/src/common/resources/timer/timer.c @@ -240,6 +240,14 @@ static void timer_notify(union sigval sv) triton_mutex_unlock(&timer_mutex); ae_opcache_complete_op(timer_opcache, op, triton_ret_t, top->tret); + + /* request poll; not because ae_poll() needs to drive any work, but + * simply because we want it to break out if any callers are blocking on + * it + */ + ae_resource_request_poll(NULL, triton_timer_resource_id); + + return; } /* diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index 71fba69..cf2f0f5 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -12,6 +12,8 @@ static char filename[] = "/tmp/mapfileXXXXXX"; #include "src/kv/kv.h" +#define KV_AE_POLL_TIMEOUT 1000 + struct completion { int done; @@ -35,9 +37,9 @@ static void write_hostfile (size_t count, int fd) } } -triton_ret_t triton_kv_server_main () +triton_ret_t triton_kv_server_main (void) { - return ae_poll(NULL, 0); + return ae_poll(NULL, KV_AE_POLL_TIMEOUT); } triton_ret_t triton_kv_init (size_t servercount, const char *kvstore) @@ -66,7 +68,7 @@ triton_ret_t triton_kv_init (size_t servercount, const char *kvstore) while(!c.done) { - ae_poll(NULL, 0); + ae_poll(NULL, KV_AE_POLL_TIMEOUT); } close (fd); @@ -98,7 +100,7 @@ triton_ret_t triton_kv_get(const char * key, void * value, while(!c.done) { - ae_poll(NULL, 0); + ae_poll(NULL, KV_AE_POLL_TIMEOUT); } return c.ret; @@ -116,7 +118,7 @@ triton_ret_t triton_kv_put(const char * key, void * value, size_t value_sz) while(!c.done) { - ae_poll(NULL, 0); + ae_poll(NULL, KV_AE_POLL_TIMEOUT); } return c.ret; @@ -134,7 +136,7 @@ triton_ret_t triton_kv_remove(const char *key) while(!c.done) { - ae_poll(NULL, 0); + ae_poll(NULL, KV_AE_POLL_TIMEOUT); } return c.ret; diff --git a/code/src/kv/kv.h b/code/src/kv/kv.h index 81101c9..63b5440 100644 --- a/code/src/kv/kv.h +++ b/code/src/kv/kv.h @@ -22,7 +22,7 @@ triton_ret_t triton_kv_remove(const char * key); /** * Worker function, to be called repeatedly for server processes. */ -triton_ret_t triton_kv_server_main (); +triton_ret_t triton_kv_server_main (void); #endif diff --git a/code/src/kv/test/simpletest.c b/code/src/kv/test/simpletest.c index 1bb939b..90db3b9 100644 --- a/code/src/kv/test/simpletest.c +++ b/code/src/kv/test/simpletest.c @@ -1,11 +1,18 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <sys/time.h> #include "test-common.h" #include "src/kv/kv.h" static size_t LOOPS = 1024; +static double wtime(void) +{ + struct timeval t; + gettimeofday(&t, NULL); + return((double)t.tv_sec + (double)t.tv_usec / 1000000.0); +} static void write0 (const char * str, ...) { @@ -31,22 +38,26 @@ static void simpletest () size_t data2size; size_t keysize; size_t i; + double start, end; write0 ("Simple basic functionality test of KV API... \n"); write0v ( "Testing if kv_put works... "); + start = wtime(); for (i=0; i<LOOPS; ++i) { generateKV (0, i, &key[0], sizeof(key), &keysize, &data[0], sizeof(data)); check_triton_ret (triton_kv_put (&key[0], &data[0], sizeof(data))); //write0v ("%d out of %d kv_put() succeeded.\n", i+1, LOOPS); } + end = wtime(); - write0v ( "done\n"); + write0v ( "done (%f seconds)\n", end-start); write0 ( "Testing if kv_get works... "); + start = wtime(); for (i=0; i<LOOPS; ++i) { generateKV (0, i, &key[0], sizeof(key), &keysize, &data[0], sizeof(data)); @@ -61,11 +72,13 @@ static void simpletest () fprintf (stderr, "kv_get returned incorrect data\n"); } } + end = wtime(); - write0v ( "done\n"); + write0v ( "done (%f seconds)\n", end-start); write0v ( "Testing if kv_remove works... "); + start = wtime(); for (i=0; i<LOOPS; ++i) { generateKV (0, i, &key[0], sizeof(key), &keysize, &data[0], sizeof(data)); @@ -84,8 +97,9 @@ static void simpletest () fprintf (stderr, "triton_kv_get retrieved nonexistent key (or delete failed)\n"); } } + end = wtime(); - write0v ( "done!\n"); + write0v ( "done (%f seconds)\n", end-start); } int main (int argc, char ** args) diff --git a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c b/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c index da1313f..32ebbcc 100644 --- a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c +++ b/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c @@ -35,13 +35,6 @@ static int triton_bdb_resource_id; static enum bdb_progress_mode triton_bdb_progress_mode = TRITON_BDB_PROG_NONE; static triton_debug_mask_t bdb_r_mask; -/* counter used by poll function in thread-per-op case to know if ops have - * finished since last poll - */ -static int completed_counter = 0; -static triton_mutex_t completed_counter_mutex = TRITON_MUTEX_INITIALIZER; -static triton_cond_t completed_counter_cond = TRITON_COND_INITIALIZER; - static unsigned long deadlock_counter = 0; #define BDB_CONFKEY_PREFIX "triton.bdb" @@ -169,11 +162,11 @@ static void* thread_fn(void* foo) /* trigger completion of the operation */ ae_opcache_complete_op(bdb_opcache, op, triton_ret_t, b_op->return_code); - /* wake up any pollers */ - triton_mutex_lock(&completed_counter_mutex); - completed_counter++; - triton_cond_signal(&completed_counter_cond); - triton_mutex_unlock(&completed_counter_mutex); + /* request poll; not because ae_poll() needs to drive any work, but + * simply because we want it to break out if any callers are blocking on + * it + */ + ae_resource_request_poll(NULL, triton_bdb_resource_id); return(NULL); } diff --git a/code/src/versioned-osd/prototype/file-resource/file-resource.c b/code/src/versioned-osd/prototype/file-resource/file-resource.c index 98c43fd..19f672a 100644 --- a/code/src/versioned-osd/prototype/file-resource/file-resource.c +++ b/code/src/versioned-osd/prototype/file-resource/file-resource.c @@ -37,13 +37,6 @@ static int triton_file_resource_id; static enum file_progress_mode triton_file_progress_mode = TRITON_FILE_PROG_NONE; static triton_debug_mask_t file_r_mask; -/* counter used by poll function in thread-per-op case to know if ops have - * finished since last poll - */ -static int completed_counter = 0; -static triton_mutex_t completed_counter_mutex = TRITON_MUTEX_INITIALIZER; -static triton_cond_t completed_counter_cond = TRITON_COND_INITIALIZER; - #define FILE_CONFKEY_PREFIX "triton.file" static const char *progress_mode_confkey = FILE_CONFKEY_PREFIX ".progress_mode"; @@ -132,11 +125,11 @@ static void* thread_fn(void* foo) /* trigger completion of the operation */ ae_opcache_complete_op(file_opcache, op, triton_ret_t, f_op->return_code); - /* wake up any pollers */ - triton_mutex_lock(&completed_counter_mutex); - completed_counter++; - triton_cond_signal(&completed_counter_cond); - triton_mutex_unlock(&completed_counter_mutex); + /* request poll; not because ae_poll() needs to drive any work, but + * simply because we want it to break out if any callers are blocking on + * it + */ + ae_resource_request_poll(NULL, triton_file_resource_id); return(NULL); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. b533ceaa176e5d87914162a45928594dfb6c4367
by noreply＠mcs.anl.gov 27 Jan '11

27 Jan '11

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 b533ceaa176e5d87914162a45928594dfb6c4367 (commit) from 8ad563938fa44137f6fec1ea2286d659eccb0df3 (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 b533ceaa176e5d87914162a45928594dfb6c4367 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Thu Jan 27 10:17:45 2011 -0600 Fix notes ----------------------------------------------------------------------- Summary of changes: code/src/mapping/mapping.ae | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/mapping/mapping.ae b/code/src/mapping/mapping.ae index e1b700e..0f4c2bb 100644 --- a/code/src/mapping/mapping.ae +++ b/code/src/mapping/mapping.ae @@ -6,7 +6,7 @@ #include "src/mapping/mapping.hae" /** - List of triton_place_mapping_t + List of triton_map_t */ static triton_list_t triton_map; @@ -197,6 +197,7 @@ triton_ret_t triton_map_contains(triton_node_t node, } /** + Obtain internal list of triton_map_t Return a pointer to the map The caller should not modify this list */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 8ad563938fa44137f6fec1ea2286d659eccb0df3
by noreply＠mcs.anl.gov 27 Jan '11

27 Jan '11

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 8ad563938fa44137f6fec1ea2286d659eccb0df3 (commit) via 59c53ef43ab10b0758af2b78418387d8b7b04cb3 (commit) via 809d0c5a3ebc55926a385e134bbd01b2fffc51f7 (commit) from fc66e9a19c87fc70e136072713bd7a6e93d72411 (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 8ad563938fa44137f6fec1ea2286d659eccb0df3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 11:05:15 2011 -0500 switch some mapping printf()'s to triton_debug() commit 59c53ef43ab10b0758af2b78418387d8b7b04cb3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 10:56:04 2011 -0500 add runtime substitutions to debug file param commit 809d0c5a3ebc55926a385e134bbd01b2fffc51f7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 10:40:20 2011 -0500 fix build error ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-debug.c | 53 ++++++++++++++++++- code/src/mapping/mapping.ae | 4 +- code/src/remote/client-server.aer | 2 + code/src/replicated-osd/tests/rosd-create-bench.ae | 8 --- 4 files changed, 54 insertions(+), 13 deletions(-) Diff of changes: diff --git a/code/src/common/triton-debug.c b/code/src/common/triton-debug.c index 378c196..766c3b7 100644 --- a/code/src/common/triton-debug.c +++ b/code/src/common/triton-debug.c @@ -1,11 +1,13 @@ +#include <limits.h> +#include <stdio.h> +#include <sys/types.h> +#include <unistd.h> #include "src/common/triton-debug.h" #include "src/common/triton-hash.h" #include "src/common/triton-init.h" #include "src/zeroconf/zeroconf.h" -#include <stdio.h> - static struct triton_hash_table *triton_debug_mask_table = NULL; static triton_list_t allocated_masks; @@ -14,6 +16,9 @@ uint32_t triton_debug_enabled_all = 0; uint32_t triton_debug_enabled_none = 1; TRITON_BITARRAY_VARDEF(triton_debug_enabled_minor, TRITON_DEBUG_MAXSIZE); +/* TODO: configure test for this; probably glibc specific */ +extern char* __progname_full; + static FILE *triton_debug_fp = NULL; static char *triton_debug_enabled_str = NULL; @@ -312,6 +317,12 @@ void triton_debug_print(triton_debug_mask_t mask, const char *message, va_list a static triton_ret_t triton_debug_setfile(const char *file) { + char target[PATH_MAX] = {0}; + char hostname[512] = {0}; + int i = 0; + int j = 0; + int pid; + if(triton_debug_fp != NULL && triton_debug_fp != stderr && triton_debug_fp != stdout) { fclose(triton_debug_fp); @@ -330,7 +341,43 @@ static triton_ret_t triton_debug_setfile(const char *file) } else { - triton_debug_fp = fopen(file, "w"); + for(i=0; i<strlen(file); i++) + { + if(file[i] != '%') + { + target[j] = file[i]; + j++; + } + else + { + switch(file[i+1]) + { + case 'p': + pid = getpid(); + j += sprintf(&target[j], "%d", pid); + i++; + break; + case 'e': + j += sprintf(&target[j], "%s", __progname_full); + i++; + break; + case 'h': + gethostname(hostname, 512); + j += sprintf(&target[j], "%s", hostname); + i++; + break; + default: + /* we don't understand this identifier; pass it + * along + */ + target[j] = file[i]; + j++; + break; + } + } + } + + triton_debug_fp = fopen(target, "w"); } if(!triton_debug_fp) diff --git a/code/src/mapping/mapping.ae b/code/src/mapping/mapping.ae index 4f16d16..e1b700e 100644 --- a/code/src/mapping/mapping.ae +++ b/code/src/mapping/mapping.ae @@ -20,7 +20,7 @@ static void destroy_map(void); triton_ret_t triton_map_init() { - // triton_debug_add_mask("triton.mapping.xyq", &debug); + triton_debug_add_mask("triton.mapping", &debug); self = triton_node_null; triton_list_init(&triton_map); } @@ -214,7 +214,7 @@ void triton_map_dump_nodes(int count, const triton_node_t *nodes) { node = nodes[i]; triton_node_to_string(node, &s); - printf("node: %s\n", triton_string_get(&s)); + triton_debug(debug, "node: %s\n", triton_string_get(&s)); triton_string_destroy(&s); } } diff --git a/code/src/remote/client-server.aer b/code/src/remote/client-server.aer index c84fdc4..ccb1f35 100644 --- a/code/src/remote/client-server.aer +++ b/code/src/remote/client-server.aer @@ -5,7 +5,9 @@ #include "mpi.h" #include "src/remote/message.hae" #include "src/remote/service.hae" +#if 0 #include "src/remote/client-server-shutdown.haer" +#endif #include "src/remote/client_server_shutdown_module.h" diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index c997363..3fcfbc6 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -433,14 +433,6 @@ int main(int argc, char *argv[]) char rank_suffix[10]; int i; int provided; -#if 0 - int mypid; - char env_var[128]; - - mypid = getpid(); - sprintf(env_var, "triton_debug_file=rosd-create-bench-%d.log", mypid); - putenv(env_var); -#endif mpi_ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &provided); assert(mpi_ret == MPI_SUCCESS); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. fc66e9a19c87fc70e136072713bd7a6e93d72411
by noreply＠mcs.anl.gov 27 Jan '11

27 Jan '11

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 fc66e9a19c87fc70e136072713bd7a6e93d72411 (commit) from 5c2a06c18e4f980a98bea0a779db627f2e9a8b7e (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 fc66e9a19c87fc70e136072713bd7a6e93d72411 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 27 09:56:30 2011 -0500 stub for remote immed completion test, not working ----------------------------------------------------------------------- Summary of changes: code/src/aesop/parser/tests/remote/module.mk.in | 9 ++ .../parser/tests/remote/test-remote-mpi-immed.aer | 106 ++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) create mode 100644 code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer Diff of changes: diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index 50c6e41..fa66988 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -27,6 +27,15 @@ MODLDFLAGS_$(DIR)/test-remote-mpi = $(MPILDFLAGS) MODLIBS_$(DIR)/test-remote-mpi = $(MPILIBS) MODCC_$(DIR)/test-remote-mpi = $(MPICC) +REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_mpi_immed +REMOTE_TESTMODSRC_$(DIR)/test_remote_mpi-immed := $(DIR)/test-remote-mpi-immed.aer +REMOTE_TESTSRC += $(DIR)/test-remote-mpi-immed.aer + +MODCFLAGS_$(DIR)/test-remote-mpi-immed = $(MPICFLAGS) +MODLDFLAGS_$(DIR)/test-remote-mpi-immed = $(MPILDFLAGS) +MODLIBS_$(DIR)/test-remote-mpi-immed = $(MPILIBS) +MODCC_$(DIR)/test-remote-mpi-immed = $(MPICC) + REMOTE_TESTLIB_MODULES += $(DIR)/test_remote_fault REMOTE_TESTMODSRC_$(DIR)/test_remote_fault := $(DIR)/test-remote-fault-injector.aer REMOTE_TESTSRC += $(DIR)/test-remote-fault-injector.aer diff --git a/code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer b/code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer new file mode 100644 index 0000000..519731e --- /dev/null +++ b/code/src/aesop/parser/tests/remote/test-remote-mpi-immed.aer @@ -0,0 +1,106 @@ +#include <unistd.h> + +#include "src/common/triton-types.h" +#include "src/aesop/hints.h" +#include "src/aesop/aesop.h" +#include "src/remote/encoding.h" +#include "src/remote/remote.hae" +#include "src/net/triton-message.hae" +#include "src/net/triton-message-method.hae" +#include "src/net/mock/mock-method.h" +#include "src/common/resources/scheduling/sched.hae" +#include "src/common/resources/timer/timer.hae" +#include "src/zeroconf/zeroconf.h" +#include "src/net/mpi/mpi.hae" +#include "src/net/mpi/mpi-method.h" + +#include "src/remote/service.hae" +#include "src/common/triton-init.h" + + +/* normally you don't have to declare this, but we do here because + * it gets declared in <module>_module.h (myclientserver_module.h) + * which is generated by this source file. + */ +triton_ret_t aer_remote_register_test_remote_mpi_immed(void); + +#include "mpi.h" + +__remote __blocking triton_ret_t test_fn(triton_ignore_t* in, triton_ignore_t* out); + +__remote __blocking triton_ret_t test_fn(triton_ignore_t* in, triton_ignore_t* out) +{ + triton_ret_t tret; + + tret = triton_timer(10); + printf("finished timer.\n"); + + return(tret); +} + +__blocking void do_remote_test(aer_remote_ctx_t rctx) +{ + triton_ret_t ret; + int32_t result; + int rank; + const char* svr = "mpi://1"; + triton_addr_t n1; + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if(rank == 0) + { + /* need a good way to wait for all the processes, so that + * we know the aer_service_requests calls have been started + * and will be able to receive messages. For now, we just sleep + * for a sec. + */ + ret = triton_timer(1000); + triton_error_assert(ret); + +#if 0 + /* must set the remote context as a hint because we're about to call + * test_fn as a local call + */ + ret = aesop_hints_put("triton.remote.context", sizeof(rctx), &rctx); + triton_error_assert(ret); +#endif + + ret = triton_addr_lookup(svr, &n1); + assert(rctx != NULL); + ret = remote_test_fn(rctx, n1, NULL, NULL); + triton_error_assert(ret); + printf("FINAL RESULT: %d\n", result); + + } + else + { + /* service a single request */ + assert(rctx != NULL); + ret = aer_service_requests(rctx, 1); + } +} + +__blocking int aesop_main(int argc, char **argv) +{ + triton_ret_t ret; + ae_op_id_t op_id; + + ret = aer_remote_register_test_remote_mpi_immed(); + triton_error_assert(ret); + + do_remote_test(AER_DEFAULT_CTX); + + return 0; +} +aesop_main_set(aesop_main, "mpi", "sched", "timer"); + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ts=8 sts=4 sw=4 expandtab + */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5c2a06c18e4f980a98bea0a779db627f2e9a8b7e
by noreply＠mcs.anl.gov 26 Jan '11

26 Jan '11

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 5c2a06c18e4f980a98bea0a779db627f2e9a8b7e (commit) from cb283c1060bb0c176abc694ca89b803ca898fd7b (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 5c2a06c18e4f980a98bea0a779db627f2e9a8b7e Author: slang <slang(a)mcs.anl.gov> Date: Wed Jan 26 17:08:09 2011 -0600 haer file not needed, stubs header suffices for clients. ----------------------------------------------------------------------- Summary of changes: code/src/remote/client-server-shutdown.aer | 15 ++++++++++++++- code/src/remote/client-server-shutdown.haer | 21 --------------------- 2 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 code/src/remote/client-server-shutdown.haer Diff of changes: diff --git a/code/src/remote/client-server-shutdown.aer b/code/src/remote/client-server-shutdown.aer index 8469d55..4711cb4 100644 --- a/code/src/remote/client-server-shutdown.aer +++ b/code/src/remote/client-server-shutdown.aer @@ -1,5 +1,18 @@ -#include "src/remote/client-server-shutdown.haer" + +#include "src/common/triton-types.h" +#include "src/aesop/aesop.h" +#include "src/aesop/hints.h" +#include "src/remote/encoding.h" +#include "src/remote/remote.hae" +#include "src/net/triton-addr.h" +#include "src/net/triton-message.hae" +#include "src/net/triton-message-method.hae" +#include "src/net/mock/mock-method.h" +#include "src/common/resources/scheduling/sched.hae" +#include "src/common/resources/timer/timer.hae" +#include "src/zeroconf/zeroconf.h" +#include "src/remote/service.hae" __remote __blocking triton_ret_t triton_server_shutdown(uint32_t in, uint32_t *out) { diff --git a/code/src/remote/client-server-shutdown.haer b/code/src/remote/client-server-shutdown.haer deleted file mode 100644 index 29497e1..0000000 --- a/code/src/remote/client-server-shutdown.haer +++ /dev/null @@ -1,21 +0,0 @@ - -#ifndef __CLIENT_SERVER_SHUTDOWN_HAER__ -#define __CLIENT_SERVER_SHUTDOWN_HAER__ - -#include "src/common/triton-types.h" -#include "src/aesop/aesop.h" -#include "src/aesop/hints.h" -#include "src/remote/encoding.h" -#include "src/remote/remote.hae" -#include "src/net/triton-addr.h" -#include "src/net/triton-message.hae" -#include "src/net/triton-message-method.hae" -#include "src/net/mock/mock-method.h" -#include "src/common/resources/scheduling/sched.hae" -#include "src/common/resources/timer/timer.hae" -#include "src/zeroconf/zeroconf.h" -#include "src/remote/service.hae" - -__remote __blocking triton_ret_t triton_server_shutdown(uint32_t in, uint32_t *out); - -#endif hooks/post-receive -- Triton Repository

1 0