Changeset 800 for Whitix/branches

Timestamp:

07/14/08 20:33:50 (4 months ago)

Author:

mwhitworth

Message:

Add JournalRemoveHeader function, more locking.

Files:

• Whitix/branches/fs/fs/journal/journals.c (modified) (8 diffs)

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

@@ -54 +54 @@
         struct JournalHead* ret;
 
+        PreemptDisable();
+
         if (BufferJournal(buffer))
         {
@@ -64 +66 @@
                 ret->buffer=buffer;
                 INIT_WAITQUEUE_HEAD(&ret->wait);
+                INIT_LIST_HEAD(&ret->next);
                 
                 BufferGet(buffer);
         }
+        
+        ret->refs++;
+        
+        PreemptEnable();
+        
+//      KePrint("JournalAddHeader = %#X, %u\n", ret, ret->refs);
 
         return ret;
+}
+
+void JournalRemoveHeader(struct JournalHead* header)
+{
+        header->refs--;
+        
+        if (!header->refs)
+        {
+                PreemptDisable();
+                
+                BufferRelease(header->buffer);
+                header->buffer->privData=NULL;
+                header->buffer->flags &= ~(1 << BUFFER_JOURNAL);
+                WakeUp(&header->wait);
+                
+                free(header);
+                PreemptEnable();
+        }
 }
 
@@ -97 +124 @@
         /* Set up timer. */
         commitTimer->func=SleepWakeup;
-        commitTimer->expires=journal->commitInterval*100000/HZ;
+        commitTimer->expires=journal->commitInterval*100000;
         commitTimer->data=currThread;
 
@@ -137 +164 @@
                 ThrSuspendThread(currThread);
                 ThrSchedule(); /* Will return here when the thread is scheduled again */
+                TimerRemove(&commitTimer);
+                
                 WaitRemoveFromQueue(&journal->commitWait, &commitWait);
 
@@ -158 +187 @@
 
         oldBuf=JournHeadToBuffer(old);
-        
         newBuf=BlockBufferAlloc(oldBuf->device, blockNo);
 
         /* Buffer is now locked, so copy over the data from old's buffer. */
-        memcpy(newBuf->data, oldBuf->data, oldBuf->device->blockSize);
+        memcpy(newBuf->data, oldBuf->data, oldBuf->device->softBlockSize);
 
         *new=JournalAddHeader(newBuf);
@@ -205 +233 @@
                 return NULL;
 
-        memset(buffer->data, 0, journal->sectorSize);
+        memset(buffer->data, journal->sectorSize, 0);
 
         return JournalAddHeader(buffer);
@@ -212 +240 @@
 int JournalDestroy(struct Journal* journal)
 {
-        /* Shutdown the committer thread. */
+        /* Shut down the committer thread. */
         journal->flags|=JOURN_UNMOUNT;
         WakeUp(&journal->commitWait);
@@ -222 +250 @@
         JournalLock(journal);
         
-        JournalCheckpoint(journal);
+        while (!ListEmpty(&journal->checkpointTrans))
+                JournalCheckpoint(journal);
         
         journal->tail=0;