Renamed 'lladd' directories and python module to 'stasis'

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 
 

benchmarks/arrayListSet.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 int main(int argc, char** argv) {

benchmarks/lhtableThreaded.c

@@ -4,7 +4,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <lladd/lhtable.h>
+#include <stasis/lhtable.h>
 
 int entries;
 int thread_count;

benchmarks/linearHashNTA.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 

benchmarks/linearHashNTAMultiReader.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 

benchmarks/linearHashNTAThreaded.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 

benchmarks/linearHashNTAWriteRequests.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 

benchmarks/linkedListNTA.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 

benchmarks/logicalHash.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 

benchmarks/logicalMultThreaded.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 //static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER;

benchmarks/logicalMultiReaders.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 //static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER;

benchmarks/naiveHash.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 int main(int argc, char** argv) {

benchmarks/naiveMultiThreaded.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 #include <pthread.h>
 static pthread_mutex_t hash_mutex = PTHREAD_MUTEX_INITIALIZER;

benchmarks/pageOrientedListNTA.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 //#define CHECK_RESULTS 1

benchmarks/rawSet.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 int main(int argc, char** argv) {

benchmarks/readLogicalHash.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <unistd.h>
 
 

benchmarks/transitiveClosure.c

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

benchmarks/zeroCopy.c

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

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

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}

examples/ex1.c

@@ -1,4 +1,4 @@
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 
 int main (int argc, char ** argv) {
 

examples/ex2.c

@@ -1,4 +1,4 @@
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <stdio.h>
 #include <assert.h>
 

libdfa/smash.h

@@ -42,7 +42,7 @@ terms specified in this license.
 
 #include <pbl/pbl.h>
 //#include <pbl/jbhash.h>
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include <libdfa/statemachine.h>
 /** State machine hash library. */
 

libdfa/statemachine.h

@@ -45,9 +45,9 @@ terms specified in this license.
 #define _STATEMACHINE_H
 
 #include <time.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <libdfa/messages.h>
-#include "../src/lladd/page.h"
+#include "../src/stasis/page.h"
 #include <sys/types.h>
 #include <pthread.h>
 

src/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = lladd libdfa 2pc timing
+SUBDIRS = stasis libdfa 2pc timing
 
 if BUILD_POBJ
 SUBDIRS += pobj

src/apps/eric/test.c

@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <assert.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 
 /**
 

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

src/apps/readOnlyHash/buildTable.c

@@ -3,8 +3,8 @@
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
-#include <lladd/transactional.h>
-#include <lladd/truncation.h>
+#include <stasis/transactional.h>
+#include <stasis/truncation.h>
 #include <sys/time.h>
 #include <time.h>
 

src/apps/readOnlyHash/queryTable.c

@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 
 int main(int argc, char** argv) {
   Tinit();

src/libdfa/messages.c

@@ -43,7 +43,7 @@ terms specified in this license.
 
 #define _GNU_SOURCE
 
-#include <lladd/common.h>
+#include <stasis/common.h>
 #include <sys/socket.h>
 #include <sys/poll.h>
 #include <netinet/in.h>

src/libdfa/networksetup.c

@@ -1,4 +1,4 @@
-#include <lladd/common.h>
+#include <stasis/common.h>
 #include <libdfa/networksetup.h>
 #include <confuse.h>
 #include <stdlib.h>

src/pobj/pobj.c

@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <pobj/pobj.h>
 #include "common.h"
 #include "debug.h"

src/stasis/allocationPolicy.c

@@ -29,10 +29,10 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <lladd/allocationPolicy.h>
-#include <lladd/lhtable.h>
-#include <lladd/redblack.h>
-#include <lladd/transactional.h>
+#include <stasis/allocationPolicy.h>
+#include <stasis/lhtable.h>
+#include <stasis/redblack.h>
+#include <stasis/transactional.h>
 
 #define ALLOCATION_POLICY_SANITY_CHECKS
 

src/stasis/arrayCollection.c

@@ -1,4 +1,4 @@
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 #include <stdlib.h>
 #include <stdio.h>
 typedef struct { 

src/stasis/blobManager.c

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

src/stasis/blobManager.h

@@ -1,7 +1,7 @@
 #ifndef __BLOB_MANAGER_H
 #define __BLOB_MANAGER_H
 
-#include <lladd/common.h>
+#include <stasis/common.h>
 BEGIN_C_DECLS
 
 /**    

src/stasis/bufferManager.c

@@ -56,25 +56,25 @@ terms specified in this license.
 
 #define _GNU_SOURCE   
 #include <stdio.h>  // Need _GNU_SOURCE for asprintf
-#include <lladd/lhtable.h>
+#include <stasis/lhtable.h>
 
 #endif
 
-#include <lladd/common.h>
+#include <stasis/common.h>
 #include <latches.h>
 #include <assert.h>
 
-#include <lladd/bufferManager.h>
+#include <stasis/bufferManager.h>
 #include "bufferManager/pageArray.h"
 #include "bufferManager/bufferHash.h"
-#include <lladd/bufferPool.h>
+#include <stasis/bufferPool.h>
 
-#include <lladd/lockManager.h>
-#include <lladd/pageCache.h>
-#include <lladd/pageHandle.h>
-#include <lladd/truncation.h>
+#include <stasis/lockManager.h>
+#include <stasis/pageCache.h>
+#include <stasis/pageHandle.h>
+#include <stasis/truncation.h>
 
-#include <lladd/lhtable.h>
+#include <stasis/lhtable.h>
 
 #undef loadPage
 #undef releasePage

src/stasis/bufferManager/bufferHash.c

@@ -1,16 +1,16 @@
 #include <pthread.h>
 #include <config.h>
 #include "bufferManager/bufferHash.h"
-#include <lladd/bufferPool.h>
-#include <lladd/doubleLinkedList.h>
-#include <lladd/lhtable.h>
+#include <stasis/bufferPool.h>
+#include <stasis/doubleLinkedList.h>
+#include <stasis/lhtable.h>
 
 
-#include <lladd/bufferPool.h>
-#include <lladd/pageHandle.h>
+#include <stasis/bufferPool.h>
+#include <stasis/pageHandle.h>
 
-#include <lladd/replacementPolicy.h>
-#include <lladd/bufferManager.h>
+#include <stasis/replacementPolicy.h>
+#include <stasis/bufferManager.h>
 
 #include <assert.h>
 

src/stasis/bufferManager/pageArray.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <config.h>
-#include <lladd/transactional.h>
-#include <lladd/bufferManager.h>
-#include <lladd/bufferPool.h>
-#include <lladd/truncation.h>
+#include <stasis/transactional.h>
+#include <stasis/bufferManager.h>
+#include <stasis/bufferPool.h>
+#include <stasis/truncation.h>
 #include "latches.h"
 #include "bufferManager/pageArray.h"
 
@@ -68,4 +68,3 @@ void paBufInit () {
   pageCount = 0;
   pageMap = 0;
 }
-

src/stasis/bufferPool.c

@@ -51,9 +51,9 @@ terms specified in this license.
 #define _XOPEN_SOURCE 600
 #include <stdlib.h>
 
-#include <lladd/bufferPool.h>
+#include <stasis/bufferPool.h>
 #include <assert.h>
-#include <lladd/truncation.h>
+#include <stasis/truncation.h>
 
 /* TODO:  Combine with buffer size... */
 static int nextPage = 0;

src/stasis/common.c

@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 #include "latches.h"
 
@@ -356,4 +356,3 @@ void __profile_deletelock (__profile_rwl *lock) {
 
   deletelock(lock->lock);
 }
-

src/stasis/compensations.c

@@ -1,4 +1,4 @@
-#include <lladd/compensations.h>
+#include <stasis/compensations.h>
 
 int ___compensation_count___ = 0;
 

src/stasis/consumer.c

@@ -1,4 +1,4 @@
-#include <lladd/consumer.h>
+#include <stasis/consumer.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <logger/logMemory.h>

src/stasis/crc32.c

@@ -1,5 +1,5 @@
 // Calculate a CRC 32 checksum.
-#include <lladd/crc32.h>  /*Added 10-6-04 */
+#include <stasis/crc32.h>  /*Added 10-6-04 */
 #include <stdlib.h>
 #include <stdio.h>
 

src/stasis/doubleLinkedList.c

@@ -1,7 +1,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lladd/doubleLinkedList.h>
+#include <stasis/doubleLinkedList.h>
 #include <assert.h>
 
 typedef LL_ENTRY(value_t) value_t;

src/stasis/fifo.c

@@ -1,5 +1,5 @@
-#include <lladd/fifo.h>
-#include <lladd/crc32.h>
+#include <stasis/fifo.h>
+#include <stasis/crc32.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "logger/logMemory.h"

src/stasis/graph.c

@@ -1,9 +1,9 @@
-#include <lladd/graph.h>
+#include <stasis/graph.h>
 #include <alloca.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "page.h"
-#include <lladd/crc32.h>
+#include <stasis/crc32.h>
 
 extern int transClos_outdegree;
 extern int numOut;

src/stasis/hash.c

@@ -1,4 +1,4 @@
-#include <lladd/hash.h>
+#include <stasis/hash.h>
 #include <assert.h>
 //#include <stdio.h>
 /**

src/stasis/io.h

@@ -5,7 +5,7 @@
 
 */
 
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 BEGIN_C_DECLS
 

src/stasis/io/debug.c

@@ -1,4 +1,4 @@
-#include <lladd/io/handle.h>
+#include <stasis/io/handle.h>
 #include <stdio.h>
 #include <stdlib.h>
 

src/stasis/io/file.c

@@ -1,6 +1,6 @@
 #include <config.h>
-#include <lladd/common.h>
-#include <lladd/io/handle.h>
+#include <stasis/common.h>
+#include <stasis/io/handle.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>

src/stasis/io/memory.c

@@ -1,4 +1,4 @@
-#include <lladd/io/handle.h>
+#include <stasis/io/handle.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>

src/stasis/io/non_blocking.c

@@ -1,5 +1,5 @@
-#include <lladd/io/handle.h>
-#include <lladd/redblack.h>
+#include <stasis/io/handle.h>
+#include <stasis/redblack.h>
 #include <pthread.h>
 #include <errno.h>
 #include <stdlib.h>

src/stasis/io/rangeTracker.c

@@ -1,7 +1,7 @@
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <lladd/io/rangeTracker.h>
-#include <lladd/redblack.h>
+#include <stasis/io/rangeTracker.h>
+#include <stasis/redblack.h>
 #include <stdlib.h>
 #include <assert.h>
 
@@ -373,4 +373,3 @@ char * transitionToString(const transition * t) {
   assert(err !=-1);
   return ret;
 }
-

src/stasis/iterator.c

@@ -1,9 +1,9 @@
-#include <lladd/iterator.h>
+#include <stasis/iterator.h>
 #include <assert.h>
 #include <stdlib.h>
 
-#include <lladd/operations.h>
-#include <lladd/arrayCollection.h>
+#include <stasis/operations.h>
+#include <stasis/arrayCollection.h>
 #include "logger/logMemory.h"
 
 static lladdIterator_def_t iterators[MAX_ITERATOR_TYPES];

src/stasis/latches.h

@@ -1,7 +1,7 @@
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 #include <pthread.h>
-#include <lladd/stats.h>
+#include <stasis/stats.h>
 
 #ifndef __LATCHES_H
 #define __LATCHES_H

src/stasis/lhtable.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
-#include <lladd/lhtable.h>
-#include <lladd/hash.h>
+#include <stasis/lhtable.h>
+#include <stasis/hash.h>
 #include <pbl/pbl.h>
 #include <assert.h>
 #include <string.h>

src/stasis/linkedlist.c

@@ -45,7 +45,7 @@ terms specified in this license.
  * simple linked list
  *****************************/
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 #include "linkedlist.h"
 

src/stasis/linkedlist.h

@@ -51,7 +51,7 @@ terms specified in this license.
   recovery algorithms.
   
  */
-#include <lladd/common.h>
+#include <stasis/common.h>
 BEGIN_C_DECLS
 
 typedef struct LinkedList {

src/stasis/lockManager.c

@@ -1,6 +1,6 @@
 #include <pbl/pbl.h>
-#include <lladd/lockManager.h>
-#include <lladd/compensations.h>
+#include <stasis/lockManager.h>
+#include <stasis/compensations.h>
 #include <sys/time.h>
 #include <time.h>
 #include "latches.h"
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include <lladd/hash.h>
+#include <stasis/hash.h>
 
 
 #define MUTEX_COUNT 32
@@ -366,4 +366,3 @@ void setupLockManagerCallbacksNil () {
   globalLockManager.abort           = NULL;
   globalLockManager.begin           = NULL;
 }
-

src/stasis/logger/inMemoryLog.h

@@ -1,4 +1,4 @@
-#include <lladd/logger/logger2.h>
+#include <stasis/logger/logger2.h>
 
 #ifndef __INMEMORYLOG 
 #define __INMEMORYLOG 1

src/stasis/logger/logEntry.c

@@ -41,13 +41,13 @@ terms specified in this license.
 ---*/
 
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 #include <assert.h>
 
 #include "page.h" // For physical_slot_length()
-#include <lladd/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
-#include <lladd/logger/logEntry.h>
+#include <stasis/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
+#include <stasis/logger/logEntry.h>
 
 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);
   }
 }
-

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 <lladd/logger/logger2.h>
+#include <stasis/logger/logger2.h>
 
 #ifndef __LOGHANDLE_H
 #define __LOGHANDLE_H

src/stasis/logger/logMemory.c

@@ -7,7 +7,7 @@
 #include <assert.h>
 #include "logMemory.h"
 #include <errno.h>
-#include <lladd/compensations.h>
+#include <stasis/compensations.h>
 
 typedef struct {
   pthread_mutex_t mutex;

src/stasis/logger/logMemory.h

@@ -1,8 +1,8 @@
-#include <lladd/transactional.h>
-#include <lladd/ringbuffer.h>
-#include <lladd/consumer.h>
-#include <lladd/iterator.h>
-#include <lladd/fifo.h>
+#include <stasis/transactional.h>
+#include <stasis/ringbuffer.h>
+#include <stasis/consumer.h>
+#include <stasis/iterator.h>
+#include <stasis/fifo.h>
 
 #ifndef __LOGMEMORY_H
 #define __LOGMEMORY_H

src/stasis/logger/logWriter.c

@@ -54,10 +54,9 @@ terms specified in this license.
 #include <stdlib.h>
 
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
-//#include <lladd/transactional.h>
-#include <lladd/crc32.h>
+#include <stasis/crc32.h>
 #include "logWriter.h"
 #include "logHandle.h"
 #include "latches.h"
@@ -65,7 +64,7 @@ terms specified in this license.
 #include <assert.h>
 
 
-#include <lladd/bufferManager.h>
+#include <stasis/bufferManager.h>
 
 /** 
     @todo Should the log file be global? 

src/stasis/logger/logWriter.h

@@ -70,8 +70,8 @@ terms specified in this license.
 #ifndef __LOGWRITER_H__
 #define __LOGWRITER_H__
 
-#include <lladd/constants.h>
-#include <lladd/common.h>
+#include <stasis/constants.h>
+#include <stasis/common.h>
 
 BEGIN_C_DECLS
 /**

src/stasis/logger/logger2.c

@@ -48,12 +48,12 @@ terms specified in this license.
 */
 
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 #include <stdio.h>
 #include <assert.h>
 
-#include <lladd/logger/logger2.h>
+#include <stasis/logger/logger2.h>
 
 #include "logWriter.h"
 #include "inMemoryLog.h"

src/stasis/multiplexer.c

@@ -1,7 +1,7 @@
-#include <lladd/multiplexer.h>
-#include <lladd/crc32.h>
+#include <stasis/multiplexer.h>
+#include <stasis/crc32.h>
 #include <stdlib.h>
-#include <lladd/operations/linearHashNTA.h>
+#include <stasis/operations/linearHashNTA.h>
 
 #include "logger/logMemory.h"
 

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 <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
-#include <lladd/operations.h>
-#include <lladd/logger/logger2.h>
-#include <lladd/bufferManager.h>
+#include <stasis/operations.h>
+#include <stasis/logger/logger2.h>
+#include <stasis/bufferManager.h>
 
 #include "page.h"
 

src/stasis/operations/alloc.c

@@ -1,10 +1,10 @@
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
-#include <lladd/operations.h>
-#include <lladd/transactional.h>
-#include <lladd/bufferManager.h>
-#include <lladd/allocationPolicy.h>
+#include <stasis/operations.h>
+#include <stasis/transactional.h>
+#include <stasis/bufferManager.h>
+#include <stasis/allocationPolicy.h>
 #include "../blobManager.h"
 #include "../page.h"
 #include <assert.h>

src/stasis/operations/arrayList.c

@@ -1,12 +1,12 @@
 
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 
 #include "../page.h"
-#include <lladd/operations/pageOperations.h>
-#include <lladd/operations/arrayList.h>
-#include <lladd/transactional.h>
-#include <lladd/bufferManager.h>
+#include <stasis/operations/pageOperations.h>
+#include <stasis/operations/arrayList.h>
+#include <stasis/transactional.h>
+#include <stasis/bufferManager.h>
 
 #include <assert.h>
 #define _XOPEN_SOURCE 600

src/stasis/operations/bTree.c

@@ -1,14 +1,14 @@
 #define __USE_GNU
 #define _GNU_SOURCE
 #include "../latches.h"
-#include <lladd/transactional.h>
-#include <lladd/hash.h>
+#include <stasis/transactional.h>
+#include <stasis/hash.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <lladd/operations/noop.h>
-#include <lladd/fifo.h>
-#include <lladd/multiplexer.h>
+#include <stasis/operations/noop.h>
+#include <stasis/fifo.h>
+#include <stasis/multiplexer.h>
 #include "../logger/logMemory.h"
 #include <stdio.h>
 

src/stasis/operations/decrement.c

@@ -45,7 +45,7 @@ terms specified in this license.
  * Decrements the given reference by one
  *********************************************/
 
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include "../page.h"
 
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {

src/stasis/operations/increment.c

@@ -45,7 +45,7 @@ terms specified in this license.
  * Increments the given reference by one
  **********************************************/
 
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include "../page.h"
 
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {

src/stasis/operations/instantSet.c

@@ -45,7 +45,7 @@ terms specified in this license.
  * sets the given reference to dat
  **********************************************/
 
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include "../page.h"
 
 static int operate(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {

src/stasis/operations/linearHash.c

@@ -1,6 +1,6 @@
 
-#include <lladd/operations.h>
-#include <lladd/hash.h>
+#include <stasis/operations.h>
+#include <stasis/hash.h>
 #include <limits.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 
 #include <math.h>
 #include <string.h>
-#include <lladd/operations/linearHash.h>
+#include <stasis/operations/linearHash.h>
 #include <pbl/pbl.h>
 
 typedef struct {

src/stasis/operations/linearHashNTA.c

@@ -1,15 +1,15 @@
 #define __USE_GNU
 #define _GNU_SOURCE
 #include "../latches.h"
-#include <lladd/transactional.h>
-#include <lladd/hash.h>
+#include <stasis/transactional.h>
+#include <stasis/hash.h>
 #include "../page.h"
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include <lladd/operations/noop.h>
-#include <lladd/fifo.h>
-#include <lladd/multiplexer.h>
+#include <stasis/operations/noop.h>
+#include <stasis/fifo.h>
+#include <stasis/multiplexer.h>
 #include "../logger/logMemory.h"
 /**
    re-entrant implementation of a linear hash hable, using nensted top actions.

src/stasis/operations/linkedListNTA.c

@@ -2,8 +2,8 @@
 #define _GNU_SOURCE
 #include "../latches.h"
 
-#include <lladd/transactional.h>
-#include <lladd/hash.h>
+#include <stasis/transactional.h>
+#include <stasis/hash.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>

src/stasis/operations/naiveLinearHash.c

@@ -1,5 +1,5 @@
-#include <lladd/operations.h>
-#include <lladd/hash.h>
+#include <stasis/operations.h>
+#include <stasis/hash.h>
 #include <limits.h>
 #include <assert.h>
 #include "../latches.h"
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <lladd/operations/linearHash.h>
+#include <stasis/operations/linearHash.h>
 #include <pbl/pbl.h>
 /**
   next.size == 0 implies empty bucket

src/stasis/operations/nestedTopActions.c

@@ -44,10 +44,10 @@ terms specified in this license.
  * 
  * Decrements the given reference by one
  *********************************************/
-#include <lladd/transactional.h>
-#include <lladd/common.h>
-#include <lladd/operations/nestedTopActions.h>
-#include <lladd/logger/logger2.h>
+#include <stasis/transactional.h>
+#include <stasis/common.h>
+#include <stasis/operations/nestedTopActions.h>
+#include <stasis/logger/logger2.h>
 #include <pbl/pbl.h>
 #include <string.h>
 #include <stdlib.h>

src/stasis/operations/noop.c

@@ -45,7 +45,7 @@ terms specified in this license.
  * sets the given reference to dat
  **********************************************/
 
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include "../page.h"
 
 int noop(int xid, Page *p,  lsn_t lsn, recordid rid, const void *dat) {

src/stasis/operations/pageOperations.c

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

src/stasis/operations/pageOrientedListNTA.c

@@ -1,4 +1,4 @@
-#include <lladd/transactional.h>
+#include <stasis/transactional.h>
 
 #include <stdlib.h>
 #include <stdio.h>

src/stasis/operations/prepare.c

@@ -46,8 +46,8 @@ terms specified in this license.
  * sets the given reference to dat
  **********************************************/
 
-#include <lladd/operations.h>
-#include <lladd/logger/logger2.h>
+#include <stasis/operations.h>
+#include <stasis/logger/logger2.h>
 
 #include <stdlib.h>
 #include <assert.h>

src/stasis/operations/regions.c

@@ -1,6 +1,6 @@
 #include "config.h"
 #include "../page.h"
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include <assert.h>
 
 typedef struct regionAllocLogArg{

src/stasis/operations/set.c

@@ -45,7 +45,7 @@ terms specified in this license.
  * sets the given reference to dat
  **********************************************/
 
-#include <lladd/operations.h>
+#include <stasis/operations.h>
 #include "../page.h"
 #include <string.h>
 #include <assert.h>

src/stasis/page.c

@@ -73,24 +73,24 @@ terms specified in this license.
 #include <stdlib.h>
 
 #include <config.h>
-#include <lladd/common.h>
+#include <stasis/common.h>
 #include "latches.h"
 #include "page.h"
 
 #include <assert.h>
 #include <stdio.h>
 
-#include <lladd/constants.h>
+#include <stasis/constants.h>
 #include <assert.h>
 #include "blobManager.h"
-#include <lladd/lockManager.h>
-#include <lladd/compensations.h>
+#include <stasis/lockManager.h>
+#include <stasis/compensations.h>
 #include "page/slotted.h"
 #include "page/fixed.h"
 #include "page/indirect.h"
-#include <lladd/operations/arrayList.h>
-#include <lladd/bufferPool.h>
-#include <lladd/truncation.h>
+#include <stasis/operations/arrayList.h>
+#include <stasis/bufferPool.h>
+#include <stasis/truncation.h>
 
 static page_impl * page_impls;
 

src/stasis/page.h

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

src/stasis/page/fixed.c

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