Changeset 64682 in vbox for trunk

Timestamp:

Nov 16, 2016 2:00:45 PM (8 years ago)

Author:

vboxsync

Message:

Storage/IOBufMgmt: Fixes

File:

• trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp

@@ -189 +189 @@
     /* Round to the next power of two and get the bin to try first. */
     uint32_t u32Order = ASMBitLastSetU32((uint32_t)cb) - 1;
-    if (cbAlloc & ~RT_BIT_32(u32Order))
-        u32Order <<= 1;
+    if (cb & (RT_BIT_32(u32Order) - 1))
+        u32Order++;
 
     u32Order = RT_CLAMP(u32Order, pThis->u32OrderMin, pThis->u32OrderMax);
@@ -374 +374 @@
         unsigned iSeg = 0;
         size_t   cbLeft = cbIoBuf;
+        size_t   cbIoBufAlloc = 0;
         PRTSGSEG pSeg = &pIoBufDesc->Int.aSegs[0];
 
@@ -386 +387 @@
             pSeg++;
             cbLeft -= RT_MIN(cbAlloc, cbLeft);
+            cbIoBufAlloc += cbAlloc;
         }
 
@@ -395 +397 @@
         pIoBufDesc->Int.cSegsUsed = iSeg;
         pIoBufDesc->Int.pIoBufMgr = pThis;
-        *pcbIoBufAllocated = cbIoBuf - cbLeft;
+        *pcbIoBufAllocated = cbIoBufAlloc;
         Assert(   (RT_SUCCESS(rc) && *pcbIoBufAllocated > 0)
                || RT_FAILURE(rc));
 
-        pThis->cbFree -= cbIoBuf - cbLeft;
+        pThis->cbFree -= cbIoBufAlloc;
 
         RTCritSectLeave(&pThis->CritSectAlloc);
@@ -429 +431 @@
             pBin->papvFree[pBin->iFree] = pSeg->pvSeg;
             pBin->iFree++;
-            pThis->cbFree += (size_t)RT_BIT_32(u32Order);
+            pThis->cbFree += pSeg->cbSeg;
         }