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 3c8dbfa9382dd2dc2d2d072fab6f0813dc59ecfc (commit) from 9f80f86d7ca0286e101c0e842a755a01e6ad15a5 (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 3c8dbfa9382dd2dc2d2d072fab6f0813dc59ecfc Author: Phil Carns <[email protected]> Date: Fri Apr 23 17:04:00 2010 -0400 stub for vosd_read() ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 17 +++++++++++++ code/src/versioned-osd/prototype/versioned-osd.hae | 25 +++++++++---------- 2 files changed, 29 insertions(+), 13 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 a109ca0..c25789a 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -1229,10 +1229,27 @@ __blocking triton_ret_t vosd_txn_close( } /* TODO: any cleanup steps if we failed to close the txn? */ + /* For now just assume that we leave the txn as is */ return(tret); } +__blocking triton_ret_t gs_cosd_read( + uint64_t oid, + uint64_t fork, + char** mem_offsets, + int64_t* mem_sizes, + int mem_count, + int64_t* obj_offsets, + int64_t* obj_sizes, + int obj_count, + int64_t* out_size) +{ + + return(TRITON_ERR_NOSYS); +} + + static int compare_log_map_key(DB * dbp, const DBT * a, const DBT * b) diff --git a/code/src/versioned-osd/prototype/versioned-osd.hae b/code/src/versioned-osd/prototype/versioned-osd.hae index 94983be..d43c3f0 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.hae +++ b/code/src/versioned-osd/prototype/versioned-osd.hae @@ -91,22 +91,10 @@ __blocking triton_ret_t vosd_txn_close( uint64_t txn_number /**< caller-assigned txn identifier */ ); - -#if 0 - -/** - * Removes an existing object - * \return 0 on success, -errno on failure - */ -__blocking int gs_cosd_remove( - uint64_t oid /**< oid to remove */ -); - /** * Reads data from an object - * \return 0 on success, -errno on failure */ -__blocking int gs_cosd_read( +__blocking triton_ret_t gs_cosd_read( uint64_t oid, /**< object to operate on */ uint64_t fork, /**< object fork to operate on */ char** mem_offsets, /**< memory region pointers */ @@ -119,6 +107,17 @@ __blocking int gs_cosd_read( ); + +#if 0 + +/** + * Removes an existing object + * \return 0 on success, -errno on failure + */ +__blocking int gs_cosd_remove( + uint64_t oid /**< oid to remove */ +); + #endif #endif /* __VERSIONED_OSD_HAE__ */ hooks/post-receive -- Triton Repository