Changeset 86626 in vbox for trunk/src/VBox

Timestamp:

Oct 19, 2020 10:42:10 AM (4 years ago)

Author:

vboxsync

Message:

tstIprtList.cpp: Fixes to MtTestSafeRandomIndex. Use event semaphore to kick off all threads at once to increase contention. bugref:9841

File:

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

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

@@ -490 +490 @@
 #define MTTEST_ITEMS_NOT_REMOVED    100
 
+static RTSEMEVENTMULTI g_hEvtMtTest = NIL_RTSEMEVENTMULTI;
+
 /**
  * Thread for prepending items to a shared list.
@@ -500 +502 @@
     MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList = (MTTEST_LIST_TYPE<MTTEST_TYPE> *)pvUser;
     RT_NOREF_PV(hSelf);
+    RTSemEventMultiWait(g_hEvtMtTest, RT_MS_1MIN);
 
     /* Prepend new items at the start of the list. */
@@ -518 +521 @@
     MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList = (MTTEST_LIST_TYPE<MTTEST_TYPE> *)pvUser;
     RT_NOREF_PV(hSelf);
+    RTSemEventMultiWait(g_hEvtMtTest, RT_MS_1MIN);
 
     /* Append new items at the end of the list. */
@@ -531 +535 @@
     uint32_t cItems = (uint32_t)pTestList->size();
     if (cItems > MTTEST_ITEMS)
+    {
         cItems -= MTTEST_ITEMS;
-    if (cItems < MTTEST_ITEMS_NOT_REMOVED)
+        if (cItems < MTTEST_ITEMS_NOT_REMOVED)
+            cItems = MTTEST_ITEMS_NOT_REMOVED;
+    }
+    else if (cItems > MTTEST_ITEMS_NOT_REMOVED)
         cItems = MTTEST_ITEMS_NOT_REMOVED;
+    else if (cItems <= 1)
+        return 0;
     return RTRandU32Ex(0, cItems - 1);
 }
@@ -547 +557 @@
     MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList = (MTTEST_LIST_TYPE<MTTEST_TYPE> *)pvUser;
     RT_NOREF_PV(hSelf);
+    RTSemEventMultiWait(g_hEvtMtTest, RT_MS_1MIN);
 
     /* Insert new items in the middle of the list. */
@@ -565 +576 @@
     MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList = (MTTEST_LIST_TYPE<MTTEST_TYPE> *)pvUser;
     RT_NOREF_PV(hSelf);
+    RTSemEventMultiWait(g_hEvtMtTest, RT_MS_1MIN);
 
     MTTEST_TYPE a;
@@ -589 +601 @@
     MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList = (MTTEST_LIST_TYPE<MTTEST_TYPE> *)pvUser;
     RT_NOREF_PV(hSelf);
+    RTSemEventMultiWait(g_hEvtMtTest, RT_MS_1MIN);
 
     /* Try to replace C items from random places. */
@@ -612 +625 @@
     MTTEST_LIST_TYPE<MTTEST_TYPE> *pTestList = (MTTEST_LIST_TYPE<MTTEST_TYPE> *)pvUser;
     RT_NOREF_PV(hSelf);
+    RTSemEventMultiWait(g_hEvtMtTest, RT_MS_1MIN);
 
     /* Try to delete items from random places. */
@@ -641 +655 @@
     };
 
+    RTTESTI_CHECK_RC_RETV(RTSemEventMultiCreate(&g_hEvtMtTest), VINF_SUCCESS);
+
     for (unsigned i = 0; i < RT_ELEMENTS(ahThreads); i++)
     {
@@ -647 +663 @@
     }
 
-    uint64_t tsMsDeadline = RTTimeMilliTS() + 60000;
+    RTTESTI_CHECK_RC(RTSemEventMultiSignal(g_hEvtMtTest), VINF_SUCCESS);
+    uint64_t tsMsDeadline = RTTimeMilliTS() + RT_MS_1MIN;
     for (unsigned i = 0; i < RT_ELEMENTS(ahThreads); i++)
     {
@@ -654 +671 @@
         RTTESTI_CHECK_RC(RTThreadWait(ahThreads[i], cWait, NULL), VINF_SUCCESS);
     }
+    RTTESTI_CHECK_RC(RTSemEventMultiDestroy(g_hEvtMtTest), VINF_SUCCESS);
+    g_hEvtMtTest = NIL_RTSEMEVENTMULTI;
 
     RTTESTI_CHECK_RETV(testList.size() == MTTEST_ITEMS * 2);