Changeset 759 for Whitix/branches/fs/fs/journal/transaction.c

Timestamp:

07/09/08 15:26:36 (5 months ago)

Author:

mwhitworth

Message:

Add to journal code. Support for per-journal threads, flushing of metadata, and start of commit code.

Files:

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

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

@@ -18 +18 @@
 
 #include <fs/journal.h>
+#include <fs/vfs.h>
 #include <module.h>
 #include <print.h>
@@ -51 +52 @@
         ret->state=JTRANS_RUNNING;
         ret->transId=journal->transSequence++;
+        ret->expires=currTime.seconds+JOURN_COMMIT_INTERVAL;
+
+        /* TODO: Move to constructor. */
+        INIT_LIST_HEAD(&ret->reservedList);
+        INIT_LIST_HEAD(&ret->metaDataList);
 
         /* TODO: Set up timer. */
@@ -148 +154 @@
 SYMBOL_EXPORT(JournalStart);
 
+int JournalStop(struct JournalHandle* handle)
+{
+        struct JournalTrans* trans=handle->transaction;
+        struct Journal* journal=trans->journal;
+
+        currThread->currHandle=NULL;
+
+        trans->updates--;
+        trans->outstandingBlocks-=handle->numBlocks;
+
+        if (!trans->updates)
+        {
+                /* Wake up waiters. */
+        }
+
+        if (handle->sync == 1 || currTime.seconds >= trans->expires)
+        {
+                int id=trans->transId;
+
+                JournalStartCommit(journal, trans);
+
+                if (handle->sync == 1)
+                        JournalWaitCommit(journal, id);
+        }
+
+        MemCacheFree(journHandleCache, handle);
+
+        return 0;
+}
+
+SYMBOL_EXPORT(JournalStop);
+
+void JournalFileBuffer(struct JournalHead* head, struct JournalTrans* trans, int type)
+{
+        struct ListHead* list;
+
+        /* Already filed? */
+        if (head->transaction && head->list == type)
+                return;
+
+        /* 
+         * It's already in this transaction, but on a different list, so we remove it
+         * before adding it to the other list.
+         */
+
+        if (head->transaction == trans && head->list > 0 && head->list != type)
+                ListRemove(&head->next);
+
+        switch (type)
+        {
+                case JOURN_RESERVED:
+                        list=&trans->reservedList;
+                        break;
+
+                case JOURN_METADATA:
+                        list=&trans->metaDataList;
+                        break;
+
+                default:
+                        KePrint("FileBuffer: handle %d!\n", type);
+                        return;
+        }
+
+        ListAddTail(&head->next, list);
+        head->list=type;
+}
+
 /* Intent to modify a buffer for metadata update. */
 
@@ -158 +231 @@
         head=JournalAddHeader(buffer);
 
+        JournalLock(journal);
+
+        /* Check if buffer is locked. */
+
+        if (!head->transaction)
+        {
+                head->transaction=trans;
+                JournalFileBuffer(head, trans, JOURN_RESERVED);
+        }
+
+        JournalUnlock(journal);
+
         return 0;
 }
 
 SYMBOL_EXPORT(JournalGetWriteAccess);
+
+int JournalDirtyMetadata(struct JournalHandle* handle, struct Buffer* buffer)
+{
+        struct JournalTrans* trans=handle->transaction;
+        struct Journal* journal=trans->journal;
+        struct JournalHead* head=BufferToJournHead(buffer);
+
+        JournalLock(journal);
+
+        JournalFileBuffer(head, trans, JOURN_METADATA);
+
+        JournalUnlock(journal);
+
+        return 0;
+}
+
+SYMBOL_EXPORT(JournalDirtyMetadata);
+
+int JournalForceCommit(struct Journal* journal)
+{
+        struct JournalHandle* handle;
+
+        handle=JournalStart(journal, 1);
+
+        handle->sync=1;
+
+        /* The sync forces the commit to disk. */
+        JournalStop(handle);
+
+        return 0;
+}
+
+SYMBOL_EXPORT(JournalForceCommit);