Changeset 56924 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jul 13, 2015 12:34:53 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101627

Message:

HostDrivers/Support: Change the TSC-delta thread waiting to an interruptible sleep and increase sleep timeout to 60 seconds.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -4082 +4082 @@
                 RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
 
-                /* Simple adaptive timeout. */
-                if (cConsecutiveTimeouts++ == 10)
-                {
-                    if (pDevExt->cMsTscDeltaTimeout == 1)           /* 10 ms */
-                        pDevExt->cMsTscDeltaTimeout = 10;
-                    else if (pDevExt->cMsTscDeltaTimeout == 10)     /* +100 ms */
-                        pDevExt->cMsTscDeltaTimeout = 100;
-                    else if (pDevExt->cMsTscDeltaTimeout == 100)    /* +1000 ms */
-                        pDevExt->cMsTscDeltaTimeout = 500;
-                    cConsecutiveTimeouts = 0;
-                }
-                rc = RTThreadUserWait(pDevExt->hTscDeltaThread, pDevExt->cMsTscDeltaTimeout);
+                /*
+                 * Linux counts uninterruptible sleeps as load, hence we shall do a
+                 * regular, interruptible sleep here and ignore wake ups due to signals.
+                 * See task_contributes_to_load() in include/linux/sched.h in the Linux sources.
+                 */
+                rc = RTThreadUserWaitNoResume(pDevExt->hTscDeltaThread, pDevExt->cMsTscDeltaTimeout);
                 if (   RT_FAILURE(rc)
-                    && rc != VERR_TIMEOUT)
+                    && rc != VERR_TIMEOUT
+                    && rc != VERR_INTERRUPTED)
                     return supdrvTscDeltaThreadButchered(pDevExt, false /* fSpinlockHeld */, "RTThreadUserWait", rc);
                 RTThreadUserReset(pDevExt->hTscDeltaThread);
@@ -4108 +4103 @@
                     return supdrvTscDeltaThreadButchered(pDevExt, true /* fSpinlockHeld */, "RTSemEventSignal", rc);
                 RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
-                pDevExt->cMsTscDeltaTimeout = 1;
                 RTThreadSleep(1);
                 /* fall thru */
@@ -4343 +4337 @@
         {
             pDevExt->enmTscDeltaThreadState = kTscDeltaThreadState_Creating;
-            pDevExt->cMsTscDeltaTimeout = 1;
+            pDevExt->cMsTscDeltaTimeout = 60000;
             rc = RTThreadCreate(&pDevExt->hTscDeltaThread, supdrvTscDeltaThread, pDevExt, 0 /* cbStack */,
                                 RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "VBoxTscThread");