Changeset 54458 in vbox

Timestamp:

Feb 24, 2015 4:15:41 PM (10 years ago)

Author:

vboxsync

Message:

nits

File:

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

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

@@ -766 +766 @@
     uint64_t            nsNow;
     uint64_t            uTsc;
-    RTCCUINTREG         uFlags;
+    RTCCUINTREG         fEFlags;
 
     /* Paranoia. */
@@ -805 +805 @@
 #endif
 
-    uFlags  = ASMIntDisableFlags();
+    fEFlags = ASMIntDisableFlags();
     uTsc    = ASMReadTSC();
     nsNow   = RTTimeSystemNanoTS();
     idCpu   = RTMpCpuId();
-    ASMSetFlags(uFlags);
+    ASMSetFlags(fEFlags);
 
     cNsElapsed          = nsNow - pDevExt->nsStartInvarTscRefine;
@@ -919 +919 @@
 {
     uint64_t    u64NanoTS;
-    RTCCUINTREG uFlags;
+    RTCCUINTREG fEFlags;
     int         rc;
 
@@ -938 +938 @@
         ASMNopPause();
 
-    uFlags = ASMIntDisableFlags();
+    fEFlags = ASMIntDisableFlags();
     pDevExt->uTscStartInvarTscRefine = ASMReadTSC();
     pDevExt->nsStartInvarTscRefine   = RTTimeSystemNanoTS();
     pDevExt->idCpuInvarTscRefine     = RTMpCpuId();
-    ASMSetFlags(uFlags);
+    ASMSetFlags(fEFlags);
 
 /** @todo we need a power management callback that disables the timer if the
@@ -1003 +1003 @@
 DECLCALLBACK(void) supdrvGipInitReadTscAndNanoTsOnCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
 {
-    RTCCUINTREG uFlags    = ASMIntDisableFlags();
+    RTCCUINTREG fEFlags   = ASMIntDisableFlags();
     uint64_t   *puTscStop = (uint64_t *)pvUser1;
     uint64_t   *pnsStop   = (uint64_t *)pvUser2;
@@ -1010 +1010 @@
     *pnsStop   = RTTimeSystemNanoTS();
 
-    ASMSetFlags(uFlags);
+    ASMSetFlags(fEFlags);
 }
 
@@ -1036 +1036 @@
     while (cTriesLeft-- > 0)
     {
-        RTCCUINTREG uFlags;
+        RTCCUINTREG fEFlags;
         uint64_t    nsStart;
         uint64_t    nsStop;
@@ -1055 +1055 @@
          * Read the TSC and current time, noting which CPU we're on.
          */
-        uFlags = ASMIntDisableFlags();
+        fEFlags = ASMIntDisableFlags();
         uTscStart   = ASMReadTSC();
         nsStart     = RTTimeSystemNanoTS();
         idCpuStart  = RTMpCpuId();
-        ASMSetFlags(uFlags);
+        ASMSetFlags(fEFlags);
 
         /*
@@ -1098 +1098 @@
          * Read the TSC and time again.
          */
-        uFlags = ASMIntDisableFlags();
+        fEFlags = ASMIntDisableFlags();
         uTscStop    = ASMReadTSC();
         nsStop      = RTTimeSystemNanoTS();
         idCpuStop   = RTMpCpuId();
-        ASMSetFlags(uFlags);
+        ASMSetFlags(fEFlags);
 
         /*
@@ -2828 +2828 @@
 }
 
-#define TSCDELTA_MASTER_SYNC_BEFORE(a_pMySync, a_pOtherSync) \
-    if (true) { \
-        if (RT_LIKELY(supdrvTscDeltaSync2_Before(a_pMySync, a_pOtherSync, true /*fMaster*/, &uFlags))) \
-        { /*likely*/ } \
-        else break; \
-    } else do {} while (0)
-#define TSCDELTA_OTHER_SYNC_BEFORE(a_pMySync, a_pOtherSync) \
-    if (true) { \
-        if (RT_LIKELY(supdrvTscDeltaSync2_Before(a_pMySync, a_pOtherSync, false /*fMaster*/, &uFlags))) \
-        { /*likely*/ } \
-        else break; \
-    } else do {} while (0)
+#define TSCDELTA_MASTER_SYNC_BEFORE(a_pMySync, a_pOtherSync, a_pfEFlags) \
+    if (RT_LIKELY(supdrvTscDeltaSync2_Before(a_pMySync, a_pOtherSync, true /*fMaster*/, a_pfEFlags))) \
+    { /*likely*/ } \
+    else break
+#define TSCDELTA_OTHER_SYNC_BEFORE(a_pMySync, a_pOtherSync, a_pfEFlags) \
+    if (RT_LIKELY(supdrvTscDeltaSync2_Before(a_pMySync, a_pOtherSync, false /*fMaster*/, a_pfEFlags))) \
+    { /*likely*/ } \
+    else break
 
 
@@ -2867 +2863 @@
 }
 
