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

Triton Repository branch, master, updated. 491f2184433fb34964441896eeb46438a8a32b0e
by noreply＠mcs.anl.gov 07 Jun '11

07 Jun '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 491f2184433fb34964441896eeb46438a8a32b0e (commit) via 3efa5d031c01f490db82e437f50303b697e4318b (commit) via f19838ae1bc4454d81064c05baab78b26781110a (commit) via a0077b6f4b0eb88ba5897e93a236cf54a8488e59 (commit) via 5819013c743cac1713233d445f4c74b8dbb6a9af (commit) via 3211188196d233f2703e84c0e214ca479c58554e (commit) via cbecc195acd8aadeebaa2ecb6e1084b790aba73a (commit) from 154add162e1b6d7cd3d231a3c1b4d28d23b9d601 (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 491f2184433fb34964441896eeb46438a8a32b0e Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 11:00:52 2011 -0500 const warning fix commit 3efa5d031c01f490db82e437f50303b697e4318b Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 10:50:19 2011 -0500 ROSD fault injection test works commit f19838ae1bc4454d81064c05baab78b26781110a Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 10:48:17 2011 -0500 Include zeroconf commit a0077b6f4b0eb88ba5897e93a236cf54a8488e59 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 10:47:59 2011 -0500 Drop const commit 5819013c743cac1713233d445f4c74b8dbb6a9af Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 10:27:58 2011 -0500 Ensure traffic-cop is initialized before using it commit 3211188196d233f2703e84c0e214ca479c58554e Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 09:22:51 2011 -0500 Add new states from meeting discussion commit cbecc195acd8aadeebaa2ecb6e1084b790aba73a Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Jun 7 09:21:39 2011 -0500 Note ----------------------------------------------------------------------- Summary of changes: code/src/common/traffic-cop.ae | 7 ++++- code/src/state/state-client.aer | 6 ++++ code/src/state/state.ae | 51 +++++++++++++++----------------- code/src/state/state.hae | 6 ++- code/src/state/test/rosd-injection.ae | 22 +++++++++++-- code/src/state/test/rosd-injection.sh | 8 +++-- 6 files changed, 63 insertions(+), 37 deletions(-) Diff of changes: diff --git a/code/src/common/traffic-cop.ae b/code/src/common/traffic-cop.ae index c9467be..b64977c 100644 --- a/code/src/common/traffic-cop.ae +++ b/code/src/common/traffic-cop.ae @@ -13,6 +13,8 @@ static int static_timeout = 0; static triton_mutex_t current_token_mutex = TRITON_MUTEX_INITIALIZER; static int current_token = 0; +static int initialized = 0; + /* how long to delay before telling the caller to re-map the remote * operation to a server */ @@ -35,6 +37,8 @@ __blocking triton_ret_t traffic_cop_query( { int timeout; + assert(initialized); + /* TODO: fill in this function */ if(retry_count > 5) { @@ -160,7 +164,7 @@ static triton_ret_t static_timeout_update(const char *key, const char *value) static triton_ret_t traffic_cop_init(void) { triton_ret_t tret; - + tret = triton_zeroconf_register("triton.traffic_cop.static_timeout", "0", static_timeout_update, "A static timeout can be set in the traffic cop (in millisecs)." " A value of 0 (default) disables the static timeout."); @@ -175,6 +179,7 @@ static triton_ret_t traffic_cop_init(void) return(tret); } + initialized = 1; return(TRITON_SUCCESS); } diff --git a/code/src/state/state-client.aer b/code/src/state/state-client.aer index 8a8146a..d9939ad 100644 --- a/code/src/state/state-client.aer +++ b/code/src/state/state-client.aer @@ -14,6 +14,8 @@ #include "src/remote/service.hae" +#include "src/zeroconf/zeroconf.h" + static triton_debug_mask_t debug; static triton_ret_t state_client_init(void) @@ -130,6 +132,10 @@ static void handle_state_change(triton_status_t *status) return; } +/** + Setting the status to INJECTED will prevent this from + returning the RPC successfully. +*/ __remote __blocking triton_ret_t state_client_admin_status_set( int32_t *status, triton_ignore_t *ignore) diff --git a/code/src/state/state.ae b/code/src/state/state.ae index b575b5f..28230c3 100644 --- a/code/src/state/state.ae +++ b/code/src/state/state.ae @@ -5,39 +5,36 @@ struct triton_state_funcs triton_state; triton_status_t triton_status = TRITON_STATUS_PROTO; -triton_ret_t triton_status_tostring(const triton_string_t *result, +triton_ret_t triton_status_tostring(triton_string_t *result, triton_status_t status) { - char *s = NULL; - switch (status) { - case TRITON_STATUS_PROTO: - s = "PROTO"; - break; - case TRITON_STATUS_NOMINAL: - s ="NOMINAL"; - break; - case TRITON_STATUS_RECOVERY: - s = "RECOVERY"; - break; - case TRITON_STATUS_MAINTENANCE: - s = "MAINTENANCE"; - break; - case TRITON_STATUS_INJECTED: - s = "INJECTED"; - break; - case TRITON_STATUS_FAILED: - s = "FAILED"; - break; - } - - if (s == NULL) - { - return TRITON_ERR_INVAL; + case TRITON_STATUS_PROTO: + triton_string_init(result, "PROTO"); + break; + case TRITON_STATUS_NOMINAL: + triton_string_init(result, "NOMINAL"); + break; + case TRITON_STATUS_NOMINAL_REBUILD: + triton_string_init(result, "NOMINAL_REBUILD"); + break; + case TRITON_STATUS_RECOVERY: + triton_string_init(result, "RECOVERY"); + break; + case TRITON_STATUS_MAINTENANCE: + triton_string_init(result, "MAINTENANCE"); + break; + case TRITON_STATUS_INJECTED: + triton_string_init(result, "INJECTED"); + break; + case TRITON_STATUS_UNREACHABLE: + triton_string_init(result, "UNREACHABLE"); + break; + default: + return TRITON_ERR_INVAL; } - triton_string_init(result, s); return TRITON_SUCCESS; } diff --git a/code/src/state/state.hae b/code/src/state/state.hae index 088473b..8cb34bd 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -89,6 +89,8 @@ typedef enum TRITON_STATUS_PROTO, /** The node is healthy */ TRITON_STATUS_NOMINAL, + /** The node is healthy but is participating in a rebuild */ + TRITON_STATUS_NOMINAL_REBUILD, /** The node is recovering metadata from neighbors */ TRITON_STATUS_RECOVERY, /** The node is unable to serve requests */ @@ -96,12 +98,12 @@ typedef enum /** The node is in a simulated FAILED state */ TRITON_STATUS_INJECTED, /** The node is out of the system */ - TRITON_STATUS_FAILED + TRITON_STATUS_UNREACHABLE } triton_status_t; extern triton_status_t triton_status; -triton_ret_t triton_status_tostring(const triton_string_t *result, +triton_ret_t triton_status_tostring(triton_string_t *result, triton_status_t status); #endif diff --git a/code/src/state/test/rosd-injection.ae b/code/src/state/test/rosd-injection.ae index f309d93..8daad36 100644 --- a/code/src/state/test/rosd-injection.ae +++ b/code/src/state/test/rosd-injection.ae @@ -60,6 +60,8 @@ char *hostfile; int mpi_rank; +static bool do_remote_noop_result = false; + /* __blocking void update_state() { @@ -131,6 +133,8 @@ __blocking void do_remote_shutdown(void) pbranch { ret = remote_triton_core_server_shutdown(AER_DEFAULT_CTX, mapping->addr, in, &out); + // This assertion is expected to fail: the unreachable server + // cannot be shut down triton_error_assert(ret); } } @@ -162,6 +166,7 @@ __blocking void do_remote_server(void) assert(nprocs > 1); // triton_debug_enable("/dev/stdout", "triton.fakess"); + triton_debug_enable("/dev/stdout", "net.fault"); triton_fakess_state_install(); pwait @@ -197,6 +202,9 @@ __blocking void do_remote_server(void) } #endif +/** + This function sets a success value in do_remote_noop_result +*/ __blocking void do_remote_noop(void) { triton_ret_t ret; @@ -256,16 +264,21 @@ __blocking void do_remote_noop(void) triton_timer(mpi_rank*1000-2000); ret = remote_state_client_admin_status_set (AER_DEFAULT_CTX, svr_addr, status, NULL); - triton_error_assert(ret); + if (ret != TRITON_ERR_CANCELED) + return; ret = remote_triton_core_noop(AER_DEFAULT_CTX, svr_addr, NULL, NULL); - triton_error_assert(ret); + if (ret != TRITON_ERR_CANCELED) + return; triton_mutex_lock(&oid_mutex); } triton_mutex_unlock(&oid_mutex); } } } + + do_remote_noop_result = true; + return; } static int done = 0; @@ -375,7 +388,7 @@ int main(int argc, char *argv[]) triton_error_assert(ret); /* servers */ - ret = triton_init("triton.server"); + ret = triton_init("triton.server", "triton.traffic_cop"); triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); @@ -387,7 +400,7 @@ int main(int argc, char *argv[]) else { /* clients */ - ret = triton_init("triton.client"); + ret = triton_init("triton.client", "triton.traffic_cop"); triton_error_assert(ret); } @@ -454,6 +467,7 @@ int main(int argc, char *argv[]) { ae_poll(NULL, CLIENT_POLL_TIMEOUT); } + assert(do_remote_noop_result); ae_hints_destroy(&hints); test_end = MPI_Wtime(); noop_elapsed = test_end - test_start; diff --git a/code/src/state/test/rosd-injection.sh b/code/src/state/test/rosd-injection.sh index 3026073..e3660b9 100755 --- a/code/src/state/test/rosd-injection.sh +++ b/code/src/state/test/rosd-injection.sh @@ -8,17 +8,19 @@ OUT=${BIN}.out export triton_fakess_method=fault export aesop_remote_default_net=fault +export triton_traffic_cop_static_timeout=10 # Test with sorted input... mpiexec -l -n 4 ${VALGRIND} ${BIN} /tmp/rosd.db /tmp/rosd-log \ 1 1 0 0 2 1 src/mapping/test/faulty2.txt > ${OUT} 2>&1 -[[ $? == 0 ]] || exit 1 +# This is expected to fail +[[ $? != 0 ]] || exit 1 LINES=$( grep "status change:" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 -[[ ${LINES} == 6 ]] || exit 1 +[[ ${LINES} == 5 ]] || exit 1 -grep "entering faulty state" ${OUT} | exit 1 +grep "entering faulty state" ${OUT} || exit 1 echo OK exit 0 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 154add162e1b6d7cd3d231a3c1b4d28d23b9d601
by noreply＠mcs.anl.gov 07 Jun '11

