Changeset 86619 in vbox for trunk

Timestamp:

Oct 16, 2020 11:16:42 PM (4 years ago)

Author:

vboxsync

Message:

tstIprtList.cpp: Ditto insert(). Created common index generator function with improved range. bugref:9841

File:

• trunk/src/VBox/Runtime/testcase/tstIprtList.cpp (modified) (4 diffs)

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

@@ -526 +526 @@
 }
 
+/** Returns an index that is safe from the removal thread. */
+static uint32_t MtTestSafeRandomIndex(MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList)
+{
+    uint32_t cItems = (uint32_t)pTestList->size();
+    if (cItems > MTTEST_ITEMS)
+        cItems -= MTTEST_ITEMS;
+    if (cItems < MTTEST_ITEMS_NOT_REMOVED)
+        cItems = MTTEST_ITEMS_NOT_REMOVED;
+    return RTRandU32Ex(0, cItems - 1);
+}
+
 /**
  * Thread for inserting items to a shared list.
@@ -539 +550 @@
     /* Insert new items in the middle of the list. */
     for (size_t i = 0; i < MTTEST_ITEMS; ++i)
-        pTestList->insert(pTestList->size() / 2, 0xF0F0F0F0);
+        pTestList->insert(MtTestSafeRandomIndex(pTestList), 0xF0F0F0F0);
 
     return VINF_SUCCESS;
@@ -562 +573 @@
         while (pTestList->isEmpty())
             RTThreadYield();
-        uint32_t const idx = RTRandU32Ex(0, RT_MIN((uint32_t)pTestList->size() / 2, MTTEST_ITEMS_NOT_REMOVED));
-        a = pTestList->at(idx);
+        a = pTestList->at(MtTestSafeRandomIndex(pTestList));
     }
 
@@ -586 +596 @@
         while (pTestList->isEmpty())
             RTThreadYield();
-        uint32_t const idx = RTRandU32Ex(0, RT_MIN((uint32_t)pTestList->size() / 2, MTTEST_ITEMS_NOT_REMOVED));
-        pTestList->replace(idx, 0xFF00FF00);
+        pTestList->replace(MtTestSafeRandomIndex(pTestList), 0xFF00FF00);
     }