From d0274c3304eedeb87e6d1fcf68529ab258d8d94f Mon Sep 17 00:00:00 2001 From: no author Date: Mon, 11 Jun 2007 21:36:57 +0000 Subject: [PATCH] Renamed 'lladd' directories and python module to 'stasis' --- benchmarks/Makefile.am | 2 +- benchmarks/arrayListSet.c | 2 +- benchmarks/lhtableThreaded.c | 2 +- benchmarks/linearHashNTA.c | 2 +- benchmarks/linearHashNTAMultiReader.c | 2 +- benchmarks/linearHashNTAThreaded.c | 2 +- benchmarks/linearHashNTAWriteRequests.c | 2 +- benchmarks/linkedListNTA.c | 2 +- benchmarks/logicalHash.c | 2 +- benchmarks/logicalMultThreaded.c | 2 +- benchmarks/logicalMultiReaders.c | 2 +- benchmarks/naiveHash.c | 2 +- benchmarks/naiveMultiThreaded.c | 2 +- benchmarks/pageOrientedListNTA.c | 2 +- benchmarks/rawSet.c | 2 +- benchmarks/readLogicalHash.c | 2 +- benchmarks/transitiveClosure.c | 8 +++---- benchmarks/zeroCopy.c | 4 ++-- configure.in | 8 +++---- examples/Makefile.am | 2 +- examples/ex1.c | 2 +- examples/ex2.c | 2 +- libdfa/smash.h | 2 +- libdfa/statemachine.h | 4 ++-- src/Makefile.am | 2 +- src/apps/eric/test.c | 2 +- src/apps/readOnlyHash/Makefile.am | 2 +- src/apps/readOnlyHash/buildTable.c | 4 ++-- src/apps/readOnlyHash/queryTable.c | 2 +- src/libdfa/messages.c | 2 +- src/libdfa/networksetup.c | 2 +- src/pobj/pobj.c | 2 +- src/{lladd => stasis}/.cvsignore | 0 src/{lladd => stasis}/Makefile.am | 0 src/{lladd => stasis}/allocationPolicy.c | 8 +++---- src/{lladd => stasis}/arrayCollection.c | 2 +- src/{lladd => stasis}/blobManager.c | 2 +- src/{lladd => stasis}/blobManager.h | 2 +- src/{lladd => stasis}/bufferManager.c | 18 +++++++-------- .../bufferManager/bufferHash.c | 14 ++++++------ .../bufferManager/bufferHash.h | 0 .../bufferManager/pageArray.c | 9 ++++---- .../bufferManager/pageArray.h | 0 src/{lladd => stasis}/bufferPool.c | 4 ++-- src/{lladd => stasis}/common.c | 3 +-- src/{lladd => stasis}/compensations.c | 2 +- src/{lladd => stasis}/consumer.c | 2 +- src/{lladd => stasis}/crc32.c | 2 +- src/{lladd => stasis}/doubleLinkedList.c | 2 +- src/{lladd => stasis}/fifo.c | 4 ++-- src/{lladd => stasis}/graph.c | 4 ++-- src/{lladd => stasis}/hash.c | 2 +- src/{lladd => stasis}/io.c | 0 src/{lladd => stasis}/io.h | 2 +- src/{lladd => stasis}/io/debug.c | 2 +- src/{lladd => stasis}/io/file.c | 4 ++-- src/{lladd => stasis}/io/memory.c | 2 +- src/{lladd => stasis}/io/non_blocking.c | 4 ++-- src/{lladd => stasis}/io/rangeTracker.c | 5 ++--- src/{lladd => stasis}/iterator.c | 6 ++--- src/{lladd => stasis}/latches.h | 4 ++-- src/{lladd => stasis}/lhtable.c | 4 ++-- src/{lladd => stasis}/linkedlist.c | 2 +- src/{lladd => stasis}/linkedlist.h | 2 +- src/{lladd => stasis}/lockManager.c | 7 +++--- src/{lladd => stasis}/logger/Makefile.am-old | 0 src/{lladd => stasis}/logger/inMemoryLog.c | 0 src/{lladd => stasis}/logger/inMemoryLog.h | 2 +- src/{lladd => stasis}/logger/logEntry.c | 7 +++--- src/{lladd => stasis}/logger/logHandle.c | 0 src/{lladd => stasis}/logger/logHandle.h | 2 +- src/{lladd => stasis}/logger/logMemory.c | 2 +- src/{lladd => stasis}/logger/logMemory.h | 10 ++++----- src/{lladd => stasis}/logger/logWriter.c | 7 +++--- src/{lladd => stasis}/logger/logWriter.h | 4 ++-- src/{lladd => stasis}/logger/logger2.c | 4 ++-- src/{lladd => stasis}/multiplexer.c | 6 ++--- src/{lladd => stasis}/operations.c | 8 +++---- .../operations/Makefile.am-old | 0 src/{lladd => stasis}/operations/alloc.c | 10 ++++----- src/{lladd => stasis}/operations/arrayList.c | 10 ++++----- src/{lladd => stasis}/operations/bTree.c | 10 ++++----- src/{lladd => stasis}/operations/decrement.c | 2 +- src/{lladd => stasis}/operations/increment.c | 2 +- src/{lladd => stasis}/operations/instantSet.c | 2 +- src/{lladd => stasis}/operations/linearHash.c | 6 ++--- .../operations/linearHashNTA.c | 10 ++++----- .../operations/linkedListNTA.c | 4 ++-- .../operations/naiveLinearHash.c | 6 ++--- .../operations/nestedTopActions.c | 8 +++---- src/{lladd => stasis}/operations/noop.c | 2 +- .../operations/pageOperations.c | 2 +- .../operations/pageOrientedListNTA.c | 2 +- src/{lladd => stasis}/operations/prepare.c | 4 ++-- src/{lladd => stasis}/operations/regions.c | 2 +- src/{lladd => stasis}/operations/set.c | 2 +- src/{lladd => stasis}/page.c | 14 ++++++------ src/{lladd => stasis}/page.h | 4 ++-- src/{lladd => stasis}/page/fixed.c | 2 +- src/{lladd => stasis}/page/fixed.h | 0 src/{lladd => stasis}/page/header.c | 0 src/{lladd => stasis}/page/header.h | 0 src/{lladd => stasis}/page/indirect.c | 2 +- src/{lladd => stasis}/page/indirect.h | 2 +- src/{lladd => stasis}/page/raw.c | 4 ++-- src/{lladd => stasis}/page/raw.h | 2 +- src/{lladd => stasis}/page/slotted.c | 2 +- src/{lladd => stasis}/page/slotted.h | 0 src/{lladd => stasis}/pageCache.c | 8 +++---- src/{lladd => stasis}/pageFile.c | 10 ++++----- src/{lladd => stasis}/pageFile.h | 0 src/{lladd => stasis}/pageHandle.c | 10 ++++----- src/{lladd => stasis}/recovery2.c | 10 ++++----- src/{lladd => stasis}/redblack.c | 3 +-- src/{lladd => stasis}/replacementPolicy.c | 0 src/{lladd => stasis}/replacementPolicy/lru.c | 9 ++++---- .../replacementPolicy/lruFast.c | 6 ++--- src/{lladd => stasis}/ringbuffer.c | 2 +- src/{lladd => stasis}/stats.c | 2 +- src/{lladd => stasis}/transactional2.c | 22 +++++++++---------- src/{lladd => stasis}/truncation.c | 4 ++-- {lladd => stasis}/.cvsignore | 0 {lladd => stasis}/Makefile.am | 0 {lladd => stasis}/allocationPolicy.h | 0 {lladd => stasis}/arrayCollection.h | 0 {lladd => stasis}/bufferManager.h | 4 ++-- {lladd => stasis}/bufferPool.h | 0 {lladd => stasis}/common.h | 0 {lladd => stasis}/compensations.h | 3 +-- {lladd => stasis}/config.h.in | 0 {lladd => stasis}/constants.h | 2 +- {lladd => stasis}/consumer.h | 3 +-- {lladd => stasis}/crc32.h | 0 {lladd => stasis}/doubleLinkedList.h | 0 {lladd => stasis}/fifo.h | 5 ++--- {lladd => stasis}/graph.h | 5 ++--- {lladd => stasis}/hash.h | 2 +- {lladd => stasis}/io/handle.h | 2 +- {lladd => stasis}/io/rangeTracker.h | 0 {lladd => stasis}/iterator.h | 2 +- {lladd => stasis}/lhtable.h | 0 {lladd => stasis}/lockManager.h | 2 +- {lladd => stasis}/logger/logEntry.h | 2 +- {lladd => stasis}/logger/logger2.h | 2 +- {lladd => stasis}/multiplexer.h | 0 {lladd => stasis}/operations.h | 12 +++++----- {lladd => stasis}/operations/alloc.h | 0 {lladd => stasis}/operations/arrayList.h | 0 {lladd => stasis}/operations/bTree.h | 0 {lladd => stasis}/operations/decrement.h | 0 {lladd => stasis}/operations/increment.h | 0 {lladd => stasis}/operations/instantSet.h | 0 {lladd => stasis}/operations/linearHash.h | 0 {lladd => stasis}/operations/linearHashNTA.h | 3 +-- {lladd => stasis}/operations/linkedListNTA.h | 0 {lladd => stasis}/operations/lladdhash.h | 0 .../operations/naiveLinearHash.h | 0 .../operations/nestedTopActions.h | 0 {lladd => stasis}/operations/noop.h | 0 {lladd => stasis}/operations/pageOperations.h | 0 .../operations/pageOrientedListNTA.h | 0 {lladd => stasis}/operations/prepare.h | 0 {lladd => stasis}/operations/regions.h | 0 {lladd => stasis}/operations/set.h | 0 {lladd => stasis}/pageCache.h | 2 +- {lladd => stasis}/pageHandle.h | 4 ++-- {lladd => stasis}/recovery.h | 0 {lladd => stasis}/redblack.h | 0 {lladd => stasis}/replacementPolicy.h | 3 +-- {lladd => stasis}/ringbuffer.h | 2 +- {lladd => stasis}/stamp-h.in | 0 {lladd => stasis}/stamp-h1 | 0 {lladd => stasis}/stats.h | 0 {lladd => stasis}/transactional.h | 0 {lladd => stasis}/truncation.h | 2 +- test/2pc/Makefile.am | 3 +-- test/Makefile.am | 2 +- test/cht/Makefile.am | 2 +- test/dfa/Makefile.am | 2 +- test/monotree/Makefile.am | 2 +- test/pobj/Makefile.am | 3 +-- test/{lladd => stasis}/.cvsignore | 0 test/{lladd => stasis}/Makefile.am | 4 +--- .../check_allocationPolicy.c | 2 +- test/{lladd => stasis}/check_bTree.c | 10 ++++----- test/{lladd => stasis}/check_blobRecovery.c | 8 +++---- test/{lladd => stasis}/check_bufferManager.c | 8 +++---- test/{lladd => stasis}/check_compensations.c | 2 +- test/{lladd => stasis}/check_errorHandling.c | 4 ++-- test/{lladd => stasis}/check_header.c | 2 +- test/{lladd => stasis}/check_indirect.c | 6 ++--- test/{lladd => stasis}/check_io.c | 2 +- test/{lladd => stasis}/check_iterator.c | 2 +- test/{lladd => stasis}/check_lht.c | 0 test/{lladd => stasis}/check_lhtable.c | 2 +- test/{lladd => stasis}/check_linearHash.c | 4 ++-- test/{lladd => stasis}/check_linearHashNTA.c | 2 +- test/{lladd => stasis}/check_linkedListNTA.c | 2 +- test/{lladd => stasis}/check_lockManager.c | 6 ++--- test/{lladd => stasis}/check_logEntry.c | 2 +- test/{lladd => stasis}/check_logWriter.c | 12 +++++----- .../check_logicalLinearHash.c | 4 ++-- test/{lladd => stasis}/check_multiplexer.c | 7 +++--- test/{lladd => stasis}/check_operations.c | 10 ++++----- test/{lladd => stasis}/check_page.c | 12 +++++----- test/{lladd => stasis}/check_pageOperations.c | 14 ++++++------ .../check_pageOrientedList.c | 2 +- test/{lladd => stasis}/check_rangeTracker.c | 4 ++-- test/{lladd => stasis}/check_recovery.c | 8 +++---- test/{lladd => stasis}/check_regions.c | 6 ++--- .../check_replacementPolicy.c | 6 ++--- test/{lladd => stasis}/check_ringbuffer.c | 2 +- test/{lladd => stasis}/check_transactional2.c | 6 ++--- utilities/Makefile.am | 2 +- utilities/logfile_dump.c | 4 ++-- utilities/run_recovery.c | 3 +-- utilities/swig/Makefile.am | 16 +++++++------- utilities/swig/ex1.py | 22 +++++++++---------- utilities/swig/lladd.i | 6 ++--- utilities/truncate_log.c | 5 ++--- 220 files changed, 367 insertions(+), 388 deletions(-) rename src/{lladd => stasis}/.cvsignore (100%) rename src/{lladd => stasis}/Makefile.am (100%) rename src/{lladd => stasis}/allocationPolicy.c (98%) rename src/{lladd => stasis}/arrayCollection.c (98%) rename src/{lladd => stasis}/blobManager.c (98%) rename src/{lladd => stasis}/blobManager.h (98%) rename src/{lladd => stasis}/bufferManager.c (98%) rename src/{lladd => stasis}/bufferManager/bufferHash.c (97%) rename src/{lladd => stasis}/bufferManager/bufferHash.h (100%) rename src/{lladd => stasis}/bufferManager/pageArray.c (92%) rename src/{lladd => stasis}/bufferManager/pageArray.h (100%) rename src/{lladd => stasis}/bufferPool.c (98%) rename src/{lladd => stasis}/common.c (99%) rename src/{lladd => stasis}/compensations.c (95%) rename src/{lladd => stasis}/consumer.c (97%) rename src/{lladd => stasis}/crc32.c (96%) rename src/{lladd => stasis}/doubleLinkedList.c (98%) rename src/{lladd => stasis}/fifo.c (99%) rename src/{lladd => stasis}/graph.c (98%) rename src/{lladd => stasis}/hash.c (99%) rename src/{lladd => stasis}/io.c (100%) rename src/{lladd => stasis}/io.h (92%) rename src/{lladd => stasis}/io/debug.c (99%) rename src/{lladd => stasis}/io/file.c (99%) rename src/{lladd => stasis}/io/memory.c (99%) rename src/{lladd => stasis}/io/non_blocking.c (99%) rename src/{lladd => stasis}/io/rangeTracker.c (99%) rename src/{lladd => stasis}/iterator.c (96%) rename src/{lladd => stasis}/latches.h (98%) rename src/{lladd => stasis}/lhtable.c (99%) rename src/{lladd => stasis}/linkedlist.c (99%) rename src/{lladd => stasis}/linkedlist.h (99%) rename src/{lladd => stasis}/lockManager.c (99%) rename src/{lladd => stasis}/logger/Makefile.am-old (100%) rename src/{lladd => stasis}/logger/inMemoryLog.c (100%) rename src/{lladd => stasis}/logger/inMemoryLog.h (92%) rename src/{lladd => stasis}/logger/logEntry.c (97%) rename src/{lladd => stasis}/logger/logHandle.c (100%) rename src/{lladd => stasis}/logger/logHandle.h (99%) rename src/{lladd => stasis}/logger/logMemory.c (99%) rename src/{lladd => stasis}/logger/logMemory.h (86%) rename src/{lladd => stasis}/logger/logWriter.c (99%) rename src/{lladd => stasis}/logger/logWriter.h (99%) rename src/{lladd => stasis}/logger/logger2.c (99%) rename src/{lladd => stasis}/multiplexer.c (98%) rename src/{lladd => stasis}/operations.c (98%) rename src/{lladd => stasis}/operations/Makefile.am-old (100%) rename src/{lladd => stasis}/operations/alloc.c (98%) rename src/{lladd => stasis}/operations/arrayList.c (97%) rename src/{lladd => stasis}/operations/bTree.c (59%) rename src/{lladd => stasis}/operations/decrement.c (99%) rename src/{lladd => stasis}/operations/increment.c (99%) rename src/{lladd => stasis}/operations/instantSet.c (99%) rename src/{lladd => stasis}/operations/linearHash.c (99%) rename src/{lladd => stasis}/operations/linearHashNTA.c (99%) rename src/{lladd => stasis}/operations/linkedListNTA.c (99%) rename src/{lladd => stasis}/operations/naiveLinearHash.c (99%) rename src/{lladd => stasis}/operations/nestedTopActions.c (97%) rename src/{lladd => stasis}/operations/noop.c (99%) rename src/{lladd => stasis}/operations/pageOperations.c (98%) rename src/{lladd => stasis}/operations/pageOrientedListNTA.c (99%) rename src/{lladd => stasis}/operations/prepare.c (98%) rename src/{lladd => stasis}/operations/regions.c (99%) rename src/{lladd => stasis}/operations/set.c (99%) rename src/{lladd => stasis}/page.c (97%) rename src/{lladd => stasis}/page.h (99%) rename src/{lladd => stasis}/page/fixed.c (99%) rename src/{lladd => stasis}/page/fixed.h (100%) rename src/{lladd => stasis}/page/header.c (100%) rename src/{lladd => stasis}/page/header.h (100%) rename src/{lladd => stasis}/page/indirect.c (99%) rename src/{lladd => stasis}/page/indirect.h (98%) rename src/{lladd => stasis}/page/raw.c (93%) rename src/{lladd => stasis}/page/raw.h (99%) rename src/{lladd => stasis}/page/slotted.c (99%) rename src/{lladd => stasis}/page/slotted.h (100%) rename src/{lladd => stasis}/pageCache.c (97%) rename src/{lladd => stasis}/pageFile.c (96%) rename src/{lladd => stasis}/pageFile.h (100%) rename src/{lladd => stasis}/pageHandle.c (91%) rename src/{lladd => stasis}/recovery2.c (98%) rename src/{lladd => stasis}/redblack.c (99%) rename src/{lladd => stasis}/replacementPolicy.c (100%) rename src/{lladd => stasis}/replacementPolicy/lru.c (94%) rename src/{lladd => stasis}/replacementPolicy/lruFast.c (95%) rename src/{lladd => stasis}/ringbuffer.c (99%) rename src/{lladd => stasis}/stats.c (98%) rename src/{lladd => stasis}/transactional2.c (97%) rename src/{lladd => stasis}/truncation.c (98%) rename {lladd => stasis}/.cvsignore (100%) rename {lladd => stasis}/Makefile.am (100%) rename {lladd => stasis}/allocationPolicy.h (100%) rename {lladd => stasis}/arrayCollection.h (100%) rename {lladd => stasis}/bufferManager.h (98%) rename {lladd => stasis}/bufferPool.h (100%) rename {lladd => stasis}/common.h (100%) rename {lladd => stasis}/compensations.h (99%) rename {lladd => stasis}/config.h.in (100%) rename {lladd => stasis}/constants.h (99%) rename {lladd => stasis}/consumer.h (97%) rename {lladd => stasis}/crc32.h (100%) rename {lladd => stasis}/doubleLinkedList.h (100%) rename {lladd => stasis}/fifo.h (96%) rename {lladd => stasis}/graph.h (91%) rename {lladd => stasis}/hash.h (96%) rename {lladd => stasis}/io/handle.h (99%) rename {lladd => stasis}/io/rangeTracker.h (100%) rename {lladd => stasis}/iterator.h (98%) rename {lladd => stasis}/lhtable.h (100%) rename {lladd => stasis}/lockManager.h (96%) rename {lladd => stasis}/logger/logEntry.h (99%) rename {lladd => stasis}/logger/logger2.h (99%) rename {lladd => stasis}/multiplexer.h (100%) rename {lladd => stasis}/operations.h (97%) rename {lladd => stasis}/operations/alloc.h (100%) rename {lladd => stasis}/operations/arrayList.h (100%) rename {lladd => stasis}/operations/bTree.h (100%) rename {lladd => stasis}/operations/decrement.h (100%) rename {lladd => stasis}/operations/increment.h (100%) rename {lladd => stasis}/operations/instantSet.h (100%) rename {lladd => stasis}/operations/linearHash.h (100%) rename {lladd => stasis}/operations/linearHashNTA.h (99%) rename {lladd => stasis}/operations/linkedListNTA.h (100%) rename {lladd => stasis}/operations/lladdhash.h (100%) rename {lladd => stasis}/operations/naiveLinearHash.h (100%) rename {lladd => stasis}/operations/nestedTopActions.h (100%) rename {lladd => stasis}/operations/noop.h (100%) rename {lladd => stasis}/operations/pageOperations.h (100%) rename {lladd => stasis}/operations/pageOrientedListNTA.h (100%) rename {lladd => stasis}/operations/prepare.h (100%) rename {lladd => stasis}/operations/regions.h (100%) rename {lladd => stasis}/operations/set.h (100%) rename {lladd => stasis}/pageCache.h (97%) rename {lladd => stasis}/pageHandle.h (96%) rename {lladd => stasis}/recovery.h (100%) rename {lladd => stasis}/redblack.h (100%) rename {lladd => stasis}/replacementPolicy.h (97%) rename {lladd => stasis}/ringbuffer.h (92%) rename {lladd => stasis}/stamp-h.in (100%) rename {lladd => stasis}/stamp-h1 (100%) rename {lladd => stasis}/stats.h (100%) rename {lladd => stasis}/transactional.h (100%) rename {lladd => stasis}/truncation.h (98%) rename test/{lladd => stasis}/.cvsignore (100%) rename test/{lladd => stasis}/Makefile.am (93%) rename test/{lladd => stasis}/check_allocationPolicy.c (99%) rename test/{lladd => stasis}/check_bTree.c (97%) rename test/{lladd => stasis}/check_blobRecovery.c (98%) rename test/{lladd => stasis}/check_bufferManager.c (98%) rename test/{lladd => stasis}/check_compensations.c (99%) rename test/{lladd => stasis}/check_errorHandling.c (94%) rename test/{lladd => stasis}/check_header.c (99%) rename test/{lladd => stasis}/check_indirect.c (98%) rename test/{lladd => stasis}/check_io.c (99%) rename test/{lladd => stasis}/check_iterator.c (99%) rename test/{lladd => stasis}/check_lht.c (100%) rename test/{lladd => stasis}/check_lhtable.c (99%) rename test/{lladd => stasis}/check_linearHash.c (99%) rename test/{lladd => stasis}/check_linearHashNTA.c (99%) rename test/{lladd => stasis}/check_linkedListNTA.c (99%) rename test/{lladd => stasis}/check_lockManager.c (97%) rename test/{lladd => stasis}/check_logEntry.c (99%) rename test/{lladd => stasis}/check_logWriter.c (98%) rename test/{lladd => stasis}/check_logicalLinearHash.c (99%) rename test/{lladd => stasis}/check_multiplexer.c (98%) rename test/{lladd => stasis}/check_operations.c (98%) rename test/{lladd => stasis}/check_page.c (98%) rename test/{lladd => stasis}/check_pageOperations.c (95%) rename test/{lladd => stasis}/check_pageOrientedList.c (99%) rename test/{lladd => stasis}/check_rangeTracker.c (99%) rename test/{lladd => stasis}/check_recovery.c (98%) rename test/{lladd => stasis}/check_regions.c (98%) rename test/{lladd => stasis}/check_replacementPolicy.c (96%) rename test/{lladd => stasis}/check_ringbuffer.c (99%) rename test/{lladd => stasis}/check_transactional2.c (99%) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 1b7ecc1..440502b 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -1,4 +1,4 @@ -LDADD=$(top_builddir)/src/lladd/liblladd.a \ +LDADD=$(top_builddir)/src/stasis/liblladd.a \ $(top_builddir)/src/libdfa/librw.a #$(top_builddir)/src/2pc/lib2pc.a $(top_builddir)/src/libdfa/libdfa.a diff --git a/benchmarks/arrayListSet.c b/benchmarks/arrayListSet.c index 27700b2..fee1824 100644 --- a/benchmarks/arrayListSet.c +++ b/benchmarks/arrayListSet.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include int main(int argc, char** argv) { diff --git a/benchmarks/lhtableThreaded.c b/benchmarks/lhtableThreaded.c index ad57214..4c926c0 100644 --- a/benchmarks/lhtableThreaded.c +++ b/benchmarks/lhtableThreaded.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include int entries; int thread_count; diff --git a/benchmarks/linearHashNTA.c b/benchmarks/linearHashNTA.c index 03d7f30..a324d47 100644 --- a/benchmarks/linearHashNTA.c +++ b/benchmarks/linearHashNTA.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/benchmarks/linearHashNTAMultiReader.c b/benchmarks/linearHashNTAMultiReader.c index c5a0727..8e9a38f 100644 --- a/benchmarks/linearHashNTAMultiReader.c +++ b/benchmarks/linearHashNTAMultiReader.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/benchmarks/linearHashNTAThreaded.c b/benchmarks/linearHashNTAThreaded.c index d4b5c36..f8d535c 100644 --- a/benchmarks/linearHashNTAThreaded.c +++ b/benchmarks/linearHashNTAThreaded.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/benchmarks/linearHashNTAWriteRequests.c b/benchmarks/linearHashNTAWriteRequests.c index 78aad6c..23f9ea1 100644 --- a/benchmarks/linearHashNTAWriteRequests.c +++ b/benchmarks/linearHashNTAWriteRequests.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include diff --git a/benchmarks/linkedListNTA.c b/benchmarks/linkedListNTA.c index aaa3181..9b98668 100644 --- a/benchmarks/linkedListNTA.c +++ b/benchmarks/linkedListNTA.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/benchmarks/logicalHash.c b/benchmarks/logicalHash.c index 36a1380..1e01dc8 100644 --- a/benchmarks/logicalHash.c +++ b/benchmarks/logicalHash.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/benchmarks/logicalMultThreaded.c b/benchmarks/logicalMultThreaded.c index 79dacfd..32c8074 100644 --- a/benchmarks/logicalMultThreaded.c +++ b/benchmarks/logicalMultThreaded.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include //static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/benchmarks/logicalMultiReaders.c b/benchmarks/logicalMultiReaders.c index 44a8189..31c9503 100644 --- a/benchmarks/logicalMultiReaders.c +++ b/benchmarks/logicalMultiReaders.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include //static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/benchmarks/naiveHash.c b/benchmarks/naiveHash.c index 88dc532..b075bc6 100644 --- a/benchmarks/naiveHash.c +++ b/benchmarks/naiveHash.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include int main(int argc, char** argv) { diff --git a/benchmarks/naiveMultiThreaded.c b/benchmarks/naiveMultiThreaded.c index 4e70923..bbed852 100644 --- a/benchmarks/naiveMultiThreaded.c +++ b/benchmarks/naiveMultiThreaded.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/benchmarks/pageOrientedListNTA.c b/benchmarks/pageOrientedListNTA.c index 1675d43..a1166e7 100644 --- a/benchmarks/pageOrientedListNTA.c +++ b/benchmarks/pageOrientedListNTA.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include //#define CHECK_RESULTS 1 diff --git a/benchmarks/rawSet.c b/benchmarks/rawSet.c index 4665c36..139c583 100644 --- a/benchmarks/rawSet.c +++ b/benchmarks/rawSet.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include int main(int argc, char** argv) { diff --git a/benchmarks/readLogicalHash.c b/benchmarks/readLogicalHash.c index da0f4b2..c8c7c85 100644 --- a/benchmarks/readLogicalHash.c +++ b/benchmarks/readLogicalHash.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include diff --git a/benchmarks/transitiveClosure.c b/benchmarks/transitiveClosure.c index 6e08794..b593784 100644 --- a/benchmarks/transitiveClosure.c +++ b/benchmarks/transitiveClosure.c @@ -1,7 +1,7 @@ -#include -#include -#include -#include "../src/lladd/logger/logMemory.h" +#include +#include +#include +#include "../src/stasis/logger/logMemory.h" #include #include #include diff --git a/benchmarks/zeroCopy.c b/benchmarks/zeroCopy.c index ff8d900..4288c03 100644 --- a/benchmarks/zeroCopy.c +++ b/benchmarks/zeroCopy.c @@ -1,9 +1,9 @@ #include #include #include -#include +#include #include -#include "../src/lladd/page/raw.h" +#include "../src/stasis/page/raw.h" #include int main(int argc, char** argv) { diff --git a/configure.in b/configure.in index b838a8c..d06521f 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(LLADD, 0.1, sears@cs.berkeley.edu) +AC_INIT(Stasis, 0.1, sears@cs.berkeley.edu) AM_INIT_AUTOMAKE(hello,0.1) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) @@ -219,7 +219,7 @@ AC_CONFIG_FILES([Makefile benchmarks/Makefile benchmarks/berkeleyDB/Makefile libdfa/Makefile - lladd/Makefile + stasis/Makefile src/2pc/Makefile src/Makefile src/apps/Makefile @@ -227,7 +227,7 @@ AC_CONFIG_FILES([Makefile src/apps/readOnlyHash/Makefile src/apps/cyrus/Makefile src/libdfa/Makefile - src/lladd/Makefile + src/stasis/Makefile src/pobj/Makefile src/timing/Makefile test/2pc/Makefile @@ -235,7 +235,7 @@ AC_CONFIG_FILES([Makefile test/cht/Makefile test/dfa/Makefile test/lladd-old/Makefile - test/lladd/Makefile + test/stasis/Makefile test/messages/Makefile test/monotree/Makefile test/pobj/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index cf314aa..fe9fdee 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -LDADD=$(top_builddir)/src/lladd/liblladd.a \ +LDADD=$(top_builddir)/src/stasis/liblladd.a \ $(top_builddir)/src/libdfa/librw.a bin_PROGRAMS=ex1 ex2 AM_CFLAGS=${GLOBAL_CFLAGS} diff --git a/examples/ex1.c b/examples/ex1.c index 52aaf22..717c1f3 100644 --- a/examples/ex1.c +++ b/examples/ex1.c @@ -1,4 +1,4 @@ -#include +#include int main (int argc, char ** argv) { diff --git a/examples/ex2.c b/examples/ex2.c index e898395..f2390c1 100644 --- a/examples/ex2.c +++ b/examples/ex2.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/libdfa/smash.h b/libdfa/smash.h index 9af893f..c0b3e9b 100644 --- a/libdfa/smash.h +++ b/libdfa/smash.h @@ -42,7 +42,7 @@ terms specified in this license. #include //#include -#include +#include #include /** State machine hash library. */ diff --git a/libdfa/statemachine.h b/libdfa/statemachine.h index f3f5e86..4a9e8cf 100644 --- a/libdfa/statemachine.h +++ b/libdfa/statemachine.h @@ -45,9 +45,9 @@ terms specified in this license. #define _STATEMACHINE_H #include -#include +#include #include -#include "../src/lladd/page.h" +#include "../src/stasis/page.h" #include #include diff --git a/src/Makefile.am b/src/Makefile.am index de87e93..8e6f9d8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = lladd libdfa 2pc timing +SUBDIRS = stasis libdfa 2pc timing if BUILD_POBJ SUBDIRS += pobj diff --git a/src/apps/eric/test.c b/src/apps/eric/test.c index 0accef3..fbe74f3 100644 --- a/src/apps/eric/test.c +++ b/src/apps/eric/test.c @@ -1,6 +1,6 @@ #include #include -#include +#include /** diff --git a/src/apps/readOnlyHash/Makefile.am b/src/apps/readOnlyHash/Makefile.am index 55aa198..a6addb1 100644 --- a/src/apps/readOnlyHash/Makefile.am +++ b/src/apps/readOnlyHash/Makefile.am @@ -1,3 +1,3 @@ -LDADD=$(top_builddir)/src/lladd/liblladd.a $(top_builddir)/src/libdfa/librw.a +LDADD=$(top_builddir)/src/stasis/liblladd.a $(top_builddir)/src/libdfa/librw.a bin_PROGRAMS=queryTable buildTable AM_CFLAGS=-g -Wall -pedantic -std=gnu99 diff --git a/src/apps/readOnlyHash/buildTable.c b/src/apps/readOnlyHash/buildTable.c index 4f2a518..4b2402d 100644 --- a/src/apps/readOnlyHash/buildTable.c +++ b/src/apps/readOnlyHash/buildTable.c @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/apps/readOnlyHash/queryTable.c b/src/apps/readOnlyHash/queryTable.c index 26decbc..5782b40 100644 --- a/src/apps/readOnlyHash/queryTable.c +++ b/src/apps/readOnlyHash/queryTable.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include int main(int argc, char** argv) { Tinit(); diff --git a/src/libdfa/messages.c b/src/libdfa/messages.c index b8129d3..1fc3d47 100644 --- a/src/libdfa/messages.c +++ b/src/libdfa/messages.c @@ -43,7 +43,7 @@ terms specified in this license. #define _GNU_SOURCE -#include +#include #include #include #include diff --git a/src/libdfa/networksetup.c b/src/libdfa/networksetup.c index 739159d..bc7da2e 100644 --- a/src/libdfa/networksetup.c +++ b/src/libdfa/networksetup.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/pobj/pobj.c b/src/pobj/pobj.c index c4a1483..fc9b5fa 100644 --- a/src/pobj/pobj.c +++ b/src/pobj/pobj.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include "common.h" #include "debug.h" diff --git a/src/lladd/.cvsignore b/src/stasis/.cvsignore similarity index 100% rename from src/lladd/.cvsignore rename to src/stasis/.cvsignore diff --git a/src/lladd/Makefile.am b/src/stasis/Makefile.am similarity index 100% rename from src/lladd/Makefile.am rename to src/stasis/Makefile.am diff --git a/src/lladd/allocationPolicy.c b/src/stasis/allocationPolicy.c similarity index 98% rename from src/lladd/allocationPolicy.c rename to src/stasis/allocationPolicy.c index 786ee6a..02a0891 100644 --- a/src/lladd/allocationPolicy.c +++ b/src/stasis/allocationPolicy.c @@ -29,10 +29,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define ALLOCATION_POLICY_SANITY_CHECKS diff --git a/src/lladd/arrayCollection.c b/src/stasis/arrayCollection.c similarity index 98% rename from src/lladd/arrayCollection.c rename to src/stasis/arrayCollection.c index a01cadf..3f8181d 100644 --- a/src/lladd/arrayCollection.c +++ b/src/stasis/arrayCollection.c @@ -1,4 +1,4 @@ -#include +#include #include #include typedef struct { diff --git a/src/lladd/blobManager.c b/src/stasis/blobManager.c similarity index 98% rename from src/lladd/blobManager.c rename to src/stasis/blobManager.c index 8b7bcc0..06d6a65 100644 --- a/src/lladd/blobManager.c +++ b/src/stasis/blobManager.c @@ -1,5 +1,5 @@ #include -#include +#include #include "page/raw.h" #include diff --git a/src/lladd/blobManager.h b/src/stasis/blobManager.h similarity index 98% rename from src/lladd/blobManager.h rename to src/stasis/blobManager.h index 7cc6264..2811469 100644 --- a/src/lladd/blobManager.h +++ b/src/stasis/blobManager.h @@ -1,7 +1,7 @@ #ifndef __BLOB_MANAGER_H #define __BLOB_MANAGER_H -#include +#include BEGIN_C_DECLS /** diff --git a/src/lladd/bufferManager.c b/src/stasis/bufferManager.c similarity index 98% rename from src/lladd/bufferManager.c rename to src/stasis/bufferManager.c index 5c7a681..cc34d70 100644 --- a/src/lladd/bufferManager.c +++ b/src/stasis/bufferManager.c @@ -56,25 +56,25 @@ terms specified in this license. #define _GNU_SOURCE #include // Need _GNU_SOURCE for asprintf -#include +#include #endif -#include +#include #include #include -#include +#include #include "bufferManager/pageArray.h" #include "bufferManager/bufferHash.h" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #undef loadPage #undef releasePage diff --git a/src/lladd/bufferManager/bufferHash.c b/src/stasis/bufferManager/bufferHash.c similarity index 97% rename from src/lladd/bufferManager/bufferHash.c rename to src/stasis/bufferManager/bufferHash.c index 3ab9d2d..4a3379a 100644 --- a/src/lladd/bufferManager/bufferHash.c +++ b/src/stasis/bufferManager/bufferHash.c @@ -1,16 +1,16 @@ #include #include #include "bufferManager/bufferHash.h" -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/src/lladd/bufferManager/bufferHash.h b/src/stasis/bufferManager/bufferHash.h similarity index 100% rename from src/lladd/bufferManager/bufferHash.h rename to src/stasis/bufferManager/bufferHash.h diff --git a/src/lladd/bufferManager/pageArray.c b/src/stasis/bufferManager/pageArray.c similarity index 92% rename from src/lladd/bufferManager/pageArray.c rename to src/stasis/bufferManager/pageArray.c index 77eeaee..5f8a962 100644 --- a/src/lladd/bufferManager/pageArray.c +++ b/src/stasis/bufferManager/pageArray.c @@ -1,9 +1,9 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "latches.h" #include "bufferManager/pageArray.h" @@ -68,4 +68,3 @@ void paBufInit () { pageCount = 0; pageMap = 0; } - diff --git a/src/lladd/bufferManager/pageArray.h b/src/stasis/bufferManager/pageArray.h similarity index 100% rename from src/lladd/bufferManager/pageArray.h rename to src/stasis/bufferManager/pageArray.h diff --git a/src/lladd/bufferPool.c b/src/stasis/bufferPool.c similarity index 98% rename from src/lladd/bufferPool.c rename to src/stasis/bufferPool.c index 72697bb..6175fe9 100644 --- a/src/lladd/bufferPool.c +++ b/src/stasis/bufferPool.c @@ -51,9 +51,9 @@ terms specified in this license. #define _XOPEN_SOURCE 600 #include -#include +#include #include -#include +#include /* TODO: Combine with buffer size... */ static int nextPage = 0; diff --git a/src/lladd/common.c b/src/stasis/common.c similarity index 99% rename from src/lladd/common.c rename to src/stasis/common.c index b4481b3..fa3ee11 100644 --- a/src/lladd/common.c +++ b/src/stasis/common.c @@ -1,7 +1,7 @@ #define _GNU_SOURCE #include -#include +#include #include "latches.h" @@ -356,4 +356,3 @@ void __profile_deletelock (__profile_rwl *lock) { deletelock(lock->lock); } - diff --git a/src/lladd/compensations.c b/src/stasis/compensations.c similarity index 95% rename from src/lladd/compensations.c rename to src/stasis/compensations.c index e46f703..76cb14e 100644 --- a/src/lladd/compensations.c +++ b/src/stasis/compensations.c @@ -1,4 +1,4 @@ -#include +#include int ___compensation_count___ = 0; diff --git a/src/lladd/consumer.c b/src/stasis/consumer.c similarity index 97% rename from src/lladd/consumer.c rename to src/stasis/consumer.c index 7005ac5..39703c8 100644 --- a/src/lladd/consumer.c +++ b/src/stasis/consumer.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/lladd/crc32.c b/src/stasis/crc32.c similarity index 96% rename from src/lladd/crc32.c rename to src/stasis/crc32.c index 81d35a7..92779fc 100644 --- a/src/lladd/crc32.c +++ b/src/stasis/crc32.c @@ -1,5 +1,5 @@ // Calculate a CRC 32 checksum. -#include /*Added 10-6-04 */ +#include /*Added 10-6-04 */ #include #include diff --git a/src/lladd/doubleLinkedList.c b/src/stasis/doubleLinkedList.c similarity index 98% rename from src/lladd/doubleLinkedList.c rename to src/stasis/doubleLinkedList.c index 893a025..762cb12 100644 --- a/src/lladd/doubleLinkedList.c +++ b/src/stasis/doubleLinkedList.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include typedef LL_ENTRY(value_t) value_t; diff --git a/src/lladd/fifo.c b/src/stasis/fifo.c similarity index 99% rename from src/lladd/fifo.c rename to src/stasis/fifo.c index 3ab5cc3..9dbdf82 100644 --- a/src/lladd/fifo.c +++ b/src/stasis/fifo.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include "logger/logMemory.h" diff --git a/src/lladd/graph.c b/src/stasis/graph.c similarity index 98% rename from src/lladd/graph.c rename to src/stasis/graph.c index 7838b86..402ae33 100644 --- a/src/lladd/graph.c +++ b/src/stasis/graph.c @@ -1,9 +1,9 @@ -#include +#include #include #include #include #include "page.h" -#include +#include extern int transClos_outdegree; extern int numOut; diff --git a/src/lladd/hash.c b/src/stasis/hash.c similarity index 99% rename from src/lladd/hash.c rename to src/stasis/hash.c index f6a2526..628efbb 100644 --- a/src/lladd/hash.c +++ b/src/stasis/hash.c @@ -1,4 +1,4 @@ -#include +#include #include //#include /** diff --git a/src/lladd/io.c b/src/stasis/io.c similarity index 100% rename from src/lladd/io.c rename to src/stasis/io.c diff --git a/src/lladd/io.h b/src/stasis/io.h similarity index 92% rename from src/lladd/io.h rename to src/stasis/io.h index 173affb..f145ab9 100644 --- a/src/lladd/io.h +++ b/src/stasis/io.h @@ -5,7 +5,7 @@ */ -#include +#include BEGIN_C_DECLS diff --git a/src/lladd/io/debug.c b/src/stasis/io/debug.c similarity index 99% rename from src/lladd/io/debug.c rename to src/stasis/io/debug.c index 06c6daf..26c4203 100644 --- a/src/lladd/io/debug.c +++ b/src/stasis/io/debug.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/lladd/io/file.c b/src/stasis/io/file.c similarity index 99% rename from src/lladd/io/file.c rename to src/stasis/io/file.c index 5377c98..5094a6e 100644 --- a/src/lladd/io/file.c +++ b/src/stasis/io/file.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/src/lladd/io/memory.c b/src/stasis/io/memory.c similarity index 99% rename from src/lladd/io/memory.c rename to src/stasis/io/memory.c index e88ca32..d171fbd 100644 --- a/src/lladd/io/memory.c +++ b/src/stasis/io/memory.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/lladd/io/non_blocking.c b/src/stasis/io/non_blocking.c similarity index 99% rename from src/lladd/io/non_blocking.c rename to src/stasis/io/non_blocking.c index 1169d24..c1f0ec3 100644 --- a/src/lladd/io/non_blocking.c +++ b/src/stasis/io/non_blocking.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include diff --git a/src/lladd/io/rangeTracker.c b/src/stasis/io/rangeTracker.c similarity index 99% rename from src/lladd/io/rangeTracker.c rename to src/stasis/io/rangeTracker.c index 776a60d..ad28734 100644 --- a/src/lladd/io/rangeTracker.c +++ b/src/stasis/io/rangeTracker.c @@ -1,7 +1,7 @@ #define _GNU_SOURCE #include -#include -#include +#include +#include #include #include @@ -373,4 +373,3 @@ char * transitionToString(const transition * t) { assert(err !=-1); return ret; } - diff --git a/src/lladd/iterator.c b/src/stasis/iterator.c similarity index 96% rename from src/lladd/iterator.c rename to src/stasis/iterator.c index e13ffc6..53a1e8c 100644 --- a/src/lladd/iterator.c +++ b/src/stasis/iterator.c @@ -1,9 +1,9 @@ -#include +#include #include #include -#include -#include +#include +#include #include "logger/logMemory.h" static lladdIterator_def_t iterators[MAX_ITERATOR_TYPES]; diff --git a/src/lladd/latches.h b/src/stasis/latches.h similarity index 98% rename from src/lladd/latches.h rename to src/stasis/latches.h index 6fad509..e1a179d 100644 --- a/src/lladd/latches.h +++ b/src/stasis/latches.h @@ -1,7 +1,7 @@ #include -#include +#include #include -#include +#include #ifndef __LATCHES_H #define __LATCHES_H diff --git a/src/lladd/lhtable.c b/src/stasis/lhtable.c similarity index 99% rename from src/lladd/lhtable.c rename to src/stasis/lhtable.c index 10ac934..4e892b5 100644 --- a/src/lladd/lhtable.c +++ b/src/stasis/lhtable.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/src/lladd/linkedlist.c b/src/stasis/linkedlist.c similarity index 99% rename from src/lladd/linkedlist.c rename to src/stasis/linkedlist.c index b5452e1..1b414b7 100644 --- a/src/lladd/linkedlist.c +++ b/src/stasis/linkedlist.c @@ -45,7 +45,7 @@ terms specified in this license. * simple linked list *****************************/ #include -#include +#include #include "linkedlist.h" diff --git a/src/lladd/linkedlist.h b/src/stasis/linkedlist.h similarity index 99% rename from src/lladd/linkedlist.h rename to src/stasis/linkedlist.h index 6abbe60..3cfe781 100644 --- a/src/lladd/linkedlist.h +++ b/src/stasis/linkedlist.h @@ -51,7 +51,7 @@ terms specified in this license. recovery algorithms. */ -#include +#include BEGIN_C_DECLS typedef struct LinkedList { diff --git a/src/lladd/lockManager.c b/src/stasis/lockManager.c similarity index 99% rename from src/lladd/lockManager.c rename to src/stasis/lockManager.c index df62938..3399f19 100644 --- a/src/lladd/lockManager.c +++ b/src/stasis/lockManager.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include #include "latches.h" @@ -9,7 +9,7 @@ #include #include #include -#include +#include #define MUTEX_COUNT 32 @@ -366,4 +366,3 @@ void setupLockManagerCallbacksNil () { globalLockManager.abort = NULL; globalLockManager.begin = NULL; } - diff --git a/src/lladd/logger/Makefile.am-old b/src/stasis/logger/Makefile.am-old similarity index 100% rename from src/lladd/logger/Makefile.am-old rename to src/stasis/logger/Makefile.am-old diff --git a/src/lladd/logger/inMemoryLog.c b/src/stasis/logger/inMemoryLog.c similarity index 100% rename from src/lladd/logger/inMemoryLog.c rename to src/stasis/logger/inMemoryLog.c diff --git a/src/lladd/logger/inMemoryLog.h b/src/stasis/logger/inMemoryLog.h similarity index 92% rename from src/lladd/logger/inMemoryLog.h rename to src/stasis/logger/inMemoryLog.h index 5ceb5da..3534dc2 100644 --- a/src/lladd/logger/inMemoryLog.h +++ b/src/stasis/logger/inMemoryLog.h @@ -1,4 +1,4 @@ -#include +#include #ifndef __INMEMORYLOG #define __INMEMORYLOG 1 diff --git a/src/lladd/logger/logEntry.c b/src/stasis/logger/logEntry.c similarity index 97% rename from src/lladd/logger/logEntry.c rename to src/stasis/logger/logEntry.c index 20ac5d3..13a7f0b 100644 --- a/src/lladd/logger/logEntry.c +++ b/src/stasis/logger/logEntry.c @@ -41,13 +41,13 @@ terms specified in this license. ---*/ #include -#include +#include #include #include "page.h" // For physical_slot_length() -#include // needed for LoggerSizeOfInternalLogEntry() -#include +#include // needed for LoggerSizeOfInternalLogEntry() +#include LogEntry * allocCommonLogEntry(lsn_t prevLSN, int xid, unsigned int type) { LogEntry * ret = malloc(sizeof(struct __raw_log_entry)); @@ -169,4 +169,3 @@ long sizeofLogEntry(const LogEntry * log) { return sizeof(struct __raw_log_entry); } } - diff --git a/src/lladd/logger/logHandle.c b/src/stasis/logger/logHandle.c similarity index 100% rename from src/lladd/logger/logHandle.c rename to src/stasis/logger/logHandle.c diff --git a/src/lladd/logger/logHandle.h b/src/stasis/logger/logHandle.h similarity index 99% rename from src/lladd/logger/logHandle.h rename to src/stasis/logger/logHandle.h index ae2485d..672a992 100644 --- a/src/lladd/logger/logHandle.h +++ b/src/stasis/logger/logHandle.h @@ -40,7 +40,7 @@ permission to use and distribute the software in accordance with the terms specified in this license. ---*/ -#include +#include #ifndef __LOGHANDLE_H #define __LOGHANDLE_H diff --git a/src/lladd/logger/logMemory.c b/src/stasis/logger/logMemory.c similarity index 99% rename from src/lladd/logger/logMemory.c rename to src/stasis/logger/logMemory.c index 5a578a2..f80dc22 100644 --- a/src/lladd/logger/logMemory.c +++ b/src/stasis/logger/logMemory.c @@ -7,7 +7,7 @@ #include #include "logMemory.h" #include -#include +#include typedef struct { pthread_mutex_t mutex; diff --git a/src/lladd/logger/logMemory.h b/src/stasis/logger/logMemory.h similarity index 86% rename from src/lladd/logger/logMemory.h rename to src/stasis/logger/logMemory.h index a678378..d00a0ef 100644 --- a/src/lladd/logger/logMemory.h +++ b/src/stasis/logger/logMemory.h @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifndef __LOGMEMORY_H #define __LOGMEMORY_H diff --git a/src/lladd/logger/logWriter.c b/src/stasis/logger/logWriter.c similarity index 99% rename from src/lladd/logger/logWriter.c rename to src/stasis/logger/logWriter.c index bf89044..766d514 100644 --- a/src/lladd/logger/logWriter.c +++ b/src/stasis/logger/logWriter.c @@ -54,10 +54,9 @@ terms specified in this license. #include #include -#include +#include -//#include -#include +#include #include "logWriter.h" #include "logHandle.h" #include "latches.h" @@ -65,7 +64,7 @@ terms specified in this license. #include -#include +#include /** @todo Should the log file be global? diff --git a/src/lladd/logger/logWriter.h b/src/stasis/logger/logWriter.h similarity index 99% rename from src/lladd/logger/logWriter.h rename to src/stasis/logger/logWriter.h index a5fa126..70b41bd 100644 --- a/src/lladd/logger/logWriter.h +++ b/src/stasis/logger/logWriter.h @@ -70,8 +70,8 @@ terms specified in this license. #ifndef __LOGWRITER_H__ #define __LOGWRITER_H__ -#include -#include +#include +#include BEGIN_C_DECLS /** diff --git a/src/lladd/logger/logger2.c b/src/stasis/logger/logger2.c similarity index 99% rename from src/lladd/logger/logger2.c rename to src/stasis/logger/logger2.c index 7910a47..9a3e6dc 100644 --- a/src/lladd/logger/logger2.c +++ b/src/stasis/logger/logger2.c @@ -48,12 +48,12 @@ terms specified in this license. */ #include -#include +#include #include #include -#include +#include #include "logWriter.h" #include "inMemoryLog.h" diff --git a/src/lladd/multiplexer.c b/src/stasis/multiplexer.c similarity index 98% rename from src/lladd/multiplexer.c rename to src/stasis/multiplexer.c index 07505c1..17dc5ef 100644 --- a/src/lladd/multiplexer.c +++ b/src/stasis/multiplexer.c @@ -1,7 +1,7 @@ -#include -#include +#include +#include #include -#include +#include #include "logger/logMemory.h" diff --git a/src/lladd/operations.c b/src/stasis/operations.c similarity index 98% rename from src/lladd/operations.c rename to src/stasis/operations.c index 68f51aa..251d85e 100644 --- a/src/lladd/operations.c +++ b/src/stasis/operations.c @@ -40,15 +40,15 @@ permission to use and distribute the software in accordance with the terms specified in this license. ---*/ #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "page.h" diff --git a/src/lladd/operations/Makefile.am-old b/src/stasis/operations/Makefile.am-old similarity index 100% rename from src/lladd/operations/Makefile.am-old rename to src/stasis/operations/Makefile.am-old diff --git a/src/lladd/operations/alloc.c b/src/stasis/operations/alloc.c similarity index 98% rename from src/lladd/operations/alloc.c rename to src/stasis/operations/alloc.c index 50ea797..8995509 100644 --- a/src/lladd/operations/alloc.c +++ b/src/stasis/operations/alloc.c @@ -1,10 +1,10 @@ #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include "../blobManager.h" #include "../page.h" #include diff --git a/src/lladd/operations/arrayList.c b/src/stasis/operations/arrayList.c similarity index 97% rename from src/lladd/operations/arrayList.c rename to src/stasis/operations/arrayList.c index 5a76408..dce8baa 100644 --- a/src/lladd/operations/arrayList.c +++ b/src/stasis/operations/arrayList.c @@ -1,12 +1,12 @@ #include -#include +#include #include "../page.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #define _XOPEN_SOURCE 600 diff --git a/src/lladd/operations/bTree.c b/src/stasis/operations/bTree.c similarity index 59% rename from src/lladd/operations/bTree.c rename to src/stasis/operations/bTree.c index c1021c9..174440a 100644 --- a/src/lladd/operations/bTree.c +++ b/src/stasis/operations/bTree.c @@ -1,14 +1,14 @@ #define __USE_GNU #define _GNU_SOURCE #include "../latches.h" -#include -#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "../logger/logMemory.h" #include diff --git a/src/lladd/operations/decrement.c b/src/stasis/operations/decrement.c similarity index 99% rename from src/lladd/operations/decrement.c rename to src/stasis/operations/decrement.c index f47325b..ef60ae8 100644 --- a/src/lladd/operations/decrement.c +++ b/src/stasis/operations/decrement.c @@ -45,7 +45,7 @@ terms specified in this license. * Decrements the given reference by one *********************************************/ -#include +#include #include "../page.h" static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) { diff --git a/src/lladd/operations/increment.c b/src/stasis/operations/increment.c similarity index 99% rename from src/lladd/operations/increment.c rename to src/stasis/operations/increment.c index 63a71c5..4a5a07e 100644 --- a/src/lladd/operations/increment.c +++ b/src/stasis/operations/increment.c @@ -45,7 +45,7 @@ terms specified in this license. * Increments the given reference by one **********************************************/ -#include +#include #include "../page.h" static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) { diff --git a/src/lladd/operations/instantSet.c b/src/stasis/operations/instantSet.c similarity index 99% rename from src/lladd/operations/instantSet.c rename to src/stasis/operations/instantSet.c index 51465b8..017a8c3 100644 --- a/src/lladd/operations/instantSet.c +++ b/src/stasis/operations/instantSet.c @@ -45,7 +45,7 @@ terms specified in this license. * sets the given reference to dat **********************************************/ -#include +#include #include "../page.h" static int operate(int xid, Page *p, lsn_t lsn, recordid rid, const void *dat) { diff --git a/src/lladd/operations/linearHash.c b/src/stasis/operations/linearHash.c similarity index 99% rename from src/lladd/operations/linearHash.c rename to src/stasis/operations/linearHash.c index 062cbdb..4132c03 100644 --- a/src/lladd/operations/linearHash.c +++ b/src/stasis/operations/linearHash.c @@ -1,6 +1,6 @@ -#include -#include +#include +#include #include #include #include @@ -25,7 +25,7 @@ #include #include -#include +#include #include typedef struct { diff --git a/src/lladd/operations/linearHashNTA.c b/src/stasis/operations/linearHashNTA.c similarity index 99% rename from src/lladd/operations/linearHashNTA.c rename to src/stasis/operations/linearHashNTA.c index 4173f04..1a845a9 100644 --- a/src/lladd/operations/linearHashNTA.c +++ b/src/stasis/operations/linearHashNTA.c @@ -1,15 +1,15 @@ #define __USE_GNU #define _GNU_SOURCE #include "../latches.h" -#include -#include +#include +#include #include "../page.h" #include #include #include -#include -#include -#include +#include +#include +#include #include "../logger/logMemory.h" /** re-entrant implementation of a linear hash hable, using nensted top actions. diff --git a/src/lladd/operations/linkedListNTA.c b/src/stasis/operations/linkedListNTA.c similarity index 99% rename from src/lladd/operations/linkedListNTA.c rename to src/stasis/operations/linkedListNTA.c index 4b399b4..8952b23 100644 --- a/src/lladd/operations/linkedListNTA.c +++ b/src/stasis/operations/linkedListNTA.c @@ -2,8 +2,8 @@ #define _GNU_SOURCE #include "../latches.h" -#include -#include +#include +#include #include #include #include diff --git a/src/lladd/operations/naiveLinearHash.c b/src/stasis/operations/naiveLinearHash.c similarity index 99% rename from src/lladd/operations/naiveLinearHash.c rename to src/stasis/operations/naiveLinearHash.c index 5632e27..dc33bd7 100644 --- a/src/lladd/operations/naiveLinearHash.c +++ b/src/stasis/operations/naiveLinearHash.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include "../latches.h" @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include /** next.size == 0 implies empty bucket diff --git a/src/lladd/operations/nestedTopActions.c b/src/stasis/operations/nestedTopActions.c similarity index 97% rename from src/lladd/operations/nestedTopActions.c rename to src/stasis/operations/nestedTopActions.c index c3f9301..a0e0ea5 100644 --- a/src/lladd/operations/nestedTopActions.c +++ b/src/stasis/operations/nestedTopActions.c @@ -44,10 +44,10 @@ terms specified in this license. * * Decrements the given reference by one *********************************************/ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/lladd/operations/noop.c b/src/stasis/operations/noop.c similarity index 99% rename from src/lladd/operations/noop.c rename to src/stasis/operations/noop.c index 4597c96..50eb1de 100644 --- a/src/lladd/operations/noop.c +++ b/src/stasis/operations/noop.c @@ -45,7 +45,7 @@ terms specified in this license. * sets the given reference to dat **********************************************/ -#include +#include #include "../page.h" int noop(int xid, Page *p, lsn_t lsn, recordid rid, const void *dat) { diff --git a/src/lladd/operations/pageOperations.c b/src/stasis/operations/pageOperations.c similarity index 98% rename from src/lladd/operations/pageOperations.c rename to src/stasis/operations/pageOperations.c index 36a73d7..b428909 100644 --- a/src/lladd/operations/pageOperations.c +++ b/src/stasis/operations/pageOperations.c @@ -3,7 +3,7 @@ #include "config.h" #include "../page.h" -#include +#include #include #include diff --git a/src/lladd/operations/pageOrientedListNTA.c b/src/stasis/operations/pageOrientedListNTA.c similarity index 99% rename from src/lladd/operations/pageOrientedListNTA.c rename to src/stasis/operations/pageOrientedListNTA.c index a94216f..1ceac42 100644 --- a/src/lladd/operations/pageOrientedListNTA.c +++ b/src/stasis/operations/pageOrientedListNTA.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/lladd/operations/prepare.c b/src/stasis/operations/prepare.c similarity index 98% rename from src/lladd/operations/prepare.c rename to src/stasis/operations/prepare.c index dd3b314..146002e 100644 --- a/src/lladd/operations/prepare.c +++ b/src/stasis/operations/prepare.c @@ -46,8 +46,8 @@ terms specified in this license. * sets the given reference to dat **********************************************/ -#include -#include +#include +#include #include #include diff --git a/src/lladd/operations/regions.c b/src/stasis/operations/regions.c similarity index 99% rename from src/lladd/operations/regions.c rename to src/stasis/operations/regions.c index db37fed..0ea60cd 100644 --- a/src/lladd/operations/regions.c +++ b/src/stasis/operations/regions.c @@ -1,6 +1,6 @@ #include "config.h" #include "../page.h" -#include +#include #include typedef struct regionAllocLogArg{ diff --git a/src/lladd/operations/set.c b/src/stasis/operations/set.c similarity index 99% rename from src/lladd/operations/set.c rename to src/stasis/operations/set.c index c2326b2..97649ef 100644 --- a/src/lladd/operations/set.c +++ b/src/stasis/operations/set.c @@ -45,7 +45,7 @@ terms specified in this license. * sets the given reference to dat **********************************************/ -#include +#include #include "../page.h" #include #include diff --git a/src/lladd/page.c b/src/stasis/page.c similarity index 97% rename from src/lladd/page.c rename to src/stasis/page.c index c29f4ce..c15e60c 100644 --- a/src/lladd/page.c +++ b/src/stasis/page.c @@ -73,24 +73,24 @@ terms specified in this license. #include #include -#include +#include #include "latches.h" #include "page.h" #include #include -#include +#include #include #include "blobManager.h" -#include -#include +#include +#include #include "page/slotted.h" #include "page/fixed.h" #include "page/indirect.h" -#include -#include -#include +#include +#include +#include static page_impl * page_impls; diff --git a/src/lladd/page.h b/src/stasis/page.h similarity index 99% rename from src/lladd/page.h rename to src/stasis/page.h index 8584984..b13abc1 100644 --- a/src/lladd/page.h +++ b/src/stasis/page.h @@ -78,9 +78,9 @@ terms specified in this license. #ifndef __PAGE_H__ #define __PAGE_H__ -#include +#include #include "latches.h" -#include +#include BEGIN_C_DECLS diff --git a/src/lladd/page/fixed.c b/src/stasis/page/fixed.c similarity index 99% rename from src/lladd/page/fixed.c rename to src/stasis/page/fixed.c index 229d2d8..153d45c 100644 --- a/src/lladd/page/fixed.c +++ b/src/stasis/page/fixed.c @@ -2,7 +2,7 @@ #include "../page.h" #include "fixed.h" /** @todo should page implementations provide readLSN / writeLSN??? */ -#include +#include diff --git a/src/lladd/page/fixed.h b/src/stasis/page/fixed.h similarity index 100% rename from src/lladd/page/fixed.h rename to src/stasis/page/fixed.h diff --git a/src/lladd/page/header.c b/src/stasis/page/header.c similarity index 100% rename from src/lladd/page/header.c rename to src/stasis/page/header.c diff --git a/src/lladd/page/header.h b/src/stasis/page/header.h similarity index 100% rename from src/lladd/page/header.h rename to src/stasis/page/header.h diff --git a/src/lladd/page/indirect.c b/src/stasis/page/indirect.c similarity index 99% rename from src/lladd/page/indirect.c rename to src/stasis/page/indirect.c index 2dd80c7..35d4a6e 100644 --- a/src/lladd/page/indirect.c +++ b/src/stasis/page/indirect.c @@ -6,7 +6,7 @@ #include "../blobManager.h" #include "../page.h" -#include +#include void indirectInitialize(Page * p, int height) { *level_ptr(p) = height; diff --git a/src/lladd/page/indirect.h b/src/stasis/page/indirect.h similarity index 98% rename from src/lladd/page/indirect.h rename to src/stasis/page/indirect.h index 4b2ddb5..2067e68 100644 --- a/src/lladd/page/indirect.h +++ b/src/stasis/page/indirect.h @@ -26,7 +26,7 @@ implementation). */ -#include +#include #include "../page.h" #ifndef __LLADD_PAGE_INDIRECT_H diff --git a/src/lladd/page/raw.c b/src/stasis/page/raw.c similarity index 93% rename from src/lladd/page/raw.c rename to src/stasis/page/raw.c index 1d7ef67..aee2b4f 100644 --- a/src/lladd/page/raw.c +++ b/src/stasis/page/raw.c @@ -1,6 +1,6 @@ #include "page/raw.h" -#include -#include +#include +#include /** @todo Should rawPageInferMetadata set a page type in the Page struct? diff --git a/src/lladd/page/raw.h b/src/stasis/page/raw.h similarity index 99% rename from src/lladd/page/raw.h rename to src/stasis/page/raw.h index 1db9957..ed9cf88 100644 --- a/src/lladd/page/raw.h +++ b/src/stasis/page/raw.h @@ -74,7 +74,7 @@ terms specified in this license. */ -#include +#include #include "../page.h" #define units_from_start_raw(unit,page,count) (((unit*)(page->memAddr))+(count)) diff --git a/src/lladd/page/slotted.c b/src/stasis/page/slotted.c similarity index 99% rename from src/lladd/page/slotted.c rename to src/stasis/page/slotted.c index a1b4849..6aaa33e 100644 --- a/src/lladd/page/slotted.c +++ b/src/stasis/page/slotted.c @@ -5,7 +5,7 @@ #include "slotted.h" #include /** @todo should page implementations provide readLSN / writeLSN??? */ -#include +#include static inline void slottedFsck(const Page const * page) { assertlocked(page->rwlatch); diff --git a/src/lladd/page/slotted.h b/src/stasis/page/slotted.h similarity index 100% rename from src/lladd/page/slotted.h rename to src/stasis/page/slotted.h diff --git a/src/lladd/pageCache.c b/src/stasis/pageCache.c similarity index 97% rename from src/lladd/pageCache.c rename to src/stasis/pageCache.c index a17d5a3..e5370ea 100644 --- a/src/lladd/pageCache.c +++ b/src/stasis/pageCache.c @@ -6,11 +6,11 @@ writes, and locking. */ #include -#include +#include -#include "page.h" -#include -#include +#include "page.h" +#include +#include #include #include diff --git a/src/lladd/pageFile.c b/src/stasis/pageFile.c similarity index 96% rename from src/lladd/pageFile.c rename to src/stasis/pageFile.c index 14c6ab6..1ef1f30 100644 --- a/src/lladd/pageFile.c +++ b/src/stasis/pageFile.c @@ -5,13 +5,13 @@ */ #include "config.h" #include "page.h" -#include +#include #include "pageFile.h" -#include +#include #include -#include -#include +#include +#include #include #include @@ -22,7 +22,7 @@ #include /** Allows boostrapping of the header page. */ -#include +#include static int stable = -1; static pthread_mutex_t stable_mutex; diff --git a/src/lladd/pageFile.h b/src/stasis/pageFile.h similarity index 100% rename from src/lladd/pageFile.h rename to src/stasis/pageFile.h diff --git a/src/lladd/pageHandle.c b/src/stasis/pageHandle.c similarity index 91% rename from src/lladd/pageHandle.c rename to src/stasis/pageHandle.c index 98bbdf3..a81a9fa 100644 --- a/src/lladd/pageHandle.c +++ b/src/stasis/pageHandle.c @@ -1,11 +1,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void (*pageWrite)(Page * dat); void (*pageRead)(Page * ret); void (*forcePageFile)(); diff --git a/src/lladd/recovery2.c b/src/stasis/recovery2.c similarity index 98% rename from src/lladd/recovery2.c rename to src/stasis/recovery2.c index 0e4855a..4b8ac31 100644 --- a/src/lladd/recovery2.c +++ b/src/stasis/recovery2.c @@ -5,19 +5,19 @@ */ #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include /** @todo Add better log iterator guard support and remove this include.*/ -#include +#include #include "logger/logHandle.h" /** @todo Get rid of linkedlist.[ch] */ diff --git a/src/lladd/redblack.c b/src/stasis/redblack.c similarity index 99% rename from src/lladd/redblack.c rename to src/stasis/redblack.c index 095cf74..2f2302c 100644 --- a/src/lladd/redblack.c +++ b/src/stasis/redblack.c @@ -27,7 +27,7 @@ static char rcsid[]="$Id$"; #include #include #include -#include +#include #define assert(expr) @@ -1148,4 +1148,3 @@ RB_ENTRY(dumptree)(struct RB_ENTRY(node) *x, int n) * Initial import of files. Versions are now all over the place. Oh well * */ - diff --git a/src/lladd/replacementPolicy.c b/src/stasis/replacementPolicy.c similarity index 100% rename from src/lladd/replacementPolicy.c rename to src/stasis/replacementPolicy.c diff --git a/src/lladd/replacementPolicy/lru.c b/src/stasis/replacementPolicy/lru.c similarity index 94% rename from src/lladd/replacementPolicy/lru.c rename to src/stasis/replacementPolicy/lru.c index 709d947..65e9107 100644 --- a/src/lladd/replacementPolicy/lru.c +++ b/src/stasis/replacementPolicy/lru.c @@ -2,10 +2,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include typedef struct entry { void * value; @@ -95,4 +95,3 @@ replacementPolicy * lruInit() { ret->impl = l; return ret; } - diff --git a/src/lladd/replacementPolicy/lruFast.c b/src/stasis/replacementPolicy/lruFast.c similarity index 95% rename from src/lladd/replacementPolicy/lruFast.c rename to src/stasis/replacementPolicy/lruFast.c index b1bfd40..41bd723 100644 --- a/src/lladd/replacementPolicy/lruFast.c +++ b/src/stasis/replacementPolicy/lruFast.c @@ -1,8 +1,8 @@ #include #include -#include -//#include -#include +#include +//#include +#include #include typedef LL_ENTRY(value_t) value_t; diff --git a/src/lladd/ringbuffer.c b/src/stasis/ringbuffer.c similarity index 99% rename from src/lladd/ringbuffer.c rename to src/stasis/ringbuffer.c index 0529c50..d958dbd 100644 --- a/src/lladd/ringbuffer.c +++ b/src/stasis/ringbuffer.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include //#define TRACK_OFFSETS diff --git a/src/lladd/stats.c b/src/stasis/stats.c similarity index 98% rename from src/lladd/stats.c rename to src/stasis/stats.c index e039f52..f22dd69 100644 --- a/src/lladd/stats.c +++ b/src/stasis/stats.c @@ -1,5 +1,5 @@ #include -#include +#include #include "latches.h" #include diff --git a/src/lladd/transactional2.c b/src/stasis/transactional2.c similarity index 97% rename from src/lladd/transactional2.c rename to src/stasis/transactional2.c index 81e0777..aaa567a 100644 --- a/src/lladd/transactional2.c +++ b/src/stasis/transactional2.c @@ -3,22 +3,22 @@ #include #include -#include +#include #include "latches.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef USE_PAGEFILE #include "pageFile.h" #endif -#include +#include #include "page.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/lladd/truncation.c b/src/stasis/truncation.c similarity index 98% rename from src/lladd/truncation.c rename to src/stasis/truncation.c index 5ee1c55..67c893e 100644 --- a/src/lladd/truncation.c +++ b/src/stasis/truncation.c @@ -1,7 +1,7 @@ #include -#include +#include #include -#include +#include #include "page.h" #include diff --git a/lladd/.cvsignore b/stasis/.cvsignore similarity index 100% rename from lladd/.cvsignore rename to stasis/.cvsignore diff --git a/lladd/Makefile.am b/stasis/Makefile.am similarity index 100% rename from lladd/Makefile.am rename to stasis/Makefile.am diff --git a/lladd/allocationPolicy.h b/stasis/allocationPolicy.h similarity index 100% rename from lladd/allocationPolicy.h rename to stasis/allocationPolicy.h diff --git a/lladd/arrayCollection.h b/stasis/arrayCollection.h similarity index 100% rename from lladd/arrayCollection.h rename to stasis/arrayCollection.h diff --git a/lladd/bufferManager.h b/stasis/bufferManager.h similarity index 98% rename from lladd/bufferManager.h rename to stasis/bufferManager.h index a09c411..279e009 100644 --- a/lladd/bufferManager.h +++ b/stasis/bufferManager.h @@ -77,8 +77,8 @@ terms specified in this license. * $Id$ */ -#include -#include +#include +#include #ifndef __BUFFERMANAGER_H__ #define __BUFFERMANAGER_H__ diff --git a/lladd/bufferPool.h b/stasis/bufferPool.h similarity index 100% rename from lladd/bufferPool.h rename to stasis/bufferPool.h diff --git a/lladd/common.h b/stasis/common.h similarity index 100% rename from lladd/common.h rename to stasis/common.h diff --git a/lladd/compensations.h b/stasis/compensations.h similarity index 99% rename from lladd/compensations.h rename to stasis/compensations.h index 047c9f6..7bce1ed 100644 --- a/lladd/compensations.h +++ b/stasis/compensations.h @@ -1,5 +1,5 @@ #include -#include +#include #ifndef __COMPENSATIONS_H #define __COMPENSATIONS_H @@ -160,4 +160,3 @@ extern int ___compensation_count___; #endif END_C_DECLS - diff --git a/lladd/config.h.in b/stasis/config.h.in similarity index 100% rename from lladd/config.h.in rename to stasis/config.h.in diff --git a/lladd/constants.h b/stasis/constants.h similarity index 99% rename from lladd/constants.h rename to stasis/constants.h index b87055f..ed45132 100644 --- a/lladd/constants.h +++ b/stasis/constants.h @@ -55,7 +55,7 @@ terms specified in this license. #ifndef __CONSTANTS_H__ #define __CONSTANTS_H__ -#include +#include /*#define DEBUG 1*/ #define LOG_FILE "logfile.txt" diff --git a/lladd/consumer.h b/stasis/consumer.h similarity index 97% rename from lladd/consumer.h rename to stasis/consumer.h index baa0238..a1afae1 100644 --- a/lladd/consumer.h +++ b/stasis/consumer.h @@ -1,4 +1,4 @@ -#include +#include #ifndef __CONSUMER_H #define __CONSUMER_H @@ -43,4 +43,3 @@ int Tconsumer_push(int xid, lladdConsumer_t * it, byte * key, size_t keySize, by //int Tconsumer_tryPush(int xid, ....); #endif // __CONSUMER_H - diff --git a/lladd/crc32.h b/stasis/crc32.h similarity index 100% rename from lladd/crc32.h rename to stasis/crc32.h diff --git a/lladd/doubleLinkedList.h b/stasis/doubleLinkedList.h similarity index 100% rename from lladd/doubleLinkedList.h rename to stasis/doubleLinkedList.h diff --git a/lladd/fifo.h b/stasis/fifo.h similarity index 96% rename from lladd/fifo.h rename to stasis/fifo.h index 2d77521..b259fe0 100644 --- a/lladd/fifo.h +++ b/stasis/fifo.h @@ -1,6 +1,6 @@ -#include -#include +#include +#include #ifndef __FIFO_H #define __FIFO_H @@ -42,4 +42,3 @@ int lladdFifoPool_iterator_value (int xid, void * it, byte ** val); void lladdFifoPool_iterator_tupleDone(int xid, void * it); void lladdFifoPool_iterator_releaseLock(int xid, void * it); #endif // __FIFO_H - diff --git a/lladd/graph.h b/stasis/graph.h similarity index 91% rename from lladd/graph.h rename to stasis/graph.h index ef10289..c221851 100644 --- a/lladd/graph.h +++ b/stasis/graph.h @@ -1,6 +1,5 @@ - -#include -#include +#include +#include #ifndef __LLADD_GRAPH_H #define __LLADD_GRAPH_H diff --git a/lladd/hash.h b/stasis/hash.h similarity index 96% rename from lladd/hash.h rename to stasis/hash.h index e9ea047..8652daf 100644 --- a/lladd/hash.h +++ b/stasis/hash.h @@ -1,5 +1,5 @@ -#include +#include #ifndef __HASH_H #define __HASH_H diff --git a/lladd/io/handle.h b/stasis/io/handle.h similarity index 99% rename from lladd/io/handle.h rename to stasis/io/handle.h index 112bb8b..5636a5a 100644 --- a/lladd/io/handle.h +++ b/stasis/io/handle.h @@ -1,4 +1,4 @@ -#include +#include #ifndef IO_HANDLE_H #define IO_HANDLE_H diff --git a/lladd/io/rangeTracker.h b/stasis/io/rangeTracker.h similarity index 100% rename from lladd/io/rangeTracker.h rename to stasis/io/rangeTracker.h diff --git a/lladd/iterator.h b/stasis/iterator.h similarity index 98% rename from lladd/iterator.h rename to stasis/iterator.h index e7948e2..64e8dc1 100644 --- a/lladd/iterator.h +++ b/stasis/iterator.h @@ -1,4 +1,4 @@ -#include +#include #ifndef __ITERATOR_H diff --git a/lladd/lhtable.h b/stasis/lhtable.h similarity index 100% rename from lladd/lhtable.h rename to stasis/lhtable.h diff --git a/lladd/lockManager.h b/stasis/lockManager.h similarity index 96% rename from lladd/lockManager.h rename to stasis/lockManager.h index 9824dfb..5368ff7 100644 --- a/lladd/lockManager.h +++ b/stasis/lockManager.h @@ -1,4 +1,4 @@ -#include +#include typedef struct { void (*init)(); diff --git a/lladd/logger/logEntry.h b/stasis/logger/logEntry.h similarity index 99% rename from lladd/logger/logEntry.h rename to stasis/logger/logEntry.h index f4fb234..3e06f2f 100644 --- a/lladd/logger/logEntry.h +++ b/stasis/logger/logEntry.h @@ -43,7 +43,7 @@ terms specified in this license. #ifndef __LLADD_LOGGING_LOGENTRY_H #define __LLADD_LOGGING_LOGENTRY_H -#include +#include BEGIN_C_DECLS diff --git a/lladd/logger/logger2.h b/stasis/logger/logger2.h similarity index 99% rename from lladd/logger/logger2.h rename to stasis/logger/logger2.h index a4fddb9..eb8a5df 100644 --- a/lladd/logger/logger2.h +++ b/stasis/logger/logger2.h @@ -53,7 +53,7 @@ terms specified in this license. #ifndef __LOGGER2_H__ #define __LOGGER2_H__ -#include +#include /** A callback function that allows logHandle's iterator to stop diff --git a/lladd/multiplexer.h b/stasis/multiplexer.h similarity index 100% rename from lladd/multiplexer.h rename to stasis/multiplexer.h diff --git a/lladd/operations.h b/stasis/operations.h similarity index 97% rename from lladd/operations.h rename to stasis/operations.h index 01f9e4b..1339cb7 100644 --- a/lladd/operations.h +++ b/stasis/operations.h @@ -53,12 +53,12 @@ terms specified in this license. #ifndef __OPERATIONS_H__ #define __OPERATIONS_H__ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include BEGIN_C_DECLS diff --git a/lladd/operations/alloc.h b/stasis/operations/alloc.h similarity index 100% rename from lladd/operations/alloc.h rename to stasis/operations/alloc.h diff --git a/lladd/operations/arrayList.h b/stasis/operations/arrayList.h similarity index 100% rename from lladd/operations/arrayList.h rename to stasis/operations/arrayList.h diff --git a/lladd/operations/bTree.h b/stasis/operations/bTree.h similarity index 100% rename from lladd/operations/bTree.h rename to stasis/operations/bTree.h diff --git a/lladd/operations/decrement.h b/stasis/operations/decrement.h similarity index 100% rename from lladd/operations/decrement.h rename to stasis/operations/decrement.h diff --git a/lladd/operations/increment.h b/stasis/operations/increment.h similarity index 100% rename from lladd/operations/increment.h rename to stasis/operations/increment.h diff --git a/lladd/operations/instantSet.h b/stasis/operations/instantSet.h similarity index 100% rename from lladd/operations/instantSet.h rename to stasis/operations/instantSet.h diff --git a/lladd/operations/linearHash.h b/stasis/operations/linearHash.h similarity index 100% rename from lladd/operations/linearHash.h rename to stasis/operations/linearHash.h diff --git a/lladd/operations/linearHashNTA.h b/stasis/operations/linearHashNTA.h similarity index 99% rename from lladd/operations/linearHashNTA.h rename to stasis/operations/linearHashNTA.h index 860c6f4..241053b 100644 --- a/lladd/operations/linearHashNTA.h +++ b/stasis/operations/linearHashNTA.h @@ -20,7 +20,7 @@ */ -#include +#include #ifndef __LINEAR_HASH_NTA_H #define __LINEAR_HASH_NTA_H @@ -135,4 +135,3 @@ typedef struct { #define HASH_FILL_FACTOR 0.7 #endif // __LINEAR_HASH_NTA_H - diff --git a/lladd/operations/linkedListNTA.h b/stasis/operations/linkedListNTA.h similarity index 100% rename from lladd/operations/linkedListNTA.h rename to stasis/operations/linkedListNTA.h diff --git a/lladd/operations/lladdhash.h b/stasis/operations/lladdhash.h similarity index 100% rename from lladd/operations/lladdhash.h rename to stasis/operations/lladdhash.h diff --git a/lladd/operations/naiveLinearHash.h b/stasis/operations/naiveLinearHash.h similarity index 100% rename from lladd/operations/naiveLinearHash.h rename to stasis/operations/naiveLinearHash.h diff --git a/lladd/operations/nestedTopActions.h b/stasis/operations/nestedTopActions.h similarity index 100% rename from lladd/operations/nestedTopActions.h rename to stasis/operations/nestedTopActions.h diff --git a/lladd/operations/noop.h b/stasis/operations/noop.h similarity index 100% rename from lladd/operations/noop.h rename to stasis/operations/noop.h diff --git a/lladd/operations/pageOperations.h b/stasis/operations/pageOperations.h similarity index 100% rename from lladd/operations/pageOperations.h rename to stasis/operations/pageOperations.h diff --git a/lladd/operations/pageOrientedListNTA.h b/stasis/operations/pageOrientedListNTA.h similarity index 100% rename from lladd/operations/pageOrientedListNTA.h rename to stasis/operations/pageOrientedListNTA.h diff --git a/lladd/operations/prepare.h b/stasis/operations/prepare.h similarity index 100% rename from lladd/operations/prepare.h rename to stasis/operations/prepare.h diff --git a/lladd/operations/regions.h b/stasis/operations/regions.h similarity index 100% rename from lladd/operations/regions.h rename to stasis/operations/regions.h diff --git a/lladd/operations/set.h b/stasis/operations/set.h similarity index 100% rename from lladd/operations/set.h rename to stasis/operations/set.h diff --git a/lladd/pageCache.h b/stasis/pageCache.h similarity index 97% rename from lladd/pageCache.h rename to stasis/pageCache.h index 7149edc..16c11e7 100644 --- a/lladd/pageCache.h +++ b/stasis/pageCache.h @@ -1,7 +1,7 @@ #ifndef __PAGECACHE_H #define __PAGECACHE_H -#include +#include //Page * getPage(int pageid, int locktype); /** diff --git a/lladd/pageHandle.h b/stasis/pageHandle.h similarity index 96% rename from lladd/pageHandle.h rename to stasis/pageHandle.h index 8ce7f43..6b31785 100644 --- a/lladd/pageHandle.h +++ b/stasis/pageHandle.h @@ -1,5 +1,5 @@ -#include -#include +#include +#include /** * Write page to disk, including correct LSN. Doing so may require a * call to logSync(). There is not much that can be done to avoid diff --git a/lladd/recovery.h b/stasis/recovery.h similarity index 100% rename from lladd/recovery.h rename to stasis/recovery.h diff --git a/lladd/redblack.h b/stasis/redblack.h similarity index 100% rename from lladd/redblack.h rename to stasis/redblack.h diff --git a/lladd/replacementPolicy.h b/stasis/replacementPolicy.h similarity index 97% rename from lladd/replacementPolicy.h rename to stasis/replacementPolicy.h index 6d28780..03d2d49 100644 --- a/lladd/replacementPolicy.h +++ b/stasis/replacementPolicy.h @@ -20,7 +20,7 @@ */ -#include +#include typedef struct replacementPolicy { struct replacementPolicy* (*init)(); @@ -39,4 +39,3 @@ replacementPolicy * lruFastInit( struct LL_ENTRY(node_t) * n, void * conf), void * conf); - diff --git a/lladd/ringbuffer.h b/stasis/ringbuffer.h similarity index 92% rename from lladd/ringbuffer.h rename to stasis/ringbuffer.h index d2aa087..d9f2ec6 100644 --- a/lladd/ringbuffer.h +++ b/stasis/ringbuffer.h @@ -1,4 +1,4 @@ -#include +#include typedef struct ringBufferLog_s ringBufferLog_t; diff --git a/lladd/stamp-h.in b/stasis/stamp-h.in similarity index 100% rename from lladd/stamp-h.in rename to stasis/stamp-h.in diff --git a/lladd/stamp-h1 b/stasis/stamp-h1 similarity index 100% rename from lladd/stamp-h1 rename to stasis/stamp-h1 diff --git a/lladd/stats.h b/stasis/stats.h similarity index 100% rename from lladd/stats.h rename to stasis/stats.h diff --git a/lladd/transactional.h b/stasis/transactional.h similarity index 100% rename from lladd/transactional.h rename to stasis/transactional.h diff --git a/lladd/truncation.h b/stasis/truncation.h similarity index 98% rename from lladd/truncation.h rename to stasis/truncation.h index 1f99a70..773f36f 100644 --- a/lladd/truncation.h +++ b/stasis/truncation.h @@ -53,7 +53,7 @@ terms specified in this license. * */ -#include +#include #ifndef __LLADD_TRUNCATION_H #define __LLADD_TRUNCATION_H 1 diff --git a/test/2pc/Makefile.am b/test/2pc/Makefile.am index 059e15a..c523761 100644 --- a/test/2pc/Makefile.am +++ b/test/2pc/Makefile.am @@ -1,5 +1,4 @@ LDADD=$(top_builddir)/src/2pc/lib2pc.a $(top_builddir)/src/libdfa/libdfa.a \ - $(top_builddir)/src/lladd/liblladd.a $(top_builddir)/src/libdfa/librw.a -lconfuse + $(top_builddir)/src/stasis/liblladd.a $(top_builddir)/src/libdfa/librw.a -lconfuse bin_PROGRAMS=always_commit AM_CFLAGS=${GLOBAL_CFLAGS} - diff --git a/test/Makefile.am b/test/Makefile.am index 43a6082..f8fad7a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ #INCLUDES = @CHECK_CFLAGS@ if HAVE_LIBCHECK -SUBDIRS = lladd +SUBDIRS = stasis if HAVE_LIBCONFUSE SUBDIRS += monotree messages dfa 2pc cht diff --git a/test/cht/Makefile.am b/test/cht/Makefile.am index a54c8d2..0f088b5 100644 --- a/test/cht/Makefile.am +++ b/test/cht/Makefile.am @@ -1,5 +1,5 @@ TESTS=./run LDADD=-lconfuse $(top_builddir)/src/apps/cht/libcht.a $(top_builddir)/src/2pc/lib2pc.a $(top_builddir)/src/libdfa/libdfa.a \ - $(top_builddir)/src/lladd/liblladd.a $(top_builddir)/src/libdfa/librw.a + $(top_builddir)/src/stasis/liblladd.a $(top_builddir)/src/libdfa/librw.a bin_PROGRAMS=simple cht_server client coordinator subordinate AM_CFLAGS=${GLOBAL_CFLAGS} diff --git a/test/dfa/Makefile.am b/test/dfa/Makefile.am index 12a6617..3a1ab6e 100644 --- a/test/dfa/Makefile.am +++ b/test/dfa/Makefile.am @@ -1,4 +1,4 @@ -LDADD= $(top_builddir)/src/libdfa/libdfa.a $(top_builddir)/src/lladd/liblladd.a $(top_builddir)/src/libdfa/librw.a -lconfuse +LDADD= $(top_builddir)/src/libdfa/libdfa.a $(top_builddir)/src/stasis/liblladd.a $(top_builddir)/src/libdfa/librw.a -lconfuse bin_PROGRAMS=ping_pong_dfa fork_bomb star AM_CFLAGS=${GLOBAL_CFLAGS} if HAVE_LIBCHECK diff --git a/test/monotree/Makefile.am b/test/monotree/Makefile.am index 5adc660..a4f62a4 100644 --- a/test/monotree/Makefile.am +++ b/test/monotree/Makefile.am @@ -1,4 +1,4 @@ -LDADD=$(top_builddir)/src/libdfa/libdfa.a $(top_builddir)/src/lladd/liblladd.a $(top_builddir)/src/libdfa/librw.a +LDADD=$(top_builddir)/src/libdfa/libdfa.a $(top_builddir)/src/stasis/liblladd.a $(top_builddir)/src/libdfa/librw.a bin_PROGRAMS=bit_arithmetic binary_search soundness soundness_SOURCES = soundness.c AM_CFLAGS=${GLOBAL_CFLAGS} diff --git a/test/pobj/Makefile.am b/test/pobj/Makefile.am index f7b8c9d..ab7fceb 100644 --- a/test/pobj/Makefile.am +++ b/test/pobj/Makefile.am @@ -1,6 +1,5 @@ noinst_PROGRAMS = test-list test-multilist test-list2 -LDADD = $(top_builddir)/src/pobj/libpobj.a $(top_builddir)/src/lladd/liblladd.a \ +LDADD = $(top_builddir)/src/pobj/libpobj.a $(top_builddir)/src/stasis/liblladd.a \ $(top_builddir)/src/libdfa/librw.a CLEANFILES = storefile.txt logfile.txt blob0_file.txt blob1_file.txt AM_CFLAGS= -g -Wall -pedantic -std=gnu99 - diff --git a/test/lladd/.cvsignore b/test/stasis/.cvsignore similarity index 100% rename from test/lladd/.cvsignore rename to test/stasis/.cvsignore diff --git a/test/lladd/Makefile.am b/test/stasis/Makefile.am similarity index 93% rename from test/lladd/Makefile.am rename to test/stasis/Makefile.am index 7b85515..bdc5309 100644 --- a/test/lladd/Makefile.am +++ b/test/stasis/Makefile.am @@ -8,8 +8,6 @@ else TESTS = endif noinst_PROGRAMS = $(TESTS) -LDADD = $(top_builddir)/src/lladd/liblladd.a $(top_builddir)/src/libdfa/librw.a #-lefence +LDADD = $(top_builddir)/src/stasis/liblladd.a $(top_builddir)/src/libdfa/librw.a #-lefence CLEANFILES = check_lht.log check_logEntry.log storefile.txt logfile.txt blob0_file.txt blob1_file.txt check_blobRecovery.log check_logWriter.log check_operations.log check_recovery.log check_transactional2.log check_page.log check_bufferManager.log check_indirect.log check_bufferMananger.log check_lladdhash.log check_pageOperations.log check_linearhash.log check_linkedListNTA.log check_linearHashNTA.log check_pageOrientedListNTA.log check_lockManager.log check_compensations.log check_errorhandling.log check_header.log check_iterator.log check_linearHash.log check_ringbuffer.log check_bTree.log AM_CFLAGS=${GLOBAL_CFLAGS} - - diff --git a/test/lladd/check_allocationPolicy.c b/test/stasis/check_allocationPolicy.c similarity index 99% rename from test/lladd/check_allocationPolicy.c rename to test/stasis/check_allocationPolicy.c index 553fd5a..0d57e9f 100644 --- a/test/lladd/check_allocationPolicy.c +++ b/test/stasis/check_allocationPolicy.c @@ -49,7 +49,7 @@ terms specified in this license. #include #include "../check_includes.h" -#include +#include #include #include diff --git a/test/lladd/check_bTree.c b/test/stasis/check_bTree.c similarity index 97% rename from test/lladd/check_bTree.c rename to test/stasis/check_bTree.c index cfd0c09..6b7207e 100644 --- a/test/lladd/check_bTree.c +++ b/test/stasis/check_bTree.c @@ -44,10 +44,10 @@ terms specified in this license. #include #include "../check_includes.h" -#include +#include -#include "../../src/lladd/page.h" +#include "../../src/stasis/page.h" #include #include @@ -223,9 +223,9 @@ int SimpleExample(){ /* Where to find stuff * **************************** - * TpageAlloc -> lladd/src/lladd/operations/pageOperations.c - * TfixedPageAlloc -> lladd/src/lladd/operations/pageOperations.c - * fixedPageInitailze -> lladd/src/lladd/page/fixed.c + * TpageAlloc -> stasis/src/stasis/operations/pageOperations.c + * TfixedPageAlloc -> stasis/src/stasis/operations/pageOperations.c + * fixedPageInitailze -> stasis/src/stasis/page/fixed.c */ diff --git a/test/lladd/check_blobRecovery.c b/test/stasis/check_blobRecovery.c similarity index 98% rename from test/lladd/check_blobRecovery.c rename to test/stasis/check_blobRecovery.c index 0775366..f0f591a 100644 --- a/test/lladd/check_blobRecovery.c +++ b/test/stasis/check_blobRecovery.c @@ -41,12 +41,12 @@ terms specified in this license. ---*/ #include #include -#include +#include -#include -#include -#include "../../src/lladd/logger/logWriter.h" +#include +#include +#include "../../src/stasis/logger/logWriter.h" #include "../check_includes.h" #include diff --git a/test/lladd/check_bufferManager.c b/test/stasis/check_bufferManager.c similarity index 98% rename from test/lladd/check_bufferManager.c rename to test/stasis/check_bufferManager.c index ce95107..210f5e7 100644 --- a/test/lladd/check_bufferManager.c +++ b/test/stasis/check_bufferManager.c @@ -1,9 +1,9 @@ #include #include -#include -#include "../../src/lladd/latches.h" -#include "../../src/lladd/page.h" -#include +#include +#include "../../src/stasis/latches.h" +#include "../../src/stasis/page.h" +#include #include #include #include "../check_includes.h" diff --git a/test/lladd/check_compensations.c b/test/stasis/check_compensations.c similarity index 99% rename from test/lladd/check_compensations.c rename to test/stasis/check_compensations.c index d98a112..5d93c43 100644 --- a/test/lladd/check_compensations.c +++ b/test/stasis/check_compensations.c @@ -44,7 +44,7 @@ terms specified in this license. #include #include #include -#include +#include #include #include "../check_includes.h" diff --git a/test/lladd/check_errorHandling.c b/test/stasis/check_errorHandling.c similarity index 94% rename from test/lladd/check_errorHandling.c rename to test/stasis/check_errorHandling.c index db77ae8..7e960e2 100644 --- a/test/lladd/check_errorHandling.c +++ b/test/stasis/check_errorHandling.c @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include #include diff --git a/test/lladd/check_header.c b/test/stasis/check_header.c similarity index 99% rename from test/lladd/check_header.c rename to test/stasis/check_header.c index 4eb810b..5622241 100644 --- a/test/lladd/check_header.c +++ b/test/stasis/check_header.c @@ -42,7 +42,7 @@ terms specified in this license. #include #include #include -#include +#include #include "../check_includes.h" #include diff --git a/test/lladd/check_indirect.c b/test/stasis/check_indirect.c similarity index 98% rename from test/lladd/check_indirect.c rename to test/stasis/check_indirect.c index 992e10b..0e2f59d 100644 --- a/test/lladd/check_indirect.c +++ b/test/stasis/check_indirect.c @@ -45,9 +45,9 @@ terms specified in this license. #include #include "../check_includes.h" -#include -#include "src/lladd/page.h" -#include "../../src/lladd/page/indirect.h" +#include +#include "src/stasis/page.h" +#include "../../src/stasis/page/indirect.h" #include diff --git a/test/lladd/check_io.c b/test/stasis/check_io.c similarity index 99% rename from test/lladd/check_io.c rename to test/stasis/check_io.c index a38ae4f..aa28f51 100644 --- a/test/lladd/check_io.c +++ b/test/stasis/check_io.c @@ -40,7 +40,7 @@ terms specified in this license. ---*/ #include #include -#include +#include #include diff --git a/test/lladd/check_iterator.c b/test/stasis/check_iterator.c similarity index 99% rename from test/lladd/check_iterator.c rename to test/stasis/check_iterator.c index 372176e..dc09204 100644 --- a/test/lladd/check_iterator.c +++ b/test/stasis/check_iterator.c @@ -41,7 +41,7 @@ terms specified in this license. ---*/ #include -#include +#include #include #include #include diff --git a/test/lladd/check_lht.c b/test/stasis/check_lht.c similarity index 100% rename from test/lladd/check_lht.c rename to test/stasis/check_lht.c diff --git a/test/lladd/check_lhtable.c b/test/stasis/check_lhtable.c similarity index 99% rename from test/lladd/check_lhtable.c rename to test/stasis/check_lhtable.c index adb11f8..026d646 100644 --- a/test/lladd/check_lhtable.c +++ b/test/stasis/check_lhtable.c @@ -47,7 +47,7 @@ terms specified in this license. #include #include -#include +#include #include #include #include diff --git a/test/lladd/check_linearHash.c b/test/stasis/check_linearHash.c similarity index 99% rename from test/lladd/check_linearHash.c rename to test/stasis/check_linearHash.c index 641ef26..ad1b040 100644 --- a/test/lladd/check_linearHash.c +++ b/test/stasis/check_linearHash.c @@ -44,10 +44,10 @@ terms specified in this license. #include #include "../check_includes.h" -#include +#include #include -#include +#include #include #include diff --git a/test/lladd/check_linearHashNTA.c b/test/stasis/check_linearHashNTA.c similarity index 99% rename from test/lladd/check_linearHashNTA.c rename to test/stasis/check_linearHashNTA.c index 293736d..046b4ae 100644 --- a/test/lladd/check_linearHashNTA.c +++ b/test/stasis/check_linearHashNTA.c @@ -44,7 +44,7 @@ terms specified in this license. #include #include "../check_includes.h" -#include +#include #include #include diff --git a/test/lladd/check_linkedListNTA.c b/test/stasis/check_linkedListNTA.c similarity index 99% rename from test/lladd/check_linkedListNTA.c rename to test/stasis/check_linkedListNTA.c index 7fdf3a2..9680937 100644 --- a/test/lladd/check_linkedListNTA.c +++ b/test/stasis/check_linkedListNTA.c @@ -44,7 +44,7 @@ terms specified in this license. #include #include "../check_includes.h" -#include +#include #include #include diff --git a/test/lladd/check_lockManager.c b/test/stasis/check_lockManager.c similarity index 97% rename from test/lladd/check_lockManager.c rename to test/stasis/check_lockManager.c index 302fa27..d42c285 100644 --- a/test/lladd/check_lockManager.c +++ b/test/stasis/check_lockManager.c @@ -1,10 +1,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include "../check_includes.h" #include diff --git a/test/lladd/check_logEntry.c b/test/stasis/check_logEntry.c similarity index 99% rename from test/lladd/check_logEntry.c rename to test/stasis/check_logEntry.c index f275ac0..a277e34 100644 --- a/test/lladd/check_logEntry.c +++ b/test/stasis/check_logEntry.c @@ -44,7 +44,7 @@ terms specified in this license. #include #include -#include +#include #include "../check_includes.h" diff --git a/test/lladd/check_logWriter.c b/test/stasis/check_logWriter.c similarity index 98% rename from test/lladd/check_logWriter.c rename to test/stasis/check_logWriter.c index 7aba670..5469531 100644 --- a/test/lladd/check_logWriter.c +++ b/test/stasis/check_logWriter.c @@ -50,16 +50,16 @@ terms specified in this license. #include #include -#include -#include "../../src/lladd/logger/logHandle.h" -#include -#include "../../src/lladd/logger/logWriter.h" +#include +#include "../../src/stasis/logger/logHandle.h" +#include +#include "../../src/stasis/logger/logWriter.h" -#include "../../src/lladd/latches.h" +#include "../../src/stasis/latches.h" #include #include #include "../check_includes.h" -#include +#include extern int numActiveXactions; diff --git a/test/lladd/check_logicalLinearHash.c b/test/stasis/check_logicalLinearHash.c similarity index 99% rename from test/lladd/check_logicalLinearHash.c rename to test/stasis/check_logicalLinearHash.c index 2246cac..a8fb90f 100644 --- a/test/lladd/check_logicalLinearHash.c +++ b/test/stasis/check_logicalLinearHash.c @@ -44,11 +44,11 @@ terms specified in this license. #include #include "../check_includes.h" -#include +#include #include #include -#include +#include #include #include diff --git a/test/lladd/check_multiplexer.c b/test/stasis/check_multiplexer.c similarity index 98% rename from test/lladd/check_multiplexer.c rename to test/stasis/check_multiplexer.c index 437667a..6c0ec0f 100644 --- a/test/lladd/check_multiplexer.c +++ b/test/stasis/check_multiplexer.c @@ -40,7 +40,7 @@ permission to use and distribute the software in accordance with the terms specified in this license. ---*/ #include -#include +#include #include #include #include @@ -50,9 +50,8 @@ terms specified in this license. #include "../check_includes.h" -#include -#include "../../src/lladd/logger/logMemory.h" -//#include +#include +#include "../../src/stasis/logger/logMemory.h" #include #include diff --git a/test/lladd/check_operations.c b/test/stasis/check_operations.c similarity index 98% rename from test/lladd/check_operations.c rename to test/stasis/check_operations.c index bf2977f..5221db6 100644 --- a/test/lladd/check_operations.c +++ b/test/stasis/check_operations.c @@ -42,12 +42,12 @@ terms specified in this license. #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../check_includes.h" -#include "../../src/lladd/page.h" +#include "../../src/stasis/page.h" #define LOG_NAME "check_operations.log" #include diff --git a/test/lladd/check_page.c b/test/stasis/check_page.c similarity index 98% rename from test/lladd/check_page.c rename to test/stasis/check_page.c index aac9d02..e63b3cb 100644 --- a/test/lladd/check_page.c +++ b/test/stasis/check_page.c @@ -44,13 +44,13 @@ terms specified in this license. #include #include -#include "../../src/lladd/page.h" -#include "../../src/lladd/page/slotted.h" -#include "../../src/lladd/blobManager.h" -#include -#include +#include "../../src/stasis/page.h" +#include "../../src/stasis/page/slotted.h" +#include "../../src/stasis/blobManager.h" +#include +#include -#include "../../src/lladd/latches.h" +#include "../../src/stasis/latches.h" #include #include #include "../check_includes.h" diff --git a/test/lladd/check_pageOperations.c b/test/stasis/check_pageOperations.c similarity index 95% rename from test/lladd/check_pageOperations.c rename to test/stasis/check_pageOperations.c index 45916f8..755d131 100644 --- a/test/lladd/check_pageOperations.c +++ b/test/stasis/check_pageOperations.c @@ -44,19 +44,19 @@ terms specified in this license. #include #include -#include "../../src/lladd/page.h" -#include -#include -#include -#include +#include "../../src/stasis/page.h" +#include +#include +#include +#include -#include "../../src/lladd/latches.h" +#include "../../src/stasis/latches.h" #include #include #include "../check_includes.h" #define LOG_NAME "check_pageOperations.log" -#include "../../src/lladd/logger/logWriter.h" +#include "../../src/stasis/logger/logWriter.h" extern int numActiveXactions; START_TEST(pageOpCheckRecovery) { diff --git a/test/lladd/check_pageOrientedList.c b/test/stasis/check_pageOrientedList.c similarity index 99% rename from test/lladd/check_pageOrientedList.c rename to test/stasis/check_pageOrientedList.c index 0c16736..0b8de81 100644 --- a/test/lladd/check_pageOrientedList.c +++ b/test/stasis/check_pageOrientedList.c @@ -43,7 +43,7 @@ terms specified in this license. #include #include -#include +#include #include #include "../check_includes.h" diff --git a/test/lladd/check_rangeTracker.c b/test/stasis/check_rangeTracker.c similarity index 99% rename from test/lladd/check_rangeTracker.c rename to test/stasis/check_rangeTracker.c index 9607fda..ea57249 100644 --- a/test/lladd/check_rangeTracker.c +++ b/test/stasis/check_rangeTracker.c @@ -1,12 +1,12 @@ #include #include #include -#include +#include #define LOG_NAME "check_rangeTracker.log" #define QUANTIZATION 7 -#include +#include #include "../check_includes.h" diff --git a/test/lladd/check_recovery.c b/test/stasis/check_recovery.c similarity index 98% rename from test/lladd/check_recovery.c rename to test/stasis/check_recovery.c index 9c05938..cd60453 100644 --- a/test/lladd/check_recovery.c +++ b/test/stasis/check_recovery.c @@ -43,10 +43,10 @@ terms specified in this license. #include #include -#include -#include -#include -#include "../../src/lladd/logger/logWriter.h" +#include +#include +#include +#include "../../src/stasis/logger/logWriter.h" #include "../check_includes.h" #define LOG_NAME "check_recovery.log" diff --git a/test/lladd/check_regions.c b/test/stasis/check_regions.c similarity index 98% rename from test/lladd/check_regions.c rename to test/stasis/check_regions.c index 93f4c4b..0bdb4b8 100644 --- a/test/lladd/check_regions.c +++ b/test/stasis/check_regions.c @@ -40,11 +40,11 @@ terms specified in this license. ---*/ #include #include -#include -#include <../../src/lladd/latches.h> +#include +#include <../../src/stasis/latches.h> #include -#include +#include #include "../check_includes.h" #define LOG_NAME "check_regions.log" diff --git a/test/lladd/check_replacementPolicy.c b/test/stasis/check_replacementPolicy.c similarity index 96% rename from test/lladd/check_replacementPolicy.c rename to test/stasis/check_replacementPolicy.c index 6bf8de3..6ee0ed2 100644 --- a/test/lladd/check_replacementPolicy.c +++ b/test/stasis/check_replacementPolicy.c @@ -1,9 +1,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "../check_includes.h" diff --git a/test/lladd/check_ringbuffer.c b/test/stasis/check_ringbuffer.c similarity index 99% rename from test/lladd/check_ringbuffer.c rename to test/stasis/check_ringbuffer.c index bafdcde..5a13b31 100644 --- a/test/lladd/check_ringbuffer.c +++ b/test/stasis/check_ringbuffer.c @@ -43,7 +43,7 @@ terms specified in this license. #include #include -#include +#include #include #include "../check_includes.h" diff --git a/test/lladd/check_transactional2.c b/test/stasis/check_transactional2.c similarity index 99% rename from test/lladd/check_transactional2.c rename to test/stasis/check_transactional2.c index ece8662..6e8f128 100644 --- a/test/lladd/check_transactional2.c +++ b/test/stasis/check_transactional2.c @@ -40,11 +40,11 @@ terms specified in this license. ---*/ #include #include -#include -#include <../../src/lladd/latches.h> +#include +#include <../../src/stasis/latches.h> #include -#include +#include #include "../check_includes.h" #define LOG_NAME "check_transactional2.log" #define THREAD_COUNT 25 diff --git a/utilities/Makefile.am b/utilities/Makefile.am index 9ffd59f..4694f5a 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -1,6 +1,6 @@ #LDADD=$(top_builddir)/src/2pc/lib2pc.a $(top_builddir)/src/libdfa/libdfa.a -LDADD=$(top_builddir)/src/lladd/liblladd.a \ +LDADD=$(top_builddir)/src/stasis/liblladd.a \ $(top_builddir)/src/libdfa/librw.a bin_PROGRAMS=logfile_dump run_recovery truncate_log AM_CFLAGS=${GLOBAL_CFLAGS} diff --git a/utilities/logfile_dump.c b/utilities/logfile_dump.c index 551a4e8..3a3b4da 100644 --- a/utilities/logfile_dump.c +++ b/utilities/logfile_dump.c @@ -2,8 +2,8 @@ #include #include -#include "../src/lladd/logger/logHandle.h" -#include "../src/lladd/logger/logWriter.h" +#include "../src/stasis/logger/logHandle.h" +#include "../src/stasis/logger/logWriter.h" static char * logEntryToString(const LogEntry * le) { diff --git a/utilities/run_recovery.c b/utilities/run_recovery.c index 5b390bd..b071f31 100644 --- a/utilities/run_recovery.c +++ b/utilities/run_recovery.c @@ -1,8 +1,7 @@ -#include +#include int main(void) { Tinit(); Tdeinit(); return compensation_error(); } - diff --git a/utilities/swig/Makefile.am b/utilities/swig/Makefile.am index 2c24e27..0771b3a 100644 --- a/utilities/swig/Makefile.am +++ b/utilities/swig/Makefile.am @@ -1,13 +1,13 @@ -BUILT_SOURCES = lladd_wrap.cc +BUILT_SOURCES = stasis_wrap.cc all: $(BUILD_SOURCES) -pkgpython_PYTHON = lladd.py -pkgpyexec_LTLIBRARIES = _lladd.la -_lladd_la_SOURCES = lladd_wrap.cc -_lladd_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/src -_lladd_la_LDFLAGS = -module -_lladd_la_LIBADD = $(top_srcdir)/src/lladd/liblladd.a $(top_srcdir)/src/libdfa/librw.a +pkgpython_PYTHON = stasis.py +pkgpyexec_LTLIBRARIES = _stasis.la +_stasis_la_SOURCES = stasis_wrap.cc +_stasis_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/src +_stasis_la_LDFLAGS = -module +_stasis_la_LIBADD = $(top_srcdir)/src/stasis/liblladd.a $(top_srcdir)/src/libdfa/librw.a -lladd_wrap.cc : lladd.i +stasis_wrap.cc : lladd.i $(SWIG) $(SWIG_PYTHON_OPT) -I$(top_srcdir)/src -I$(top_srcdir) -o $@ $< diff --git a/utilities/swig/ex1.py b/utilities/swig/ex1.py index c12f76e..dd5b880 100644 --- a/utilities/swig/ex1.py +++ b/utilities/swig/ex1.py @@ -4,42 +4,42 @@ """Example 1 in Python """ -import lladd +import stasis import sys import array def runit(argv): print "init" - lladd.Tinit() + stasis.Tinit() # First transaction, for writing print "begin & alloc" - xid = lladd.Tbegin(); - record_id = lladd.Talloc(xid, 4); + xid = stasis.Tbegin(); + record_id = stasis.Talloc(xid, 4); print "update" write_data = array.array('l', (42,)) data_out = write_data.tostring() assert len(data_out) == 4 - lladd.TupdateStr(xid, record_id, data_out, lladd.OPERATION_SET) - lladd.Tcommit(xid) + stasis.TupdateStr(xid, record_id, data_out, stasis.OPERATION_SET) + stasis.Tcommit(xid) # Second transaction, for reading print "read" - xid = lladd.Tbegin() + xid = stasis.Tbegin() # Read from Stasis into memory for data_in data_in = '1234' - lladd.TreadStr(xid, record_id, data_in) + stasis.TreadStr(xid, record_id, data_in) read_data = array.array('l', data_in) assert read_data[0] == 42 print "done" - lladd.Tdealloc(xid, record_id) - lladd.Tabort(xid) + stasis.Tdealloc(xid, record_id) + stasis.Tabort(xid) - lladd.Tdeinit() + stasis.Tdeinit() if __name__ == "__main__": diff --git a/utilities/swig/lladd.i b/utilities/swig/lladd.i index 55f2d4e..96923b0 100644 --- a/utilities/swig/lladd.i +++ b/utilities/swig/lladd.i @@ -1,6 +1,6 @@ -%module lladd +%module stasis %{ -#include "lladd/transactional.h" +#include "stasis/transactional.h" %} extern int Tinit(); @@ -32,6 +32,6 @@ extern recordid Talloc(int xid, unsigned long size); extern recordid TallocFromPage(int xid, long page, unsigned long size); extern void Tdealloc(int xid, recordid rid); -%include "lladd/constants.h" +%include "stasis/constants.h" diff --git a/utilities/truncate_log.c b/utilities/truncate_log.c index 4d583fb..4235d94 100644 --- a/utilities/truncate_log.c +++ b/utilities/truncate_log.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include int main(void) { Tinit(); truncateNow(); @@ -7,4 +7,3 @@ int main(void) { return compensation_error(); } -