Changeset 93689 in vbox for trunk/include/iprt/cpp

Timestamp:

Feb 11, 2022 2:00:56 AM (3 years ago)

Author:

vboxsync

Message:

IPRT/hardavl: Fixed the removal bug. Extended testcase and sanity checks. [doxygen fix] bugref:10093

File:

• trunk/include/iprt/cpp/hardavlrange.h (modified) (8 diffs)

trunk/include/iprt/cpp/hardavlrange.h

@@ -731 +731 @@
      * @param     a_pAllocator  Pointer to the allocator.
      * @param     a_pStack      Pointer to stack to rewind.
+     * @param     a_fLog        Log is done (DEBUG builds only).
      *
      * @code
@@ -781 +782 @@
      * @internal
      */
-    int i_rebalance(RTCHardAvlTreeSlabAllocator<NodeType> *a_pAllocator, HardAvlStack *a_pStack, bool fLog = false)
-    {
-        RT_NOREF(fLog);
+    int i_rebalance(RTCHardAvlTreeSlabAllocator<NodeType> *a_pAllocator, HardAvlStack *a_pStack, bool a_fLog = false)
+    {
+        RT_NOREF(a_fLog);
 
         while (a_pStack->cEntries > 0)
@@ -842 +843 @@
                     *pidxNode = idxLeftNode;
 #ifdef DEBUG
-                    if (fLog) RTAssertMsg2("rebalance: %#2u: op #1\n", a_pStack->cEntries);
+                    if (a_fLog) RTAssertMsg2("rebalance: %#2u: op #1\n", a_pStack->cEntries);
 #endif
                 }
@@ -864 +865 @@
                     *pidxNode = idxLeftRightNode;
 #ifdef DEBUG
-                    if (fLog) RTAssertMsg2("rebalance: %#2u: op #2\n", a_pStack->cEntries);
+                    if (a_fLog) RTAssertMsg2("rebalance: %#2u: op #2\n", a_pStack->cEntries);
 #endif
                 }
@@ -896 +897 @@
                     *pidxNode = idxRightNode;
 #ifdef DEBUG
-                    if (fLog) RTAssertMsg2("rebalance: %#2u: op #3 h=%d, *pidxNode=%#x\n", a_pStack->cEntries, pRightNode->cHeight, *pidxNode);
+                    if (a_fLog) RTAssertMsg2("rebalance: %#2u: op #3 h=%d, *pidxNode=%#x\n", a_pStack->cEntries, pRightNode->cHeight, *pidxNode);
 #endif
                     RTHARDAVL_STRICT_CHECK_HEIGHTS(pRightNode, NULL, 0);
@@ -920 +921 @@
                     *pidxNode = idxRightLeftNode;
 #ifdef DEBUG
-                    if (fLog) RTAssertMsg2("rebalance: %#2u: op #4 h=%d, *pidxNode=%#x\n", a_pStack->cEntries, pRightLeftNode->cHeight, *pidxNode);
+                    if (a_fLog) RTAssertMsg2("rebalance: %#2u: op #4 h=%d, *pidxNode=%#x\n", a_pStack->cEntries, pRightLeftNode->cHeight, *pidxNode);
 #endif
                 }
@@ -931 +932 @@
                 {
 #ifdef DEBUG
-                    if (fLog) RTAssertMsg2("rebalance: %#2u: op #5, h=%d - done\n", a_pStack->cEntries, cHeight);
+                    if (a_fLog) RTAssertMsg2("rebalance: %#2u: op #5, h=%d - done\n", a_pStack->cEntries, cHeight);
 #endif
                     RTHARDAVL_STRICT_CHECK_HEIGHTS(pNode, NULL, 0);
@@ -941 +942 @@
                 }
 #ifdef DEBUG
-                if (fLog) RTAssertMsg2("rebalance: %#2u: op #5, h=%d - \n", a_pStack->cEntries, cHeight);
+                if (a_fLog) RTAssertMsg2("rebalance: %#2u: op #5, h=%d - \n", a_pStack->cEntries, cHeight);
 #endif
                 pNode->cHeight = cHeight;