diff options
| -rw-r--r-- | netwerk/cache2/CacheIOThread.cpp | 54 | ||||
| -rw-r--r-- | toolkit/components/telemetry/Histograms.json | 72 |
2 files changed, 0 insertions, 126 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; diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 8692a4c8b..f61a67efc 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -2560,78 +2560,6 @@ "kind": "boolean", "description": "Rate of page load from offline cache" }, - "HTTP_CACHE_IO_QUEUE_2_OPEN_PRIORITY": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_READ_PRIORITY": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_MANAGEMENT": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_OPEN": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_READ": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_WRITE": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_WRITE_PRIORITY": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_INDEX": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, - "HTTP_CACHE_IO_QUEUE_2_EVICT": { - "alert_emails": ["hbambas@mozilla.com"], - "bug_numbers": [1294183], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 10, - "description": "HTTP Cache IO queue length" - }, "CACHE_DEVICE_SEARCH_2": { "expires_in_version": "never", "kind": "exponential", |