Changeset 39054 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 20, 2011 1:47:45 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74476

Message:

PDMBlkCache: Remove dead code

File:

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

trunk/src/VBox/VMM/VMMR3/PDMBlkCache.cpp

@@ -1745 +1745 @@
  *
  * @returns The number of bytes the entry can hold of the requested amount
- *          of byte.
+ *          of bytes.
  * @param   pEndpoint       The endpoint.
  * @param   pBlkCache       The endpoint cache.
@@ -1751 +1751 @@
  * @param   cb              The number of bytes the entry needs to hold at
  *                          least.
- * @param   uAlignment      Alignment of the boundary sizes.
- * @param   poffAligned     Where to store the aligned offset.
- * @param   pcbAligned      Where to store the aligned size of the entry.
+ * @param   pcbEntry        Where to store the number of bytes the entry can hold.
+ *                          Can be less than given because of other entries.
  */
 static uint32_t pdmBlkCacheEntryBoundariesCalc(PPDMBLKCACHE pBlkCache,
                                                uint64_t off, uint32_t cb,
-                                               unsigned uAlignment,
-                                               uint64_t *poffAligned, uint32_t *pcbAligned)
+                                               uint32_t *pcbEntry)
 {
     /* Get the best fit entries around the offset */
@@ -1772 +1770 @@
              pEntryAbove ? pEntryAbove->cbData : 0));
 
-    /** @todo r=bird: Why is uAlignment disregarded here? */
-    uint64_t offAligned = off;
-
-    uint32_t cbAligned;
+    uint32_t cbNext;
     uint32_t cbInEntry;
     if (    pEntryAbove
@@ -1781 +1776 @@
     {
         cbInEntry = (uint32_t)(pEntryAbove->Core.Key - off);
-        cbAligned = (uint32_t)(pEntryAbove->Core.Key - offAligned);
+        cbNext = (uint32_t)(pEntryAbove->Core.Key - off);
     }
     else
     {
         cbInEntry = cb;
-        cbAligned = cb;
+        cbNext    = cb;
     }
 
     /* A few sanity checks */
-    AssertMsg(!pEntryAbove || offAligned + cbAligned <= pEntryAbove->Core.Key,
+    AssertMsg(!pEntryAbove || off + cbNext <= pEntryAbove->Core.Key,
               ("Aligned size intersects with another cache entry\n"));
-    Assert(cbInEntry <= cbAligned);
+    Assert(cbInEntry <= cbNext);
 
     if (pEntryAbove)
         pdmBlkCacheEntryRelease(pEntryAbove);
 
-    LogFlow(("offAligned=%llu cbAligned=%u\n", offAligned, cbAligned));
-
-    *poffAligned = offAligned;
-    *pcbAligned  = cbAligned;
+    LogFlow(("off=%llu cbNext=%u\n", off, cbNext));
+
+    *pcbEntry  = cbNext;
 
     return cbInEntry;
@@ -1814 +1808 @@
  * @param   off               The offset.
  * @param   cb                Number of bytes the cache entry should have.
- * @param   uAlignment        Alignment the size of the entry should have.
  * @param   pcbData           Where to store the number of bytes the new
  *                            entry can hold. May be lower than actually requested
@@ -1821 +1814 @@
 static PPDMBLKCACHEENTRY pdmBlkCacheEntryCreate(PPDMBLKCACHE pBlkCache,
                                                 uint64_t off, size_t cb,
-                                                unsigned uAlignment,
                                                 size_t *pcbData)
 {
-    uint64_t offStart = 0;
     uint32_t cbEntry  = 0;
-    *pcbData = pdmBlkCacheEntryBoundariesCalc(pBlkCache, off, (uint32_t)cb, uAlignment,
-                                              &offStart, &cbEntry);
+
+    *pcbData = pdmBlkCacheEntryBoundariesCalc(pBlkCache, off, (uint32_t)cb, &cbEntry);
     AssertReturn(cb <= UINT32_MAX, NULL);
 
@@ -1840 +1831 @@
         LogFlow(("Evicted enough bytes (%u requested). Creating new cache entry\n", cbEntry));
 
-        pEntryNew = pdmBlkCacheEntryAlloc(pBlkCache, offStart, cbEntry, pbBuffer);
+        pEntryNew = pdmBlkCacheEntryAlloc(pBlkCache, off, cbEntry, pbBuffer);
         if (RT_LIKELY(pEntryNew))
         {
@@ -1851 +1842 @@
             AssertMsg(   (off >= pEntryNew->Core.Key)
                       && (off + *pcbData <= pEntryNew->Core.KeyLast + 1),
-                      ("Overflow in calculation off=%llu OffsetAligned=%llu\n",
-                       off, pEntryNew->Core.Key));
+                      ("Overflow in calculation off=%llu\n", off));
         }
         else
@@ -2085 +2075 @@
             PPDMBLKCACHEENTRY pEntryNew = pdmBlkCacheEntryCreate(pBlkCache,
                                                                  off, cbRead,
-                                                                 PAGE_SIZE,
                                                                  &cbToRead);
 
@@ -2317 +2306 @@
             PPDMBLKCACHEENTRY pEntryNew = pdmBlkCacheEntryCreate(pBlkCache,
                                                                  off, cbWrite,
-                                                                 512, &cbToWrite);
+                                                                 &cbToWrite);
 
             cbWrite -= cbToWrite;