Bug 951431 - Don't get stacks during profiler runs on Linux; r=BenWa

2014-01-14 10:33:32 -06:00
parent 834e3f4257
commit bcd7df32ff
1 changed files with 4 additions and 0 deletions
--- a/xpcom/threads/ThreadStackHelper.cpp
+++ b/xpcom/threads/ThreadStackHelper.cpp
@@ -89,6 +89,10 @@ ThreadStackHelper::GetStack(Stack& aStack)
  }

 #if defined(XP_LINUX)
+  if (profiler_is_active()) {
+    // Profiler can interfere with our Linux signal handling
+    return;
+  }
  if (!sInitialized) {
    MOZ_ASSERT(false);
    return;