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

Timestamp:

Feb 20, 2015 2:11:26 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrvGip.cpp: Reordered the code, missed a bit.

File:

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

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

@@ -3263 +3263 @@
 
 /**
- * Terminates the TSC-delta measurement thread.
+ * Waits for TSC-delta measurements to be completed for all online CPUs.
+ *
+ * @returns VBox status code.
+ * @param   pDevExt         Pointer to the device instance data.
+ */
+static int supdrvTscDeltaThreadWaitForOnlineCpus(PSUPDRVDEVEXT pDevExt)
+{
+    int cTriesLeft = 5;
+    int cMsTotalWait;
+    int cMsWaited = 0;
+    int cMsWaitGranularity = 1;
+
+    PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
+    AssertReturn(pGip, VERR_INVALID_POINTER);
+
+    if (RT_UNLIKELY(pDevExt->hTscDeltaThread == NIL_RTTHREAD))
+        return VERR_THREAD_NOT_WAITABLE;
+
+    cMsTotalWait = RT_MIN(pGip->cPresentCpus + 10, 200);
+    while (cTriesLeft-- > 0)
+    {
+        if (RTCpuSetIsEqual(&pDevExt->TscDeltaObtainedCpuSet, &pGip->OnlineCpuSet))
+            return VINF_SUCCESS;
+        RTThreadSleep(cMsWaitGranularity);
+        cMsWaited += cMsWaitGranularity;
+        if (cMsWaited >= cMsTotalWait)
+            break;
+    }
+
+    return VERR_TIMEOUT;
+}
+
+
+/**
+ * Terminates the actual thread running supdrvTscDeltaThread().
+ *
+ * This is an internal worker function for supdrvTscDeltaThreadInit() and
+ * supdrvTscDeltaTerm().
  *
  * @param   pDevExt   Pointer to the device instance data.
@@ -3374 +3411 @@
 }
 
-
-/**
- * Waits for TSC-delta measurements to be completed for all online CPUs.
- *
- * @returns VBox status code.
- * @param   pDevExt         Pointer to the device instance data.
- */
-static int supdrvTscDeltaThreadWaitForOnlineCpus(PSUPDRVDEVEXT pDevExt)
-{
-    int cTriesLeft = 5;
-    int cMsTotalWait;
-    int cMsWaited = 0;
-    int cMsWaitGranularity = 1;
-
-    PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
-    AssertReturn(pGip, VERR_INVALID_POINTER);
-
-    if (RT_UNLIKELY(pDevExt->hTscDeltaThread == NIL_RTTHREAD))
-        return VERR_THREAD_NOT_WAITABLE;
-
-    cMsTotalWait = RT_MIN(pGip->cPresentCpus + 10, 200);
-    while (cTriesLeft-- > 0)
-    {
-        if (RTCpuSetIsEqual(&pDevExt->TscDeltaObtainedCpuSet, &pGip->OnlineCpuSet))
-            return VINF_SUCCESS;
-        RTThreadSleep(cMsWaitGranularity);
-        cMsWaited += cMsWaitGranularity;
-        if (cMsWaited >= cMsTotalWait)
-            break;
-    }
-
-    return VERR_TIMEOUT;
-}
 
 #endif /* SUPDRV_USE_TSC_DELTA_THREAD */