December 2010 - Triton-commits - mailman3.cels.anl.gov

Triton Repository branch, master, updated. 3c4cc82b544b8b6119bc8457a99dbec6fd11b890
by noreply＠mcs.anl.gov 30 Dec '10

30 Dec '10

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 3c4cc82b544b8b6119bc8457a99dbec6fd11b890 (commit) via 4999eed431e070e88a16d03769a3be82b1ba84f1 (commit) from 741635db71188297ad8362aa3b40e4ac7c688988 (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 3c4cc82b544b8b6119bc8457a99dbec6fd11b890 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Thu Dec 30 00:41:05 2010 -0600 Add test rpc-list (mostly works) commit 4999eed431e070e88a16d03769a3be82b1ba84f1 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Thu Dec 30 00:40:11 2010 -0600 Implement sc_list ----------------------------------------------------------------------- Summary of changes: code/src/state/state-client.aer | 22 ++++++++---------- code/src/state/state-client.haer | 6 +--- code/src/state/test/module.mk.in | 6 +--- code/src/state/test/{rpc-global.ae => rpc-list.ae} | 23 +++++++++---------- 4 files changed, 25 insertions(+), 32 deletions(-) copy code/src/state/test/{rpc-global.ae => rpc-list.ae} (87%) Diff of changes: diff --git a/code/src/state/state-client.aer b/code/src/state/state-client.aer index 630babe..ffa332c 100644 --- a/code/src/state/state-client.aer +++ b/code/src/state/state-client.aer @@ -64,26 +64,24 @@ __attribute__((constructor)) void triton_state_client_init_register(void) state_client_init, state_client_finalize, NULL); } -/** - Copied from rosd_create(), rosd_read() -*/ -/* __remote __blocking triton_ret_t state_client_list( int32_t* in_nothing, - struct state_client_list_resp* resp - // struct state_client_read_resp* resp - ) + struct sc_list *list) { - triton_ret_t tret; + triton_ret_t ret; triton_node_t *result; + triton_buffer_t *buffer; + int max; - tret = TRITON_SUCCESS; + buffer = &list->buffer; - triton_state.list(result); + max = triton_state.size(); + triton_buffer_alloc(buffer, max*sizeof(triton_node_t)); + result = (triton_node_t *)(buffer->buffer); + ret = triton_state.list(result); - return(tret); + return TRITON_SUCCESS; } -*/ __remote __blocking triton_ret_t state_client_size( int32_t* in_nothing, diff --git a/code/src/state/state-client.haer b/code/src/state/state-client.haer index 962f51a..e6c0478 100644 --- a/code/src/state/state-client.haer +++ b/code/src/state/state-client.haer @@ -12,7 +12,7 @@ __remote struct sc_list { - triton_addr_t *addrs; + triton_buffer_t buffer; }; __remote struct sc_lookup_pair @@ -31,11 +31,9 @@ __remote struct sc_lookup_value /** * Obtain the state.list() */ -/* __remote __blocking triton_ret_t state_client_list( int32_t* in_nothing, - struct state_client_list_resp* resp); -*/ + struct sc_list* list); __remote __blocking triton_ret_t state_client_size( int32_t* in_nothing, diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index 86af32a..53d319a 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -7,6 +7,7 @@ STATE_TEST_SRC += $(DIR)/post-global.ae STATE_TEST_SRC += $(DIR)/engine1.ae STATE_TEST_SRC += $(DIR)/rpc-size.ae STATE_TEST_SRC += $(DIR)/rpc-global.ae +STATE_TEST_SRC += $(DIR)/rpc-list.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) @@ -21,6 +22,7 @@ STATE_TEST_RESULTS += $(DIR)/post-global.result STATE_TEST_RESULTS += $(DIR)/engine1.result STATE_TEST_RESULTS += $(DIR)/rpc-size.result STATE_TEST_RESULTS += $(DIR)/rpc-global.result +STATE_TEST_RESULTS += $(DIR)/rpc-list.result TEST_RESULTS += $(STATE_TEST_RESULTS) @@ -49,7 +51,3 @@ MODLDFLAGS_$(DIR)/engine1 = $(MPILDFLAGS) MODLIBS_$(DIR)/engine1 = $(MPILIBS) MODCC_$(DIR)/engine1 = $(MPICC) -MODCFLAGS_$(DIR)/rosd-create-bench = $(MPICFLAGS) -MODLDFLAGS_$(DIR)/rosd-create-bench = $(MPILDFLAGS) -MODLIBS_$(DIR)/rosd-create-bench = $(MPILIBS) -MODCC_$(DIR)/rosd-create-bench = $(MPICC) diff --git a/code/src/state/test/rpc-global.ae b/code/src/state/test/rpc-list.ae similarity index 87% copy from code/src/state/test/rpc-global.ae copy to code/src/state/test/rpc-list.ae index 891e1c9..a1df632 100644 --- a/code/src/state/test/rpc-global.ae +++ b/code/src/state/test/rpc-list.ae @@ -29,13 +29,13 @@ static __blocking void doclienttest(void) triton_addr_t server; int dummy = 0; int size = 0; - int *t; + triton_node_t *nodes; struct sc_lookup_pair pair; triton_string_t key; triton_buffer_t buffer; - struct sc_lookup_value value; + struct sc_list value; triton_addr_lookup("mpi://0", &server); @@ -43,16 +43,15 @@ static __blocking void doclienttest(void) printf("CLIENT\n"); - remote_state_client_size(AER_DEFAULT_CTX, server, &dummy, &size); + remote_state_client_size(AER_DEFAULT_CTX, server, + &dummy, &size); - pair.node_u = &triton_node_null.u; - pair.node_l = &triton_node_null.l; - triton_string_init(&pair.key, "sample"); - remote_state_client_lookup(AER_DEFAULT_CTX, server, - &pair, &value); - t = (int *)value.buffer.buffer; + remote_state_client_list(AER_DEFAULT_CTX, server, + &dummy, &value); + + nodes = (triton_node_t *)(value.buffer.buffer); + triton_map_dump_nodes(2, nodes); - printf("client: value: %i\n", *t); return; } @@ -76,7 +75,7 @@ static __blocking void sender(triton_string_t *key) value = malloc(sizeof(int)); *value = 34; - triton_state.post(triton_node_null, key, value, sizeof(value)); + triton_state.post(triton_node_null, key, value, sizeof(int)); } static __blocking void doservertest(void) @@ -124,7 +123,7 @@ static __blocking int doserver() } pbranch { - triton_timer(10000); + triton_timer(12000); printf("stop service engine\n"); aer_service_engine_stop(); printf("stop state engine\n"); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 741635db71188297ad8362aa3b40e4ac7c688988
by noreply＠mcs.anl.gov 29 Dec '10

29 Dec '10

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 741635db71188297ad8362aa3b40e4ac7c688988 (commit) via ccaae7b3ac18a0ccf86818f37c05914b2cc8b183 (commit) from 51a6cc4c4edcd8f57d497de629834b55fb2edeb4 (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 741635db71188297ad8362aa3b40e4ac7c688988 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Wed Dec 29 16:56:55 2010 -0600 Actual state client lookup often works commit ccaae7b3ac18a0ccf86818f37c05914b2cc8b183 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Wed Dec 29 16:53:15 2010 -0600 Add extra length parameter to fakess items ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 20 ++++++++++------- code/src/fakess/fakess.hae | 3 +- code/src/fakess/test/local.ae | 2 +- code/src/state/state-client.aer | 28 ++++++++++++++++++++++++ code/src/state/state-client.haer | 42 +++++++++++++++++++++++++++++++----- code/src/state/state.hae | 4 ++- code/src/state/test/local.ae | 2 +- code/src/state/test/rpc-global.ae | 29 ++++++++++++++++++------- code/src/state/test/rpc-global.sh | 4 ++- 9 files changed, 107 insertions(+), 27 deletions(-) Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index c334dd3..913072d 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -359,14 +359,17 @@ triton_ret_t triton_fakess_item_add(triton_node_t node, } /** - Assist triton_fakess_set() + Assist triton_fakess_set() - mutex already locked */ -static void update(triton_state_data_t *data, void *value) +static void update(triton_state_data_t *data, + void *value, + int value_length) { if (data->value && data->value != TRITON_FAKESS_UNSET) free(data->value); data->value = value; + data->size = value_length; } /** @@ -374,7 +377,8 @@ static void update(triton_state_data_t *data, void *value) Should be private, exposed for local.ae test */ triton_ret_t triton_fakess_set(triton_state_data_t *data, - void *value) + void *value, + int value_length) { /* triton_debug(debug, "set key: %s\n", @@ -383,7 +387,7 @@ triton_ret_t triton_fakess_set(triton_state_data_t *data, triton_mutex_lock(&data->mutex); - update(data, value); + update(data, value, value_length); triton_sched_notify_all(data->sched); triton_mutex_unlock(&data->mutex); @@ -479,7 +483,7 @@ __blocking triton_ret_t triton_fakess_post(triton_node_t node, data = triton_fakess_lookup(node, key); assert(data); - triton_fakess_set(data, value); + triton_fakess_set(data, value, value_length); triton_fakess_broadcast(tag, buffer, buffer_length); @@ -500,7 +504,7 @@ static triton_string_t *triton_string_malloc(char *string) } static void post_localupdate(triton_node_t node, triton_string_t *key, - void *value) + void *value, int size) { triton_state_data_t *data = triton_fakess_lookup(node, key); triton_ret_t error; @@ -522,7 +526,7 @@ static void post_localupdate(triton_node_t node, triton_string_t *key, data = triton_fakess_lookup(node, key); assert(data); } - triton_fakess_set(data, value); + triton_fakess_set(data, value, size); } static void process_post(char *buffer, int p, triton_addr_t from) @@ -554,7 +558,7 @@ static void process_post(char *buffer, int p, triton_addr_t from) q = strchr(args, '\n'); memcpy(value, q+1, length); - post_localupdate(node, &key, value); + post_localupdate(node, &key, value, length); triton_string_destroy(&key); } diff --git a/code/src/fakess/fakess.hae b/code/src/fakess/fakess.hae index a08c7b7..8043f54 100644 --- a/code/src/fakess/fakess.hae +++ b/code/src/fakess/fakess.hae @@ -67,7 +67,8 @@ triton_ret_t triton_fakess_item_add(triton_node_t node, triton_string_t *key); triton_ret_t triton_fakess_set(triton_state_data_t *data, - void *value); + void *value, + int value_length); __blocking triton_ret_t triton_fakess_post(triton_node_t node, triton_string_t *key, diff --git a/code/src/fakess/test/local.ae b/code/src/fakess/test/local.ae index a7cf968..b768030 100644 --- a/code/src/fakess/test/local.ae +++ b/code/src/fakess/test/local.ae @@ -41,7 +41,7 @@ static __blocking int dostuff(void) triton_timer(1000); printf("setter: setting...\n"); data = triton_fakess_lookup(triton_node_null, &key); - error = triton_fakess_set(data, value); + error = triton_fakess_set(data, value, 128); printf("setter: set.\n"); } else diff --git a/code/src/state/state-client.aer b/code/src/state/state-client.aer index 85f9b26..630babe 100644 --- a/code/src/state/state-client.aer +++ b/code/src/state/state-client.aer @@ -67,6 +67,7 @@ __attribute__((constructor)) void triton_state_client_init_register(void) /** Copied from rosd_create(), rosd_read() */ +/* __remote __blocking triton_ret_t state_client_list( int32_t* in_nothing, struct state_client_list_resp* resp @@ -82,6 +83,7 @@ __remote __blocking triton_ret_t state_client_list( return(tret); } +*/ __remote __blocking triton_ret_t state_client_size( int32_t* in_nothing, @@ -91,6 +93,32 @@ __remote __blocking triton_ret_t state_client_size( return TRITON_SUCCESS; } +__remote __blocking triton_ret_t state_client_lookup( + struct sc_lookup_pair *pair, + struct sc_lookup_value *value) +{ + triton_buffer_t *buffer; + triton_node_t node; + triton_state_data_t *data; + + buffer = &value->buffer; + value = malloc(sizeof(struct sc_lookup_value)); + + printf("remote_lookup: node: %lu.%lu\n", node.u, node.l); + printf("remote_lookup: key: %s\n", + triton_string_get(&pair->key)); + + node.u = *pair->node_u; + node.l = *pair->node_l; + data = triton_state.lookup(node, &pair->key); + + printf("remote_lookup: value: %i\n", *(int*)(data->value)); + + triton_buffer_alloc(buffer, data->size); + memcpy(buffer->buffer, data->value, data->size); + + return TRITON_SUCCESS; +} /* * Local variables: diff --git a/code/src/state/state-client.haer b/code/src/state/state-client.haer index 1ac2439..962f51a 100644 --- a/code/src/state/state-client.haer +++ b/code/src/state/state-client.haer @@ -3,25 +3,55 @@ #define STATE_CLIENT_HAER #include "src/aesop/aesop.h" +#include "src/common/triton-buffer.h" #include "src/common/triton-error.h" +#include "src/common/triton-string.h" +#include "src/mapping/node.h" #include "src/net/triton-addr.h" #include "src/remote/encoding.h" -__remote struct state_client_list_resp +__remote struct sc_list { triton_addr_t *addrs; }; +__remote struct sc_lookup_pair +{ + // triton_node_t *node; + int64_t *node_u; + int64_t *node_l; + triton_string_t key; +}; + +__remote struct sc_lookup_value +{ + triton_buffer_t buffer; +}; + /** * Obtain the state.list() */ +/* __remote __blocking triton_ret_t state_client_list( - int32_t* in_nothing, - struct state_client_list_resp* resp -); + int32_t* in_nothing, + struct state_client_list_resp* resp); +*/ __remote __blocking triton_ret_t state_client_size( - int32_t* in_nothing, - int32_t* out_size); + int32_t* in_nothing, + int32_t* out_size); + +__remote __blocking triton_ret_t state_client_lookup( + struct sc_lookup_pair *pair, + struct sc_lookup_value *value); #endif + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ts=8 sts=4 sw=4 expandtab + */ diff --git a/code/src/state/state.hae b/code/src/state/state.hae index 015f20d..ce0a7c1 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -24,6 +24,7 @@ typedef struct { triton_string_t key; void *value; + int size; triton_mutex_t mutex; triton_sched_t sched; struct triton_hash_link link; @@ -57,7 +58,8 @@ struct triton_state_funcs triton_string_t *key); triton_ret_t (*set)(triton_state_data_t *data, - void *value); + void *value, + int value_length); __blocking triton_ret_t (*post)(triton_node_t node, triton_string_t *key, diff --git a/code/src/state/test/local.ae b/code/src/state/test/local.ae index 1f2c535..e36a63f 100644 --- a/code/src/state/test/local.ae +++ b/code/src/state/test/local.ae @@ -42,7 +42,7 @@ static __blocking int dostuff(void) triton_timer(1000); printf("setter: setting...\n"); data = triton_state.lookup(triton_node_null, &key); - error = triton_state.set(data, value); + error = triton_state.set(data, value, 128); printf("setter: set.\n"); } else diff --git a/code/src/state/test/rpc-global.ae b/code/src/state/test/rpc-global.ae index a9ceec1..891e1c9 100644 --- a/code/src/state/test/rpc-global.ae +++ b/code/src/state/test/rpc-global.ae @@ -1,7 +1,7 @@ /** state rpc-global - Start state.engine, post something, let client read it + Start state.engine, post something, let clients query it usage: mpiexec -l -n 4 rpc-size hosts2.txt (uses 2 servers and 2 clients) @@ -10,7 +10,7 @@ #include <stdbool.h> #include <stdio.h> #include "src/aesop/aesop.h" -#include "src/common/triton-notify.h" +#include "src/common/triton-buffer.h" #include "src/common/resources/timer/timer.hae" #include "src/net/mpi/mpi.hae" #include "src/fakess/fakess.hae" @@ -29,15 +29,30 @@ static __blocking void doclienttest(void) triton_addr_t server; int dummy = 0; int size = 0; + int *t; + + struct sc_lookup_pair pair; + triton_string_t key; + triton_buffer_t buffer; + + struct sc_lookup_value value; triton_addr_lookup("mpi://0", &server); + triton_timer(6000-rank*1000); + printf("CLIENT\n"); remote_state_client_size(AER_DEFAULT_CTX, server, &dummy, &size); - printf("size: %i\n", size); + pair.node_u = &triton_node_null.u; + pair.node_l = &triton_node_null.l; + triton_string_init(&pair.key, "sample"); + remote_state_client_lookup(AER_DEFAULT_CTX, server, + &pair, &value); + t = (int *)value.buffer.buffer; + printf("client: value: %i\n", *t); return; } @@ -66,7 +81,6 @@ static __blocking void sender(triton_string_t *key) static __blocking void doservertest(void) { - printf("servertest\n"); triton_string_t key; triton_string_init(&key, "sample"); @@ -88,8 +102,8 @@ static __blocking void doservertest(void) static __blocking int doserver() { triton_ret_t ret; - printf("SERVER\n"); + printf("SERVER\n"); ret = aer_remote_register_sc(); triton_error_assert(ret); assert(AER_DEFAULT_CTX); @@ -110,14 +124,13 @@ static __blocking int doserver() } pbranch { - triton_timer(3000); + triton_timer(10000); printf("stop service engine\n"); aer_service_engine_stop(); printf("stop state engine\n"); triton_state.engine_stop(); } } - return 0; } @@ -144,7 +157,7 @@ static __blocking int dostuff(char *filename) doclienttest(); } - triton_timer(10000); + triton_timer(1000); return 0; } diff --git a/code/src/state/test/rpc-global.sh b/code/src/state/test/rpc-global.sh index 58a2237..125e276 100755 --- a/code/src/state/test/rpc-global.sh +++ b/code/src/state/test/rpc-global.sh @@ -9,7 +9,9 @@ OUT=${BIN}.out mpiexec -l -n 4 ${BIN} src/mapping/test/hosts2.txt > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 -grep "size: 3" ${OUT} > /dev/null || exit 1 +LINES=$( grep "value: 34" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 5 ]] || exit 1 LINES=$( grep "done" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 51a6cc4c4edcd8f57d497de629834b55fb2edeb4
by noreply＠mcs.anl.gov 28 Dec '10

28 Dec '10

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 51a6cc4c4edcd8f57d497de629834b55fb2edeb4 (commit) via bc609fb811db4072901bf39e20e8c11fd151f4f8 (commit) via 1f7a54b5ecd20fc47f50247cce7c983dd4481efe (commit) via b9dc6d585abc467a0bbbb0a6024ff447b6023625 (commit) via 40a1bcaef48d7ac1a19d983202dc8433659906bb (commit) via 38ef96f38dae79a5f3d2d468ae116bd7a2c20671 (commit) via f6682fb175c69ff6e927da2e2bb89ea476af21e4 (commit) via df0ec180f74e7125dcdedba1a0001f1ed26e0ab0 (commit) via 6fb69b24b232bc13e44b43a8b5bdf14349140490 (commit) via 71fefc5b26785dbaedae0e0fd2a0390c7b3a2b44 (commit) via 29197b45f326dd7a7f44e5c581d6490a085724ce (commit) from 6e679ed3dc515f9b4fb886449515f4643c4cd8de (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 51a6cc4c4edcd8f57d497de629834b55fb2edeb4 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 15:28:41 2010 -0600 Pass a global in rpc-global commit bc609fb811db4072901bf39e20e8c11fd151f4f8 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 14:49:44 2010 -0600 Sketch of test that uses state.engine commit 1f7a54b5ecd20fc47f50247cce7c983dd4481efe Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 14:39:19 2010 -0600 Correct usage notes commit b9dc6d585abc467a0bbbb0a6024ff447b6023625 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 14:35:47 2010 -0600 Clean out reference code commit 40a1bcaef48d7ac1a19d983202dc8433659906bb Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 14:34:39 2010 -0600 Plug in actual call to triton_state commit 38ef96f38dae79a5f3d2d468ae116bd7a2c20671 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 14:27:01 2010 -0600 Sketch of remote state interface and test commit f6682fb175c69ff6e927da2e2bb89ea476af21e4 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 13:52:10 2010 -0600 Error checks commit df0ec180f74e7125dcdedba1a0001f1ed26e0ab0 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 12:56:43 2010 -0600 state engine test commit 6fb69b24b232bc13e44b43a8b5bdf14349140490 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 12:54:43 2010 -0600 Add engine functions to the state interface commit 71fefc5b26785dbaedae0e0fd2a0390c7b3a2b44 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 12:17:33 2010 -0600 New engine1 test commit 29197b45f326dd7a7f44e5c581d6490a085724ce Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 28 12:14:04 2010 -0600 Whitespace ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 36 ++++--- code/src/fakess/fakess.hae | 4 +- code/src/fakess/test/engine1.ae | 13 +-- .../src/fakess/test/{post-global.sh => engine1.sh} | 0 code/src/fakess/test/module.mk.in | 1 + code/src/mapping/mapping.ae | 8 ++- code/src/state/state-client.aer | 108 +------------------- code/src/state/state-client.haer | 6 +- code/src/state/state.hae | 6 +- code/src/{fakess => state}/test/engine1.ae | 33 +++---- .../test/post-global.sh => state/test/engine1.sh} | 0 code/src/state/test/module.mk.in | 9 ++- .../test/engine1.ae => state/test/rpc-global.ae} | 108 +++++++++++++------- .../state/test/{post-global.sh => rpc-global.sh} | 3 +- .../test/engine1.ae => state/test/rpc-size.ae} | 83 ++++++--------- code/src/state/test/{shutdown.sh => rpc-size.sh} | 7 +- code/src/state/test/shutdown.ae | 4 +- 17 files changed, 183 insertions(+), 246 deletions(-) copy code/src/fakess/test/{post-global.sh => engine1.sh} (100%) copy code/src/{fakess => state}/test/engine1.ae (78%) copy code/src/{fakess/test/post-global.sh => state/test/engine1.sh} (100%) copy code/src/{fakess/test/engine1.ae => state/test/rpc-global.ae} (53%) copy code/src/state/test/{post-global.sh => rpc-global.sh} (86%) copy code/src/{fakess/test/engine1.ae => state/test/rpc-size.ae} (56%) copy code/src/state/test/{shutdown.sh => rpc-size.sh} (58%) Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index ca183d9..c334dd3 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -155,18 +155,20 @@ __blocking triton_ret_t triton_fakess_init_self(void) __blocking void triton_fakess_state_install(void) { - triton_state.init_self = triton_fakess_init_self; - triton_state.list = triton_fakess_list; - triton_state.size = triton_fakess_size; - triton_state.load = triton_fakess_load_map; - triton_state.lookup = triton_fakess_lookup; - triton_state.item_add = triton_fakess_item_add; - triton_state.set = triton_fakess_set; - triton_state.post = triton_fakess_post; - triton_state.recv = triton_fakess_recv; - triton_state.running = triton_fakess_running; - triton_state.shutdown = triton_fakess_shutdown; - triton_state.finalize = triton_fakess_finalize; + triton_state.init_self = triton_fakess_init_self; + triton_state.list = triton_fakess_list; + triton_state.size = triton_fakess_size; + triton_state.load = triton_fakess_load_map; + triton_state.lookup = triton_fakess_lookup; + triton_state.item_add = triton_fakess_item_add; + triton_state.set = triton_fakess_set; + triton_state.post = triton_fakess_post; + triton_state.recv = triton_fakess_recv; + triton_state.engine_start = triton_fakess_engine_start; + triton_state.engine_stop = triton_fakess_engine_stop; + triton_state.running = triton_fakess_running; + triton_state.shutdown = triton_fakess_shutdown; + triton_state.finalize = triton_fakess_finalize; } static struct triton_state_table *lookup_node(triton_node_t node); @@ -203,6 +205,7 @@ static struct triton_state_table *lookup_node(triton_node_t node) struct triton_state_table *result = NULL; struct triton_hash_link *link; + assert(fakess_nodes); link = triton_hash_search(fakess_nodes, &node); if (link) result = triton_hash_get_entry(link, @@ -456,10 +459,11 @@ __blocking triton_ret_t triton_fakess_post(triton_node_t node, triton_state_data_t *data; char buffer[TRITON_FAKESS_SIZE_MESSAGE]; uint32_t buffer_length; - triton_msg_tag_t tag = TRITON_TAG_FAKESS; + triton_msg_tag_t tag = triton_msg_new_tag(msg_group); triton_string_t tmp; + /* if (triton_debug_enabled(debug)) { triton_node_to_string(node, &tmp); @@ -467,6 +471,7 @@ __blocking triton_ret_t triton_fakess_post(triton_node_t node, triton_string_get(&tmp), triton_string_get(key)); triton_string_destroy(&tmp); } + */ header_length = serialize_post(node, key, value_length, buffer); memcpy(buffer+header_length, value, value_length); @@ -600,7 +605,7 @@ __blocking triton_ret_t triton_fakess_recv() } else if (ret == TRITON_ERR_CANCELED) { - triton_debug(debug, "triton_fakess_recv(): canceled\n"); + // triton_debug(debug, "triton_fakess_recv(): canceled\n"); } else { @@ -714,8 +719,9 @@ __blocking triton_ret_t triton_fakess_engine_start(void) return(TRITON_SUCCESS); } -void triton_fakess_engine_stop(void) +triton_ret_t triton_fakess_engine_stop(void) { + // debug printf("fakess_engine_stop()\n"); triton_mutex_lock(&fakess_mutex); /* set a flag and signal the fakess engine to stop running */ fakess_running = false; diff --git a/code/src/fakess/fakess.hae b/code/src/fakess/fakess.hae index 7902d08..a08c7b7 100644 --- a/code/src/fakess/fakess.hae +++ b/code/src/fakess/fakess.hae @@ -76,7 +76,7 @@ __blocking triton_ret_t triton_fakess_post(triton_node_t node, __blocking triton_ret_t triton_fakess_engine_start(void); -void triton_fakess_engine_stop(void); +triton_ret_t triton_fakess_engine_stop(void); __blocking triton_ret_t triton_fakess_recv(void); @@ -89,7 +89,7 @@ triton_state_data_t *triton_fakess_item_store(struct triton_state_table *state, __blocking triton_ret_t triton_fakess_engine_start(void); -void triton_fakess_engine_stop(void); +triton_ret_t triton_fakess_engine_stop(void); bool triton_fakess_running(void); diff --git a/code/src/fakess/test/engine1.ae b/code/src/fakess/test/engine1.ae index 95765a6..1329939 100644 --- a/code/src/fakess/test/engine1.ae +++ b/code/src/fakess/test/engine1.ae @@ -30,9 +30,6 @@ static __blocking void sender() value = malloc(128); sprintf(value, "V1"); - printf("posting: %s %s\n", - triton_string_get(&key), (char *)value); - triton_fakess_item_add(triton_node_null, &key); triton_fakess_post(triton_node_null, &key, value, strlen(value)+1); @@ -51,7 +48,7 @@ static __blocking void receiver() data = triton_fakess_lookup(triton_node_null, &key); triton_string_destroy(&key); value = (char *)(data->value); - printf("value is: %s\n", value); + printf("receiver: value: %s\n", value); } static __blocking void doservertest(void) @@ -77,14 +74,14 @@ static __blocking int doserver(int srank) pbranch { doservertest(); - triton_timer(1000); } pbranch { - triton_timer(4000); + triton_timer(6000); triton_fakess_engine_stop(); } } + return 0; } @@ -104,8 +101,8 @@ static __blocking int dostuff(char *filename) triton_map_contains(self, &server); if (server) { + printf("SERVER\n"); doserver(rank); - triton_timer(1000); } else { @@ -136,8 +133,6 @@ int main(int argc, char *argv[]) triton_init("triton.keyval"); - ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &mpi_thread_level); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); if (getenv("GDB_WAIT")) diff --git a/code/src/fakess/test/post-global.sh b/code/src/fakess/test/engine1.sh similarity index 100% copy from code/src/fakess/test/post-global.sh copy to code/src/fakess/test/engine1.sh diff --git a/code/src/fakess/test/module.mk.in b/code/src/fakess/test/module.mk.in index a39c3fb..52cf4f6 100644 --- a/code/src/fakess/test/module.mk.in +++ b/code/src/fakess/test/module.mk.in @@ -15,6 +15,7 @@ AETESTSRC += $(FAKESS_TEST_SRC) FAKESS_TEST_RESULTS := FAKESS_TEST_RESULTS += $(DIR)/shutdown.result FAKESS_TEST_RESULTS += $(DIR)/post-global.result +FAKESS_TEST_RESULTS += $(DIR)/engine1.result TEST_RESULTS += $(FAKESS_TEST_RESULTS) diff --git a/code/src/mapping/mapping.ae b/code/src/mapping/mapping.ae index fa36727..bd0f5c7 100644 --- a/code/src/mapping/mapping.ae +++ b/code/src/mapping/mapping.ae @@ -59,10 +59,16 @@ triton_ret_t triton_map_file(const char *filename) triton_ret_t error; FILE *file; + assert(filename); triton_debug(debug, "mapping file: %s\n", filename); file = fopen(filename, "r"); - assert(file); + + if (!file) + { + printf("mapping: could not open: %s\n", filename); + exit(1); + } error = triton_map_read(file); triton_error_assert(error); fclose(file); diff --git a/code/src/state/state-client.aer b/code/src/state/state-client.aer index 0a460fe..85f9b26 100644 --- a/code/src/state/state-client.aer +++ b/code/src/state/state-client.aer @@ -83,112 +83,14 @@ __remote __blocking triton_ret_t state_client_list( return(tret); } -/* -__remote __blocking triton_ret_t state_client_read( - struct state_client_read_req* req, - struct state_client_read_resp* resp - ) +__remote __blocking triton_ret_t state_client_size( + int32_t* in_nothing, + int32_t* out_size) { -*/ - /* - memset(&resp->buffer, 0, sizeof(resp->buffer)); - resp->buffer.buffer = malloc(req->size); - if(!resp->buffer.buffer) - { - return(TRITON_ERR_NOMEM); - } - mem_offsets[0] = resp->buffer.buffer; - tret = vosd_read(req->oid, req->fork, mem_offsets, &req->size, 1, - &req->offset, &req->size, 1, &out_size, 0); - - if(tret == TRITON_SUCCESS) - { - /* may have been a short read, so we set the size here - resp->buffer.size = out_size; - resp->buffer.alloc_size = out_size; - } - - /* TODO: how does the buffer_t get free'd? - */ -/* - return(tret); + *out_size = triton_state.size(); + return TRITON_SUCCESS; } -*/ - -/* -__remote __blocking triton_ret_t state_client_write( - struct state_client_write_req* req, - int32_t* out_nothing - ) -{ - triton_ret_t tret; - - /* - int my_position; - triton_addr_t peer_addr; - int64_t obj_offset; - int64_t size; - int64_t out_size; - char* buffer_offsets[1]; - uint32_t replication_factor; - uint64_t txn_number; - struct trans_nr_cache_entry* entry_p; - - /* retrieve the replication factor from the object - obj_offset = 0; - buffer_offsets[0] = (char*)&replication_factor; - size = sizeof(replication_factor); - tret = vosd_read(req->oid, REP_FACTOR_FORK, buffer_offsets, - &size, 1, &obj_offset, &size, 1, &out_size, 0); - if(tret != TRITON_SUCCESS) - { - triton_log_error(triton_log_default, tret, "replication factor vosd_read()"); - return(tret); - } - if(out_size != sizeof(replication_factor)) - { - triton_crit(triton_log_default, "Error: corrupt data (short read) on replication factor fork.\n"); - return(TRITON_ERR_STATE_CLIENT_META); - } - tret = get_placement_info(req->oid, replication_factor, - &my_position, &peer_addr); - if(tret != TRITON_SUCCESS) - { - triton_log_error(triton_log_default, tret, "get_placement_info()"); - return(tret); - } - - /* this is a client request, so I better be the master. - /* TODO: need to handle this case; may have simply been a client with a - * stale node list - - assert(my_position == 0); - - /* figure out what transaction number to use - tret = trans_nr_cache_get(&entry_p, req->oid, &txn_number); - if(tret != TRITON_SUCCESS) - { - triton_log_error(triton_log_default, tret, "trans_nr_cache_get()"); - return(tret); - } - - tret = state_client_write_do_work( - req->oid, - req->fork, - req->buffer, - req->offset, - req->flags, - replication_factor, - txn_number, - my_position, - peer_addr); - - trans_nr_cache_put(entry_p); - - return(tret); - } - */ /* * Local variables: diff --git a/code/src/state/state-client.haer b/code/src/state/state-client.haer index 0b5dffb..1ac2439 100644 --- a/code/src/state/state-client.haer +++ b/code/src/state/state-client.haer @@ -17,7 +17,11 @@ __remote struct state_client_list_resp */ __remote __blocking triton_ret_t state_client_list( int32_t* in_nothing, - struct state_client_list_resp* resp + struct state_client_list_resp* resp ); +__remote __blocking triton_ret_t state_client_size( + int32_t* in_nothing, + int32_t* out_size); + #endif diff --git a/code/src/state/state.hae b/code/src/state/state.hae index 7fdb897..015f20d 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -57,7 +57,7 @@ struct triton_state_funcs triton_string_t *key); triton_ret_t (*set)(triton_state_data_t *data, - void *value); + void *value); __blocking triton_ret_t (*post)(triton_node_t node, triton_string_t *key, @@ -66,6 +66,10 @@ struct triton_state_funcs __blocking triton_ret_t (*recv)(void); + __blocking triton_ret_t (*engine_start)(void); + + triton_ret_t (*engine_stop)(void); + bool (*running)(void); __blocking triton_ret_t (*shutdown)(void); diff --git a/code/src/fakess/test/engine1.ae b/code/src/state/test/engine1.ae similarity index 78% copy from code/src/fakess/test/engine1.ae copy to code/src/state/test/engine1.ae index 95765a6..f955cdd 100644 --- a/code/src/fakess/test/engine1.ae +++ b/code/src/state/test/engine1.ae @@ -1,7 +1,7 @@ /** - fakess engine1 - Test fakess_engine for simple global post + state engine1 + Test state.engine for simple global post usage: mpiexec -l -n 4 engine1 hosts2.txt (uses 2 servers and 2 clients) @@ -30,12 +30,9 @@ static __blocking void sender() value = malloc(128); sprintf(value, "V1"); - printf("posting: %s %s\n", - triton_string_get(&key), (char *)value); - - triton_fakess_item_add(triton_node_null, &key); - triton_fakess_post(triton_node_null, &key, - value, strlen(value)+1); + triton_state.item_add(triton_node_null, &key); + triton_state.post(triton_node_null, &key, + value, strlen(value)+1); triton_string_destroy(&key); } @@ -48,10 +45,10 @@ static __blocking void receiver() triton_timer(1000); triton_string_init(&key, "K1"); - data = triton_fakess_lookup(triton_node_null, &key); + data = triton_state.lookup(triton_node_null, &key); triton_string_destroy(&key); value = (char *)(data->value); - printf("value is: %s\n", value); + printf("receiver: value: %s\n", value); } static __blocking void doservertest(void) @@ -72,19 +69,19 @@ static __blocking int doserver(int srank) { pbranch { - triton_fakess_engine_start(); + triton_state.engine_start(); } pbranch { doservertest(); - triton_timer(1000); } pbranch { - triton_timer(4000); - triton_fakess_engine_stop(); + triton_timer(6000); + triton_state.engine_stop(); } } + return 0; } @@ -96,16 +93,16 @@ static __blocking int dostuff(char *filename) triton_map_init(); triton_map_file(filename); triton_fakess_init_self(); - - triton_fakess_load_map(); + triton_fakess_state_install(); + triton_state.load(); self = triton_map_self(); triton_map_contains(self, &server); if (server) { + printf("SERVER\n"); doserver(rank); - triton_timer(1000); } else { @@ -136,8 +133,6 @@ int main(int argc, char *argv[]) triton_init("triton.keyval"); - ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &mpi_thread_level); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); if (getenv("GDB_WAIT")) diff --git a/code/src/fakess/test/post-global.sh b/code/src/state/test/engine1.sh similarity index 100% copy from code/src/fakess/test/post-global.sh copy to code/src/state/test/engine1.sh diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index fec5558..86af32a 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -4,8 +4,10 @@ STATE_TEST_SRC := STATE_TEST_SRC += $(DIR)/local.ae STATE_TEST_SRC += $(DIR)/shutdown.ae STATE_TEST_SRC += $(DIR)/post-global.ae -#STATE_TEST_SRC += $(DIR)/engine1.ae -AETESTSRC += $(DIR)/state-client.ae +STATE_TEST_SRC += $(DIR)/engine1.ae +STATE_TEST_SRC += $(DIR)/rpc-size.ae +STATE_TEST_SRC += $(DIR)/rpc-global.ae +# AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) @@ -16,6 +18,9 @@ AETESTSRC += $(STATE_TEST_SRC) STATE_TEST_RESULTS := STATE_TEST_RESULTS += $(DIR)/shutdown.result STATE_TEST_RESULTS += $(DIR)/post-global.result +STATE_TEST_RESULTS += $(DIR)/engine1.result +STATE_TEST_RESULTS += $(DIR)/rpc-size.result +STATE_TEST_RESULTS += $(DIR)/rpc-global.result TEST_RESULTS += $(STATE_TEST_RESULTS) diff --git a/code/src/fakess/test/engine1.ae b/code/src/state/test/rpc-global.ae similarity index 53% copy from code/src/fakess/test/engine1.ae copy to code/src/state/test/rpc-global.ae index 95765a6..a9ceec1 100644 --- a/code/src/fakess/test/engine1.ae +++ b/code/src/state/test/rpc-global.ae @@ -1,9 +1,9 @@ /** - fakess engine1 - Test fakess_engine for simple global post + state rpc-global + Start state.engine, post something, let client read it - usage: mpiexec -l -n 4 engine1 hosts2.txt + usage: mpiexec -l -n 4 rpc-size hosts2.txt (uses 2 servers and 2 clients) */ @@ -16,75 +16,108 @@ #include "src/fakess/fakess.hae" #include "src/mapping/mapping.hae" +#include "src/state/sc_module.h" +#include "src/state/sc_stubs.hae" + #include <sys/types.h> #include <unistd.h> int numprocs, rank; -static __blocking void sender() +static __blocking void doclienttest(void) { - triton_string_t key; - void *value; + triton_addr_t server; + int dummy = 0; + int size = 0; - triton_string_init(&key, "K1"); - value = malloc(128); - sprintf(value, "V1"); + triton_addr_lookup("mpi://0", &server); - printf("posting: %s %s\n", - triton_string_get(&key), (char *)value); + printf("CLIENT\n"); - triton_fakess_item_add(triton_node_null, &key); - triton_fakess_post(triton_node_null, &key, - value, strlen(value)+1); - triton_string_destroy(&key); + remote_state_client_size(AER_DEFAULT_CTX, server, &dummy, &size); + + printf("size: %i\n", size); + + return; } -static __blocking void receiver() +static __blocking void receiver(triton_string_t *key) { + int value; triton_state_data_t *data; - triton_string_t key; - char *value; + + triton_timer(2000); + + data = triton_state.lookup(triton_node_null, key); + + printf("value: %i\n", *(int *)data->value); +} + +static __blocking void sender(triton_string_t *key) +{ + int *value; triton_timer(1000); - triton_string_init(&key, "K1"); - data = triton_fakess_lookup(triton_node_null, &key); - triton_string_destroy(&key); - value = (char *)(data->value); - printf("value is: %s\n", value); + value = malloc(sizeof(int)); + *value = 34; + triton_state.post(triton_node_null, key, value, sizeof(value)); } static __blocking void doservertest(void) { - if (rank % 2 == 0) + printf("servertest\n"); + triton_string_t key; + + triton_string_init(&key, "sample"); + + // All servers have the key + triton_state.item_add(triton_node_null, &key); + + if (rank == 0) { - sender(); + receiver(&key); } else { - receiver(); + sender(&key); } + triton_string_destroy(&key); } -static __blocking int doserver(int srank) +static __blocking int doserver() { + triton_ret_t ret; + printf("SERVER\n"); + + ret = aer_remote_register_sc(); + triton_error_assert(ret); + assert(AER_DEFAULT_CTX); + pwait { pbranch { - triton_fakess_engine_start(); + triton_state.engine_start(); + } + pbranch + { + aer_service_engine_start(AER_DEFAULT_CTX); } pbranch { doservertest(); - triton_timer(1000); } pbranch { - triton_timer(4000); - triton_fakess_engine_stop(); + triton_timer(3000); + printf("stop service engine\n"); + aer_service_engine_stop(); + printf("stop state engine\n"); + triton_state.engine_stop(); } } + return 0; } @@ -96,22 +129,23 @@ static __blocking int dostuff(char *filename) triton_map_init(); triton_map_file(filename); triton_fakess_init_self(); - - triton_fakess_load_map(); + triton_fakess_state_install(); + triton_state.load(); self = triton_map_self(); triton_map_contains(self, &server); if (server) { - doserver(rank); - triton_timer(1000); + doserver(); } else { - printf("CLIENT\n"); + doclienttest(); } + triton_timer(10000); + return 0; } @@ -136,8 +170,6 @@ int main(int argc, char *argv[]) triton_init("triton.keyval"); - ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &mpi_thread_level); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); if (getenv("GDB_WAIT")) diff --git a/code/src/state/test/post-global.sh b/code/src/state/test/rpc-global.sh similarity index 86% copy from code/src/state/test/post-global.sh copy to code/src/state/test/rpc-global.sh index ff1af73..58a2237 100755 --- a/code/src/state/test/post-global.sh +++ b/code/src/state/test/rpc-global.sh @@ -6,10 +6,11 @@ SCRIPT=$0 BIN=${SCRIPT%.sh} OUT=${BIN}.out -# Test with sorted input... mpiexec -l -n 4 ${BIN} src/mapping/test/hosts2.txt > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 +grep "size: 3" ${OUT} > /dev/null || exit 1 + LINES=$( grep "done" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 [[ ${LINES} == 4 ]] || exit 1 diff --git a/code/src/fakess/test/engine1.ae b/code/src/state/test/rpc-size.ae similarity index 56% copy from code/src/fakess/test/engine1.ae copy to code/src/state/test/rpc-size.ae index 95765a6..015878a 100644 --- a/code/src/fakess/test/engine1.ae +++ b/code/src/state/test/rpc-size.ae @@ -1,10 +1,10 @@ /** - fakess engine1 - Test fakess_engine for simple global post + state rpc-size + Simple RPC test: does not start fakess engine - usage: mpiexec -l -n 4 engine1 hosts2.txt - (uses 2 servers and 2 clients) + usage: mpiexec -l -n 2 rpc-size hosts1a.txt + (uses 1 server and 1 client) */ #include <stdbool.h> @@ -16,75 +16,63 @@ #include "src/fakess/fakess.hae" #include "src/mapping/mapping.hae" +#include "src/state/sc_module.h" +#include "src/state/sc_stubs.hae" + #include <sys/types.h> #include <unistd.h> int numprocs, rank; -static __blocking void sender() +static __blocking void doclienttest(void) { - triton_string_t key; - void *value; - - triton_string_init(&key, "K1"); - value = malloc(128); - sprintf(value, "V1"); + triton_addr_t server; + int dummy = 0; + int size = 0; - printf("posting: %s %s\n", - triton_string_get(&key), (char *)value); + triton_addr_lookup("mpi://0", &server); - triton_fakess_item_add(triton_node_null, &key); - triton_fakess_post(triton_node_null, &key, - value, strlen(value)+1); - triton_string_destroy(&key); -} + printf("CLIENT\n"); -static __blocking void receiver() -{ - triton_state_data_t *data; - triton_string_t key; - char *value; + remote_state_client_size(AER_DEFAULT_CTX, server, &dummy, &size); - triton_timer(1000); + printf("result: %i\n", size); - triton_string_init(&key, "K1"); - data = triton_fakess_lookup(triton_node_null, &key); - triton_string_destroy(&key); - value = (char *)(data->value); - printf("value is: %s\n", value); + return; } static __blocking void doservertest(void) { - if (rank % 2 == 0) - { - sender(); - } - else - { - receiver(); - } + printf("servertest\n"); } -static __blocking int doserver(int srank) +static __blocking int doserver() { + triton_ret_t ret; + printf("SERVER\n"); + + ret = aer_remote_register_sc(); + triton_error_assert(ret); + assert(AER_DEFAULT_CTX); + pwait { pbranch { - triton_fakess_engine_start(); + aer_service_engine_start(AER_DEFAULT_CTX); } pbranch { doservertest(); - triton_timer(1000); } pbranch { - triton_timer(4000); - triton_fakess_engine_stop(); + triton_timer(3000); + printf("stop service engine\n"); + aer_service_engine_stop(); } } + return 0; } @@ -96,20 +84,19 @@ static __blocking int dostuff(char *filename) triton_map_init(); triton_map_file(filename); triton_fakess_init_self(); - - triton_fakess_load_map(); + triton_fakess_state_install(); + triton_state.load(); self = triton_map_self(); triton_map_contains(self, &server); if (server) { - doserver(rank); - triton_timer(1000); + doserver(); } else { - printf("CLIENT\n"); + doclienttest(); } return 0; @@ -136,8 +123,6 @@ int main(int argc, char *argv[]) triton_init("triton.keyval"); - ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &mpi_thread_level); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); if (getenv("GDB_WAIT")) diff --git a/code/src/state/test/shutdown.sh b/code/src/state/test/rpc-size.sh similarity index 58% copy from code/src/state/test/shutdown.sh copy to code/src/state/test/rpc-size.sh index 6c58179..73df998 100755 --- a/code/src/state/test/shutdown.sh +++ b/code/src/state/test/rpc-size.sh @@ -6,13 +6,14 @@ SCRIPT=$0 BIN=${SCRIPT%.sh} OUT=${BIN}.out -# Test with sorted input... -mpiexec -l -n 3 ${BIN} src/mapping/test/hosts2.txt > ${OUT} 2>&1 +mpiexec -l -n 2 ${BIN} src/mapping/test/hosts1a.txt > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 +grep "result: 2" ${OUT} > /dev/null || exit 1 + LINES=$( grep "done" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 -[[ ${LINES} == 3 ]] || exit 1 +[[ ${LINES} == 2 ]] || exit 1 echo OK exit 0 diff --git a/code/src/state/test/shutdown.ae b/code/src/state/test/shutdown.ae index 8f5b474..578f0f6 100644 --- a/code/src/state/test/shutdown.ae +++ b/code/src/state/test/shutdown.ae @@ -1,8 +1,8 @@ /** - Test fakess_shutdown() + Test state.shutdown() Example: - mpiexec -l -n 3 src/fakess/test/shutdown src/mapping/test/hosts2.txt + mpiexec -l -n 3 src/state/test/shutdown src/mapping/test/hosts2.txt */ #include <stdbool.h> hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 6e679ed3dc515f9b4fb886449515f4643c4cd8de
by noreply＠mcs.anl.gov 22 Dec '10

22 Dec '10

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 6e679ed3dc515f9b4fb886449515f4643c4cd8de (commit) from 648d8e4d8fcee46fed7028560d128626fffc5524 (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 6e679ed3dc515f9b4fb886449515f4643c4cd8de Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Dec 22 15:03:20 2010 -0500 used destroy fn for read response ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/tests/rosd-create-bench.ae | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index a680889..0487db8 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -292,6 +292,10 @@ __blocking void do_remote_read(void) { fprintf(stderr, "Error: rosd_read() failure.\n"); } + else + { + aer_destroy_struct_rosd_read_resp(&resp); + } /* printf("Got data: %s\n", resp.buffer.buffer); */ triton_mutex_lock(&oid_mutex); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 648d8e4d8fcee46fed7028560d128626fffc5524
by noreply＠mcs.anl.gov 22 Dec '10

22 Dec '10

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 648d8e4d8fcee46fed7028560d128626fffc5524 (commit) from 082fb25c5397dfd4941459c6f9a9aadb2da4d34b (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 648d8e4d8fcee46fed7028560d128626fffc5524 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Dec 22 11:57:52 2010 -0500 bug fix to encoding size for shallow copy buffers ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index 32d92b2..47fb914 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -553,10 +553,19 @@ static struct aer_encoder __attribute__ ((unused)) aer_encoder_triton_string_t = static inline uint64_t aer_encode_size_triton_buffer_t( const char *n __unused, void *x) { + triton_buffer_t* buf_to_encode; + + /* account for the fact that this may be a shallow copy of a + * triton_buffer_t + */ + buf_to_encode = ctbuffer(x); + while(buf_to_encode->parent != NULL) + buf_to_encode = buf_to_encode->parent; + assert(x); - if((ctbuffer(x))->buffer) + if(buf_to_encode->buffer) { - return aer_roundup8(8 + ctbuffer(x)->size); + return aer_roundup8(8 + buf_to_encode->size); } return 8; } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 082fb25c5397dfd4941459c6f9a9aadb2da4d34b
by noreply＠mcs.anl.gov 22 Dec '10

22 Dec '10

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 082fb25c5397dfd4941459c6f9a9aadb2da4d34b (commit) from caa3a2cecedaa64380bd6edffc9c9da021a15af3 (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 082fb25c5397dfd4941459c6f9a9aadb2da4d34b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Dec 22 11:10:57 2010 -0500 don't print buffer contents beyond end of buffer ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index 26b1711..32d92b2 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -68,6 +68,12 @@ #include "src/remote/byteswap.h" #include "src/common/triton-debug.h" +/* how many bytes of each encoded buffer to print in debugging msgs. Don't + * change this without also changing the triton_debug() calls that go + * with it. + */ +#define DBG_SIZE 4 + /* macros used by pw encoding macros - probably shouldn't * be used elsewhere */ @@ -561,6 +567,8 @@ static inline triton_ret_t aer_encode_triton_buffer_t( triton_ret_t ret; uint32_t offset; triton_buffer_t* buf_to_encode; + char dbg_buffer[DBG_SIZE]; + int i; assert(buffer); assert(x); @@ -573,11 +581,15 @@ static inline triton_ret_t aer_encode_triton_buffer_t( buf_to_encode = buf_to_encode->parent; triton_debug(encoding_dbg_mask, "encoding:triton_buffer_t:\tcptr=%p\n",triton_buffer_cptr(buffer)); + + for(i=0; i<DBG_SIZE; i++) + dbg_buffer[i] = buf_to_encode->size > i ? buf_to_encode->buffer[i] : 0; + triton_debug(encoding_dbg_mask, "\tx=%x:%x:%x:%x...\n", - buf_to_encode->buffer[0], - buf_to_encode->buffer[1], - buf_to_encode->buffer[2], - buf_to_encode->buffer[3]); + dbg_buffer[0], + dbg_buffer[1], + dbg_buffer[2], + dbg_buffer[3]); triton_queue_enqueue(&buf_to_encode->embed_link, &buffer->embedded); ret = aer_encode_uint32_t(buffer, "size", &(buf_to_encode->size)); @@ -590,9 +602,6 @@ static inline triton_ret_t aer_encode_triton_buffer_t( * the cptr gets used later to encode the proper offset from the current location to the * point where the embedded buffer actually starts. */ - /* TODO: should this be done in the parent, or in the buffer_t passed - * into this function? - */ buf_to_encode->cptr = triton_buffer_cptr(buffer); offset = 0; @@ -611,6 +620,8 @@ static inline triton_ret_t aer_decode_triton_buffer_t( triton_ret_t ret; uint64_t size = 0; uint64_t offset = 0; + char dbg_buffer[DBG_SIZE]; + int i; assert(buffer); assert(x); @@ -636,14 +647,19 @@ static inline triton_ret_t aer_decode_triton_buffer_t( } memcpy(ctbuffer(x)->buffer, triton_buffer_cptr(buffer) + offset - aer_encode_size_uint32_t(NULL, &offset), size); + + for(i=0; i<DBG_SIZE; i++) + dbg_buffer[i] = size > i ? ctbuffer(x)->buffer[i] : 0; + triton_debug(encoding_dbg_mask, "\tx=%x:%x:%x:%x...\n", - ctbuffer(x)->buffer[0], - ctbuffer(x)->buffer[1], - ctbuffer(x)->buffer[2], - ctbuffer(x)->buffer[3]); + dbg_buffer[0], + dbg_buffer[1], + dbg_buffer[2], + dbg_buffer[3]); return TRITON_SUCCESS; } + static inline triton_ret_t aer_init_null_triton_buffer_t(void *x) { ctbuffer(x)->buffer = NULL; hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. caa3a2cecedaa64380bd6edffc9c9da021a15af3
by noreply＠mcs.anl.gov 21 Dec '10

21 Dec '10

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 caa3a2cecedaa64380bd6edffc9c9da021a15af3 (commit) via 00a76c74acb1a3a4b28d002a36ff280381710be7 (commit) from 7c75a5128762c98965cc4f7d7f0f0d06c27df84e (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 caa3a2cecedaa64380bd6edffc9c9da021a15af3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Dec 21 12:02:19 2010 -0500 possible fix for encoding of copied triton_buffer commit 00a76c74acb1a3a4b28d002a36ff280381710be7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Dec 21 11:52:22 2010 -0500 fix memory bug ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 26 ++++++++++++++----- code/src/replicated-osd/tests/rosd-create-bench.ae | 2 - 2 files changed, 19 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index ce7e8f6..26b1711 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -560,18 +560,27 @@ static inline triton_ret_t aer_encode_triton_buffer_t( { triton_ret_t ret; uint32_t offset; + triton_buffer_t* buf_to_encode; assert(buffer); assert(x); + + /* account for the fact that this may be a shallow copy of a + * triton_buffer_t + */ + buf_to_encode = ctbuffer(x); + while(buf_to_encode->parent != NULL) + buf_to_encode = buf_to_encode->parent; + triton_debug(encoding_dbg_mask, "encoding:triton_buffer_t:\tcptr=%p\n",triton_buffer_cptr(buffer)); triton_debug(encoding_dbg_mask, "\tx=%x:%x:%x:%x...\n", - ctbuffer(x)->buffer[0], - ctbuffer(x)->buffer[1], - ctbuffer(x)->buffer[2], - ctbuffer(x)->buffer[3]); + buf_to_encode->buffer[0], + buf_to_encode->buffer[1], + buf_to_encode->buffer[2], + buf_to_encode->buffer[3]); - triton_queue_enqueue(&ctbuffer(x)->embed_link, &buffer->embedded); - ret = aer_encode_uint32_t(buffer, "size", &(ctbuffer(x)->size)); + triton_queue_enqueue(&buf_to_encode->embed_link, &buffer->embedded); + ret = aer_encode_uint32_t(buffer, "size", &(buf_to_encode->size)); if(ret != TRITON_SUCCESS) { return ret; @@ -581,7 +590,10 @@ static inline triton_ret_t aer_encode_triton_buffer_t( * the cptr gets used later to encode the proper offset from the current location to the * point where the embedded buffer actually starts. */ - ctbuffer(x)->cptr = triton_buffer_cptr(buffer); + /* TODO: should this be done in the parent, or in the buffer_t passed + * into this function? + */ + buf_to_encode->cptr = triton_buffer_cptr(buffer); offset = 0; ret = aer_encode_uint32_t(buffer, "offset", &offset); diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index d7f9b86..a680889 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -371,8 +371,6 @@ __blocking void do_remote_write(void) } } } - - free(test_buffer); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 7c75a5128762c98965cc4f7d7f0f0d06c27df84e
by noreply＠mcs.anl.gov 21 Dec '10

21 Dec '10

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 7c75a5128762c98965cc4f7d7f0f0d06c27df84e (commit) from 9094edd5b7affdc6228653f8927399fa212689fa (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 7c75a5128762c98965cc4f7d7f0f0d06c27df84e Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Dec 21 10:02:33 2010 -0600 init fixes (restores target test_results) ----------------------------------------------------------------------- Summary of changes: code/src/state/test/post-global.ae | 2 +- code/src/state/test/shutdown.ae | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/state/test/post-global.ae b/code/src/state/test/post-global.ae index c2122a0..12799b5 100644 --- a/code/src/state/test/post-global.ae +++ b/code/src/state/test/post-global.ae @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) assert(argc == 2); - triton_init(); + triton_init("triton.client"); MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); diff --git a/code/src/state/test/shutdown.ae b/code/src/state/test/shutdown.ae index 905cadb..8f5b474 100644 --- a/code/src/state/test/shutdown.ae +++ b/code/src/state/test/shutdown.ae @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) hostlist = argv[1]; - triton_init(); + triton_init("triton.client"); if (getenv("GDB_WAIT")) { hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 9094edd5b7affdc6228653f8927399fa212689fa
by noreply＠mcs.anl.gov 20 Dec '10

20 Dec '10

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 9094edd5b7affdc6228653f8927399fa212689fa (commit) from 322264b8e82087b79173bffb956f5413f7bc78af (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 9094edd5b7affdc6228653f8927399fa212689fa Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Dec 20 16:55:03 2010 -0500 fix aer_init_xxx calls to pass pointers ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/tests/rosd-create-bench.ae | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index 9d7c3e4..d7f9b86 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -189,6 +189,7 @@ __blocking void do_remote_remove(void) int32_t out; triton_addr_t svr_addr; triton_node_t svr_node; + uint32_t flags = 0; MPI_Comm_rank(MPI_COMM_WORLD, &rank); @@ -209,7 +210,7 @@ __blocking void do_remote_remove(void) while(oid.l < nobjects) { oid.l++; - ret = aer_init_struct_rosd_remove_req(&req, oid, 0); + ret = aer_init_struct_rosd_remove_req(&req, &oid, &flags); triton_error_assert(ret); triton_mutex_unlock(&oid_mutex); @@ -244,6 +245,10 @@ __blocking void do_remote_read(void) triton_addr_t svr_addr; triton_string_t svr_string; char test_buffer[128]; + uint64_t oid_fork = 0; + int64_t offset = 0; + int64_t size = 128; + uint32_t flags = 0; MPI_Comm_rank(MPI_COMM_WORLD, &rank); @@ -268,7 +273,7 @@ __blocking void do_remote_read(void) /* NOTE: passing in 128 as the size, but we expect a * short read here */ - ret = aer_init_struct_rosd_read_req(&req, oid, 0, 128, 0, 0); + ret = aer_init_struct_rosd_read_req(&req, &oid, &oid_fork, &size, &offset, &flags); triton_error_assert(ret); triton_mutex_unlock(&oid_mutex); @@ -310,6 +315,9 @@ __blocking void do_remote_write(void) triton_string_t svr_string; char test_buffer[128]; triton_buffer_t tbuf; + uint64_t oid_fork = 0; + int64_t offset = 0; + uint32_t flags = ROSD_FLAG_TRUNC_WRITE; /* TODO: come back and think about const issue here (ie, is there any * way to get a const pointer into rosd_write()) @@ -340,7 +348,7 @@ __blocking void do_remote_write(void) /* TODO: think about tbuf arg. Seems weird to pass full * struct here instead of pointer. */ - ret = aer_init_struct_rosd_write_req(&req, oid, 0, tbuf, 0, ROSD_FLAG_TRUNC_WRITE); + ret = aer_init_struct_rosd_write_req(&req, &oid, &oid_fork, &tbuf, &offset, &flags); triton_error_assert(ret); triton_mutex_unlock(&oid_mutex); @@ -378,6 +386,8 @@ __blocking void do_remote_create(void) int32_t out; triton_node_t svr_node; triton_addr_t svr_addr; + uint32_t flags = 0; + uint32_t rep_factor = replication_factor; MPI_Comm_rank(MPI_COMM_WORLD, &rank); @@ -398,7 +408,7 @@ __blocking void do_remote_create(void) while(oid.l < nobjects) { oid.l++; - ret = aer_init_struct_rosd_create_req(&req, oid, 0, replication_factor); + ret = aer_init_struct_rosd_create_req(&req, &oid, &flags, &rep_factor); triton_error_assert(ret); triton_mutex_unlock(&oid_mutex); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 322264b8e82087b79173bffb956f5413f7bc78af
by noreply＠mcs.anl.gov 20 Dec '10

20 Dec '10

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 322264b8e82087b79173bffb956f5413f7bc78af (commit) from 8967b742ea193712285adaed2d41871132fab224 (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 322264b8e82087b79173bffb956f5413f7bc78af Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Dec 20 15:00:18 2010 -0500 triton_ignore_t type for dummy rpc args, untested ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-types.h | 5 ++++ code/src/remote/encoding-pw.h | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/common/triton-types.h b/code/src/common/triton-types.h index 1c19662..cfc5b40 100644 --- a/code/src/common/triton-types.h +++ b/code/src/common/triton-types.h @@ -23,4 +23,9 @@ } \ } while(0) +/** + * To be used for ignored arguments to remote functions + */ +typedef void* triton_ignore_t; + #endif /* __TRITON_TYPES_H__ */ diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index 8d1cc80..ce7e8f6 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -78,6 +78,54 @@ extern triton_debug_mask_t encoding_dbg_mask; /* basic encoding types */ +/* Type: triton_ignore_t + * + * void *. This is a type to be used as a placeholder in the definition of + * remote functions that don't specify an input argument or an output + * argument. It is _not_ encoded or sent over the wire. + * + * Format: [] + * Bytes: <0> + */ +static inline uint64_t aer_encode_size_triton_ignore_t( + const char *n __unused, void *x) +{ + return 0; +} +static inline triton_ret_t aer_encode_triton_ignore_t( + triton_buffer_t *buf, const char *n __unused, void *x) +{ + return TRITON_SUCCESS; +} +static inline triton_ret_t aer_decode_triton_ignore_t( + triton_buffer_t *buf, char **n __unused, void *x) +{ + return TRITON_SUCCESS; +} +static inline triton_ret_t aer_init_null_triton_ignore_t(void *x) +{ + return TRITON_SUCCESS; +} +static inline triton_ret_t aer_copy_triton_ignore_t(void *x, void *v) +{ + return TRITON_SUCCESS; +} +static inline void aer_destroy_triton_ignore_t(void *x) +{ + return; +} + +static struct aer_encoder __attribute__ ((unused)) aer_encoder_triton_ignore_t = +{ + .encode = aer_encode_triton_ignore_t, + .decode = aer_decode_triton_ignore_t, + .encode_size = aer_encode_size_triton_ignore_t, + .init_null = aer_init_null_triton_ignore_t, + .copy = aer_copy_triton_ignore_t, + .destroy = aer_destroy_triton_ignore_t +}; + + /* Type: uint128_t * * 16 byte unsigned integer. This is an additional type not included hooks/post-receive -- Triton Repository

1 0