-#define TSCDELTA_MASTER_SYNC_AFTER(a_pMySync, a_pOtherSync) \
-    if (true) { \
-        if (RT_LIKELY(supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, uFlags))) \
-        { /* likely */ } \
-        else break; \
-    } else do {} while (0)
+#define TSCDELTA_MASTER_SYNC_AFTER(a_pMySync, a_pOtherSync, a_fEFlags) \
+    if (RT_LIKELY(supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, a_fEFlags))) \
+    { /* likely */ } \
+    else break
 
 #define TSCDELTA_MASTER_KICK_OTHER_OUT_OF_AFTER(a_pMySync, a_pOtherSync) \
-    if (true) { \
-        /* \
-         * Tell the worker that we're done processing the data and ready for the next round. \
-         */ \
-        if (RT_LIKELY(ASMAtomicCmpXchgU32(&(a_pOtherSync)->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_GO))) \
-        { /* likely */ } \
-        else break; \
-    } else do {} while (0)
-
-#define TSCDELTA_OTHER_SYNC_AFTER(a_pMySync, a_pOtherSync) \
+    /* \
+     * Tell the worker that we're done processing the data and ready for the next round. \
+     */ \
+    if (RT_LIKELY(ASMAtomicCmpXchgU32(&(a_pOtherSync)->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_GO))) \
+    { /* likely */ } \
+    else break
+
+#define TSCDELTA_OTHER_SYNC_AFTER(a_pMySync, a_pOtherSync, a_fEFlags) \
     if (true) { \
         /* \
@@ -2893 +2885 @@
         else \
         { \
-            ASMSetFlags(uFlags); \
+            ASMSetFlags(a_fEFlags); \
             break; \
         } \
-        if (RT_LIKELY(supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, uFlags))) \
+        if (RT_LIKELY(supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, a_fEFlags))) \
         { /* likely */ } \
         else break; \
@@ -2947 +2939 @@
     for (iLoop = 0; iLoop < GIP_TSC_DELTA_LOOPS; iLoop++)
     {
-        RTCCUINTREG uFlags;
+        RTCCUINTREG fEFlags;
         if (fIsMaster)
         {
@@ -2956 +2948 @@
                       ("%#llx idMaster=%#x idWorker=%#x (idGipMaster=%#x)\n",
                        pGipCpuMaster->u64TSCSample, pGipCpuMaster->idCpu, pGipCpuWorker->idCpu, pArgs->pDevExt->idGipMaster));
-            TSCDELTA_MASTER_SYNC_BEFORE(pMySync, pOtherSync);
+            TSCDELTA_MASTER_SYNC_BEFORE(pMySync, pOtherSync, &fEFlags);
 
             do
@@ -2964 +2956 @@
             } while (pGipCpuMaster->u64TSCSample == GIP_TSC_DELTA_RSVD);
 
-            TSCDELTA_MASTER_SYNC_AFTER(pMySync, pOtherSync);
+            TSCDELTA_MASTER_SYNC_AFTER(pMySync, pOtherSync, fEFlags);
 
             /* Process the data. */
@@ -2994 +2986 @@
 
             ASMAtomicReadU64(&pGipCpuMaster->u64TSCSample);     /* Warm the cache line. */
-            TSCDELTA_OTHER_SYNC_BEFORE(pMySync, pOtherSync);
+            TSCDELTA_OTHER_SYNC_BEFORE(pMySync, pOtherSync, &fEFlags);
 
             /*
@@ -3029 +3021 @@
             }
 
-            TSCDELTA_OTHER_SYNC_AFTER(pMySync, pOtherSync);
+            TSCDELTA_OTHER_SYNC_AFTER(pMySync, pOtherSync, fEFlags);
         }
     }
@@ -3215 +3207 @@
     for (iLoop = 0; iLoop < GIP_TSC_DELTA_M2_LOOPS; iLoop++)
     {
-        RTCCUINTREG uFlags;
+        RTCCUINTREG fEFlags;
         if (fIsMaster)
         {
@@ -3252 +3244 @@
              * Sync up with the worker and collect data.
              */
