From 6e39acd90de7acd68d8831db40c005ef87f3e6e1 Mon Sep 17 00:00:00 2001 From: Vladan Djeric Date: Tue, 26 Aug 2014 15:12:42 -0400 Subject: [PATCH] Bug 1058832 - Remove unneeded LocalStorage Telemetry. r=honzab --- dom/src/storage/DOMStorageCache.cpp | 14 ----- toolkit/components/telemetry/Histograms.json | 56 -------------------- 2 files changed, 70 deletions(-) diff --git a/dom/src/storage/DOMStorageCache.cpp b/dom/src/storage/DOMStorageCache.cpp index fbaa0f9cda0..66df87eb012 100644 --- a/dom/src/storage/DOMStorageCache.cpp +++ b/dom/src/storage/DOMStorageCache.cpp @@ -351,8 +351,6 @@ DOMStorageCache::WaitForPreload(Telemetry::ID aTelemetryID) nsresult DOMStorageCache::GetLength(const DOMStorage* aStorage, uint32_t* aRetval) { - Telemetry::AutoTimer autoTimer; - if (Persist(aStorage)) { WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETLENGTH_BLOCKING_MS); if (NS_FAILED(mLoadResult)) { @@ -401,8 +399,6 @@ DOMStorageCache::GetKey(const DOMStorage* aStorage, uint32_t aIndex, nsAString& // suck if there's a large numer of indexes. Do we care? If so, // maybe we need to have a lazily populated key array here or // something? - Telemetry::AutoTimer autoTimer; - if (Persist(aStorage)) { WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETKEY_BLOCKING_MS); if (NS_FAILED(mLoadResult)) { @@ -431,8 +427,6 @@ KeysArrayBuilder(const nsAString& aKey, const nsString aValue, void* aArg) void DOMStorageCache::GetKeys(const DOMStorage* aStorage, nsTArray& aKeys) { - Telemetry::AutoTimer autoTimer; - if (Persist(aStorage)) { WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETALLKEYS_BLOCKING_MS); } @@ -448,8 +442,6 @@ nsresult DOMStorageCache::GetItem(const DOMStorage* aStorage, const nsAString& aKey, nsAString& aRetval) { - Telemetry::AutoTimer autoTimer; - if (Persist(aStorage)) { WaitForPreload(Telemetry::LOCALDOMSTORAGE_GETVALUE_BLOCKING_MS); if (NS_FAILED(mLoadResult)) { @@ -472,8 +464,6 @@ nsresult DOMStorageCache::SetItem(const DOMStorage* aStorage, const nsAString& aKey, const nsString& aValue, nsString& aOld) { - Telemetry::AutoTimer autoTimer; - if (Persist(aStorage)) { WaitForPreload(Telemetry::LOCALDOMSTORAGE_SETVALUE_BLOCKING_MS); if (NS_FAILED(mLoadResult)) { @@ -520,8 +510,6 @@ nsresult DOMStorageCache::RemoveItem(const DOMStorage* aStorage, const nsAString& aKey, nsString& aOld) { - Telemetry::AutoTimer autoTimer; - if (Persist(aStorage)) { WaitForPreload(Telemetry::LOCALDOMSTORAGE_REMOVEKEY_BLOCKING_MS); if (NS_FAILED(mLoadResult)) { @@ -556,8 +544,6 @@ DOMStorageCache::RemoveItem(const DOMStorage* aStorage, const nsAString& aKey, nsresult DOMStorageCache::Clear(const DOMStorage* aStorage) { - Telemetry::AutoTimer autoTimer; - bool refresh = false; if (Persist(aStorage)) { // We need to preload all data (know the size) before we can proceeed diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index abe52ee6a77..f731a978769 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -4056,14 +4056,6 @@ "kind": "boolean", "description": "True when we had to wait for a pending preload on first access to localStorage data, false otherwise" }, - "LOCALDOMSTORAGE_GETALLKEYS_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to return a list of all keys in domain's LocalStorage (ms)" - }, "LOCALDOMSTORAGE_GETALLKEYS_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential", @@ -4072,14 +4064,6 @@ "extended_statistics_ok": true, "description": "Time to block before we return a list of all keys in domain's LocalStorage (ms)" }, - "LOCALDOMSTORAGE_GETKEY_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to return a key name in domain's LocalStorage (ms)" - }, "LOCALDOMSTORAGE_GETKEY_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential", @@ -4088,14 +4072,6 @@ "extended_statistics_ok": true, "description": "Time to block before we return a key name in domain's LocalStorage (ms)" }, - "LOCALDOMSTORAGE_GETLENGTH_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to return number of keys in domain's LocalStorage (ms)" - }, "LOCALDOMSTORAGE_GETLENGTH_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential", @@ -4104,14 +4080,6 @@ "extended_statistics_ok": true, "description": "Time to block before we return number of keys in domain's LocalStorage (ms)" }, - "LOCALDOMSTORAGE_GETVALUE_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to return a value for a key in LocalStorage (ms)" - }, "LOCALDOMSTORAGE_GETVALUE_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential", @@ -4120,14 +4088,6 @@ "extended_statistics_ok": true, "description": "Time to block before we return a value for a key in LocalStorage (ms)" }, - "LOCALDOMSTORAGE_SETVALUE_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to set a single key's value in LocalStorage (ms)" - }, "LOCALDOMSTORAGE_SETVALUE_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential", @@ -4136,14 +4096,6 @@ "extended_statistics_ok": true, "description": "Time to block before we set a single key's value in LocalStorage (ms)" }, - "LOCALDOMSTORAGE_REMOVEKEY_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to remove a single key from LocalStorage (ms)" - }, "LOCALDOMSTORAGE_REMOVEKEY_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential", @@ -4152,14 +4104,6 @@ "extended_statistics_ok": true, "description": "Time to block before we remove a single key from LocalStorage (ms)" }, - "LOCALDOMSTORAGE_CLEAR_MS": { - "expires_in_version": "never", - "kind": "exponential", - "high": "3000", - "n_buckets": 10, - "extended_statistics_ok": true, - "description": "Time to clear LocalStorage for all domains (ms)" - }, "LOCALDOMSTORAGE_CLEAR_BLOCKING_MS": { "expires_in_version": "never", "kind": "exponential",