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 9819ff743bb14287d24a0df42431a06bfe231e12 (commit) via fb1c2fface9194f0d02080830298bf163e83a88a (commit) from bef47016f89c5adf00e3bf908797a4087b75ef0c (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 9819ff743bb14287d24a0df42431a06bfe231e12 Author: Phil Carns <[email protected]> Date: Mon Mar 8 18:26:39 2010 -0500 non-working vosd test program stub commit fb1c2fface9194f0d02080830298bf163e83a88a Author: Phil Carns <[email protected]> Date: Mon Mar 8 18:25:39 2010 -0500 non-working vosd test program stub ----------------------------------------------------------------------- Summary of changes: code/configure | 3 +- code/configure.ac | 1 + code/src/versioned-osd/prototype/module.mk.in | 1 + .../src/versioned-osd/prototype/tests/module.mk.in | 3 ++ code/src/versioned-osd/prototype/tests/vosd1.ae | 29 ++++++++++++++++++++ code/src/versioned-osd/prototype/versioned-osd.ae | 18 ++++++++++++ code/src/versioned-osd/prototype/versioned-osd.hae | 8 +++--- 7 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 code/src/versioned-osd/prototype/tests/module.mk.in create mode 100644 code/src/versioned-osd/prototype/tests/vosd1.ae Diff of changes: diff --git a/code/configure b/code/configure index cabecfe..9273728 100755 --- a/code/configure +++ b/code/configure @@ -5077,7 +5077,7 @@ fi -ac_config_files="$ac_config_files Makefile src/common/module.mk src/common/tests/module.mk src/common/resources/timer/test/module.mk src/common/resources/timer/module.mk src/common/resources/scheduling/module.mk src/common/resources/scheduling/test/module.mk src/net/module.mk src/net/mpi/module.mk src/net/mpi/test/module.mk src/remote/module.mk src/aesop/module.mk src/aesop/parser/module.mk src/aesop/examples/module.mk src/aesop/parser/tests/remote/module.mk src/aesop/parser/tests/blocking/module.mk src/versioned-osd/prototype/module.mk src/versioned-osd/prototype/bdb-resource/module.mk" +ac_config_files="$ac_config_files Makefile src/common/module.mk src/common/tests/module.mk src/common/resources/timer/test/module.mk src/common/resources/timer/module.mk src/common/resources/scheduling/module.mk src/common/resources/scheduling/test/module.mk src/net/module.mk src/net/mpi/module.mk src/net/mpi/test/module.mk src/remote/module.mk src/aesop/module.mk src/aesop/parser/module.mk src/aesop/examples/module.mk src/aesop/parser/tests/remote/module.mk src/aesop/parser/tests/blocking/module.mk src/versioned-osd/prototype/module.mk src/versioned-osd/prototype/tests/module.mk src/versioned-osd/prototype/bdb-resource/module.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5777,6 +5777,7 @@ do "src/aesop/parser/tests/remote/module.mk") CONFIG_FILES="$CONFIG_FILES src/aesop/parser/tests/remote/module.mk" ;; "src/aesop/parser/tests/blocking/module.mk") CONFIG_FILES="$CONFIG_FILES src/aesop/parser/tests/blocking/module.mk" ;; "src/versioned-osd/prototype/module.mk") CONFIG_FILES="$CONFIG_FILES src/versioned-osd/prototype/module.mk" ;; + "src/versioned-osd/prototype/tests/module.mk") CONFIG_FILES="$CONFIG_FILES src/versioned-osd/prototype/tests/module.mk" ;; "src/versioned-osd/prototype/bdb-resource/module.mk") CONFIG_FILES="$CONFIG_FILES src/versioned-osd/prototype/bdb-resource/module.mk" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/code/configure.ac b/code/configure.ac index cfda58f..a47efe1 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -152,4 +152,5 @@ src/aesop/examples/module.mk src/aesop/parser/tests/remote/module.mk src/aesop/parser/tests/blocking/module.mk src/versioned-osd/prototype/module.mk +src/versioned-osd/prototype/tests/module.mk src/versioned-osd/prototype/bdb-resource/module.mk) diff --git a/code/src/versioned-osd/prototype/module.mk.in b/code/src/versioned-osd/prototype/module.mk.in index c0681e7..c41a609 100644 --- a/code/src/versioned-osd/prototype/module.mk.in +++ b/code/src/versioned-osd/prototype/module.mk.in @@ -1,4 +1,5 @@ DIR := src/versioned-osd/prototype AESOP_HDR += $(DIR)/versioned-osd.hae + AELIBSRC += $(DIR)/versioned-osd.ae diff --git a/code/src/versioned-osd/prototype/tests/module.mk.in b/code/src/versioned-osd/prototype/tests/module.mk.in new file mode 100644 index 0000000..8942340 --- /dev/null +++ b/code/src/versioned-osd/prototype/tests/module.mk.in @@ -0,0 +1,3 @@ +DIR := src/versioned-osd/prototype/tests + +AETESTSRC += $(DIR)/vosd1.ae diff --git a/code/src/versioned-osd/prototype/tests/vosd1.ae b/code/src/versioned-osd/prototype/tests/vosd1.ae new file mode 100644 index 0000000..0687ef6 --- /dev/null +++ b/code/src/versioned-osd/prototype/tests/vosd1.ae @@ -0,0 +1,29 @@ +#include <stdio.h> +#include <errno.h> + +#include "src/aesop/aesop.h" +#include "src/versioned-osd/prototype/versioned-osd.hae" + +int main(int argc, char *argv[]) +{ + ae_context_t ctx; + + vosd_init("/tmp/cosd"); + + ae_context_create(&ctx, 1, "vosd1"); + + ae_context_destroy(ctx); + + vosd_finalize(); + + return 0; +} + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ft=c ts=8 sts=4 sw=4 expandtab + */ diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index b7983f4..d4f61b9 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -16,6 +16,7 @@ #include "src/aesop/aesop.h" #include "src/common/triton-hash.h" #include "src/versioned-osd/prototype/bdb-resource/bdb-resource.h" +#include "src/versioned-osd/prototype/versioned-osd.hae" /* This file contains a prototype implementation of the VOSD API that uses @@ -38,6 +39,23 @@ */ /**************************************************************/ +triton_ret_t vosd_init(const char* path) +{ + triton_ret_t tret; + + /* initialize BDB resource */ + tret = bdb_init(TRITON_PROG_THREAD_PER_OP); + + return(tret); +} + +void vosd_finalize(void) +{ + /* shut down BDB resource */ + bdb_finalize(); + + return; +} /* * Local variables: diff --git a/code/src/versioned-osd/prototype/versioned-osd.hae b/code/src/versioned-osd/prototype/versioned-osd.hae index 9226d87..83aa9a3 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.hae +++ b/code/src/versioned-osd/prototype/versioned-osd.hae @@ -21,12 +21,10 @@ #define VOSD_FLAG_TRUNC_WRITE 1 /**< truncate fork on write */ #define VOSD_FLAG_AUTO_TXN 2 /**< automatically wrap write in a transaction */ -#if 0 /** * Initializes VOSD interface */ -int gs_cosd_init( - enum progress_mode mode, /**< progress mode */ +triton_ret_t vosd_init( const char* path /**< local path to use for storing data, will be created if needed */ ); @@ -34,7 +32,9 @@ int gs_cosd_init( /** * Shuts down VOSD interface */ -int gs_cosd_finalize(void); +void vosd_finalize(void); + +#if 0 /** * Creates a new object hooks/post-receive -- Triton Repository