-            TSCDELTA_MASTER_SYNC_BEFORE(pMySync, pOtherSync);
+            TSCDELTA_MASTER_SYNC_BEFORE(pMySync, pOtherSync, &fEFlags);
             supdrvTscDeltaMethod2CollectData(pArgs->M2.pMasterData, &pArgs->M2.pWorkerData->iCurSeqNo, pArgs->M2.fLagMaster);
-            TSCDELTA_MASTER_SYNC_AFTER(pMySync, pOtherSync);
+            TSCDELTA_MASTER_SYNC_AFTER(pMySync, pOtherSync, fEFlags);
 
             /*
@@ -3271 +3263 @@
              * The worker.
              */
-            TSCDELTA_OTHER_SYNC_BEFORE(pMySync, pOtherSync);
+            TSCDELTA_OTHER_SYNC_BEFORE(pMySync, pOtherSync, &fEFlags);
             supdrvTscDeltaMethod2CollectData(pArgs->M2.pWorkerData, &pArgs->M2.pMasterData->iCurSeqNo, pArgs->M2.fLagWorker);
-            TSCDELTA_OTHER_SYNC_AFTER(pMySync, pOtherSync);
+            TSCDELTA_OTHER_SYNC_AFTER(pMySync, pOtherSync, fEFlags);
         }
 
@@ -3331 +3323 @@
     for (;;)
     {
-        RTCCUINTREG uFlags;
+        RTCCUINTREG fEFlags;
         AssertCompile((RT_ELEMENTS(pArgs->auVerifyMasterTscs) & 1) == 0);
         AssertCompile(RT_ELEMENTS(pArgs->auVerifyWorkerTscs) == RT_ELEMENTS(pArgs->auVerifyMasterTscs));
@@ -3338 +3330 @@
         {
             uint64_t uTscWorker;
-            TSCDELTA_MASTER_SYNC_BEFORE(pMySync, pOtherSync);
+            TSCDELTA_MASTER_SYNC_BEFORE(pMySync, pOtherSync, &fEFlags);
 
             /*
@@ -3370 +3362 @@
             }
 
-            TSCDELTA_MASTER_SYNC_AFTER(pMySync, pOtherSync);
+            TSCDELTA_MASTER_SYNC_AFTER(pMySync, pOtherSync, fEFlags);
 
             /*
@@ -3433 +3425 @@
              * The worker, master leads.
              */
-            TSCDELTA_OTHER_SYNC_BEFORE(pMySync, pOtherSync);
+            TSCDELTA_OTHER_SYNC_BEFORE(pMySync, pOtherSync, &fEFlags);
 
             for (i = 0; i < RT_ELEMENTS(pArgs->auVerifyWorkerTscs); i += 2)
@@ -3464 +3456 @@
             }
 
-            TSCDELTA_OTHER_SYNC_AFTER(pMySync, pOtherSync);
+            TSCDELTA_OTHER_SYNC_AFTER(pMySync, pOtherSync, fEFlags);
         }
         return pArgs->rcVerify;
@@ -4671 +4663 @@
              * while we do that.
              */
-            RTCCUINTREG uFlags  = ASMIntDisableFlags();
+            RTCCUINTREG fEFlags = ASMIntDisableFlags();
             int         iCpuSet = RTMpCpuIdToSetIndex(RTMpCpuId());
             int         iGipCpu;
@@ -4680 +4672 @@
                 pReq->u.Out.idApic = pGip->aCPUs[iGipCpu].idApic;
                 pReq->u.Out.u64AdjustedTsc = ASMReadTSC();
-                ASMSetFlags(uFlags);
+                ASMSetFlags(fEFlags);
 
                 /*
@@ -4712 +4704 @@
                 pReq->u.Out.idApic = ASMGetApicId();
                 pReq->u.Out.u64AdjustedTsc = ASMReadTSC();
-                ASMSetFlags(uFlags);
+                ASMSetFlags(fEFlags);
                 rc = VERR_INTERNAL_ERROR_5; /** @todo change to warning. */
                 break;
@@ -4723 +4715 @@
          * No delta to apply. Easy. Deal with preemption the lazy way.
          */
-        RTCCUINTREG uFlags  = ASMIntDisableFlags();
+        RTCCUINTREG fEFlags = ASMIntDisableFlags();
         int         iCpuSet = RTMpCpuIdToSetIndex(RTMpCpuId());
         int         iGipCpu;
@@ -4732 +4724 @@
             pReq->u.Out.idApic = ASMGetApicId();
         pReq->u.Out.u64AdjustedTsc = ASMReadTSC();
-        ASMSetFlags(uFlags);
+        ASMSetFlags(fEFlags);
         rc = VINF_SUCCESS;
     }