Bug 1375043 - Rename m(Keyed)Accumulations to m(Keyed)HistogramAccumulations in DiscardedData. r=gfritzsche
authorKrypto <krishnamanvar35@gmail.com>
Sat, 24 Jun 2017 17:26:56 +0530
changeset 366104 751b38c592b5
parent 366103 f98184b0cb93
child 366105 a7effdfd856a
push id91884
push userryanvm@gmail.com
push dateTue, 27 Jun 2017 00:01:11 +0000
treeherdermozilla-inbound@c538aaac7e5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche
bugs1375043
milestone56.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 1375043 - Rename m(Keyed)Accumulations to m(Keyed)HistogramAccumulations in DiscardedData. r=gfritzsche
toolkit/components/telemetry/TelemetryScalar.cpp
toolkit/components/telemetry/ipc/TelemetryComms.h
toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.cpp
--- a/toolkit/components/telemetry/TelemetryScalar.cpp
+++ b/toolkit/components/telemetry/TelemetryScalar.cpp
@@ -2341,22 +2341,22 @@ TelemetryScalar::RecordDiscardedData(Pro
   }
 
   ScalarBase* scalar = nullptr;
   mozilla::DebugOnly<nsresult> rv;
 
   rv = internal_GetScalarByEnum(ScalarID::TELEMETRY_DISCARDED_ACCUMULATIONS,
                                 aProcessType, &scalar);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
-  scalar->AddValue(aDiscardedData.mDiscardedAccumulations);
+  scalar->AddValue(aDiscardedData.mDiscardedHistogramAccumulations);
 
   rv = internal_GetScalarByEnum(ScalarID::TELEMETRY_DISCARDED_KEYED_ACCUMULATIONS,
                                 aProcessType, &scalar);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
-  scalar->AddValue(aDiscardedData.mDiscardedKeyedAccumulations);
+  scalar->AddValue(aDiscardedData.mDiscardedKeyedHistogramAccumulations);
 
   rv = internal_GetScalarByEnum(ScalarID::TELEMETRY_DISCARDED_SCALAR_ACTIONS,
                                 aProcessType, &scalar);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
   scalar->AddValue(aDiscardedData.mDiscardedScalarActions);
 
   rv = internal_GetScalarByEnum(ScalarID::TELEMETRY_DISCARDED_KEYED_SCALAR_ACTIONS,
                                 aProcessType, &scalar);
--- a/toolkit/components/telemetry/ipc/TelemetryComms.h
+++ b/toolkit/components/telemetry/ipc/TelemetryComms.h
@@ -70,18 +70,18 @@ struct ChildEventData {
   nsCString category;
   nsCString method;
   nsCString object;
   mozilla::Maybe<nsCString> value;
   nsTArray<EventExtraEntry> extra;
 };
 
 struct DiscardedData {
-  uint32_t mDiscardedAccumulations;
-  uint32_t mDiscardedKeyedAccumulations;
+  uint32_t mDiscardedHistogramAccumulations;
+  uint32_t mDiscardedKeyedHistogramAccumulations;
   uint32_t mDiscardedScalarActions;
   uint32_t mDiscardedKeyedScalarActions;
   uint32_t mDiscardedChildEvents;
 };
 
 } // namespace Telemetry
 } // namespace mozilla
 
--- a/toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.cpp
+++ b/toolkit/components/telemetry/ipc/TelemetryIPCAccumulator.cpp
@@ -142,17 +142,17 @@ TelemetryIPCAccumulator::AccumulateChild
                                                   uint32_t aSample)
 {
   StaticMutexAutoLock locker(gTelemetryIPCAccumulatorMutex);
   if (!gHistogramAccumulations) {
     gHistogramAccumulations = new nsTArray<Accumulation>();
   }
   if (gHistogramAccumulations->Length() >=
       kWaterMarkDiscardFactor * kHistogramAccumulationsArrayHighWaterMark) {
-    gDiscardedData.mDiscardedAccumulations++;
+    gDiscardedData.mDiscardedHistogramAccumulations++;
     return;
   }
   if (gHistogramAccumulations->Length() == kHistogramAccumulationsArrayHighWaterMark) {
     DispatchIPCTimerFired();
   }
   gHistogramAccumulations->AppendElement(Accumulation{aId, aSample});
   ArmIPCTimer(locker);
 }
@@ -162,17 +162,17 @@ TelemetryIPCAccumulator::AccumulateChild
                                                        const nsCString& aKey, uint32_t aSample)
 {
   StaticMutexAutoLock locker(gTelemetryIPCAccumulatorMutex);
   if (!gKeyedHistogramAccumulations) {
     gKeyedHistogramAccumulations = new nsTArray<KeyedAccumulation>();
   }
   if (gKeyedHistogramAccumulations->Length() >=
       kWaterMarkDiscardFactor * kHistogramAccumulationsArrayHighWaterMark) {
-    gDiscardedData.mDiscardedKeyedAccumulations++;
+    gDiscardedData.mDiscardedKeyedHistogramAccumulations++;
     return;
   }
   if (gKeyedHistogramAccumulations->Length() == kHistogramAccumulationsArrayHighWaterMark) {
     DispatchIPCTimerFired();
   }
   gKeyedHistogramAccumulations->AppendElement(KeyedAccumulation{aId, aSample, aKey});
   ArmIPCTimer(locker);
 }