Bug 1477213 - Remove now-empty shallow sizes. r=gfritzsche
authorJan-Erik Rediger <jrediger@mozilla.com>
Mon, 27 Aug 2018 14:26:51 +0000
changeset 488607 afeaf5a5abe3a232d7d7538528967568f651237d
parent 488606 fcd411537143c5d926136eb3aa39a6ff677bf326
child 488608 be4fd8ee7afd98b8e8f1cbffd2fc634fa5fe49a1
push id9734
push usershindli@mozilla.com
push dateThu, 30 Aug 2018 12:18:07 +0000
treeherdermozilla-beta@71c71ab3afae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche
bugs1477213
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1477213 - Remove now-empty shallow sizes. r=gfritzsche Depends On D2928 Differential Revision: https://phabricator.services.mozilla.com/D2929
toolkit/components/telemetry/Telemetry.cpp
toolkit/components/telemetry/TelemetryHistogram.cpp
toolkit/components/telemetry/TelemetryHistogram.h
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -222,20 +222,16 @@ TelemetryImpl::CollectReports(nsIHandleR
   mozilla::MallocSizeOf aMallocSizeOf = TelemetryMallocSizeOf;
 
 #define COLLECT_REPORT(name, size, desc) \
   MOZ_COLLECT_REPORT(name, KIND_HEAP, UNITS_BYTES, size, desc)
 
   COLLECT_REPORT("explicit/telemetry/impl", aMallocSizeOf(this),
       "Memory used by the Telemetry core implemenation");
 
-  COLLECT_REPORT("explicit/telemetry/histogram/shallow",
-      TelemetryHistogram::GetMapShallowSizesOfExcludingThis(aMallocSizeOf),
-      "Memory used by the Telemetry Histogram implementation");
-
   COLLECT_REPORT("explicit/telemetry/scalar/shallow",
       TelemetryScalar::GetMapShallowSizesOfExcludingThis(aMallocSizeOf),
       "Memory used by the Telemetry Scalar implemenation");
 
   COLLECT_REPORT("explicit/telemetry/WebRTC",
       mWebrtcTelemetry.SizeOfExcludingThis(aMallocSizeOf),
       "Memory used by WebRTC Telemetry");
 
--- a/toolkit/components/telemetry/TelemetryHistogram.cpp
+++ b/toolkit/components/telemetry/TelemetryHistogram.cpp
@@ -2553,23 +2553,16 @@ TelemetryHistogram::GetKeyedHistogramSna
         return NS_ERROR_FAILURE;
       }
     }
   }
   return NS_OK;
 }
 
 size_t
-TelemetryHistogram::GetMapShallowSizesOfExcludingThis(mozilla::MallocSizeOf
-                                                      aMallocSizeOf)
-{
-  return 0;
-}
-
-size_t
 TelemetryHistogram::GetHistogramSizesOfIncludingThis(mozilla::MallocSizeOf
                                                      aMallocSizeOf)
 {
   StaticMutexAutoLock locker(gTelemetryHistogramMutex);
 
   size_t n = 0;
 
   // If we allocated the array, let's count the number of pointers in there and
--- a/toolkit/components/telemetry/TelemetryHistogram.h
+++ b/toolkit/components/telemetry/TelemetryHistogram.h
@@ -72,19 +72,16 @@ nsresult
 CreateHistogramSnapshots(JSContext* aCx, JS::MutableHandleValue aResult, unsigned int aDataset,
                          bool aClearSubsession);
 
 nsresult
 GetKeyedHistogramSnapshots(JSContext *aCx, JS::MutableHandleValue aResult, unsigned int aDataset,
                            bool aClearSubsession);
 
 size_t
-GetMapShallowSizesOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf);
-
-size_t
 GetHistogramSizesOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf);
 
 // These functions are only meant to be used for GeckoView persistence.
 // They are responsible for updating in-memory probes with the data persisted
 // on the disk and vice-versa.
 nsresult SerializeHistograms(mozilla::JSONWriter &aWriter);
 nsresult SerializeKeyedHistograms(mozilla::JSONWriter &aWriter);
 nsresult DeserializeHistograms(JSContext* aCx, JS::HandleValue aData);