Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 3e869dd7e82a (bug 1016629)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-07-25 15:59:52 +02:00
parent 8d17345642
commit 289ad915a3
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xpcom/threads/ThreadStackHelper.cpp
View File

@ -76,10 +76,11 @@ ThreadStackHelper::Shutdown()
}
ThreadStackHelper::ThreadStackHelper()
: mStackToFill(nullptr)
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
, mPseudoStack(mozilla_get_pseudo_stack())
:
#ifdef MOZ_ENABLE_PROFILER_SPS
mPseudoStack(mozilla_get_pseudo_stack()),
#endif
mStackToFill(nullptr)
, mMaxStackSize(Stack::sMaxInlineStorage)
, mMaxBufferSize(0)
{
@ -195,7 +196,7 @@ ThreadStackHelper::PrepareStackBuffer(Stack& aStack)
{
// Return false to skip getting the stack and return an empty stack
aStack.clear();
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
#ifdef MOZ_ENABLE_PROFILER_SPS
/* Normally, provided the profiler is enabled, it would be an error if we
don't have a pseudostack here (the thread probably forgot to call
profiler_register_thread). However, on B2G, profiling secondary threads
@ -218,7 +219,7 @@ ThreadStackHelper::PrepareStackBuffer(Stack& aStack)
#endif
}
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
#ifdef MOZ_ENABLE_PROFILER_SPS
namespace {
@ -286,14 +287,14 @@ ThreadStackHelper::AppendJSEntry(const volatile StackEntry* aEntry,
return label;
}
#endif // MOZ_THREADSTACKHELPER_PSEUDO
#endif // MOZ_ENABLE_PROFILER_SPS
void
ThreadStackHelper::FillStackBuffer()
{
MOZ_ASSERT(mStackToFill->empty());
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
#ifdef MOZ_ENABLE_PROFILER_SPS
size_t reservedSize = mStackToFill->capacity();
size_t reservedBufferSize = mStackToFill->AvailableBufferSize();
intptr_t availableBufferSize = intptr_t(reservedBufferSize);

13
xpcom/threads/ThreadStackHelper.h
View File

@ -23,13 +23,6 @@
#include <mach/mach.h>
#endif
// Support pseudostack on these platforms.
#if defined(XP_LINUX) || defined(XP_WIN) || defined(XP_MACOSX)
# ifdef MOZ_ENABLE_PROFILER_SPS
# define MOZ_THREADSTACKHELPER_PSEUDO
# endif
#endif
namespace mozilla {
/**
@ -48,16 +41,16 @@ public:
typedef Telemetry::HangStack Stack;
private:
Stack* mStackToFill;
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
#ifdef MOZ_ENABLE_PROFILER_SPS
const PseudoStack* const mPseudoStack;
#endif
Stack* mStackToFill;
size_t mMaxStackSize;
size_t mMaxBufferSize;
bool PrepareStackBuffer(Stack& aStack);
void FillStackBuffer();
#ifdef MOZ_THREADSTACKHELPER_PSEUDO
#ifdef MOZ_ENABLE_PROFILER_SPS
const char* AppendJSEntry(const volatile StackEntry* aEntry,
intptr_t& aAvailableBufferSize,
const char* aPrevLabel);