Bug 1004923 part 7 - Kill unused calibration.last, returnedTime in PRMJ_Now. r=njn

js/src/prmjtime.cpp

@@ -92,9 +92,6 @@ struct CalibrationData {
     double offset;       /* The low res 'epoch' */
     double timer_offset; /* The high res 'epoch' */
 
-    /* The last high res time that we returned since recalibrating */
-    int64_t last;
-
     bool calibrated;
 
 #ifdef JS_THREADSAFE
@@ -134,7 +131,6 @@ NowCalibrate()
 
         calibration.offset = FileTimeToUnixMicroseconds(ft);
         calibration.timer_offset = double(now.QuadPart);
-        calibration.last = 0;
 
         calibration.calibrated = true;
     }
@@ -204,7 +200,6 @@ PRMJ_Now()
 {
     bool calibrated = false;
     bool needsCalibration = false;
-    int64_t returnedTime;
     double cachedOffset = 0.0;
 
     /* For non threadsafe platforms, NowInit is not necessary */
@@ -247,26 +242,19 @@ PRMJ_Now()
         double highresTime = calibration.offset + PRMJ_USEC_PER_SEC *
             (highresTimerValue-calibration.timer_offset)/calibration.freq;
         cachedOffset = calibration.offset;
-
-        // On some dual processor/core systems, we might get an earlier time
-        // so we cache the last time that we returned.
-        calibration.last = js::Max(calibration.last, int64_t(highresTime));
-        returnedTime = calibration.last;
         MUTEX_UNLOCK(&calibration.data_lock);
 
         // Rather than assume the NT kernel ticks every 15.6ms, ask it.
         double skewThreshold;
         DWORD timeAdjustment, timeIncrement;
         BOOL timeAdjustmentDisabled;
-        if (GetSystemTimeAdjustment(&timeAdjustment,
-                                    &timeIncrement,
-                                    &timeAdjustmentDisabled)) {
+        if (GetSystemTimeAdjustment(&timeAdjustment, &timeIncrement, &timeAdjustmentDisabled)) {
             if (timeAdjustmentDisabled) {
                 // timeAdjustment is in units of 100ns.
-                skewThreshold = timeAdjustment/10.0;
+                skewThreshold = timeAdjustment / 10.0;
             } else {
                 // timeIncrement is in units of 100ns.
-                skewThreshold = timeIncrement/10.0;
+                skewThreshold = timeIncrement / 10.0;
             }
         } else {
             // Default to 15.625 ms if the syscall fails.