Changeset 34223 in vbox

Timestamp:

Nov 21, 2010 11:51:36 PM (14 years ago)

Author:

vboxsync

Message:

BlockCache: Bug fixes

File:

• trunk/src/VBox/VMM/PDMBlkCache.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/PDMBlkCache.cpp

@@ -603 +603 @@
         return VERR_NO_MEMORY;
 
+    ASMAtomicIncU32(&pReq->cXfersPending);
     pIoXfer->fIoCache    = false;
     pIoXfer->pReq        = pReq;
@@ -945 +946 @@
     int rc = VINF_SUCCESS;
     PPDMBLKCACHE pBlkCache = NULL;
+    bool fAlreadyExists = false;
     PPDMBLKCACHEGLOBAL pBlkCacheGlobal = pVM->pUVM->pdm.s.pBlkCacheGlobal;
 
@@ -959 +961 @@
     {
         if (!RTStrCmp(pBlkCache->pszId, pcszId))
+        {
+            fAlreadyExists = true;
             break;
-    }
-
-    if (!pBlkCache)
+        }
+    }
+
+    if (!fAlreadyExists)
     {
         pBlkCache = (PPDMBLKCACHE)RTMemAllocZ(sizeof(PDMBLKCACHE));
@@ -1045 +1050 @@
     if (RT_SUCCESS(rc))
     {
+        pBlkCache->enmType = PDMBLKCACHETYPE_DRV;
         pBlkCache->u.Drv.pfnXferComplete = pfnXferComplete;
         pBlkCache->u.Drv.pfnXferEnqueue  = pfnXferEnqueue;
         pBlkCache->u.Drv.pDrvIns         = pDrvIns;
+        *ppBlkCache = pBlkCache;
     }
 
@@ -1065 +1072 @@
     if (RT_SUCCESS(rc))
     {
+        pBlkCache->enmType = PDMBLKCACHETYPE_DEV;
         pBlkCache->u.Dev.pfnXferComplete = pfnXferComplete;
         pBlkCache->u.Dev.pfnXferEnqueue  = pfnXferEnqueue;
         pBlkCache->u.Dev.pDevIns         = pDevIns;
+        *ppBlkCache = pBlkCache;
     }
 
@@ -1086 +1095 @@
     if (RT_SUCCESS(rc))
     {
+        pBlkCache->enmType = PDMBLKCACHETYPE_USB;
         pBlkCache->u.Usb.pfnXferComplete = pfnXferComplete;
         pBlkCache->u.Usb.pfnXferEnqueue  = pfnXferEnqueue;
         pBlkCache->u.Usb.pUsbIns         = pUsbIns;
+        *ppBlkCache = pBlkCache;
     }
 
@@ -1107 +1118 @@
     if (RT_SUCCESS(rc))
     {
+        pBlkCache->enmType = PDMBLKCACHETYPE_INTERNAL;
         pBlkCache->u.Int.pfnXferComplete = pfnXferComplete;
         pBlkCache->u.Int.pfnXferEnqueue  = pfnXferEnqueue;
         pBlkCache->u.Int.pvUser          = pvUser;
+        *ppBlkCache = pBlkCache;
     }
 
@@ -1488 +1501 @@
         return VERR_NO_MEMORY;
 
+    ASMAtomicIncU32(&pReq->cXfersPending);
     pWaiter->pReq          = pReq;
     pWaiter->offCacheEntry = offDiff;
@@ -1733 +1747 @@
     }
 
+    LogFlowFunc(("pReq=%#p cXfersPending=%u cbXfer=%u\n", pReq, cXfersPending, (cbOld - cbComplete)));
     return false;
 }
@@ -1752 +1767 @@
     /* Allocate new request structure. */
     pReq = pdmBlkCacheReqAlloc(cbRead, pvUser);
-    if (RT_UNLIKELY(pReq))
+    if (RT_UNLIKELY(!pReq))
         return VERR_NO_MEMORY;
 
@@ -1818 +1833 @@
                     /* Read as much as we can from the entry. */
                     RTSgBufCopyFromBuf(&SgBuf, pEntry->pbData + offDiff, cbToRead);
+                    ASMAtomicSubU32(&pReq->cbXfer, cbToRead);
                 }
 
@@ -1967 +1983 @@
     /* Allocate new request structure. */
     pReq = pdmBlkCacheReqAlloc(cbWrite, pvUser);
-    if (RT_UNLIKELY(pReq))
+    if (RT_UNLIKELY(!pReq))
         return VERR_NO_MEMORY;