From 078d518bb6062229c2bbe29c04b95f834f61cbda Mon Sep 17 00:00:00 2001
From: Sears Russell <sears@cs.berkeley.edu>
Date: Thu, 11 Feb 2010 21:21:31 +0000
Subject: [PATCH] cleaned up some lsn-free stuff

---
 src/stasis/bufferManager.c         |  3 ++-
 src/stasis/operations.c            |  2 --
 src/stasis/operations/lsnFreeSet.c |  4 ++--
 src/stasis/page.c                  | 10 +++++++---
 src/stasis/page/lsnFree.c          | 10 +++-------
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/stasis/bufferManager.c b/src/stasis/bufferManager.c
index 8aa50e0..b5a81e7 100644
--- a/src/stasis/bufferManager.c
+++ b/src/stasis/bufferManager.c
@@ -157,7 +157,8 @@ Page * loadPage(int xid, pageid_t pageid) {
 Page * loadPageOfType(int xid, pageid_t pageid, pagetype_t type) {
   if(globalLockManager.readLockPage) { globalLockManager.readLockPage(xid, pageid); }
   stasis_buffer_manager_t * bm = stasis_runtime_buffer_manager();
-  return bm->loadPageImpl(bm, xid, pageid, type);
+  Page *p = bm->loadPageImpl(bm, xid, pageid, type);
+  return p;
 }
 Page * loadUninitializedPage(int xid, pageid_t pageid) {
   // This lock is released at Tcommit()
diff --git a/src/stasis/operations.c b/src/stasis/operations.c
index eae5949..766d644 100644
--- a/src/stasis/operations.c
+++ b/src/stasis/operations.c
@@ -150,8 +150,6 @@ void stasis_operation_redo(const LogEntry * e, Page * p) {
     // is for this log type.
 
     // contrast with stasis_operation_do(), which doesn't check the .redo field
-    assert(e->update.funcID != OPERATION_INVALID);
-    assert(stasis_operation_table[e->update.funcID].redo != OPERATION_INVALID);
     stasis_operation_table[stasis_operation_table[e->update.funcID].redo]
       .run(e,p);
     if(p) stasis_page_lsn_write(e->xid, p, e->LSN);
diff --git a/src/stasis/operations/lsnFreeSet.c b/src/stasis/operations/lsnFreeSet.c
index 462a173..7b11256 100644
--- a/src/stasis/operations/lsnFreeSet.c
+++ b/src/stasis/operations/lsnFreeSet.c
@@ -97,7 +97,7 @@ int TsetWriteBack(int xid, pageid_t page, pageoff_t off, pageoff_t len, const vo
 stasis_operation_impl stasis_op_impl_lsn_free_set() {
   stasis_operation_impl o = {
     OPERATION_SET_LSN_FREE,
-    SEGMENT_PAGE,
+    SLOTTED_LSN_FREE_PAGE,
     OPERATION_SET_LSN_FREE,
     OPERATION_SET_LSN_FREE_INVERSE,
     op_lsn_free_set
@@ -108,7 +108,7 @@ stasis_operation_impl stasis_op_impl_lsn_free_set() {
 stasis_operation_impl stasis_op_impl_lsn_free_set_inverse() {
   stasis_operation_impl o = {
     OPERATION_SET_LSN_FREE_INVERSE,
-    SEGMENT_PAGE,
+    SLOTTED_LSN_FREE_PAGE,
     OPERATION_SET_LSN_FREE_INVERSE,
     OPERATION_SET_LSN_FREE,
     op_lsn_free_unset
diff --git a/src/stasis/page.c b/src/stasis/page.c
index 2a2e169..0d2a2fc 100644
--- a/src/stasis/page.c
+++ b/src/stasis/page.c
@@ -284,11 +284,12 @@ void stasis_record_compact_slotids(int xid, Page * p) {
 }
 void stasis_page_loaded(Page * p, pagetype_t type){
   p->pageType = (type == UNKNOWN_TYPE_PAGE) ? *stasis_page_type_ptr(p) : type;
-  assert(page_impls[p->pageType].page_type == p->pageType);
-  if(page_impls[type].has_header) {
+  assert(page_impls[p->pageType].page_type == p->pageType);  // XXX unsafe; what if the page has no header?
+  if(page_impls[p->pageType].has_header) {
     p->LSN = *stasis_page_lsn_cptr(p);
   } else {
-    p->LSN = 0; // TODO is this the right thing to do?
+    // XXX Need to distinguish between lsn free and header free, then assert(type != UNKNOWN_TYPE_PAGE);
+    p->LSN = 0;
   }
   if (page_impls[p->pageType].pageLoaded) page_impls[p->pageType].pageLoaded(p);
 }
@@ -300,6 +301,9 @@ void stasis_page_flushed(Page * p){
   if(page_impls[type].has_header) {
     *stasis_page_type_ptr(p)= type;
     *stasis_page_lsn_ptr(p) = p->LSN;
+  } else {
+    *stasis_page_type_ptr(p)= type; // XXX 'has_header' is a misnomer.
+
   }
   if(page_impls[type].pageFlushed) page_impls[type].pageFlushed(p);
 }
diff --git a/src/stasis/page/lsnFree.c b/src/stasis/page/lsnFree.c
index 68aeb95..0616da2 100644
--- a/src/stasis/page/lsnFree.c
+++ b/src/stasis/page/lsnFree.c
@@ -6,16 +6,12 @@ void stasis_slotted_lsn_free_initialize_page(Page * p) {
   stasis_page_slotted_initialize_page(p);
   p->pageType = SLOTTED_LSN_FREE_PAGE;
 }
-// XXX still not correct; need to have an "LSN_FREE" constant.
-static void lsnFreeLoaded(Page * p) {
-  p->LSN = 0; //stasis_log_file->next_available_lsn(stasis_log_file);
-}
-static void lsnFreeFlushed(Page * p) { }
 
 page_impl slottedLsnFreeImpl() {
   page_impl pi = stasis_page_slotted_impl();
+  pi.has_header = 0;
   pi.page_type = SLOTTED_LSN_FREE_PAGE;
-  pi.pageLoaded = lsnFreeLoaded;
-  pi.pageLoaded = lsnFreeFlushed;
+  pi.pageLoaded = 0;
+  pi.pageFlushed = 0;
   return pi;
 }