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

Triton Repository branch, master, updated. 4263a99e99f01679914d1e4326616c6129d41737
by noreply＠mcs.anl.gov 29 Sep '11

29 Sep '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 4263a99e99f01679914d1e4326616c6129d41737 (commit) from fd4e2f2118f7c2e80f9e5185b5127396087bed87 (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 4263a99e99f01679914d1e4326616c6129d41737 Author: Dries Kimpe <dkimpe(a)mcs.anl.gov> Date: Thu Sep 29 12:31:31 2011 -0500 Add base error comparison function Re #114 ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-error.c | 18 +++++++++++++++++- code/src/common/triton-error.h | 7 +++++++ 2 files changed, 24 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/common/triton-error.c b/code/src/common/triton-error.c index 2773d7b..146b12a 100644 --- a/code/src/common/triton-error.c +++ b/code/src/common/triton-error.c @@ -1,8 +1,10 @@ -#include <stdarg.h> #include "src/common/triton-error.h" #include "src/common/triton-log.h" +#include <stdarg.h> +#include <stdbool.h> + triton_ret_t triton_error_from_error_code(triton_error_code_t error_code) { if(error_code >= TRITON_ERROR_COUNT) @@ -280,3 +282,17 @@ void triton_error_print(triton_ret_t ret, const char *format, ...) fflush(stderr); } +int triton_error_equal (const triton_ret_t r1, const triton_ret_t r2) +{ + // If both are 0, or both are static + if (r1 == r2) + return true; + + // One of the two is invalid (NULL) + if (!r1 || !r2) + return false; + + // Pointer values are not equal. Need to get the error codes and compare + // those. + return r1->error_code == r2->error_code; +} diff --git a/code/src/common/triton-error.h b/code/src/common/triton-error.h index ed41e4b..2dfc969 100644 --- a/code/src/common/triton-error.h +++ b/code/src/common/triton-error.h @@ -97,4 +97,11 @@ void triton_error_print(triton_ret_t ret, const char *format, ...) __attribute__ } #endif +/** + * Compare the base error codes of the given triton_ret_t values. + * Returns non-zero if equal, zero if not equal. + */ +int triton_error_equal (const triton_ret_t r1, const triton_ret_t r2); + + #endif /* __TRITON_ERROR_H__ */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. fd4e2f2118f7c2e80f9e5185b5127396087bed87
by noreply＠mcs.anl.gov 26 Sep '11

26 Sep '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 fd4e2f2118f7c2e80f9e5185b5127396087bed87 (commit) from 3c9618b4398d9dea43df9a82827eb3f8ed92714d (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 fd4e2f2118f7c2e80f9e5185b5127396087bed87 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 26 15:46:12 2011 -0400 fix stale doc text ----------------------------------------------------------------------- Summary of changes: code/doc/fault-injection.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/doc/fault-injection.txt b/code/doc/fault-injection.txt index 511f0a8..a882988 100644 --- a/code/doc/fault-injection.txt +++ b/code/doc/fault-injection.txt @@ -9,9 +9,10 @@ Triton for testing purposes. == Network fault injection Triton includes a mechanism for injecting faults into arbitrary network -methods. Right now the only type of fault that it can simulate is causing a -send or recv operation to hang indefinitely (triggering timeout and retry -behavior in Triton). +methods. Two types of faults can be simulated: causing a send or recv to +hang indefinitely (triggering timeout and retry behavior in Triton) or +causing a send or recv to fail immediately with an error code (which also +causes a retry, but without waiting for a timeout). In order to enable the fault injector for an arbitrary test program, you must first change all network address strings to use the "fault://" prefix hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 3c9618b4398d9dea43df9a82827eb3f8ed92714d
by noreply＠mcs.anl.gov 26 Sep '11

26 Sep '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 3c9618b4398d9dea43df9a82827eb3f8ed92714d (commit) via 35d1ccc2d1bfdcb885017832c2e4f3a1f834083b (commit) from 14e7000947433e71c1fd00237c38b66d2a8d5e8b (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 3c9618b4398d9dea43df9a82827eb3f8ed92714d Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 26 15:32:09 2011 -0400 minor group and comm fixes commit 35d1ccc2d1bfdcb885017832c2e4f3a1f834083b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 26 14:20:27 2011 -0400 minor communicator leak fix ----------------------------------------------------------------------- Summary of changes: code/src/kv/test/kvtest.c | 3 +++ code/src/replicated-osd/tests/rosd-create-bench.ae | 4 ++++ code/src/replicated-osd/tests/rosd-txn-nr-test.ae | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/kv/test/kvtest.c b/code/src/kv/test/kvtest.c index 943e6cd..1d30e2f 100644 --- a/code/src/kv/test/kvtest.c +++ b/code/src/kv/test/kvtest.c @@ -442,6 +442,9 @@ static void speedtest (MPI_Comm comm, int commrank, int commsize) } write0 (commrank, "\n"); MPI_Barrier (comm); + stats_destroy(&s_put); + stats_destroy(&s_get); + stats_destroy(&s_remove); } static void hybridtest () diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index 6404d41..f1c092a 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -869,6 +869,10 @@ int main(int argc, char *argv[]) } } + if(rank >= nservers) + MPI_Comm_free(&client_comm); + MPI_Group_free(&client_group); + MPI_Group_free(&orig_group); triton_finalize(); MPI_Finalize(); diff --git a/code/src/replicated-osd/tests/rosd-txn-nr-test.ae b/code/src/replicated-osd/tests/rosd-txn-nr-test.ae index 7e0abf4..edaff40 100644 --- a/code/src/replicated-osd/tests/rosd-txn-nr-test.ae +++ b/code/src/replicated-osd/tests/rosd-txn-nr-test.ae @@ -545,6 +545,10 @@ int main(int argc, char *argv[]) } } + if(rank >= nservers) + MPI_Comm_free(&client_comm); + MPI_Group_free(&client_group); + MPI_Group_free(&orig_group); triton_finalize(); MPI_Finalize(); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 14e7000947433e71c1fd00237c38b66d2a8d5e8b
by noreply＠mcs.anl.gov 23 Sep '11

23 Sep '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 14e7000947433e71c1fd00237c38b66d2a8d5e8b (commit) from ca2c87f04cd1dba60c1a2596c9a9821d7ba3d28b (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 14e7000947433e71c1fd00237c38b66d2a8d5e8b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Sep 23 10:05:33 2011 -0400 make aesop objects depend on implicit headers - fixes #152 ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 4 ++-- code/maint/depend-ae.sh | 6 +++++- code/maint/depend-aer.sh | 6 +++++- code/maint/depend-hae.sh | 6 +++++- code/src/aesop/parser/tests/remote/module.mk.in | 12 ++++++------ code/src/remote/module.mk.in | 2 +- code/src/replicated-osd/module.mk.in | 2 +- code/src/state/module.mk.in | 2 +- 8 files changed, 26 insertions(+), 14 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index be0c561..5cbc4c6 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -518,7 +518,7 @@ $(AEOBJS): %.o: $(HSBIN) %.ae # Auto-generated dependencies for .ae files $(AEDEPS): %.ae.d: %.ae $(Q) " DEP $@" - $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-ae.sh $(call dirname,$*) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ + $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-ae.sh $(call dirname,$*) $(srcdir) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ # rule to build remote modules (actual file names depend on dummies, see # module.mk.in for directories containing .aer files) @@ -543,7 +543,7 @@ $(AESOP_TRHDR): %.h: %.hae $(HSBIN) $(AESOP_TRHDR_DEPS): %.h.d: %.hae $(Q) " DEP $@" - $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-hae.sh $(call dirname,$*) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ + $(E)CC=$(call MCC_C,$*) $(srcdir)/maint/depend-hae.sh $(call dirname,$*) $(srcdir) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_C,$*) $< > $@ # TODO: we need a better solution here. The problem is that the # auto-dependencies often include generated headers. If we make the .d diff --git a/code/maint/depend-ae.sh b/code/maint/depend-ae.sh index e05fe68..03a5067 100755 --- a/code/maint/depend-ae.sh +++ b/code/maint/depend-ae.sh @@ -1,6 +1,8 @@ #!/bin/sh DIR="$1" shift +SRCDIR="$1" +shift if [ -n "$DIR" ] ; then DIR="$DIR"/ fi @@ -13,4 +15,6 @@ fi # -x c tells gcc to pretend like the input file is a c file regardless of # filename extension. This is useful for cases where we want gcc to # generate dependencies on raw .ae files. -exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.o:@" +# there is one manual addition to the dependencies (ae-blocking-parser.h) +# which is implicitly added by the aesop parser +exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.o: $SRCDIR/src/aesop/ae-blocking-parser.h@" diff --git a/code/maint/depend-aer.sh b/code/maint/depend-aer.sh index 07c70e4..36c6a2f 100755 --- a/code/maint/depend-aer.sh +++ b/code/maint/depend-aer.sh @@ -1,6 +1,8 @@ #!/bin/sh DIR="$1" shift +SRCDIR="$1" +shift if [ -n "$DIR" ] ; then DIR="$DIR"/ fi @@ -16,4 +18,6 @@ shift # -x c tells gcc to pretend like the input file is a c file regardless of # filename extension. This is useful for cases where we want gcc to # generate dependencies on raw .ae files. -exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@${DIR}${RMOD}.dummy:@" +# there is one manual addition to the dependencies (ae-remote-parser.h) +# which is implicitly added by the aesop remote parser +exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@${DIR}${RMOD}.dummy: $SRCDIR/src/aesop/ae-remote-parser.h $SRCDIR/src/aesop/ae-blocking-parser.h@" diff --git a/code/maint/depend-hae.sh b/code/maint/depend-hae.sh index 83f1ebf..2ac0ce0 100755 --- a/code/maint/depend-hae.sh +++ b/code/maint/depend-hae.sh @@ -1,6 +1,8 @@ #!/bin/sh DIR="$1" shift +SRCDIR="$1" +shift if [ -n "$DIR" ] ; then DIR="$DIR"/ fi @@ -14,4 +16,6 @@ fi # -x c tells gcc to pretend like the input file is a c file regardless of # filename extension. This is useful for cases where we want gcc to # generate dependencies on raw .ae files. -exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.h: @" +# there is one manual addition to the dependencies (ae-blocking-parser.h) +# which is implicitly added by the aesop parser +exec $CC -x c -M -MM -MG "$@" | sed -e "s@^$.*$\.o:@$DIR\1.h: $SRCDIR/src/aesop/ae-blocking-parser.h@" diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index c7e023a..a809b45 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -12,7 +12,7 @@ $(FULLMODNAME1)_stubs.hae $(FULLMODNAME1)_module.h $(FULLMODNAME1)_module.o $(DI $(FULLMODNAME1).d: $(DIR_TESTREMOTE)/test-remote-mock.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME1)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME1) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME1) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME1)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(srcdir) $(MODNAME1) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME1) $< > $@ REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_mock_buf REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_mock_buf := $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer @@ -23,7 +23,7 @@ $(FULLMODNAME2)_stubs.hae $(FULLMODNAME2)_module.h $(FULLMODNAME2)_module.o $(DI $(FULLMODNAME2).d: $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME2)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME2) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME2) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME2)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(srcdir) $(MODNAME2) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME2) $< > $@ ifneq (,$(BUILD_MPI)) @@ -42,7 +42,7 @@ ifneq (,$(BUILD_MPI)) #$(FULLMODNAME3).d: $(DIR_TESTREMOTE)/test-remote-mpi.aer # $(Q) " DEP $@" -# $(E)CC=$(call MCC_AE,$(FULLMODNAME3)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME3) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME3) $< > $@ +# $(E)CC=$(call MCC_AE,$(FULLMODNAME3)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(srcdir) $(MODNAME3) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME3) $< > $@ REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_fault REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_fault := $(DIR_TESTREMOTE)/test-remote-fault-injector.aer @@ -53,7 +53,7 @@ $(FULLMODNAME4)_stubs.hae $(FULLMODNAME4)_module.h $(FULLMODNAME4)_module.o $(DI $(FULLMODNAME4).d: $(DIR_TESTREMOTE)/test-remote-fault-injector.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME4)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME4) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME4) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME4)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(srcdir) $(MODNAME4) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME4) $< > $@ REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_service_stop REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_service_stop := $(DIR_TESTREMOTE)/test-remote-service-stop.aer @@ -64,7 +64,7 @@ $(FULLMODNAME5)_stubs.hae $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DI $(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-service-stop.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(srcdir) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_buffer_response REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_buffer_response := $(DIR_TESTREMOTE)/test-remote-buffer-response.aer @@ -75,7 +75,7 @@ $(FULLMODNAME5)_stubs.hae $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DI $(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-buffer-response.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(srcdir) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ REMOTE_TESTSRC += $(DIR_TESTREMOTE)/test-remote-mock.aer \ diff --git a/code/src/remote/module.mk.in b/code/src/remote/module.mk.in index 07734dc..b20f4d7 100644 --- a/code/src/remote/module.mk.in +++ b/code/src/remote/module.mk.in @@ -20,5 +20,5 @@ $(FULLMODNAME_CORE)_stubs.hae $(FULLMODNAME_CORE)_module.h $(FULLMODNAME_CORE)_m $(FULLMODNAME_CORE).d: $(DIR_REMOTE)/core-functions.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME_CORE)) $(srcdir)/maint/depend-aer.sh $(DIR_REMOTE) $(MODNAME_CORE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_CORE) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME_CORE)) $(srcdir)/maint/depend-aer.sh $(DIR_REMOTE) $(srcdir) $(MODNAME_CORE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_CORE) $< > $@ diff --git a/code/src/replicated-osd/module.mk.in b/code/src/replicated-osd/module.mk.in index 7993a44..51fd4e8 100644 --- a/code/src/replicated-osd/module.mk.in +++ b/code/src/replicated-osd/module.mk.in @@ -20,6 +20,6 @@ $(FULLMODNAME_ROSD)_stubs.hae $(FULLMODNAME_ROSD)_module.h $(FULLMODNAME_ROSD)_m $(FULLMODNAME_ROSD).d: $(DIR_ROSD)/replicated-osd.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME_ROSD)) $(srcdir)/maint/depend-aer.sh $(DIR_ROSD) $(MODNAME_ROSD) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_ROSD) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME_ROSD)) $(srcdir)/maint/depend-aer.sh $(DIR_ROSD) $(srcdir) $(MODNAME_ROSD) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_ROSD) $< > $@ endif # BUILD_MPI diff --git a/code/src/state/module.mk.in b/code/src/state/module.mk.in index 4fb9c9c..5bb4269 100644 --- a/code/src/state/module.mk.in +++ b/code/src/state/module.mk.in @@ -19,6 +19,6 @@ $(FULLMODNAME_STATE)_stubs.hae $(FULLMODNAME_STATE)_module.h $(FULLMODNAME_STATE $(FULLMODNAME_STATE).d: $(DIR_STATE)/state-client.aer $(Q) " DEP $@" - $(E)CC=$(call MCC_AE,$(FULLMODNAME_STATE)) $(srcdir)/maint/depend-aer.sh $(DIR_STATE) $(MODNAME_STATE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_STATE) $< > $@ + $(E)CC=$(call MCC_AE,$(FULLMODNAME_STATE)) $(srcdir)/maint/depend-aer.sh $(DIR_STATE) $(srcdir) $(MODNAME_STATE) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME_STATE) $< > $@ endif # BUILD_MPI hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. ca2c87f04cd1dba60c1a2596c9a9821d7ba3d28b
by noreply＠mcs.anl.gov 21 Sep '11

21 Sep '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 ca2c87f04cd1dba60c1a2596c9a9821d7ba3d28b (commit) from 9739de2c251e0d87b47f0b7e6dd7195c3d3c5cd7 (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 ca2c87f04cd1dba60c1a2596c9a9821d7ba3d28b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Sep 21 18:02:35 2011 -0400 don't generate conflicting dependencies in aecc - fixes #150 ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index e0141e5..be0c561 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -510,10 +510,9 @@ lib/libtriton-test.dylib: $(AETESTLIBOBJS) $(TESTLIBOBJS) # AE rule compiles *.ae files to object files # $(AEOBJS): %.o: $(HSBIN) %.ae - $(Q) " AECC $*.ae" $(E)$(builddir)/maint/aecc -o $(builddir)/$*.o $(srcdir)/$*.ae \ - -M -c $(call MCC_AE,$*) $(VA) $(DA) $(AEPRETTY) \ + -c $(call MCC_AE,$*) $(VA) $(DA) $(AEPRETTY) \ -- $(LIBCFLAGS) $(CFLAGS) $(CWARNS) $(call MODCFLAGS_AE,$*) # Auto-generated dependencies for .ae files hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 9739de2c251e0d87b47f0b7e6dd7195c3d3c5cd7
by noreply＠mcs.anl.gov 20 Sep '11

