Bug 1304735 - Remove ClearHistogram
MozReview-Commit-ID: Ez7u2gsRX6R
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -2807,22 +2807,16 @@ AccumulateChild(const nsTArray<Accumulat
}
void
AccumulateChildKeyed(const nsTArray<KeyedAccumulation>& aAccumulations)
{
TelemetryHistogram::AccumulateChildKeyed(aAccumulations);
}
-void
-ClearHistogram(ID aId)
-{
- TelemetryHistogram::ClearHistogram(aId);
-}
-
const char*
GetHistogramName(ID id)
{
return TelemetryHistogram::GetHistogramName(id);
}
bool
CanRecordBase()
--- a/toolkit/components/telemetry/Telemetry.h
+++ b/toolkit/components/telemetry/Telemetry.h
@@ -138,23 +138,16 @@ void AccumulateChild(const nsTArray<Accu
/**
* Accumulate child data into child keyed histograms
*
* @param aAccumulations - accumulation actions to perform
*/
void AccumulateChildKeyed(const nsTArray<KeyedAccumulation>& aAccumulations);
/**
- * This clears the data for a histogram in TelemetryHistogramEnums.h.
- *
- * @param id - histogram id
- */
-void ClearHistogram(ID id);
-
-/**
* Enable/disable recording for this histogram at runtime.
* Recording is enabled by default, unless listed at kRecordingInitiallyDisabledIDs[].
* id must be a valid telemetry enum, otherwise an assertion is triggered.
*
* @param id - histogram id
* @param enabled - whether or not to enable recording from now on.
*/
void SetHistogramRecordingEnabled(ID id, bool enabled);
--- a/toolkit/components/telemetry/TelemetryHistogram.cpp
+++ b/toolkit/components/telemetry/TelemetryHistogram.cpp
@@ -2210,31 +2210,16 @@ TelemetryHistogram::AccumulateChildKeyed
continue;
}
internal_AccumulateChildKeyed(aAccumulations[i].mId,
aAccumulations[i].mKey,
aAccumulations[i].mSample);
}
}
-void
-TelemetryHistogram::ClearHistogram(mozilla::Telemetry::ID aId)
-{
- StaticMutexAutoLock locker(gTelemetryHistogramMutex);
- if (!internal_CanRecordBase()) {
- return;
- }
-
- Histogram *h;
- nsresult rv = internal_GetHistogramByEnumId(aId, &h);
- if (NS_SUCCEEDED(rv) && h) {
- internal_HistogramClear(*h, false);
- }
-}
-
nsresult
TelemetryHistogram::GetHistogramById(const nsACString &name, JSContext *cx,
JS::MutableHandle<JS::Value> ret)
{
Histogram *h = nullptr;
{
StaticMutexAutoLock locker(gTelemetryHistogramMutex);
nsresult rv = internal_GetHistogramByName(name, &h);
--- a/toolkit/components/telemetry/TelemetryHistogram.h
+++ b/toolkit/components/telemetry/TelemetryHistogram.h
@@ -42,19 +42,16 @@ void Accumulate(mozilla::Telemetry::ID a
void Accumulate(const char* name, uint32_t sample);
void Accumulate(const char* name, const nsCString& key, uint32_t sample);
void AccumulateCategorical(mozilla::Telemetry::ID aId, const nsCString& aLabel);
void AccumulateChild(const nsTArray<mozilla::Telemetry::Accumulation>& aAccumulations);
void AccumulateChildKeyed(const nsTArray<mozilla::Telemetry::KeyedAccumulation>& aAccumulations);
-void
-ClearHistogram(mozilla::Telemetry::ID aId);
-
nsresult
GetHistogramById(const nsACString &name, JSContext *cx,
JS::MutableHandle<JS::Value> ret);
nsresult
GetKeyedHistogramById(const nsACString &name, JSContext *cx,
JS::MutableHandle<JS::Value> ret);