07 Jun '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 154add162e1b6d7cd3d231a3c1b4d28d23b9d601 (commit) from b4689cf8ef6b98afba0cab6afa86bf51679f981d (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 154add162e1b6d7cd3d231a3c1b4d28d23b9d601 Author: Kevin Harms <harms(a)bblogin1.mcs.anl.gov> Date: Tue Jun 7 00:19:48 2011 -0500 Add support for TEST_READ, TEST_WRITE. ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 93 +++++++++++++++++++++++++++++++++-- 1 files changed, 88 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 9eb51fc..120154b 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -3,6 +3,7 @@ #include "src/common/resources/aesocket/aesocket.hae" #include "src/common/resources/timer/timer.hae" #include "src/socket/test/echo-server.h" +#include "src/versioned-osd/prototype/file-resource/file-resource.hae" #include <sys/types.h> #include <sys/socket.h> @@ -33,6 +34,8 @@ static __blocking void handleConnection( struct test_request req; struct test_response resp; int end_loop = 1; + int file_fd; + int error_code; resp.error_code = 0; @@ -85,7 +88,6 @@ static __blocking void handleConnection( // printf("Serviced a READ_NULL request.\n"); break; case TEST_WRITE_NULL: -//printf("write_null request\n"); ret = triton_read(fd, buffer, req.size, &len); if (ret != TRITON_SUCCESS) { @@ -93,7 +95,6 @@ static __blocking void handleConnection( end_loop = 1; break; } -//printf("request size: %d len:%d\n", req.size, len); assert(len == req.size); ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) @@ -103,12 +104,94 @@ static __blocking void handleConnection( break; } assert(written == sizeof(resp)); - //printf("Serviced a WRITE_NULL request.\n"); break; case TEST_READ: - /* not implemented */ + ret = file_open(&file_fd, + req.filename, + (O_CREAT|O_TRUNC|O_WRONLY), + 0644); + if (ret == TRITON_SUCCESS) + { + ret = file_pread(file_fd, + buffer, + req.size, + 0); + if (ret == TRITON_SUCCESS) + { + ret = triton_write(fd, buffer, req.size, &written); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on triton_write"); + } + assert(written == req.size); + } + else + { + triton_error_print(ret, "error on file_pread"); + } + ret = file_close(file_fd); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on file_close"); + } + } + else + { + triton_error_print(ret, "error on file_open"); + break; + } + ret = triton_write(fd, &resp, sizeof(resp), &written); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on write:"); + end_loop = 1; + break; + } + assert(written == sizeof(resp)); + break; case TEST_WRITE: - /* not implemented */ + ret = triton_read(fd, buffer, req.size, &len); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on write:"); + end_loop = 1; + break; + } + assert(len == req.size); + ret = file_open(&file_fd, + req.filename, + (O_CREAT|O_TRUNC|O_WRONLY), + 0644); + if (ret == TRITON_SUCCESS) + { + ret = file_pwrite(file_fd, + buffer, + req.size, + 0); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on file_pwrite"); + } + ret = file_close(file_fd); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on file_close"); + } + } + else + { + triton_error_print(ret, "error on file_open"); + break; + } + ret = triton_write(fd, &resp, sizeof(resp), &written); + if (ret != TRITON_SUCCESS) + { + triton_error_print(ret, "error on write:"); + end_loop = 1; + break; + } + assert(written == sizeof(resp)); + break; default: assert(0); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. b4689cf8ef6b98afba0cab6afa86bf51679f981d
by noreply＠mcs.anl.gov 06 Jun '11

