Backed out changeset 0a1486cf11b2 (bug 1297790) for browser_UsageTelemetry_content_aboutHome.js failures a=backout CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Fri, 28 Oct 2016 15:44:51 -0700
changeset 320086 2777fabbe62a3a55a3514d724303977bac7260fb
parent 320085 8c08e1aca9ea4953d610ead9b7d1cd4eb0d822d3
child 320087 b171726c465e305411429b29012f48e890598b3f
push id20749
push userryanvm@gmail.com
push dateSat, 29 Oct 2016 13:21:21 +0000
treeherderfx-team@1b170b39ed6b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1297790
milestone52.0a1
backs out0a1486cf11b228e41d27499b79b1e3ea6be3e28f
Backed out changeset 0a1486cf11b2 (bug 1297790) for browser_UsageTelemetry_content_aboutHome.js failures a=backout CLOSED TREE
gfx/ipc/GPUChild.cpp
gfx/ipc/GPUProcessHost.cpp
gfx/ipc/GPUProcessHost.h
toolkit/components/telemetry/Histograms.json
--- a/gfx/ipc/GPUChild.cpp
+++ b/gfx/ipc/GPUChild.cpp
@@ -2,17 +2,16 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=99: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "GPUChild.h"
 #include "gfxConfig.h"
 #include "gfxPrefs.h"
 #include "GPUProcessHost.h"
-#include "mozilla/Telemetry.h"
 #include "mozilla/dom/CheckerboardReportService.h"
 #include "mozilla/gfx/gfxVars.h"
 #if defined(XP_WIN)
 # include "mozilla/gfx/DeviceManagerDx.h"
 #endif
 #include "mozilla/ipc/CrashReporterHost.h"
 
 namespace mozilla {
@@ -75,30 +74,28 @@ GPUChild::EnsureGPUReady()
   if (mGPUReady) {
     return;
   }
 
   GPUDeviceData data;
   SendGetDeviceStatus(&data);
 
   gfxPlatform::GetPlatform()->ImportGPUDeviceData(data);
-  Telemetry::AccumulateTimeDelta(Telemetry::GPU_PROCESS_LAUNCH_TIME_MS, mHost->GetLaunchTime());
   mGPUReady = true;
 }
 
 bool
 GPUChild::RecvInitComplete(const GPUDeviceData& aData)
 {
   // We synchronously requested GPU parameters before this arrived.
   if (mGPUReady) {
     return true;
   }
 
   gfxPlatform::GetPlatform()->ImportGPUDeviceData(aData);
-  Telemetry::AccumulateTimeDelta(Telemetry::GPU_PROCESS_LAUNCH_TIME_MS, mHost->GetLaunchTime());
   mGPUReady = true;
   return true;
 }
 
 bool
 GPUChild::RecvReportCheckerboard(const uint32_t& aSeverity, const nsCString& aLog)
 {
   layers::CheckerboardEventStorage::Report(aSeverity, std::string(aLog.get()));
@@ -142,18 +139,16 @@ GPUChild::ActorDestroy(ActorDestroyReaso
 {
   if (aWhy == AbnormalShutdown) {
 #ifdef MOZ_CRASHREPORTER
     if (mCrashReporter) {
       mCrashReporter->GenerateCrashReport(OtherPid());
       mCrashReporter = nullptr;
     }
 #endif
-    Telemetry::Accumulate(Telemetry::SUBPROCESS_ABNORMAL_ABORT,
-        nsDependentCString(XRE_ChildProcessTypeToString(GeckoProcessType_GPU), 1));
   }
 
   gfxVars::RemoveReceiver(this);
   mHost->OnChannelClosed();
 }
 
 class DeferredDeleteGPUChild : public Runnable
 {
--- a/gfx/ipc/GPUProcessHost.cpp
+++ b/gfx/ipc/GPUProcessHost.cpp
@@ -34,18 +34,16 @@ GPUProcessHost::~GPUProcessHost()
 
 bool
 GPUProcessHost::Launch()
 {
   MOZ_ASSERT(mLaunchPhase == LaunchPhase::Unlaunched);
   MOZ_ASSERT(!mGPUChild);
 
   mLaunchPhase = LaunchPhase::Waiting;
-  mLaunchTime = TimeStamp::Now();
-
   if (!GeckoChildProcessHost::AsyncLaunch()) {
     mLaunchPhase = LaunchPhase::Complete;
     return false;
   }
   return true;
 }
 
 bool
--- a/gfx/ipc/GPUProcessHost.h
+++ b/gfx/ipc/GPUProcessHost.h
@@ -77,24 +77,16 @@ public:
   // Return a unique id for this process, guaranteed not to be shared with any
   // past or future instance of GPUProcessHost.
   uint64_t GetProcessToken() const;
 
   bool IsConnected() const {
     return !!mGPUChild;
   }
 
-  // Return the time stamp for when we tried to launch the GPU process. This is
-  // currently used for Telemetry so that we can determine how long GPU processes
-  // take to spin up. Note this doesn't denote a successful launch, just when we
-  // attempted launch.
-  TimeStamp GetLaunchTime() const {
-    return mLaunchTime;
-  }
-
   // Called on the IO thread.
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
   void SetListener(Listener* aListener);
 
 private:
   // Called on the main thread.
@@ -125,16 +117,14 @@ private:
   };
   LaunchPhase mLaunchPhase;
 
   UniquePtr<GPUChild> mGPUChild;
   uint64_t mProcessToken;
 
   bool mShutdownRequested;
   bool mChannelClosed;
-
-  TimeStamp mLaunchTime;
 };
 
 } // namespace gfx
 } // namespace mozilla
 
 #endif // _include_mozilla_gfx_ipc_GPUProcessHost_h_
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -947,26 +947,16 @@
   },
   "GEOLOCATION_WATCHPOSITION_VISIBLE": {
     "alert_emails": ["michelangelo@mozilla.com"],
     "expires_in_version": "55",
     "kind": "boolean",
     "bug_numbers": [1255198],
     "description": "This metric is recorded every time a navigator.geolocation.watchPosition() request gets allowed/fulfilled. A false value is recorded if the owner is not visible according to document.isVisible."
   },
-  "GPU_PROCESS_LAUNCH_TIME_MS" : {
-    "alert_emails": ["george@mozilla.com", "danderson@mozilla.com"],
-    "expires_in_version": "never",
-    "bug_numbers": [1297790],
-    "kind": "exponential",
-    "high": 1000,
-    "n_buckets": 50,
-    "releaseChannelCollection": "opt-out",
-    "description": "GPU process launch time in milliseconds"
-  },
   "JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT": {
     "alert_emails": ["jdemooij@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 10,
     "description": "Use of SpiderMonkey's deprecated language extensions in web content: ForEach=0, DestructuringForIn=1 (obsolete), LegacyGenerator=2, ExpressionClosure=3, LetBlock=4 (obsolete), LetExpression=5 (obsolete), NoSuchMethod=6 (obsolete), FlagsArgument=7 (obsolete), RegExpSourceProp=8 (obsolete), RestoredRegExpStatics=9 (obsolete), BlockScopeFunRedecl=10"
   },
   "JS_DEPRECATED_LANGUAGE_EXTENSIONS_IN_ADDONS": {