corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Bug 1394494 - Use a custom Frame::Kind for special BHR frame types, r=froydnj

Browse Source
This commit is contained in:
Michael Layzell
2017-08-28 13:34:34 -04:00
parent 33870cae74
commit a8a2f5b7ab
4 changed files with 121 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp
View File

@@ -165,6 +165,20 @@ ThreadStackHelper::TryAppendFrame(HangStack::Frame aFrame)
{
MOZ_RELEASE_ASSERT(mStackToFill);
// We deduplicate identical frames of kind CONTENT, JIT, WASM, and SUPPRESSED.
switch (aFrame.GetKind()) {
case HangStack::Frame::Kind::CONTENT:
case HangStack::Frame::Kind::JIT:
case HangStack::Frame::Kind::WASM:
case HangStack::Frame::Kind::SUPPRESSED:
if (!mStackToFill->empty() && mStackToFill->back().GetKind() == aFrame.GetKind()) {
return;
}
break;
default:
break;
}
// Record that we _want_ to use another frame entry. If this exceeds
// mMaxStackSize, we'll allocate more room on the next hang.
mDesiredStackSize += 1;
@@ -186,7 +200,7 @@ void
ThreadStackHelper::CollectJitReturnAddr(void* aAddr)
{
MOZ_RELEASE_ASSERT(mStackToFill);
TryAppendFrame(HangStack::Frame("(jit frame)"));
TryAppendFrame(HangStack::Frame::Jit());
}
void
@@ -195,7 +209,7 @@ ThreadStackHelper::CollectWasmFrame(const char* aLabel)
MOZ_RELEASE_ASSERT(mStackToFill);
// We don't want to collect WASM frames, as they are probably for content, so
// we just add a "(content wasm)" frame.
TryAppendFrame(HangStack::Frame("(wasm)"));
TryAppendFrame(HangStack::Frame::Wasm());
}
namespace {
@@ -247,10 +261,6 @@ GetPathAfterComponent(const char* filename, const char (&component)[LEN]) {
void
ThreadStackHelper::CollectPseudoEntry(const js::ProfileEntry& aEntry)
{
HangStack::Frame* backFrame = mStackToFill->empty()
? nullptr
: &mStackToFill->back();
// For non-js frames we just include the raw label.
if (!aEntry.isJs()) {
const char* label = aEntry.label();
@@ -259,18 +269,12 @@ ThreadStackHelper::CollectPseudoEntry(const js::ProfileEntry& aEntry)
}
if (!aEntry.script()) {
TryAppendFrame(HangStack::Frame("(profiling suppressed)"));
TryAppendFrame(HangStack::Frame::Suppressed());
return;
}
if (!IsChromeJSScript(aEntry.script())) {
// NOTE: Deduplicate consecutive (content script) frames.
if (backFrame &&
backFrame->GetKind() == HangStack::Frame::Kind::STRING &&
!strcmp(backFrame->AsString(), "(content script)")) {
return;
}
TryAppendFrame(HangStack::Frame("(content script)"));
TryAppendFrame(HangStack::Frame::Content());
return;
}