06 Jun '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 b4689cf8ef6b98afba0cab6afa86bf51679f981d (commit) via 52a1a27a502c573e2170b2d7aa1cadf18d1532a5 (commit) via 3265e018633ebc909240373de7602cecc98f3d14 (commit) via 6fc4b60c92aed47b0f8da0013403ffbc53c10d21 (commit) via c0b612d0f6d24bb30c7eb79c82fa4e6ed2bb28ba (commit) from 967ecd50221f0e1ae5febcc171c47c82a6761b41 (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 b4689cf8ef6b98afba0cab6afa86bf51679f981d Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 16:18:09 2011 -0500 Skip cursor ahead to first valid oid commit 52a1a27a502c573e2170b2d7aa1cadf18d1532a5 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 15:55:41 2011 -0500 Remove redundant notes commit 3265e018633ebc909240373de7602cecc98f3d14 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 15:54:56 2011 -0500 Cleanups commit 6fc4b60c92aed47b0f8da0013403ffbc53c10d21 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 15:34:23 2011 -0500 goto-free loop logic commit c0b612d0f6d24bb30c7eb79c82fa4e6ed2bb28ba Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 15:17:02 2011 -0500 Cut out unused DB operations in vosd_range() ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 170 ++++----------------- 1 files changed, 28 insertions(+), 142 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index e621652..cd314ea 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -2224,36 +2224,24 @@ __blocking triton_ret_t vosd_range(int count, triton_ret_t tret; triton_ret_t tret_tmp; DB_TXN *txn; - DBC *log_map_dbcp, *missing_ver_dbcp, *ver_dbcp, *niid_dbcp; - DBT log_map_key, missing_ver_key, ver_key, nd_key; - DBT log_map_value, missing_ver_value, ver_value, nd_value; + DBC *ver_dbcp; + DBT ver_key; + DBT ver_value; int c_get_flag = DB_SET_RANGE; - char oid_str[TRITON_UINT128_STRLEN]; - struct niid_key nkey; - struct niid_value nvalue; - struct logical_map_key lmk; - struct missing_version mvk; - uint128_t vk = triton_uint128_from_uint64(0); - struct logical_map_entry lmv; + uint128_t vk = lower; uint64_t vv; int current; - int pointer; + int index; VOSD_CHECK(); /* keys for each db */ - VOSD_INIT_DBT(log_map_key, lmk); - VOSD_INIT_DBT(missing_ver_key, mvk); VOSD_INIT_DBT(ver_key, vk); - VOSD_INIT_DBT(nd_key, nkey); /* values for each db */ - VOSD_INIT_DBT(log_map_value, lmv); - VOSD_INIT_DBT_EMPTY(missing_ver_value); VOSD_INIT_DBT(ver_value, vv); - VOSD_INIT_DBT(nd_value, nvalue); /* NOTE: We do not attempt to retry here if a deadlock is encountered. * This function should only be called when VOSD is in a quiescent @@ -2267,161 +2255,59 @@ __blocking triton_ret_t vosd_range(int count, return(tret); } - /* create cursors on all 3 dbs */ - tret = bdb_cursor(log_map_dbp, txn, &log_map_dbcp, 0); - if(tret != TRITON_SUCCESS) - { - printf(" *** INCOMPLETE: error opening cursor.\n"); - tret_tmp = throttle_bdb_txn_abort(txn); - triton_error_destroy(tret_tmp); - return(tret); - } tret = bdb_cursor(ver_dbp, txn, &ver_dbcp, 0); if(tret != TRITON_SUCCESS) { printf(" *** INCOMPLETE: error opening cursor.\n"); - tret_tmp = bdb_cursor_close(log_map_dbcp); - triton_error_destroy(tret_tmp); - tret_tmp = throttle_bdb_txn_abort(txn); - triton_error_destroy(tret_tmp); - return(tret); - } - tret = bdb_cursor(missing_ver_dbp, txn, &missing_ver_dbcp, 0); - if(tret != TRITON_SUCCESS) - { - printf(" *** INCOMPLETE: error opening cursor.\n"); - tret_tmp = bdb_cursor_close(ver_dbcp); - triton_error_destroy(tret_tmp); - tret_tmp = bdb_cursor_close(log_map_dbcp); - triton_error_destroy(tret_tmp); tret_tmp = throttle_bdb_txn_abort(txn); triton_error_destroy(tret_tmp); return(tret); } /* loop through version db, one entry per object */ - tret = bdb_cursor_get(ver_dbcp, &ver_key, &ver_value, DB_NEXT); + tret = bdb_cursor_get(ver_dbcp, &ver_key, &ver_value, DB_SET_RANGE); /* loop counter */ current = 0; /* offset into output oids */ - pointer = 0; + index = 0; while (tret == TRITON_SUCCESS) { - if (triton_cmp_uint128(vk, lower) == -1 || - triton_cmp_uint128(vk, upper) == 1) - goto next; - if (current < offset) - goto skip; - if (pointer >= count) - break; - - oids[pointer] = vk; - - pointer++; - - triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, vk); - - /* search for any missing versions */ - mvk.oid = vk; - mvk.version = 0; - c_get_flag = DB_SET_RANGE; - tret = bdb_cursor_get(missing_ver_dbcp, - &missing_ver_key, &missing_ver_value, c_get_flag); - while(tret == TRITON_SUCCESS) - { - c_get_flag = DB_NEXT; - tret = bdb_cursor_get(missing_ver_dbcp, - &missing_ver_key, &missing_ver_value, c_get_flag); - } - if(tret != TRITON_ERR_NOENT) - { - printf(" *** INCOMPLETE: error getting missing versions.\n"); - tret_tmp = bdb_cursor_close(ver_dbcp); - triton_error_destroy(tret_tmp); - tret_tmp = bdb_cursor_close(log_map_dbcp); - triton_error_destroy(tret_tmp); - tret_tmp = bdb_cursor_close(missing_ver_dbcp); - triton_error_destroy(tret_tmp); - tret_tmp = throttle_bdb_txn_abort(txn); - triton_error_destroy(tret_tmp); - return(tret); - } triton_error_destroy(tret); - /* search for logical map entries */ - lmk.oid = vk; - lmk.oid_fork = 0; - lmk.logical_offset_end = 0; - c_get_flag = DB_SET_RANGE; - tret = bdb_cursor_get(log_map_dbcp, &log_map_key, - &log_map_value, c_get_flag); - while(tret == TRITON_SUCCESS && triton_cmp_uint128(lmk.oid, vk) == 0) - { - printf("fork: %llu, logical_off: %lld, logical_end: %lld, size: %lld, log_off: %lld, ver: %llu\n", - llu(lmk.oid_fork), - lld(lmv.logical_offset), lld(lmv.logical_offset_end), - lld(lmv.size), lld(lmv.log_offset), llu(lmv.version)); - c_get_flag = DB_NEXT; - tret = bdb_cursor_get(log_map_dbcp, &log_map_key, - &log_map_value, c_get_flag); - } - if(tret != TRITON_SUCCESS && tret != TRITON_ERR_NOENT) + if (index >= count) + break; + + if (triton_cmp_uint128(vk, lower) != -1 && + triton_cmp_uint128(vk, upper) != 1) { - printf(" *** INCOMPLETE: error getting missing versions.\n"); - tret = bdb_cursor_close(ver_dbcp); - triton_error_destroy(tret_tmp); - tret = bdb_cursor_close(log_map_dbcp); - triton_error_destroy(tret_tmp); - tret = bdb_cursor_close(missing_ver_dbcp); - triton_error_destroy(tret_tmp); - tret = throttle_bdb_txn_abort(txn); - triton_error_destroy(tret_tmp); - return(tret); + if (current >= offset) + { + oids[index] = vk; + index++; + } + current++; } - triton_error_destroy(tret); - - skip: - current++; - next: tret = bdb_cursor_get(ver_dbcp, &ver_key, &ver_value, DB_NEXT); } - if (tret != TRITON_SUCCESS) - triton_error_destroy(tret); + if (tret != TRITON_SUCCESS && + tret != TRITON_ERR_NOENT) + { + triton_error_print(tret, "vosd_range(): "); + return(tret); + } - tret = bdb_cursor_close(log_map_dbcp); triton_error_destroy(tret); + tret = bdb_cursor_close(ver_dbcp); + triton_error_assert(tret); triton_error_destroy(tret); - tret = bdb_cursor_close(missing_ver_dbcp); - triton_error_destroy(tret); - - /* dump niid database all at once*/ - tret = bdb_cursor(niid_dbp, txn, &niid_dbcp, 0); - if(tret != TRITON_SUCCESS) - { - printf(" *** INCOMPLETE: error opening cursor.\n"); - tret_tmp = throttle_bdb_txn_abort(txn); - triton_error_destroy(tret_tmp); - return(tret); - } - nkey.oid = triton_uint128_from_uint64(0); - nkey.niid = 0; - nkey.op_type = 0; - tret = bdb_cursor_get(niid_dbcp, &nd_key, &nd_value, DB_NEXT); - while (tret == TRITON_SUCCESS) - { - triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, nkey.oid); - printf("OID: %s, NIID: %llu, op_type: %d, timestamp: %lld\n", oid_str, - llu(nkey.niid), nkey.op_type, lld(nvalue.timestamp)); - tret = bdb_cursor_get(niid_dbcp, &nd_key, &nd_value, DB_NEXT); - } - tret = bdb_cursor_close(niid_dbcp); tret = throttle_bdb_txn_commit(txn, 0); + triton_error_assert(tret); triton_error_destroy(tret); - *result = pointer; + *result = index; return(TRITON_SUCCESS); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 967ecd50221f0e1ae5febcc171c47c82a6761b41
by noreply＠mcs.anl.gov 06 Jun '11

