Bug 1365309 - Part 2: Re-enable the Background Hang Reporter on Linux, r=froydnj
☠☠ backed out by 83c89460055e ☠ ☠
authorMichael Layzell <michael@thelayzells.com>
Fri, 19 May 2017 09:00:47 -0400
changeset 607718 48f5e0597242cc85bcde94ce5463db12152a75d5
parent 607717 39ed96d7b2639889a17baec37695fb21dd63ebd3
child 607719 56850220bd77d1c4776aad99dfbfc86d73ef7150
push id68095
push userbmo:rbarker@mozilla.com
push dateWed, 12 Jul 2017 20:01:47 +0000
reviewersfroydnj
bugs1365309
milestone56.0a1
Bug 1365309 - Part 2: Re-enable the Background Hang Reporter on Linux, r=froydnj MozReview-Commit-ID: EjAti9UqW7k
xpcom/threads/ThreadStackHelper.h
--- a/xpcom/threads/ThreadStackHelper.h
+++ b/xpcom/threads/ThreadStackHelper.h
@@ -25,24 +25,24 @@
 // 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
 
-// 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)
+// Android x86 builds consistently crash in the Background Hang Reporter. bug
+// 1368520.
+#if defined(__ANDROID__)
+#  undef MOZ_THREADSTACKHELPER_PSEUDO
 #  undef MOZ_THREADSTACKHELPER_NATIVE
-#  undef MOZ_THREADSTACKHELPER_PSEUDO
 #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;
  * then another thread can call ThreadStackHelper::GetStack to retrieve
  * the pseudo-stack of the target thread at that instant.