Changeset 54447 in vbox

Timestamp:

Feb 24, 2015 1:38:39 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrvGip.cpp: Use a interval timer as solaris cannot restart one-shot timers from the callback. This is a better idea anyway as I get ticks I can use to record the refinement history in the u64CpuHz members of CPU entries 1+ :-)

File:

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

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

@@ -712 +712 @@
  * @param   nsElapsed           The number of nano seconds elapsed.
  * @param   cElapsedTscTicks    The corresponding number of TSC ticks.
- */
-static void supdrvGipInitSetCpuFreq(PSUPGLOBALINFOPAGE pGip, uint64_t nsElapsed, uint64_t cElapsedTscTicks)
+ * @param   iTick               The tick number for debugging.
+ */
+static void supdrvGipInitSetCpuFreq(PSUPGLOBALINFOPAGE pGip, uint64_t nsElapsed, uint64_t cElapsedTscTicks, uint32_t iTick)
 {
     /*
@@ -736 +737 @@
     ASMAtomicWriteU64(&pGip->u64CpuHz, uCpuHz);
     if (pGip->u32Mode != SUPGIPMODE_ASYNC_TSC)
+    {
         ASMAtomicWriteU64(&pGip->aCPUs[0].u64CpuHz, uCpuHz);
+
+        /* For inspecting the frequency calcs using tstGIP-2, debugger or similar. */
+        if (iTick + 1 < pGip->cCpus)
+            ASMAtomicWriteU64(&pGip->aCPUs[iTick + 1].u64CpuHz, uCpuHz);
+    }
 }
 
@@ -833 +840 @@
          * calculations.
          */
-        else if (cNsElapsed <= GIP_TSC_REFINE_PERIOD_IN_SECS * 5 * RT_NS_1SEC_64)
-        {
-            int rc = RTTimerStart(pTimer, RT_NS_1SEC);
-            AssertRC(rc);
-            return;
-        }
-        else
+        else if (cNsElapsed > GIP_TSC_REFINE_PERIOD_IN_SECS * 5 * RT_NS_1SEC_64)
         {
             SUPR0Printf("vboxdrv: Failed to refine invariant TSC frequency because deltas are unavailable after %u (%u) seconds\n",
@@ -845 +846 @@
             SUPR0Printf("vboxdrv: start: %u, %u, %#llx  stop: %u, %u, %#llx\n",
                         iStartCpuSet, iStartGipCpu, iStartTscDelta, iStopCpuSet, iStopGipCpu, iStopTscDelta);
+            int rc = RTTimerStop(pTimer);
+            AssertRC(rc);
             return;
         }
@@ -859 +862 @@
         || cNsElapsed < RT_NS_1SEC * 2)
     {
-        supdrvGipInitSetCpuFreq(pGip, cNsElapsed, cTscTicksElapsed);
+        supdrvGipInitSetCpuFreq(pGip, cNsElapsed, cTscTicksElapsed, iTick);
 
         /*
-         * Reschedule the timer if we haven't yet reached the defined refinement period.
+         * Stop the timer once we've reached the defined refinement period.
          */
-        if (cNsElapsed < GIP_TSC_REFINE_PERIOD_IN_SECS * RT_NS_1SEC_64)
-        {
-            int rc = RTTimerStart(pTimer, RT_NS_1SEC);
+        if (cNsElapsed > GIP_TSC_REFINE_PERIOD_IN_SECS * RT_NS_1SEC_64)
+        {
+            int rc = RTTimerStop(pTimer);
             AssertRC(rc);
         }
+    }
+    else
+    {
+        int rc = RTTimerStop(pTimer);
+        AssertRC(rc);
     }
 }
@@ -927 +935 @@
      * mapped (we want a stable frequency for all VMs).
      */
-    rc = RTTimerCreateEx(&pDevExt->pInvarTscRefineTimer, 0 /* one-shot */,
+    rc = RTTimerCreateEx(&pDevExt->pInvarTscRefineTimer, RT_NS_1SEC,
                          RTTIMER_FLAGS_CPU(RTMpCpuIdToSetIndex(pDevExt->idCpuInvarTscRefine)),
                          supdrvInitRefineInvariantTscFreqTimer, pDevExt);
@@ -940 +948 @@
     if (rc == VERR_CPU_OFFLINE || rc == VERR_NOT_SUPPORTED)
     {
-        rc = RTTimerCreateEx(&pDevExt->pInvarTscRefineTimer, 0 /* one-shot */, RTTIMER_FLAGS_CPU_ANY,
+        rc = RTTimerCreateEx(&pDevExt->pInvarTscRefineTimer, RT_NS_1SEC, RTTIMER_FLAGS_CPU_ANY,
                              supdrvInitRefineInvariantTscFreqTimer, pDevExt);
         if (RT_SUCCESS(rc))
@@ -1169 +1177 @@
          * Calculate the TSC frequency and update it (shared with the refinement timer).
          */
-        supdrvGipInitSetCpuFreq(pGip, nsStop - nsStart, uTscStop - uTscStart);
+        supdrvGipInitSetCpuFreq(pGip, nsStop - nsStart, uTscStop - uTscStart, 0);
         return VINF_SUCCESS;
     }