Changeset 53064 in vbox for trunk

Timestamp:

Oct 15, 2014 12:50:19 PM (10 years ago)

Author:

vboxsync

Message:

HostDrivers/Support: Do the async. delta measurement from the ioctl -after- checking for fForce remeasurement.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -7382 +7382 @@
         return VERR_INVALID_CPU_ID;
 
-#ifdef SUPDRV_USE_TSC_DELTA_THREAD
-    if (pReq->u.In.fAsync)
-    {
-        /** @todo Async. doesn't implement options like retries, waiting. We'll need
-         *        to pass those options to the thread somehow and implement it in the
-         *        thread. Check if anyone uses/needs fAsync before implementing this. */
-        RTCpuSetAdd(&pDevExt->TscDeltaCpuSet, idCpu);
-        RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock);
-        if (   pDevExt->enmTscDeltaState == kSupDrvTscDeltaState_Listening
-            || pDevExt->enmTscDeltaState == kSupDrvTscDeltaState_Measuring)
-        {
-            pDevExt->enmTscDeltaState = kSupDrvTscDeltaState_WaitAndMeasure;
-        }
-        RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
-        RTThreadUserSignal(pDevExt->hTscDeltaThread);
-        return VINF_SUCCESS;
-    }
-#endif
-
     cTries       = RT_MAX(pReq->u.In.cRetries + 1, 10);
     cMsWaitRetry = RT_MAX(pReq->u.In.cMsWaitRetry, 5);
@@ -7412 +7393 @@
                 && !pReq->u.In.fForce)
                 return VINF_SUCCESS;
+
+#ifdef SUPDRV_USE_TSC_DELTA_THREAD
+            if (pReq->u.In.fAsync)
+            {
+                /** @todo Async. doesn't implement options like retries, waiting. We'll need
+                 *        to pass those options to the thread somehow and implement it in the
+                 *        thread. Check if anyone uses/needs fAsync before implementing this. */
+                RTCpuSetAdd(&pDevExt->TscDeltaCpuSet, idCpu);
+                RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock);
+                if (   pDevExt->enmTscDeltaState == kSupDrvTscDeltaState_Listening
+                    || pDevExt->enmTscDeltaState == kSupDrvTscDeltaState_Measuring)
+                {
+                    pDevExt->enmTscDeltaState = kSupDrvTscDeltaState_WaitAndMeasure;
+                }
+                RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
+                RTThreadUserSignal(pDevExt->hTscDeltaThread);
+                return VINF_SUCCESS;
+            }
+#endif
 
             while (!cTries--)