06 Jun '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 967ecd50221f0e1ae5febcc171c47c82a6761b41 (commit) via 7b8cd8863ea6cb92170306cf0415ab44044cbc1a (commit) via f84cf30a9c0c8027cf127f63226b0ddd05a7a31f (commit) from 26c361acf3465184e4405c3ea7fec2c0cf3dba16 (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 967ecd50221f0e1ae5febcc171c47c82a6761b41 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 14:53:50 2011 -0500 Now vosd_enumerate() just calls vosd_range(). New triton_uint128_setmax() commit 7b8cd8863ea6cb92170306cf0415ab44044cbc1a Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 14:16:10 2011 -0500 New vosd_range() and test (2) commit f84cf30a9c0c8027cf127f63226b0ddd05a7a31f Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Jun 6 14:15:42 2011 -0500 New vosd_range() and test ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-uint128.h | 1 + .../src/versioned-osd/prototype/tests/module.mk.in | 1 + .../prototype/tests/vosd-enumerate.ae | 15 ++++-- .../tests/{vosd-enumerate.ae => vosd-range.ae} | 51 +++++++++++++++----- code/src/versioned-osd/prototype/versioned-osd.ae | 39 +++++++++------ code/src/versioned-osd/prototype/versioned-osd.hae | 13 +++++- 6 files changed, 87 insertions(+), 33 deletions(-) copy code/src/versioned-osd/prototype/tests/{vosd-enumerate.ae => vosd-range.ae} (68%) Diff of changes: diff --git a/code/src/common/triton-uint128.h b/code/src/common/triton-uint128.h index 7761cc2..64e4942 100644 --- a/code/src/common/triton-uint128.h +++ b/code/src/common/triton-uint128.h @@ -11,6 +11,7 @@ typedef struct { uint64_t l; uint64_t u; } uint128_t; #define triton_uint128_setzero(t) t.l = 0, t.u = 0 #define triton_uint128_iszero(t) (t.l == 0 && t.u == 0) +#define triton_uint128_setmax(t) t.l = UINT64_MAX, t.u = UINT64_MAX #define triton_uint128_set(from, to) ((to).l = (from).l, (to).u = (from).u) diff --git a/code/src/versioned-osd/prototype/tests/module.mk.in b/code/src/versioned-osd/prototype/tests/module.mk.in index afa68df..3b6d38e 100644 --- a/code/src/versioned-osd/prototype/tests/module.mk.in +++ b/code/src/versioned-osd/prototype/tests/module.mk.in @@ -3,6 +3,7 @@ DIR := src/versioned-osd/prototype/tests AETESTSRC += $(DIR)/vosd1.ae AETESTSRC += $(DIR)/vosd-dump.ae AETESTSRC += $(DIR)/vosd-enumerate.ae +AETESTSRC += $(DIR)/vosd-range.ae AETESTSRC += $(DIR)/vosd-autotune.ae AETESTSRC += $(DIR)/vosd-niid.ae AETESTSRC += $(DIR)/fake1.ae diff --git a/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae b/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae index b9390ea..bef00d3 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae +++ b/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae @@ -26,17 +26,24 @@ static __blocking int do_vosd_test(void) triton_ret_t tret; int i; char oid_str[TRITON_UINT128_STRLEN]; + int result; oids = malloc(count * sizeof(uint128_t)); - tret = vosd_enumerate(count, offset, oids); + tret = vosd_enumerate(count, offset, oids, &result); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error in vosd_enumerate()\n"); triton_error_destroy(tret); return(1); } - for (i = 0; i < count; i++) + if (result < count) + { + printf("vosd-enumerate: warning: " + "requested %i oids but received %i\n", count, result); + } + + for (i = 0; i < result; i++) { triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, oids[i]); @@ -57,7 +64,7 @@ int main(int argc, char *argv[]) if(argc != 5) { - fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path>" + fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path> " "<count> <offset>\n"); return(-1); } diff --git a/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae b/code/src/versioned-osd/prototype/tests/vosd-range.ae similarity index 68% copy from code/src/versioned-osd/prototype/tests/vosd-enumerate.ae copy to code/src/versioned-osd/prototype/tests/vosd-range.ae index b9390ea..d8aff4a 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae +++ b/code/src/versioned-osd/prototype/tests/vosd-range.ae @@ -13,6 +13,8 @@ static int do_vosd_test_ret; int count; int offset; +uint128_t lower; +uint128_t upper; uint128_t *oids; static void done_callback(void *up, int ret) @@ -26,17 +28,18 @@ static __blocking int do_vosd_test(void) triton_ret_t tret; int i; char oid_str[TRITON_UINT128_STRLEN]; + int result; oids = malloc(count * sizeof(uint128_t)); - tret = vosd_enumerate(count, offset, oids); + tret = vosd_range(count, offset, lower, upper, oids, &result); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error in vosd_enumerate()\n"); triton_error_destroy(tret); return(1); } - for (i = 0; i < count; i++) + for (i = 0; i < result; i++) { triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, oids[i]); @@ -46,6 +49,8 @@ static __blocking int do_vosd_test(void) return 1; } +#define LLU long long unsigned int * + int main(int argc, char *argv[]) { triton_ret_t ret; @@ -54,32 +59,52 @@ int main(int argc, char *argv[]) int pc = 0; ae_op_id_t op_id; int c; + /** arg index */ + int arg_i = 1; - if(argc != 5) + if(argc != 7) { - fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path>" - "<count> <offset>\n"); + fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path> " + "<count> <offset> <lower> <upper>\n"); return(-1); } - ret = triton_zeroconf_set("triton.vosd.db_path", argv[1]); + ret = triton_zeroconf_set("triton.vosd.db_path", argv[arg_i++]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", argv[2]); + ret = triton_zeroconf_set("triton.vosd.data_path", argv[arg_i++]); triton_error_assert(ret); - c = sscanf(argv[3], "%i", &count); + c = sscanf(argv[arg_i], "%i", &count); if(c != 1) { - fprintf(stderr, "could not scan <count>: %s\n", argv[3]); + fprintf(stderr, "could not scan <count>: %s\n", argv[arg_i]); return(-1); } + arg_i++; - c = sscanf(argv[4], "%i", &offset); + c = sscanf(argv[arg_i], "%i", &offset); if(c != 1) { - fprintf(stderr, "could not scan <offset>: %s\n", argv[4]); + fprintf(stderr, "could not scan <offset>: %s\n", argv[arg_i]); + return(-1); + } + arg_i++; + + c = sscanf(argv[arg_i], "%llu:%llu", (LLU) &lower.u, (LLU) &lower.l); + if(c != 2) + { + fprintf(stderr, "could not scan <lower>: %s\n", argv[arg_i]); return(-1); } + arg_i++; + + c = sscanf(argv[arg_i], "%llu:%llu", (LLU) &upper.u, (LLU) &upper.l); + if(c != 2) + { + fprintf(stderr, "could not scan <upper.l>: %s\n", argv[arg_i]); + return(-1); + } + arg_i++; /* test initializing a specific component */ ret = triton_init("triton.vosd"); @@ -122,6 +147,8 @@ int main(int argc, char *argv[]) triton_finalize(); + puts("OK"); + return do_vosd_test_ret; } diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index 5dc013f..e621652 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -2115,8 +2115,6 @@ __blocking triton_ret_t vosd_dump(void) triton_error_destroy(tret); /* search for logical map entries */ - printf(" logical map:\n"); - printf(" ------------------------------------------\n"); lmk.oid = vk; lmk.oid_fork = 0; lmk.logical_offset_end = 0; @@ -2203,9 +2201,25 @@ __blocking triton_ret_t vosd_dump(void) return(TRITON_SUCCESS); } +static const int error_count_max = 8; __blocking triton_ret_t vosd_enumerate(int count, int offset, - uint128_t *oids) + uint128_t *oids, + int *result) +{ + uint128_t lower; + uint128_t upper; + triton_uint128_setzero(lower); + triton_uint128_setmax(upper); + return vosd_range(count, offset, lower, upper, oids, result); +} + +__blocking triton_ret_t vosd_range(int count, + int offset, + uint128_t lower, + uint128_t upper, + uint128_t *oids, + int *result) { triton_ret_t tret; triton_ret_t tret_tmp; @@ -2246,7 +2260,6 @@ __blocking triton_ret_t vosd_enumerate(int count, * state. This caveat allows us to simply print contents as they are * encountered without maintaining any state. */ - printf("Dumping VOSD contents...\n"); tret = throttle_bdb_txn_begin(envp, NULL, &txn, 0); if(tret != TRITON_SUCCESS) { @@ -2294,6 +2307,9 @@ __blocking triton_ret_t vosd_enumerate(int count, pointer = 0; while (tret == TRITON_SUCCESS) { + if (triton_cmp_uint128(vk, lower) == -1 || + triton_cmp_uint128(vk, upper) == 1) + goto next; if (current < offset) goto skip; if (pointer >= count) @@ -2304,12 +2320,8 @@ __blocking triton_ret_t vosd_enumerate(int count, pointer++; triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, vk); - printf("OID: %s\n", oid_str); - printf("=============================================\n"); - printf(" version: %llu\n", llu(vv)); /* search for any missing versions */ - printf(" missing versions: "); mvk.oid = vk; mvk.version = 0; c_get_flag = DB_SET_RANGE; @@ -2318,11 +2330,9 @@ __blocking triton_ret_t vosd_enumerate(int count, while(tret == TRITON_SUCCESS) { c_get_flag = DB_NEXT; - printf("%llu ", llu(mvk.version)); tret = bdb_cursor_get(missing_ver_dbcp, &missing_ver_key, &missing_ver_value, c_get_flag); } - printf("\n"); if(tret != TRITON_ERR_NOENT) { printf(" *** INCOMPLETE: error getting missing versions.\n"); @@ -2339,8 +2349,6 @@ __blocking triton_ret_t vosd_enumerate(int count, triton_error_destroy(tret); /* search for logical map entries */ - printf(" logical map:\n"); - printf(" ------------------------------------------\n"); lmk.oid = vk; lmk.oid_fork = 0; lmk.logical_offset_end = 0; @@ -2373,8 +2381,9 @@ __blocking triton_ret_t vosd_enumerate(int count, triton_error_destroy(tret); skip: - tret = bdb_cursor_get(ver_dbcp, &ver_key, &ver_value, DB_NEXT); current++; + next: + tret = bdb_cursor_get(ver_dbcp, &ver_key, &ver_value, DB_NEXT); } if (tret != TRITON_SUCCESS) @@ -2388,8 +2397,6 @@ __blocking triton_ret_t vosd_enumerate(int count, triton_error_destroy(tret); /* dump niid database all at once*/ - printf("NIIDs:\n"); - printf("=============================================\n"); tret = bdb_cursor(niid_dbp, txn, &niid_dbcp, 0); if(tret != TRITON_SUCCESS) { @@ -2409,12 +2416,12 @@ __blocking triton_ret_t vosd_enumerate(int count, llu(nkey.niid), nkey.op_type, lld(nvalue.timestamp)); tret = bdb_cursor_get(niid_dbcp, &nd_key, &nd_value, DB_NEXT); } - printf("\n"); tret = bdb_cursor_close(niid_dbcp); tret = throttle_bdb_txn_commit(txn, 0); triton_error_destroy(tret); + *result = pointer; return(TRITON_SUCCESS); } diff --git a/code/src/versioned-osd/prototype/versioned-osd.hae b/code/src/versioned-osd/prototype/versioned-osd.hae index 55de632..e468cb7 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.hae +++ b/code/src/versioned-osd/prototype/versioned-osd.hae @@ -69,7 +69,18 @@ __blocking triton_ret_t vosd_dump(void); */ __blocking triton_ret_t vosd_enumerate(int offset, int count, - uint128_t *oids); + uint128_t *oids, + int *result); +/** + * Obtain a list of all OIDs between lower and upper, inclusive + * NOTE: the VOSD must be quiescent during this operation + */ +__blocking triton_ret_t vosd_range(int count, + int offset, + uint128_t lower, + uint128_t upper, + uint128_t *oids, + int *result); /** * Opens a txn hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 26c361acf3465184e4405c3ea7fec2c0cf3dba16
by noreply＠mcs.anl.gov 06 Jun '11

