Moved page.h and some of the logging headers out of the public API.

libdfa/statemachine.h

@@ -47,7 +47,7 @@ terms specified in this license.
 #include <time.h>
 #include <lladd/transactional.h>
 #include <libdfa/messages.h>
-#include "../lladd/lladd/page.h"
+#include "../lladd/src/lladd/page.h"
 #include <sys/types.h>
 #include <pthread.h>
 

lladd/bufferManager.h

@@ -88,8 +88,6 @@ terms specified in this license.
 #define __BUFFERMANAGER_H__
 
 
-
-/*#include <lladd/page.h>*/
 #include <lladd/constants.h>
 #include <lladd/transactional.h>
 /**

lladd/logger/logEntry.h

@@ -44,8 +44,6 @@ terms specified in this license.
 #define __LLADD_LOGGING_LOGENTRY_H
 
 #include <lladd/common.h>
-/*#include <lladd/page.h>*/
-/*#include <lladd/transactional.h> */
 
 BEGIN_C_DECLS
 

lladd/pageCache.h

@@ -15,10 +15,12 @@
     the three functions below.  They are relatively straightforward.
     Note that pageCache does not perform any file I/O of its own.
 
+    @todo pageCache should not include page.h at all.  It should treat
+    pages as (int, void*) pairs.
+
 */
-#include <lladd/page.h>
 void pageCacheInit();
 void pageCacheDeinit();
-Page * loadPagePtr(int pageid);
+void * loadPagePtr(int pageid);
 
 #endif

src/lladd/blobManager.c

@@ -5,7 +5,6 @@
 
 #include <lladd/transactional.h>
 #include <lladd/bufferManager.h>
-#include <lladd/page.h>
 #include <lladd/constants.h>
 
 #include "blobManager.h"

src/lladd/blobManager.h

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

src/lladd/bufferManager.c

@@ -54,9 +54,9 @@ terms specified in this license.
 #include <lladd/bufferManager.h>
 #include "blobManager.h"
 #include <lladd/pageCache.h>
-#include <lladd/logger/logWriter.h>
+#include "logger/logWriter.h"
 
-#include <lladd/page.h>
+#include "page.h"
 
 static FILE * stable = NULL;
 

src/lladd/logger/logHandle.c

@@ -40,8 +40,8 @@ permission to use and distribute the software in accordance with the
 terms specified in this license.
 ---*/
 
-#include <lladd/logger/logHandle.h>
-#include <lladd/logger/logWriter.h>
+#include "logHandle.h"
+#include "logWriter.h" 
 #include <config.h> 
 #include <malloc.h>
 

src/lladd/logger/logHandle.h

@@ -62,8 +62,9 @@ BEGIN_C_DECLS
 
    @see logWriter.h For write access to the log.
    @see logger2.h for the typedef of the logHandle struct
-*/
 
+   $Id$
+*/
 
 /** Returns a logHandle pointing at the first log entry in the log.  */
 LogHandle getLogHandle();

src/lladd/logger/logWriter.c

@@ -43,15 +43,14 @@ terms specified in this license.
 #include <lladd/common.h>
 
 #include <lladd/transactional.h>
-#include <lladd/logger/logWriter.h>
-#include <lladd/logger/logHandle.h>
+#include "logWriter.h"
+#include "logHandle.h"
 
 #include "../latches.h"
 
 #include <assert.h>
 #include <stdio.h>
 
-#include <lladd/page.h> /* For addPendingEvent() */
 #include <lladd/bufferManager.h>
 /** 
     @todo Should the log file be global? 

src/lladd/logger/logWriter.h

@@ -68,7 +68,7 @@ terms specified in this license.
 #ifndef __LOGWRITER_H__
 #define __LOGWRITER_H__
 
-#include "logEntry.h"
+/*#include "logEntry.h"*/
 #include <lladd/constants.h>
 #include <lladd/common.h>
 

src/lladd/logger/logger2.c

@@ -44,7 +44,7 @@ terms specified in this license.
 #include <lladd/common.h>
 
 #include <lladd/logger/logger2.h>
