Attachment 8786401 Details for Bug 1218576

[patch] 0002-bug-1218576-Support-subsession-hgrams-for-child-aggr.patch

0002-bug-1218576-Support-subsession-hgrams-for-child-aggr.patch (text/plain), 3.82 KB, created by Chris H-C :chutten

(hide)

Description:

Filename:

MIME Type:

Creator: Chris H-C :chutten

Size: 3.82 KB

patch

obsolete

>From a2ce62c558ae7c8aa60c3a40c7af76302d1fcad0 Mon Sep 17 00:00:00 2001
>From: Chris H-C <chutten@mozilla.com>
>Date: Wed, 29 Jun 2016 15:36:07 -0400
>Subject: [PATCH 02/14] bug 1218576 - Support subsession hgrams for child aggregation r=gfritzsche
>
>The original commit didn't properly support subsession histograms, so rectify
>that lapse by adding support for stripping out the base name of a histogram
>when trying to determine its id.
>
>MozReview-Commit-ID: LvUek6f5WUx
>---
> .../components/telemetry/TelemetryHistogram.cpp    | 49 ++++++++++++++++++----
> 1 file changed, 42 insertions(+), 7 deletions(-)
>
>diff --git a/toolkit/components/telemetry/TelemetryHistogram.cpp b/toolkit/components/telemetry/TelemetryHistogram.cpp
>index c3622f8..c501cf4 100644
>--- a/toolkit/components/telemetry/TelemetryHistogram.cpp
>+++ b/toolkit/components/telemetry/TelemetryHistogram.cpp
>@@ -336,6 +336,16 @@ HistogramInfo::label_id(const char* label, uint32_t* labelId) const
>   return NS_ERROR_FAILURE;
> }
> 
>+bool
>+StringEndsWith(const std::string& name, const std::string& suffix)
>+{
>+  if (name.size() < suffix.size()) {
>+    return false;
>+  }
>+
>+  return name.compare(name.size() - suffix.size(), suffix.size(), suffix) == 0;
>+}
>+
> } // namespace
> 
> 
>@@ -420,6 +430,18 @@ internal_HistogramGet(const char *name, const char *expiration,
>   return NS_OK;
> }
> 
>+CharPtrEntryType*
>+internal_GetHistogramMapEntry(const char* name)
>+{
>+  nsDependentCString histogramName(name);
>+  NS_NAMED_LITERAL_CSTRING(suffix, CHILD_HISTOGRAM_SUFFIX);
>+  if (!StringEndsWith(histogramName, suffix)) {
>+    return gHistogramMap.GetEntry(name);
>+  }
>+  auto root = Substring(histogramName, 0, histogramName.Length() - suffix.Length());
>+  return gHistogramMap.GetEntry(PromiseFlatCString(root).get());
>+}
>+
> nsresult
> internal_GetHistogramEnumId(const char *name, mozilla::Telemetry::ID *id)
> {
>@@ -427,7 +449,7 @@ internal_GetHistogramEnumId(const char *name, mozilla::Telemetry::ID *id)
>     return NS_ERROR_FAILURE;
>   }
> 
>-  CharPtrEntryType *entry = gHistogramMap.GetEntry(name);
>+  CharPtrEntryType *entry = internal_GetHistogramMapEntry(name);
>   if (!entry) {
>     return NS_ERROR_INVALID_ARG;
>   }
>@@ -499,7 +521,9 @@ internal_GetHistogramByName(const nsACString &name, Histogram **ret)
>     return rv;
>   }
> 
>-  rv = internal_GetHistogramByEnumId(id, ret);
>+  bool isChild = StringEndsWith(name,
>+                                NS_LITERAL_CSTRING(CHILD_HISTOGRAM_SUFFIX));
>+  rv = internal_GetHistogramByEnumId(id, ret, isChild);
>   if (NS_FAILED(rv))
>     return rv;
> 
>@@ -555,6 +579,7 @@ internal_CloneHistogram(const nsACString& newName,
> }
> 
> #if !defined(MOZ_WIDGET_GONK) && !defined(MOZ_WIDGET_ANDROID)
>+
> Histogram*
> internal_GetSubsessionHistogram(Histogram& existing)
> {
>@@ -565,9 +590,14 @@ internal_GetSubsessionHistogram(Histogram& existing)
>     return nullptr;
>   }
> 
>+  bool isChild = StringEndsWith(existing.histogram_name(),
>+                                CHILD_HISTOGRAM_SUFFIX);
>+
>   static Histogram* subsession[mozilla::Telemetry::HistogramCount] = {};
>-  if (subsession[id]) {
>-    return subsession[id];
>+  static Histogram* subsessionChild[mozilla::Telemetry::HistogramCount] = {};
>+  Histogram* cached = isChild ? subsessionChild[id] : subsession[id];
>+  if (cached) {
>+    return cached;
>   }
> 
>   NS_NAMED_LITERAL_CSTRING(prefix, SUBSESSION_HISTOGRAM_PREFIX);
>@@ -577,10 +607,15 @@ internal_GetSubsessionHistogram(Histogram& existing)
>   }
> 
>   nsCString subsessionName(prefix);
>-  subsessionName.Append(existingName);
>+  subsessionName.Append(existing.histogram_name().c_str());
> 
>-  subsession[id] = internal_CloneHistogram(subsessionName, id, existing);
>-  return subsession[id];
>+  Histogram* clone = internal_CloneHistogram(subsessionName, id, existing);
>+  if (isChild) {
>+    subsessionChild[id] = clone;
>+  } else {
>+    subsession[id] = clone;
>+  }
>+  return clone;
> }
> #endif
> 
>-- 
>2.7.4.windows.1
>

Flags:

chutten: review+

Actions: View | Diff | Review

Attachments on bug 1218576: 8760367 | 8762163 | 8764976 | 8765964 | 8768060 | 8768061 | 8768063 | 8768064 | 8768065 | 8768066 | 8768068 | 8768069 | 8768072 | 8770187 | 8770189 | 8770190 | 8770191 | 8770192 | 8770193 | 8770194 | 8770195 | 8770196 | 8770197 | 8771095 | 8771096 | 8771097 | 8771098 | 8771099 | 8771103 | 8772410 | 8772411 | 8772412 | 8773780 | 8773781 | 8773782 | 8775162 | 8775163 | 8776914 | 8777042 | 8781667 | 8781668 | 8781669 | 8781670 | 8781672 | 8781673 | 8781674 | 8781677 | 8781678 | 8781679 | 8781680 | 8781681 | 8781682 | 8782636 | 8782637 | 8782939 | 8782943 | 8783654 | 8783655 | 8783995 | 8783997 | 8786401 | 8786403 | 8787320 | 8787737 | 8788461 | 8791972 | 8791974 | 8791977 | 8792556

Bugzilla

Quick Search

Attachment 8786401 Details for Bug 1218576