From afbd89e3ffd9812eaa93f888eb031442264275ff Mon Sep 17 00:00:00 2001 From: Sears Russell Date: Sun, 13 Apr 2008 04:02:57 +0000 Subject: [PATCH] All headers now live in the header directory. (stasis/, not src/stasis) --- benchmarks/transitiveClosure.c | 2 +- benchmarks/zeroCopy.c | 2 +- src/stasis/blobManager.c | 2 +- src/stasis/bufferManager.c | 8 ++++---- src/stasis/bufferPool.c | 2 +- src/stasis/common.c | 2 +- src/stasis/fifo.c | 2 +- src/stasis/graph.c | 2 +- src/stasis/io.c | 2 +- src/stasis/iterator.c | 2 +- src/stasis/lhtable.c | 2 +- src/stasis/linkedlist.c | 2 +- src/stasis/lockManager.c | 2 +- src/stasis/logger/inMemoryLog.c | 4 ++-- src/stasis/logger/logEntry.c | 2 +- src/stasis/logger/logHandle.c | 2 +- src/stasis/logger/logMemory.c | 2 +- src/stasis/logger/logWriter.c | 4 ++-- src/stasis/logger/logger2.c | 6 +++--- src/stasis/multiplexer.c | 2 +- src/stasis/operations.c | 2 +- src/stasis/operations/alloc.c | 4 ++-- src/stasis/operations/arrayList.c | 2 +- src/stasis/operations/bTree.c | 4 ++-- src/stasis/operations/decrement.c | 2 +- src/stasis/operations/increment.c | 2 +- src/stasis/operations/instantSet.c | 2 +- src/stasis/operations/linearHash.c | 2 +- src/stasis/operations/linearHashNTA.c | 4 ++-- src/stasis/operations/linkedListNTA.c | 2 +- src/stasis/operations/lsmTree.c | 2 +- src/stasis/operations/naiveLinearHash.c | 2 +- src/stasis/operations/nestedTopActions.c | 2 +- src/stasis/operations/noop.c | 2 +- src/stasis/operations/pageOperations.c | 2 +- src/stasis/operations/regions.c | 2 +- src/stasis/operations/set.c | 2 +- src/stasis/page.c | 12 ++++++------ src/stasis/page/fixed.c | 4 ++-- src/stasis/page/indirect.c | 8 ++++---- src/stasis/page/slotted.c | 4 ++-- src/stasis/pageCache.c | 2 +- src/stasis/pageFile.c | 4 ++-- src/stasis/pageHandle.c | 2 +- src/stasis/recovery2.c | 6 +++--- src/stasis/stats.c | 2 +- src/stasis/transactional2.c | 6 +++--- src/stasis/truncation.c | 2 +- {src/stasis => stasis}/blobManager.h | 2 +- {src/stasis => stasis}/bufferManager/bufferHash.h | 0 {src/stasis => stasis}/bufferManager/pageArray.h | 0 {src/stasis => stasis}/io.h | 0 {src/stasis => stasis}/latches.h | 0 {src/stasis => stasis}/linkedlist.h | 0 {src/stasis => stasis}/logger/inMemoryLog.h | 0 {src/stasis => stasis}/logger/logHandle.h | 0 {src/stasis => stasis}/logger/logMemory.h | 0 {src/stasis => stasis}/logger/logWriter.h | 0 {src/stasis => stasis}/operations/lsmIterators.h | 0 {src/stasis => stasis}/operations/lsmTable.h | 0 {src/stasis => stasis}/operations/lsmWorkers.h | 0 {src/stasis => stasis/operations}/pageFile.h | 0 {src/stasis => stasis}/page.h | 2 +- .../stasis => stasis}/page/compression/compression.h | 0 {src/stasis => stasis}/page/compression/for-impl.h | 0 {src/stasis => stasis}/page/compression/for.h | 0 .../page/compression/multicolumn-impl.h | 0 .../stasis => stasis}/page/compression/multicolumn.h | 0 {src/stasis => stasis}/page/compression/nop.h | 0 {src/stasis => stasis}/page/compression/pageLayout.h | 0 .../page/compression/pluginDispatcher.h | 0 {src/stasis => stasis}/page/compression/pstar-impl.h | 0 {src/stasis => stasis}/page/compression/pstar.h | 0 {src/stasis => stasis}/page/compression/rle-impl.h | 0 {src/stasis => stasis}/page/compression/rle.h | 0 .../page/compression/staticMulticolumn.h | 0 .../stasis => stasis}/page/compression/staticTuple.h | 0 {src/stasis => stasis}/page/compression/tuple.h | 0 {src/stasis => stasis}/page/fixed.h | 0 {src/stasis => stasis}/page/header.h | 0 {src/stasis => stasis}/page/indirect.h | 0 {src/stasis => stasis}/page/raw.h | 2 +- {src/stasis => stasis}/page/slotted.h | 0 stasis/pageFile.h | 7 +++++++ test/stasis/check_bTree.c | 2 +- test/stasis/check_blobRecovery.c | 1 - test/stasis/check_bufferManager.c | 4 ++-- test/stasis/check_indirect.c | 4 ++-- test/stasis/check_logWriter.c | 6 +++--- test/stasis/check_multiplexer.c | 2 +- test/stasis/check_operations.c | 2 +- test/stasis/check_page.c | 10 +++++----- test/stasis/check_pageOperations.c | 5 ++--- test/stasis/check_recovery.c | 1 - utilities/logfile_dump.c | 4 ++-- 95 files changed, 102 insertions(+), 98 deletions(-) rename {src/stasis => stasis}/blobManager.h (98%) rename {src/stasis => stasis}/bufferManager/bufferHash.h (100%) rename {src/stasis => stasis}/bufferManager/pageArray.h (100%) rename {src/stasis => stasis}/io.h (100%) rename {src/stasis => stasis}/latches.h (100%) rename {src/stasis => stasis}/linkedlist.h (100%) rename {src/stasis => stasis}/logger/inMemoryLog.h (100%) rename {src/stasis => stasis}/logger/logHandle.h (100%) rename {src/stasis => stasis}/logger/logMemory.h (100%) rename {src/stasis => stasis}/logger/logWriter.h (100%) rename {src/stasis => stasis}/operations/lsmIterators.h (100%) rename {src/stasis => stasis}/operations/lsmTable.h (100%) rename {src/stasis => stasis}/operations/lsmWorkers.h (100%) rename {src/stasis => stasis/operations}/pageFile.h (100%) rename {src/stasis => stasis}/page.h (99%) rename {src/stasis => stasis}/page/compression/compression.h (100%) rename {src/stasis => stasis}/page/compression/for-impl.h (100%) rename {src/stasis => stasis}/page/compression/for.h (100%) rename {src/stasis => stasis}/page/compression/multicolumn-impl.h (100%) rename {src/stasis => stasis}/page/compression/multicolumn.h (100%) rename {src/stasis => stasis}/page/compression/nop.h (100%) rename {src/stasis => stasis}/page/compression/pageLayout.h (100%) rename {src/stasis => stasis}/page/compression/pluginDispatcher.h (100%) rename {src/stasis => stasis}/page/compression/pstar-impl.h (100%) rename {src/stasis => stasis}/page/compression/pstar.h (100%) rename {src/stasis => stasis}/page/compression/rle-impl.h (100%) rename {src/stasis => stasis}/page/compression/rle.h (100%) rename {src/stasis => stasis}/page/compression/staticMulticolumn.h (100%) rename {src/stasis => stasis}/page/compression/staticTuple.h (100%) rename {src/stasis => stasis}/page/compression/tuple.h (100%) rename {src/stasis => stasis}/page/fixed.h (100%) rename {src/stasis => stasis}/page/header.h (100%) rename {src/stasis => stasis}/page/indirect.h (100%) rename {src/stasis => stasis}/page/raw.h (99%) rename {src/stasis => stasis}/page/slotted.h (100%) create mode 100644 stasis/pageFile.h diff --git a/benchmarks/transitiveClosure.c b/benchmarks/transitiveClosure.c index 5bde2ef..2eaf6b1 100644 --- a/benchmarks/transitiveClosure.c +++ b/benchmarks/transitiveClosure.c @@ -1,7 +1,7 @@ #include #include #include -#include "../src/stasis/logger/logMemory.h" +#include #include #include #include diff --git a/benchmarks/zeroCopy.c b/benchmarks/zeroCopy.c index 4288c03..5d09024 100644 --- a/benchmarks/zeroCopy.c +++ b/benchmarks/zeroCopy.c @@ -3,7 +3,7 @@ #include #include #include -#include "../src/stasis/page/raw.h" +#include #include int main(int argc, char** argv) { diff --git a/src/stasis/blobManager.c b/src/stasis/blobManager.c index eb1cc6a..2585035 100644 --- a/src/stasis/blobManager.c +++ b/src/stasis/blobManager.c @@ -1,6 +1,6 @@ #include #include -#include "page/raw.h" +#include #include diff --git a/src/stasis/bufferManager.c b/src/stasis/bufferManager.c index 2efdf54..cd6cdd6 100644 --- a/src/stasis/bufferManager.c +++ b/src/stasis/bufferManager.c @@ -61,12 +61,12 @@ terms specified in this license. #endif #include -#include "latches.h" +#include #include #include -#include "bufferManager/pageArray.h" -#include "bufferManager/bufferHash.h" +#include +#include #include #include @@ -74,7 +74,7 @@ terms specified in this license. #include #include -#include "page.h" +#include #undef loadPage #undef releasePage diff --git a/src/stasis/bufferPool.c b/src/stasis/bufferPool.c index f45df3d..d11f8e9 100644 --- a/src/stasis/bufferPool.c +++ b/src/stasis/bufferPool.c @@ -54,7 +54,7 @@ terms specified in this license. #include #include #include -#include "page.h" +#include /* TODO: Combine with buffer size... */ static int nextPage = 0; static pthread_mutex_t pageMallocMutex; diff --git a/src/stasis/common.c b/src/stasis/common.c index fa3ee11..a7014c6 100644 --- a/src/stasis/common.c +++ b/src/stasis/common.c @@ -3,7 +3,7 @@ #include #include -#include "latches.h" +#include #include #include diff --git a/src/stasis/fifo.c b/src/stasis/fifo.c index 04ee126..1449eeb 100644 --- a/src/stasis/fifo.c +++ b/src/stasis/fifo.c @@ -2,7 +2,7 @@ #include #include #include -#include "logger/logMemory.h" +#include #include #include diff --git a/src/stasis/graph.c b/src/stasis/graph.c index cfd5e3b..baa8846 100644 --- a/src/stasis/graph.c +++ b/src/stasis/graph.c @@ -2,7 +2,7 @@ #include #include #include -#include "page.h" +#include #include int numOut = 0; diff --git a/src/stasis/io.c b/src/stasis/io.c index 9e40278..b6687ea 100644 --- a/src/stasis/io.c +++ b/src/stasis/io.c @@ -1,5 +1,5 @@ #include -#include "io.h" +#include #include /** @file diff --git a/src/stasis/iterator.c b/src/stasis/iterator.c index d304f01..57bfa64 100644 --- a/src/stasis/iterator.c +++ b/src/stasis/iterator.c @@ -4,7 +4,7 @@ #include #include -#include "logger/logMemory.h" +#include static lladdIterator_def_t iterators[MAX_ITERATOR_TYPES]; diff --git a/src/stasis/lhtable.c b/src/stasis/lhtable.c index 4e892b5..969436b 100644 --- a/src/stasis/lhtable.c +++ b/src/stasis/lhtable.c @@ -5,7 +5,7 @@ #include #include #include -#include "latches.h" +#include #define FILL_FACTOR (0.5) diff --git a/src/stasis/linkedlist.c b/src/stasis/linkedlist.c index 1b414b7..e07eef2 100644 --- a/src/stasis/linkedlist.c +++ b/src/stasis/linkedlist.c @@ -47,7 +47,7 @@ terms specified in this license. #include #include -#include "linkedlist.h" +#include #include diff --git a/src/stasis/lockManager.c b/src/stasis/lockManager.c index 3399f19..a01046a 100644 --- a/src/stasis/lockManager.c +++ b/src/stasis/lockManager.c @@ -3,7 +3,7 @@ #include #include #include -#include "latches.h" +#include #include #include #include diff --git a/src/stasis/logger/inMemoryLog.c b/src/stasis/logger/inMemoryLog.c index 05bca33..584b559 100644 --- a/src/stasis/logger/inMemoryLog.c +++ b/src/stasis/logger/inMemoryLog.c @@ -1,5 +1,5 @@ -#include "inMemoryLog.h" -#include "../latches.h" +#include +#include #include #include static rwl * flushedLSN_lock; diff --git a/src/stasis/logger/logEntry.c b/src/stasis/logger/logEntry.c index d295824..4eb50f0 100644 --- a/src/stasis/logger/logEntry.c +++ b/src/stasis/logger/logEntry.c @@ -45,7 +45,7 @@ terms specified in this license. #include -#include "../page.h" // For stasis_record_type_to_size() +#include // For stasis_record_type_to_size() #include // needed for LoggerSizeOfInternalLogEntry() #include #include diff --git a/src/stasis/logger/logHandle.c b/src/stasis/logger/logHandle.c index 3843d09..4f319aa 100644 --- a/src/stasis/logger/logHandle.c +++ b/src/stasis/logger/logHandle.c @@ -44,7 +44,7 @@ terms specified in this license. #include -#include "logHandle.h" +#include /** Sets the next and prev field of h, but does not set h.file_offset. diff --git a/src/stasis/logger/logMemory.c b/src/stasis/logger/logMemory.c index f80dc22..f74b08c 100644 --- a/src/stasis/logger/logMemory.c +++ b/src/stasis/logger/logMemory.c @@ -5,7 +5,7 @@ #include #include -#include "logMemory.h" +#include #include #include diff --git a/src/stasis/logger/logWriter.c b/src/stasis/logger/logWriter.c index c537cbb..21a43ff 100644 --- a/src/stasis/logger/logWriter.c +++ b/src/stasis/logger/logWriter.c @@ -57,8 +57,8 @@ terms specified in this license. #include #include -#include "logWriter.h" -#include "logHandle.h" +#include +#include #include #include #include diff --git a/src/stasis/logger/logger2.c b/src/stasis/logger/logger2.c index 970946c..5b278d0 100644 --- a/src/stasis/logger/logger2.c +++ b/src/stasis/logger/logger2.c @@ -55,9 +55,9 @@ terms specified in this license. #include -#include "logWriter.h" -#include "inMemoryLog.h" -#include "../page.h" +#include +#include +#include #ifdef USE_LOGGER int loggerType = USE_LOGGER; diff --git a/src/stasis/multiplexer.c b/src/stasis/multiplexer.c index 17dc5ef..e538dca 100644 --- a/src/stasis/multiplexer.c +++ b/src/stasis/multiplexer.c @@ -3,7 +3,7 @@ #include #include -#include "logger/logMemory.h" +#include lladdMultiplexer_t * lladdMultiplexer_alloc(int xid, lladdIterator_t * it, void (*multiplexer)(byte * key, diff --git a/src/stasis/operations.c b/src/stasis/operations.c index 3fd6f10..990a08e 100644 --- a/src/stasis/operations.c +++ b/src/stasis/operations.c @@ -50,7 +50,7 @@ terms specified in this license. #include #include -#include "page.h" +#include Operation operationsTable[MAX_OPERATIONS]; diff --git a/src/stasis/operations/alloc.c b/src/stasis/operations/alloc.c index 3798633..5201282 100644 --- a/src/stasis/operations/alloc.c +++ b/src/stasis/operations/alloc.c @@ -6,8 +6,8 @@ #include #include #include -#include "../blobManager.h" -#include "../page.h" +#include +#include #include //try{ /** diff --git a/src/stasis/operations/arrayList.c b/src/stasis/operations/arrayList.c index 905d42a..8e6ce3d 100644 --- a/src/stasis/operations/arrayList.c +++ b/src/stasis/operations/arrayList.c @@ -2,7 +2,7 @@ #include #include -#include "../page.h" +#include #include #include #include diff --git a/src/stasis/operations/bTree.c b/src/stasis/operations/bTree.c index 174440a..25abe4f 100644 --- a/src/stasis/operations/bTree.c +++ b/src/stasis/operations/bTree.c @@ -1,6 +1,6 @@ #define __USE_GNU #define _GNU_SOURCE -#include "../latches.h" +#include #include #include #include @@ -9,7 +9,7 @@ #include #include #include -#include "../logger/logMemory.h" +#include #include int HelloWorld(){ diff --git a/src/stasis/operations/decrement.c b/src/stasis/operations/decrement.c index 8ea32d1..aa771c8 100644 --- a/src/stasis/operations/decrement.c +++ b/src/stasis/operations/decrement.c @@ -46,7 +46,7 @@ terms specified in this license. *********************************************/ #include -#include "../page.h" +#include static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) { int i; diff --git a/src/stasis/operations/increment.c b/src/stasis/operations/increment.c index 55de26b..549c298 100644 --- a/src/stasis/operations/increment.c +++ b/src/stasis/operations/increment.c @@ -46,7 +46,7 @@ terms specified in this license. **********************************************/ #include -#include "../page.h" +#include static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) { int i; diff --git a/src/stasis/operations/instantSet.c b/src/stasis/operations/instantSet.c index 0f32a1c..f911be5 100644 --- a/src/stasis/operations/instantSet.c +++ b/src/stasis/operations/instantSet.c @@ -46,7 +46,7 @@ terms specified in this license. **********************************************/ #include -#include "../page.h" +#include static int operate(int xid, Page *p, lsn_t lsn, recordid rid, const void *dat) { stasis_record_write(xid, p, lsn, rid, dat); diff --git a/src/stasis/operations/linearHash.c b/src/stasis/operations/linearHash.c index 50a290c..9ed282c 100644 --- a/src/stasis/operations/linearHash.c +++ b/src/stasis/operations/linearHash.c @@ -4,7 +4,7 @@ #include #include #include -#include "../page.h" +#include /** diff --git a/src/stasis/operations/linearHashNTA.c b/src/stasis/operations/linearHashNTA.c index 7e787d7..31cc042 100644 --- a/src/stasis/operations/linearHashNTA.c +++ b/src/stasis/operations/linearHashNTA.c @@ -1,6 +1,6 @@ #define __USE_GNU #define _GNU_SOURCE -#include "../latches.h" +#include #include #include #include @@ -8,7 +8,7 @@ // The next two #includes are for deprecated code. #include #include -#include "../logger/logMemory.h" +#include /** re-entrant implementation of a linear hash hable, using nested top actions. diff --git a/src/stasis/operations/linkedListNTA.c b/src/stasis/operations/linkedListNTA.c index fb4eb1b..eafdc4a 100644 --- a/src/stasis/operations/linkedListNTA.c +++ b/src/stasis/operations/linkedListNTA.c @@ -1,7 +1,7 @@ #define __USE_GNU #define _GNU_SOURCE -#include "../latches.h" +#include #include #include #include diff --git a/src/stasis/operations/lsmTree.c b/src/stasis/operations/lsmTree.c index 9534525..c243452 100644 --- a/src/stasis/operations/lsmTree.c +++ b/src/stasis/operations/lsmTree.c @@ -5,7 +5,7 @@ #include // XXX including fixed.h breaks page api encapsulation; we need a "last slot" // call. -#include "../page/fixed.h" +#include #include static lsm_comparator_t comparators[MAX_LSM_COMPARATORS]; diff --git a/src/stasis/operations/naiveLinearHash.c b/src/stasis/operations/naiveLinearHash.c index dc33bd7..62c4d67 100644 --- a/src/stasis/operations/naiveLinearHash.c +++ b/src/stasis/operations/naiveLinearHash.c @@ -2,7 +2,7 @@ #include #include #include -#include "../latches.h" +#include /** A from-scratch implementation of linear hashing. Uses the diff --git a/src/stasis/operations/nestedTopActions.c b/src/stasis/operations/nestedTopActions.c index 269c8e7..19943ef 100644 --- a/src/stasis/operations/nestedTopActions.c +++ b/src/stasis/operations/nestedTopActions.c @@ -51,7 +51,7 @@ terms specified in this license. #include #include #include -#include "../latches.h" +#include #include /** @todo Remove extern declaration of transactional_2_mutex from nestedTopActions.c */ extern pthread_mutex_t transactional_2_mutex; diff --git a/src/stasis/operations/noop.c b/src/stasis/operations/noop.c index bd546fa..a55803e 100644 --- a/src/stasis/operations/noop.c +++ b/src/stasis/operations/noop.c @@ -46,7 +46,7 @@ terms specified in this license. **********************************************/ #include -#include "../page.h" +#include int noop(int xid, Page *p, lsn_t lsn, recordid rid, const void *dat) { /* If p is null, then this is a logical no-op that spans pages, so do nothing. diff --git a/src/stasis/operations/pageOperations.c b/src/stasis/operations/pageOperations.c index e9bcf07..ac263ec 100644 --- a/src/stasis/operations/pageOperations.c +++ b/src/stasis/operations/pageOperations.c @@ -2,7 +2,7 @@ #include #include "config.h" -#include "../page.h" +#include #include #include #include diff --git a/src/stasis/operations/regions.c b/src/stasis/operations/regions.c index dcdf37c..0389db4 100644 --- a/src/stasis/operations/regions.c +++ b/src/stasis/operations/regions.c @@ -1,5 +1,5 @@ #include "config.h" -#include "../page.h" +#include #include #include diff --git a/src/stasis/operations/set.c b/src/stasis/operations/set.c index 9637b86..28c852f 100644 --- a/src/stasis/operations/set.c +++ b/src/stasis/operations/set.c @@ -46,7 +46,7 @@ terms specified in this license. **********************************************/ #include -#include "../page.h" +#include #include #include static int operate(int xid, Page *p, lsn_t lsn, recordid rid, const void *dat) { diff --git a/src/stasis/page.c b/src/stasis/page.c index bfdac27..cfc0377 100644 --- a/src/stasis/page.c +++ b/src/stasis/page.c @@ -74,20 +74,20 @@ terms specified in this license. #include #include -#include "latches.h" -#include "page.h" +#include +#include #include #include #include #include -#include "blobManager.h" +#include #include #include -#include "page/slotted.h" -#include "page/fixed.h" -#include "page/indirect.h" +#include +#include +#include #include #include #include diff --git a/src/stasis/page/fixed.c b/src/stasis/page/fixed.c index 02ead3b..cac2e0c 100644 --- a/src/stasis/page/fixed.c +++ b/src/stasis/page/fixed.c @@ -1,6 +1,6 @@ #include -#include "../page.h" -#include "fixed.h" +#include +#include /** @todo should page implementations provide readLSN / writeLSN??? */ #include diff --git a/src/stasis/page/indirect.c b/src/stasis/page/indirect.c index 0e05d3b..ef7e903 100644 --- a/src/stasis/page/indirect.c +++ b/src/stasis/page/indirect.c @@ -1,10 +1,10 @@ -#include "indirect.h" -#include "slotted.h" +#include +#include +#include #include #include #include -#include "../blobManager.h" -#include "../page.h" +#include #include diff --git a/src/stasis/page/slotted.c b/src/stasis/page/slotted.c index c3133b0..1667679 100644 --- a/src/stasis/page/slotted.c +++ b/src/stasis/page/slotted.c @@ -1,8 +1,8 @@ /** $Id$ */ #include "config.h" -#include "../page.h" -#include "slotted.h" +#include +#include #include /** @todo should page implementations provide readLSN / writeLSN??? */ #include diff --git a/src/stasis/pageCache.c b/src/stasis/pageCache.c index e5370ea..7f186da 100644 --- a/src/stasis/pageCache.c +++ b/src/stasis/pageCache.c @@ -8,7 +8,7 @@ #include #include -#include "page.h" +#include #include #include diff --git a/src/stasis/pageFile.c b/src/stasis/pageFile.c index eab975a..963afe9 100644 --- a/src/stasis/pageFile.c +++ b/src/stasis/pageFile.c @@ -4,10 +4,10 @@ */ #include "config.h" -#include "page.h" +#include #include -#include "pageFile.h" +#include #include #include #include diff --git a/src/stasis/pageHandle.c b/src/stasis/pageHandle.c index 031fc57..34d9a23 100644 --- a/src/stasis/pageHandle.c +++ b/src/stasis/pageHandle.c @@ -7,7 +7,7 @@ #include #include -#include "page.h" +#include void (*pageWrite)(Page * dat); void (*pageRead)(Page * ret); diff --git a/src/stasis/recovery2.c b/src/stasis/recovery2.c index 48b8295..7df7da0 100644 --- a/src/stasis/recovery2.c +++ b/src/stasis/recovery2.c @@ -19,10 +19,10 @@ /** @todo Add better log iterator guard support and remove this include.*/ #include -#include "logger/logHandle.h" +#include /** @todo Get rid of linkedlist.[ch] */ -#include "linkedlist.h" -#include "page.h" // Needed for pageReadLSN. +#include +#include // Needed for pageReadLSN. static pblHashTable_t * transactionLSN; diff --git a/src/stasis/stats.c b/src/stasis/stats.c index f22dd69..c3cf3fc 100644 --- a/src/stasis/stats.c +++ b/src/stasis/stats.c @@ -1,6 +1,6 @@ #include #include -#include "latches.h" +#include #include diff --git a/src/stasis/transactional2.c b/src/stasis/transactional2.c index 7c04695..1103a97 100644 --- a/src/stasis/transactional2.c +++ b/src/stasis/transactional2.c @@ -4,16 +4,16 @@ #include #include -#include "latches.h" +#include #include #include #include #include #include #include -#include "pageFile.h" +#include #include -#include "page.h" +#include #include #include #include diff --git a/src/stasis/truncation.c b/src/stasis/truncation.c index cfd6192..95026fb 100644 --- a/src/stasis/truncation.c +++ b/src/stasis/truncation.c @@ -2,7 +2,7 @@ #include #include #include -#include "page.h" +#include #include static int initialized = 0; diff --git a/src/stasis/blobManager.h b/stasis/blobManager.h similarity index 98% rename from src/stasis/blobManager.h rename to stasis/blobManager.h index e62e855..2921bc5 100644 --- a/src/stasis/blobManager.h +++ b/stasis/blobManager.h @@ -2,7 +2,7 @@ #define __BLOB_MANAGER_H #include -#include "page.h" +#include BEGIN_C_DECLS /** diff --git a/src/stasis/bufferManager/bufferHash.h b/stasis/bufferManager/bufferHash.h similarity index 100% rename from src/stasis/bufferManager/bufferHash.h rename to stasis/bufferManager/bufferHash.h diff --git a/src/stasis/bufferManager/pageArray.h b/stasis/bufferManager/pageArray.h similarity index 100% rename from src/stasis/bufferManager/pageArray.h rename to stasis/bufferManager/pageArray.h diff --git a/src/stasis/io.h b/stasis/io.h similarity index 100% rename from src/stasis/io.h rename to stasis/io.h diff --git a/src/stasis/latches.h b/stasis/latches.h similarity index 100% rename from src/stasis/latches.h rename to stasis/latches.h diff --git a/src/stasis/linkedlist.h b/stasis/linkedlist.h similarity index 100% rename from src/stasis/linkedlist.h rename to stasis/linkedlist.h diff --git a/src/stasis/logger/inMemoryLog.h b/stasis/logger/inMemoryLog.h similarity index 100% rename from src/stasis/logger/inMemoryLog.h rename to stasis/logger/inMemoryLog.h diff --git a/src/stasis/logger/logHandle.h b/stasis/logger/logHandle.h similarity index 100% rename from src/stasis/logger/logHandle.h rename to stasis/logger/logHandle.h diff --git a/src/stasis/logger/logMemory.h b/stasis/logger/logMemory.h similarity index 100% rename from src/stasis/logger/logMemory.h rename to stasis/logger/logMemory.h diff --git a/src/stasis/logger/logWriter.h b/stasis/logger/logWriter.h similarity index 100% rename from src/stasis/logger/logWriter.h rename to stasis/logger/logWriter.h diff --git a/src/stasis/operations/lsmIterators.h b/stasis/operations/lsmIterators.h similarity index 100% rename from src/stasis/operations/lsmIterators.h rename to stasis/operations/lsmIterators.h diff --git a/src/stasis/operations/lsmTable.h b/stasis/operations/lsmTable.h similarity index 100% rename from src/stasis/operations/lsmTable.h rename to stasis/operations/lsmTable.h diff --git a/src/stasis/operations/lsmWorkers.h b/stasis/operations/lsmWorkers.h similarity index 100% rename from src/stasis/operations/lsmWorkers.h rename to stasis/operations/lsmWorkers.h diff --git a/src/stasis/pageFile.h b/stasis/operations/pageFile.h similarity index 100% rename from src/stasis/pageFile.h rename to stasis/operations/pageFile.h diff --git a/src/stasis/page.h b/stasis/page.h similarity index 99% rename from src/stasis/page.h rename to stasis/page.h index b6efd9e..693943f 100644 --- a/src/stasis/page.h +++ b/stasis/page.h @@ -102,7 +102,7 @@ terms specified in this license. #define __PAGE_H__ #include -#include "latches.h" +#include #include BEGIN_C_DECLS diff --git a/src/stasis/page/compression/compression.h b/stasis/page/compression/compression.h similarity index 100% rename from src/stasis/page/compression/compression.h rename to stasis/page/compression/compression.h diff --git a/src/stasis/page/compression/for-impl.h b/stasis/page/compression/for-impl.h similarity index 100% rename from src/stasis/page/compression/for-impl.h rename to stasis/page/compression/for-impl.h diff --git a/src/stasis/page/compression/for.h b/stasis/page/compression/for.h similarity index 100% rename from src/stasis/page/compression/for.h rename to stasis/page/compression/for.h diff --git a/src/stasis/page/compression/multicolumn-impl.h b/stasis/page/compression/multicolumn-impl.h similarity index 100% rename from src/stasis/page/compression/multicolumn-impl.h rename to stasis/page/compression/multicolumn-impl.h diff --git a/src/stasis/page/compression/multicolumn.h b/stasis/page/compression/multicolumn.h similarity index 100% rename from src/stasis/page/compression/multicolumn.h rename to stasis/page/compression/multicolumn.h diff --git a/src/stasis/page/compression/nop.h b/stasis/page/compression/nop.h similarity index 100% rename from src/stasis/page/compression/nop.h rename to stasis/page/compression/nop.h diff --git a/src/stasis/page/compression/pageLayout.h b/stasis/page/compression/pageLayout.h similarity index 100% rename from src/stasis/page/compression/pageLayout.h rename to stasis/page/compression/pageLayout.h diff --git a/src/stasis/page/compression/pluginDispatcher.h b/stasis/page/compression/pluginDispatcher.h similarity index 100% rename from src/stasis/page/compression/pluginDispatcher.h rename to stasis/page/compression/pluginDispatcher.h diff --git a/src/stasis/page/compression/pstar-impl.h b/stasis/page/compression/pstar-impl.h similarity index 100% rename from src/stasis/page/compression/pstar-impl.h rename to stasis/page/compression/pstar-impl.h diff --git a/src/stasis/page/compression/pstar.h b/stasis/page/compression/pstar.h similarity index 100% rename from src/stasis/page/compression/pstar.h rename to stasis/page/compression/pstar.h diff --git a/src/stasis/page/compression/rle-impl.h b/stasis/page/compression/rle-impl.h similarity index 100% rename from src/stasis/page/compression/rle-impl.h rename to stasis/page/compression/rle-impl.h diff --git a/src/stasis/page/compression/rle.h b/stasis/page/compression/rle.h similarity index 100% rename from src/stasis/page/compression/rle.h rename to stasis/page/compression/rle.h diff --git a/src/stasis/page/compression/staticMulticolumn.h b/stasis/page/compression/staticMulticolumn.h similarity index 100% rename from src/stasis/page/compression/staticMulticolumn.h rename to stasis/page/compression/staticMulticolumn.h diff --git a/src/stasis/page/compression/staticTuple.h b/stasis/page/compression/staticTuple.h similarity index 100% rename from src/stasis/page/compression/staticTuple.h rename to stasis/page/compression/staticTuple.h diff --git a/src/stasis/page/compression/tuple.h b/stasis/page/compression/tuple.h similarity index 100% rename from src/stasis/page/compression/tuple.h rename to stasis/page/compression/tuple.h diff --git a/src/stasis/page/fixed.h b/stasis/page/fixed.h similarity index 100% rename from src/stasis/page/fixed.h rename to stasis/page/fixed.h diff --git a/src/stasis/page/header.h b/stasis/page/header.h similarity index 100% rename from src/stasis/page/header.h rename to stasis/page/header.h diff --git a/src/stasis/page/indirect.h b/stasis/page/indirect.h similarity index 100% rename from src/stasis/page/indirect.h rename to stasis/page/indirect.h diff --git a/src/stasis/page/raw.h b/stasis/page/raw.h similarity index 99% rename from src/stasis/page/raw.h rename to stasis/page/raw.h index ed9cf88..d933585 100644 --- a/src/stasis/page/raw.h +++ b/stasis/page/raw.h @@ -75,7 +75,7 @@ terms specified in this license. */ #include -#include "../page.h" +#include #define units_from_start_raw(unit,page,count) (((unit*)(page->memAddr))+(count)) diff --git a/src/stasis/page/slotted.h b/stasis/page/slotted.h similarity index 100% rename from src/stasis/page/slotted.h rename to stasis/page/slotted.h diff --git a/stasis/pageFile.h b/stasis/pageFile.h new file mode 100644 index 0000000..079b16d --- /dev/null +++ b/stasis/pageFile.h @@ -0,0 +1,7 @@ + +#ifndef __PAGE_FILE_H +#define __PAGE_FILE_H + +void openPageFile(); + +#endif /* __PAGE_FILE_H */ diff --git a/test/stasis/check_bTree.c b/test/stasis/check_bTree.c index b8c91cf..07ec1da 100644 --- a/test/stasis/check_bTree.c +++ b/test/stasis/check_bTree.c @@ -47,7 +47,7 @@ terms specified in this license. #include -#include "../../src/stasis/page.h" +#include #include #include diff --git a/test/stasis/check_blobRecovery.c b/test/stasis/check_blobRecovery.c index efff6e6..7353700 100644 --- a/test/stasis/check_blobRecovery.c +++ b/test/stasis/check_blobRecovery.c @@ -46,7 +46,6 @@ terms specified in this license. #include #include -#include "../../src/stasis/logger/logWriter.h" #include "../check_includes.h" #include diff --git a/test/stasis/check_bufferManager.c b/test/stasis/check_bufferManager.c index ad7f50a..75808e4 100644 --- a/test/stasis/check_bufferManager.c +++ b/test/stasis/check_bufferManager.c @@ -1,8 +1,8 @@ #include #include #include -#include "../../src/stasis/latches.h" -#include "../../src/stasis/page.h" +#include +#include #include #include #include diff --git a/test/stasis/check_indirect.c b/test/stasis/check_indirect.c index 682d504..85992f7 100644 --- a/test/stasis/check_indirect.c +++ b/test/stasis/check_indirect.c @@ -46,8 +46,8 @@ terms specified in this license. #include "../check_includes.h" #include -#include "src/stasis/page.h" -#include "../../src/stasis/page/indirect.h" +#include +#include #include diff --git a/test/stasis/check_logWriter.c b/test/stasis/check_logWriter.c index 53aa94c..86df041 100644 --- a/test/stasis/check_logWriter.c +++ b/test/stasis/check_logWriter.c @@ -51,11 +51,11 @@ terms specified in this license. #include #include -#include "../../src/stasis/logger/logHandle.h" +#include #include -#include "../../src/stasis/logger/logWriter.h" +#include -#include "../../src/stasis/latches.h" +#include #include #include #include "../check_includes.h" diff --git a/test/stasis/check_multiplexer.c b/test/stasis/check_multiplexer.c index 6c0ec0f..553b49c 100644 --- a/test/stasis/check_multiplexer.c +++ b/test/stasis/check_multiplexer.c @@ -51,7 +51,7 @@ terms specified in this license. #include "../check_includes.h" #include -#include "../../src/stasis/logger/logMemory.h" +#include #include #include diff --git a/test/stasis/check_operations.c b/test/stasis/check_operations.c index f82e900..4397a81 100644 --- a/test/stasis/check_operations.c +++ b/test/stasis/check_operations.c @@ -47,7 +47,7 @@ terms specified in this license. #include #include #include "../check_includes.h" -#include "../../src/stasis/page.h" +#include #define LOG_NAME "check_operations.log" #include diff --git a/test/stasis/check_page.c b/test/stasis/check_page.c index 24096fd..19775e3 100644 --- a/test/stasis/check_page.c +++ b/test/stasis/check_page.c @@ -49,14 +49,14 @@ terms specified in this license. #include #include -#include "../../src/stasis/page.h" -#include "../../src/stasis/page/indirect.h" -#include "../../src/stasis/page/slotted.h" -#include "../../src/stasis/blobManager.h" +#include +#include +#include +#include #include #include -#include "../../src/stasis/latches.h" +#include #include #include #include "../check_includes.h" diff --git a/test/stasis/check_pageOperations.c b/test/stasis/check_pageOperations.c index 4f6c78a..fc2dea6 100644 --- a/test/stasis/check_pageOperations.c +++ b/test/stasis/check_pageOperations.c @@ -44,19 +44,18 @@ terms specified in this license. #include #include -#include "../../src/stasis/page.h" +#include #include #include #include #include -#include "../../src/stasis/latches.h" +#include #include #include #include "../check_includes.h" #define LOG_NAME "check_pageOperations.log" -#include "../../src/stasis/logger/logWriter.h" extern int numActiveXactions; START_TEST(pageOpCheckRecovery) { diff --git a/test/stasis/check_recovery.c b/test/stasis/check_recovery.c index 0a2b446..5f65bcb 100644 --- a/test/stasis/check_recovery.c +++ b/test/stasis/check_recovery.c @@ -46,7 +46,6 @@ terms specified in this license. #include #include #include -#include "../../src/stasis/logger/logWriter.h" #include "../check_includes.h" #define LOG_NAME "check_recovery.log" diff --git a/utilities/logfile_dump.c b/utilities/logfile_dump.c index 3a3b4da..92bb9c5 100644 --- a/utilities/logfile_dump.c +++ b/utilities/logfile_dump.c @@ -2,8 +2,8 @@ #include #include -#include "../src/stasis/logger/logHandle.h" -#include "../src/stasis/logger/logWriter.h" +#include +#include static char * logEntryToString(const LogEntry * le) {