-#include <lladd/logger/logWriter.h>
+#include "logWriter.h"
 #include <lladd/bufferManager.h>
 #include <stdio.h>
 TransactionLog LogTransBegin(int xid) {

src/lladd/operations.c

@@ -41,9 +41,8 @@ terms specified in this license.
 ---*/
 #include <lladd/operations.h>
 
-#include <lladd/logger/logWriter.h>
+#include "logger/logWriter.h"
 #include <lladd/bufferManager.h>
-#include <lladd/page.h>
 #include <assert.h>
 
 #include <stdio.h>

src/lladd/operations/alloc.c

@@ -4,7 +4,6 @@
 #include <lladd/operations/alloc.h>
 
 #include <lladd/transactional.h>
-#include <lladd/page.h>
 #include <lladd/bufferManager.h>
 #include "../blobManager.h"
 /**

src/lladd/operations/prepare.c

@@ -47,7 +47,7 @@ terms specified in this license.
  **********************************************/
 
 #include <lladd/operations/prepare.h>
-#include <lladd/logger/logWriter.h>
+#include "../logger/logWriter.h"
 #include <malloc.h>
 
 recordid prepare_bogus_rec  = { 0, 0, 0};

src/lladd/page.c

@@ -89,7 +89,7 @@ terms specified in this license.
 
 #include <config.h>
 #include <lladd/common.h>
-#include <lladd/page.h>
+#include "page.h"
 
 #include <assert.h>
 #include <stdio.h>

src/lladd/page.h

@@ -54,14 +54,14 @@ terms specified in this license.
 #ifndef __PAGE_H__
 #define __PAGE_H__
 
-#include "common.h"
+#include <lladd/common.h>
 
 /** @todo page.h includes things that it shouldn't!  (Or, page.h shouldn't be an installed header.) */
 
 #include <lladd/transactional.h>
 
-#include "../config.h"
-#include "../src/lladd/latches.h"
+#include <config.h>
+#include "latches.h"
 BEGIN_C_DECLS
 
 /** 

src/lladd/pageCache.c

@@ -14,7 +14,7 @@
 #include <pbl/pbl.h>
 
 #include <stdio.h>
-
+#include "page.h" 
 static pblHashTable_t *activePages; /* page lookup */
 static unsigned int bufferSize; /* < MAX_BUFFER_SIZE */
 static Page *repHead, *repMiddle, *repTail; /* replacement policy */
@@ -137,7 +137,7 @@ static Page *kickPage(int pageid) {
 int lastPageId = -1;
 Page * lastPage = 0;
 
-Page *loadPagePtr(int pageid) {
+void *loadPagePtr(int pageid) {
 	/* lock activePages, bufferSize */
 	Page *ret;
 

src/lladd/recovery2.c

@@ -10,13 +10,12 @@
 
 #include <config.h>
 #include <lladd/common.h>
-#include <lladd/page.h>
 #include <lladd/recovery.h>
 
 #include <pbl/pbl.h>
 #include "linkedlist.h"
-#include <lladd/logger/logHandle.h>
-#include <lladd/logger/logWriter.h>
+#include "logger/logHandle.h"
+#include "logger/logWriter.h"
 #include <lladd/bufferManager.h>
 
 #include <lladd/transactional.h>

src/lladd/transactional2.c

@@ -4,7 +4,7 @@
 #include <lladd/transactional.h>
 
 #include <lladd/recovery.h>
-#include <lladd/logger/logWriter.h>
+#include "logger/logWriter.h"
 #include <lladd/bufferManager.h>
 #include <lladd/logger/logger2.h>
 

test/lladd/check_blobRecovery.c

@@ -44,7 +44,7 @@ terms specified in this license.
 /*#include <assert.h> */
 
 #include <lladd/transactional.h>
-#include <lladd/logger/logWriter.h>
+#include "../../src/lladd/logger/logWriter.h"
 #include "../check_includes.h"
 #include <assert.h>
 

test/lladd/check_logWriter.c

@@ -45,8 +45,8 @@ terms specified in this license.
 
 #include <lladd/transactional.h>
 /*#include <lladd/logger/logEntry.h> */
-#include <lladd/logger/logHandle.h>
-#include <lladd/logger/logWriter.h>
+#include "../../src/lladd/logger/logHandle.h"
+#include "../../src/lladd/logger/logWriter.h"
 
 #include "../../src/lladd/latches.h"
 #include <sched.h>

test/lladd/check_page.c

@@ -44,7 +44,7 @@ terms specified in this license.
 #include <config.h>
 #include <check.h>
 
-#include <lladd/page.h>
+#include "../../src/lladd/page.h"
 #include <lladd/bufferManager.h>
 #include <lladd/transactional.h>
 

test/lladd/check_recovery.c

@@ -44,7 +44,7 @@ terms specified in this license.
 #include <assert.h> 
 
 #include <lladd/transactional.h>
-#include <lladd/logger/logWriter.h>
+#include "../../src/lladd/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 <lladd/logger/logHandle.h>
-#include <lladd/logger/logWriter.h>
+#include "../src/lladd/logger/logHandle.h"
+#include "../src/lladd/logger/logWriter.h"
 
 
 static char * logEntryToString(LogEntry * le) {