Changeset 789

Timestamp:

07/13/08 20:46:20 (3 months ago)

Author:

mwhitworth

Message:

Add more list types, add support for blocks on two different transactions.

Files:

• Whitix/branches/fs/fs/journal/transaction.c (modified) (11 diffs)

Whitix/branches/fs/fs/journal/transaction.c

@@ -58 +58 @@
         INIT_LIST_HEAD(&ret->metaDataList);
         INIT_LIST_HEAD(&ret->logControlList);
+        INIT_LIST_HEAD(&ret->shadowList);
+        INIT_LIST_HEAD(&ret->ioList);
+        INIT_LIST_HEAD(&ret->forgetList);
 
         /* TODO: Set up timer. */
@@ -68 +71 @@
 int JournalHandleStart(struct Journal* journal, struct JournalHandle* handle)
 {
-        int numBlocks=handle->numBlocks;
+        DWORD numBlocks=handle->numBlocks;
         struct JournalTrans* trans;
         int needed;
@@ -101 +104 @@
 
         /* Check log space left. */
+//      KePrint("free = %u\n", journal->free);
 
         /* Account for all the buffers, and add the handle to the running transaction. */
@@ -138 +142 @@
 
         handle=JournalHandleAllocate(numBlocks);
-
         currThread->currHandle=handle;
-
         ret=JournalHandleStart(journal, handle);
 
@@ -159 +161 @@
         struct JournalTrans* trans=handle->transaction;
         struct Journal* journal=trans->journal;
-
+        
         currThread->currHandle=NULL;
+
+        --handle->refs;
+        
+        if (handle->refs > 0)
+                return 0;
 
         trans->updates--;
         trans->outstandingBlocks-=handle->numBlocks;
 
+//      KePrint("JournalStop: %u\n", trans->updates);
+
         if (!trans->updates)
         {
-                /* Wake up waiters. */
+//              KePrint("Here! %u %u\n", currTime.seconds, trans->expires);
+                WakeUp(&journal->waitUpdates);
         }
 
@@ -190 +200 @@
 {
         struct ListHead* list;
+
+        if (!head)
+        {
+                KePrint("JournalFileBuffer: head = NULL\n");
+                return;
+        }
 
         /* Already filed? */
@@ -201 +217 @@
 
         if (head->transaction == trans && head->list > 0 && head->list != type)
-                ListRemove(&head->next);
+                JournalUnfileBuffer(head);
+        else
+                head->transaction=trans;
 
         switch (type)
@@ -215 +233 @@
                 case JOURN_LOGCTL:
                         list=&trans->logControlList;
+                        break;
+
+                case JOURN_SHADOW:
+                        list=&trans->shadowList;
+                        break;
+
+                case JOURN_IO:
+                        list=&trans->ioList;
+                        break;
+                        
+                case JOURN_FORGET:
+                        list=&trans->forgetList;
                         break;
 
@@ -226 +256 @@
 }
 
+void JournalUnfileBuffer(struct JournalHead* head)
+{
+        ListRemove(&head->next);
+}
+
 /* Intent to modify a buffer for metadata update. */
 
@@ -238 +273 @@
         JournalLock(journal);
 
-        /* Check if buffer is locked. */
+        BufferLock(buffer);
+
+repeat:
+        if (head->transaction && head->transaction != trans)
+        {
+                if (head->list == JOURN_SHADOW)
+                {
+                        JournalUnlock(journal);
+//                      KePrint("shadow wait, %#X, %u\n", head, JournHeadToBuffer(head)->blockNum);
+                        WAIT_ON(head->wait, head->list != JOURN_SHADOW);
+                        JournalLock(journal);
+                        goto repeat;
+                }
+                
+                if (head->list != JOURN_FORGET)
+                {
+                }
+                
+                head->nextTransaction=trans;
+        }
 
         if (!head->transaction)
@@ -245 +299 @@
                 JournalFileBuffer(head, trans, JOURN_RESERVED);
         }
+        
+        BufferUnlock(buffer);
+        
+        if (handle->numBlocks <= 0)
+        {
+                KePrint("numBlocks <= 0\n");
+                cli(); hlt();
+                return 0;
+        }
+        
+        handle->numBlocks--;
+        
+//      KePrint("blocks left: %u\n", handle->numBlocks);
 
         JournalUnlock(journal);