Bug 1315935 - Remove the NumberOfProcessors crash annotation because it is redundant r=ted
authorGabriele Svelto <gsvelto@mozilla.com>
Wed, 16 Jan 2019 17:01:43 +0000
changeset 514147 8ad8553af8b4dabac964a4267554ee92500d8141
parent 514146 b9ab3e3e109a0bf5716918ce90775df3586ca077
child 514148 ac8281636fba946242d7da3357948443cca6aba9
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1315935
milestone66.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 1315935 - Remove the NumberOfProcessors crash annotation because it is redundant r=ted Differential Revision: https://phabricator.services.mozilla.com/D16688
dom/plugins/ipc/PluginModuleParent.cpp
dom/plugins/test/mochitest/hang_test.js
toolkit/crashreporter/CrashAnnotations.yaml
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -677,20 +677,16 @@ void PluginModuleChromeParent::WriteExtr
   mCrashReporter->AddAnnotation(CrashReporter::Annotation::PluginName,
                                 mPluginName);
   mCrashReporter->AddAnnotation(CrashReporter::Annotation::PluginVersion,
                                 mPluginVersion);
 
   if (mCrashReporter) {
 #ifdef XP_WIN
     if (mPluginCpuUsageOnHang.Length() > 0) {
-      mCrashReporter->AddAnnotation(
-          CrashReporter::Annotation::NumberOfProcessors,
-          PR_GetNumberOfProcessors());
-
       nsCString cpuUsageStr;
       cpuUsageStr.AppendFloat(std::ceil(mPluginCpuUsageOnHang[0] * 100) / 100);
       mCrashReporter->AddAnnotation(CrashReporter::Annotation::PluginCpuUsage,
                                     cpuUsageStr);
 
 #ifdef MOZ_CRASHREPORTER_INJECTOR
       for (uint32_t i = 1; i < mPluginCpuUsageOnHang.Length(); ++i) {
         nsCString tempStr;
--- a/dom/plugins/test/mochitest/hang_test.js
+++ b/dom/plugins/test/mochitest/hang_test.js
@@ -49,20 +49,16 @@ var testObserver = {
 
     ok("PluginCpuUsage" in extraData, "got extra field for plugin cpu usage");
     let cpuUsage = parseFloat(extraData["PluginCpuUsage"]);
     if (this.idleHang) {
       ok(cpuUsage == 0, "plugin cpu usage is 0%");
     } else {
       ok(cpuUsage > 0, "plugin cpu usage is >0%");
     }
-
-    // check processor count field
-    ok("NumberOfProcessors" in extraData, "got extra field for processor count");
-    ok(parseInt(extraData["NumberOfProcessors"]) > 0, "number of processors is >0");
   },
 
   QueryInterface: function(iid) {
     if (iid.equals(Ci.nsIObserver) ||
         iid.equals(Ci.nsISupportsWeakReference) ||
         iid.equals(Ci.nsISupports))
       return this;
     throw Cr.NS_NOINTERFACE;
--- a/toolkit/crashreporter/CrashAnnotations.yaml
+++ b/toolkit/crashreporter/CrashAnnotations.yaml
@@ -511,21 +511,16 @@ Notes:
     Miscellaneous notes that can be appended to a crash.
   type: string
 
 nsAsyncShutdownComponent:
   description: >
     Holds the contents of the nsAsyncShutdown.js script
   type: string
 
-NumberOfProcessors:
-  description: >
-    Number of logical processors in the system.
-  type: integer
-
 OOMAllocationSize:
   description: >
     Size of the allocation that caused an out-of-memory condition.
   type: string
   ping: true
 
 PluginCpuUsage:
   description: >