06 Jun '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 26c361acf3465184e4405c3ea7fec2c0cf3dba16 (commit) from 5d5b6e988a9bb3c6e9c6d63f625f7f899a554267 (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 26c361acf3465184e4405c3ea7fec2c0cf3dba16 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jun 6 13:59:59 2011 -0400 fix memory leak in aesop generated code fixes #129 ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-blocking-parser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-blocking-parser.h b/code/src/aesop/ae-blocking-parser.h index 90db87a..0909e2d 100644 --- a/code/src/aesop/ae-blocking-parser.h +++ b/code/src/aesop/ae-blocking-parser.h @@ -460,6 +460,7 @@ __ae_pbranch_##__pbranch_pos_str##_done: #__fname "_ctl:pbranch_" #__pbranch_pos_str, \ __pbranch_ctl, \ __ae_ctl); \ + ae_ctl_done(&__ae_ctl->gen); \ goto __ae_blocking_function_done; \ } \ } \ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5d5b6e988a9bb3c6e9c6d63f625f7f899a554267
by noreply＠mcs.anl.gov 06 Jun '11

06 Jun '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 5d5b6e988a9bb3c6e9c6d63f625f7f899a554267 (commit) from 5c6978d898612c96329de9f079994734c20b8bd5 (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 5d5b6e988a9bb3c6e9c6d63f625f7f899a554267 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jun 6 10:30:39 2011 -0400 hush printfs ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 21 ++++++++++----------- code/src/socket/triton-socket.ae | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 9d6a11b..9eb51fc 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -15,7 +15,6 @@ int cb_ret; #define LISTENPORT 9999 - static void done_callback( void *up, int ret) @@ -37,7 +36,7 @@ static __blocking void handleConnection( resp.error_code = 0; - printf("New connection (fd %i)!\n", fd); + // printf("New connection (fd %i)!\n", fd); /* mark socket as nonblocking */ fcntl(fd, F_SETFL, O_NONBLOCK); @@ -51,12 +50,12 @@ static __blocking void handleConnection( ret = triton_read(fd, &req, sizeof(req), &len); if (ret != TRITON_SUCCESS) { - printf("Socket error or socket closed.\n"); + // printf("Socket error or socket closed.\n"); break; } assert(len == sizeof(req)); - printf("Got request on fd %i\n", fd); + // printf("Got request on fd %i\n", fd); /* allocate a buffer for moving data */ buffer = malloc(req.size); @@ -66,7 +65,7 @@ static __blocking void handleConnection( switch(req.type) { case TEST_READ_NULL: -printf("read_null request\n"); +// printf("read_null request\n"); ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) { @@ -83,10 +82,10 @@ printf("read_null request\n"); break; } assert(written == req.size); - printf("Serviced a READ_NULL request.\n"); + // printf("Serviced a READ_NULL request.\n"); break; case TEST_WRITE_NULL: -printf("write_null request\n"); +//printf("write_null request\n"); ret = triton_read(fd, buffer, req.size, &len); if (ret != TRITON_SUCCESS) { @@ -94,7 +93,7 @@ printf("write_null request\n"); end_loop = 1; break; } -printf("request size: %d len:%d\n", req.size, len); +//printf("request size: %d len:%d\n", req.size, len); assert(len == req.size); ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) @@ -104,7 +103,7 @@ printf("request size: %d len:%d\n", req.size, len); break; } assert(written == sizeof(resp)); - printf("Serviced a WRITE_NULL request.\n"); + //printf("Serviced a WRITE_NULL request.\n"); break; case TEST_READ: /* not implemented */ @@ -116,7 +115,7 @@ printf("request size: %d len:%d\n", req.size, len); free(buffer); } while (!end_loop); - printf("Client %i disconnect...\n", fd); + //printf("Client %i disconnect...\n", fd); close(fd); } } @@ -168,7 +167,7 @@ static __blocking int dotest( while (1) { ret = triton_accept(listensocket, 0, 0, &newsocket); - printf("newsocket = %i\n", newsocket); + //printf("newsocket = %i\n", newsocket); if (ret != TRITON_SUCCESS) { perror("error in accept"); diff --git a/code/src/socket/triton-socket.ae b/code/src/socket/triton-socket.ae index 699f003..3f78c0d 100644 --- a/code/src/socket/triton-socket.ae +++ b/code/src/socket/triton-socket.ae @@ -40,7 +40,7 @@ __blocking triton_ret_t triton_accept( *newfd = r; - printf("newfd=%i\n", *newfd); + //printf("newfd=%i\n", *newfd); return TRITON_SUCCESS; } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5c6978d898612c96329de9f079994734c20b8bd5
by noreply＠mcs.anl.gov 06 Jun '11

