wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 942488 - Don't report pseudo-stacks without SPS profiler. r=nchen

Browse Source
This commit is contained in:
Jan Beich 2013-11-25 09:24:00 -05:00
parent 5cd1075cce
commit b25abb6817
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xpcom/threads/ThreadStackHelper.cpp
View File

@ -50,8 +50,11 @@ ThreadStackHelper::Shutdown()
} }
ThreadStackHelper::ThreadStackHelper() ThreadStackHelper::ThreadStackHelper()
: mPseudoStack(mozilla_get_pseudo_stack()) :
, mStackBuffer() #ifdef MOZ_ENABLE_PROFILER_SPS
mPseudoStack(mozilla_get_pseudo_stack()),
#endif
mStackBuffer()
, mMaxStackSize(mStackBuffer.capacity()) , mMaxStackSize(mStackBuffer.capacity())
{ {
#if defined(XP_LINUX) #if defined(XP_LINUX)
@ -147,15 +150,20 @@ ThreadStackHelper::SigAction(int aSignal, siginfo_t* aInfo, void* aContext)
bool bool
ThreadStackHelper::PrepareStackBuffer(Stack& aStack) { ThreadStackHelper::PrepareStackBuffer(Stack& aStack) {
aStack.clear(); aStack.clear();
#ifdef MOZ_ENABLE_PROFILER_SPS
if (!mPseudoStack) { if (!mPseudoStack) {
return false; return false;
} }
mStackBuffer.clear(); mStackBuffer.clear();
return mStackBuffer.reserve(mMaxStackSize); return mStackBuffer.reserve(mMaxStackSize);
#else
return false;
#endif
} }
void void
ThreadStackHelper::FillStackBuffer() { ThreadStackHelper::FillStackBuffer() {
#ifdef MOZ_ENABLE_PROFILER_SPS
size_t reservedSize = mMaxStackSize; size_t reservedSize = mMaxStackSize;
// Go from front to back // Go from front to back
@ -170,6 +178,7 @@ ThreadStackHelper::FillStackBuffer() {
} }
// If we exited early due to buffer size, expand the buffer for next time // If we exited early due to buffer size, expand the buffer for next time
mMaxStackSize += (end - entry); mMaxStackSize += (end - entry);
#endif
} }
} // namespace mozilla } // namespace mozilla

2
xpcom/threads/ThreadStackHelper.h
View File

@ -40,7 +40,9 @@ public:
typedef Telemetry::HangHistogram::Stack Stack; typedef Telemetry::HangHistogram::Stack Stack;
private: private:
#ifdef MOZ_ENABLE_PROFILER_SPS
const PseudoStack* const mPseudoStack; const PseudoStack* const mPseudoStack;
#endif
Stack mStackBuffer; Stack mStackBuffer;
size_t mMaxStackSize; size_t mMaxStackSize;