Changeset 881 for Whitix/trunk/fs/vfs/bcache.c

Timestamp:

09/23/08 14:18:34 (4 months ago)

Author:

mwhitworth

Message:

Add NameToVNode parameter, a dir parameter for relative lookups.

Files:

• Whitix/trunk/fs/vfs/bcache.c (modified) (14 diffs)

Whitix/trunk/fs/vfs/bcache.c

@@ -58 +58 @@
  *
  * DESCRIPTION: Lock a buffer for unique access. Waits for the buffer to
- *              be unlocked, and then locks it again.
+ *                              be unlocked, and then locks it again.
  *
  * PARAMETERS:  buffer - buffer in question.
  *
- * RETURNS:     Nothing.
+ * RETURNS:             Nothing.
  *
  ***********************************************************************/
@@ -72 +72 @@
 }
 
+SYMBOL_EXPORT(BufferLock);
+
 /***********************************************************************
  *
@@ -90 +92 @@
 }
 
+SYMBOL_EXPORT(BufferUnlock);
+
 static void BufferWait(struct Buffer* buffer)
 {
         BufferGet(buffer);
         INIT_WAITQUEUE_ENTRY(bufferWait);
-
+        
         do
         {
@@ -123 +127 @@
 }
 
+SYMBOL_EXPORT(WaitForBuffer);
+
 /***********************************************************************
  *
@@ -144 +150 @@
                 return NULL;
 
+        ZeroMemory(buff, sizeof(struct Buffer));
+
         buff->device=device;
         buff->blockNum=blockNum;
         buff->refs=1;
-        buff->data=(BYTE*)malloc(device->softBlockSize);
+        buff->data=(BYTE*)MemAlloc(device->softBlockSize);
         if (!buff->data)
+        {
+                MemCacheFree(blockCache, buff);
                 return NULL;
+        }
 
         INIT_WAITQUEUE_HEAD(&buff->waitQueue);
-        BufferLock(buff);
+        
+        BufferLock(buff); /* Buffer is unlocked in StorageEndRequest. */
         BlockAddToHashTable(buff);
 
@@ -158 +170 @@
 }
 
+SYMBOL_EXPORT(BlockBufferAlloc);
+
 /***********************************************************************
  *
@@ -173 +187 @@
 {
         WaitForBuffer(buff);
-        free(buff->data);
+        MemFree(buff->data);
         ListRemove(&buff->list);
-        MemCacheFree(blockCache,buff);
+        MemCacheFree(blockCache, buff);
 }
 
@@ -211 +225 @@
  ***********************************************************************/
 
-int BlockSendRequestRaw(struct StorageDevice* device,struct Request* request)
+int BlockSendRequestRaw(struct StorageDevice* device, struct Request* request)
 {
         int err;
@@ -307 +321 @@
 }
 
+/* TODO: device is redundant here. */
+
 int BlockWrite(struct StorageDevice* device,struct Buffer* buffer)
 {
@@ -378 +394 @@
                 /* Write all the blocks belonging to device to disk */
                 ListForEachEntry(buff, head, list)
+                {
                         if (BufferDirty(buff))
                         {
+                                WaitForBuffer(buff);
+                                
                                 /* For each block, call the respective StorageDevice write function */
                                 DoBlockWrite(buff->device,buff);
                                 buff->flags &= ~(1 << BUFFER_DIRTY);
                         }
+                }
         }
 
@@ -431 +451 @@
 static void BufferFlusher()
 {
-        struct StorageDevice* sDevice;
+//      struct StorageDevice* sDevice;
         ThrSetPriority(currThread,1);
 
@@ -439 +459 @@
                 ThrSchedule();
 
-                ListForEachEntry(sDevice,&sDeviceList,list)
-                        BlockSyncDevice(sDevice);
+                /* FIXME: TEMP */
+//              ListForEachEntry(sDevice,&sDeviceList,list)
+//                      BlockSyncDevice(sDevice);
         }
 }
@@ -461 +482 @@
         DWORD i;
 
-        dev->hashLists=(struct ListHead*)malloc(1 << HASH_TABLE_ORDER);
+        dev->hashLists=(struct ListHead*)MemAlloc(1 << HASH_TABLE_ORDER);
 
         for (i=0; i<HASH_NUM_ENTRIES; i++)
@@ -480 +501 @@
                 {
                         BufferGet(curr);
-                        PreemptEnable(); /* As WaitForBuffer may sleep. */
+                        PreemptEnable();
                         WaitForBuffer(curr);
                         return curr;