May 2012 - Triton-commits - mailman3.cels.anl.gov

branch, master, updated. 97936c02164071391652bf807af983f7133a3dbf
by noreply＠mcs.anl.gov 31 May '12

31 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 97936c02164071391652bf807af983f7133a3dbf (commit) from 9551f1bdfd523cd12f2effa82d22c47dab597422 (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 97936c02164071391652bf807af983f7133a3dbf Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu May 31 16:43:35 2012 -0500 Remove links ; They only work for in-tree build ----------------------------------------------------------------------- Summary of changes: include | 1 - lib | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) delete mode 120000 include delete mode 120000 lib Diff of changes: diff --git a/include b/include deleted file mode 120000 index 8444e3b..0000000 --- a/include +++ /dev/null @@ -1 +0,0 @@ -code/include \ No newline at end of file diff --git a/lib b/lib deleted file mode 120000 index b3ed493..0000000 --- a/lib +++ /dev/null @@ -1 +0,0 @@ -code/lib \ No newline at end of file hooks/post-receive --

1 0

branch, master, updated. 9551f1bdfd523cd12f2effa82d22c47dab597422
by noreply＠mcs.anl.gov 31 May '12

31 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 9551f1bdfd523cd12f2effa82d22c47dab597422 (commit) from 564bcb49dfca1ae376a0dd1c1223cb54054c06d6 (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 9551f1bdfd523cd12f2effa82d22c47dab597422 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu May 31 15:08:47 2012 -0400 update kv code to use status information ----------------------------------------------------------------------- Summary of changes: code/src/kv/kv-intern.ae | 29 ++++++++++++++++++++++------- code/src/kv/kv-intern.hae | 1 + code/src/kv/kv.c | 27 +++++++++++++++++++++++++++ code/src/kv/kv.h | 5 +++++ code/src/kv/tests/kvtest.c | 24 +++++++++++++++++++----- 5 files changed, 74 insertions(+), 12 deletions(-) Diff of changes: diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index 35608a4..4d45e1c 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -15,6 +15,7 @@ #include "src/kv/kv-intern.hae" #include "src/state/state.hae" #include "src/state/status.hae" +#include "src/state/sc_module.h" #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" @@ -23,18 +24,13 @@ __blocking triton_ret_t triton_kv_init_internal(const char * mapfile, int is_server) { - triton_ret_t ret; + triton_ret_t ret = TRITON_SUCCESS; if(is_server) { ret = triton_bootstrap_by_hostfile(mapfile); } - else - { - sleep(1); - ret = triton_attach("mpi://0"); - } - + return ret; } @@ -193,6 +189,19 @@ __blocking triton_ret_t triton_kv_server_stop_internal(void) } /** + * \brief internal routine to start clients + */ +__blocking triton_ret_t triton_kv_client_start_internal(void) +{ + triton_ret_t ret; + + ret = triton_attach("mpi://0"); + + return(ret); +} + + +/** * \brief internal routine to start servers */ __blocking triton_ret_t triton_kv_server_start_internal(void) @@ -211,6 +220,12 @@ __blocking triton_ret_t triton_kv_server_start_internal(void) { return ret; } + + ret = aer_remote_register_sc(); + if(ret != TRITON_SUCCESS) + { + return ret; + } pwait { diff --git a/code/src/kv/kv-intern.hae b/code/src/kv/kv-intern.hae index a4122ed..bcdb18c 100644 --- a/code/src/kv/kv-intern.hae +++ b/code/src/kv/kv-intern.hae @@ -10,6 +10,7 @@ */ __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_client_start_internal(void); __blocking triton_ret_t triton_kv_init_internal(const char * mapfile, int is_server); void triton_kv_finalize_internal(void); diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index 67ceec2..16d9286 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -45,6 +45,33 @@ static void write_hostfile (size_t count, int fd) } } +triton_ret_t triton_kv_client_start(void) +{ + triton_ret_t ret; + ae_op_id_t op_id; + struct completion c; + ae_hints_t hints; + + c.done = 0; + + ae_hints_init(&hints); + ret = ext_post_blocking(triton_kv_client_start_internal, cb, &c, &hints, + NULL, &op_id, &c.ret); + + if(ret == TRITON_SUCCESS) + return(ret); + + else if(ret == TRITON_IMMEDIATE_COMPLETION) + { + } + else + { + c.ret = ret; + } + ae_hints_destroy(&hints); + return TRITON_SUCCESS; +} + triton_ret_t triton_kv_server_start(kv_op_id* id) { triton_ret_t ret; diff --git a/code/src/kv/kv.h b/code/src/kv/kv.h index 8418018..09d68ea 100644 --- a/code/src/kv/kv.h +++ b/code/src/kv/kv.h @@ -27,6 +27,11 @@ triton_ret_t triton_kv_remove(const char * key); triton_ret_t triton_kv_server_start(kv_op_id* id); /** + * Starts the kv client functionality (nonblocking) + */ +triton_ret_t triton_kv_client_start(void); + +/** * Waits for kv server to finish processing (blocking) */ triton_ret_t triton_kv_server_wait(kv_op_id id); diff --git a/code/src/kv/tests/kvtest.c b/code/src/kv/tests/kvtest.c index 5551465..8344cb3 100644 --- a/code/src/kv/tests/kvtest.c +++ b/code/src/kv/tests/kvtest.c @@ -249,17 +249,23 @@ static void dotest (MPI_Comm comm) static void server_main (MPI_Comm globalcomm, MPI_Comm comm) { - MPI_Barrier (globalcomm); - + kv_op_id id; int commrank; int commsize; + triton_ret_t ret; MPI_Comm_rank (comm, &commrank); MPI_Comm_size (comm, &commsize); writev ("Rank %i server starting\n", commrank); + ret = triton_kv_server_start(&id); + assert(ret == TRITON_SUCCESS); + + writev ("Rank %i server running\n", commrank); + MPI_Barrier (globalcomm); - triton_kv_server_start_and_wait(); + ret = triton_kv_server_wait(id); + assert(ret == TRITON_SUCCESS); writev ("Rank %i server done\n", commrank); MPI_Barrier (globalcomm); @@ -267,6 +273,8 @@ static void server_main (MPI_Comm globalcomm, MPI_Comm comm) static void client_main (MPI_Comm globalcomm, MPI_Comm comm) { + triton_ret_t ret; + MPI_Barrier (globalcomm); int commrank; @@ -275,6 +283,9 @@ static void client_main (MPI_Comm globalcomm, MPI_Comm comm) MPI_Comm_rank (comm, &commrank); MPI_Comm_size (comm, &commsize); + ret = triton_kv_client_start(); + assert(ret == TRITON_SUCCESS); + simple_test (comm, commrank, commsize); strong_consistency_test (comm, commrank, commsize); atomic_put_test (comm, commrank, commsize); @@ -467,7 +478,8 @@ static void hybridtest () char buf[256]; sprintf (buf, "/tmp/tosd-%i", commrank); - triton_kv_init (commsize, 1, buf); + ret = triton_kv_init (commsize, 1, buf); + assert(ret == TRITON_SUCCESS); ret = triton_kv_server_start(&id); assert(ret == TRITON_SUCCESS); @@ -489,6 +501,7 @@ int main (int argc, char ** args) { int flags, opt; int nsecs, tfnd; + triton_ret_t ret; nsecs = 0; tfnd = 0; @@ -572,7 +585,8 @@ int main (int argc, char ** args) write0v (commrank, "Initializing KV store...\n"); char buf[128]; sprintf (buf, "/tmp/tosd-%u", commrank); - triton_kv_init (opt_servers, is_server, buf); + ret = triton_kv_init (opt_servers, is_server, buf); + assert(ret == TRITON_SUCCESS); /* ============================================= */ MPI_Barrier (MPI_COMM_WORLD); hooks/post-receive --

1 0

branch, master, updated. 564bcb49dfca1ae376a0dd1c1223cb54054c06d6
by noreply＠mcs.anl.gov 31 May '12

31 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 564bcb49dfca1ae376a0dd1c1223cb54054c06d6 (commit) from 6c2b3f0a826ad428aeb16f68be0603c42989c4c6 (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 564bcb49dfca1ae376a0dd1c1223cb54054c06d6 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu May 31 13:34:25 2012 -0400 bug fix ----------------------------------------------------------------------- Summary of changes: code/src/kv/kv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index 3f59022..67ceec2 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -152,6 +152,7 @@ triton_ret_t triton_kv_init (size_t servercount, int is_server, const char *kvst { triton_ret_t ret; char datapath[1024]; + int fd = mkstemp (filename); write_hostfile (servercount, fd); @@ -170,6 +171,7 @@ triton_ret_t triton_kv_init (size_t servercount, int is_server, const char *kvst struct completion c; ae_op_id_t op_id; + c.done = 0; ae_hints_init(&hints); ret = ext_post_blocking(triton_kv_init_internal, cb, &c, &hints, NULL, &op_id, &c.ret, &filename[0], is_server); hooks/post-receive --

1 0

branch, master, updated. 6c2b3f0a826ad428aeb16f68be0603c42989c4c6
by noreply＠mcs.anl.gov 31 May '12

31 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 6c2b3f0a826ad428aeb16f68be0603c42989c4c6 (commit) from 7107ea840ea44593a1ac8e8e9b1973d9c1bfee55 (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 6c2b3f0a826ad428aeb16f68be0603c42989c4c6 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu May 31 12:50:20 2012 -0400 work around memory corruption in kvtest ----------------------------------------------------------------------- Summary of changes: code/src/kv/tests/kvtest.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/kv/tests/kvtest.c b/code/src/kv/tests/kvtest.c index 415d8b6..5551465 100644 --- a/code/src/kv/tests/kvtest.c +++ b/code/src/kv/tests/kvtest.c @@ -343,11 +343,19 @@ inline static unsigned int safe_store (void * buf, unsigned int val) static unsigned int fast_generate_key (unsigned int seed, unsigned int iter, void * buf, unsigned int bufsize) { + /* NOTE: the commented-out logic is producing some memory errors for + * some reason. Just replacing with normal string functions for now. + */ +#if 1 + int ret = snprintf((char*)buf, bufsize, "%u:%u", seed, iter); + return(ret); +#else assert (bufsize >= (sizeof(int)*4)); char * ptr = (char*) buf; ptr += safe_store (ptr, seed); ptr += safe_store (ptr, iter); return ((char*) ptr - (char*) buf); +#endif } static void fast_generate_data (void * data, unsigned int size) hooks/post-receive --

1 0

branch, master, updated. 7107ea840ea44593a1ac8e8e9b1973d9c1bfee55
by noreply＠mcs.anl.gov 31 May '12

31 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 7107ea840ea44593a1ac8e8e9b1973d9c1bfee55 (commit) via 1bf9a1a0291c4c4d84bece80400ac68a774f3677 (commit) from 628dd78bd3047ec5953fd026f2693287b8872e24 (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 7107ea840ea44593a1ac8e8e9b1973d9c1bfee55 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu May 31 11:09:20 2012 -0400 make kv servers use server status system commit 1bf9a1a0291c4c4d84bece80400ac68a774f3677 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu May 31 11:09:02 2012 -0400 make sure that servers don't manually refresh ----------------------------------------------------------------------- Summary of changes: code/src/kv/kv-intern.ae | 27 ++++++++++++++++++++++++++- code/src/state/sc.aer | 11 +++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index 80b2ef6..35608a4 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -14,6 +14,7 @@ #include "src/placement/placement.hae" #include "src/kv/kv-intern.hae" #include "src/state/state.hae" +#include "src/state/status.hae" #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" #include "src/remote/core-client.hae" @@ -211,7 +212,31 @@ __blocking triton_ret_t triton_kv_server_start_internal(void) return ret; } - aer_service_engine_start(AER_DEFAULT_CTX); + pwait + { + pbranch + { + /* run service engine to process requests */ + assert(AER_DEFAULT_CTX); + aer_service_engine_start(AER_DEFAULT_CTX); + /* once service engine stops we should stop state component as well */ + triton_state_engine_stop(); + } + pbranch + { + triton_ret_t state_ret; + /* start state engine */ + state_ret = triton_state_engine_start(); + /* TODO: error handling */ + triton_error_assert(state_ret); + } + pbranch + { + triton_status_set(TRITON_STATUS_NOMINAL); + triton_state_monitor(); + } + } + return TRITON_SUCCESS; } diff --git a/code/src/state/sc.aer b/code/src/state/sc.aer index fb9ceee..f84b822 100644 --- a/code/src/state/sc.aer +++ b/code/src/state/sc.aer @@ -625,6 +625,17 @@ __blocking triton_ret_t triton_state_client_refresh(triton_addr_t svr_addr) struct triton_state_data *dscratch; int i; triton_addr_t tmp_addr; + triton_node_t self; + + self = triton_map_self(); + if(triton_cmp_node(self, triton_node_null) != 0) + { + /* This is a server (most likely a server that is invoking a + * client-side rpc function). Do not manually refresh. Servers + * automatically refresh themselves. + */ + return(TRITON_SUCCESS); + } if(!triton_addr_is_null(svr_addr)) { hooks/post-receive --

1 0

branch, master, updated. 628dd78bd3047ec5953fd026f2693287b8872e24
by noreply＠mcs.anl.gov 31 May '12

31 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 628dd78bd3047ec5953fd026f2693287b8872e24 (commit) from f4ca7fc9fefbc3882347afa094df3d604abc03c4 (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 628dd78bd3047ec5953fd026f2693287b8872e24 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu May 31 10:00:45 2012 -0400 bug fix to test script rules ----------------------------------------------------------------------- Summary of changes: code/src/aesop/parser/tests/remote/module.mk.in | 2 +- code/src/kv/tests/module.mk.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 919d069..291083d 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -11,7 +11,7 @@ AERTESTSRC += $(DIR_TESTREMOTE)/test-remote-fault-injector.aer \ $(DIR_TESTREMOTE)/test-remote-buffer-response.aer \ $(DIR_TESTREMOTE)/test-remote-list.aer -TEST_RESULTS += $(DIR_TESTREMOTE)/test-remote-list.sh +TEST_RESULTS += $(DIR_TESTREMOTE)/test-remote-list.result #AERTESTSRC += $(DIR_TESTREMOTE)/test-remote-mpi.aer diff --git a/code/src/kv/tests/module.mk.in b/code/src/kv/tests/module.mk.in index a6ab1b5..a4c47e0 100644 --- a/code/src/kv/tests/module.mk.in +++ b/code/src/kv/tests/module.mk.in @@ -11,7 +11,7 @@ MODLINKWITH_$(DIR)/simpletest := $(DIR)/test-common.o ifeq ($(BUILD_MPI),1) -TEST_RESULTS += $(DIR)/kvtest.sh +TEST_RESULTS += $(DIR)/kvtest.result TESTSUPPORTSRC += $(DIR)/nb-barrier.c $(DIR)/stats.c hooks/post-receive --

1 0

branch, master, updated. f4ca7fc9fefbc3882347afa094df3d604abc03c4
by noreply＠mcs.anl.gov 30 May '12

30 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via f4ca7fc9fefbc3882347afa094df3d604abc03c4 (commit) via 153fb401cb9646e61dc3a990b46386546703c5ed (commit) via 434d482e575a14aebb5b617a9b916af712cbe32a (commit) from 8cd681c37285b1ec580096787adab8c91df836ea (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 f4ca7fc9fefbc3882347afa094df3d604abc03c4 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 30 16:44:57 2012 -0500 ASG: Consistent naming commit 153fb401cb9646e61dc3a990b46386546703c5ed Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 30 16:44:43 2012 -0500 Make asg.h/libasg.a public commit 434d482e575a14aebb5b617a9b916af712cbe32a Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 30 16:23:23 2012 -0500 Move asg to include dir to make it public ----------------------------------------------------------------------- Summary of changes: code/{src/asg => include}/asg.h | 2 +- code/src/asg/asg.c | 2 +- include | 1 + lib | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename code/{src/asg => include}/asg.h (99%) create mode 120000 include create mode 120000 lib Diff of changes: diff --git a/code/src/asg/asg.h b/code/include/asg.h similarity index 99% rename from code/src/asg/asg.h rename to code/include/asg.h index 96314b1..b74263a 100644 --- a/code/src/asg/asg.h +++ b/code/include/asg.h @@ -75,7 +75,7 @@ typedef enum /* ========================================================================*/ /** Initialize storage system instance */ -int asg_init (asg_instance_t * instance, const char * options); +int asg_initialize (asg_instance_t * instance, const char * options); /** Close storage system instance */ diff --git a/code/src/asg/asg.c b/code/src/asg/asg.c index 19a9181..558bae9 100644 --- a/code/src/asg/asg.c +++ b/code/src/asg/asg.c @@ -1,6 +1,6 @@ #include "asg.h" -int asg_init (asg_instance_t * instance, const char * options) +int asg_initialize (asg_instance_t * instance, const char * options) { return ASG_SUCCESS; } diff --git a/include b/include new file mode 120000 index 0000000..8444e3b --- /dev/null +++ b/include @@ -0,0 +1 @@ +code/include \ No newline at end of file diff --git a/lib b/lib new file mode 120000 index 0000000..b3ed493 --- /dev/null +++ b/lib @@ -0,0 +1 @@ +code/lib \ No newline at end of file hooks/post-receive --

1 0

branch, master, updated. 8cd681c37285b1ec580096787adab8c91df836ea
by noreply＠mcs.anl.gov 30 May '12

30 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 8cd681c37285b1ec580096787adab8c91df836ea (commit) from d01dc8c440acc2b4d02ad26ec56bb622aa0f3309 (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 8cd681c37285b1ec580096787adab8c91df836ea Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 30 16:14:13 2012 -0500 Add missing file in asg dir ----------------------------------------------------------------------- Summary of changes: code/src/asg/module.mk.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 code/src/asg/module.mk.in Diff of changes: diff --git a/code/src/asg/module.mk.in b/code/src/asg/module.mk.in new file mode 100644 index 0000000..7dd6b62 --- /dev/null +++ b/code/src/asg/module.mk.in @@ -0,0 +1,4 @@ +DIR_ASG := src/asg + +ASGLIBSRC += $(DIR_ASG)/asg.c + hooks/post-receive --

1 0

branch, master, updated. d01dc8c440acc2b4d02ad26ec56bb622aa0f3309
by noreply＠mcs.anl.gov 30 May '12

30 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via d01dc8c440acc2b4d02ad26ec56bb622aa0f3309 (commit) from 181da25652682c630dbede18bfdefb0dd59c220c (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 d01dc8c440acc2b4d02ad26ec56bb622aa0f3309 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 30 14:47:12 2012 -0500 Build libasg.a ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 14 +++++- code/configure.ac | 1 + code/src/asg/asg.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ code/src/asg/asg.h | 1 + 4 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 code/src/asg/asg.c Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 68e62d8..401eb37 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -117,6 +117,7 @@ INSTALL = @INSTALL@ AELIBSRC := AERLIBSRC := +ASGLIBSRC := LIBSRC := AETESTSRC := AERTESTSRC := @@ -332,6 +333,8 @@ AERLIBOBJS=$(patsubst %.aer,%.o,$(AERLIBSRC)) $(patsubst %.aer,%_module.o,$(AERL LIBOBJS=$(patsubst %.c,%.o,$(LIBSRC)) LIBDEPS=$(patsubst %.c,%.d,$(LIBSRC)) +ASGLIBOBJS=$(patsubst %.c,%.o,$(ASGLIBSRC)) + TESTOBJS=$(patsubst %.c,%.o,$(TESTSRC)) $(patsubst %.c,%.o,$(TESTSUPPORTSRC)) TESTDEPS=$(patsubst %.c,%.d,$(TESTSRC)) $(patsubst %.c,%.d,$(TESTSUPPORTSRC)) @@ -394,7 +397,8 @@ runVALGRIND = $(patsubst %,valgrind%,$(TESTS)) ifneq (,$(USE_DYLIBS)) LIBRARIES=lib/libtriton.dylib else -LIBRARIES=lib/libtriton.a +LIBRARIES=lib/libtriton.a \ + lib/libasg.a endif DOCHTML=$(patsubst %.txt,%.html,$(DOCSRC)) @@ -451,7 +455,7 @@ $(AERPROGRAM): %: %.o $(LIBRARIES) -L$(builddir)/lib -ltriton \ $(call MODLDFLAGS_AER,$*) $(call MODLIBS_AER,$*) $(LIBS) -$(LIBOBJS) $(TESTOBJS): %.o: %.c +$(ASGLIBOBJS) $(LIBOBJS) $(TESTOBJS): %.o: %.c $(Q) " CC $@" $(E)$(call MCC_C,$*) -c -o $@ \ $(LIBCFLAGS) $(CFLAGS) $(CWARNS) \ @@ -470,6 +474,12 @@ lib/libtriton.a: $(AERLIBOBJS) $(AELIBOBJS) $(LIBOBJS) $(E)$(INSTALL) -d lib $(E)ar rcs $@ $(AELIBOBJS) $(LIBOBJS) $(AERLIBOBJS) +lib/libasg.a: $(ASGLIBOBJS) + $(Q) " RANLIB $@" + $(E)$(INSTALL) -d lib + $(E)ar rcs $@ $< + + # shared objects lib/libtriton.so: $(AERLIBOBJS) $(AELIBOBJS) $(LIBOBJS) diff --git a/code/configure.ac b/code/configure.ac index af78464..59475a2 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -425,4 +425,5 @@ src/socket/tests/module.mk doc/module.mk doc/resilience/module.mk doc/resilience/resilience-book.txt +src/asg/module.mk ]) diff --git a/code/src/asg/asg.c b/code/src/asg/asg.c new file mode 100644 index 0000000..19a9181 --- /dev/null +++ b/code/src/asg/asg.c @@ -0,0 +1,140 @@ +#include "asg.h" + +int asg_init (asg_instance_t * instance, const char * options) +{ + return ASG_SUCCESS; +} + + +int asg_finalize (void) +{ + return ASG_SUCCESS; +} + +int asg_read ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t object, + asg_fork_id_t fork, + asg_record_id_t start_record, + asg_size_t recordcount, + asg_flags_t flags, + asg_version_t version_condition, + void * buf, + size_t bufsize, + asg_size_t * transferred, + asg_version_t * version_info) +{ + return ASG_SUCCESS; +} + +int asg_write ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t object, + asg_fork_id_t fork, + asg_record_id_t start_record, + asg_size_t recordcount, + asg_size_t recordlen, + asg_flags_t flags, + asg_version_t version_condition, + asg_version_t new_version, + const void * data, + asg_size_t * transferred) +{ + return ASG_SUCCESS; +} + +int asg_punch ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t object, + asg_fork_id_t fork, + asg_record_id_t start_record, + asg_size_t recordcount, + asg_size_t recordlen, + asg_flags_t flags, + asg_version_t version_condition, + asg_version_t new_version, + asg_size_t * transferred) +{ + return ASG_SUCCESS; +} + + +int asg_reset ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t object, + asg_fork_id_t fork, + asg_record_id_t start_record, + asg_size_t recordcount, + asg_size_t recordlen, + asg_size_t * reset_count) +{ + return ASG_SUCCESS; +} + + +int asg_probe_system ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t start, + asg_container_info_t * buf, + asg_size_t maxitems, + asg_size_t * transferred, /* number of container structures returned */ + asg_container_id_t * next) +{ + return ASG_SUCCESS; +} + + +int asg_probe_container ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t start, + asg_object_info_t * buf, + asg_size_t maxitems, + asg_size_t * transferred, + asg_object_id_t * next) +{ + return ASG_SUCCESS; +} + + +int asg_probe_object ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t object, + asg_fork_id_t start, + asg_fork_info_t * buf, + asg_size_t maxitems, + asg_size_t * transferred, + asg_fork_id_t * next) +{ + return ASG_SUCCESS; +} + + +int asg_probe_fork ( + asg_instance_t instance, + asg_location_t location, + asg_container_id_t container, + asg_object_id_t object, + asg_fork_id_t fork, + asg_record_id_t start, + asg_record_info_t * buf, + asg_size_t maxitems, + asg_size_t * transferred, + asg_record_id_t * next) +{ + return ASG_SUCCESS; +} + + diff --git a/code/src/asg/asg.h b/code/src/asg/asg.h index 489b020..96314b1 100644 --- a/code/src/asg/asg.h +++ b/code/src/asg/asg.h @@ -2,6 +2,7 @@ #define TRITON_ASG_H #include <stdint.h> +#include <string.h> typedef intptr_t asg_instance_t; hooks/post-receive --

1 0

branch, master, updated. 181da25652682c630dbede18bfdefb0dd59c220c
by noreply＠mcs.anl.gov 30 May '12

30 May '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 181da25652682c630dbede18bfdefb0dd59c220c (commit) from 6b661b7cdcf73763d70bfa6b22a8d5f5d56db359 (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 181da25652682c630dbede18bfdefb0dd59c220c Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed May 30 14:16:20 2012 -0500 asg: update return of version when reading ----------------------------------------------------------------------- Summary of changes: code/src/asg/asg.h | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/asg/asg.h b/code/src/asg/asg.h index 6620c24..489b020 100644 --- a/code/src/asg/asg.h +++ b/code/src/asg/asg.h @@ -15,8 +15,16 @@ typedef uint64_t asg_record_id_t; typedef uint64_t asg_offset_t; typedef uint64_t asg_size_t; + typedef uint64_t asg_version_t; +/** The highest valid version number */ +#define ASG_VERSION_MAX (2^64-2) + +/** Constant indicating multiple versions + * (used in reading) */ +#define ASG_VERSION_MIXED (2^64-1) + #define ASG_LOCATION_AUTO 0 @@ -72,7 +80,13 @@ int asg_init (asg_instance_t * instance, const char * options); /** Close storage system instance */ int asg_finalize (void); -/** Retrieve data */ +/** + * Retrieve data + * - The version number of the region is returned in version_info: + * either a specific version number, or -- if multiple versions + * are present in the range -- ASG_VERSION_MIXED + * + * */ int asg_read ( asg_instance_t instance, asg_location_t location, @@ -85,7 +99,8 @@ int asg_read ( asg_version_t version_condition, void * buf, size_t bufsize, - asg_size_t * transferred); + asg_size_t * transferred, + asg_version_t * version_info); int asg_write ( asg_instance_t instance, hooks/post-receive --

1 0