Changeset 799

Timestamp:

07/14/08 20:33:28 (3 months ago)

Author:

mwhitworth

Message:

Add to checkpoint function, return early if no checkpointing is needed.

Files:

• Whitix/branches/fs/fs/journal/checkpoint.c (modified) (5 diffs)

Whitix/branches/fs/fs/journal/checkpoint.c

@@ -41 +41 @@
                 
 //              KePrint("transaction->id = %u, %u\n", transaction->transId, blockNo);
+        }else if ((transaction = journal->committingTrans) || (transaction = journal->currTransaction))
+        {
+                firstTid=transaction->transId;
+                blockNo=transaction->logStart;
         }else{
 //              KePrint("JournalCleanupTail: list empty!\n");
@@ -49 +53 @@
         
         if (journal->tailSequence == firstTid)
-        {
                 return 1;
-        }
         
         freed=blockNo-journal->tail;
         
-//      KePrint("Journal tail from %d to %d (offset %u), freed %d\n", journal->tailSequence, firstTid, blockNo, freed);
+        KePrint("Journal tail from %d to %d (offset %u), freed %d\n", journal->tailSequence, firstTid, blockNo, freed);
         
         journal->free+=freed;
@@ -68 +70 @@
         struct JournalTrans* curr, *curr2;
         struct JournalHead* currHead, *currHead2;
+        int ret;
+
+        JournalLock(journal);
         
-        JournalCleanupTail(journal);
+        ret=JournalCleanupTail(journal);
         
-        JournalLock(journal);
+        if (ret <= 0)
+                goto out;
+        
+        ListForEachEntry(curr, &journal->checkpointTrans, next)
+        {
+                ListForEachEntry(currHead, &curr->forgetList, next)
+                {
+                        BlockWrite(currHead->buffer->device, currHead->buffer);
+//                      KePrint("Wrote %u\n", currHead->buffer->blockNum);
+                }
+        }
         
         ListForEachEntrySafe(curr, curr2, &journal->checkpointTrans, next)
@@ -77 +92 @@
                 ListForEachEntrySafe(currHead, currHead2, &curr->forgetList, next)
                 {
-                        BlockWrite(currHead->buffer->device, currHead->buffer);
-//                      KePrint("Wrote %u\n", currHead->buffer->blockNum);
+                        WaitForBuffer(currHead->buffer);
                         ListRemove(&currHead->next);
+                        JournalRemoveHeader(currHead);
                 }
+                
+                INIT_LIST_HEAD(&curr->forgetList);
                 
                 ListRemove(&curr->next);
         }
-        
-        JournalUnlock(journal);
+                
+        INIT_LIST_HEAD(&journal->checkpointTrans);
         
         /* Clean up the tail. */
@@ -92 +109 @@
         /* Update the superblock. */
         JournalUpdateSuperBlock(journal);
+
+out:
+        JournalUnlock(journal);
         
         return 0;