Changeset 97919 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 30, 2022 4:57:42 PM (2 years ago)

Author:

vboxsync

Message:

Add/VBoxGuestR0LibPhysHeap.cpp: Reduced the size of VBGLPHYSHEAPBLOCK: 64-bit: 40 -> 32 bytes; 32-bit: 24 -> 20 bytes.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp (modified) (15 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR0LibPhysHeap.cpp

@@ -105 +105 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
+/**
+ * A heap block (within a chunk).
+ *
+ * This is used to track a part of a heap chunk that's either free or
+ * allocated.  The VBGLPHYSHEAPBLOCK::fAllocated member indicates which it is.
+ */
 struct VBGLPHYSHEAPBLOCK
 {
@@ -111 +117 @@
 
     /** Size of user data in the block. Does not include this block header. */
-    uint32_t cbDataSize;
-
-    uint32_t fu32Flags;
-
+    uint32_t cbDataSize : 31;
+    /** The top bit indicates whether it's allocated or free. */
+    uint32_t fAllocated : 1;
+
+    /** Pointer to the next block on the list. */
     VBGLPHYSHEAPBLOCK  *pNext;
+    /** Pointer to the previous block on the list. */
     VBGLPHYSHEAPBLOCK  *pPrev;
-
+    /** Pointer back to the chunk. */
     VBGLPHYSHEAPCHUNK  *pChunk;
 };
 
+/**
+ * A chunk of memory used by the heap for sub-allocations.
+ *
+ * There is a list of these.
+ */
 struct VBGLPHYSHEAPCHUNK
 {
@@ -135 +148 @@
     int32_t cAllocatedBlocks;
 
+    /** Pointer to the next chunk. */
     VBGLPHYSHEAPCHUNK  *pNext;
+    /** Pointer to the previous chunk. */
     VBGLPHYSHEAPCHUNK  *pPrev;
 };
@@ -165 +180 @@
    while (pBlock)
    {
-       VBGL_PH_dprintf(("%p: pNext = %p, pPrev = %p, sign = %08X, size = %8d, flags = %08X, pChunk = %p\n",
-                        pBlock, pBlock->pNext, pBlock->pPrev, pBlock->u32Signature, pBlock->cbDataSize, pBlock->fu32Flags, pBlock->pChunk));
+       VBGL_PH_dprintf(("%p: pNext = %p, pPrev = %p, sign = %08X, size = %8d, %s, pChunk = %p\n",
+                        pBlock, pBlock->pNext, pBlock->pPrev, pBlock->u32Signature, pBlock->cbDataSize,
+                        pBlock->fAllocated ? "allocated" : "free", pBlock->pChunk));
 
        pBlock = pBlock->pNext;
@@ -177 +193 @@
    while (pBlock)
    {
-       VBGL_PH_dprintf(("%p: pNext = %p, pPrev = %p, sign = %08X, size = %8d, flags = %08X, pChunk = %p\n",
-                        pBlock, pBlock->pNext, pBlock->pPrev, pBlock->u32Signature, pBlock->cbDataSize, pBlock->fu32Flags, pBlock->pChunk));
+       VBGL_PH_dprintf(("%p: pNext = %p, pPrev = %p, sign = %08X, size = %8d, %s, pChunk = %p\n",
+                        pBlock, pBlock->pNext, pBlock->pPrev, pBlock->u32Signature, pBlock->cbDataSize,
+                        pBlock->fAllocated ? "allocated" : "free", pBlock->pChunk));
 
        pBlock = pBlock->pNext;
@@ -233 +250 @@
     pBlock->u32Signature = VBGL_PH_BLOCKSIGNATURE;
     pBlock->cbDataSize   = cbDataSize;
-    pBlock->fu32Flags    = 0;
+    pBlock->fAllocated   = false;
     pBlock->pNext        = NULL;
     pBlock->pPrev        = NULL;
@@ -260 +277 @@
         pBlock->pPrev = NULL;
 
-        if (pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED)
+        if (pBlock->fAllocated)
         {
             pBlock->pNext = g_vbgldata.pAllocBlocksHead;
@@ -293 +310 @@
     if (pBlock->pPrev)
         pBlock->pPrev->pNext = pBlock->pNext;
-    else if (pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED)
+    else if (pBlock->fAllocated)
     {
         Assert(g_vbgldata.pAllocBlocksHead == pBlock);
@@ -487 +504 @@
         VBGL_PH_ASSERT_MSG(pBlock->u32Signature == VBGL_PH_BLOCKSIGNATURE,
                            ("pBlock = %p, pBlock->u32Signature = %08X\n", pBlock, pBlock->u32Signature));
-        VBGL_PH_ASSERT_MSG((pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED) == 0,
-                           ("pBlock = %p, pBlock->fu32Flags = %08X\n", pBlock, pBlock->fu32Flags));
+        VBGL_PH_ASSERT_MSG(!pBlock->fAllocated, ("pBlock = %p\n", pBlock));
 
         /* We have a free block, either found or allocated. */
@@ -512 +528 @@
 
         /* Mark as allocated */
-        pBlock->fu32Flags |= VBGL_PH_BF_ALLOCATED;
+        pBlock->fAllocated = true;
 
         /* Insert to allocated list */
@@ -536 +552 @@
     if (pBlock)
     {
-        VBGL_PH_ASSERT_MSG((pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED) != 0,
-                           ("pBlock = %p, pBlock->fu32Flags = %08X\n", pBlock, pBlock->fu32Flags));
-
-        if (pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED)
+        VBGL_PH_ASSERT_MSG(pBlock->fAllocated, ("pBlock = %p\n", pBlock));
+
+        if (pBlock->fAllocated)
             physAddr = pBlock->pChunk->physAddr + (uint32_t)((uintptr_t)pv - (uintptr_t)pBlock->pChunk);
     }
@@ -566 +581 @@
     }
 
-    VBGL_PH_ASSERT_MSG((pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED) != 0,
-                       ("pBlock = %p, pBlock->fu32Flags = %08X\n", pBlock, pBlock->fu32Flags));
+    VBGL_PH_ASSERT_MSG(pBlock->fAllocated, ("pBlock = %p\n", pBlock));
 
     /* Exclude from allocated list */
@@ -577 +591 @@
 
     /* Mark as free */
-    pBlock->fu32Flags &= ~VBGL_PH_BF_ALLOCATED;
+    pBlock->fAllocated = false;
 
     /* Insert to free list */
@@ -603 +617 @@
 
     if (   (uintptr_t)pNeighbour < (uintptr_t)pChunk + pChunk->cbSize
-        && (pNeighbour->fu32Flags & VBGL_PH_BF_ALLOCATED) == 0)
+        && !pNeighbour->fAllocated)
     {
         /* The next block is free as well. */
@@ -701 +715 @@
                          RTErrInfoSetF(pErrInfo, VERR_INTERNAL_ERROR_3,
                                        "pCurBlock=%p: cbDataSize=%#x\n", pCurBlock, pCurBlock->cbDataSize));
-            AssertReturn(   pCurBlock->fu32Flags <= VBGL_PH_BF_ALLOCATED,
-                         RTErrInfoSetF(pErrInfo, VERR_INTERNAL_ERROR_3,
-                                       "pCurBlock=%p: fu32Flags=%#x\n", pCurBlock, pCurBlock->fu32Flags));
-            if (pCurBlock->fu32Flags & VBGL_PH_BF_ALLOCATED)
+            if (pCurBlock->fAllocated)
                 cUsedBlocks += 1;
             else