06 Jun '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 5c6978d898612c96329de9f079994734c20b8bd5 (commit) from dac73b174ff7008c17ce357e276c1f9c6341cc96 (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 5c6978d898612c96329de9f079994734c20b8bd5 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jun 6 10:23:14 2011 -0400 triton_write() loop bug fix ----------------------------------------------------------------------- Summary of changes: code/src/socket/triton-socket.ae | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/socket/triton-socket.ae b/code/src/socket/triton-socket.ae index 209ffef..699f003 100644 --- a/code/src/socket/triton-socket.ae +++ b/code/src/socket/triton-socket.ae @@ -131,7 +131,7 @@ __blocking triton_ret_t triton_write( { return triton_error_from_errno(errno); } - } while (1); + } while (tmp_count > 0); *len = count; return TRITON_SUCCESS; hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. dac73b174ff7008c17ce357e276c1f9c6341cc96
by noreply＠mcs.anl.gov 06 Jun '11

06 Jun '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 dac73b174ff7008c17ce357e276c1f9c6341cc96 (commit) from 571ba8d2c1b2190a10cb5e5bbf06ae0c5b30852a (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 dac73b174ff7008c17ce357e276c1f9c6341cc96 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jun 6 09:29:11 2011 -0400 log message if converting an unknown errno ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-error.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/common/triton-error.c b/code/src/common/triton-error.c index e4d31e7..2773d7b 100644 --- a/code/src/common/triton-error.c +++ b/code/src/common/triton-error.c @@ -38,7 +38,10 @@ triton_ret_t triton_error_from_errno(int errno_val) case EIO: return TRITON_ERR_IO; case EMFILE: return TRITON_ERR_MFILE; case 0: return TRITON_SUCCESS; - default: return TRITON_ERR_UNKNOWN; + default: + triton_warn(triton_log_default, + "triton_error_from_errno() received errno value (%d) with no Triton equivalent.\n", errno_val); + return TRITON_ERR_UNKNOWN; } return TRITON_ERR_UNKNOWN; } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 571ba8d2c1b2190a10cb5e5bbf06ae0c5b30852a
by noreply＠mcs.anl.gov 03 Jun '11