20 Sep '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 9739de2c251e0d87b47f0b7e6dd7195c3d3c5cd7 (commit) via ba2092478cbe366ea3e840e18e017a0cb821b50e (commit) via 427e0658b4acfd7e30aee659100fb80b0e673272 (commit) from c7717172a4cdb3a5f904f521b1aaf5a52b6b17ba (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 9739de2c251e0d87b47f0b7e6dd7195c3d3c5cd7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Sep 20 12:32:47 2011 -0400 rename vosd->tosd (function and variable names) commit ba2092478cbe366ea3e840e18e017a0cb821b50e Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Sep 20 12:01:49 2011 -0400 rename vosd to tosd commit 427e0658b4acfd7e30aee659100fb80b0e673272 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Sep 20 11:09:05 2011 -0400 moved bdb and file resources to common location ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 8 +- .../resources/bdb}/bdb-resource.c | 4 +- .../resources/bdb}/bdb-resource.hae | 0 .../resources/bdb}/module.mk.in | 2 +- .../resources/file}/file-resource.c | 8 +- .../resources/file}/file-resource.hae | 0 .../resources/file}/module.mk.in | 2 +- code/src/common/triton-init-registry.c | 4 +- code/src/common/triton-init.c | 8 +- code/src/kv/kv-intern.ae | 1 - code/src/kv/kv.c | 4 +- code/src/kv/test/kvtest.c | 4 +- code/src/kv/test/simpletest.c | 2 +- code/src/rebuild/rebuild.ae | 4 +- code/src/replicated-osd/replicated-osd.aer | 38 +- code/src/replicated-osd/rosd-trans-nr-cache.ae | 6 +- code/src/replicated-osd/tests/rosd-create-bench.ae | 10 +- code/src/replicated-osd/tests/rosd-txn-nr-test.ae | 6 +- code/src/replicated-osd/tests/rosd2.ae | 10 +- code/src/replicated-osd/tests/rosd3.ae | 9 +- code/src/socket/test/echo-server.ae | 2 +- code/src/state/test/rosd-global.ae | 10 +- code/src/state/test/rosd-injection.ae | 10 +- code/src/state/test/rosd-maint.ae | 10 +- code/src/state/test/rosd-peers.ae | 9 +- code/src/state/test/rosd-recover.ae | 10 +- code/src/state/test/rosd-start.ae | 10 +- code/src/state/test/rosd-status.ae | 10 +- code/src/state/test/rosd-trigger.ae | 10 +- .../bdb-throttle.ae | 12 +- .../bdb-throttle.hae | 0 .../prototype => transactional-osd}/module.mk.in | 10 +- .../tests/4M-w-serial.txt | 0 .../tests/fake-resource.c | 2 +- .../tests/fake-resource.hae | 0 .../prototype => transactional-osd}/tests/fake1.ae | 6 +- .../prototype => transactional-osd}/tests/faker.ae | 4 +- .../tests/faker.hae | 0 code/src/transactional-osd/tests/module.mk.in | 23 + .../tests/tosd-autotune.ae} | 26 +- .../tests/tosd-bench-concurrent.ae} | 58 ++-- .../tests/tosd-bench-create.ae} | 40 +- .../tests/tosd-dump.ae} | 24 +- .../tests/tosd-enumerate.ae} | 26 +- .../tests/tosd-multi-object.ae} | 40 +- .../tests/tosd-niid.ae} | 68 ++-- .../tests/tosd-range.ae} | 24 +- .../vosd1.ae => transactional-osd/tests/tosd1.ae} | 138 +++--- .../tests/workload-gen.ae | 2 +- .../tosd-fd-cache.ae} | 12 +- .../tosd-fd-cache.hae} | 10 +- .../transactional-osd.ae} | 494 ++++++++++---------- .../transactional-osd.hae} | 64 ++-- .../src/versioned-osd/prototype/tests/module.mk.in | 23 - 54 files changed, 647 insertions(+), 670 deletions(-) rename code/src/{versioned-osd/prototype/bdb-resource => common/resources/bdb}/bdb-resource.c (99%) rename code/src/{versioned-osd/prototype/bdb-resource => common/resources/bdb}/bdb-resource.hae (100%) rename code/src/{versioned-osd/prototype/bdb-resource => common/resources/bdb}/module.mk.in (68%) rename code/src/{versioned-osd/prototype/file-resource => common/resources/file}/file-resource.c (98%) rename code/src/{versioned-osd/prototype/file-resource => common/resources/file}/file-resource.hae (100%) rename code/src/{versioned-osd/prototype/file-resource => common/resources/file}/module.mk.in (59%) rename code/src/{versioned-osd/prototype => transactional-osd}/bdb-throttle.ae (92%) rename code/src/{versioned-osd/prototype => transactional-osd}/bdb-throttle.hae (100%) rename code/src/{versioned-osd/prototype => transactional-osd}/module.mk.in (52%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/4M-w-serial.txt (100%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/fake-resource.c (98%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/fake-resource.hae (100%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/fake1.ae (90%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/faker.ae (84%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/faker.hae (100%) create mode 100644 code/src/transactional-osd/tests/module.mk.in rename code/src/{versioned-osd/prototype/tests/vosd-autotune.ae => transactional-osd/tests/tosd-autotune.ae} (70%) rename code/src/{versioned-osd/prototype/tests/vosd-bench-concurrent.ae => transactional-osd/tests/tosd-bench-concurrent.ae} (83%) rename code/src/{versioned-osd/prototype/tests/vosd-bench-create.ae => transactional-osd/tests/tosd-bench-create.ae} (82%) rename code/src/{versioned-osd/prototype/tests/vosd-dump.ae => transactional-osd/tests/tosd-dump.ae} (75%) rename code/src/{versioned-osd/prototype/tests/vosd-enumerate.ae => transactional-osd/tests/tosd-enumerate.ae} (80%) rename code/src/{versioned-osd/prototype/tests/vosd-multi-object.ae => transactional-osd/tests/tosd-multi-object.ae} (75%) rename code/src/{versioned-osd/prototype/tests/vosd-niid.ae => transactional-osd/tests/tosd-niid.ae} (62%) rename code/src/{versioned-osd/prototype/tests/vosd-range.ae => transactional-osd/tests/tosd-range.ae} (83%) rename code/src/{versioned-osd/prototype/tests/vosd1.ae => transactional-osd/tests/tosd1.ae} (80%) rename code/src/{versioned-osd/prototype => transactional-osd}/tests/workload-gen.ae (97%) rename code/src/{versioned-osd/prototype/vosd-fd-cache.ae => transactional-osd/tosd-fd-cache.ae} (98%) rename code/src/{versioned-osd/prototype/vosd-fd-cache.hae => transactional-osd/tosd-fd-cache.hae} (92%) rename code/src/{versioned-osd/prototype/versioned-osd.ae => transactional-osd/transactional-osd.ae} (90%) rename code/src/{versioned-osd/prototype/versioned-osd.hae => transactional-osd/transactional-osd.hae} (76%) delete mode 100644 code/src/versioned-osd/prototype/tests/module.mk.in Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index d8e7ddb..020d92a 100644 --- a/code/configure.ac +++ b/code/configure.ac @@ -395,10 +395,10 @@ 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 -src/versioned-osd/prototype/file-resource/module.mk +src/transactional-osd/module.mk +src/transactional-osd/tests/module.mk +src/common/resources/bdb/module.mk +src/common/resources/file/module.mk src/replicated-osd/module.mk src/replicated-osd/tests/module.mk src/mapping/module.mk diff --git a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c b/code/src/common/resources/bdb/bdb-resource.c similarity index 99% rename from code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c rename to code/src/common/resources/bdb/bdb-resource.c index c292809..263456e 100644 --- a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c +++ b/code/src/common/resources/bdb/bdb-resource.c @@ -19,7 +19,7 @@ #include "src/aesop/op.h" #include "src/aesop/opcache.h" #include "src/common/triton-hash.h" -#include "src/versioned-osd/prototype/bdb-resource/bdb-resource.h" +#include "src/common/resources/bdb/bdb-resource.h" #include "src/common/triton-error.h" #include "src/common/triton-debug.h" #include "src/common/triton-init.h" @@ -484,7 +484,7 @@ void bdb_finalize(void) __attribute__((constructor)) void triton_bdb_init_register(void) { - triton_init_register("triton.vosd.bdb", bdb_init, bdb_finalize, NULL, + triton_init_register("triton.tosd.bdb", bdb_init, bdb_finalize, NULL, "triton.debug", "aesop.control", "triton.zeroconf"); } diff --git a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.hae b/code/src/common/resources/bdb/bdb-resource.hae similarity index 100% rename from code/src/versioned-osd/prototype/bdb-resource/bdb-resource.hae rename to code/src/common/resources/bdb/bdb-resource.hae diff --git a/code/src/versioned-osd/prototype/bdb-resource/module.mk.in b/code/src/common/resources/bdb/module.mk.in similarity index 68% rename from code/src/versioned-osd/prototype/bdb-resource/module.mk.in rename to code/src/common/resources/bdb/module.mk.in index 6a6cc9c..48e7a80 100644 --- a/code/src/versioned-osd/prototype/bdb-resource/module.mk.in +++ b/code/src/common/resources/bdb/module.mk.in @@ -1,4 +1,4 @@ -DIR := src/versioned-osd/prototype/bdb-resource +DIR := src/common/resources/bdb AESOP_HDR += $(DIR)/bdb-resource.hae LIBSRC += $(DIR)/bdb-resource.c diff --git a/code/src/versioned-osd/prototype/file-resource/file-resource.c b/code/src/common/resources/file/file-resource.c similarity index 98% rename from code/src/versioned-osd/prototype/file-resource/file-resource.c rename to code/src/common/resources/file/file-resource.c index f34d9a6..b933dcd 100644 --- a/code/src/versioned-osd/prototype/file-resource/file-resource.c +++ b/code/src/common/resources/file/file-resource.c @@ -21,7 +21,7 @@ #include "src/aesop/op.h" #include "src/aesop/opcache.h" #include "src/common/triton-hash.h" -#include "src/versioned-osd/prototype/file-resource/file-resource.h" +#include "src/common/resources/file/file-resource.h" #include "src/common/triton-error.h" #include "src/common/triton-debug.h" #include "src/common/triton-init.h" @@ -442,7 +442,7 @@ void file_finalize(void) __attribute__((constructor)) void triton_file_init_register(void); __attribute__((constructor)) void triton_file_init_register(void) { - triton_init_register("triton.vosd.file", file_init, file_finalize, NULL, + triton_init_register("triton.tosd.file", file_init, file_finalize, NULL, "triton.debug", "aesop.control", "triton.zeroconf"); } @@ -745,7 +745,7 @@ static int pwrite_work_fn(struct ae_op* op) f_op->u.pwrite.offset); /* NOTE: We are going to treat it as an error if a write ever comes up - * short. Should not be a normal condition in the VOSD's usage of this + * short. Should not be a normal condition in the TOSD's usage of this * resource. */ if(ret < 0) @@ -801,7 +801,7 @@ static int pread_work_fn(struct ae_op* op) f_op->u.pread.offset); /* NOTE: We are going to treat it as an error if a read ever comes up - * short. Should not be a normal condition in the VOSD's usage of this + * short. Should not be a normal condition in the TOSD's usage of this * resource. */ if(ret < 0) diff --git a/code/src/versioned-osd/prototype/file-resource/file-resource.hae b/code/src/common/resources/file/file-resource.hae similarity index 100% rename from code/src/versioned-osd/prototype/file-resource/file-resource.hae rename to code/src/common/resources/file/file-resource.hae diff --git a/code/src/versioned-osd/prototype/file-resource/module.mk.in b/code/src/common/resources/file/module.mk.in similarity index 59% rename from code/src/versioned-osd/prototype/file-resource/module.mk.in rename to code/src/common/resources/file/module.mk.in index d1506df..ed6208b 100644 --- a/code/src/versioned-osd/prototype/file-resource/module.mk.in +++ b/code/src/common/resources/file/module.mk.in @@ -1,4 +1,4 @@ -DIR := src/versioned-osd/prototype/file-resource +DIR := src/common/resources/file AESOP_HDR += $(DIR)/file-resource.hae LIBSRC += $(DIR)/file-resource.c diff --git a/code/src/common/triton-init-registry.c b/code/src/common/triton-init-registry.c index 265e5c1..fb1ae9e 100644 --- a/code/src/common/triton-init-registry.c +++ b/code/src/common/triton-init-registry.c @@ -28,7 +28,7 @@ void triton_zeroconf_init_register(void); void triton_fakess_init_register(void); void triton_place_init_register(void); void triton_rebuild_init_register(void); -void triton_vosd_init_register(void); +void triton_tosd_init_register(void); void triton_file_init_register(void); void triton_bdb_init_register(void); void triton_rosd_init_register(void); @@ -60,7 +60,7 @@ void triton_init_register_components(void) triton_fakess_init_register(); triton_place_init_register(); triton_rebuild_init_register(); - triton_vosd_init_register(); + triton_tosd_init_register(); triton_bdb_init_register(); triton_file_init_register(); triton_rosd_init_register(); diff --git a/code/src/common/triton-init.c b/code/src/common/triton-init.c index 78dbe19..a0ee9b8 100644 --- a/code/src/common/triton-init.c +++ b/code/src/common/triton-init.c @@ -408,15 +408,15 @@ __attribute__((constructor)) void triton_logical_register(void) NULL, NULL, "triton.core", - "triton.vosd.bdb", - "triton.vosd.file", - "triton.vosd"); + "triton.tosd.bdb", + "triton.tosd.file", + "triton.tosd"); triton_init_register("triton.echo-server", NULL, NULL, NULL, - "triton.vosd.file", + "triton.tosd.file", "triton.resource.timer", "triton.socket"); diff --git a/code/src/kv/kv-intern.ae b/code/src/kv/kv-intern.ae index 41b8020..286dd46 100644 --- a/code/src/kv/kv-intern.ae +++ b/code/src/kv/kv-intern.ae @@ -11,7 +11,6 @@ #include "src/replicated-osd/rosd-utils.h" #include "src/placement/placement.hae" #include "src/kv/kv-intern.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" #include "src/fakess/fakess.hae" #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" diff --git a/code/src/kv/kv.c b/code/src/kv/kv.c index 3b48250..e5e49e8 100644 --- a/code/src/kv/kv.c +++ b/code/src/kv/kv.c @@ -159,9 +159,9 @@ triton_ret_t triton_kv_init (size_t servercount, const char *kvstore) snprintf(datapath, sizeof(datapath), "%s/data", kvstore); - ret = triton_zeroconf_set("triton.vosd.db_path", kvstore); + ret = triton_zeroconf_set("triton.tosd.db_path", kvstore); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", datapath); + ret = triton_zeroconf_set("triton.tosd.data_path", datapath); triton_error_assert(ret); ret = triton_init("triton.client", "triton.server"); diff --git a/code/src/kv/test/kvtest.c b/code/src/kv/test/kvtest.c index 80b312d..943e6cd 100644 --- a/code/src/kv/test/kvtest.c +++ b/code/src/kv/test/kvtest.c @@ -455,7 +455,7 @@ static void hybridtest () MPI_Comm_size (MPI_COMM_WORLD, &commsize); char buf[256]; - sprintf (buf, "/tmp/vosd-%i", commrank); + sprintf (buf, "/tmp/tosd-%i", commrank); triton_kv_init (commsize, buf); ret = triton_kv_server_start(&id); @@ -560,7 +560,7 @@ int main (int argc, char ** args) /* ============================================= */ write0v (commrank, "Initializing KV store...\n"); char buf[128]; - sprintf (buf, "/tmp/vosd-%u", commrank); + sprintf (buf, "/tmp/tosd-%u", commrank); triton_kv_init (opt_servers, buf); /* ============================================= */ diff --git a/code/src/kv/test/simpletest.c b/code/src/kv/test/simpletest.c index 9254091..38536e1 100644 --- a/code/src/kv/test/simpletest.c +++ b/code/src/kv/test/simpletest.c @@ -104,7 +104,7 @@ static void simpletest () int main (int argc, char ** args) { - triton_kv_init (1, "/tmp/vosd"); + triton_kv_init (1, "/tmp/tosd"); simpletest (); triton_kv_finalize (); diff --git a/code/src/rebuild/rebuild.ae b/code/src/rebuild/rebuild.ae index 1b1eeee..5ccdbdc 100644 --- a/code/src/rebuild/rebuild.ae +++ b/code/src/rebuild/rebuild.ae @@ -10,7 +10,7 @@ #include "src/rebuild/rebuild.hae" #include "src/placement/placement.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" /** List of triton_rebuild_wu_stub_t @@ -60,7 +60,7 @@ __blocking void enumerate_stub_wus(triton_node_t self, offset = 0; while (true) { - vosd_enumerate(64, offset, working, &actual); + tosd_enumerate(64, offset, working, &actual); printf("enumerate got: %i\n", actual); if (actual == 0) break; diff --git a/code/src/replicated-osd/replicated-osd.aer b/code/src/replicated-osd/replicated-osd.aer index ff38149..9672551 100644 --- a/code/src/replicated-osd/replicated-osd.aer +++ b/code/src/replicated-osd/replicated-osd.aer @@ -38,7 +38,7 @@ /* TODO: doxygen format */ -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #define REP_FACTOR_FORK 1000 #define TRANS_NR_CACHE_SIZE 1024 /* TODO: tunable? */ @@ -103,7 +103,7 @@ __attribute__((constructor)) void triton_rosd_init_register(void) { triton_init_register( "triton.rosd", rosd_init, rosd_finalize, NULL, - "aesop.remote.service", "aesop.remote", "triton.remote.retry", "triton.net", "triton.vosd", "triton.placement"); + "aesop.remote.service", "aesop.remote", "triton.remote.retry", "triton.net", "triton.tosd", "triton.placement"); } @@ -119,7 +119,7 @@ __blocking triton_ret_t rosd_remove_local_storage( triton_ret_t tret; int value = 0; - tret = vosd_remove(oid, niid); + tret = tosd_remove(oid, niid); if(tret == TRITON_ERR_NIID_DONE) { /* this operation is already done */ @@ -148,7 +148,7 @@ __blocking triton_ret_t rosd_create_local_storage( int64_t size; char* buffer_offsets[1]; - tret = vosd_create(oid, niid); + tret = tosd_create(oid, niid); if(tret == TRITON_ERR_NIID_DONE) { /* this operation is already done */ @@ -158,7 +158,7 @@ __blocking triton_ret_t rosd_create_local_storage( if(tret != TRITON_SUCCESS) { - return triton_error_wrap(tret, TRITON_ADDR_NULL, "vosd_create failed"); + return triton_error_wrap(tret, TRITON_ADDR_NULL, "tosd_create failed"); } /* store replication factor directly in a data fork */ @@ -170,8 +170,8 @@ __blocking triton_ret_t rosd_create_local_storage( * There is no harm in writing the replication factor twice. We do need * to look out for conflicts on the transaction number, though. */ - tret = vosd_write(oid, REP_FACTOR_FORK, 1, buffer_offsets, - &size, 1, &obj_offset, &size, 1, VOSD_FLAG_AUTO_TXN, 0); + tret = tosd_write(oid, REP_FACTOR_FORK, 1, buffer_offsets, + &size, 1, &obj_offset, &size, 1, TOSD_FLAG_AUTO_TXN, 0); if(tret == TRITON_ERR_TXN_ALREADY) { /* already done */ @@ -185,7 +185,7 @@ __blocking triton_ret_t rosd_create_local_storage( * Give a best effort here to remove the object in order to simplify * cleanup later. It's ok if this does not succeed. */ - tret_tmp = vosd_remove(oid, 0); + tret_tmp = tosd_remove(oid, 0); if(tret_tmp != TRITON_SUCCESS) { triton_error_destroy(tret_tmp); @@ -216,20 +216,20 @@ __blocking triton_ret_t rosd_write_local_storage( int value = 0; char* buffer_offsets[1]; int64_t big_size = buffer.size; - int vosd_flags = VOSD_FLAG_AUTO_TXN; + int tosd_flags = TOSD_FLAG_AUTO_TXN; if(flags & ROSD_FLAG_TRUNC_WRITE) - vosd_flags |= VOSD_FLAG_TRUNC_WRITE; + tosd_flags |= TOSD_FLAG_TRUNC_WRITE; /* NOTE: a typical write is idempotent; no need for niid information * here */ buffer_offsets[0] = buffer.buffer; - tret = vosd_write(oid, oid_fork, txn_number, buffer_offsets, &big_size, - 1, &offset, &big_size, 1, vosd_flags, 0); + tret = tosd_write(oid, oid_fork, txn_number, buffer_offsets, &big_size, + 1, &offset, &big_size, 1, tosd_flags, 0); if(tret != TRITON_SUCCESS) { - triton_log_error(triton_log_default, tret, "vosd_write()"); + triton_log_error(triton_log_default, tret, "tosd_write()"); } return(tret); @@ -664,7 +664,7 @@ __remote __blocking triton_ret_t rosd_remove( obj_offset = 0; buffer_offsets[0] = (char*)&replication_factor; size = sizeof(replication_factor); - tret = vosd_read(req->oid, REP_FACTOR_FORK, buffer_offsets, + tret = tosd_read(req->oid, REP_FACTOR_FORK, buffer_offsets, &size, 1, &obj_offset, &size, 1, &out_size, 0); /* TODO: the below logic is only a stopgap solution; when niids are * supported by reads we won't have to jump through these hoops @@ -676,7 +676,7 @@ __remote __blocking triton_ret_t rosd_remove( * remove operation? Check to see if the remove has already been * performed. */ - tret = vosd_check_niid(req->oid, niid, VOSD_NIID_OP_REMOVE); + tret = tosd_check_niid(req->oid, niid, TOSD_NIID_OP_REMOVE); if(tret == TRITON_ERR_NIID_DONE) { /* we did this remove already; return success */ @@ -697,7 +697,7 @@ __remote __blocking triton_ret_t rosd_remove( } if(tret != TRITON_SUCCESS) { - triton_log_error(triton_log_default, tret, "replication factor vosd_read()"); + triton_log_error(triton_log_default, tret, "replication factor tosd_read()"); return(tret); } if(out_size != sizeof(replication_factor)) @@ -811,7 +811,7 @@ __remote __blocking triton_ret_t rosd_read( return(tret); } mem_offsets[0] = resp->buffer.buffer; - tret = vosd_read(req->oid, req->oid_fork, mem_offsets, &req->size, 1, + tret = tosd_read(req->oid, req->oid_fork, mem_offsets, &req->size, 1, &req->offset, &req->size, 1, &out_size, 0); if(tret == TRITON_SUCCESS) @@ -854,11 +854,11 @@ __remote __blocking triton_ret_t rosd_write( obj_offset = 0; buffer_offsets[0] = (char*)&replication_factor; size = sizeof(replication_factor); - tret = vosd_read(req->oid, REP_FACTOR_FORK, buffer_offsets, + tret = tosd_read(req->oid, REP_FACTOR_FORK, buffer_offsets, &size, 1, &obj_offset, &size, 1, &out_size, 0); if(tret != TRITON_SUCCESS) { - triton_log_error(triton_log_default, tret, "replication factor vosd_read()"); + triton_log_error(triton_log_default, tret, "replication factor tosd_read()"); return(tret); } if(out_size != sizeof(replication_factor)) diff --git a/code/src/replicated-osd/rosd-trans-nr-cache.ae b/code/src/replicated-osd/rosd-trans-nr-cache.ae index 40b61ba..269af05 100644 --- a/code/src/replicated-osd/rosd-trans-nr-cache.ae +++ b/code/src/replicated-osd/rosd-trans-nr-cache.ae @@ -10,7 +10,7 @@ #include "src/common/triton-log.h" #include "src/common/triton-debug.h" #include "rosd-trans-nr-cache.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" static triton_debug_mask_t txn_nr_cache_dbg_mask; @@ -134,8 +134,8 @@ __blocking triton_ret_t trans_nr_cache_get(struct trans_nr_cache_entry **entry, tmp_entry->oid = oid; tmp_entry->ref_count = 1; - /* pull current txn_number from vosd */ - tret = vosd_get_version(oid, &tmp_entry->txn_number); + /* pull current txn_number from tosd */ + tret = tosd_get_version(oid, &tmp_entry->txn_number); if(tret != TRITON_SUCCESS) { triton_mutex_unlock(&trans_nr_mutex); diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index d4a186e..6404d41 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -25,8 +25,6 @@ #include "src/common/triton-init.h" #include "src/common/traffic-cop.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -623,16 +621,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/replicated-osd/tests/rosd-txn-nr-test.ae b/code/src/replicated-osd/tests/rosd-txn-nr-test.ae index 19c6fbe..7e0abf4 100644 --- a/code/src/replicated-osd/tests/rosd-txn-nr-test.ae +++ b/code/src/replicated-osd/tests/rosd-txn-nr-test.ae @@ -23,8 +23,6 @@ #include "src/zeroconf/zeroconf.h" #include "src/mapping/mapping.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd module */ #include "src/replicated-osd/rosd_module.h" @@ -389,11 +387,11 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); /* servers */ diff --git a/code/src/replicated-osd/tests/rosd2.ae b/code/src/replicated-osd/tests/rosd2.ae index 4d406c8..9f4f7df 100644 --- a/code/src/replicated-osd/tests/rosd2.ae +++ b/code/src/replicated-osd/tests/rosd2.ae @@ -22,8 +22,6 @@ #include "src/fakess/fakess.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" @@ -184,12 +182,12 @@ int main(int argc, char *argv[]) if (rank == 0 || rank == 1) { - ret = triton_zeroconf_set("triton.vosd.db_path", rosd_root); + ret = triton_zeroconf_set("triton.tosd.db_path", rosd_root); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", rosd_logs); + ret = triton_zeroconf_set("triton.tosd.data_path", rosd_logs); triton_error_assert(ret); - ret = vosd_init(); + ret = tosd_init(); triton_error_assert(ret); ae_context_create(&mpi_resource_ctx, @@ -215,7 +213,7 @@ int main(int argc, char *argv[]) if(rank == 0) { - vosd_finalize(); + tosd_finalize(); } aer_service_finalize(); diff --git a/code/src/replicated-osd/tests/rosd3.ae b/code/src/replicated-osd/tests/rosd3.ae index 8074704..5a958ee 100644 --- a/code/src/replicated-osd/tests/rosd3.ae +++ b/code/src/replicated-osd/tests/rosd3.ae @@ -24,7 +24,6 @@ #include "src/placement/placement.hae" #include "src/replicated-osd/rosd-utils.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" @@ -219,12 +218,12 @@ int main(int argc, char *argv[]) { sprintf(rosd_root, "/tmp/rosd%i", rank); sprintf(rosd_logs, "%s/logs", rosd_root); - ret = triton_zeroconf_set("triton.vosd.db_path", rosd_root); + ret = triton_zeroconf_set("triton.tosd.db_path", rosd_root); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", rosd_logs); + ret = triton_zeroconf_set("triton.tosd.data_path", rosd_logs); triton_error_assert(ret); - ret = vosd_init(); + ret = tosd_init(); triton_error_assert(ret); ae_context_create(&mpi_resource_ctx, @@ -251,7 +250,7 @@ int main(int argc, char *argv[]) if (rank == 0) { - ; //vosd_finalize(); + ; //tosd_finalize(); } // aer_service_finalize(); diff --git a/code/src/socket/test/echo-server.ae b/code/src/socket/test/echo-server.ae index fa4bc24..e3cfe02 100644 --- a/code/src/socket/test/echo-server.ae +++ b/code/src/socket/test/echo-server.ae @@ -3,7 +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 "src/common/resources/file/file-resource.hae" #include "src/common/triton-debug.h" #include <getopt.h> diff --git a/code/src/state/test/rosd-global.ae b/code/src/state/test/rosd-global.ae index b21dd32..fdffe97 100644 --- a/code/src/state/test/rosd-global.ae +++ b/code/src/state/test/rosd-global.ae @@ -29,8 +29,6 @@ #include "src/placement/placement.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -332,16 +330,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-injection.ae b/code/src/state/test/rosd-injection.ae index 07e552f..7fa8517 100644 --- a/code/src/state/test/rosd-injection.ae +++ b/code/src/state/test/rosd-injection.ae @@ -33,8 +33,6 @@ #include "src/state/sc_stubs.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -354,16 +352,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", mpi_rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-maint.ae b/code/src/state/test/rosd-maint.ae index b165596..5157b77 100644 --- a/code/src/state/test/rosd-maint.ae +++ b/code/src/state/test/rosd-maint.ae @@ -33,8 +33,6 @@ #include "src/state/sc_stubs.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -362,16 +360,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", mpi_rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-peers.ae b/code/src/state/test/rosd-peers.ae index 39a0d75..9cefc25 100644 --- a/code/src/state/test/rosd-peers.ae +++ b/code/src/state/test/rosd-peers.ae @@ -31,7 +31,6 @@ #include "src/state/state.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" #include "src/aesop/aesop-support.hae" /* include server-side rosd skeletons */ @@ -354,16 +353,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", mpi_rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-recover.ae b/code/src/state/test/rosd-recover.ae index 5ee910d..c3cd1f9 100644 --- a/code/src/state/test/rosd-recover.ae +++ b/code/src/state/test/rosd-recover.ae @@ -33,8 +33,6 @@ #include "src/state/sc_stubs.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -322,16 +320,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", mpi_rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-start.ae b/code/src/state/test/rosd-start.ae index 71f5f7d..181cea1 100644 --- a/code/src/state/test/rosd-start.ae +++ b/code/src/state/test/rosd-start.ae @@ -29,8 +29,6 @@ #include "src/placement/placement.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -290,16 +288,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-status.ae b/code/src/state/test/rosd-status.ae index c1717cd..d01c981 100644 --- a/code/src/state/test/rosd-status.ae +++ b/code/src/state/test/rosd-status.ae @@ -30,8 +30,6 @@ #include "src/state/state.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -356,16 +354,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/state/test/rosd-trigger.ae b/code/src/state/test/rosd-trigger.ae index 28be517..1f43893 100644 --- a/code/src/state/test/rosd-trigger.ae +++ b/code/src/state/test/rosd-trigger.ae @@ -30,8 +30,6 @@ #include "src/state/state.hae" #include "src/common/triton-init.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" - /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" #include "src/remote/core_module.h" @@ -353,16 +351,16 @@ int main(int argc, char *argv[]) sprintf(rank_suffix, "%d", mpi_rank); strcat(log_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.data_path", log_path); + ret = triton_zeroconf_set("triton.tosd.data_path", log_path); triton_error_assert(ret); strcat(db_path, rank_suffix); - ret = triton_zeroconf_set("triton.vosd.db_path", db_path); + ret = triton_zeroconf_set("triton.tosd.db_path", db_path); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + ret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(ret); /* servers */ diff --git a/code/src/versioned-osd/prototype/bdb-throttle.ae b/code/src/transactional-osd/bdb-throttle.ae similarity index 92% rename from code/src/versioned-osd/prototype/bdb-throttle.ae rename to code/src/transactional-osd/bdb-throttle.ae index 929e32e..21ae413 100644 --- a/code/src/versioned-osd/prototype/bdb-throttle.ae +++ b/code/src/transactional-osd/bdb-throttle.ae @@ -1,10 +1,10 @@ #include <db.h> -#include "src/versioned-osd/prototype/bdb-throttle.hae" +#include "src/transactional-osd/bdb-throttle.hae" #include "src/common/resources/scheduling/sched.hae" #include "src/common/triton-list.h" -#include "src/versioned-osd/prototype/bdb-resource/bdb-resource.hae" +#include "src/common/resources/bdb/bdb-resource.hae" #include "src/zeroconf/zeroconf.h" #include "src/common/triton-debug.h" @@ -15,7 +15,7 @@ static triton_mutex_t bdb_txn_mutex = TRITON_MUTEX_INITIALIZER; static triton_sched_t bdb_txn_sched; static triton_list_t bdb_txn_queue = TRITON_LIST_STATIC_INITIALIZER(bdb_txn_queue); -static const char *max_confkey = "triton.vosd.bdb_throttle_max"; +static const char *max_confkey = "triton.tosd.bdb_throttle_max"; static triton_ret_t max_updater(const char *key, const char *value); static triton_debug_mask_t bdb_throttle_mask; static DB_ENV *envp = NULL; @@ -32,8 +32,8 @@ triton_ret_t throttle_bdb_init(DB_ENV *env) triton_ret_t tret; envp = env; - tret = triton_debug_add_mask("vosd.bdb_throttle", &bdb_throttle_mask, - "Output debugging information for the versioned-osd throttling component"); + tret = triton_debug_add_mask("tosd.bdb_throttle", &bdb_throttle_mask, + "Output debugging information for the transactional-osd throttling component"); if(tret != TRITON_SUCCESS) { return(tret); @@ -41,7 +41,7 @@ triton_ret_t throttle_bdb_init(DB_ENV *env) tret = triton_zeroconf_register(max_confkey, "32", max_updater, - "Specify maximum number of BDB txns for the VOSD to launch at once."); + "Specify maximum number of BDB txns for the TOSD to launch at once."); if(tret != TRITON_SUCCESS && tret != TRITON_ERR_EXIST) { return(tret); diff --git a/code/src/versioned-osd/prototype/bdb-throttle.hae b/code/src/transactional-osd/bdb-throttle.hae similarity index 100% rename from code/src/versioned-osd/prototype/bdb-throttle.hae rename to code/src/transactional-osd/bdb-throttle.hae diff --git a/code/src/versioned-osd/prototype/module.mk.in b/code/src/transactional-osd/module.mk.in similarity index 52% rename from code/src/versioned-osd/prototype/module.mk.in rename to code/src/transactional-osd/module.mk.in index 09283b2..93b2ed9 100644 --- a/code/src/versioned-osd/prototype/module.mk.in +++ b/code/src/transactional-osd/module.mk.in @@ -1,11 +1,11 @@ -DIR := src/versioned-osd/prototype +DIR := src/transactional-osd -AESOP_HDR += $(DIR)/versioned-osd.hae -AESOP_HDR += $(DIR)/vosd-fd-cache.hae +AESOP_HDR += $(DIR)/transactional-osd.hae +AESOP_HDR += $(DIR)/tosd-fd-cache.hae AESOP_HDR += $(DIR)/bdb-throttle.hae -AELIBSRC += $(DIR)/versioned-osd.ae -AELIBSRC += $(DIR)/vosd-fd-cache.ae +AELIBSRC += $(DIR)/transactional-osd.ae +AELIBSRC += $(DIR)/tosd-fd-cache.ae AELIBSRC += $(DIR)/bdb-throttle.ae # using _GNU_SOURCE for pread/pwrite declarations. _XOPEN_SOURCE might work diff --git a/code/src/versioned-osd/prototype/tests/4M-w-serial.txt b/code/src/transactional-osd/tests/4M-w-serial.txt similarity index 100% rename from code/src/versioned-osd/prototype/tests/4M-w-serial.txt rename to code/src/transactional-osd/tests/4M-w-serial.txt diff --git a/code/src/versioned-osd/prototype/tests/fake-resource.c b/code/src/transactional-osd/tests/fake-resource.c similarity index 98% rename from code/src/versioned-osd/prototype/tests/fake-resource.c rename to code/src/transactional-osd/tests/fake-resource.c index 136a52a..a9cb2f9 100644 --- a/code/src/versioned-osd/prototype/tests/fake-resource.c +++ b/code/src/transactional-osd/tests/fake-resource.c @@ -16,7 +16,7 @@ #include "src/aesop/op.h" #include "src/aesop/opcache.h" #include "src/common/triton-hash.h" -#include "src/versioned-osd/prototype/tests/fake-resource.h" +#include "src/transactional-osd/tests/fake-resource.h" #include "src/common/triton-error.h" #include "src/common/triton-debug.h" diff --git a/code/src/versioned-osd/prototype/tests/fake-resource.hae b/code/src/transactional-osd/tests/fake-resource.hae similarity index 100% rename from code/src/versioned-osd/prototype/tests/fake-resource.hae rename to code/src/transactional-osd/tests/fake-resource.hae diff --git a/code/src/versioned-osd/prototype/tests/fake1.ae b/code/src/transactional-osd/tests/fake1.ae similarity index 90% rename from code/src/versioned-osd/prototype/tests/fake1.ae rename to code/src/transactional-osd/tests/fake1.ae index 785eaa3..1b64855 100644 --- a/code/src/versioned-osd/prototype/tests/fake1.ae +++ b/code/src/transactional-osd/tests/fake1.ae @@ -4,8 +4,8 @@ #include <stdio.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/tests/fake-resource.hae" -#include "src/versioned-osd/prototype/tests/faker.hae" +#include "src/transactional-osd/tests/fake-resource.hae" +#include "src/transactional-osd/tests/faker.hae" static int done; static int do_fake_test_ret; @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) ae_op_id_t op_id; int pc = 0; - ret = triton_init("triton.vosd"); + ret = triton_init("triton.tosd"); triton_error_assert(ret); ret = fake_init(); diff --git a/code/src/versioned-osd/prototype/tests/faker.ae b/code/src/transactional-osd/tests/faker.ae similarity index 84% rename from code/src/versioned-osd/prototype/tests/faker.ae rename to code/src/transactional-osd/tests/faker.ae index d0d56c6..df54658 100644 --- a/code/src/versioned-osd/prototype/tests/faker.ae +++ b/code/src/transactional-osd/tests/faker.ae @@ -15,8 +15,8 @@ #include "src/common/triton-base.h" #include "src/aesop/aesop.h" #include "src/common/triton-hash.h" -#include "src/versioned-osd/prototype/tests/fake-resource.hae" -#include "src/versioned-osd/prototype/tests/faker.hae" +#include "src/transactional-osd/tests/fake-resource.hae" +#include "src/transactional-osd/tests/faker.hae" __blocking triton_ret_t fake_test(int *x) { diff --git a/code/src/versioned-osd/prototype/tests/faker.hae b/code/src/transactional-osd/tests/faker.hae similarity index 100% rename from code/src/versioned-osd/prototype/tests/faker.hae rename to code/src/transactional-osd/tests/faker.hae diff --git a/code/src/transactional-osd/tests/module.mk.in b/code/src/transactional-osd/tests/module.mk.in new file mode 100644 index 0000000..812c477 --- /dev/null +++ b/code/src/transactional-osd/tests/module.mk.in @@ -0,0 +1,23 @@ +DIR := src/transactional-osd/tests + +AETESTSRC += $(DIR)/tosd1.ae +AETESTSRC += $(DIR)/tosd-dump.ae +AETESTSRC += $(DIR)/tosd-enumerate.ae +AETESTSRC += $(DIR)/tosd-range.ae +AETESTSRC += $(DIR)/tosd-autotune.ae +AETESTSRC += $(DIR)/tosd-niid.ae +AETESTSRC += $(DIR)/fake1.ae +AETESTSRC += $(DIR)/tosd-multi-object.ae +AETESTSRC += $(DIR)/tosd-bench-concurrent.ae +AETESTSRC += $(DIR)/tosd-bench-create.ae +AETESTSRC += $(DIR)/workload-gen.ae +AESOP_HDR += $(DIR)/fake-resource.hae +AESOP_HDR += $(DIR)/faker.hae +AELIBSRC += $(DIR)/faker.ae +LIBSRC += $(DIR)/fake-resource.c + +MODLIBS_$(DIR) = -lpthread -ldb + +DEPLIBS += -ldb + +LIBS += -ldb diff --git a/code/src/versioned-osd/prototype/tests/vosd-autotune.ae b/code/src/transactional-osd/tests/tosd-autotune.ae similarity index 70% rename from code/src/versioned-osd/prototype/tests/vosd-autotune.ae rename to code/src/transactional-osd/tests/tosd-autotune.ae index be3ca24..c2c2a6a 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-autotune.ae +++ b/code/src/transactional-osd/tests/tosd-autotune.ae @@ -4,41 +4,41 @@ #include <sys/time.h> #include <stdlib.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; - tret = vosd_autotune(); + tret = tosd_autotune(); if(tret != TRITON_SUCCESS) { fprintf(stderr, "Error: autotuner failed.\n"); return 0; } - /* tret = vosd_dump(); */ + /* tret = tosd_dump(); */ return 0; } int done = 0; -int do_vosd_test_ret; +int do_tosd_test_ret; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; done = 1; ae_poll_break(ctx); } static void usage(void) { - fprintf(stderr, "Usage: vosd-autotune <vosd db dir> <vosd log dir>\n"); + fprintf(stderr, "Usage: tosd-autotune <tosd db dir> <tosd log dir>\n"); return; } @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) int pc = 0; int ret; triton_ret_t tret; - const char* vosd_init_flags = NULL; + const char* tosd_init_flags = NULL; int i; if(argc != 3) @@ -60,19 +60,19 @@ int main(int argc, char *argv[]) return(-1); } - tret = triton_zeroconf_set("triton.vosd.db_path", argv[1]); + tret = triton_zeroconf_set("triton.tosd.db_path", argv[1]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.data_path", argv[2]); + tret = triton_zeroconf_set("triton.tosd.data_path", argv[2]); triton_error_assert(tret); - tret = triton_init("triton.vosd"); + tret = triton_init("triton.tosd"); triton_error_assert(tret); ae_context_create(&ctx, "bdb", "file", "sched", "timer"); ae_hints_init(&hints); done = 0; - tret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + tret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(tret == TRITON_SUCCESS) { while(done == 0) @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) } printf("\n"); - return do_vosd_test_ret; + return do_tosd_test_ret; } /* diff --git a/code/src/versioned-osd/prototype/tests/vosd-bench-concurrent.ae b/code/src/transactional-osd/tests/tosd-bench-concurrent.ae similarity index 83% rename from code/src/versioned-osd/prototype/tests/vosd-bench-concurrent.ae rename to code/src/transactional-osd/tests/tosd-bench-concurrent.ae index fd34f61..86b6538 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-bench-concurrent.ae +++ b/code/src/transactional-osd/tests/tosd-bench-concurrent.ae @@ -4,7 +4,7 @@ #include <sys/time.h> #include <stdlib.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" enum op_type @@ -41,15 +41,15 @@ static uint64_t version; static int max_seconds = 0; static uint128_t oid; -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; - int w_flags = VOSD_FLAG_AUTO_TXN; + int w_flags = TOSD_FLAG_AUTO_TXN; if(data_mode == 'k') - w_flags |= VOSD_FLAG_TRUNC_WRITE; + w_flags |= TOSD_FLAG_TRUNC_WRITE; - tret = vosd_create(oid, 0); + tret = tosd_create(oid, 0); if(tret == TRITON_ERR_EXIST) { printf("# operating on existing object.\n"); @@ -58,7 +58,7 @@ static __blocking int do_vosd_test(void) } triton_error_assert(tret); - tret = vosd_get_version(oid, &version); + tret = tosd_get_version(oid, &version); triton_error_assert(tret); first_version = version; @@ -120,7 +120,7 @@ static __blocking int do_vosd_test(void) if(tmp_op->type == WRITE) { - b_ret = vosd_write(oid, fork, b_version, &buffer, + b_ret = tosd_write(oid, fork, b_version, &buffer, &tmp_op->size, 1, &tmp_op->offset, &tmp_op->size, 1, w_flags, 0); triton_error_assert(b_ret); @@ -129,7 +129,7 @@ static __blocking int do_vosd_test(void) { assert(tmp_op->type == READ); - b_ret = vosd_read(oid, fork, &buffer, &tmp_op->size, 1, + b_ret = tosd_read(oid, fork, &buffer, &tmp_op->size, 1, &tmp_op->offset, &tmp_op->size, 1, &out_size, 0); triton_error_assert(b_ret); assert(out_size == tmp_op->size); @@ -162,13 +162,13 @@ static __blocking int do_vosd_test(void) } int done = 0; -int do_vosd_test_ret; +int do_tosd_test_ret; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; done = 1; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; ae_poll_break(ctx); } @@ -187,14 +187,14 @@ int main(int argc, char *argv[]) int ret; struct bench_op* tmp_op; triton_ret_t tret; - const char* vosd_init_flags = NULL; + const char* tosd_init_flags = NULL; int i; oid = triton_uint128_from_uint64(1); if(argc != 11) { - fprintf(stderr, "Usage: vosd-bench-concurrent <workload description file> <vosd db dir> <vosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <tosd db dir> <tosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); fprintf(stderr, " # k key/val, d for data mode\n"); fprintf(stderr, " # o for odirect, s for sync, b for both, n for neither\n"); return(-1); @@ -203,7 +203,7 @@ int main(int argc, char *argv[]) ret = sscanf(argv[4], "%d", &concurrent); if(ret != 1 || concurrent < 1) { - fprintf(stderr, "Usage: vosd-bench-concurrent <workload description file> <vosd db dir> <vosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <tosd db dir> <tosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); fprintf(stderr, " # k key/val, d for data mode\n"); fprintf(stderr, " # o for odirect, s for sync, b for both, n for neither\n"); return(-1); @@ -212,7 +212,7 @@ int main(int argc, char *argv[]) ret = sscanf(argv[5], "%c", &data_mode); if(ret != 1 || (data_mode != 'k' && data_mode != 'd')) { - fprintf(stderr, "Usage: vosd-bench-concurrent <workload description file> <vosd db dir> <vosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <tosd db dir> <tosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); fprintf(stderr, " # k key/val, d for data mode\n"); fprintf(stderr, " # o for odirect, s for sync, b for both, n for neither\n"); return(-1); @@ -222,7 +222,7 @@ int main(int argc, char *argv[]) if(ret != 1 || (sync_mode != 'o' && sync_mode != 's' && sync_mode != 'b' && sync_mode != 'n')) { - fprintf(stderr, "Usage: vosd-bench-concurrent <workload description file> <vosd db dir> <vosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <tosd db dir> <tosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); fprintf(stderr, " # k key/val, d for data mode\n"); fprintf(stderr, " # o for odirect, s for sync, b for both, n for neither\n"); return(-1); @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) ret = sscanf(argv[10], "%d", &max_seconds); if(ret != 1 || max_seconds < 0) { - fprintf(stderr, "Usage: vosd-bench-concurrent <workload description file> <vosd db dir> <vosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); + fprintf(stderr, "Usage: tosd-bench-concurrent <workload description file> <tosd db dir> <tosd log dir> <concurrent ops> <k|d> <db highwater mark> <log highwater mark> <alignment> <o|s|b|n> <max seconds>\n"); fprintf(stderr, " # k key/val, d for data mode\n"); fprintf(stderr, " # o for odirect, s for sync, b for both, n for neither\n"); return(-1); @@ -274,36 +274,36 @@ int main(int argc, char *argv[]) fclose(desc); if(sync_mode == 'o') - vosd_init_flags = "DATA_ODIRECT"; + tosd_init_flags = "DATA_ODIRECT"; else if(sync_mode == 's') - vosd_init_flags = "DATA_SYNC"; + tosd_init_flags = "DATA_SYNC"; else if(sync_mode == 'b') - vosd_init_flags = "DATA_SYNC,DATA_ODIRECT"; + tosd_init_flags = "DATA_SYNC,DATA_ODIRECT"; else - vosd_init_flags = ""; + tosd_init_flags = ""; - tret = triton_zeroconf_set("triton.vosd.flags", vosd_init_flags); + tret = triton_zeroconf_set("triton.tosd.flags", tosd_init_flags); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.db_path", argv[2]); + tret = triton_zeroconf_set("triton.tosd.db_path", argv[2]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.data_path", argv[3]); + tret = triton_zeroconf_set("triton.tosd.data_path", argv[3]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[6]); + tret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[6]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[7]); + tret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[7]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.alignment", argv[8]); + tret = triton_zeroconf_set("triton.tosd.alignment", argv[8]); triton_error_assert(tret); - tret = triton_init("triton.vosd"); + tret = triton_init("triton.tosd"); triton_error_assert(tret); ae_context_create(&ctx, "bdb", "file", "sched"); done = 0; ae_hints_init(&hints); - tret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + tret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(tret == TRITON_SUCCESS) { while(done == 0) @@ -336,7 +336,7 @@ int main(int argc, char *argv[]) printf("%f MB/s\n", (((double)total_size)/(1024.0*1024.0))/(end_tm-start_tm)); printf("%f ops/s\n", ((double)(version-first_version))/(end_tm-start_tm)); #endif - return do_vosd_test_ret; + return do_tosd_test_ret; } /* diff --git a/code/src/versioned-osd/prototype/tests/vosd-bench-create.ae b/code/src/transactional-osd/tests/tosd-bench-create.ae similarity index 82% rename from code/src/versioned-osd/prototype/tests/vosd-bench-create.ae rename to code/src/transactional-osd/tests/tosd-bench-create.ae index fa48a20..4de05b8 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-bench-create.ae +++ b/code/src/transactional-osd/tests/tosd-bench-create.ae @@ -4,7 +4,7 @@ #include <sys/time.h> #include <stdlib.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" @@ -25,7 +25,7 @@ static int use_niids = 0; triton_mutex_t started_mutex = TRITON_MUTEX_INITIALIZER; int started = 0; -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; uint32_t retry_count = 1; @@ -34,7 +34,7 @@ static __blocking int do_vosd_test(void) if(use_niids) { /* set hint indicating that all operations in this routines are - * "retries", meaning that the VOSD should honor the niid + * "retries", meaning that the TOSD should honor the niid */ tret = aesop_hints_put("triton.remote.retry_count", sizeof(retry_count), &retry_count, 1); triton_error_assert(tret); @@ -82,7 +82,7 @@ static __blocking int do_vosd_test(void) if(!done) { - b_ret = vosd_create(oid, niid); + b_ret = tosd_create(oid, niid); triton_error_assert(b_ret); } } @@ -100,20 +100,20 @@ static __blocking int do_vosd_test(void) } int done = 0; -int do_vosd_test_ret; +int do_tosd_test_ret; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; done = 1; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; ae_poll_break(ctx); } static void usage(void) { - fprintf(stderr, "Usage: vosd-bench-create <vosd db dir> <vosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> <use niids (0|1)>\n"); + fprintf(stderr, "Usage: tosd-bench-create <tosd db dir> <tosd log dir> <total ops> <concurrent ops> <db highwater mark> <s|n> <max seconds> <use niids (0|1)>\n"); fprintf(stderr, " # s for sync, n for no sync\n"); return; } @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) int pc = 0; int ret; triton_ret_t tret; - const char* vosd_init_flags = NULL; + const char* tosd_init_flags = NULL; int i; if(argc != 9) @@ -174,27 +174,27 @@ int main(int argc, char *argv[]) } if(sync_mode == 'o') - vosd_init_flags = "DATA_ODIRECT"; + tosd_init_flags = "DATA_ODIRECT"; else if(sync_mode == 's') - vosd_init_flags = "DATA_SYNC"; + tosd_init_flags = "DATA_SYNC"; else if(sync_mode == 'b') - vosd_init_flags = "DATA_SYNC,DATA_ODIRECT"; + tosd_init_flags = "DATA_SYNC,DATA_ODIRECT"; else - vosd_init_flags = ""; + tosd_init_flags = ""; - tret = triton_zeroconf_set("triton.vosd.flags", vosd_init_flags); + tret = triton_zeroconf_set("triton.tosd.flags", tosd_init_flags); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.db_path", argv[1]); + tret = triton_zeroconf_set("triton.tosd.db_path", argv[1]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.data_path", argv[2]); + tret = triton_zeroconf_set("triton.tosd.data_path", argv[2]); triton_error_assert(tret); - tret = triton_zeroconf_set("triton.vosd.db_coalescing_highwater", argv[5]); + tret = triton_zeroconf_set("triton.tosd.db_coalescing_highwater", argv[5]); triton_error_assert(tret); /* NOTE: setting data coalescing to match db coalescing */ - tret = triton_zeroconf_set("triton.vosd.data_coalescing_highwater", argv[5]); + tret = triton_zeroconf_set("triton.tosd.data_coalescing_highwater", argv[5]); triton_error_assert(tret); - /* NOTE: we have to initialize more than just the vosd so that the + /* NOTE: we have to initialize more than just the tosd so that the * retry_count hint gets registered */ tret = triton_init("triton.server"); @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) done = 0; ae_hints_init(&hints); - tret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + tret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(tret == TRITON_SUCCESS) { while(done == 0) @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) total, concurrent, (end_tm-start_tm), ((double)(total))/(end_tm-start_tm)); - return do_vosd_test_ret; + return do_tosd_test_ret; } /* diff --git a/code/src/versioned-osd/prototype/tests/vosd-dump.ae b/code/src/transactional-osd/tests/tosd-dump.ae similarity index 75% rename from code/src/versioned-osd/prototype/tests/vosd-dump.ae rename to code/src/transactional-osd/tests/tosd-dump.ae index de16c5a..c369f28 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-dump.ae +++ b/code/src/transactional-osd/tests/tosd-dump.ae @@ -4,29 +4,29 @@ #include <stdio.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" static void triton_perror(const char *s, triton_ret_t ret); static int done; -static int do_vosd_test_ret; +static int do_tosd_test_ret; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; done = 1; ae_poll_break(ctx); } -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; - tret = vosd_dump(); + tret = tosd_dump(); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error dumping TOSD state.\n"); triton_error_destroy(tret); return(1); } @@ -44,17 +44,17 @@ int main(int argc, char *argv[]) if(argc != 3) { - fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path>\n"); + fprintf(stderr, "Usage: tosd-dump <tosd path> <tosd log path>\n"); return(-1); } - ret = triton_zeroconf_set("triton.vosd.db_path", argv[1]); + ret = triton_zeroconf_set("triton.tosd.db_path", argv[1]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", argv[2]); + ret = triton_zeroconf_set("triton.tosd.data_path", argv[2]); triton_error_assert(ret); /* test initializing a specific component */ - ret = triton_init("triton.vosd"); + ret = triton_init("triton.tosd"); if(ret != TRITON_SUCCESS) { triton_perror("triton_init", ret); @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) done = 0; ae_hints_init(&hints); - ret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + ret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(ret == TRITON_SUCCESS) { while(done == 0) @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) triton_finalize(); - return do_vosd_test_ret; + return do_tosd_test_ret; } static void triton_perror(const char *s, triton_ret_t ret) diff --git a/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae b/code/src/transactional-osd/tests/tosd-enumerate.ae similarity index 80% rename from code/src/versioned-osd/prototype/tests/vosd-enumerate.ae rename to code/src/transactional-osd/tests/tosd-enumerate.ae index 3b2523a..2dbe288 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-enumerate.ae +++ b/code/src/transactional-osd/tests/tosd-enumerate.ae @@ -4,12 +4,12 @@ #include <stdio.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" static void triton_perror(const char *s, triton_ret_t ret); static int done; -static int do_vosd_test_ret; +static int do_tosd_test_ret; int count; int offset; @@ -18,12 +18,12 @@ uint128_t *oids; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; done = 1; ae_poll_break(ctx); } -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; int i; @@ -31,17 +31,17 @@ static __blocking int do_vosd_test(void) int result; oids = malloc(count * sizeof(uint128_t)); - tret = vosd_enumerate(count, offset, oids, &result); + tret = tosd_enumerate(count, offset, oids, &result); if(tret != TRITON_SUCCESS) { - printf("Error in vosd_enumerate()\n"); + printf("Error in tosd_enumerate()\n"); triton_error_destroy(tret); return(1); } if (result < count) { - printf("vosd-enumerate: warning: " + printf("tosd-enumerate: warning: " "requested %i oids but received %i\n", count, result); } @@ -66,14 +66,14 @@ int main(int argc, char *argv[]) if(argc != 5) { - fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path> " + fprintf(stderr, "Usage: tosd-dump <tosd path> <tosd log path> " "<count> <offset>\n"); return(-1); } - ret = triton_zeroconf_set("triton.vosd.db_path", argv[1]); + ret = triton_zeroconf_set("triton.tosd.db_path", argv[1]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", argv[2]); + ret = triton_zeroconf_set("triton.tosd.data_path", argv[2]); triton_error_assert(ret); c = sscanf(argv[3], "%i", &count); @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) } /* test initializing a specific component */ - ret = triton_init("triton.vosd"); + ret = triton_init("triton.tosd"); if(ret != TRITON_SUCCESS) { triton_perror("triton_init", ret); @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) done = 0; ae_hints_init(&hints); - ret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + ret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(ret == TRITON_SUCCESS) { while(done == 0) @@ -131,7 +131,7 @@ int main(int argc, char *argv[]) triton_finalize(); - return do_vosd_test_ret; + return do_tosd_test_ret; } static void triton_perror(const char *s, triton_ret_t ret) diff --git a/code/src/versioned-osd/prototype/tests/vosd-multi-object.ae b/code/src/transactional-osd/tests/tosd-multi-object.ae similarity index 75% rename from code/src/versioned-osd/prototype/tests/vosd-multi-object.ae rename to code/src/transactional-osd/tests/tosd-multi-object.ae index cd30fc0..40bab8b 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-multi-object.ae +++ b/code/src/transactional-osd/tests/tosd-multi-object.ae @@ -2,11 +2,11 @@ #include <stdio.h> #include <errno.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" -static __blocking int do_vosd_test(int argc, char **argv) +static __blocking int do_tosd_test(int argc, char **argv) { int ret; triton_ret_t tret; @@ -26,7 +26,7 @@ static __blocking int do_vosd_test(int argc, char **argv) if(argc != 1) { - fprintf(stderr, "Usage: vosd-multi-object\n"); + fprintf(stderr, "Usage: tosd-multi-object\n"); return(-1); } @@ -38,7 +38,7 @@ static __blocking int do_vosd_test(int argc, char **argv) for(i=0; i<500; i++) { oid = triton_uint128_from_uint64(i+1); - tret = vosd_create(oid, 0); + tret = tosd_create(oid, 0); if(tret != TRITON_SUCCESS && tret != TRITON_ERR_EXIST) { printf("Error creating oid=%llu\n", llu(i+1)); @@ -48,7 +48,7 @@ static __blocking int do_vosd_test(int argc, char **argv) } triton_error_destroy(tret); - tret = vosd_get_version(oid, &version_array[i]); + tret = tosd_get_version(oid, &version_array[i]); if(tret != TRITON_SUCCESS) { printf("Error getting version number for oid=%llu: %d\n", llu(i+1), ret); @@ -67,8 +67,8 @@ static __blocking int do_vosd_test(int argc, char **argv) buffer_szs[0] = 1024; obj_offsets[0] = 0; obj_szs[0] = 1024; - tret = vosd_write(oid, 0, version_array[i], buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_AUTO_TXN, 0); + tret = tosd_write(oid, 0, version_array[i], buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_AUTO_TXN, 0); if(tret != TRITON_SUCCESS) { printf("Error writing 0-1024 on oid=%llu: %d\n", llu(i+1), ret); @@ -78,7 +78,7 @@ static __blocking int do_vosd_test(int argc, char **argv) } } - tret = vosd_dump(); + tret = tosd_dump(); triton_error_assert(tret); /* delete them all */ @@ -86,7 +86,7 @@ static __blocking int do_vosd_test(int argc, char **argv) { oid = triton_uint128_from_uint64(i+1); - tret = vosd_remove(oid, 0); + tret = tosd_remove(oid, 0); if(tret != TRITON_SUCCESS) { printf("Error deleting oid=%llu\n", llu(i+1)); @@ -96,12 +96,12 @@ static __blocking int do_vosd_test(int argc, char **argv) } } - tret = vosd_dump(); + tret = tosd_dump(); triton_error_assert(tret); /* try to delete something that doesn't exist */ oid = triton_uint128_from_uint64(0); - tret = vosd_remove(oid, 0); + tret = tosd_remove(oid, 0); assert(tret == TRITON_ERR_NOENT); triton_error_destroy(tret); @@ -109,16 +109,16 @@ static __blocking int do_vosd_test(int argc, char **argv) return 0; } -static triton_ret_t init_vosd_zeroconf_params(int argc, char** argv) +static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) { triton_ret_t ret; - ret = triton_zeroconf_set("triton.vosd.db_path", "/tmp/vosd"); + ret = triton_zeroconf_set("triton.tosd.db_path", "/tmp/tosd"); if(ret != TRITON_SUCCESS) { return ret; } - return triton_zeroconf_set("triton.vosd.data_path", "/tmp/vosd/data"); + return triton_zeroconf_set("triton.tosd.data_path", "/tmp/tosd/data"); } /* NOTE: as an alternative, the following syntax could be used to make this @@ -126,14 +126,14 @@ static triton_ret_t init_vosd_zeroconf_params(int argc, char** argv) * and sched resources. Instead we are using it as an example of a test * program that uses the default context, by not specifying any resources. */ -/* aesop_main_set_with_init(init_vosd_zeroconf_params, - * "triton.vosd", - * do_vosd_test, +/* aesop_main_set_with_init(init_tosd_zeroconf_params, + * "triton.tosd", + * do_tosd_test, * "bdb", "file","sched"); */ -aesop_main_set_with_init(init_vosd_zeroconf_params, - "triton.vosd", - do_vosd_test); +aesop_main_set_with_init(init_tosd_zeroconf_params, + "triton.tosd", + do_tosd_test); /* * Local variables: diff --git a/code/src/versioned-osd/prototype/tests/vosd-niid.ae b/code/src/transactional-osd/tests/tosd-niid.ae similarity index 62% rename from code/src/versioned-osd/prototype/tests/vosd-niid.ae rename to code/src/transactional-osd/tests/tosd-niid.ae index 0a7a1d8..b5db64d 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-niid.ae +++ b/code/src/transactional-osd/tests/tosd-niid.ae @@ -5,10 +5,10 @@ #include "src/aesop/hints.h" #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" -static __blocking int do_vosd_test(int argc, char **argv) +static __blocking int do_tosd_test(int argc, char **argv) { triton_ret_t tret; uint64_t version = 5; @@ -22,7 +22,7 @@ static __blocking int do_vosd_test(int argc, char **argv) int64_t obj_szs[1]; /* set hint indicating that all operations in this routines are - * "retries", meaning that the VOSD should honor the niid. Normally + * "retries", meaning that the TOSD should honor the niid. Normally * this would be handled by the remote service code. */ tret = ae_hints_type_register("triton.remote.retry_count", 0, NULL); @@ -32,114 +32,114 @@ static __blocking int do_vosd_test(int argc, char **argv) triton_error_assert(tret); printf("Creating oid 5 (no niid)...\n"); - tret = vosd_create(oid, 0); + tret = tosd_create(oid, 0); if(tret != TRITON_SUCCESS) { - triton_error_print(tret, "vosd_create (please delete previous data for this test)"); + triton_error_print(tret, "tosd_create (please delete previous data for this test)"); return 1; } printf("Creating oid 5 (no niid)...\n"); - tret = vosd_create(oid, 0); + tret = tosd_create(oid, 0); if(tret != TRITON_ERR_EXIST) { - triton_error_print(tret, "vosd_create (should have been ERR_EXIST)"); + triton_error_print(tret, "tosd_create (should have been ERR_EXIST)"); return 1; } oid = triton_uint128_from_uint64(6); printf("Creating oid 6 (w/ niid)...\n"); - tret = vosd_create(oid, 33); + tret = tosd_create(oid, 33); if(tret != TRITON_SUCCESS) { - triton_error_print(tret, "vosd_create (please delete previous data for this test)"); + triton_error_print(tret, "tosd_create (please delete previous data for this test)"); return 1; } printf("Creating oid 6 (w/ niid)...\n"); - tret = vosd_create(oid, 33); + tret = tosd_create(oid, 33); if(tret != TRITON_ERR_NIID_DONE) { - triton_error_print(tret, "vosd_create (should have been ERR_NIID_DONE)"); + triton_error_print(tret, "tosd_create (should have been ERR_NIID_DONE)"); return 1; } - tret = vosd_dump(); + tret = tosd_dump(); printf("Writing oid 6 (w/ niid 77)...\n"); buffer_offsets[0] = (char*)&version; buffer_szs[0] = sizeof(version); obj_offsets[0] = 0; obj_szs[0] = sizeof(version); - tret = vosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_AUTO_TXN, 77); + tret = tosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_AUTO_TXN, 77); triton_error_assert(tret); printf("Deleting oid 6 (niid 99)...\n"); - tret = vosd_remove(oid, 99); + tret = tosd_remove(oid, 99); triton_error_assert(tret); printf("Deleting oid 6 (niid 99)...\n"); - tret = vosd_remove(oid, 99); + tret = tosd_remove(oid, 99); if(tret != TRITON_ERR_NIID_DONE) { - triton_error_print(tret, "vosd_create (should have been ERR_NIID_DONE)"); - tret = vosd_dump(); + triton_error_print(tret, "tosd_create (should have been ERR_NIID_DONE)"); + tret = tosd_dump(); return 1; } assert(tret == TRITON_ERR_NIID_DONE); - tret = vosd_dump(); + tret = tosd_dump(); printf("Writing oid 6 (w/ niid 77)...\n"); buffer_offsets[0] = (char*)&version; buffer_szs[0] = sizeof(version); obj_offsets[0] = 0; obj_szs[0] = sizeof(version); - tret = vosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_AUTO_TXN, 77); + tret = tosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_AUTO_TXN, 77); if(tret != TRITON_ERR_NIID_DONE) { - triton_log_error(triton_log_default, tret, "vosd_write()"); + triton_log_error(triton_log_default, tret, "tosd_write()"); } assert(tret == TRITON_ERR_NIID_DONE); printf("Creating oid 6 (w/ new niid)...\n"); - tret = vosd_create(oid, 34); + tret = tosd_create(oid, 34); triton_error_assert(tret); - tret = vosd_dump(); + tret = tosd_dump(); printf("Discarding an niid...\n"); tmp_niid = 33; - tret = vosd_discard_niids(&oid, &tmp_niid, 1); + tret = tosd_discard_niids(&oid, &tmp_niid, 1); triton_error_assert(tret); - tret = vosd_dump(); + tret = tosd_dump(); printf("Discarding the same niid...\n"); tmp_niid = 33; - tret = vosd_discard_niids(&oid, &tmp_niid, 1); + tret = tosd_discard_niids(&oid, &tmp_niid, 1); triton_error_assert(tret); - tret = vosd_dump(); + tret = tosd_dump(); return 1; } -static triton_ret_t init_vosd_zeroconf_params(int argc, char** argv) +static triton_ret_t init_tosd_zeroconf_params(int argc, char** argv) { triton_ret_t ret; - ret = triton_zeroconf_set("triton.vosd.db_path", "/tmp/vosd"); + ret = triton_zeroconf_set("triton.tosd.db_path", "/tmp/tosd"); if(ret != TRITON_SUCCESS) { return ret; } - return triton_zeroconf_set("triton.vosd.data_path", "/tmp/vosd/data"); + return triton_zeroconf_set("triton.tosd.data_path", "/tmp/tosd/data"); } -aesop_main_set_with_init(init_vosd_zeroconf_params, - "triton.vosd", - do_vosd_test, +aesop_main_set_with_init(init_tosd_zeroconf_params, + "triton.tosd", + do_tosd_test, "bdb", "file", "sched"); /* diff --git a/code/src/versioned-osd/prototype/tests/vosd-range.ae b/code/src/transactional-osd/tests/tosd-range.ae similarity index 83% rename from code/src/versioned-osd/prototype/tests/vosd-range.ae rename to code/src/transactional-osd/tests/tosd-range.ae index f964560..94d0cfa 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-range.ae +++ b/code/src/transactional-osd/tests/tosd-range.ae @@ -4,12 +4,12 @@ #include <stdio.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" static void triton_perror(const char *s, triton_ret_t ret); static int done; -static int do_vosd_test_ret; +static int do_tosd_test_ret; int count; int offset; @@ -20,12 +20,12 @@ uint128_t *oids; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; done = 1; ae_poll_break(ctx); } -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; int i; @@ -33,10 +33,10 @@ static __blocking int do_vosd_test(void) int result; oids = malloc(count * sizeof(uint128_t)); - tret = vosd_range(count, offset, lower, upper, oids, &result); + tret = tosd_range(count, offset, lower, upper, oids, &result); if(tret != TRITON_SUCCESS) { - printf("Error in vosd_enumerate()\n"); + printf("Error in tosd_enumerate()\n"); triton_error_destroy(tret); return(1); } @@ -66,14 +66,14 @@ int main(int argc, char *argv[]) if(argc != 7) { - fprintf(stderr, "Usage: vosd-dump <vosd path> <vosd log path> " + fprintf(stderr, "Usage: tosd-dump <tosd path> <tosd log path> " "<count> <offset> <lower> <upper>\n"); return(-1); } - ret = triton_zeroconf_set("triton.vosd.db_path", argv[arg_i++]); + ret = triton_zeroconf_set("triton.tosd.db_path", argv[arg_i++]); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", argv[arg_i++]); + ret = triton_zeroconf_set("triton.tosd.data_path", argv[arg_i++]); triton_error_assert(ret); c = sscanf(argv[arg_i], "%i", &count); @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) arg_i++; /* test initializing a specific component */ - ret = triton_init("triton.vosd"); + ret = triton_init("triton.tosd"); if(ret != TRITON_SUCCESS) { triton_perror("triton_init", ret); @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) done = 0; ae_hints_init(&hints); - ret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + ret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(ret == TRITON_SUCCESS) { while(done == 0) @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) puts("OK"); - return do_vosd_test_ret; + return do_tosd_test_ret; } static void triton_perror(const char *s, triton_ret_t ret) diff --git a/code/src/versioned-osd/prototype/tests/vosd1.ae b/code/src/transactional-osd/tests/tosd1.ae similarity index 80% rename from code/src/versioned-osd/prototype/tests/vosd1.ae rename to code/src/transactional-osd/tests/tosd1.ae index a36d63d..61ceafc 100644 --- a/code/src/versioned-osd/prototype/tests/vosd1.ae +++ b/code/src/transactional-osd/tests/tosd1.ae @@ -4,25 +4,25 @@ #include <stdio.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" #include "src/zeroconf/zeroconf.h" #include "src/aesop/hints.h" static void triton_perror(const char *s, triton_ret_t ret); static int done; -static int do_vosd_test_ret; +static int do_tosd_test_ret; static void done_callback(void *up, int ret) { ae_context_t ctx = (ae_context_t)up; - do_vosd_test_ret = ret; + do_tosd_test_ret = ret; done = 1; ae_poll_break(ctx); } -static __blocking int do_vosd_test(void) +static __blocking int do_tosd_test(void) { triton_ret_t tret; uint64_t version; @@ -43,11 +43,11 @@ static __blocking int do_vosd_test(void) buffer = void_buffer; printf("Creating oid 1 ...\n"); - tret = vosd_create(oid, 0); + tret = tosd_create(oid, 0); if(tret != TRITON_SUCCESS && tret != TRITON_ERR_EXIST) { free(buffer); - triton_perror("vosd_create", tret); + triton_perror("tosd_create", tret); return 1; } if(tret == TRITON_ERR_EXIST) @@ -57,7 +57,7 @@ static __blocking int do_vosd_test(void) triton_error_destroy(tret); printf("Getting version number of oid 1...\n"); - tret = vosd_get_version(oid, &version); + tret = tosd_get_version(oid, &version); if(tret != TRITON_SUCCESS) { printf("Error getting version number for oid=1.\n"); @@ -67,10 +67,10 @@ static __blocking int do_vosd_test(void) } printf("DONE: %llu\n", llu(version)); - tret = vosd_dump(); + tret = tosd_dump(); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error dumping TOSD state.\n"); free(buffer); triton_error_destroy(tret); return(1); @@ -78,7 +78,7 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("opening txn...\n"); - tret = vosd_txn_open(oid, 0, (++version), 0); + tret = tosd_txn_open(oid, 0, (++version), 0); if(tret != TRITON_SUCCESS) { printf("Error opening txn 1.\n"); @@ -93,7 +93,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 1024; obj_offsets[0] = 0; obj_szs[0] = 1024; - tret = vosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, + tret = tosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, 0, 0); if(tret != TRITON_SUCCESS) { @@ -105,7 +105,7 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); printf("closing txn...\n"); - tret = vosd_txn_close(oid, 0, (version)); + tret = tosd_txn_close(oid, 0, (version)); if(tret != TRITON_SUCCESS) { printf("Error closing txn 1.\n"); @@ -115,10 +115,10 @@ static __blocking int do_vosd_test(void) } printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error dumping TOSD state.\n"); free(buffer); triton_error_destroy(tret); return(1); @@ -127,7 +127,7 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("opening txn...\n"); version = version+2; - tret = vosd_txn_open(oid, 0, (version), 0); + tret = tosd_txn_open(oid, 0, (version), 0); if(tret != TRITON_SUCCESS) { printf("Error opening txn 1: %d\n", ret); @@ -148,7 +148,7 @@ static __blocking int do_vosd_test(void) obj_offsets[1] = 2000; obj_szs[0] = 100; obj_szs[1] = 924; - tret = vosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 3, + tret = tosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 3, obj_offsets, obj_szs, 2, 0, 0); if(tret != TRITON_SUCCESS) { @@ -160,7 +160,7 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); printf("closing txn...\n"); - tret = vosd_txn_close(oid, 0, (version)); + tret = tosd_txn_close(oid, 0, (version)); if(tret != TRITON_SUCCESS) { printf("Error closing txn 1: %d\n", ret); @@ -170,10 +170,10 @@ static __blocking int do_vosd_test(void) } printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error dumping TOSD state.\n"); free(buffer); triton_error_destroy(tret); return(1); @@ -181,7 +181,7 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("opening txn...\n"); - tret = vosd_txn_open(oid, 0, (version-1), 0); + tret = tosd_txn_open(oid, 0, (version-1), 0); if(tret != TRITON_SUCCESS) { printf("Error opening txn 1: %d\n", ret); @@ -196,7 +196,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 4096; obj_offsets[0] = 200; obj_szs[0] = 4096; - tret = vosd_write(oid, 0, (version-1), buffer_offsets, buffer_szs, 1, + tret = tosd_write(oid, 0, (version-1), buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, 0, 0); if(tret != TRITON_SUCCESS) { @@ -208,7 +208,7 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); printf("closing txn...\n"); - tret = vosd_txn_close(oid, 0, (version-1)); + tret = tosd_txn_close(oid, 0, (version-1)); if(tret != TRITON_SUCCESS) { printf("Error closing txn 1: %d\n", ret); @@ -218,10 +218,10 @@ static __blocking int do_vosd_test(void) } printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); if(tret != TRITON_SUCCESS) { - printf("Error dumping VOSD state.\n"); + printf("Error dumping TOSD state.\n"); free(buffer); triton_error_destroy(tret); return(1); @@ -233,7 +233,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 1024; obj_szs[0] = 512; - tret = vosd_read(oid, 0, buffer_offsets, buffer_szs, 1, obj_offsets, + tret = tosd_read(oid, 0, buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, &out_size, 0); assert(out_size == 512); if(tret != TRITON_SUCCESS) @@ -251,7 +251,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 51200; obj_szs[0] = 512; - tret = vosd_read(oid, 0, buffer_offsets, buffer_szs, 1, obj_offsets, + tret = tosd_read(oid, 0, buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, &out_size, 0); if(tret != TRITON_SUCCESS || out_size != 0) { @@ -264,10 +264,10 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("checking size of fork 0...\n"); - tret = vosd_get_size(oid, 0, obj_offsets, 0); + tret = tosd_get_size(oid, 0, obj_offsets, 0); if(tret != TRITON_SUCCESS) { - printf("Error: bad error code from vosd_get_size()\n"); + printf("Error: bad error code from tosd_get_size()\n"); triton_error_destroy(tret); return(-1); } @@ -275,10 +275,10 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("checking size of fork 1...\n"); - tret = vosd_get_size(oid, 1, obj_offsets, 0); + tret = tosd_get_size(oid, 1, obj_offsets, 0); if(tret != TRITON_SUCCESS) { - printf("Error: bad error code from vosd_get_size()\n"); + printf("Error: bad error code from tosd_get_size()\n"); triton_error_destroy(tret); return(-1); } @@ -293,7 +293,7 @@ static __blocking int do_vosd_test(void) buffer_szs[1] = 12; obj_offsets[0] = 13; obj_szs[0] = 1524; - tret = vosd_read(oid, 0, buffer_offsets, buffer_szs, 2, obj_offsets, + tret = tosd_read(oid, 0, buffer_offsets, buffer_szs, 2, obj_offsets, obj_szs, 1, &out_size, 0); if(tret != TRITON_SUCCESS) { @@ -307,7 +307,7 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("opening txn...\n"); - tret = vosd_txn_open(oid, 0, (++version), 0); + tret = tosd_txn_open(oid, 0, (++version), 0); if(tret != TRITON_SUCCESS) { printf("Error opening txn 1: %d\n", ret); @@ -323,7 +323,7 @@ static __blocking int do_vosd_test(void) sprintf(buffer, "Hello world."); obj_offsets[0] = 10024; obj_szs[0] = 13; - tret = vosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, + tret = tosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, 0, 0); if(tret != TRITON_SUCCESS) { @@ -335,7 +335,7 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); printf("closing txn...\n"); - tret = vosd_txn_close(oid, 0, (version)); + tret = tosd_txn_close(oid, 0, (version)); if(tret != TRITON_SUCCESS) { printf("Error closing txn: %d\n", ret); @@ -345,7 +345,7 @@ static __blocking int do_vosd_test(void) } printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); triton_error_assert(tret); /********************************************************/ @@ -354,7 +354,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 9525; obj_szs[0] = 512; - tret = vosd_read(oid, 0, buffer_offsets, buffer_szs, 1, obj_offsets, + tret = tosd_read(oid, 0, buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, &out_size, 0); if(tret != TRITON_SUCCESS) { @@ -374,7 +374,7 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("writing to two forks...\n"); - tret = vosd_txn_open(oid, 1, (++version), 0); + tret = tosd_txn_open(oid, 1, (++version), 0); triton_error_assert(tret); buffer_offsets[0] = buffer; @@ -382,14 +382,14 @@ static __blocking int do_vosd_test(void) sprintf(buffer, "fork1"); obj_offsets[0] = 0; obj_szs[0] = 6; - tret = vosd_write(oid, 1, (version), buffer_offsets, buffer_szs, 1, + tret = tosd_write(oid, 1, (version), buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, 0, 0); triton_error_assert(tret); - tret = vosd_txn_close(oid, 1, (version)); + tret = tosd_txn_close(oid, 1, (version)); triton_error_assert(tret); - tret = vosd_txn_open(oid, 2, (++version), 0); + tret = tosd_txn_open(oid, 2, (++version), 0); triton_error_assert(tret); buffer_offsets[0] = buffer; @@ -397,11 +397,11 @@ static __blocking int do_vosd_test(void) sprintf(buffer, "fork2"); obj_offsets[0] = 0; obj_szs[0] = 6; - tret = vosd_write(oid, 2, (version), buffer_offsets, buffer_szs, 1, + tret = tosd_write(oid, 2, (version), buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, 0, 0); triton_error_assert(tret); - tret = vosd_txn_close(oid, 2, (version)); + tret = tosd_txn_close(oid, 2, (version)); triton_error_assert(tret); printf("DONE\n"); @@ -411,7 +411,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 0; obj_szs[0] = 512; - tret = vosd_read(oid, 1, buffer_offsets, buffer_szs, 1, obj_offsets, + tret = tosd_read(oid, 1, buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, &out_size, 0); assert(tret == TRITON_SUCCESS && out_size == 6); @@ -422,7 +422,7 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 256; obj_offsets[0] = 0; obj_szs[0] = 256; - tret = vosd_read(oid, 2, buffer_offsets, buffer_szs, 1, obj_offsets, + tret = tosd_read(oid, 2, buffer_offsets, buffer_szs, 1, obj_offsets, obj_szs, 1, &out_size, 0); assert(tret == TRITON_SUCCESS && out_size == 6); @@ -431,15 +431,15 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); triton_error_assert(tret); /********************************************************/ printf("checking size of fork 0...\n"); - tret = vosd_get_size(oid, 0, obj_offsets, 0); + tret = tosd_get_size(oid, 0, obj_offsets, 0); if(tret != TRITON_SUCCESS) { - printf("Error: bad error code from vosd_get_size()\n"); + printf("Error: bad error code from tosd_get_size()\n"); triton_error_destroy(tret); return(-1); } @@ -447,10 +447,10 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("checking size of fork 1...\n"); - tret = vosd_get_size(oid, 1, obj_offsets, 0); + tret = tosd_get_size(oid, 1, obj_offsets, 0); if(tret != TRITON_SUCCESS) { - printf("Error: bad error code from vosd_get_size()\n"); + printf("Error: bad error code from tosd_get_size()\n"); triton_error_destroy(tret); return(-1); } @@ -458,10 +458,10 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("checking size of fork 2...\n"); - tret = vosd_get_size(oid, 2, obj_offsets, 0); + tret = tosd_get_size(oid, 2, obj_offsets, 0); if(tret != TRITON_SUCCESS) { - printf("Error: bad error code from vosd_get_size()\n"); + printf("Error: bad error code from tosd_get_size()\n"); triton_error_destroy(tret); return(-1); } @@ -471,7 +471,7 @@ static __blocking int do_vosd_test(void) /********************************************************/ printf("opening txn...\n"); - tret = vosd_txn_open(oid, 0, (++version), 0); + tret = tosd_txn_open(oid, 0, (++version), 0); if(tret != TRITON_SUCCESS) { printf("Error opening txn 1: %d\n", ret); @@ -486,8 +486,8 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 1024; obj_offsets[0] = 0; obj_szs[0] = 1024; - tret = vosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_TRUNC_WRITE, 0); + tret = tosd_write(oid, 0, (version), buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_TRUNC_WRITE, 0); if(tret != TRITON_SUCCESS) { printf("Error writing 0-1024: %d\n", ret); @@ -498,7 +498,7 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); printf("closing txn...\n"); - tret = vosd_txn_close(oid, 0, (version)); + tret = tosd_txn_close(oid, 0, (version)); if(tret != TRITON_SUCCESS) { printf("Error closing txn 1: %d\n", ret); @@ -508,7 +508,7 @@ static __blocking int do_vosd_test(void) } printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); triton_error_assert(tret); /********************************************************/ @@ -518,8 +518,8 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 512; obj_szs[0] = 512; - tret = vosd_write(oid, 0, (++version), buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_AUTO_TXN, 0); + tret = tosd_write(oid, 0, (++version), buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_AUTO_TXN, 0); if(tret != TRITON_SUCCESS) { printf("Error writing 512-1024\n"); @@ -533,7 +533,7 @@ static __blocking int do_vosd_test(void) printf("injecting a storage fault...\n"); errors = 1; - tret = aesop_hints_put("triton.vosd.insert_errors", sizeof(errors), &errors, 1); + tret = aesop_hints_put("triton.tosd.insert_errors", sizeof(errors), &errors, 1); if(tret != TRITON_SUCCESS) { printf("Error injecting storage fault via hint\n"); @@ -548,8 +548,8 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 512; obj_szs[0] = 512; - tret = vosd_write(oid, 0, (++version), buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_AUTO_TXN, 0); + tret = tosd_write(oid, 0, (++version), buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_AUTO_TXN, 0); if(tret != TRITON_ERR_IO) { printf("Error: write succeeded after fault injection.\n"); @@ -564,8 +564,8 @@ static __blocking int do_vosd_test(void) buffer_szs[0] = 512; obj_offsets[0] = 512; obj_szs[0] = 512; - tret = vosd_write(oid, 0, (++version), buffer_offsets, buffer_szs, 1, - obj_offsets, obj_szs, 1, VOSD_FLAG_AUTO_TXN, 0); + tret = tosd_write(oid, 0, (++version), buffer_offsets, buffer_szs, 1, + obj_offsets, obj_szs, 1, TOSD_FLAG_AUTO_TXN, 0); if(tret != TRITON_SUCCESS) { printf("Error: write failed after completion of fault injection.\n"); @@ -576,7 +576,7 @@ static __blocking int do_vosd_test(void) printf("DONE\n"); - tret = vosd_dump(); + tret = tosd_dump(); triton_error_assert(tret); return 1; @@ -601,13 +601,13 @@ int main(int argc, char *argv[]) triton_error_assert(ret); #endif - ret = triton_zeroconf_set("triton.vosd.db_path", "/tmp/vosd"); + ret = triton_zeroconf_set("triton.tosd.db_path", "/tmp/tosd"); triton_error_assert(ret); - ret = triton_zeroconf_set("triton.vosd.data_path", "/tmp/vosd/data"); + ret = triton_zeroconf_set("triton.tosd.data_path", "/tmp/tosd/data"); triton_error_assert(ret); /* test initializing a specific component */ - ret = triton_init("triton.vosd"); + ret = triton_init("triton.tosd"); if(ret != TRITON_SUCCESS) { triton_perror("triton_init", ret); @@ -623,7 +623,7 @@ int main(int argc, char *argv[]) done = 0; ae_hints_init(&hints); - ret = ae_post_blocking(do_vosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_vosd_test_ret); + ret = ae_post_blocking(do_tosd_test, done_callback, ctx, &hints, ctx, &op_id, &do_tosd_test_ret); if(ret == TRITON_SUCCESS) { while(done == 0) @@ -647,7 +647,7 @@ int main(int argc, char *argv[]) triton_finalize(); - return do_vosd_test_ret; + return do_tosd_test_ret; } static void triton_perror(const char *s, triton_ret_t ret) diff --git a/code/src/versioned-osd/prototype/tests/workload-gen.ae b/code/src/transactional-osd/tests/workload-gen.ae similarity index 97% rename from code/src/versioned-osd/prototype/tests/workload-gen.ae rename to code/src/transactional-osd/tests/workload-gen.ae index 7e18b07..a186c09 100644 --- a/code/src/versioned-osd/prototype/tests/workload-gen.ae +++ b/code/src/transactional-osd/tests/workload-gen.ae @@ -4,7 +4,7 @@ #include <stdlib.h> #include "src/aesop/aesop.h" -#include "src/versioned-osd/prototype/versioned-osd.hae" +#include "src/transactional-osd/transactional-osd.hae" /* * arguments: diff --git a/code/src/versioned-osd/prototype/vosd-fd-cache.ae b/code/src/transactional-osd/tosd-fd-cache.ae similarity index 98% rename from code/src/versioned-osd/prototype/vosd-fd-cache.ae rename to code/src/transactional-osd/tosd-fd-cache.ae index c0c91f1..7eed499 100644 --- a/code/src/versioned-osd/prototype/vosd-fd-cache.ae +++ b/code/src/transactional-osd/tosd-fd-cache.ae @@ -10,9 +10,9 @@ #include "src/common/triton-list.h" #include "src/common/triton-hash.h" #include "src/common/triton-log.h" -#include "vosd-fd-cache.hae" -#include "versioned-osd.hae" -#include "src/versioned-osd/prototype/file-resource/file-resource.hae" +#include "tosd-fd-cache.hae" +#include "transactional-osd.hae" +#include "src/common/resources/file/file-resource.hae" /* TODO: it would be great if there were a way to disable the mutex locking * inside of triton_hash. We are locking ourselves here because we need to span @@ -245,14 +245,14 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi tmp_entry->oid = oid; tmp_entry->ref_count = 1; - if(flags & VOSD_INIT_FLAG_DATA_ODIRECT) + if(flags & TOSD_INIT_FLAG_DATA_ODIRECT) #ifdef HAVE_ODIRECT posix_open_flags |= O_DIRECT; #endif - /* note: if data coalescing is enabled then we leave it to the vosd to + /* note: if data coalescing is enabled then we leave it to the tosd to * decide when to sync. Otherwise we turn it on automatically */ - if(flags & VOSD_INIT_FLAG_DATA_SYNC && data_coalesce_highwater < 1) + if(flags & TOSD_INIT_FLAG_DATA_SYNC && data_coalesce_highwater < 1) posix_open_flags |= O_DSYNC; /* actually open the file */ diff --git a/code/src/versioned-osd/prototype/vosd-fd-cache.hae b/code/src/transactional-osd/tosd-fd-cache.hae similarity index 92% rename from code/src/versioned-osd/prototype/vosd-fd-cache.hae rename to code/src/transactional-osd/tosd-fd-cache.hae index 0877097..2efb759 100644 --- a/code/src/versioned-osd/prototype/vosd-fd-cache.hae +++ b/code/src/transactional-osd/tosd-fd-cache.hae @@ -1,9 +1,9 @@ -#ifndef __VOSD_FD_CACHE_HAE__ -#define __VOSD_FD_CACHE_HAE__ +#ifndef __TOSD_FD_CACHE_HAE__ +#define __TOSD_FD_CACHE_HAE__ -/** \defgroup VOSD FD cache +/** \defgroup TOSD FD cache * - * This is a simple API for caching open file descriptors in the VOSD + * This is a simple API for caching open file descriptors in the TOSD * prototype * * . @@ -11,7 +11,7 @@ */ /** \file - * Declarations for VOSD FD cache API. + * Declarations for TOSD FD cache API. */ #include <stdint.h> diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/transactional-osd/transactional-osd.ae similarity index 90% rename from code/src/versioned-osd/prototype/versioned-osd.ae rename to code/src/transactional-osd/transactional-osd.ae index 07fc599..2c6ffc3 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -17,17 +17,17 @@ #include "src/aesop/aesop.h" #include "src/common/triton-hash.h" #include "src/common/resources/timer/timer.hae" -#include "src/versioned-osd/prototype/bdb-resource/bdb-resource.hae" -#include "src/versioned-osd/prototype/file-resource/file-resource.hae" -#include "src/versioned-osd/prototype/versioned-osd.hae" -#include "src/versioned-osd/prototype/vosd-fd-cache.hae" -#include "src/versioned-osd/prototype/bdb-throttle.hae" +#include "src/common/resources/bdb/bdb-resource.hae" +#include "src/common/resources/file/file-resource.hae" +#include "src/transactional-osd/transactional-osd.hae" +#include "src/transactional-osd/tosd-fd-cache.hae" +#include "src/transactional-osd/bdb-throttle.hae" #include "src/common/resources/scheduling/sched.hae" #include "src/aesop/hints.h" #include "src/zeroconf/zeroconf.h" -/* This file contains a prototype implementation of the VOSD API implemented +/* This file contains a prototype implementation of the TOSD API implemented * on top of berkeley db and flat files */ @@ -43,15 +43,15 @@ */ /**************************************************************/ -#define VOSD_MIN(__a, __b) ((__a) < (__b) ? (__a) : (__b)) -#define VOSD_MAX(__a, __b) ((__a) > (__b) ? (__a) : (__b)) +#define TOSD_MIN(__a, __b) ((__a) < (__b) ? (__a) : (__b)) +#define TOSD_MAX(__a, __b) ((__a) > (__b) ? (__a) : (__b)) -#define VOSD_CHECK() \ +#define TOSD_CHECK() \ do {\ float __threshold; \ int __errs; \ triton_ret_t __tmp_tret; \ - __tmp_tret = triton_init_check("triton.vosd"); \ + __tmp_tret = triton_init_check("triton.tosd"); \ if(__tmp_tret != TRITON_SUCCESS) \ return(__tmp_tret); \ if(insert_errors_at_rate > 0) { \ @@ -62,10 +62,10 @@ return(TRITON_ERR_IO); \ } \ triton_mutex_lock(&fault_mutex); \ - __tmp_tret = aesop_hints_get("triton.vosd.insert_errors", sizeof(__errs), &__errs); \ + __tmp_tret = aesop_hints_get("triton.tosd.insert_errors", sizeof(__errs), &__errs); \ if(__tmp_tret == TRITON_SUCCESS && __errs > 0) { \ __errs--; \ - aesop_hints_modify("triton.vosd.insert_errors", sizeof(__errs), &__errs); \ + aesop_hints_modify("triton.tosd.insert_errors", sizeof(__errs), &__errs); \ triton_mutex_unlock(&fault_mutex); \ return(TRITON_ERR_IO); \ } else { \ @@ -74,14 +74,14 @@ } \ } while(0) -#define VOSD_CONFKEY_PREFIX "triton.vosd" -static const char* db_path_confkey = VOSD_CONFKEY_PREFIX ".db_path"; -static const char* data_path_confkey = VOSD_CONFKEY_PREFIX ".data_path"; -static const char* db_coal_confkey = VOSD_CONFKEY_PREFIX ".db_coalescing_highwater"; -static const char* data_coal_confkey = VOSD_CONFKEY_PREFIX ".data_coalescing_highwater"; -static const char* align_confkey = VOSD_CONFKEY_PREFIX ".alignment"; -static const char* flags_confkey = VOSD_CONFKEY_PREFIX ".flags"; -static const char* error_rate_confkey = VOSD_CONFKEY_PREFIX ".insert_errors_at_rate"; +#define TOSD_CONFKEY_PREFIX "triton.tosd" +static const char* db_path_confkey = TOSD_CONFKEY_PREFIX ".db_path"; +static const char* data_path_confkey = TOSD_CONFKEY_PREFIX ".data_path"; +static const char* db_coal_confkey = TOSD_CONFKEY_PREFIX ".db_coalescing_highwater"; +static const char* data_coal_confkey = TOSD_CONFKEY_PREFIX ".data_coalescing_highwater"; +static const char* align_confkey = TOSD_CONFKEY_PREFIX ".alignment"; +static const char* flags_confkey = TOSD_CONFKEY_PREFIX ".flags"; +static const char* error_rate_confkey = TOSD_CONFKEY_PREFIX ".insert_errors_at_rate"; static triton_ret_t db_path_updater(const char *key, const char *value); static triton_ret_t data_path_updater(const char *key, const char *value); static triton_ret_t db_coal_updater(const char *key, const char *value); @@ -89,11 +89,11 @@ static triton_ret_t data_coal_updater(const char *key, const char *value); static triton_ret_t align_updater(const char *key, const char *value); static triton_ret_t flags_updater(const char *key, const char *value); static triton_ret_t error_rate_updater(const char *key, const char *value); -__attribute__((constructor)) void triton_vosd_init_register(void); +__attribute__((constructor)) void triton_tosd_init_register(void); -static triton_debug_mask_t vosd_mask; -static char* vosd_db_path = NULL; -static char* vosd_log_path = NULL; +static triton_debug_mask_t tosd_mask; +static char* tosd_db_path = NULL; +static char* tosd_log_path = NULL; static DB_ENV *envp = NULL; static DB *log_map_dbp = NULL; static DB *missing_ver_dbp = NULL; @@ -194,7 +194,7 @@ static inline int triton_hash_txn_acc(const void *k, int table_size) return(pc & (table_size -1)); } -#define VOSD_INIT_DBT(__dbt, __data) \ +#define TOSD_INIT_DBT(__dbt, __data) \ do { \ memset(&(__dbt), 0, sizeof(__dbt)); \ (__dbt).data = &(__data); \ @@ -202,7 +202,7 @@ static inline int triton_hash_txn_acc(const void *k, int table_size) (__dbt).ulen = sizeof(__data); \ (__dbt).flags = DB_DBT_USERMEM; \ }while(0) -#define VOSD_INIT_DBT_EMPTY(__dbt) \ +#define TOSD_INIT_DBT_EMPTY(__dbt) \ do { \ memset(&(__dbt), 0, sizeof(__dbt)); \ (__dbt).flags = DB_DBT_USERMEM; \ @@ -289,8 +289,8 @@ static __blocking triton_ret_t check_niid(DB_TXN* txn, uint128_t oid, uint64_t n n_key.oid = oid; n_key.niid = niid; n_key.op_type = op_type; - VOSD_INIT_DBT(key, n_key); - VOSD_INIT_DBT(value, n_value); + TOSD_INIT_DBT(key, n_key); + TOSD_INIT_DBT(value, n_value); tret = bdb_get(niid_dbp, txn, &key, &value, DB_RMW); if(tret != TRITON_SUCCESS && tret != TRITON_ERR_NOENT) @@ -323,8 +323,8 @@ static __blocking triton_ret_t store_niid(DB_TXN* txn, uint128_t oid, uint64_t n n_key.op_type = op_type; gettimeofday(&tv, NULL); n_value.timestamp = tv.tv_sec; - VOSD_INIT_DBT(key, n_key); - VOSD_INIT_DBT(value, n_value); + TOSD_INIT_DBT(key, n_key); + TOSD_INIT_DBT(value, n_value); tret = bdb_put(niid_dbp, txn, &key, &value, 0); if(tret != TRITON_SUCCESS) @@ -356,7 +356,7 @@ static __blocking triton_ret_t end_write(struct coalesce_obj *obj) obj->flags &= ~COALESCE_DB; if(global_data_coalesce_highwater == 0) obj->flags &= ~COALESCE_DATA; - if(!(global_flags & VOSD_INIT_FLAG_DATA_SYNC)) + if(!(global_flags & TOSD_INIT_FLAG_DATA_SYNC)) obj->flags &= ~COALESCE_DATA; /* do nothing if coalescing is off */ @@ -389,7 +389,7 @@ static __blocking triton_ret_t end_write(struct coalesce_obj *obj) * high: Checkpoint regardless of other pending operations if we already * have highwater mark operations waiting. */ - max_highwater = VOSD_MAX(global_db_coalesce_highwater, global_data_coalesce_highwater); + max_highwater = TOSD_MAX(global_db_coalesce_highwater, global_data_coalesce_highwater); if(triton_list_empty(&write_started_queue) || triton_list_count(&coalesce_queue) >= max_highwater) { @@ -494,10 +494,10 @@ static __blocking triton_ret_t end_write(struct coalesce_obj *obj) * instead */ #if 0 -static __blocking triton_ret_t __vosd_create_retryable(uint128_t oid, uint64_t niid); +static __blocking triton_ret_t __tosd_create_retryable(uint128_t oid, uint64_t niid); #endif -static __blocking triton_ret_t __vosd_create_retryable(uint128_t oid, uint64_t niid) +static __blocking triton_ret_t __tosd_create_retryable(uint128_t oid, uint64_t niid) { triton_ret_t tret; triton_ret_t tret_tmp; @@ -509,7 +509,7 @@ static __blocking triton_ret_t __vosd_create_retryable(uint128_t oid, uint64_t n if(tret != TRITON_SUCCESS) return(tret); - tret = check_niid(txn, oid, niid, VOSD_NIID_OP_CREATE); + tret = check_niid(txn, oid, niid, TOSD_NIID_OP_CREATE); if(tret != TRITON_SUCCESS) { tret_tmp = throttle_bdb_txn_abort(txn); @@ -519,8 +519,8 @@ static __blocking triton_ret_t __vosd_create_retryable(uint128_t oid, uint64_t n /* set initial version of 1 */ val = 1; - VOSD_INIT_DBT(key, oid); - VOSD_INIT_DBT(value, val); + TOSD_INIT_DBT(key, oid); + TOSD_INIT_DBT(value, val); /* nooverwrite so that we can return EXIST if object is already there */ tret = bdb_put(ver_dbp, txn, &key, &value, DB_NOOVERWRITE); @@ -536,7 +536,7 @@ static __blocking triton_ret_t __vosd_create_retryable(uint128_t oid, uint64_t n * operations racing against create/remove. */ - tret = store_niid(txn, oid, niid, VOSD_NIID_OP_CREATE); + tret = store_niid(txn, oid, niid, TOSD_NIID_OP_CREATE); if(tret != TRITON_SUCCESS) { tret_tmp = throttle_bdb_txn_abort(txn); @@ -592,8 +592,8 @@ static __blocking triton_ret_t clear_missing_vers( struct missing_version mvk; int c_get_flag = DB_SET_RANGE; - VOSD_INIT_DBT(missing_ver_key, mvk); - VOSD_INIT_DBT_EMPTY(missing_ver_value); + TOSD_INIT_DBT(missing_ver_key, mvk); + TOSD_INIT_DBT_EMPTY(missing_ver_value); /* search for any missing versions */ mvk.oid = oid; @@ -662,8 +662,8 @@ static __blocking triton_ret_t clear_logical_map( struct logical_map_key lmk; struct logical_map_entry lmv; - VOSD_INIT_DBT(log_map_key, lmk); - VOSD_INIT_DBT(log_map_value, lmv); + TOSD_INIT_DBT(log_map_key, lmk); + TOSD_INIT_DBT(log_map_value, lmv); /* search for any logical map entries */ lmk.oid = oid; @@ -689,10 +689,10 @@ static __blocking triton_ret_t clear_logical_map( } #if 0 -static __blocking triton_ret_t __vosd_remove_retryable(uint128_t oid, uint64_t niid); +static __blocking triton_ret_t __tosd_remove_retryable(uint128_t oid, uint64_t niid); #endif -static __blocking triton_ret_t __vosd_remove_retryable(uint128_t oid, uint64_t niid) +static __blocking triton_ret_t __tosd_remove_retryable(uint128_t oid, uint64_t niid) { triton_ret_t tret; triton_ret_t tret_tmp; @@ -709,7 +709,7 @@ static __blocking triton_ret_t __vosd_remove_retryable(uint128_t oid, uint64_t n return(tret); } - tret = check_niid(txn, oid, niid, VOSD_NIID_OP_REMOVE); + tret = check_niid(txn, oid, niid, TOSD_NIID_OP_REMOVE); if(tret != TRITON_SUCCESS) { tret_tmp = throttle_bdb_txn_abort(txn); @@ -717,8 +717,8 @@ static __blocking triton_ret_t __vosd_remove_retryable(uint128_t oid, uint64_t n return(tret); } - VOSD_INIT_DBT(ver_key, vk); - VOSD_INIT_DBT(ver_value, vv); + TOSD_INIT_DBT(ver_key, vk); + TOSD_INIT_DBT(ver_value, vv); vk = oid; /* delete version key */ @@ -787,7 +787,7 @@ static __blocking triton_ret_t __vosd_remove_retryable(uint128_t oid, uint64_t n return(tret); } - tret = store_niid(txn, oid, niid, VOSD_NIID_OP_REMOVE); + tret = store_niid(txn, oid, niid, TOSD_NIID_OP_REMOVE); if(tret != TRITON_SUCCESS) { tret_tmp = throttle_bdb_txn_abort(txn); @@ -808,9 +808,9 @@ static __blocking triton_ret_t __vosd_remove_retryable(uint128_t oid, uint64_t n } #if 0 -static __blocking triton_ret_t __vosd_get_version_retryable(uint128_t oid, uint64_t* version); +static __blocking triton_ret_t __tosd_get_version_retryable(uint128_t oid, uint64_t* version); #endif -static __blocking triton_ret_t __vosd_get_version_retryable(uint128_t oid, uint64_t* version) +static __blocking triton_ret_t __tosd_get_version_retryable(uint128_t oid, uint64_t* version) { DB_TXN *txn; DBT key, value; @@ -822,8 +822,8 @@ static __blocking triton_ret_t __vosd_get_version_retryable(uint128_t oid, uint6 return(tret); /* read current version */ - VOSD_INIT_DBT(key, oid); - VOSD_INIT_DBT(value, *version); + TOSD_INIT_DBT(key, oid); + TOSD_INIT_DBT(value, *version); tret = bdb_get(ver_dbp, txn, &key, &value, 0); if(tret != TRITON_SUCCESS) @@ -860,8 +860,8 @@ static __blocking triton_ret_t find_entries_on_disk( triton_ret_t tret; struct logical_map_entry* tmp_entry; - VOSD_INIT_DBT(key, lmk); - VOSD_INIT_DBT(value, lme); + TOSD_INIT_DBT(key, lmk); + TOSD_INIT_DBT(value, lme); lmk.oid = oid; lmk.oid_fork = oid_fork; @@ -878,9 +878,9 @@ static __blocking triton_ret_t find_entries_on_disk( (triton_cmp_uint128(lmk.oid, oid) == 0) && (lmk.oid_fork == oid_fork) && ((lme.logical_offset < update->logical_offset_end) || - (update->flags & VOSD_FLAG_TRUNC_WRITE))) + (update->flags & TOSD_FLAG_TRUNC_WRITE))) { - if(!(update->flags & VOSD_FLAG_TRUNC_WRITE)) + if(!(update->flags & TOSD_FLAG_TRUNC_WRITE)) { /* store this in a linked list */ tmp_entry = malloc(sizeof(*tmp_entry)); @@ -916,11 +916,11 @@ static __blocking triton_ret_t find_entries_on_disk( } #if 0 -static __blocking triton_ret_t __vosd_txn_close_retryable( +static __blocking triton_ret_t __tosd_txn_close_retryable( struct txn_accumulator* txn_acc); #endif /* TODO: audit error handling in this whole function */ -static __blocking triton_ret_t __vosd_txn_close_retryable( +static __blocking triton_ret_t __tosd_txn_close_retryable( struct txn_accumulator* txn_acc) { DB_TXN *txn; @@ -972,14 +972,14 @@ static __blocking triton_ret_t __vosd_txn_close_retryable( return(tret); } - /* loop through each update in the vosd txn */ + /* loop through each update in the tosd txn */ triton_list_for_each(iterator, scratch, &txn_acc->update_list) { tmp_update = triton_list_get_entry(iterator, struct logical_map_entry, list_link); /* check and store niid for each segment */ - tret = check_niid(txn, txn_acc->oid, tmp_update->niid, VOSD_NIID_OP_WRITE); + tret = check_niid(txn, txn_acc->oid, tmp_update->niid, TOSD_NIID_OP_WRITE); if(tret == TRITON_ERR_EXIST) { /* this write is already done; discard it from the txn */ @@ -995,7 +995,7 @@ static __blocking triton_ret_t __vosd_txn_close_retryable( return(tret); } - tret = store_niid(txn, txn_acc->oid, tmp_update->niid, VOSD_NIID_OP_WRITE); + tret = store_niid(txn, txn_acc->oid, tmp_update->niid, TOSD_NIID_OP_WRITE); if(tret != TRITON_SUCCESS) { tret_tmp = bdb_cursor_close(dbc_p); @@ -1065,8 +1065,8 @@ static __blocking triton_ret_t __vosd_txn_close_retryable( { tmp_entry = triton_list_get_entry(iterator, struct logical_map_entry, list_link); - VOSD_INIT_DBT(key, lmk); - VOSD_INIT_DBT(value, lme); + TOSD_INIT_DBT(key, lmk); + TOSD_INIT_DBT(value, lme); lme = *tmp_entry; lmk.oid = txn_acc->oid; lmk.oid_fork = txn_acc->oid_fork; @@ -1083,8 +1083,8 @@ static __blocking triton_ret_t __vosd_txn_close_retryable( free(free_ptr); /* read current version */ - VOSD_INIT_DBT(key, txn_acc->oid); - VOSD_INIT_DBT(value, version); + TOSD_INIT_DBT(key, txn_acc->oid); + TOSD_INIT_DBT(value, version); tret = bdb_get(ver_dbp, txn, &key, &value, DB_RMW); if(tret != TRITON_SUCCESS) { @@ -1096,8 +1096,8 @@ static __blocking triton_ret_t __vosd_txn_close_retryable( if(txn_acc->txn_number > version) { /* this update is newer than the current version of the object */ - VOSD_INIT_DBT(mv_key, mv); - VOSD_INIT_DBT_EMPTY(mv_value); + TOSD_INIT_DBT(mv_key, mv); + TOSD_INIT_DBT_EMPTY(mv_value); /* identify skipped version numbers */ missing_ver = version + 1; @@ -1160,7 +1160,7 @@ static __blocking triton_ret_t __vosd_txn_close_retryable( } -static __blocking triton_ret_t vosd_txn_close_internal( +static __blocking triton_ret_t tosd_txn_close_internal( uint128_t oid, uint64_t oid_fork, uint64_t txn_number) @@ -1197,7 +1197,7 @@ static __blocking triton_ret_t vosd_txn_close_internal( for(tret = TRITON_ERR_DEADLOCK; tret == TRITON_ERR_DEADLOCK; ) { triton_error_destroy(tret); - tret = __vosd_txn_close_retryable(txn_acc); + tret = __tosd_txn_close_retryable(txn_acc); } /* TODO: any cleanup steps if we failed to close the txn? */ @@ -1234,8 +1234,8 @@ static __blocking triton_ret_t __get_read_region_retryable( triton_error_destroy(tret_tmp); return(tret); } - VOSD_INIT_DBT(key, (*lmk)); - VOSD_INIT_DBT(value, (*lme)); + TOSD_INIT_DBT(key, (*lmk)); + TOSD_INIT_DBT(value, (*lme)); tret = bdb_cursor_get(dbc_p, &key, &value, DB_SET_RANGE); /* return whatever error code we got here */ @@ -1439,7 +1439,7 @@ static __blocking triton_ret_t read_segment( return(TRITON_SUCCESS); } -triton_ret_t vosd_init(void) +triton_ret_t tosd_init(void) { triton_ret_t tret; int ret; @@ -1455,8 +1455,8 @@ triton_ret_t vosd_init(void) seed += tv.tv_usec; srandom(seed); - tret = triton_debug_add_mask("vosd", &vosd_mask, - "Output debugging information for the VOSD interface"); + tret = triton_debug_add_mask("tosd", &tosd_mask, + "Output debugging information for the TOSD interface"); if(tret != TRITON_SUCCESS) { return(tret); @@ -1464,7 +1464,7 @@ triton_ret_t vosd_init(void) tret = triton_zeroconf_register(db_path_confkey, "", db_path_updater, - "Directory that will contain Berkeley DB files used by the VOSD."); + "Directory that will contain Berkeley DB files used by the TOSD."); if(tret != TRITON_SUCCESS) { return(tret); @@ -1472,7 +1472,7 @@ triton_ret_t vosd_init(void) tret = triton_zeroconf_register(data_path_confkey, "", data_path_updater, - "Directory that will contain raw data stored by the VOSD."); + "Directory that will contain raw data stored by the TOSD."); if(tret != TRITON_SUCCESS) { return(tret); @@ -1496,7 +1496,7 @@ triton_ret_t vosd_init(void) tret = triton_zeroconf_register(align_confkey, "4096", align_updater, - "VOSD data on-disk data alignment (directio mode requires block alignment)."); + "TOSD data on-disk data alignment (directio mode requires block alignment)."); if(tret != TRITON_SUCCESS) { return(tret); @@ -1504,7 +1504,7 @@ triton_ret_t vosd_init(void) tret = triton_zeroconf_register(flags_confkey, "DATA_ODIRECT,DATA_SYNC", flags_updater, - "VOSD initialization flags (DATA_ODIRECT for directio, DATA_SYNC for fsync)."); + "TOSD initialization flags (DATA_ODIRECT for directio, DATA_SYNC for fsync)."); if(tret != TRITON_SUCCESS) { return(tret); @@ -1518,21 +1518,21 @@ triton_ret_t vosd_init(void) return(tret); } - tret = ae_hints_type_register("triton.vosd.insert_errors", 0, NULL); + tret = ae_hints_type_register("triton.tosd.insert_errors", 0, NULL); if(tret != TRITON_SUCCESS) { return(tret); } /* check for sane config parameters */ - if(strlen(vosd_db_path) == 0) + if(strlen(tosd_db_path) == 0) { - triton_err(triton_log_default, "Error: VOSD initialized without specifying %s\n", db_path_confkey); + triton_err(triton_log_default, "Error: TOSD initialized without specifying %s\n", db_path_confkey); return(TRITON_ERR_INVAL); } - if(strlen(vosd_log_path) == 0) + if(strlen(tosd_log_path) == 0) { - triton_err(triton_log_default, "Error: VOSD initialized without specifying %s\n", data_path_confkey); + triton_err(triton_log_default, "Error: TOSD initialized without specifying %s\n", data_path_confkey); return(TRITON_ERR_INVAL); } @@ -1543,7 +1543,7 @@ triton_ret_t vosd_init(void) /* doesn't make sense to enable data sync coalescing if you aren't * syncing data in the first place */ - assert(global_data_coalesce_highwater == 0 || (global_flags & VOSD_INIT_FLAG_DATA_SYNC)); + assert(global_data_coalesce_highwater == 0 || (global_flags & TOSD_INIT_FLAG_DATA_SYNC)); /* TODO: for now the data and db highwater marks have to match if * enabled; we are going to handle them in the same queue @@ -1553,22 +1553,22 @@ triton_ret_t vosd_init(void) global_data_coalesce_highwater == global_db_coalesce_highwater); /* TODO: this should go to the logging api... */ - if(!(global_flags & VOSD_INIT_FLAG_DATA_ODIRECT) && !(global_flags & VOSD_INIT_FLAG_DATA_SYNC)) - printf("WARNING: VOSD initialized without directio or fsync.\n"); - if((global_flags & VOSD_INIT_FLAG_DATA_ODIRECT) && (global_alignment != 4096)) - printf("WARNING: VOSD using directio, but alignment is not 4096.\n"); + if(!(global_flags & TOSD_INIT_FLAG_DATA_ODIRECT) && !(global_flags & TOSD_INIT_FLAG_DATA_SYNC)) + printf("WARNING: TOSD initialized without directio or fsync.\n"); + if((global_flags & TOSD_INIT_FLAG_DATA_ODIRECT) && (global_alignment != 4096)) + printf("WARNING: TOSD using directio, but alignment is not 4096.\n"); tret = triton_sched_init(&coalesce_sched); if(tret != TRITON_SUCCESS) { - goto vosd_init_error; + goto tosd_init_error; } triton_list_init(&coalesce_queue); triton_list_init(&write_started_queue); /* make a directory for db storage if not already present */ - ret = mkdir(vosd_db_path, 0755); + ret = mkdir(tosd_db_path, 0755); if(ret != 0 && errno == EEXIST) { db_dir_exists = 1; @@ -1577,12 +1577,12 @@ triton_ret_t vosd_init(void) { /* some other error */ tret = triton_ret_from_bdb(errno); - triton_log_error(triton_log_default, tret, "Error: failed to create or access %s\n", vosd_db_path); - goto vosd_init_error; + triton_log_error(triton_log_default, tret, "Error: failed to create or access %s\n", tosd_db_path); + goto tosd_init_error; } /* make a directory for data storage if not already present */ - ret = mkdir(vosd_log_path, 0755); + ret = mkdir(tosd_log_path, 0755); if(ret != 0 && errno == EEXIST) { log_dir_exists = 1; @@ -1591,8 +1591,8 @@ triton_ret_t vosd_init(void) { /* some other error */ tret = triton_ret_from_bdb(errno); - triton_log_error(triton_log_default, tret, "Error: failed to create or access %s\n", vosd_log_path); - goto vosd_init_error; + triton_log_error(triton_log_default, tret, "Error: failed to create or access %s\n", tosd_log_path); + goto tosd_init_error; } /* create berkeley db environment */ @@ -1600,7 +1600,7 @@ triton_ret_t vosd_init(void) if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } if(global_db_coalesce_highwater > 0) @@ -1612,7 +1612,7 @@ triton_ret_t vosd_init(void) if(ret != 0) { tret = triton_ret_from_bdb(errno); - goto vosd_init_error; + goto tosd_init_error; } } @@ -1631,7 +1631,7 @@ triton_ret_t vosd_init(void) if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } env_flags = @@ -1646,11 +1646,11 @@ triton_ret_t vosd_init(void) DB_RECOVER; /* Run normal recovery steps */ /* open environment */ - ret = envp->open(envp, vosd_db_path, env_flags, 0); + ret = envp->open(envp, tosd_db_path, env_flags, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } /* create db handles */ @@ -1661,28 +1661,28 @@ triton_ret_t vosd_init(void) if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } log_map_dbp->set_bt_compare(log_map_dbp, compare_log_map_key); ret = db_create(&missing_ver_dbp, envp, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } missing_ver_dbp->set_bt_compare(missing_ver_dbp, compare_missing_version); ret = db_create(&ver_dbp, envp, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } ver_dbp->set_bt_compare(ver_dbp, compare_uint128); ret = db_create(&niid_dbp, envp, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } niid_dbp->set_bt_compare(niid_dbp, compare_niid_key); @@ -1693,35 +1693,35 @@ triton_ret_t vosd_init(void) if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } ret = missing_ver_dbp->open(missing_ver_dbp, NULL, "missing_version.db", "missing_versions.db", DB_BTREE, open_flags, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } ret = ver_dbp->open(ver_dbp, NULL, "version.db", "version.db", DB_BTREE, open_flags, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } ret = niid_dbp->open(niid_dbp, NULL, "niid.db", "niid.db", DB_BTREE, open_flags, 0); if(ret != 0) { tret = triton_ret_from_bdb(ret); - goto vosd_init_error; + goto tosd_init_error; } tret = throttle_bdb_init(envp); if(tret != TRITON_SUCCESS) { - goto vosd_init_error; + goto tosd_init_error; } /* flush out txn logs up front; otherwise the first I/O operation to the - * VOSD may bog down instead. + * TOSD may bog down instead. */ envp->txn_checkpoint(envp, 0, 0, 0); @@ -1731,26 +1731,26 @@ triton_ret_t vosd_init(void) if(!txn_table) { tret = TRITON_ERR_NOMEM; - goto vosd_init_error; + goto tosd_init_error; } triton_mutex_unlock(&txn_mutex); - tret = fd_cache_initialize(vosd_log_path); + tret = fd_cache_initialize(tosd_log_path); if(tret != TRITON_SUCCESS) { - goto vosd_init_error; + goto tosd_init_error; } return(TRITON_SUCCESS); -vosd_init_error: +tosd_init_error: - vosd_finalize(); + tosd_finalize(); return(tret); } -void vosd_finalize(void) +void tosd_finalize(void) { #ifdef LOG_FLUSH_TIMING int i = 0; @@ -1779,10 +1779,10 @@ void vosd_finalize(void) if(envp) envp->close(envp, 0); - if(vosd_db_path) - free(vosd_db_path); - if(vosd_log_path) - free(vosd_log_path); + if(tosd_db_path) + free(tosd_db_path); + if(tosd_log_path) + free(tosd_log_path); #ifdef LOG_FLUSH_TIMING for(i=0; i<time_array_counter; i++) @@ -1793,18 +1793,18 @@ void vosd_finalize(void) return; } -__attribute__((constructor)) void triton_vosd_init_register(void) +__attribute__((constructor)) void triton_tosd_init_register(void) { - triton_init_register("triton.vosd", vosd_init, vosd_finalize, NULL, - "triton.resource.sched", "triton.vosd.bdb", "triton.vosd.file", "triton.resource.timer"); + triton_init_register("triton.tosd", tosd_init, tosd_finalize, NULL, + "triton.resource.sched", "triton.tosd.bdb", "triton.tosd.file", "triton.resource.timer"); } #if 0 #if 0 -static __blocking triton_ret_t __vosd_truncate_retryable(uint128_t oid, uint64_t ofork, int64_t size) +static __blocking triton_ret_t __tosd_truncate_retryable(uint128_t oid, uint64_t ofork, int64_t size) #endif -static __blocking triton_ret_t __vosd_truncate_retryable(uint128_t oid, uint64_t ofork, int64_t size) +static __blocking triton_ret_t __tosd_truncate_retryable(uint128_t oid, uint64_t ofork, int64_t size) { triton_ret_t tret; @@ -1832,7 +1832,7 @@ static __blocking triton_ret_t __vosd_truncate_retryable(uint128_t oid, uint64_t return(tret); } -__blocking triton_ret_t vosd_truncate(uint128_t oid, uint64_t ofork, int64_t size, uint64_t niid) +__blocking triton_ret_t tosd_truncate(uint128_t oid, uint64_t ofork, int64_t size, uint64_t niid) { triton_ret_t tret; @@ -1843,18 +1843,18 @@ __blocking triton_ret_t vosd_truncate(uint128_t oid, uint64_t ofork, int64_t siz for(tret = TRITON_ERR_DEADLOCK; tret == TRITON_ERR_DEADLOCK; ) { triton_error_destroy(tret); - tret = __vosd_truncate_retryable(oid, ofork, size); + tret = __tosd_truncate_retryable(oid, ofork, size); } return(tret); } #endif -__blocking triton_ret_t vosd_get_version(uint128_t oid, uint64_t* version) +__blocking triton_ret_t tosd_get_version(uint128_t oid, uint64_t* version) { triton_ret_t tret; - VOSD_CHECK(); + TOSD_CHECK(); /* TODO: note that a do/while loop will compile here, but not work * correctly @@ -1862,13 +1862,13 @@ __blocking triton_ret_t vosd_get_version(uint128_t oid, uint64_t* version) for(tret = TRITON_ERR_DEADLOCK; tret == TRITON_ERR_DEADLOCK; ) { triton_error_destroy(tret); - tret = __vosd_get_version_retryable(oid, version); + tret = __tosd_get_version_retryable(oid, version); } return(tret); } -static __blocking triton_ret_t __vosd_discard_niids_retryable( +static __blocking triton_ret_t __tosd_discard_niids_retryable( uint128_t* oid_array, uint64_t* niid_array, int count) @@ -1897,8 +1897,8 @@ static __blocking triton_ret_t __vosd_discard_niids_retryable( triton_error_destroy(tret_tmp); return(tret); } - VOSD_INIT_DBT(key, (nkey)); - VOSD_INIT_DBT(value, (nvalue)); + TOSD_INIT_DBT(key, (nkey)); + TOSD_INIT_DBT(value, (nvalue)); for(i=0; i<count; i++) { @@ -1947,32 +1947,32 @@ static __blocking triton_ret_t __vosd_discard_niids_retryable( return(tret); } -__blocking triton_ret_t vosd_discard_niids( +__blocking triton_ret_t tosd_discard_niids( uint128_t* oid_array, uint64_t* niid_array, int count) { triton_ret_t tret; - VOSD_CHECK(); + TOSD_CHECK(); for(tret = TRITON_ERR_DEADLOCK; tret == TRITON_ERR_DEADLOCK; ) { triton_error_destroy(tret); - tret = __vosd_discard_niids_retryable(oid_array, niid_array, count); + tret = __tosd_discard_niids_retryable(oid_array, niid_array, count); } return tret; } -__blocking triton_ret_t vosd_create(uint128_t oid, uint64_t niid) +__blocking triton_ret_t tosd_create(uint128_t oid, uint64_t niid) { triton_ret_t tret; triton_ret_t tret_tmp; struct coalesce_obj co; - VOSD_CHECK(); + TOSD_CHECK(); co.oid = oid; co.flags = COALESCE_DB; @@ -1984,7 +1984,7 @@ __blocking triton_ret_t vosd_create(uint128_t oid, uint64_t niid) for(tret = TRITON_ERR_DEADLOCK; tret == TRITON_ERR_DEADLOCK; ) { triton_error_destroy(tret); - tret = __vosd_create_retryable(oid, niid); + tret = __tosd_create_retryable(oid, niid); } /* delay creating log file until the first write() operation */ @@ -2005,7 +2005,7 @@ __blocking triton_ret_t vosd_create(uint128_t oid, uint64_t niid) return(tret); } -__blocking triton_ret_t vosd_dump(void) +__blocking triton_ret_t tosd_dump(void) { triton_ret_t tret; triton_ret_t tret_tmp; @@ -2024,26 +2024,26 @@ __blocking triton_ret_t vosd_dump(void) struct logical_map_entry lmv; uint64_t vv; - VOSD_CHECK(); + TOSD_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); + TOSD_INIT_DBT(log_map_key, lmk); + TOSD_INIT_DBT(missing_ver_key, mvk); + TOSD_INIT_DBT(ver_key, vk); + TOSD_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); + TOSD_INIT_DBT(log_map_value, lmv); + TOSD_INIT_DBT_EMPTY(missing_ver_value); + TOSD_INIT_DBT(ver_value, vv); + TOSD_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 + * This function should only be called when TOSD is in a quiescent * state. This caveat allows us to simply print contents as they are * encountered without maintaining any state. */ - printf("Dumping VOSD contents...\n"); + printf("Dumping TOSD contents...\n"); tret = throttle_bdb_txn_begin(envp, NULL, &txn, 0); if(tret != TRITON_SUCCESS) { @@ -2210,7 +2210,7 @@ __blocking triton_ret_t vosd_dump(void) } static const int error_count_max = 8; -__blocking triton_ret_t vosd_enumerate(int count, +__blocking triton_ret_t tosd_enumerate(int count, int offset, uint128_t *oids, int *result) @@ -2219,10 +2219,10 @@ __blocking triton_ret_t vosd_enumerate(int count, uint128_t upper; triton_uint128_setzero(lower); triton_uint128_setmax(upper); - return vosd_range(count, offset, lower, upper, oids, result); + return tosd_range(count, offset, lower, upper, oids, result); } -__blocking triton_ret_t vosd_range(int count, +__blocking triton_ret_t tosd_range(int count, int offset, uint128_t lower, uint128_t upper, @@ -2243,16 +2243,16 @@ __blocking triton_ret_t vosd_range(int count, int current; int index; - VOSD_CHECK(); + TOSD_CHECK(); /* keys for each db */ - VOSD_INIT_DBT(ver_key, vk); + TOSD_INIT_DBT(ver_key, vk); /* values for each db */ - VOSD_INIT_DBT(ver_value, vv); + TOSD_INIT_DBT(ver_value, vv); /* 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 + * This function should only be called when TOSD is in a quiescent * state. This caveat allows us to simply print contents as they are * encountered without maintaining any state. */ @@ -2301,7 +2301,7 @@ __blocking triton_ret_t vosd_range(int count, if (tret != TRITON_SUCCESS && tret != TRITON_ERR_NOENT) { - triton_error_print(tret, "vosd_range(): "); + triton_error_print(tret, "tosd_range(): "); return(tret); } @@ -2322,7 +2322,7 @@ __blocking triton_ret_t vosd_range(int count, /* TODO: remove niid argument here. We are just going to deal with niids at * the individual write level */ -triton_ret_t vosd_txn_open( +triton_ret_t tosd_txn_open( uint128_t oid, uint64_t oid_fork, uint64_t txn_number, @@ -2364,7 +2364,7 @@ triton_ret_t vosd_txn_open( return(TRITON_SUCCESS); } -static __blocking triton_ret_t vosd_write_internal( +static __blocking triton_ret_t tosd_write_internal( uint128_t oid, uint64_t oid_fork, uint64_t txn_number, @@ -2415,16 +2415,16 @@ static __blocking triton_ret_t vosd_write_internal( memcpy(tmp_obj_offsets, obj_offsets, obj_count*sizeof(*tmp_obj_offsets)); memcpy(tmp_obj_sizes, obj_sizes, obj_count*sizeof(*tmp_obj_sizes)); - if(flags & VOSD_FLAG_AUTO_TXN) + if(flags & TOSD_FLAG_AUTO_TXN) { - tret = vosd_txn_open(oid, oid_fork, txn_number, niid); + tret = tosd_txn_open(oid, oid_fork, txn_number, niid); if(tret != TRITON_SUCCESS) { free_tmp_listio(); return(tret); } } - /* TODO: add vosd_txn_abort() calls in return paths through the rest of + /* TODO: add tosd_txn_abort() calls in return paths through the rest of * this function */ @@ -2569,16 +2569,16 @@ static __blocking triton_ret_t vosd_write_internal( fd_cache_put(fd_entry); tret = TRITON_SUCCESS; - if(flags & VOSD_FLAG_AUTO_TXN) + if(flags & TOSD_FLAG_AUTO_TXN) { - tret = vosd_txn_close_internal(oid, oid_fork, txn_number); + tret = tosd_txn_close_internal(oid, oid_fork, txn_number); } free_tmp_listio(); return(tret); } -__blocking triton_ret_t vosd_get_size( +__blocking triton_ret_t tosd_get_size( uint128_t oid, uint64_t oid_fork, int64_t* size, @@ -2593,7 +2593,7 @@ __blocking triton_ret_t vosd_get_size( struct logical_map_key lmk; struct logical_map_entry lme; - VOSD_CHECK(); + TOSD_CHECK(); /* not supported yet */ assert(niid == 0); @@ -2614,8 +2614,8 @@ __blocking triton_ret_t vosd_get_size( triton_error_destroy(tret_tmp); return(tret); } - VOSD_INIT_DBT(key, lmk); - VOSD_INIT_DBT(value, lme); + TOSD_INIT_DBT(key, lmk); + TOSD_INIT_DBT(value, lme); /* we want to go to the first record _after_ the fork that we are * interested in @@ -2665,7 +2665,7 @@ __blocking triton_ret_t vosd_get_size( if(tret == TRITON_ERR_NOENT) { - /* nothing in the vosd at all yet */ + /* nothing in the tosd at all yet */ *size = 0; } else if(triton_cmp_uint128(lmk.oid,oid) == 0 && lmk.oid_fork == oid_fork) @@ -2691,7 +2691,7 @@ __blocking triton_ret_t vosd_get_size( } -__blocking triton_ret_t vosd_write( +__blocking triton_ret_t tosd_write( uint128_t oid, uint64_t oid_fork, uint64_t txn_number, @@ -2708,13 +2708,13 @@ __blocking triton_ret_t vosd_write( triton_ret_t tret_tmp; struct coalesce_obj co; - VOSD_CHECK(); + TOSD_CHECK(); co.oid = oid; co.flags = COALESCE_DB|COALESCE_DATA; start_write(&co); - tret = vosd_write_internal(oid, oid_fork, txn_number, mem_offsets, + tret = tosd_write_internal(oid, oid_fork, txn_number, mem_offsets, mem_sizes, mem_count, obj_offsets, obj_sizes, obj_count, flags, niid); tret_tmp = end_write(&co); @@ -2727,7 +2727,7 @@ __blocking triton_ret_t vosd_write( } -__blocking triton_ret_t vosd_txn_close( +__blocking triton_ret_t tosd_txn_close( uint128_t oid, uint64_t oid_fork, uint64_t txn_number) @@ -2736,13 +2736,13 @@ __blocking triton_ret_t vosd_txn_close( triton_ret_t tret_tmp; struct coalesce_obj co; - VOSD_CHECK(); + TOSD_CHECK(); co.oid = oid; co.flags = COALESCE_DB; start_write(&co); - tret = vosd_txn_close_internal(oid, oid_fork, txn_number); + tret = tosd_txn_close_internal(oid, oid_fork, txn_number); tret_tmp = end_write(&co); if(tret == TRITON_SUCCESS) @@ -2754,7 +2754,7 @@ __blocking triton_ret_t vosd_txn_close( } -__blocking triton_ret_t vosd_read( +__blocking triton_ret_t tosd_read( uint128_t oid, uint64_t oid_fork, char** mem_offsets, @@ -2778,7 +2778,7 @@ __blocking triton_ret_t vosd_read( int64_t ver; DBT key, value; - VOSD_CHECK(); + TOSD_CHECK(); /* not supported yet */ assert(niid == 0); @@ -2819,8 +2819,8 @@ __blocking triton_ret_t vosd_read( triton_error_destroy(tret); /* does the object exist at all? */ - VOSD_INIT_DBT(key, oid); - VOSD_INIT_DBT(value, ver); + TOSD_INIT_DBT(key, oid); + TOSD_INIT_DBT(value, ver); /* NOTE: deliberately no txn here. From bdb docs: "If no * transaction handle is specified, but the operation occurs in @@ -2861,13 +2861,13 @@ __blocking triton_ret_t vosd_read( return(TRITON_SUCCESS); } -__blocking triton_ret_t vosd_remove(uint128_t oid, uint64_t niid) +__blocking triton_ret_t tosd_remove(uint128_t oid, uint64_t niid) { triton_ret_t tret; triton_ret_t tret_tmp; struct coalesce_obj co; - VOSD_CHECK(); + TOSD_CHECK(); co.oid = oid; co.flags = COALESCE_DB; @@ -2876,7 +2876,7 @@ __blocking triton_ret_t vosd_remove(uint128_t oid, uint64_t niid) for(tret = TRITON_ERR_DEADLOCK; tret == TRITON_ERR_DEADLOCK; ) { triton_error_destroy(tret); - tret = __vosd_remove_retryable(oid, niid); + tret = __tosd_remove_retryable(oid, niid); } tret_tmp = end_write(&co); @@ -3003,7 +3003,7 @@ static int txn_acc_compare(const void *key, struct triton_hash_link *hash_link) * regions. returns 1 if listio is done, 0 otherwise. * * WARNING: this function modifies its arguments. It should not be called - * directly on variables passed in from the VOSD API. + * directly on variables passed in from the TOSD API. */ static int advance_listio_ptrs( char** mem_offsets, @@ -3145,7 +3145,7 @@ static triton_ret_t merge_logical_map(struct triton_list* list1_in, logical_offset = list1_array[0].logical_offset; else { - logical_offset = VOSD_MIN(list1_array[0].logical_offset, + logical_offset = TOSD_MIN(list1_array[0].logical_offset, list2_array[0].logical_offset); } @@ -3214,7 +3214,7 @@ static triton_ret_t merge_logical_map(struct triton_list* list1_in, loser = &list1_array[i]; } list_out_array[k] = *winner; - logical_offset = VOSD_MIN(winner->logical_offset_end, + logical_offset = TOSD_MIN(winner->logical_offset_end, loser->logical_offset_end); list_out_array[k].logical_offset_end = logical_offset; list_out_array[k].size = list_out_array[k].logical_offset_end - @@ -3235,7 +3235,7 @@ static triton_ret_t merge_logical_map(struct triton_list* list1_in, loser = &list1_array[i]; } list_out_array[k] = *winner; - logical_offset = VOSD_MIN(winner->logical_offset_end, + logical_offset = TOSD_MIN(winner->logical_offset_end, loser->logical_offset); list_out_array[k].logical_offset_end = logical_offset; list_out_array[k].size = list_out_array[k].logical_offset_end - @@ -3304,7 +3304,7 @@ static void free_logical_map_list(struct triton_list* list) return; } -/* must be called at the beginning of any vosd function that has the +/* must be called at the beginning of any tosd function that has the * potential to modify bdb */ static void start_write(struct coalesce_obj *obj) @@ -3317,7 +3317,7 @@ static void start_write(struct coalesce_obj *obj) obj->flags &= ~COALESCE_DB; if(global_data_coalesce_highwater == 0) obj->flags &= ~COALESCE_DATA; - if(!(global_flags & VOSD_INIT_FLAG_DATA_SYNC)) + if(!(global_flags & TOSD_INIT_FLAG_DATA_SYNC)) obj->flags &= ~COALESCE_DATA; /* do nothing if coalescing is off */ @@ -3374,24 +3374,24 @@ static triton_ret_t db_path_updater(const char *key, const char *value) { assert(!strcmp(key, db_path_confkey)); - if(triton_init_check("triton.vosd") == TRITON_SUCCESS) + if(triton_init_check("triton.tosd") == TRITON_SUCCESS) { - triton_err(triton_log_default, "Error: %s parameter cannot be modified after VOSD has been initialized.\n", db_path_confkey); + triton_err(triton_log_default, "Error: %s parameter cannot be modified after TOSD has been initialized.\n", db_path_confkey); return TRITON_ERR_INVAL; } - if(vosd_db_path) - free(vosd_db_path); + if(tosd_db_path) + free(tosd_db_path); - vosd_db_path = strdup(value); - if(!vosd_db_path) + tosd_db_path = strdup(value); + if(!tosd_db_path) { return(TRITON_ERR_NOMEM); } - /* note: will error check later in vosd_init() */ - triton_debug(vosd_mask, - "VOSD db path set to: %s\n", vosd_db_path); + /* note: will error check later in tosd_init() */ + triton_debug(tosd_mask, + "TOSD db path set to: %s\n", tosd_db_path); return TRITON_SUCCESS; } @@ -3400,24 +3400,24 @@ static triton_ret_t data_path_updater(const char *key, const char *value) { assert(!strcmp(key, data_path_confkey)); - if(triton_init_check("triton.vosd") == TRITON_SUCCESS) + if(triton_init_check("triton.tosd") == TRITON_SUCCESS) { - triton_err(triton_log_default, "Error: %s parameter cannot be modified after VOSD has been initialized.\n", data_path_confkey); + triton_err(triton_log_default, "Error: %s parameter cannot be modified after TOSD has been initialized.\n", data_path_confkey); return TRITON_ERR_INVAL; } - if(vosd_log_path) - free(vosd_log_path); + if(tosd_log_path) + free(tosd_log_path); - vosd_log_path = strdup(value); - if(!vosd_log_path) + tosd_log_path = strdup(value); + if(!tosd_log_path) { return(TRITON_ERR_NOMEM); } - /* note: will error check later in vosd_init() */ - triton_debug(vosd_mask, - "VOSD data path set to: %s\n", vosd_log_path); + /* note: will error check later in tosd_init() */ + triton_debug(tosd_mask, + "TOSD data path set to: %s\n", tosd_log_path); return TRITON_SUCCESS; } @@ -3435,8 +3435,8 @@ static triton_ret_t db_coal_updater(const char *key, const char *value) } global_db_coalesce_highwater = tmp_value; - triton_debug(vosd_mask, - "VOSD DB coalescing highwater mark set to: %d\n", tmp_value); + triton_debug(tosd_mask, + "TOSD DB coalescing highwater mark set to: %d\n", tmp_value); return TRITON_SUCCESS; } @@ -3454,8 +3454,8 @@ static triton_ret_t data_coal_updater(const char *key, const char *value) } global_data_coalesce_highwater = tmp_value; - triton_debug(vosd_mask, - "VOSD DB coalescing highwater mark set to: %d\n", tmp_value); + triton_debug(tosd_mask, + "TOSD DB coalescing highwater mark set to: %d\n", tmp_value); return TRITON_SUCCESS; } @@ -3473,8 +3473,8 @@ static triton_ret_t align_updater(const char *key, const char *value) } global_alignment = tmp_value; - triton_debug(vosd_mask, - "VOSD alignment set to: %d\n", tmp_value); + triton_debug(tosd_mask, + "TOSD alignment set to: %d\n", tmp_value); return TRITON_SUCCESS; } @@ -3519,16 +3519,16 @@ static triton_ret_t flags_updater(const char *key, const char *value) if(strcmp(parse_value, "DATA_ODIRECT") == 0) { - tmp_value |= VOSD_INIT_FLAG_DATA_ODIRECT; + tmp_value |= TOSD_INIT_FLAG_DATA_ODIRECT; } else if(strcmp(parse_value, "DATA_SYNC") == 0) { - tmp_value |= VOSD_INIT_FLAG_DATA_SYNC; + tmp_value |= TOSD_INIT_FLAG_DATA_SYNC; } else { free(hack_value); - triton_err(triton_log_default, "Error: invalid value %s for VOSD flags.", parse_value); + triton_err(triton_log_default, "Error: invalid value %s for TOSD flags.", parse_value); return(TRITON_ERR_INVAL); } @@ -3537,15 +3537,15 @@ static triton_ret_t flags_updater(const char *key, const char *value) global_flags = tmp_value; - triton_debug(vosd_mask, - "VOSD flags set to: %d\n", tmp_value); + triton_debug(tosd_mask, + "TOSD flags set to: %d\n", tmp_value); free(hack_value); return TRITON_SUCCESS; } -__blocking triton_ret_t vosd_check_niid(uint128_t oid, uint64_t niid, int op_type) +__blocking triton_ret_t tosd_check_niid(uint128_t oid, uint64_t niid, int op_type) { triton_ret_t tret; @@ -3566,7 +3566,7 @@ static __blocking triton_ret_t purge_niids_from_oid(uint64_t max, uint128_t oid) for(i=1; i<=max; i++) { niid = i; - tret = vosd_discard_niids(&oid, &niid, 1); + tret = tosd_discard_niids(&oid, &niid, 1); triton_error_assert(tret); } @@ -3584,7 +3584,7 @@ static __blocking triton_ret_t purge_niids(uint64_t max) { oid = triton_uint128_from_uint64(i); niid = i; - tret = vosd_discard_niids(&oid, &niid, 1); + tret = tosd_discard_niids(&oid, &niid, 1); triton_error_assert(tret); } @@ -3637,9 +3637,9 @@ static __blocking triton_ret_t create_rm_bench(double seconds, if(!done) { - b_ret = vosd_create(oid, niid); + b_ret = tosd_create(oid, niid); triton_error_assert(b_ret); - b_ret = vosd_remove(oid, niid); + b_ret = tosd_remove(oid, niid); triton_error_assert(b_ret); } } @@ -3682,7 +3682,7 @@ static __blocking triton_ret_t write_bench(double seconds, } oid = triton_uint128_from_uint64(0); - tret = vosd_create(oid, 0); + tret = tosd_create(oid, 0); triton_error_assert(tret); triton_mutex_init(&started_mutex, NULL); @@ -3721,7 +3721,7 @@ static __blocking triton_ret_t write_bench(double seconds, if(!done) { /* NOTE: using niid as txn number here */ - b_ret = vosd_write(oid, 0, niid, &buffer, &buffer_size, 1, &offset, &buffer_size, 1, VOSD_FLAG_AUTO_TXN, niid); + b_ret = tosd_write(oid, 0, niid, &buffer, &buffer_size, 1, &offset, &buffer_size, 1, TOSD_FLAG_AUTO_TXN, niid); triton_error_assert(b_ret); } } @@ -3734,7 +3734,7 @@ static __blocking triton_ret_t write_bench(double seconds, triton_mutex_destroy(&started_mutex); - tret = vosd_remove(oid, 0); + tret = tosd_remove(oid, 0); triton_error_assert(tret); /* get rid of any niids that were inserted by the benchmark */ @@ -3748,7 +3748,7 @@ static __blocking triton_ret_t write_bench(double seconds, } -__blocking triton_ret_t vosd_autotune(void) +__blocking triton_ret_t tosd_autotune(void) { triton_ret_t tret; double ops_warmup, ops_thread_txn, ops_thread_op, ops_flush_thread_per_op; @@ -3786,20 +3786,20 @@ __blocking triton_ret_t vosd_autotune(void) value = triton_zeroconf_get(flags_confkey); if(strcmp(value, "DATA_ODIRECT,DATA_SYNC") != 0) { - fprintf(stderr, "Error: VOSD not using default DATA_ODIRECT,DATA_SYNC flags.\n"); + fprintf(stderr, "Error: TOSD not using default DATA_ODIRECT,DATA_SYNC flags.\n"); return(TRITON_ERR_INVAL); } - printf("vosd_autotune: concurrent operations %d\n", concurrency); - printf("vosd_autotune: duration of each test: %f\n", duration); - printf("vosd_autotune: confirmed default settings:\n"); + printf("tosd_autotune: concurrent operations %d\n", concurrency); + printf("tosd_autotune: duration of each test: %f\n", duration); + printf("tosd_autotune: confirmed default settings:\n"); printf(" bdb txns: THREAD_PER_TXN\n"); printf(" bdb flushes: ONE_THREAD\n"); printf(" io: THREAD_POOL\n"); - printf(" vosd flags: DATA_ODIRECT,DATA_SYNC\n"); + printf(" tosd flags: DATA_ODIRECT,DATA_SYNC\n"); /* warm up run before real testing */ - printf("vosd_autotune: metadata warm up run...\n"); + printf("tosd_autotune: metadata warm up run...\n"); tret = create_rm_bench(duration, concurrency, &ops_warmup); triton_error_assert(tret); printf(" %f (creates+removes)/sec\n", ops_warmup); @@ -3807,7 +3807,7 @@ __blocking triton_ret_t vosd_autotune(void) triton_timer(1000); /* real test */ - printf("vosd_autotune: bdb: default settings ...\n"); + printf("tosd_autotune: bdb: default settings ...\n"); tret = create_rm_bench(duration, concurrency, &ops_thread_txn); triton_error_assert(tret); printf(" %f (creates+removes)/sec\n", ops_thread_txn); @@ -3819,7 +3819,7 @@ __blocking triton_ret_t vosd_autotune(void) "triton.bdb.txn_progress_mode", "THREAD_PER_OP"); triton_error_assert(tret); - printf("vosd_autotune: bdb txns: THREAD_PER_OP ...\n"); + printf("tosd_autotune: bdb txns: THREAD_PER_OP ...\n"); tret = create_rm_bench(duration, concurrency, &ops_thread_op); triton_error_assert(tret); printf(" %f (creates+removes)/sec\n", ops_thread_op); @@ -3843,7 +3843,7 @@ __blocking triton_ret_t vosd_autotune(void) "triton.bdb.flush_progress_mode", "THREAD_PER_OP"); triton_error_assert(tret); - printf("vosd_autotune: bdb flushes: THREAD_PER_OP ...\n"); + printf("tosd_autotune: bdb flushes: THREAD_PER_OP ...\n"); tret = create_rm_bench(duration, concurrency, &ops_flush_thread_per_op); triton_error_assert(tret); printf(" %f (creates+removes)/sec\n", ops_flush_thread_per_op); @@ -3862,21 +3862,21 @@ __blocking triton_ret_t vosd_autotune(void) triton_error_assert(tret); } - printf("vosd_autotune: write warm up run...\n"); + printf("tosd_autotune: write warm up run...\n"); tret = write_bench(duration, concurrency, 4*1024*1024, &wr_warmup); triton_error_assert(tret); printf(" %f (4MiB writes)/sec\n", wr_warmup); triton_timer(1000); - printf("vosd_autotune: 4KiB writes ...\n"); + printf("tosd_autotune: 4KiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024, &wr1_default); triton_error_assert(tret); printf(" %f (4KiB writes)/sec\n", wr1_default); triton_timer(1000); - printf("vosd_autotune: 4MiB writes ...\n"); + printf("tosd_autotune: 4MiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024*1024, &wr2_default); triton_error_assert(tret); printf(" %f (4MiB writes)/sec\n", wr2_default); @@ -3888,14 +3888,14 @@ __blocking triton_ret_t vosd_autotune(void) "triton.file.io_progress_mode", "IN_PLACE"); triton_error_assert(tret); - printf("vosd_autotune: I/O: IN_PLACE, 4KiB writes ...\n"); + printf("tosd_autotune: I/O: IN_PLACE, 4KiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024, &wr1_no_threads); triton_error_assert(tret); printf(" %f (4KiB writes)/sec\n", wr1_no_threads); triton_timer(1000); - printf("vosd_autotune: I/O: IN_PLACE, 4MiB writes ...\n"); + printf("tosd_autotune: I/O: IN_PLACE, 4MiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024*1024, &wr2_no_threads); triton_error_assert(tret); printf(" %f (4MiB writes)/sec\n", wr2_no_threads); @@ -3919,14 +3919,14 @@ __blocking triton_ret_t vosd_autotune(void) "triton.file.io_progress_mode", "THREAD_PER_OP"); triton_error_assert(tret); - printf("vosd_autotune: I/O: THREAD_PER_OP, 4KiB writes ...\n"); + printf("tosd_autotune: I/O: THREAD_PER_OP, 4KiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024, &wr1_tpo); triton_error_assert(tret); printf(" %f (4KiB writes)/sec\n", wr1_tpo); triton_timer(1000); - printf("vosd_autotune: I/O: THREAD_PER_OP, 4MiB writes ...\n"); + printf("tosd_autotune: I/O: THREAD_PER_OP, 4MiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024*1024, &wr2_tpo); triton_error_assert(tret); printf(" %f (4MiB writes)/sec\n", wr2_tpo); @@ -3957,14 +3957,14 @@ __blocking triton_ret_t vosd_autotune(void) tret = triton_zeroconf_set(flags_confkey, "DATA_SYNC"); triton_error_assert(tret); - printf("vosd_autotune: I/O: no O_DIRECT, 4KiB writes ...\n"); + printf("tosd_autotune: I/O: no O_DIRECT, 4KiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024, &wr1_no_odirect); triton_error_assert(tret); printf(" %f (4KiB writes)/sec\n", wr1_no_odirect); triton_timer(1000); - printf("vosd_autotune: I/O: no O_DIRECT, 4MiB writes ...\n"); + printf("tosd_autotune: I/O: no O_DIRECT, 4MiB writes ...\n"); tret = write_bench(duration, concurrency, 4*1024*1024, &wr2_no_odirect); triton_error_assert(tret); printf(" %f (4MiB writes)/sec\n", wr2_no_odirect); @@ -3997,7 +3997,7 @@ __blocking triton_ret_t vosd_autotune(void) if(wr2_tpo > wr2_default && wr2_tpo > wr2_no_threads) printf("triton_file_io_progress_mode=THREAD_PER_OP\n"); if(wr2_no_odirect > wr2_default && wr2_no_odirect > wr2_no_threads) - printf("triton_vosd_flags=DATA_SYNC"); + printf("triton_tosd_flags=DATA_SYNC"); /* TODO: other things we could consider testing later: * diff --git a/code/src/versioned-osd/prototype/versioned-osd.hae b/code/src/transactional-osd/transactional-osd.hae similarity index 76% rename from code/src/versioned-osd/prototype/versioned-osd.hae rename to code/src/transactional-osd/transactional-osd.hae index e468cb7..7fc7b2a 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.hae +++ b/code/src/transactional-osd/transactional-osd.hae @@ -1,9 +1,9 @@ #ifndef __VERSIONED_OSD_HAE__ #define __VERSIONED_OSD_HAE__ -/** \defgroup VOSD prototype +/** \defgroup TOSD prototype * - * This is a prototype VOSD to be used for initial studies of the Grayskull + * This is a prototype TOSD to be used for initial studies of the Grayskull * replication protocol. * * . @@ -11,7 +11,7 @@ */ /** \file - * Declarations for VOSD object storage resource. + * Declarations for TOSD object storage resource. */ #include <stdint.h> @@ -19,31 +19,31 @@ #include "src/common/triton-error.h" #include "src/aesop/aesop.h" -#define VOSD_FLAG_TRUNC_WRITE 1 /**< truncate fork on write */ -#define VOSD_FLAG_AUTO_TXN 2 /**< automatically wrap write in a transaction */ +#define TOSD_FLAG_TRUNC_WRITE 1 /**< truncate fork on write */ +#define TOSD_FLAG_AUTO_TXN 2 /**< automatically wrap write in a transaction */ -#define VOSD_INIT_FLAG_DATA_ODIRECT 1 /**< O_DIRECT for data access */ -#define VOSD_INIT_FLAG_DATA_SYNC 2 /**< fsync() (or similar) when writing data */ +#define TOSD_INIT_FLAG_DATA_ODIRECT 1 /**< O_DIRECT for data access */ +#define TOSD_INIT_FLAG_DATA_SYNC 2 /**< fsync() (or similar) when writing data */ /* Types of operations that support NIID tracking */ -#define VOSD_NIID_OP_CREATE 1 -#define VOSD_NIID_OP_REMOVE 2 -#define VOSD_NIID_OP_WRITE 3 +#define TOSD_NIID_OP_CREATE 1 +#define TOSD_NIID_OP_REMOVE 2 +#define TOSD_NIID_OP_WRITE 3 /** - * Initializes VOSD interface + * Initializes TOSD interface */ -triton_ret_t vosd_init(void); +triton_ret_t tosd_init(void); /** - * Shuts down VOSD interface + * Shuts down TOSD interface */ -void vosd_finalize(void); +void tosd_finalize(void); /** * Creates a new object */ -__blocking triton_ret_t vosd_create( +__blocking triton_ret_t tosd_create( uint128_t oid, /**< requested identifier */ uint64_t niid /**< non-idempotent identifier */ ); @@ -52,30 +52,30 @@ __blocking triton_ret_t vosd_create( /** * Retrieves current version number of object */ -__blocking triton_ret_t vosd_get_version( +__blocking triton_ret_t tosd_get_version( uint128_t oid, /**< object to operate on */ uint64_t* version /**< version number of object */ ); /** * Dumps object version and log information to stdout - * NOTE: the VOSD must be quiescent during dump + * NOTE: the TOSD must be quiescent during dump */ -__blocking triton_ret_t vosd_dump(void); +__blocking triton_ret_t tosd_dump(void); /** * Obtain a list of all OIDs - * NOTE: the VOSD must be quiescent during this operation + * NOTE: the TOSD must be quiescent during this operation */ -__blocking triton_ret_t vosd_enumerate(int offset, +__blocking triton_ret_t tosd_enumerate(int offset, int count, 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 + * NOTE: the TOSD must be quiescent during this operation */ -__blocking triton_ret_t vosd_range(int count, +__blocking triton_ret_t tosd_range(int count, int offset, uint128_t lower, uint128_t upper, @@ -85,7 +85,7 @@ __blocking triton_ret_t vosd_range(int count, /** * Opens a txn */ -triton_ret_t vosd_txn_open( +triton_ret_t tosd_txn_open( uint128_t oid, /**< object to operate on */ uint64_t fork, /**< fork to operate on */ uint64_t txn_number, /**< caller-assigned txn identifier */ @@ -95,7 +95,7 @@ triton_ret_t vosd_txn_open( /** * Get logical size of a fork */ -__blocking triton_ret_t vosd_get_size( +__blocking triton_ret_t tosd_get_size( uint128_t oid, /**< object to operate on */ uint64_t oid_fork, /**< fork identifier */ int64_t* size, /**< logical size of fork */ @@ -105,7 +105,7 @@ __blocking triton_ret_t vosd_get_size( /** * Writes data into an object */ -__blocking triton_ret_t vosd_write( +__blocking triton_ret_t tosd_write( uint128_t oid, /**< object to operate on */ uint64_t fork, /**< fork identifier */ uint64_t txn_number, /**< txn identifier */ @@ -122,7 +122,7 @@ __blocking triton_ret_t vosd_write( /** * Closes a txn */ -__blocking triton_ret_t vosd_txn_close( +__blocking triton_ret_t tosd_txn_close( uint128_t oid, /**< object to operate on */ uint64_t fork, /**< fork to operate on */ uint64_t txn_number /**< caller-assigned txn identifier */ @@ -131,7 +131,7 @@ __blocking triton_ret_t vosd_txn_close( /** * Reads data from an object */ -__blocking triton_ret_t vosd_read( +__blocking triton_ret_t tosd_read( uint128_t oid, /**< object to operate on */ uint64_t fork, /**< object fork to operate on */ char** mem_offsets, /**< memory region pointers */ @@ -147,7 +147,7 @@ __blocking triton_ret_t vosd_read( /** * Removes an existing object */ -__blocking triton_ret_t vosd_remove( +__blocking triton_ret_t tosd_remove( uint128_t oid, /**< oid to remove */ uint64_t niid /**< non-idempotent identifier */ ); @@ -156,7 +156,7 @@ __blocking triton_ret_t vosd_remove( /** * Truncates */ -__blocking triton_ret_t vosd_truncate( +__blocking triton_ret_t tosd_truncate( uint128_t oid, /**< object to operate on */ uint64_t fork, /**< object fork to operate on */ int64_t size, /**< size to truncate to (maybe be larger than current size) */ @@ -168,7 +168,7 @@ __blocking triton_ret_t vosd_truncate( * Discards stale NIIDs * NOTE: this function fails silently (no error code) if NIID not found */ -__blocking triton_ret_t vosd_discard_niids( +__blocking triton_ret_t tosd_discard_niids( uint128_t* oid_array, /**< objects */ uint64_t* niid_array, /**< niids */ int count /**< number of objects and niids */ @@ -177,13 +177,13 @@ __blocking triton_ret_t vosd_discard_niids( /** * Checks to see if a given niid has been issued already */ -__blocking triton_ret_t vosd_check_niid(uint128_t oid, uint64_t niid, int op_type); +__blocking triton_ret_t tosd_check_niid(uint128_t oid, uint64_t niid, int op_type); /** * Performs a series of tests to determine which tuning parameters are * fastest */ -__blocking triton_ret_t vosd_autotune(void); +__blocking triton_ret_t tosd_autotune(void); #endif /* __VERSIONED_OSD_HAE__ */ diff --git a/code/src/versioned-osd/prototype/tests/module.mk.in b/code/src/versioned-osd/prototype/tests/module.mk.in deleted file mode 100644 index 3b6d38e..0000000 --- a/code/src/versioned-osd/prototype/tests/module.mk.in +++ /dev/null @@ -1,23 +0,0 @@ -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 -AETESTSRC += $(DIR)/vosd-multi-object.ae -AETESTSRC += $(DIR)/vosd-bench-concurrent.ae -AETESTSRC += $(DIR)/vosd-bench-create.ae -AETESTSRC += $(DIR)/workload-gen.ae -AESOP_HDR += $(DIR)/fake-resource.hae -AESOP_HDR += $(DIR)/faker.hae -AELIBSRC += $(DIR)/faker.ae -LIBSRC += $(DIR)/fake-resource.c - -MODLIBS_$(DIR) = -lpthread -ldb - -DEPLIBS += -ldb - -LIBS += -ldb hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. c7717172a4cdb3a5f904f521b1aaf5a52b6b17ba
by noreply＠mcs.anl.gov 20 Sep '11

20 Sep '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 c7717172a4cdb3a5f904f521b1aaf5a52b6b17ba (commit) from 4f2883347ed6f7f09e0ad9b6f3d6e43295f69c7b (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 c7717172a4cdb3a5f904f521b1aaf5a52b6b17ba Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Sep 20 09:20:51 2011 -0400 cond variable optimizations in file resource - just a short term fix until we have a unified thread pool ----------------------------------------------------------------------- Summary of changes: .../prototype/file-resource/file-resource.c | 23 +++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/file-resource/file-resource.c b/code/src/versioned-osd/prototype/file-resource/file-resource.c index 0b97aff..f34d9a6 100644 --- a/code/src/versioned-osd/prototype/file-resource/file-resource.c +++ b/code/src/versioned-osd/prototype/file-resource/file-resource.c @@ -29,6 +29,7 @@ #define FILE_DEFAULT_OPCACHE_SIZE 1024 static int thread_pool_size = 1; +static int num_threads_active = 1; static pthread_t* pool_tids; triton_cond_t pool_cond; static triton_mutex_t pool_mutex = TRITON_MUTEX_INITIALIZER; @@ -39,6 +40,7 @@ static ae_ops_t file_thread_oplist; static ae_ops_t file_thread_pool_oplist; static int pool_started = 0; static triton_mutex_t file_mutex = TRITON_MUTEX_INITIALIZER; +#define THREAD_WORK_THRESHOLD 4 static int triton_file_resource_id; static enum file_progress_mode meta_progress_mode = TRITON_FILE_PROG_NONE; @@ -126,7 +128,9 @@ static void* thread_pool_fn(void* foo) triton_mutex_lock(&pool_mutex); while(ae_ops_empty(&file_thread_pool_oplist) && pool_started) { + num_threads_active--; pthread_cond_wait(&pool_cond, &pool_mutex); + num_threads_active++; } if(!pool_started) { @@ -134,6 +138,17 @@ static void* thread_pool_fn(void* foo) pthread_exit(NULL); } op = ae_ops_dequeue(&file_thread_pool_oplist); + + if(ae_ops_count(&file_thread_pool_oplist)/num_threads_active > + THREAD_WORK_THRESHOLD && + num_threads_active < thread_pool_size) + { + /* there is enough work available that we could make use of + * another thread + */ + triton_cond_signal(&pool_cond); + } + triton_mutex_unlock(&pool_mutex); f_op = ae_op_entry(op, struct file_op, op); @@ -241,6 +256,7 @@ static triton_ret_t file_launch_op(struct ae_op *op, enum file_progress_mode mod if(!pool_started) { pool_started = 1; + num_threads_active = thread_pool_size; for(i=0; i<thread_pool_size; i++) { ret = pthread_create(&pool_tids[i], NULL, thread_pool_fn, NULL); @@ -248,7 +264,12 @@ static triton_ret_t file_launch_op(struct ae_op *op, enum file_progress_mode mod } } ae_ops_enqueue(op, &file_thread_pool_oplist); - pthread_cond_signal(&pool_cond); + assert(num_threads_active > -1); + if(num_threads_active == 0) + { + /* need to wake up at least one servicing thread */ + triton_cond_signal(&pool_cond); + } triton_mutex_unlock(&pool_mutex); break; default: hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 4f2883347ed6f7f09e0ad9b6f3d6e43295f69c7b
by noreply＠mcs.anl.gov 19 Sep '11

19 Sep '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 4f2883347ed6f7f09e0ad9b6f3d6e43295f69c7b (commit) via dc55f3a438902f2467c21b37e488ad4ecc7ad879 (commit) from 4b00d0dcd69b9eaedad4a38e2b8a2d430fb7b339 (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 4f2883347ed6f7f09e0ad9b6f3d6e43295f69c7b Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 19 16:12:16 2011 -0400 explanatory comment commit dc55f3a438902f2467c21b37e488ad4ecc7ad879 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 19 16:10:45 2011 -0400 remove old traffic cop retry handlers ----------------------------------------------------------------------- Summary of changes: code/src/common/traffic-cop.ae | 55 ---------------------------- code/src/common/traffic-cop.hae | 50 ------------------------- code/src/replicated-osd/replicated-osd.aer | 28 +++++++-------- 3 files changed, 13 insertions(+), 120 deletions(-) Diff of changes: diff --git a/code/src/common/traffic-cop.ae b/code/src/common/traffic-cop.ae index f82d344..7f1ff30 100644 --- a/code/src/common/traffic-cop.ae +++ b/code/src/common/traffic-cop.ae @@ -114,61 +114,6 @@ triton_ret_t traffic_cop_update( return TRITON_SUCCESS; } - -void __traffic_cop_remote_start_internal( - triton_addr_t addr, - int retry_count, - int* token) -{ - /* for now just increment a counter to get a "unique" token. When this - * function asctually does something besides serve as a placeholder then - * the token can be used to map to some internal accounting data - * structure. - */ - triton_mutex_lock(&current_token_mutex); - current_token++; - *token = current_token; - triton_mutex_unlock(&current_token_mutex); - - return; -} - -__blocking void __traffic_cop_remote_finish_internal( - triton_addr_t addr, - int retry_count, - int token, - triton_ret_t remote_return_code, - enum traffic_cop_action *action) -{ - - if(remote_return_code == TRITON_ERR_WRONG_SERVER || - remote_return_code == TRITON_ERR_OFFLINE) - { - if(retry_count > TC_MAX_REMOTE_RETRY) - { - *action = TRAFFIC_COP_FAIL; - return; - } - *action = TRAFFIC_COP_REMAP; - triton_timer(TC_REMOTE_REMAP_DELAY); - return; - } - if(remote_return_code == TRITON_ERR_AGAIN) - { - if(retry_count > TC_MAX_REMOTE_RETRY) - { - *action = TRAFFIC_COP_FAIL; - return; - } - *action = TRAFFIC_COP_RETRY; - triton_timer(TC_REMOTE_RETRY_DELAY); - return; - } - - *action = TRAFFIC_COP_DONE; - return; -} - uint64_t traffic_cop_rpc_register(void) { diff --git a/code/src/common/traffic-cop.hae b/code/src/common/traffic-cop.hae index b74ce31..0286198 100644 --- a/code/src/common/traffic-cop.hae +++ b/code/src/common/traffic-cop.hae @@ -11,8 +11,6 @@ enum traffic_cop_action { TRAFFIC_COP_RETRY, /* retry the operation */ TRAFFIC_COP_FAIL, /* give up on the operation */ - TRAFFIC_COP_REMAP, /* retry after recalculating target server */ - TRAFFIC_COP_DONE /* operation is complete */ }; /** @@ -27,54 +25,6 @@ __blocking triton_ret_t traffic_cop_query( enum traffic_cop_action *action); /** - * Called before invoking a remote_* function to let the traffic cop know - * that a remote RPC function is being invoked. The token is an output - * argument that must be provided to a matching traffic_cop_remote_finish() - * call after the remote function has finished. - * - * NOTE: no return code here; this is just advisory information to the traffic - * cop so its not critical if we fail. - * NOTE: we set the hint here in a macro rather than in a function, because - * we want the hint to exist in the context of the caller (so that it is - * also propagated to the rpc). - */ -#define traffic_cop_remote_start(__addr, __retry_count, __token) \ - do{\ - triton_ret_t __tret; \ - __traffic_cop_remote_start_internal(__addr, __retry_count, __token); \ - __tret = aesop_hints_put("triton.traffic_cop.token", sizeof(*__token), __token, 1); \ - if(__tret != TRITON_SUCCESS) \ - triton_error_destroy(__tret); \ - }while(0) - -void __traffic_cop_remote_start_internal( - triton_addr_t addr, - int retry_count, - int* token); - -/** - * Called after completion of a remote function to let the caller know if - * they should retry, remap and retry, or just stop with the error code that - * they got. The token should match the token provided by the - * remote_start() call. - */ -#define traffic_cop_remote_finish(__addr, __retry_count, __token, __remote_return_code, __action) \ - do{\ - triton_ret_t __tret; \ - __traffic_cop_remote_finish_internal(__addr, __retry_count, __token, __remote_return_code, __action); \ - __tret = aesop_hints_del("triton.traffic_cop.token"); \ - if(__tret != TRITON_SUCCESS) \ - triton_error_destroy(__tret); \ - }while(0) - -__blocking void __traffic_cop_remote_finish_internal( - triton_addr_t addr, - int retry_count, - int token, - triton_ret_t remote_return_code, - enum traffic_cop_action *action); - -/** * Called by the RPC server to query on whether or not retry the response or fail. This is * a blocking call because the traffic cop can schedule the completion of this call so that * a delay between attempts is handled internally. diff --git a/code/src/replicated-osd/replicated-osd.aer b/code/src/replicated-osd/replicated-osd.aer index 2261e78..ff38149 100644 --- a/code/src/replicated-osd/replicated-osd.aer +++ b/code/src/replicated-osd/replicated-osd.aer @@ -434,9 +434,7 @@ static __blocking triton_ret_t rosd_create_do_work( pprivate char oid_str[TRITON_UINT128_STRLEN]; pbranch { - int retry_count = 0; - int token; - enum traffic_cop_action action = TRAFFIC_COP_RETRY; + uint64_t niid; if(forward_flag) { @@ -445,9 +443,17 @@ static __blocking triton_ret_t rosd_create_do_work( "ROSD forwarding create of oid %s to %d'th server.\n", oid_str, my_position+1); - while(action == TRAFFIC_COP_RETRY || action == TRAFFIC_COP_REMAP) + remote_tret = TRITON_SUCCESS; + peer_addr = TRITON_ADDR_NULL; + + /* NOTE: we generate a new niid here just to use for + * tracking RPC retries. The forwarded create request is + * still using the old niid generated by the client + */ + niid = traffic_cop_rpc_register(); + do { - if(action == TRAFFIC_COP_REMAP) + if(traffic_cop_rpc_should_remap(niid, peer_addr, remote_tret)) { tret = get_placement_info( oid, replication_factor, &my_new_position, @@ -472,18 +478,10 @@ static __blocking triton_ret_t rosd_create_do_work( break; } } - - traffic_cop_remote_start( - peer_addr, retry_count, &token); - remote_tret = remote_rosd_s2s_create( rctx, peer_addr, &req, NULL); - - traffic_cop_remote_finish( - peer_addr, retry_count, token, remote_tret, &action); - - retry_count++; - } + } while(traffic_cop_rpc_should_retry(niid, peer_addr, remote_tret)); + traffic_cop_rpc_unregister(niid); aer_destroy_struct_rosd_s2s_create_req(&req); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 4b00d0dcd69b9eaedad4a38e2b8a2d430fb7b339
by noreply＠mcs.anl.gov 19 Sep '11

19 Sep '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 4b00d0dcd69b9eaedad4a38e2b8a2d430fb7b339 (commit) from f1e81c7f56a747bd80ed4c1332c3ca94d9fa5b6c (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 4b00d0dcd69b9eaedad4a38e2b8a2d430fb7b339 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 19 15:29:57 2011 -0400 remove old niid calculation and hint ----------------------------------------------------------------------- Summary of changes: code/src/remote/retry-method.ae | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) Diff of changes: diff --git a/code/src/remote/retry-method.ae b/code/src/remote/retry-method.ae index 18991b7..1158c21 100644 --- a/code/src/remote/retry-method.ae +++ b/code/src/remote/retry-method.ae @@ -350,7 +350,6 @@ static __blocking triton_ret_t retry_service_request( aer_remote_ctx_t ctx, triton_addr_t from, aer_message_t *request) { triton_string_t nodestr; - uint64_t niid; uint32_t h1 = 0, h2 = 0; triton_ret_t ret, eret; aer_message_t response; @@ -359,7 +358,6 @@ static __blocking triton_ret_t retry_service_request( char **buffer_array; uint32_t *sizes; int count; - struct retry_request_header reqh_for_niid; triton_interval_t interval; struct aer_service_ctx *service_ctx; triton_ret_t service_error; @@ -408,25 +406,6 @@ static __blocking triton_ret_t retry_service_request( triton_string_destroy(&nodestr); } - /* generate niid hash based on client id and request header */ - bj_hashlittle2(&from, sizeof(from), &h1, &h2); - /* use results from first hash as input to second hash */ - /* NOTE: we copy the request header here so that we can clear the retry - * count (therefore excluding it from the hash) - */ - reqh_for_niid = *reqh; - reqh_for_niid.retry = 0; - bj_hashlittle2(&reqh_for_niid, sizeof(reqh_for_niid), &h1, &h2); - niid = h1 + (((uint64_t)h2)<<32); - - /* store the niid (non-idempotent id) in a hint so the servicing function - * can retreive it if they need it */ - ret = aesop_hints_put("triton.remote.niid", sizeof(niid), &niid, 1); - if(ret != TRITON_SUCCESS) - { - return ret; - } - /* set response message type to UNDEF so that we can check to see if it was * initialized by servicing code */ @@ -846,9 +825,6 @@ triton_ret_t retry_method_init(void) ret = ae_hints_type_register("triton.remote.retry_count", 0, NULL); if(ret != TRITON_SUCCESS) return ret; - ret = ae_hints_type_register("triton.remote.niid", 0, NULL); - if(ret != TRITON_SUCCESS) return ret; - return aer_remote_ctx_register(&retry_context); } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f1e81c7f56a747bd80ed4c1332c3ca94d9fa5b6c
by noreply＠mcs.anl.gov 19 Sep '11

19 Sep '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 f1e81c7f56a747bd80ed4c1332c3ca94d9fa5b6c (commit) from b20cf4e36435afc5b6fe3549e9be858045f2ac86 (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 f1e81c7f56a747bd80ed4c1332c3ca94d9fa5b6c Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Sep 19 15:18:29 2011 -0400 fix bug in vosd dump routine - re: #156 ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 4 ++-- 1 files changed, 2 insertions(+), 2 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 56c1619..07fc599 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -2099,7 +2099,7 @@ __blocking triton_ret_t vosd_dump(void) 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) + while(tret == TRITON_SUCCESS && triton_cmp_uint128(mvk.oid, vk)) { c_get_flag = DB_NEXT; printf("%llu ", llu(mvk.version)); @@ -2107,7 +2107,7 @@ __blocking triton_ret_t vosd_dump(void) &missing_ver_key, &missing_ver_value, c_get_flag); } printf("\n"); - if(tret != TRITON_ERR_NOENT) + if(tret != TRITON_ERR_NOENT && tret != TRITON_SUCCESS) { printf(" *** INCOMPLETE: error getting missing versions.\n"); tret_tmp = bdb_cursor_close(ver_dbcp); hooks/post-receive -- Triton Repository

1 0