Merge branch 'master' into Basilisk-releasev2018.11.04

1 files changed, 0 insertions, 54 deletions

diff --git a/netwerk/cache2/CacheIOThread.cpp b/netwerk/cache2/CacheIOThread.cpp
index d51f61b0f..2fbc0ccce 100644
--- a/netwerk/cache2/CacheIOThread.cpp
+++ b/netwerk/cache2/CacheIOThread.cpp
@@ -18,54 +18,6 @@
 namespace mozilla {
 namespace net {
 
-namespace { // anon
-
-class CacheIOTelemetry
-{
-public:
-  typedef CacheIOThread::EventQueue::size_type size_type;
-  static size_type mMinLengthToReport[CacheIOThread::LAST_LEVEL];
-  static void Report(uint32_t aLevel, size_type aLength);
-};
-
-static CacheIOTelemetry::size_type const kGranularity = 30;
-
-CacheIOTelemetry::size_type 
-CacheIOTelemetry::mMinLengthToReport[CacheIOThread::LAST_LEVEL] = {
-  kGranularity, kGranularity, kGranularity, kGranularity,
-  kGranularity, kGranularity, kGranularity, kGranularity
-};
-
-// static
-void CacheIOTelemetry::Report(uint32_t aLevel, CacheIOTelemetry::size_type aLength)
-{
-  if (mMinLengthToReport[aLevel] > aLength) {
-    return;
-  }
-
-  static Telemetry::ID telemetryID[] = {
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_OPEN_PRIORITY,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_READ_PRIORITY,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_MANAGEMENT,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_OPEN,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_READ,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_WRITE_PRIORITY,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_WRITE,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_INDEX,
-    Telemetry::HTTP_CACHE_IO_QUEUE_2_EVICT
-  };
-
-  // Each bucket is a multiply of kGranularity (30, 60, 90..., 300+)
-  aLength = (aLength / kGranularity);
-  // Next time report only when over the current length + kGranularity
-  mMinLengthToReport[aLevel] = (aLength + 1) * kGranularity;
-
-  // 10 is number of buckets we have in each probe
-  aLength = std::min<size_type>(aLength, 10);
-}
-
-} // anon
-
 namespace detail {
 
 /**
@@ -525,7 +477,6 @@ void CacheIOThread::LoopOneLevel(uint32_t aLevel)
   mCurrentlyExecutingLevel = aLevel;
 
   bool returnEvents = false;
-  bool reportTelementry = true;
 
   EventQueue::size_type index;
   {
@@ -539,11 +490,6 @@ void CacheIOThread::LoopOneLevel(uint32_t aLevel)
         break;
       }
 
-      if (reportTelementry) {
-        reportTelementry = false;
-        CacheIOTelemetry::Report(aLevel, length);
-      }
-
       // Drop any previous flagging, only an event on the current level may set
       // this flag.
       mRerunCurrentEvent = false;