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

Bug 1135166 - Initialize Telemetry histogram id cache early to avoid races. r=froydnj,vladan

Browse Source
This commit is contained in:
Georg Fritzsche 2015-02-25 23:54:34 +01:00
parent 67d3af8d6b
commit 054baf847b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
toolkit/components/telemetry/Telemetry.cpp
View File

@ -1808,6 +1808,17 @@ mFailedLockCount(0)
mTrackedDBs.MarkImmutable();
#endif
// Populate the static histogram name->id cache.
// Note that the histogram names are statically allocated.
for (uint32_t i = 0; i < Telemetry::HistogramCount; i++) {
CharPtrEntryType *entry = mHistogramMap.PutEntry(gHistograms[i].id());
entry->mData = (Telemetry::ID) i;
}
#ifdef DEBUG
mHistogramMap.MarkImmutable();
#endif
// Create registered keyed histograms
for (size_t i = 0; i < ArrayLength(gHistograms); ++i) {
const TelemetryHistogram& h = gHistograms[i];
@ -1938,21 +1949,8 @@ TelemetryImpl::GetHistogramEnumId(const char *name, Telemetry::ID *id)
return NS_ERROR_FAILURE;
}
// Cache names
// Note the histogram names are statically allocated
TelemetryImpl::HistogramMapType *map = &sTelemetry->mHistogramMap;
if (!map->Count()) {
for (uint32_t i = 0; i < Telemetry::HistogramCount; i++) {
CharPtrEntryType *entry = map->PutEntry(gHistograms[i].id());
if (MOZ_UNLIKELY(!entry)) {
map->Clear();
return NS_ERROR_OUT_OF_MEMORY;
}
entry->mData = (Telemetry::ID) i;
}
}
CharPtrEntryType *entry = map->GetEntry(name);
const TelemetryImpl::HistogramMapType& map = sTelemetry->mHistogramMap;
CharPtrEntryType *entry = map.GetEntry(name);
if (!entry) {
return NS_ERROR_INVALID_ARG;
}