Changeset 93715 in vbox

Timestamp:

Feb 14, 2022 10:34:27 AM (3 years ago)

Author:

vboxsync

Message:

IPRT/hardavl: Renamed lookupMatchingOrSmaller to lookupMatchingOrBelow and lookupMatchingOrLarger to lookupMatchingOrAbove. bugref:10093

Location:

trunk

Files:

• include/iprt/cpp/hardavlrange.h (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTAvl.cpp (modified) (6 diffs)

trunk/include/iprt/cpp/hardavlrange.h

@@ -478 +478 @@
      * @param     a_ppFound     Where to return the pointer to the node.
      */
-    int lookupMatchingOrSmaller(RTCHardAvlTreeSlabAllocator<NodeType> *a_pAllocator, KeyType a_Key,
-                                NodeType **a_ppFound) RT_NOEXCEPT
+    int lookupMatchingOrBelow(RTCHardAvlTreeSlabAllocator<NodeType> *a_pAllocator, KeyType a_Key,
+                              NodeType **a_ppFound) RT_NOEXCEPT
     {
         *a_ppFound = NULL;
@@ -558 +558 @@
      * @param     a_ppFound     Where to return the pointer to the node.
      */
-    int lookupMatchingOrLarger(RTCHardAvlTreeSlabAllocator<NodeType> *a_pAllocator, KeyType a_Key,
-                               NodeType **a_ppFound) RT_NOEXCEPT
+    int lookupMatchingOrAbove(RTCHardAvlTreeSlabAllocator<NodeType> *a_pAllocator, KeyType a_Key,
+                              NodeType **a_ppFound) RT_NOEXCEPT
     {
         *a_ppFound = NULL;

trunk/src/VBox/Runtime/testcase/tstRTAvl.cpp

@@ -1419 +1419 @@
         /* pre-removal lookup tests */
         MYTESTNODE *pNode = (MYTESTNODE *)(intptr_t)i;
-        int rc = Tree.lookupMatchingOrSmaller(&Allocator, Key, &pNode);
+        int rc = Tree.lookupMatchingOrBelow(&Allocator, Key, &pNode);
         if (rc != VINF_SUCCESS)
-            RTTestIFailed("pre-remove lookupMatchingOrSmaller failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp)",
+            RTTestIFailed("pre-remove lookupMatchingOrBelow failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp)",
                           rc, i, idx, Key, Key + cbStep - 1);
         else if (pNode->Key != Key)
-            RTTestIFailed("pre-remove lookupMatchingOrSmaller returned the wrong node: Key=%RGp, expected %RGp", pNode->Key, Key);
+            RTTestIFailed("pre-remove lookupMatchingOrBelow returned the wrong node: Key=%RGp, expected %RGp", pNode->Key, Key);
 
         pNode = (MYTESTNODE *)(intptr_t)i;
-        rc = Tree.lookupMatchingOrLarger(&Allocator, Key, &pNode);
+        rc = Tree.lookupMatchingOrAbove(&Allocator, Key, &pNode);
         if (rc != VINF_SUCCESS)
-            RTTestIFailed("pre-remove lookupMatchingOrLarger failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp)",
+            RTTestIFailed("pre-remove lookupMatchingOrAbove failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp)",
                           rc, i, idx, Key, Key + cbStep - 1);
         else if (pNode->Key != Key)
-            RTTestIFailed("pre-remove lookupMatchingOrLarger returned the wrong node: Key=%RGp, expected %RGp", pNode->Key, Key);
+            RTTestIFailed("pre-remove lookupMatchingOrAbove returned the wrong node: Key=%RGp, expected %RGp", pNode->Key, Key);
 
         /* remove */
@@ -1468 +1468 @@
             /* post-removal lookup tests */
             pNode = (MYTESTNODE *)(intptr_t)i;
-            rc = Tree.lookupMatchingOrSmaller(&Allocator, Key, &pNode);
+            rc = Tree.lookupMatchingOrBelow(&Allocator, Key, &pNode);
             uint32_t idxAbove;
             if (rc == VINF_SUCCESS)
@@ -1476 +1476 @@
                 idxAbove = (uint32_t)ASMBitNextSet(pbmPresent, cItems, idxRet);
                 if (idxAbove <= idx)
-                    RTTestIFailed("post-remove lookupMatchingOrSmaller wrong: idxRet=%#x idx=%#x idxAbove=%#x",
+                    RTTestIFailed("post-remove lookupMatchingOrBelow wrong: idxRet=%#x idx=%#x idxAbove=%#x",
                                   idxRet, idx, idxAbove);
             }
@@ -1483 +1483 @@
                 idxAbove = (uint32_t)ASMBitFirstSet(pbmPresent, cItems);
                 if (idxAbove <= idx)
-                    RTTestIFailed("post-remove lookupMatchingOrSmaller wrong: VERR_NOT_FOUND idx=%#x idxAbove=%#x", idx, idxAbove);
+                    RTTestIFailed("post-remove lookupMatchingOrBelow wrong: VERR_NOT_FOUND idx=%#x idxAbove=%#x", idx, idxAbove);
             }
             else
             {
-                RTTestIFailed("post-remove lookupMatchingOrSmaller failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp)",
+                RTTestIFailed("post-remove lookupMatchingOrBelow failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp)",
                               rc, i, idx, Key, Key + cbStep - 1);
                 idxAbove = (uint32_t)ASMBitNextSet(pbmPresent, cItems, idx);
@@ -1493 +1493 @@
 
             pNode = (MYTESTNODE *)(intptr_t)i;
-            rc = Tree.lookupMatchingOrLarger(&Allocator, Key, &pNode);
+            rc = Tree.lookupMatchingOrAbove(&Allocator, Key, &pNode);
             if (rc == VINF_SUCCESS)
             {
                 uint32_t idxRet = pNode->Key / cbStep;
                 if (idxRet != idxAbove)
-                    RTTestIFailed("post-remove lookupMatchingOrLarger wrong: idxRet=%#x idxAbove=%#x idx=%#x",
+                    RTTestIFailed("post-remove lookupMatchingOrAbove wrong: idxRet=%#x idxAbove=%#x idx=%#x",
                                   idxRet, idxAbove, idx);
             }
@@ -1504 +1504 @@
             {
                 if (idxAbove != UINT32_MAX)
-                    RTTestIFailed("post-remove lookupMatchingOrLarger wrong: VERR_NOT_FOUND idxAbove=%#x idx=%#x", idxAbove, idx);
+                    RTTestIFailed("post-remove lookupMatchingOrAbove wrong: VERR_NOT_FOUND idxAbove=%#x idx=%#x", idxAbove, idx);
             }
             else
             {
-                RTTestIFailed("post-remove lookupMatchingOrLarger failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp) idxAbove=%#x",
+                RTTestIFailed("post-remove lookupMatchingOrAbove failed: %Rrc, i=%#x, idx=%#x (%RGp ... %RGp) idxAbove=%#x",
                               rc, i, idx, Key, Key + cbStep - 1, idxAbove);
             }