move latching stuff to util/, blobs to operations/

src/stasis/CMakeLists.txt

@@ -15,13 +15,13 @@ ADD_LIBRARY(stasis util/crc32.c
                    util/slab.c
                    util/stlredblack.cpp
                    util/stlslab.cpp
-                   common.c flags.c stats.c bufferManager.c
+                   common.c flags.c util/latchStats.c bufferManager.c
                    operations.c pageHandle.c 
                    bufferManager/concurrentBufferManager.c
                    bufferManager/legacy/pageFile.c
                    bufferManager/legacy/pageCache.c
                    bufferManager/legacy/legacyBufferManager.c
-                   page.c bufferPool.c blobManager.c
+                   page.c bufferPool.c
                    recovery2.c truncation.c transactional2.c
                    dirtyPageTable.c transactionTable.c
                    allocationPolicy.c iterator.c
@@ -53,6 +53,7 @@ ADD_LIBRARY(stasis util/crc32.c
                    operations/pageOrientedListNTA.c
                    operations/regions.c
                    operations/bTree.c
+                   operations/blobs.c
                    io/rangeTracker.c io/memory.c io/file.c io/pfile.c io/raid1.c
                    io/non_blocking.c io/debug.c io/handle.c
                    bufferManager/pageArray.c

src/stasis/bufferManager/pageArray.c

@@ -1,7 +1,7 @@
 #include <stasis/transactional.h>
 #include <stasis/bufferPool.h>
 #include <stasis/truncation.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/bufferManager/pageArray.h>
 #include <stasis/page.h>
 

src/stasis/common.c

@@ -2,7 +2,7 @@
 
 #include <stasis/common.h>
 
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 
 #include <pbl/pbl.h>
 #include <assert.h>

src/stasis/experimental/lockManagerImpl.c

@@ -1,6 +1,6 @@
 #include <pbl/pbl.h>
 #include <stasis/lockManager.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/util/hash.h>
 
 #include <sys/time.h>

src/stasis/logger/filePool.c

@@ -8,7 +8,7 @@
 
 #include <stasis/util/ringbuffer.h>
 #include <stasis/util/crc32.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/logger/filePool.h>
 
 #include <stdio.h>

src/stasis/logger/inMemoryLog.c

@@ -1,6 +1,6 @@
 #include <stasis/logger/inMemoryLog.h>
 #include <stasis/flags.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>

src/stasis/logger/safeWrites.c

@@ -45,7 +45,7 @@ terms specified in this license.
 #include <stasis/common.h>
 #include <stasis/flags.h>
 
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/util/crc32.h>
 #include <stasis/util/min.h>
 

src/stasis/operations/alloc.c

@@ -2,7 +2,6 @@
 #include <stasis/transactional.h>
 #include <stasis/bufferManager.h>
 #include <stasis/allocationPolicy.h>
-#include <stasis/blobManager.h>
 #include <stasis/page.h>
 
 #include <string.h>

src/stasis/operations/blobs.c

@@ -50,7 +50,7 @@ void stasis_blob_read(int xid, Page * p, recordid rid, byte * buf) {
   DEBUG("Chunk = %d->%lld\n", chunk, (long long)rec.offset+chunk);
 }
 
-void stasis_blob_write(int xid, Page * p, recordid rid, const void* dat) {
+void stasis_blob_write(int xid, Page * p, recordid rid, const byte* dat) {
     blob_record_t rec;
     recordid r = rid;
     r.size = sizeof(blob_record_t);

src/stasis/operations/linearHashNTA.c

@@ -1,6 +1,6 @@
 #include <config.h>
 #define _GNU_SOURCE
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/util/hash.h>
 #include <assert.h>

src/stasis/operations/linkedListNTA.c

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

src/stasis/operations/naiveLinearHash.c

@@ -1,7 +1,7 @@
 #include <stasis/bufferManager.h>
 #include <stasis/operations.h>
 #include <stasis/util/hash.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/page.h>
 
 /**

src/stasis/operations/set.c

@@ -46,7 +46,6 @@ terms specified in this license.
  **********************************************/
 
 #include <stasis/operations.h>
-#include <stasis/blobManager.h>
 #include <stasis/bufferManager.h>
 #include <stasis/page.h>
 #include <string.h>

src/stasis/page.c

@@ -68,10 +68,10 @@ terms specified in this license.
 */
 
 #include <stasis/common.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/page.h>
 #include <stasis/constants.h>
-#include <stasis/blobManager.h>
+#include <stasis/operations/blobs.h>
 #include <stasis/lockManager.h>
 #include <stasis/page/slotted.h>
 #include <stasis/page/fixed.h>

src/stasis/transactional2.c

@@ -1,4 +1,4 @@
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/recovery.h>
 #include <stasis/bufferManager.h>
@@ -20,7 +20,7 @@
 
 #include <stasis/truncation.h>
 #include <stasis/io/handle.h>
-#include <stasis/blobManager.h> // XXX remove this, move Tread() to set.c
+#include <stasis/operations/blobs.h> // XXX remove this, move Tread() to set.c
 
 #include <assert.h>
 #include <stdio.h>

src/stasis/util/latchStats.c

@@ -1,5 +1,5 @@
 #include <stasis/common.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 
 #include <math.h>
 #include <stdio.h>

src/stasis/util/lhtable.c

@@ -1,7 +1,7 @@
 #include <stasis/util/lhtable.h>
 #include <stasis/util/hash.h>
 #include <pbl/pbl.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 
 #include <assert.h>
 

stasis/operations.h

@@ -157,7 +157,7 @@ typedef struct {
 #include "operations/regions.h"
 #include "operations/lsnFreeSet.h"
 #include "operations/segmentFile.h"
-
+#include "operations/blobs.h"
 /**
    Initialize stasis' operation table.
  */

stasis/operations/blobs.h

@@ -52,13 +52,13 @@ BEGIN_C_DECLS
 /** 
     Read the blob from the recordid rid into buf.
 */
-void stasis_blob_read(int xid, Page * p,  recordid rid, void * buf);
+void stasis_blob_read(int xid, Page * p,  recordid rid, byte * buf);
 
 
 /** 
     Write the contents of buf to the blob in recordid rid.
 */
-void stasis_blob_write(int xid, Page * p, recordid rid, const void * buf);
+void stasis_blob_write(int xid, Page * p, recordid rid, const byte * buf);
 
 recordid preAllocBlob(int xid, long blobsize);
 recordid preAllocBlobFromPage(int xid, long page, long blobsize);

stasis/page.h

@@ -103,7 +103,7 @@ terms specified in this license.
 
 #include <stasis/common.h>
 #include <stasis/constants.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/dirtyPageTable.h>
 
 #include <assert.h>

stasis/util/latches.h

@@ -1,6 +1,5 @@
 #include <stasis/common.h>
-#include <pthread.h>
+#include <stasis/util/latchStats.h>
-#include <stasis/stats.h>
 
 #ifndef __LATCHES_H
 #define __LATCHES_H
@@ -20,7 +19,7 @@ typedef struct {
   void * lockpoints;
 } lladd_pthread_mutex_t;
 
-#include "util/rw.h"
+#include "rw.h"
 
 /**
    Keeps some profiling information along with a read/write lock.

test/stasis/check_bufferManager.c

@@ -1,7 +1,7 @@
 #include "../check_includes.h"
 
 #include <stasis/transactional.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/page.h>
 #include <stasis/bufferManager.h>
 #include <stasis/bufferManager/bufferHash.h>

test/stasis/check_logWriter.c

@@ -55,7 +55,7 @@ terms specified in this license.
 #include <stasis/logger/safeWrites.h>
 #include <stasis/logger/inMemoryLog.h>
 #include <stasis/truncation.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 
 #include <sched.h>
 #include <assert.h>

test/stasis/check_page.c

@@ -49,10 +49,10 @@ terms specified in this license.
 #include <stasis/page.h>
 #include <stasis/page/slotted.h>
 #include <stasis/experimental/latchFree/lfSlotted.h>
-#include <stasis/blobManager.h>
+#include <stasis/operations/blobs.h>
 #include <stasis/bufferManager.h>
 #include <stasis/transactional.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 
 #include <sched.h>
 #include <assert.h>

test/stasis/check_pageOperations.c

@@ -47,7 +47,7 @@ terms specified in this license.
 #include <stasis/transactional.h>
 #include <stasis/truncation.h>
 #include <stasis/logger/logger2.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 
 #include <sched.h>
 #include <assert.h>

test/stasis/check_regions.c

@@ -40,7 +40,7 @@ terms specified in this license.
 ---*/
 #include "../check_includes.h"
 
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/transactional.h>
 
 #include <assert.h>

test/stasis/check_transactional2.c

@@ -41,7 +41,7 @@ terms specified in this license.
 #include "../check_includes.h"
 
 #include <stasis/common.h>
-#include <stasis/latches.h>
+#include <stasis/util/latches.h>
 #include <stasis/transactional.h>
 
 #include <assert.h>