Bug 1442515 Turn MOZ_LOG's in Timer Reduction on in non-debug builds also r?baku draft
authorTom Ritter <tom@mozilla.com>
Tue, 06 Mar 2018 10:15:39 -0600
changeset 763735 2e94febd1f0986c8397122e476dbd18fa0b6d557
parent 763734 18cfd3dccc2317ba0f080d7d450ec9132ed779ac
child 763736 47f6e866e7407fcfba681bb3181e6a206c3fd40c
push id101542
push userbmo:tom@mozilla.com
push dateTue, 06 Mar 2018 16:18:41 +0000
reviewersbaku
bugs1442515
milestone60.0a1
Bug 1442515 Turn MOZ_LOG's in Timer Reduction on in non-debug builds also r?baku MozReview-Commit-ID: C3JkX8RogeW
toolkit/components/resistfingerprinting/nsRFPService.cpp
old mode 100644
new mode 100755
--- a/toolkit/components/resistfingerprinting/nsRFPService.cpp
+++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp
@@ -37,19 +37,17 @@
 #include "prenv.h"
 #include "nss.h"
 
 #include "js/Date.h"
 
 using namespace mozilla;
 using namespace std;
 
-#ifdef DEBUG
 static mozilla::LazyLogModule gResistFingerprintingLog("nsResistFingerprinting");
-#endif
 
 #define RESIST_FINGERPRINTING_PREF "privacy.resistFingerprinting"
 #define RFP_TIMER_PREF "privacy.reduceTimerPrecision"
 #define RFP_TIMER_VALUE_PREF "privacy.resistFingerprinting.reduceTimerPrecision.microseconds"
 #define RFP_TIMER_VALUE_DEFAULT 2000
 #define RFP_JITTER_VALUE_PREF "privacy.resistFingerprinting.reduceTimerPrecision.jitter"
 #define RFP_JITTER_VALUE_DEFAULT true
 #define RFP_SPOOFED_FRAMES_PER_SEC_PREF "privacy.resistFingerprinting.video_frames_per_sec"
@@ -158,62 +156,53 @@ public:
     for (auto & cacheEntry : this->cache) {
       // Read optimistically befor locking
       if (cacheEntry.key == aKey) {
         MutexAutoLock lock(mLock);
 
         // Double check after we have a lock
         if (MOZ_UNLIKELY(cacheEntry.key != aKey)) {
           // Got evicted in a race
-#if defined(DEBUG)
           long long tmp_key = cacheEntry.key;
           MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose,
             ("LRU Cache HIT-MISS with %lli != %lli", aKey, tmp_key));
-#endif
           return EmptyCString();
         }
 
         cacheEntry.accessTime = PR_Now();
-
-#if defined(DEBUG)
         MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose,
           ("LRU Cache HIT with %lli", aKey));
-#endif
         return cacheEntry.data;
       }
     }
 
     return EmptyCString();
   }
 
   void Store(long long aKey, const nsCString& aValue) {
     MOZ_DIAGNOSTIC_ASSERT(aValue.Length() == HASH_DIGEST_SIZE_BYTES);
     MutexAutoLock lock(mLock);
 
     CacheEntry* lowestKey = &this->cache[0];
     for (auto & cacheEntry : this->cache) {
       if (MOZ_UNLIKELY(cacheEntry.key == aKey)) {
         // Another thread inserted before us, don't insert twice
-#if defined(DEBUG)
         MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose,
           ("LRU Cache DOUBLE STORE with %lli", aKey));
-#endif
         return;
       }
       if (cacheEntry.accessTime < lowestKey->accessTime) {
         lowestKey = &cacheEntry;
       }
     }
 
     lowestKey->key = aKey;
     lowestKey->data = aValue;
     lowestKey->accessTime = PR_Now();
-#if defined(DEBUG)
     MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose, ("LRU Cache STORE with %lli", aKey));
-#endif
   }
 
 
 private:
   struct CacheEntry {
     Atomic<long long, Relaxed> key;
     PRTime accessTime = 0;
     nsCString data;
@@ -494,24 +483,22 @@ nsRFPService::ReduceTimePrecisionImpl(
        timeAsInt >= clamped + midpoint) {
       clampedAndJittered += resolutionAsInt;
     }
   }
 
   // Cast it back to a double and reduce it to the correct units.
   double ret = double(clampedAndJittered) / (1000000.0 / aTimeScale);
 
-#if defined(DEBUG)
   bool tmp_jitter = sJitter;
   MOZ_LOG(gResistFingerprintingLog, LogLevel::Verbose,
     ("Given: (%.*f, Scaled: %.*f, Converted: %lli), Rounding with (%lli, Originally %.*f), "
      "Intermediate: (%lli), Clamped: (%lli) Jitter: (%i Midpoint: %lli) Final: (%lli Converted: %.*f)",
      DBL_DIG-1, aTime, DBL_DIG-1, timeScaled, timeAsInt, resolutionAsInt, DBL_DIG-1, aResolutionUSec,
      (long long)floor(double(timeAsInt) / resolutionAsInt), clamped, tmp_jitter, midpoint, clampedAndJittered, DBL_DIG-1, ret));
-#endif
 
   return ret;
 }
 
 /* static */
 double
 nsRFPService::ReduceTimePrecisionAsUSecs(double aTime, TimerPrecisionType aType /* = TimerPrecisionType::All */)
 {