Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-13 07:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1113416 - Don't read stack labels inside hang monitor sighandler; r=nfroyd r=snorp

Browse Source 
When we're inside the hang monitor's signal handler, we must not read any string labels. Doing so may result in on-demand decompression kicking in on Android, which may result in a deadlock.
This commit is contained in:
Jim Chen 2015-01-10 12:41:48 -05:00
parent 3e54f20e33
commit c2e9cb1c30
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xpcom/threads/BackgroundHangMonitor.cpp
View File

@ -360,6 +360,13 @@ BackgroundHangThread::ReportHang(PRIntervalTime aHangTime)
// Recovered from a hang; called on the monitor thread // Recovered from a hang; called on the monitor thread
// mManager->mLock IS locked // mManager->mLock IS locked
// Remove unwanted "js::RunScript" frame from the stack
for (const char** f = &mHangStack.back(); f >= mHangStack.begin(); f--) {
if (!mHangStack.IsInBuffer(*f) && !strcmp(*f, "js::RunScript")) {
mHangStack.erase(f);
}
}
Telemetry::HangHistogram newHistogram(Move(mHangStack)); Telemetry::HangHistogram newHistogram(Move(mHangStack));
for (Telemetry::HangHistogram* oldHistogram = mStats.mHangs.begin(); for (Telemetry::HangHistogram* oldHistogram = mStats.mHangs.begin();
oldHistogram != mStats.mHangs.end(); oldHistogram++) { oldHistogram != mStats.mHangs.end(); oldHistogram++) {

4
xpcom/threads/ThreadStackHelper.cpp
View File

@ -673,10 +673,8 @@ ThreadStackHelper::FillStackBuffer()
} }
#endif #endif
const char* const label = entry->label(); const char* const label = entry->label();
if (mStackToFill->IsSameAsEntry(prevLabel, label) || if (mStackToFill->IsSameAsEntry(prevLabel, label)) {
!strcmp(label, "js::RunScript")) {
// Avoid duplicate labels to save space in the stack. // Avoid duplicate labels to save space in the stack.
// Avoid js::RunScript labels because we save actual JS frames above.
continue; continue;
} }
mStackToFill->infallibleAppend(label); mStackToFill->infallibleAppend(label);