Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1218576 - Assert we're the parent process when clearing histograms. r=gfritzsche

Browse Source 
Clear isn't generally called at all, and isn't dispatched to the parent process
for child telemetry aggregation. Clear should only be called on the parent
process.

MozReview-Commit-ID: stIutvAO6h
This commit is contained in:
Chris H-C 2016-08-16 12:41:00 +07:00
parent 36f6594d00
commit bbc40e0f54
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/telemetry/TelemetryHistogram.cpp
View File

@ -684,6 +684,10 @@ internal_HistogramAddCategorical(mozilla::Telemetry::ID id, const nsCString& lab
void
internal_HistogramClear(Histogram& aHistogram, bool onlySubsession)
{
MOZ_ASSERT(XRE_IsParentProcess());
if (!XRE_IsParentProcess()) {
return;
}
if (!onlySubsession) {
aHistogram.Clear();
}
@ -1023,6 +1027,10 @@ KeyedHistogram::Add(const nsCString& key, uint32_t sample)
void
KeyedHistogram::Clear(bool onlySubsession)
{
MOZ_ASSERT(XRE_IsParentProcess());
if (!XRE_IsParentProcess()) {
return;
}
#if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
for (auto iter = mSubsessionMap.Iter(); !iter.Done(); iter.Next()) {
iter.Get()->mData->Clear();