03 Jun '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 571ba8d2c1b2190a10cb5e5bbf06ae0c5b30852a (commit) from 49ca4c1a287d59ed0368b36bdb9fea9b56a04836 (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 571ba8d2c1b2190a10cb5e5bbf06ae0c5b30852a Author: Kevin Harms <harms(a)flogin1.lcrc.anl.gov> Date: Fri Jun 3 17:57:06 2011 -0500 Fix length checks. ----------------------------------------------------------------------- Summary of changes: code/src/socket/test/echo-server.ae | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index 2559b13..9d6a11b 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -33,7 +33,7 @@ static __blocking void handleConnection( int written; struct test_request req; struct test_response resp; - int end_loop = 0; + int end_loop = 1; resp.error_code = 0; @@ -66,6 +66,7 @@ static __blocking void handleConnection( switch(req.type) { case TEST_READ_NULL: +printf("read_null request\n"); ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) { @@ -81,10 +82,11 @@ static __blocking void handleConnection( end_loop = 1; break; } - assert(written == sizeof(req.size)); + assert(written == req.size); printf("Serviced a READ_NULL request.\n"); break; case TEST_WRITE_NULL: +printf("write_null request\n"); ret = triton_read(fd, buffer, req.size, &len); if (ret != TRITON_SUCCESS) { @@ -92,7 +94,8 @@ static __blocking void handleConnection( end_loop = 1; break; } - assert(len == sizeof(req.size)); +printf("request size: %d len:%d\n", req.size, len); + assert(len == req.size); ret = triton_write(fd, &resp, sizeof(resp), &written); if (ret != TRITON_SUCCESS) { hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 49ca4c1a287d59ed0368b36bdb9fea9b56a04836
by noreply＠mcs.anl.gov 03 Jun '11

