Changeset 34219 in vbox

Timestamp:

Nov 21, 2010 6:10:39 PM (14 years ago)

Author:

vboxsync

Message:

PDM/BlockCache: First part for #5295, move the writeback cache into a separate component

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• include/VBox/pdmblkcache.h (added)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/PDM.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMBlkCache.cpp (added)
• src/VBox/VMM/PDMBlkCacheInternal.h (added)
• src/VBox/VMM/PDMDriver.cpp (modified) (1 diff)
• src/VBox/VMM/PDMInternal.h (modified) (4 diffs)

trunk/include/VBox/log.h

@@ -252 +252 @@
     /** PDM Async completion group. */
     LOG_GROUP_PDM_ASYNC_COMPLETION,
+    /** PDM Block cache group. */
+    LOG_GROUP_PDM_BLK_CACHE,
     /** PDM Device group. */
     LOG_GROUP_PDM_DEVICE,
@@ -459 +461 @@
     "PDM",          \
     "PDM_ASYNC_COMPLETION", \
+    "PDM_BLK_CACHE", \
     "PDM_DEVICE",   \
     "PDM_DRIVER",   \

trunk/src/VBox/VMM/Makefile.kmk

@@ -167 +167 @@
         PATM/PATMA.asm \
         PATM/PATMSSM.cpp \
-        PATM/VMMAll/PATMAll.cpp
+        PATM/VMMAll/PATMAll.cpp \
+        PDMBlkCache.cpp
 ifdef VBOX_WITH_VUSB
  VMMR3_SOURCES += PDMUsb.cpp

trunk/src/VBox/VMM/PDM.cpp

@@ -344 +344 @@
 #endif
     if (RT_SUCCESS(rc))
+        rc = pdmR3BlkCacheInit(pVM);
+    if (RT_SUCCESS(rc))
         rc = pdmR3DrvInit(pVM);
     if (RT_SUCCESS(rc))
@@ -606 +608 @@
     pdmR3ThreadDestroyAll(pVM);
 
+    /*
+     * Destroy the block cache.
+     */
+    pdmR3BlkCacheTerm(pVM);
+
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     /*

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -660 +660 @@
         AssertRC(rc);
 
+        /* Block caches. */
+        PDMR3BlkCacheReleaseDriver(pVM, pCur);
+
         /* Finally, the driver it self. */
         bool fHyperHeap = pCur->Internal.s.fHyperHeap;

trunk/src/VBox/VMM/PDMInternal.h

@@ -25 +25 @@
 #include <VBox/vusb.h>
 #include <VBox/pdmasynccompletion.h>
+#include <VBox/pdmblkcache.h>
 #include <VBox/pdmcommon.h>
 #include <iprt/assert.h>
@@ -914 +915 @@
 typedef struct PDMASYNCCOMPLETIONEPCLASS *PPDMASYNCCOMPLETIONEPCLASS;
 
+/** Pointer to the global block cache structure. */
+typedef struct PDMBLKCACHEGLOBAL *PPDMBLKCACHEGLOBAL;
 
 /**
@@ -1052 +1055 @@
     /** @} */
 
+    R3PTRTYPE(PPDMBLKCACHEGLOBAL)   pBlkCacheGlobal;
+
 } PDMUSERPERVM;
 /** Pointer to the PDM data kept in the UVM. */
@@ -1163 +1168 @@
 #endif
 
+int         pdmR3BlkCacheInit(PVM pVM);
+void        pdmR3BlkCacheTerm(PVM pVM);
+
 #endif /* IN_RING3 */