Changeset 53095 in vbox for trunk/src

Timestamp:

Oct 20, 2014 5:02:44 PM (10 years ago)

Author:

vboxsync

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

96614

Message:

HostDrivers/Support: cosmetics, better scoping.

File:

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

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

@@ -5921 +5921 @@
 {
     int cTriesLeft = 4;
+
+    /* Assert order. */
     AssertReturn(pGip, VERR_INVALID_PARAMETER);
     AssertReturn(pGip->u32Magic == SUPGLOBALINFOPAGE_MAGIC, VERR_WRONG_ORDER);
@@ -5933 +5935 @@
         uint8_t     idApicBefore;
         uint8_t     idApicAfter;
-        PSUPGIPCPU  pGipCpuBefore;
-        PSUPGIPCPU  pGipCpuAfter;
-        uint16_t    iCpuBefore;
-        uint16_t    iCpuAfter;
 
         uFlags = ASMIntDisableFlags();
@@ -5989 +5987 @@
         ASMSetFlags(uFlags);
 
-        iCpuBefore = pGip->aiCpuFromApicId[idApicBefore];
-        iCpuAfter  = pGip->aiCpuFromApicId[idApicAfter];
-        AssertMsg(iCpuBefore < pGip->cCpus, ("iCpuBefore=%u cCpus=%u\n", iCpuBefore, pGip->cCpus));
-        AssertMsg(iCpuAfter  < pGip->cCpus, ("iCpuAfter=%u cCpus=%u\n", iCpuAfter, pGip->cCpus));
-        pGipCpuBefore = &pGip->aCPUs[iCpuBefore];
-        pGipCpuAfter  = &pGip->aCPUs[iCpuAfter];
-
         /** @todo replace with enum check. */
         if (supdrvIsInvariantTsc())
         {
+            PSUPGIPCPU pGipCpuBefore;
+            PSUPGIPCPU pGipCpuAfter;
+
+            uint16_t iCpuBefore = pGip->aiCpuFromApicId[idApicBefore];
+            uint16_t iCpuAfter  = pGip->aiCpuFromApicId[idApicAfter];
+            AssertMsgReturn(iCpuBefore < pGip->cCpus, ("iCpuBefore=%u cCpus=%u\n", iCpuBefore, pGip->cCpus), VERR_WRONG_ORDER);
+            AssertMsgReturn(iCpuAfter  < pGip->cCpus, ("iCpuAfter=%u cCpus=%u\n", iCpuAfter, pGip->cCpus), VERR_WRONG_ORDER);
+            pGipCpuBefore = &pGip->aCPUs[iCpuBefore];
+            pGipCpuAfter  = &pGip->aCPUs[iCpuAfter];
+
             if (   pGipCpuBefore->i64TSCDelta != INT64_MAX
                 && pGipCpuAfter->i64TSCDelta  != INT64_MAX)
@@ -6005 +6006 @@
                 u64TscAfter  += pGipCpuAfter->i64TSCDelta;
 
-                SUPR0Printf("vboxdrv: TSC frequency is (%'RU64) Hz, kernel timer granularity is (%RU32) Ns\n",
+                SUPR0Printf("vboxdrv: TSC frequency is (%'RU64) Hz - invariant, kernel timer granularity is (%RU32) Ns\n",
                             ((u64TscAfter - u64TscBefore) * RT_NS_1SEC_64) / (u64NanoTsAfter - u64NanoTs),
                             RTTimerGetSystemGranularity());
@@ -6018 +6019 @@
         else
         {
-            SUPR0Printf("vboxdrv: TSC frequency is (%'RU64) Hz, kernel timer granularity is (%RU32) Ns\n",
+            SUPR0Printf("vboxdrv: TSC frequency is (%'RU64) Hz - maybe variant, kernel timer granularity is (%RU32) Ns\n",
                         ((u64TscAfter - u64TscBefore) * RT_NS_1SEC_64) / (u64NanoTsAfter - u64NanoTs),
                         RTTimerGetSystemGranularity());