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

Triton Repository branch, master, updated. 4e7cfb7e84f97e2926a71c559e7beb6a0763411e
by noreply＠mcs.anl.gov 30 Nov '11

30 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 4e7cfb7e84f97e2926a71c559e7beb6a0763411e (commit) from a899df5028c0b93075f9cf5bf87118aff5fc8bc1 (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 4e7cfb7e84f97e2926a71c559e7beb6a0763411e Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Wed Nov 30 11:14:05 2011 -0600 Add triton error convenience function. Use triton_is_error(ret) to compare against TRITON_SUCCESS. Returns true if ret != TRITON_SUCCESS. ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-error.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/common/triton-error.h b/code/src/common/triton-error.h index 41c3a5c..e7d677e 100644 --- a/code/src/common/triton-error.h +++ b/code/src/common/triton-error.h @@ -113,5 +113,13 @@ void triton_error_print(triton_ret_t ret, const char *format, ...) __attribute__ */ int triton_error_equal (const triton_ret_t r1, const triton_ret_t r2); +/** + * Convenience function: return true if the return code does not indicate + * TRITON_SUCCESS. + */ +static inline int triton_is_error (const triton_ret_t r) +{ + return !triton_error_equal (r, TRITON_SUCCESS); +} #endif /* __TRITON_ERROR_H__ */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. a899df5028c0b93075f9cf5bf87118aff5fc8bc1
by noreply＠mcs.anl.gov 30 Nov '11

30 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via a899df5028c0b93075f9cf5bf87118aff5fc8bc1 (commit) from b2895f574f232e63994bc89b4dc462c074f01f47 (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 a899df5028c0b93075f9cf5bf87118aff5fc8bc1 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Nov 30 10:42:06 2011 -0500 fix build error in test program ----------------------------------------------------------------------- Summary of changes: code/src/state/test/rosd-injection.ae | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/state/test/rosd-injection.ae b/code/src/state/test/rosd-injection.ae index 2b5b518..77813b7 100644 --- a/code/src/state/test/rosd-injection.ae +++ b/code/src/state/test/rosd-injection.ae @@ -183,8 +183,6 @@ static __blocking triton_ret_t rosd_client_fn(int nservers, int nclients, void* // triton_status_t maintenance = TRITON_STATUS_MAINTENANCE; triton_status_t injected = TRITON_STATUS_INJECTED; - int32_t *status; - int32_t ignore; /* NOTE: we aren't really operating on objects here; just using OID as a * way to map to servers. hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. b2895f574f232e63994bc89b4dc462c074f01f47
by noreply＠mcs.anl.gov 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via b2895f574f232e63994bc89b4dc462c074f01f47 (commit) from 368b3c272385bc82a23e525321c60249b154d7cb (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 b2895f574f232e63994bc89b4dc462c074f01f47 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Nov 29 13:21:32 2011 -0500 clean out some unused variables ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-buffer.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/common/triton-buffer.h b/code/src/common/triton-buffer.h index 7a89b6f..c11653e 100644 --- a/code/src/common/triton-buffer.h +++ b/code/src/common/triton-buffer.h @@ -91,7 +91,6 @@ static inline triton_ret_t triton_buffer_alloc(triton_buffer_t *buffer, int64_t static inline void triton_buffer_destroy(triton_buffer_t *buffer) { int r, lr; - triton_buffer_t *embedded_entry, *tmpb; /* first, decrement my refcount */ lr = triton_mutex_lock(&buffer->reflock); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 368b3c272385bc82a23e525321c60249b154d7cb
by noreply＠mcs.anl.gov 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 368b3c272385bc82a23e525321c60249b154d7cb (commit) from c26016ba72b997dff128f3258465f13436919137 (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 368b3c272385bc82a23e525321c60249b154d7cb Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Nov 29 12:04:42 2011 -0500 stub for rosd read failover test doesn't work yet ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/rosd-test-harness.ae | 6 + code/src/replicated-osd/rosd-test-harness.hae | 1 + code/src/replicated-osd/tests/module.mk.in | 6 + .../src/replicated-osd/tests/rosd-read-failover.ae | 263 ++++++++++++++++++++ 4 files changed, 276 insertions(+), 0 deletions(-) create mode 100644 code/src/replicated-osd/tests/rosd-read-failover.ae Diff of changes: diff --git a/code/src/replicated-osd/rosd-test-harness.ae b/code/src/replicated-osd/rosd-test-harness.ae index 2bfb846..f820d0c 100644 --- a/code/src/replicated-osd/rosd-test-harness.ae +++ b/code/src/replicated-osd/rosd-test-harness.ae @@ -34,6 +34,7 @@ triton_ret_t rosd_test_harness_parseargs(int argc, char** argv, int rank, memset(options, 0, sizeof(*options)); triton_uint128_setzero(options->write_oid); + triton_uint128_setzero(options->read_oid); if(argc != 7) { @@ -311,6 +312,11 @@ __blocking triton_ret_t rosd_test_harness_read(struct rosd_test_harness_options* { oid.l++; target_oid = oid; + if(!triton_uint128_iszero(options->read_oid)) + { + /* override oid to read from */ + triton_uint128_set(options->read_oid, target_oid); + } triton_mutex_unlock(&oid_mutex); /* NOTE: passing in 128 as the size, but we expect a diff --git a/code/src/replicated-osd/rosd-test-harness.hae b/code/src/replicated-osd/rosd-test-harness.hae index c3f1f66..0cf9f89 100644 --- a/code/src/replicated-osd/rosd-test-harness.hae +++ b/code/src/replicated-osd/rosd-test-harness.hae @@ -29,6 +29,7 @@ struct rosd_test_harness_options int nservers; int replication_factor; uint128_t write_oid; /* if non-zero, forces all ops to same oid on write */ + uint128_t read_oid; /* if non-zero, forces all ops to same oid on read */ }; triton_ret_t rosd_test_harness_parseargs(int argc, char** argv, int rank, diff --git a/code/src/replicated-osd/tests/module.mk.in b/code/src/replicated-osd/tests/module.mk.in index 66e2a68..2df1337 100644 --- a/code/src/replicated-osd/tests/module.mk.in +++ b/code/src/replicated-osd/tests/module.mk.in @@ -14,6 +14,12 @@ MODLDFLAGS_$(DIR)/rosd-txn-nr-test = $(MPILDFLAGS) MODLIBS_$(DIR)/rosd-txn-nr-test = $(MPILIBS) MODCC_$(DIR)/rosd-txn-nr-test = $(MPICC) +AETESTSRC += $(DIR)/rosd-read-failover.ae +MODCFLAGS_$(DIR)/rosd-read-failover = $(MPICFLAGS) +MODLDFLAGS_$(DIR)/rosd-read-failover = $(MPILDFLAGS) +MODLIBS_$(DIR)/rosd-read-failover = $(MPILIBS) +MODCC_$(DIR)/rosd-read-failover = $(MPICC) + endif # BUILD_MPI MODLIBS_$(DIR) = -lpthread -ldb diff --git a/code/src/replicated-osd/tests/rosd-read-failover.ae b/code/src/replicated-osd/tests/rosd-read-failover.ae new file mode 100644 index 0000000..3bcb745 --- /dev/null +++ b/code/src/replicated-osd/tests/rosd-read-failover.ae @@ -0,0 +1,263 @@ +#include <sys/types.h> +#include <unistd.h> +#include <limits.h> +#include <stdlib.h> + +#include "src/common/triton-types.h" +#include "src/common/triton-debug.h" +#include "src/aesop/hints.h" +#include "src/aesop/aesop.h" +#include "src/remote/client-server-exec.hae" +#include "src/replicated-osd/rosd-test-harness.hae" +#include "src/mapping/mapping.hae" +#include "src/zeroconf/zeroconf.h" +#include "src/fakess/fakess.hae" +#include "src/replicated-osd/rosd_stubs.hae" +#include "src/common/traffic-cop.hae" +#include "src/placement/placement.hae" + +/* NOTES: + * + * Run this test with 3 or more processes. One process (the last one) will + * be a client, and the remainder will be servers. A single object will be + * created and replicated across all servers and a small amount of data will + * be written to it. The client will then continuously read the same data + * back from one server. Faults can be injected in servers to test failover + * capability. + */ + +#include "mpi.h" + +#define POLL_TIMEOUT 1000 + +static __blocking triton_ret_t rosd_client_fn(int nservers, int nclients, void* data, MPI_Comm client_comm); +static triton_ret_t parseargs(int argc, char** argv, int rank, + struct rosd_test_harness_options* options, int* read_delay_seconds); +static void usage(void); + +triton_ret_t main_tret; +static int done = 0; +static void cb(void *up, triton_ret_t tret) +{ + main_tret = tret; + done=1; + ae_poll_break(NULL); +} + +int main(int argc, char *argv[]) +{ + triton_ret_t ret; + ae_op_id_t op_id; + ae_hints_t hints; + int rank; + int nprocs; + int mpi_ret; + int provided; + struct rosd_test_harness_options options; + int read_delay_seconds = 0; + + mpi_ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &provided); + assert(mpi_ret == MPI_SUCCESS); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &nprocs); + + /* parse command line */ + ret = parseargs(argc, argv, rank, &options, &read_delay_seconds); + if(ret != TRITON_SUCCESS) + { + return(-1); + } + + if(options.nservers < 2 || (nprocs - options.nservers) < 1) + { + fprintf(stderr, "Error: not enough procs.\n"); + return(-1); + } + + ae_hints_init(&hints); + ret = ae_post_blocking(triton_launch_client_server, cb, NULL, &hints, NULL, &op_id, &main_tret, options.nservers, &options, rosd_client_fn, rosd_test_harness_server_fn); + triton_error_assert(ret); + while(!done) + { + ae_poll(NULL, POLL_TIMEOUT); + } + ae_hints_destroy(&hints); + + if(main_tret != TRITON_SUCCESS) + fprintf(stderr, "Error: test failed.\n"); + + MPI_Finalize(); + + return 0; +} + +static __blocking triton_ret_t rosd_client_fn(int nservers, int nclients, void* data, MPI_Comm client_comm) +{ + triton_ret_t ret; + char* hostfile; + int client_rank; + double create_elapsed_time, create_min_elapsed_time, create_rate; + double write_elapsed_time, write_min_elapsed_time, write_rate; + int mpi_ret; + struct rosd_test_harness_options* options = (struct rosd_test_harness_options*)data; + struct rosd_read_req req; + struct rosd_read_resp resp; + triton_addr_t svr_addr; + triton_node_t svr_node; + uint128_t target_oid; + uint64_t niid; + uint64_t oid_fork = 0; + int64_t size = 128; + int64_t offset = 0; + uint32_t flags = 0; + + + MPI_Comm_rank(client_comm, &client_rank); + + /* start up triton */ + ret = triton_init("triton.client"); + triton_error_assert(ret); + + /* initialize fakess and placement components */ + hostfile = triton_map_generate_mapfile(nservers); + if(!hostfile) + return(TRITON_ERR_INVAL); + ret = triton_map_file(hostfile); + if(ret != TRITON_SUCCESS) + { + free(hostfile); + return(ret); + } + ret = triton_fakess_load_map(); + triton_map_destroy_mapfile(hostfile); + if(ret != TRITON_SUCCESS) + { + return(ret); + } + + if(client_rank == 0) + printf("# creating object.\n"); + ret = rosd_test_harness_create(options, client_comm, &create_min_elapsed_time, &create_elapsed_time, &create_rate); + triton_error_assert(ret); + sleep(1); + + if(client_rank == 0) + printf("# writing object.\n"); + ret = rosd_test_harness_write(options, client_comm, &write_min_elapsed_time, &write_elapsed_time, &write_rate); + triton_error_assert(ret); + sleep(2); + + ret = aer_init_struct_rosd_read_req(&req, &target_oid, &oid_fork, &size, &offset, &flags); + triton_error_assert(ret); + + printf("# Running read loop:\n"); + while(1) + { + /* TODO: make this interval configurable */ + sleep(1); + printf("."); + + ret = TRITON_SUCCESS; + svr_addr = TRITON_ADDR_NULL; + niid = traffic_cop_rpc_register(); + do + { + if(traffic_cop_rpc_should_remap(niid, svr_addr, ret)) + { + ret = triton_place_lookup(target_oid, 1, &svr_node); + triton_error_assert(ret); + ret = triton_map_lookup_node(svr_node, &svr_addr); + triton_error_assert(ret); + } + + ret = remote_rosd_read(AER_DEFAULT_CTX, svr_addr, &req, &resp); + if(ret != TRITON_SUCCESS) + { + fprintf(stderr, "Error: rosd_read() failure.\n"); + } + else + { + aer_destroy_struct_rosd_read_resp(&resp); + } + }while(traffic_cop_rpc_should_retry(niid, svr_addr, ret)); + + traffic_cop_rpc_unregister(niid); + } + aer_destroy_struct_rosd_read_req(&req); + + return(TRITON_SUCCESS); +} + +static triton_ret_t parseargs(int argc, char** argv, int rank, + struct rosd_test_harness_options* options, int* read_delay_seconds) +{ + char rank_suffix[10]; + int scan_ret; + int nprocs; + + MPI_Comm_size(MPI_COMM_WORLD, &nprocs); + + memset(options, 0, sizeof(*options)); + triton_uint128_setzero(options->write_oid); + triton_uint128_setzero(options->read_oid); + + if(argc != 4) + { + usage(); + return(TRITON_ERR_INVAL); + } + + scan_ret = sscanf(argv[1], "%s", options->db_path); + if(scan_ret != 1) + { + usage(); + return(TRITON_ERR_INVAL); + } + /* append rank number to avoid collisions */ + sprintf(rank_suffix, "%d", rank); + strcat(options->db_path, rank_suffix); + + scan_ret = sscanf(argv[2], "%s", options->log_path); + if(scan_ret != 1) + { + usage(); + return(TRITON_ERR_INVAL); + } + /* append rank number to avoid collisions */ + sprintf(rank_suffix, "%d", rank); + strcat(options->log_path, rank_suffix); + + scan_ret = sscanf(argv[3], "%d", read_delay_seconds); + if(scan_ret != 1 || *read_delay_seconds < 0) + { + usage(); + return(TRITON_ERR_INVAL); + } + + options->nobjects = 1; + options->nconcurrent = 1; + options->nservers = nprocs - 1; + options->replication_factor = nprocs-1; + + return(TRITON_SUCCESS); +} + +static void usage(void) +{ + fprintf(stderr, + "Usage: testprogram <db path> <log path> <seconds between reads>\n"); + + return; +} + + + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ts=8 sts=4 sw=4 expandtab + */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. c26016ba72b997dff128f3258465f13436919137
by noreply＠mcs.anl.gov 29 Nov '11

29 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via c26016ba72b997dff128f3258465f13436919137 (commit) via 2f0416228f028132be435ad64cdbcea3ba4338d3 (commit) via 0070eea73bd75143366ad2f396ccb64b183c6548 (commit) via 5d924ba098c29b6e9648bb91c17d9872ff145d85 (commit) from 7a0e3c2512b661cf395f68070297e8a9ceda0560 (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 c26016ba72b997dff128f3258465f13436919137 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Nov 29 10:02:04 2011 -0600 Fix test commit 2f0416228f028132be435ad64cdbcea3ba4338d3 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Nov 29 10:01:37 2011 -0600 Allow valgrind commit 0070eea73bd75143366ad2f396ccb64b183c6548 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Nov 29 09:41:53 2011 -0600 Print debug messages to stderr so they appear before failures commit 5d924ba098c29b6e9648bb91c17d9872ff145d85 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 16:52:39 2011 -0600 New etags target ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 7 +++++++ code/src/common/triton-init.c | 20 ++++++++++---------- code/src/state/test/local.ae | 2 +- code/src/state/test/local.sh | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 8ed5128..0777eea 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -667,6 +667,13 @@ cscope: tags:: find @SRC_ABSOLUTE_TOP@ -regex ".*\.$c\|h\|ae\|hae\|aer\|haer$" | ctags -L- --excmd=pattern -B --extra=+f --langmap=c:+.ae.aer.hae.haer -I pwait,pbranch -f @SRC_ABSOLUTE_TOP@/tags +etags: +# Note: this only reads src and prunes the test directories + cd @SRC_ABSOLUTE_TOP@ ; find src \ + -name test -prune -o -name tests -prune -o \ + -regex ".*\.$c\|h\|ae\|hae\|aer\|haer$" -print \ + | xargs etags + #%.txt: %.doc # $(srcdir)/maint/handle-ditaa.py -j $(srcdir)/maint/ditaa/ditaa.jar -d $(dir $@) $< > $@ # diff --git a/code/src/common/triton-init.c b/code/src/common/triton-init.c index ea8a600..11ddcb0 100644 --- a/code/src/common/triton-init.c +++ b/code/src/common/triton-init.c @@ -76,7 +76,7 @@ static void triton_init_init(void) init_debugstr = getenv("triton_init_debug"); if(init_debugstr) init_debug = atoi(init_debugstr); - + triton_init_initialized = 1; } @@ -84,13 +84,13 @@ static void destroy_init_entry(void *e) { struct init_entry *entry = (struct init_entry *)e; struct dep_entry *pos, *scratch; - + triton_list_for_each_entry(pos, scratch, &entry->deps, struct dep_entry, dlink) { triton_list_del(&pos->dlink); free(pos); } - + free(e); } @@ -153,7 +153,7 @@ triton_ret_t _triton_init_register( triton_list_link_clear(&dep->dlink); triton_queue_enqueue(&dep->dlink, &entry->deps); } - + triton_list_link_clear(&entry->hlink); triton_hash_add(init_table, entry->name, &entry->hlink); triton_list_link_clear(&entry->llink); @@ -169,7 +169,7 @@ static triton_ret_t handle_entry(struct init_entry *entry) struct init_entry *centry, *tmpentry; struct dep_entry *dep, *tmpdep; - if(init_debug) printf("[init]: handling init of %s\n", entry->name); + if(init_debug) fprintf(stderr, "[init]: handling init of %s\n", entry->name); if(entry->initialized) { @@ -229,7 +229,7 @@ static triton_ret_t handle_entry(struct init_entry *entry) /* dep hasn't been initialized, so we put ourselves on the stack, and recursively call handle_entry with dep */ triton_stack_push(&entry->clink, &circle_check); - if(init_debug) printf("[init]: %s depends on %s\n", entry->name, dep_entry->name); + if(init_debug) fprintf(stderr, "[init]: %s depends on %s\n", entry->name, dep_entry->name); ret = handle_entry(dep_entry); triton_stack_pop(&circle_check); @@ -242,7 +242,7 @@ static triton_ret_t handle_entry(struct init_entry *entry) /* all deps should be initialized now. initialize ourselves and return */ if(entry->init) { - if(init_debug) printf("[init]: initializing: %s\n", entry->name); + if(init_debug) fprintf(stderr, "[init]: initializing: %s\n", entry->name); ret = entry->init(); if(ret != TRITON_SUCCESS) { @@ -325,7 +325,7 @@ triton_ret_t _triton_init(const char *format __attribute__((unused)), int count, triton_list_for_each_entry( entry, tmpentry, &init_order, struct init_entry, ilink) { - if(init_debug) printf("[init]: initializing (stage2): %s\n", entry->name); + if(init_debug) fprintf(stderr, "[init]: initializing (stage2): %s\n", entry->name); if(entry->init_stage2) { ret = entry->init_stage2(); @@ -350,12 +350,12 @@ void triton_finalize(void) triton_list_link_clear(&entry->ilink); if(entry->finalize && entry->initialized) { - if(init_debug) printf("[init]: finalizing: %s\n", entry->name); + if(init_debug) fprintf(stderr, "[init]: finalizing: %s\n", entry->name); entry->finalize(); } entry->initialized = 0; } - + triton_init_finalize(); } diff --git a/code/src/state/test/local.ae b/code/src/state/test/local.ae index 084ea8d..425c51a 100644 --- a/code/src/state/test/local.ae +++ b/code/src/state/test/local.ae @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) ae_context_t ctx; ae_hints_t hints; - triton_init(); + triton_init("triton.client"); // triton_debug_enable("/dev/stdout", "fakess"); diff --git a/code/src/state/test/local.sh b/code/src/state/test/local.sh index 15b7b11..06cb0f2 100755 --- a/code/src/state/test/local.sh +++ b/code/src/state/test/local.sh @@ -8,7 +8,7 @@ BIN=${SCRIPT//+(${SRCDIR}\/|.sh)} OUT=${BIN}.out HOSTS=${SRCDIR}/src/mapping/test/hosts2.txt -mpiexec -l -n 3 ${BIN} ${HOSTS} > ${OUT} 2>&1 +mpiexec -l -n 3 ${VALGRIND} ${BIN} ${HOSTS} > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 LINES=$( grep "got: sample_value" ${OUT} | wc -l ) hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 7a0e3c2512b661cf395f68070297e8a9ceda0560
by noreply＠mcs.anl.gov 28 Nov '11

28 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 7a0e3c2512b661cf395f68070297e8a9ceda0560 (commit) from 73faaaec2cba648adbfab954fd66c43555fb5c68 (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 7a0e3c2512b661cf395f68070297e8a9ceda0560 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 14:02:32 2011 -0600 Undo net mpi mistake ----------------------------------------------------------------------- Summary of changes: code/src/net/mpi/mpi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/net/mpi/mpi.c b/code/src/net/mpi/mpi.c index 3730b93..7079434 100644 --- a/code/src/net/mpi/mpi.c +++ b/code/src/net/mpi/mpi.c @@ -683,6 +683,7 @@ static triton_ret_t mpi_context_init(struct mpi_context **c) ctx->array_size = MPI_TESTCOUNT_MAXSIZE; ctx->array_count = 0; + ctx->stop_thread = 0; tret = AE_OPCACHE_INIT(struct mpi_op, op, ctx->array_size, &ctx->opcache); if(tret != TRITON_SUCCESS) @@ -779,7 +780,6 @@ static triton_ret_t mpi_context_init(struct mpi_context **c) return TRITON_ERR_UNKNOWN; } } - ctx->stop_thread = 0; *c = ctx; context_count++; hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 73faaaec2cba648adbfab954fd66c43555fb5c68
by noreply＠mcs.anl.gov 28 Nov '11

28 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 73faaaec2cba648adbfab954fd66c43555fb5c68 (commit) from f8204773dd7121c43d05b00ced3b70547065ae82 (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 73faaaec2cba648adbfab954fd66c43555fb5c68 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:46:31 2011 -0600 Fix git mistake ----------------------------------------------------------------------- Summary of changes: code/src/placement/test/hostmap2.ae | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) Diff of changes: diff --git a/code/src/placement/test/hostmap2.ae b/code/src/placement/test/hostmap2.ae index 43a216d..ebf5686 100644 --- a/code/src/placement/test/hostmap2.ae +++ b/code/src/placement/test/hostmap2.ae @@ -34,11 +34,7 @@ int main(int argc, char *argv[]) triton_string_t errors[8]; triton_ret_t ret; -<<<<<<< Updated upstream if (argc != 2) -======= - if (argc == 2) ->>>>>>> Stashed changes { printf("hostmap2: requires input file!\n"); exit(1); hooks/post-receive -- Triton Repository

1 0

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

28 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via f8204773dd7121c43d05b00ced3b70547065ae82 (commit) via 77516e4bca0d2abf6ae34573a4a48f7af2b5b47b (commit) from 6e84b40e534199d18e00c78e1f7a0dc945001f7f (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 f8204773dd7121c43d05b00ced3b70547065ae82 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:33:49 2011 -0600 No change commit 77516e4bca0d2abf6ae34573a4a48f7af2b5b47b Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:27:43 2011 -0600 No real change ----------------------------------------------------------------------- Summary of changes: code/src/placement/test/hostmap2.ae | 4 ++++ code/src/placement/test/hostmap2.sh | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/placement/test/hostmap2.ae b/code/src/placement/test/hostmap2.ae index ebf5686..43a216d 100644 --- a/code/src/placement/test/hostmap2.ae +++ b/code/src/placement/test/hostmap2.ae @@ -34,7 +34,11 @@ int main(int argc, char *argv[]) triton_string_t errors[8]; triton_ret_t ret; +<<<<<<< Updated upstream if (argc != 2) +======= + if (argc == 2) +>>>>>>> Stashed changes { printf("hostmap2: requires input file!\n"); exit(1); diff --git a/code/src/placement/test/hostmap2.sh b/code/src/placement/test/hostmap2.sh index 57a30f2..74a74f8 100755 --- a/code/src/placement/test/hostmap2.sh +++ b/code/src/placement/test/hostmap2.sh @@ -20,21 +20,20 @@ check() [[ -n ${TRITON_SCRIPT_DEBUG} ]] && set -x -shopt -s extglob SCRIPT=$0 -BIN=${SCRIPT//+(${SRCDIR}\/|.sh)} +BIN=${SCRIPT%.sh} OUT=${BIN}.out # Test with sorted input... -${BIN} ${SRCDIR}/src/mapping/test/hosts8.txt > ${OUT} 2>&1 +${BIN} ${SRCDIR}/src/mapping/test/hosts8.txt > ${OUT} 2>&1 || exit 1 check ${OUT} 8 0000000000000001.0000000000000000 || exit 1 # Test with shuffled input... -${BIN} ${SRCDIR}/src/mapping/test/hosts8-s.txt > ${OUT} 2>&1 +${BIN} ${SRCDIR}/src/mapping/test/hosts8-s.txt > ${OUT} 2>&1 || exit 1 check ${OUT} 8 0000000000000001.0000000000000000 || exit 1 # Test with insufficient input... -${BIN} ${SRCDIR}/src/mapping/test/hosts1b.txt > ${OUT} 2>&1 +${BIN} ${SRCDIR}/src/mapping/test/hosts1b.txt > ${OUT} 2>&1 || exit 1 check ${OUT} 1 0000000000000001.0000000000000000 || exit 1 grep TRITON_ERR_NO_SERVERS ${OUT} > /dev/null 2>&1 || exit 1 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 6e84b40e534199d18e00c78e1f7a0dc945001f7f
by noreply＠mcs.anl.gov 28 Nov '11

28 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via 6e84b40e534199d18e00c78e1f7a0dc945001f7f (commit) via 90feb003e935237fa11fb8810ee50032c84eff04 (commit) via 64fe27e16a3806e34c6a56c7da6a242b36d26985 (commit) via 9a4291d5f7942fbb835bb53ff6b5927c1a1b5e90 (commit) from eac9041211be5126e1a06d583b1f58459581d25f (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 6e84b40e534199d18e00c78e1f7a0dc945001f7f Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:23:31 2011 -0600 No real changes commit 90feb003e935237fa11fb8810ee50032c84eff04 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:22:37 2011 -0600 Not sure what happened here commit 64fe27e16a3806e34c6a56c7da6a242b36d26985 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:10:32 2011 -0600 Test bug fix commit 9a4291d5f7942fbb835bb53ff6b5927c1a1b5e90 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 13:00:55 2011 -0600 No real change ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 2 +- code/src/fakess/fakess.ae | 3 ++- code/src/fakess/test/shutdown.sh | 5 +++-- code/src/net/mpi/mpi.c | 2 +- code/src/placement/test/hostmap2.ae | 6 +++++- code/src/state/state-client.haer | 3 +++ code/src/state/test/rosd-injection.ae | 6 ++++-- 7 files changed, 19 insertions(+), 8 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index ea637fb..8ed5128 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -1,7 +1,7 @@ ############################################################### # General documentation # -# This is a single makefile that runs the entire pvfs2 build +# This is a single makefile that runs the entire Triton build # process. There are no makefiles in subdirectories. For a # general introduction to this approach, please read this document # by Peter Miller: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index b2264f3..409610b 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -749,7 +749,8 @@ __blocking triton_ret_t triton_fakess_engine_start(void) if(fakess_ret != TRITON_ERR_CANCELED && fakess_ret != TRITON_SUCCESS) { - triton_log_error(triton_log_default, fakess_ret, "triton_fakess_recv() error.\n"); + triton_log_error(triton_log_default, fakess_ret, + "triton_fakess_recv() error.\n"); } } else diff --git a/code/src/fakess/test/shutdown.sh b/code/src/fakess/test/shutdown.sh index 973a1a3..4403ace 100755 --- a/code/src/fakess/test/shutdown.sh +++ b/code/src/fakess/test/shutdown.sh @@ -9,11 +9,12 @@ BIN=${SCRIPT//+(${SRCDIR}\/|.sh)} OUT=${BIN}.out # Test with sorted input... -mpiexec -l -n 3 ${BIN} ${SRCDIR}/src/mapping/test/hosts2.txt > ${OUT} 2>&1 +HOSTS=src/mapping/test/hosts2.txt +mpiexec -l -n 3 ${VALGRIND} ${BIN} ${HOSTS} > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 LINES=$( grep "done" ${OUT} | wc -l ) -[[ $? == 0 ]] || exit 1 +[[ ${?} == 0 ]] || exit 1 [[ ${LINES} == 3 ]] || exit 1 echo OK diff --git a/code/src/net/mpi/mpi.c b/code/src/net/mpi/mpi.c index 7079434..3730b93 100644 --- a/code/src/net/mpi/mpi.c +++ b/code/src/net/mpi/mpi.c @@ -683,7 +683,6 @@ static triton_ret_t mpi_context_init(struct mpi_context **c) ctx->array_size = MPI_TESTCOUNT_MAXSIZE; ctx->array_count = 0; - ctx->stop_thread = 0; tret = AE_OPCACHE_INIT(struct mpi_op, op, ctx->array_size, &ctx->opcache); if(tret != TRITON_SUCCESS) @@ -780,6 +779,7 @@ static triton_ret_t mpi_context_init(struct mpi_context **c) return TRITON_ERR_UNKNOWN; } } + ctx->stop_thread = 0; *c = ctx; context_count++; diff --git a/code/src/placement/test/hostmap2.ae b/code/src/placement/test/hostmap2.ae index 6a7bf33..ebf5686 100644 --- a/code/src/placement/test/hostmap2.ae +++ b/code/src/placement/test/hostmap2.ae @@ -34,7 +34,11 @@ int main(int argc, char *argv[]) triton_string_t errors[8]; triton_ret_t ret; - assert(argc == 2); + if (argc != 2) + { + printf("hostmap2: requires input file!\n"); + exit(1); + } filename = argv[1]; diff --git a/code/src/state/state-client.haer b/code/src/state/state-client.haer index 6372f3b..c3df75b 100644 --- a/code/src/state/state-client.haer +++ b/code/src/state/state-client.haer @@ -43,6 +43,9 @@ __remote __blocking triton_ret_t state_client_lookup( struct sc_lookup_pair *pair, struct sc_lookup_value *value); +/** + * Obtain the upper bound on the state propagation time + */ __remote __blocking triton_ret_t state_client_propagation( int32_t *in_nothing, int32_t *out_time); diff --git a/code/src/state/test/rosd-injection.ae b/code/src/state/test/rosd-injection.ae index 70c9095..2b5b518 100644 --- a/code/src/state/test/rosd-injection.ae +++ b/code/src/state/test/rosd-injection.ae @@ -182,7 +182,9 @@ static __blocking triton_ret_t rosd_client_fn(int nservers, int nclients, void* } // triton_status_t maintenance = TRITON_STATUS_MAINTENANCE; - triton_status_t injected = TRITON_STATUS_INJECTED; + triton_status_t injected = TRITON_STATUS_INJECTED; + int32_t *status; + int32_t ignore; /* NOTE: we aren't really operating on objects here; just using OID as a * way to map to servers. @@ -274,7 +276,7 @@ int main(int argc, char *argv[]) { return(-1); } - + if(options.nservers < 1 || (nprocs - options.nservers) < 1) { fprintf(stderr, "Error: not enough procs.\n"); hooks/post-receive -- Triton Repository

1 0

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

28 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Triton Repository". The branch, master has been updated via eac9041211be5126e1a06d583b1f58459581d25f (commit) from ce73222512049ce7d6e841321d0f693455fb90c0 (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 eac9041211be5126e1a06d583b1f58459581d25f Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Nov 28 11:37:06 2011 -0600 Bug fixes to test_results scripts ----------------------------------------------------------------------- Summary of changes: code/src/fakess/test/shutdown.sh | 2 +- code/src/state/test/local.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/fakess/test/shutdown.sh b/code/src/fakess/test/shutdown.sh index 6c09c27..973a1a3 100755 --- a/code/src/fakess/test/shutdown.sh +++ b/code/src/fakess/test/shutdown.sh @@ -9,7 +9,7 @@ BIN=${SCRIPT//+(${SRCDIR}\/|.sh)} OUT=${BIN}.out # Test with sorted input... -mpiexec -l -n 3 ${BIN} ${SRCDIR}/${SRCDIR}/src/mapping/test/hosts2.txt > ${OUT} 2>&1 +mpiexec -l -n 3 ${BIN} ${SRCDIR}/src/mapping/test/hosts2.txt > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 LINES=$( grep "done" ${OUT} | wc -l ) diff --git a/code/src/state/test/local.sh b/code/src/state/test/local.sh index d390261..15b7b11 100755 --- a/code/src/state/test/local.sh +++ b/code/src/state/test/local.sh @@ -7,8 +7,8 @@ SCRIPT=$0 BIN=${SCRIPT//+(${SRCDIR}\/|.sh)} OUT=${BIN}.out -# Test with sorted input... -mpiexec -l -n 3 ${BIN} ${SRCDIR}/${SRCDIR}/src/mapping/test/hosts2.txt > ${OUT} 2>&1 +HOSTS=${SRCDIR}/src/mapping/test/hosts2.txt +mpiexec -l -n 3 ${BIN} ${HOSTS} > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 LINES=$( grep "got: sample_value" ${OUT} | wc -l ) hooks/post-receive -- Triton Repository

1 0