Changeset 1132 for Whitix

Timestamp:

10/14/08 19:37:00 (1 month ago)

Author:

mwhitworth

Message:

Add a global numDirty integer to help with flushing blocks to disk.

Files:

• Whitix/branches/keobject/fs/vfs/bcache.c (modified) (9 diffs)

Whitix/branches/keobject/fs/vfs/bcache.c

@@ -18 +18 @@
 
 #include <typedefs.h>
+#include <malloc.h>
 #include <fs/vfs.h>
 #include <error.h>
@@ -40 +41 @@
 DWORD cacheSize=0;
 extern struct DevClass storageClass;
+int numDirty=0;
 
 static void BufferWait(struct Buffer* buffer);
@@ -238 +240 @@
                 KePrint("BlockSendRequest: error (%d) reading %u\n",err,request->sector);
                 err=-EIO;
-        }       
+        }
+        
+//      if (request->type == REQUEST_WRITE && request->sector < 10)
+//              KePrint("(%u) ", request->sector);
 
         return err;
@@ -325 +330 @@
 int BlockWrite(struct StorageDevice* device,struct Buffer* buffer)
 {
+        if (!(buffer->flags & (1 << BUFFER_DIRTY)))
+                numDirty++;
+
         /* Just signal that the buffer is dirty, and let BufferFlusher write it to disk in the near future as an update */
         buffer->flags |= (1 << BUFFER_DIRTY);
 
-        if (bufferFlusher)
-                ThrResumeThread(bufferFlusher);
-
+        if (numDirty == 1)
+        {
+                if (bufferFlusher)
+                        ThrResumeThread(bufferFlusher);
+        }
+        
         return 0;
 }
@@ -384 +395 @@
 {
         DWORD flags, i;
-        struct Buffer* buff;
+        struct Buffer* buff, *buff2;
+
+//      KePrint("BlockSyncDevice(%s), numDirty = %d\n", KeObjGetName(&device->device.object), numDirty);
 
         IrqSaveFlags(flags);
@@ -393 +406 @@
 
                 /* Write all the blocks belonging to device to disk */
-                ListForEachEntry(buff, head, list)
+                ListForEachEntrySafe(buff, buff2, head, list)
                 {
                         if (BufferDirty(buff))
                         {
+                                --numDirty;
                                 /* For each block, call the respective StorageDevice write function */
                                 DoBlockWrite(buff->device,buff);
@@ -411 +425 @@
 int BlockSyncAll()
 {
-//      struct StorageDevice* sDevice;
-
-        /* Sync all vnodes */
-//      extern void VNodeSyncAll();
-//      VNodeSyncAll();
-
         struct StorageDevice* sDevice;
         struct KeObject* object, *object2;
@@ -460 +468 @@
         while (1)
         {
-                ThrSuspendThread(currThread);
-                ThrSchedule();
+                if (!numDirty)
+                {
+                        ThrSuspendThread(currThread);
+                        ThrSchedule();
+                }
                 
                 BlockSyncAll();
@@ -477 +488 @@
         struct ListHead* head=BUFFER_HASH(buffer->device, buffer->blockNum);
 
-        ListAdd(&buffer->list, head);
+        ListAddTail(&buffer->list, head);
 }