All headers now live in the header directory. (stasis/, not src/stasis)

benchmarks/transitiveClosure.c

@@ -1,7 +1,7 @@
 #include <stasis/transactional.h>
 #include <stasis/multiplexer.h>
 #include <stasis/graph.h>
-#include "../src/stasis/logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>

benchmarks/zeroCopy.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stasis/transactional.h>
 #include <unistd.h>
-#include "../src/stasis/page/raw.h"
+#include <stasis/page/raw.h>
 #include <string.h>
 
 int main(int argc, char** argv) { 

src/stasis/blobManager.c

@@ -1,6 +1,6 @@
 #include <string.h>
 #include <stasis/transactional.h>
-#include "page/raw.h"
+#include <stasis/page/raw.h>
 #include <assert.h>
 
 

src/stasis/bufferManager.c

@@ -61,12 +61,12 @@ terms specified in this license.
 #endif
 
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <assert.h>
 
 #include <stasis/bufferManager.h>
-#include "bufferManager/pageArray.h"
-#include "bufferManager/bufferHash.h"
+#include <stasis/bufferManager/pageArray.h>
+#include <stasis/bufferManager/bufferHash.h>
 #include <stasis/bufferPool.h>
 
 #include <stasis/lockManager.h>
@@ -74,7 +74,7 @@ terms specified in this license.
 #include <stasis/pageHandle.h>
 
 #include <stasis/lhtable.h>
-#include "page.h"
+#include <stasis/page.h>
 
 #undef loadPage
 #undef releasePage

src/stasis/bufferPool.c

@@ -54,7 +54,7 @@ terms specified in this license.
 #include <stasis/bufferPool.h>
 #include <assert.h>
 #include <stasis/truncation.h>
-#include "page.h"
+#include <stasis/page.h>
 /* TODO:  Combine with buffer size... */
 static int nextPage = 0;
 static pthread_mutex_t pageMallocMutex;

src/stasis/common.c

@@ -3,7 +3,7 @@
 #include <config.h>
 #include <stasis/common.h>
 
-#include "latches.h"
+#include <stasis/latches.h>
 
 #include <pbl/pbl.h>
 #include <errno.h>

src/stasis/fifo.c

@@ -2,7 +2,7 @@
 #include <stasis/crc32.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 #include <string.h>
 #include <assert.h>

src/stasis/graph.c

@@ -2,7 +2,7 @@
 #include <alloca.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/crc32.h>
 
 int numOut = 0;

src/stasis/io.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "io.h"
+#include <stasis/io.h>
 #include <stdlib.h>
 /** @file 
 

src/stasis/iterator.c

@@ -4,7 +4,7 @@
 
 #include <stasis/operations.h>
 #include <stasis/arrayCollection.h>
-#include "logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 static lladdIterator_def_t iterators[MAX_ITERATOR_TYPES];
 

src/stasis/lhtable.c

@@ -5,7 +5,7 @@
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
-#include "latches.h"
+#include <stasis/latches.h>
 
 #define FILL_FACTOR (0.5)
 

src/stasis/linkedlist.c

@@ -47,7 +47,7 @@ terms specified in this license.
 #include <config.h>
 #include <stasis/common.h>
 
-#include "linkedlist.h"
+#include <stasis/linkedlist.h>
 
 #include <stdio.h>
 

src/stasis/lockManager.c

@@ -3,7 +3,7 @@
 #include <stasis/compensations.h>
 #include <sys/time.h>
 #include <time.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>

src/stasis/logger/inMemoryLog.c

@@ -1,5 +1,5 @@
-#include "inMemoryLog.h"
-#include "../latches.h"
+#include <stasis/logger/inMemoryLog.h>
+#include <stasis/latches.h>
 #include <string.h>
 #include <assert.h>
 static rwl * flushedLSN_lock;

src/stasis/logger/logEntry.c

@@ -45,7 +45,7 @@ terms specified in this license.
 
 #include <assert.h>
 
-#include "../page.h" // For stasis_record_type_to_size()
+#include <stasis/page.h> // For stasis_record_type_to_size()
 #include <stasis/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
 #include <stasis/logger/logEntry.h>
 #include <stasis/crc32.h>

src/stasis/logger/logHandle.c

@@ -44,7 +44,7 @@ terms specified in this license.
 
 #include <stdlib.h>
 
-#include "logHandle.h"
+#include <stasis/logger/logHandle.h>
 
 /**
    Sets the next and prev field of h, but does not set h.file_offset.

src/stasis/logger/logMemory.c

@@ -5,7 +5,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
-#include "logMemory.h"
+#include <stasis/logger/logMemory.h>
 #include <errno.h>
 #include <stasis/compensations.h>
 

src/stasis/logger/logWriter.c

@@ -57,8 +57,8 @@ terms specified in this license.
 #include <stasis/common.h>
 
 #include <stasis/crc32.h>
-#include "logWriter.h"
-#include "logHandle.h"
+#include <stasis/logger/logWriter.h>
+#include <stasis/logger/logHandle.h>
 #include <stasis/latches.h>
 #include <stasis/io.h>
 #include <assert.h>

src/stasis/logger/logger2.c

@@ -55,9 +55,9 @@ terms specified in this license.
 
 #include <stasis/logger/logger2.h>
 
-#include "logWriter.h"
-#include "inMemoryLog.h"
-#include "../page.h"  
+#include <stasis/logger/logWriter.h>
+#include <stasis/logger/inMemoryLog.h>
+#include <stasis/page.h>
 
 #ifdef USE_LOGGER
 int loggerType = USE_LOGGER;

src/stasis/multiplexer.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stasis/operations/linearHashNTA.h>
 
-#include "logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 lladdMultiplexer_t * lladdMultiplexer_alloc(int xid, lladdIterator_t * it, 
 					    void (*multiplexer)(byte * key,

src/stasis/operations.c

@@ -50,7 +50,7 @@ terms specified in this license.
 #include <stasis/logger/logger2.h>
 #include <stasis/bufferManager.h>
 
-#include "page.h"
+#include <stasis/page.h>
 
 
 Operation operationsTable[MAX_OPERATIONS];

src/stasis/operations/alloc.c

@@ -6,8 +6,8 @@
 #include <stasis/transactional.h>
 #include <stasis/bufferManager.h>
 #include <stasis/allocationPolicy.h>
-#include "../blobManager.h"
-#include "../page.h"
+#include <stasis/blobManager.h>
+#include <stasis/page.h>
 #include <assert.h>
 //try{
 /**

src/stasis/operations/arrayList.c

@@ -2,7 +2,7 @@
 #include <config.h>
 #include <stasis/common.h>
 
-#include "../page.h"
+#include <stasis/page.h>
 #include <stasis/operations/pageOperations.h>
 #include <stasis/operations/arrayList.h>
 #include <stasis/transactional.h>

src/stasis/operations/bTree.c

@@ -1,6 +1,6 @@
 #define __USE_GNU
 #define _GNU_SOURCE
-#include "../latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/hash.h>
 #include <stdlib.h>
@@ -9,7 +9,7 @@
 #include <stasis/operations/noop.h>
 #include <stasis/fifo.h>
 #include <stasis/multiplexer.h>
-#include "../logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 #include <stdio.h>
 
 int HelloWorld(){

src/stasis/operations/decrement.c

@@ -46,7 +46,7 @@ terms specified in this license.
  *********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
 	int i;

src/stasis/operations/increment.c

@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
 	int i;

src/stasis/operations/instantSet.c

@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 static int operate(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {
   stasis_record_write(xid, p, lsn, rid, dat); 

src/stasis/operations/linearHash.c

@@ -4,7 +4,7 @@
 #include <limits.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 /**
 

src/stasis/operations/linearHashNTA.c

@@ -1,6 +1,6 @@
 #define __USE_GNU
 #define _GNU_SOURCE
-#include "../latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/hash.h>
 #include <assert.h>
@@ -8,7 +8,7 @@
 // The next two #includes are for deprecated code.
 #include <stasis/fifo.h>
 #include <stasis/multiplexer.h>
-#include "../logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 /**
    re-entrant implementation of a linear hash hable, using nested top actions.
 

src/stasis/operations/linkedListNTA.c

@@ -1,7 +1,7 @@
 #define __USE_GNU 
 #define _GNU_SOURCE
-#include "../latches.h"
 
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/hash.h>
 #include <stdlib.h>

src/stasis/operations/lsmTree.c

@@ -5,7 +5,7 @@
 #include <stasis/constants.h>
 //  XXX including fixed.h breaks page api encapsulation; we need a "last slot"
 // call.
-#include "../page/fixed.h"
+#include <stasis/page/fixed.h>
 #include <pthread.h>
 
 static lsm_comparator_t comparators[MAX_LSM_COMPARATORS];

src/stasis/operations/naiveLinearHash.c

@@ -2,7 +2,7 @@
 #include <stasis/hash.h>
 #include <limits.h>
 #include <assert.h>
-#include "../latches.h"
+#include <stasis/latches.h>
 /**
 
    A from-scratch implementation of linear hashing.  Uses the

src/stasis/operations/nestedTopActions.c

@@ -51,7 +51,7 @@ terms specified in this license.
 #include <pbl/pbl.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../latches.h"
+#include <stasis/latches.h>
 #include <assert.h>
 /** @todo Remove extern declaration of transactional_2_mutex from nestedTopActions.c */
 extern pthread_mutex_t transactional_2_mutex;

src/stasis/operations/noop.c

@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 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.

src/stasis/operations/pageOperations.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "config.h"
-#include "../page.h"
+#include <stasis/page.h>
 #include <stasis/operations/pageOperations.h>
 #include <assert.h>
 #include <alloca.h>

src/stasis/operations/regions.c

@@ -1,5 +1,5 @@
 #include "config.h"
-#include "../page.h"
+#include <stasis/page.h>
 #include <stasis/operations.h>
 #include <assert.h>
 

src/stasis/operations/set.c

@@ -46,7 +46,7 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include "../page.h"
+#include <stasis/page.h>
 #include <string.h>
 #include <assert.h>
 static int operate(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {

src/stasis/page.c

@@ -74,20 +74,20 @@ terms specified in this license.
 
 #include <config.h>
 #include <stasis/common.h>
-#include "latches.h"
-#include "page.h"
+#include <stasis/latches.h>
+#include <stasis/page.h>
 
 #include <assert.h>
 #include <stdio.h>
 
 #include <stasis/constants.h>
 #include <assert.h>
-#include "blobManager.h"
+#include <stasis/blobManager.h>
 #include <stasis/lockManager.h>
 #include <stasis/compensations.h>
-#include "page/slotted.h"
-#include "page/fixed.h"
-#include "page/indirect.h"
+#include <stasis/page/slotted.h>
+#include <stasis/page/fixed.h>
+#include <stasis/page/indirect.h>
 #include <stasis/operations/arrayList.h>
 #include <stasis/bufferPool.h>
 #include <stasis/truncation.h>

src/stasis/page/fixed.c

@@ -1,6 +1,6 @@
 #include <assert.h>
-#include "../page.h"
-#include "fixed.h"
+#include <stasis/page.h>
+#include <stasis/page/fixed.h>
 /** @todo should page implementations provide readLSN / writeLSN??? */
 #include <stasis/truncation.h>
 

src/stasis/page/indirect.c

@@ -1,10 +1,10 @@
-#include "indirect.h"
-#include "slotted.h"
+#include <stasis/page.h>
+#include <stasis/page/indirect.h>
+#include <stasis/page/slotted.h>
 #include <math.h>
 #include <string.h>
 #include <assert.h>
-#include "../blobManager.h"
-#include "../page.h"
+#include <stasis/blobManager.h>
 
 #include <stasis/operations.h>
 

src/stasis/page/slotted.c

@@ -1,8 +1,8 @@
 /** $Id$ */
 
 #include "config.h"
-#include "../page.h"
-#include "slotted.h"
+#include <stasis/page.h>
+#include <stasis/page/slotted.h>
 #include <assert.h>
 /** @todo should page implementations provide readLSN / writeLSN??? */
 #include <stasis/truncation.h>

src/stasis/pageCache.c

@@ -8,7 +8,7 @@
 #include <config.h>
 #include <stasis/common.h>
 
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/pageCache.h>
 #include <stasis/bufferManager.h>
 

src/stasis/pageFile.c

@@ -4,10 +4,10 @@
 
 */
 #include "config.h"
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/bufferManager.h>
 
-#include "pageFile.h"
+#include <stasis/pageFile.h>
 #include <stasis/pageHandle.h>
 #include <assert.h>
 #include <stasis/logger/logger2.h>

src/stasis/pageHandle.c

@@ -7,7 +7,7 @@
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
 
-#include "page.h"
+#include <stasis/page.h>
 
 void (*pageWrite)(Page * dat);
 void (*pageRead)(Page * ret);

src/stasis/recovery2.c

@@ -19,10 +19,10 @@
 /** @todo Add better log iterator guard support and remove this include.*/
 #include <stasis/operations/prepare.h>
 
-#include "logger/logHandle.h"
+#include <stasis/logger/logHandle.h>
 /** @todo Get rid of linkedlist.[ch] */
-#include "linkedlist.h"
-#include "page.h" // Needed for pageReadLSN. 
+#include <stasis/linkedlist.h>
+#include <stasis/page.h> // Needed for pageReadLSN. 
 
 
 static pblHashTable_t * transactionLSN;

src/stasis/stats.c

@@ -1,6 +1,6 @@
 #include <config.h>
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 
 #include <math.h>
 

src/stasis/transactional2.c

@@ -4,16 +4,16 @@
 #include <fcntl.h>
 
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/recovery.h>
 #include <stasis/bufferManager.h>
 #include <stasis/consumer.h>
 #include <stasis/lockManager.h>
 #include <stasis/compensations.h>
-#include "pageFile.h"
+#include <stasis/pageFile.h>
 #include <stasis/pageHandle.h>
-#include "page.h"
+#include <stasis/page.h>
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
 #include <stasis/io/handle.h>

src/stasis/truncation.c

@@ -2,7 +2,7 @@
 #include <stasis/truncation.h>
 #include <pbl/pbl.h>
 #include <stasis/logger/logger2.h>
-#include "page.h"
+#include <stasis/page.h>
 #include <assert.h>
 
 static int initialized = 0;

stasis/blobManager.h

@@ -2,7 +2,7 @@
 #define __BLOB_MANAGER_H
 
 #include <stasis/common.h>
-#include "page.h"
+#include <stasis/page.h>
 BEGIN_C_DECLS
 
 /**    

stasis/page.h

@@ -102,7 +102,7 @@ terms specified in this license.
 #define __PAGE_H__
 
 #include <stasis/common.h>
-#include "latches.h"
+#include <stasis/latches.h>
 #include <stasis/transactional.h>
 
 BEGIN_C_DECLS

stasis/page/raw.h

@@ -75,7 +75,7 @@ terms specified in this license.
   */
 
 #include <stasis/common.h>
-#include "../page.h"
+#include <stasis/page.h>
 
 #define units_from_start_raw(unit,page,count) (((unit*)(page->memAddr))+(count))
 

stasis/pageFile.h

@@ -0,0 +1,7 @@
+
+#ifndef __PAGE_FILE_H
+#define __PAGE_FILE_H
+
+void openPageFile();
+
+#endif /* __PAGE_FILE_H */

test/stasis/check_bTree.c

@@ -47,7 +47,7 @@ terms specified in this license.
 #include <stasis/transactional.h>
 
 
-#include "../../src/stasis/page.h"
+#include <stasis/page.h>
 
 #include <assert.h>
 #include <limits.h>

test/stasis/check_blobRecovery.c

@@ -46,7 +46,6 @@ terms specified in this license.
 
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
-#include "../../src/stasis/logger/logWriter.h"
 #include "../check_includes.h"
 #include <assert.h>
 

test/stasis/check_bufferManager.c

@@ -1,8 +1,8 @@
 #include <config.h>
 #include <check.h>
 #include <stasis/transactional.h>
-#include "../../src/stasis/latches.h"
-#include "../../src/stasis/page.h"
+#include <stasis/latches.h>
+#include <stasis/page.h>
 #include <stasis/bufferManager.h>
 #include <sched.h>
 #include <assert.h>

test/stasis/check_indirect.c

@@ -46,8 +46,8 @@ terms specified in this license.
 
 #include "../check_includes.h"
 #include <stasis/bufferManager.h>
-#include "src/stasis/page.h"
-#include "../../src/stasis/page/indirect.h"
+#include <stasis/page.h>
+#include <stasis/page/indirect.h>
 
 #include <assert.h>
 

test/stasis/check_logWriter.c

@@ -51,11 +51,11 @@ terms specified in this license.
 #include <check.h>
 
 #include <stasis/transactional.h>
-#include "../../src/stasis/logger/logHandle.h"
+#include <stasis/logger/logHandle.h>
 #include <stasis/logger/logger2.h>
-#include "../../src/stasis/logger/logWriter.h"
+#include <stasis/logger/logWriter.h>
 
-#include "../../src/stasis/latches.h"
+#include <stasis/latches.h>
 #include <sched.h>
 #include <assert.h>
 #include "../check_includes.h"

test/stasis/check_multiplexer.c

@@ -51,7 +51,7 @@ terms specified in this license.
 #include "../check_includes.h"
 
 #include <stasis/multiplexer.h>
-#include "../../src/stasis/logger/logMemory.h"
+#include <stasis/logger/logMemory.h>
 
 #include <sys/time.h>
 #include <time.h>

test/stasis/check_operations.c

@@ -47,7 +47,7 @@ terms specified in this license.
 #include <stasis/bufferManager.h>
 #include <stasis/truncation.h>
 #include "../check_includes.h"
-#include "../../src/stasis/page.h"
+#include <stasis/page.h>
 #define LOG_NAME   "check_operations.log"
 
 #include <stdio.h>

test/stasis/check_page.c

@@ -49,14 +49,14 @@ terms specified in this license.
 #include <config.h>
 #include <check.h>
 
-#include "../../src/stasis/page.h"
-#include "../../src/stasis/page/indirect.h"
-#include "../../src/stasis/page/slotted.h"
-#include "../../src/stasis/blobManager.h"
+#include <stasis/page.h>
+#include <stasis/page/indirect.h>
+#include <stasis/page/slotted.h>
+#include <stasis/blobManager.h>
 #include <stasis/bufferManager.h>
 #include <stasis/transactional.h>
 
-#include "../../src/stasis/latches.h"
+#include <stasis/latches.h>
 #include <sched.h>
 #include <assert.h>
 #include "../check_includes.h"

test/stasis/check_pageOperations.c

@@ -44,19 +44,18 @@ terms specified in this license.
 #include <config.h>
 #include <check.h>
 
-#include "../../src/stasis/page.h"
+#include <stasis/page.h>
 #include <stasis/bufferManager.h>
 #include <stasis/transactional.h>
 #include <stasis/truncation.h>
 #include <stasis/logger/logger2.h>
 
-#include "../../src/stasis/latches.h"
+#include <stasis/latches.h>
 #include <sched.h>
 #include <assert.h>
 #include "../check_includes.h"
 
 #define LOG_NAME   "check_pageOperations.log"
-#include "../../src/stasis/logger/logWriter.h"
 extern int numActiveXactions;
 
 START_TEST(pageOpCheckRecovery) {

test/stasis/check_recovery.c

@@ -46,7 +46,6 @@ terms specified in this license.
 #include <stasis/transactional.h>
 #include <stasis/logger/logger2.h>
 #include <stasis/truncation.h>
-#include "../../src/stasis/logger/logWriter.h"
 #include "../check_includes.h"
 
 #define LOG_NAME   "check_recovery.log"

utilities/logfile_dump.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "../src/stasis/logger/logHandle.h"
-#include "../src/stasis/logger/logWriter.h"
+#include <stasis/logger/logHandle.h>
+#include <stasis/logger/logWriter.h>
 
 
 static char * logEntryToString(const LogEntry * le) {