Changeset 45541 in vbox for trunk/src/VBox/Runtime/testcase

Timestamp:

Apr 14, 2013 12:42:52 PM (12 years ago)

Author:

vboxsync

Message:

Fixed cLoops=1 retry bug and increased the loop timeout on darwin.

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstR0ThreadPreemption.cpp (modified) (2 diffs)
• tstR0ThreadPreemptionDriver.cpp (modified) (5 diffs)

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

@@ -103 +103 @@
             if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
             {
+#ifdef RT_OS_DARWIN
+                uint64_t const cNsMax = UINT64_C(8)*1000U*1000U*1000U;
+#else
+                uint64_t const cNsMax = UINT64_C(2)*1000U*1000U*1000U;
+#endif
                 if (ASMIntAreEnabled())
                 {
@@ -118 +123 @@
                         cLoops++;
                     } while (   !fPending
-                             && cNanosElapsed    < UINT64_C(2)*1000U*1000U*1000U
-                             && cNanosSysElapsed < UINT64_C(2)*1000U*1000U*1000U
+                             && cNanosElapsed    < cNsMax
+                             && cNanosSysElapsed < cNsMax
                              && cLoops           < 100U*_1M);
                     if (!fPending)

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

@@ -38 +38 @@
 #include <iprt/string.h>
 #include <iprt/test.h>
+#include <iprt/time.h>
 #include <iprt/thread.h>
 #ifdef VBOX
@@ -61 +62 @@
 
     while (!g_fTerminate)
-        RTThreadSleep(50);
+    {
+        uint64_t tsStart = RTTimeMilliTS();
+        do
+        {
+            ASMNopPause();
+        } while (RTTimeMilliTS() - tsStart < 8);
+        RTThreadSleep(8);
+    }
 
     return VINF_SUCCESS;
@@ -193 +201 @@
     }
 
+
+    RTTestSub(hTest, "Pending Preemption");
 RTThreadSleep(250); /** @todo fix GIP initialization? */
-
-    RTTestSub(hTest, "Pending Preemption");
     for (int i = 0; ; i++)
     {
@@ -203 +211 @@
         RTTESTI_CHECK_RC(rc = SUPR3CallR0Service("tstR0ThreadPreemption", sizeof("tstR0ThreadPreemption") - 1,
                                                  TSTR0THREADPREMEPTION_IS_PENDING, 0, &Req.Hdr), VINF_SUCCESS);
-        if (    strcmp(Req.szMsg, "cLoops=1\n")
+        if (    strcmp(Req.szMsg, "!cLoops=1\n")
             ||  i >= 64)
         {
@@ -214 +222 @@
         if ((i % 3) == 0)
             RTThreadYield();
+        else if ((i % 16) == 0)
+            RTThreadSleep(8);
     }