Backed out changeset 579fd072422e (bug 1365309)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 11 Aug 2017 09:29:08 +0200
changeset 374272 d5bdc2c7ca34dcb6a51365aee8aef45cd76854c7
parent 374271 d7a7569e436a330711c0cd8b622c399b14fb3190
child 374273 7fefe0f46c4648f92d75e02a5c5bf8b20a6f799d
push id32318
push userkwierso@gmail.com
push dateFri, 11 Aug 2017 20:16:01 +0000
treeherdermozilla-central@80ff3f300e05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1365309
milestone57.0a1
backs out579fd072422efc48b2c0bd0caec2120fe63c5f10
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
Backed out changeset 579fd072422e (bug 1365309)
toolkit/components/telemetry/tests/unit/xpcshell.ini
xpcom/threads/ThreadStackHelper.h
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -48,17 +48,17 @@ tags = addons
 [test_TelemetryControllerBuildID.js]
 [test_TelemetrySendOldPings.js]
 skip-if = os == "android" # Disabled due to intermittent orange on Android
 tags = addons
 [test_TelemetrySession.js]
 tags = addons
 [test_TelemetrySession_activeTicks.js]
 [test_ThreadHangStats.js]
-skip-if = os == "android" # BHR is disabled on android (bug 1368520)
+skip-if = os == "android" || os == "linux" # BHR is disabled on linux (bug 1365309)
 run-sequentially = Bug 1046307, test can fail intermittently when CPU load is high
 [test_TelemetrySend.js]
 [test_ChildHistograms.js]
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 tags = addons
 [test_ChildScalars.js]
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 [test_TelemetryReportingPolicy.js]
--- a/xpcom/threads/ThreadStackHelper.h
+++ b/xpcom/threads/ThreadStackHelper.h
@@ -25,22 +25,22 @@
 // Support pseudostack and native stack on these platforms.
 #if defined(XP_LINUX) || defined(XP_WIN) || defined(XP_MACOSX)
 #  ifdef MOZ_GECKO_PROFILER
 #    define MOZ_THREADSTACKHELPER_PSEUDO
 #    define MOZ_THREADSTACKHELPER_NATIVE
 #  endif
 #endif
 
-
-// Android x86 builds consistently crash in the Background Hang Reporter. bug
-// 1368520.
-#if defined(__ANDROID__)
+// NOTE: Currently, due to a problem with LUL stackwalking initialization taking
+// a long time (bug 1365309), we don't perform pseudostack or native stack
+// walking on Linux.
+#if defined(XP_LINUX)
+#  undef MOZ_THREADSTACKHELPER_NATIVE
 #  undef MOZ_THREADSTACKHELPER_PSEUDO
-#  undef MOZ_THREADSTACKHELPER_NATIVE
 #endif
 
 namespace mozilla {
 
 /**
  * ThreadStackHelper is used to retrieve the profiler pseudo-stack of a
  * thread, as an alternative of using the profiler to take a profile.
  * The target thread first declares an ThreadStackHelper instance;