Changeset 54464 in vbox

Timestamp:

Feb 24, 2015 6:07:30 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrvGip.cpp: Enabled the 2nd algo after some adjusting.

File:

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

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

@@ -2480 +2480 @@
  * Select TSC delta measurement algorithm.
  */
-#if 1
+#if 0
 # define GIP_TSC_DELTA_METHOD_1
 #else
@@ -2516 +2516 @@
     uint32_t                    au64CacheLinePaddingAfter[GIP_TSC_DELTA_CACHE_LINE_SIZE / sizeof(uint32_t) - 1];
     /** Result table. */
-    SUPDRVTSCDELTAMETHOD2ENTRY  aResults[96];
+    SUPDRVTSCDELTAMETHOD2ENTRY  aResults[64];
 } SUPDRVTSCDELTAMETHOD2;
 /** Pointer to the data for TSC delta mesurment algorithm \#2 .*/
@@ -2601 +2601 @@
         bool                    fLagMaster;
         bool                    fLagWorker;
+# if 0  /* pointless now */
         bool volatile           fQuitEarly;
+# endif
     } M2;
 #endif
@@ -3126 +3128 @@
  */
 
-# define GIP_TSC_DELTA_M2_LOOPS             (8 + GIP_TSC_DELTA_M2_PRIMER_LOOPS)
-# define GIP_TSC_DELTA_M2_PRIMER_LOOPS      1
+# define GIP_TSC_DELTA_M2_LOOPS             (7 + GIP_TSC_DELTA_M2_PRIMER_LOOPS)
+# define GIP_TSC_DELTA_M2_PRIMER_LOOPS      0
 
 
@@ -3263 +3265 @@
     unsigned iLoop;
 
+#if 0  /* pointless now */
     if (fIsMaster)
         ASMAtomicWriteBool(&pArgs->M2.fQuitEarly, false);
+#endif
 
     for (iLoop = 0; iLoop < GIP_TSC_DELTA_M2_LOOPS; iLoop++)
@@ -3329 +3333 @@
         }
 
+#if 0  /* pointless now */
         if (ASMAtomicReadBool(&pArgs->M2.fQuitEarly))
             break;
+#endif
 
     }
@@ -3744 +3750 @@
             if (fIsMaster)
             {
-#if 0
+#if 1
                 if (pGipCpuWorker->i64TSCDelta != INT64_MAX)
 #else