Changeset 756

Timestamp:

07/08/08 18:16:50 (2 months ago)

Author:

mwhitworth

Message:

Add to journal code.

Location:

Whitix/branches/fs/fs/journal

Files:

• init.c (modified) (2 diffs)
• journals.c (modified) (1 diff)
• transaction.c (modified) (4 diffs)

Whitix/branches/fs/fs/journal/init.c

@@ -26 +26 @@
 struct Thread* journalCommitter=NULL;
 
-struct Cache* journalCache=NULL;
+struct Cache* journalCache=NULL, *journHandleCache=NULL, *journTransCache=NULL;
 
 static void JournalCommitter()
@@ -45 +45 @@
         /* Init caches. */
         journalCache=MemCacheCreate("Journal cache", sizeof(struct Journal), NULL, NULL, 0);
+        journHandleCache=MemCacheCreate("Journal handle cache", 
+                sizeof(struct JournalHandle), NULL, NULL, 0);
+        journTransCache=MemCacheCreate("Journal transaction cache",
+                sizeof(struct JournalTrans), NULL, NULL, 0);
 
         journalCommitter=ThrCreateKernelThread(JournalCommitter);

Whitix/branches/fs/fs/journal/journals.c

@@ -88 +88 @@
         journal->maxLength=vNode->size/BYTES_PER_SECTOR(vNode->superBlock);
         journal->sectorSize=BYTES_PER_SECTOR(vNode->superBlock);
+        journal->transSequence=1;
 
         if (BeToCpu32(jSb->maxLen) < journal->maxLength)

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

@@ -22 +22 @@
 #include <slab.h>
 
-extern struct Cache* journHandleCache;
+extern struct Cache* journHandleCache, *journTransCache;
 
-int JournalTransCreate(struct Journal* journal)
+/*******************************************************************************
+ *
+ * FUNCTION:    JournalTransCreate
+ *
+ * DESCRIPTION: Create a new current transaction for the journal. The journal
+ *                              lock must be held on entry to this function. Create it in a
+ *                              RUNNING state and add it to the new journal.
+ *
+ * PARAMETERS:  journal - the journal to create a new filesystem transaction for
+ *
+ * RETURNS:     a structure representing the new current transaction for the
+ *                              journal.
+ *
+ ******************************************************************************/
+
+struct JournalTrans* JournalTransCreate(struct Journal* journal)
 {
-        KePrint("JournalTransCreate\n");
+        struct JournalTrans* ret;
+
+        ret=(struct JournalTrans*)MemCacheAlloc(journTransCache);
+
+        if (!ret)
+                return NULL;
+
+        ret->journal=journal;
+        ret->state=JTRANS_RUNNING;
+        ret->transId=journal->transSequence++;
+
+        /* TODO: Set up timer. */
+
+        journal->currTransaction=ret;
+
+        return ret;
 }
 
@@ -32 +62 @@
 {
         int numBlocks=handle->numBlocks;
+        struct JournalTrans* trans;
+        int needed;
 
         if (numBlocks > journal->maxTransactionBuffers)
@@ -49 +81 @@
         if (!journal->currTransaction)
                 journal->currTransaction=JournalTransCreate(journal);
+
+        trans=journal->currTransaction;
+
+        /* Check if locked. */
+
+        needed=trans->outstandingBlocks+numBlocks;
+
+        if (needed > journal->maxTransactionBuffers)
+        {
+                /* Current transaction is too large. TODO: Commit it. */
+        }
+
+        /* Check log space left. */
+
+        /* Account for all the buffers, and add the handle to the running transaction. */
+        handle->transaction=trans;
+        trans->outstandingBlocks+=numBlocks;
+        trans->updates++;
+        trans->handleCount++;
+
+        JournalUnlock(journal);
+
+        return 0;
 }
 
@@ -92 +147 @@
 
 SYMBOL_EXPORT(JournalStart);
+
+/* Intent to modify a buffer for metadata update. */
+
+int JournalGetWriteAccess(struct JournalHandle* handle, struct Buffer* buffer)
+{
+        struct JournalTrans* trans=handle->transaction;
+        struct Journal* journal=trans->journal;
+        struct JournalHead* head;
+
+        head=JournalAddHeader(buffer);
+
+        return 0;
+}
+
+SYMBOL_EXPORT(JournalGetWriteAccess);