03 Jun '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 49ca4c1a287d59ed0368b36bdb9fea9b56a04836 (commit) from fa7c0fc50b706789dcae3de8d2e4b7fd65a3f523 (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 49ca4c1a287d59ed0368b36bdb9fea9b56a04836 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jun 3 16:48:35 2011 -0400 aesop test program for lonely branch scope ----------------------------------------------------------------------- Summary of changes: ...pbranch.ae => lonely-pbranch-variable-scope.ae} | 17 +++++++++++++++-- code/src/aesop/parser/tests/blocking/module.mk.in | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) copy code/src/aesop/parser/tests/blocking/{lonely-pbranch.ae => lonely-pbranch-variable-scope.ae} (63%) Diff of changes: diff --git a/code/src/aesop/parser/tests/blocking/lonely-pbranch.ae b/code/src/aesop/parser/tests/blocking/lonely-pbranch-variable-scope.ae similarity index 63% copy from code/src/aesop/parser/tests/blocking/lonely-pbranch.ae copy to code/src/aesop/parser/tests/blocking/lonely-pbranch-variable-scope.ae index 1bc605a..500d02f 100644 --- a/code/src/aesop/parser/tests/blocking/lonely-pbranch.ae +++ b/code/src/aesop/parser/tests/blocking/lonely-pbranch-variable-scope.ae @@ -8,6 +8,7 @@ static __blocking void lonely_pbranch(void) int a = 0; int ret1; triton_ret_t tret; + int foo; pbranch { @@ -23,11 +24,19 @@ static __blocking void lonely_pbranch(void) printf("Error in branch 1.\n"); } + /* start a timer to make sure that the pbranch is + * still active after this function returns + */ tret = triton_timer(2000); if(tret != TRITON_SUCCESS) { printf("Error in branch 1 while sleeping\n"); } + + /* access a variable that is scoped to the function (not the + * pbranch) to make sure nothing breaks + */ + foo = 1; printf("pbranch done!\n"); } @@ -37,15 +46,19 @@ static __blocking void lonely_pbranch(void) printf("Error in final btest1\n"); } - printf("lonely_pbranch done! returning...\n"); + printf("lonely_pbranch function done! returning (with pbranch still running)...\n"); } __blocking int aesop_main(int argc, char **argv) { lonely_pbranch(); + /* start a timer to wait for the lonely pbranch to finish */ + printf("Sleeping 5 seconds to wait for pbranch to finish.\n"); + triton_timer(5000); + printf("Test complete.\n"); return 0; } -btest_main_set(aesop_main, "btest"); +btest_main_set(aesop_main, "btest", "timer"); /* * Local variables: diff --git a/code/src/aesop/parser/tests/blocking/module.mk.in b/code/src/aesop/parser/tests/blocking/module.mk.in index 8419276..2f7cba5 100644 --- a/code/src/aesop/parser/tests/blocking/module.mk.in +++ b/code/src/aesop/parser/tests/blocking/module.mk.in @@ -50,6 +50,7 @@ AETESTSRC += $(DIR)/icpfor.ae \ $(DIR)/lonely-pbranch2.ae \ $(DIR)/lonely-pbranch3.ae \ $(DIR)/lonely-pbranch4.ae \ + $(DIR)/lonely-pbranch-variable-scope.ae \ $(DIR)/pwait-in-while.ae \ $(DIR)/pwait-in-for.ae \ $(DIR)/pbranch-completion.ae hooks/post-receive -- Triton Repository

1 0