Changeset 24359 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2009 10:28:48 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: CFGM key to disable the cache globally

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFile.cpp (modified) (3 diffs)
• PDMAsyncCompletionFileCache.cpp (modified) (1 diff)
• PDMAsyncCompletionFileInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -527 +527 @@
     if (RT_SUCCESS(rc))
     {
-        /* Init cache structure */
-        rc = pdmacFileCacheInit(pEpClassFile, pCfgNode);
-        if (RT_FAILURE(rc))
-            RTCritSectDelete(&pEpClassFile->CritSect);
+        /* Check if the cache was disabled by the user. */
+        rc = CFGMR3QueryBoolDef(pCfgNode, "CacheEnabled", &pEpClassFile->fCacheEnabled, true);
+        AssertLogRelRCReturn(rc, rc);
+
+        if (pEpClassFile->fCacheEnabled)
+        {
+            /* Init cache structure */
+            rc = pdmacFileCacheInit(pEpClassFile, pCfgNode);
+            if (RT_FAILURE(rc))
+            {
+                RTCritSectDelete(&pEpClassFile->CritSect);
+                pEpClassFile->fCacheEnabled = false;
+                LogRel(("AIOMgr: Failed to initialise the cache (rc=%Rrc), disabled caching\n"));
+            }
+        }
+        else
+            LogRel(("AIOMgr: Cache was globally disabled\n"));
     }
 
@@ -546 +559 @@
     while (pEpClassFile->pAioMgrHead)
         pdmacFileAioMgrDestroy(pEpClassFile, pEpClassFile->pAioMgrHead);
+
+    /* Destroy the cache. */
+    if (pEpClassFile->fCacheEnabled)
+        pdmacFileCacheDestroy(pEpClassFile);
 
     RTCritSectDelete(&pEpClassFile->CritSect);
@@ -657 +674 @@
                 else
                 {
-                    if (fFlags & PDMACEP_FILE_FLAGS_CACHING)
+                    if (   (fFlags & PDMACEP_FILE_FLAGS_CACHING)
+                        && (pEpClassFile->fCacheEnabled))
                     {
                         pEpFile->fCaching = true;

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp

@@ -681 +681 @@
     /* Initialize the critical section */
     rc = RTCritSectInit(&pCache->CritSect);
+
+    if (RT_SUCCESS(rc))
+        LogRel(("AIOMgr: Cache successfully initialised. Cache size is %u bytes\n", pCache->cbMax));
+
     return rc;
 }

trunk/src/VBox/VMM/PDMAsyncCompletionFileInternal.h

@@ -332 +332 @@
     /** Flag whether we use the failsafe method. */
     bool                                fFailsafe;
+    /** Flag whether the file data cache is enabled. */
+    bool                                fCacheEnabled;
     /** Critical section protecting the list of async I/O managers. */
     RTCRITSECT                          CritSect;