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

Bug 1698427 - Call ExtractJsFrames outside of MergeStacks, before native stackwalk (if present) - r=canaltinova

Browse Source 
In a later bug, ExtractJsFrames will retrieve more information about the JS frames, which will be given to stack walkers in order to resume native sampling past JIT stacks.

Differential Revision: https://phabricator.services.mozilla.com/D108417
This commit is contained in:
Gerald Squelart 2021-03-16 05:08:23 +00:00
parent 3c786e5b5e
commit 2cc3b39bc9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/profiler/core/platform.cpp
View File

@ -1752,7 +1752,7 @@ static void MergeStacks(uint32_t aFeatures, bool aIsSynchronous,
const RegisteredThread& aRegisteredThread,
const Registers& aRegs, const NativeStack& aNativeStack,
ProfilerStackCollector& aCollector,
JsFrameBuffer aJsFrames) {
JsFrameBuffer aJsFrames, uint32_t aJsFramesCount) {
// WARNING: this function runs within the profiler's "critical section".
// WARNING: this function might be called while the profiler is inactive, and
// cannot rely on ActivePS.
@ -1762,16 +1762,13 @@ static void MergeStacks(uint32_t aFeatures, bool aIsSynchronous,
const js::ProfilingStackFrame* profilingStackFrames = profilingStack.frames;
uint32_t profilingStackFrameCount = profilingStack.stackSize();
const uint32_t jsFramesCount = ExtractJsFrames(
aIsSynchronous, aRegisteredThread, aRegs, aCollector, aJsFrames);
// While the profiling stack array is ordered oldest-to-youngest, the JS and
// native arrays are ordered youngest-to-oldest. We must add frames to aInfo
// oldest-to-youngest. Thus, iterate over the profiling stack forwards and JS
// and native arrays backwards. Note: this means the terminating condition
// jsIndex and nativeIndex is being < 0.
uint32_t profilingStackIndex = 0;
int32_t jsIndex = jsFramesCount - 1;
int32_t jsIndex = aJsFramesCount - 1;
int32_t nativeIndex = aNativeStack.mCount - 1;
uint8_t* lastLabelFrameStackAddr = nullptr;
@ -2244,6 +2241,9 @@ static inline void DoSharedSample(
MOZ_RELEASE_ASSERT(ActivePS::Exists(aLock));
ProfileBufferCollector collector(aBuffer, aSamplePos, aBufferRangeStart);
JsFrameBuffer& jsFrames = CorePS::JsFrames(aLock);
const uint32_t jsFramesCount = ExtractJsFrames(
aIsSynchronous, aRegisteredThread, aRegs, collector, jsFrames);
NativeStack nativeStack;
#if defined(HAVE_NATIVE_UNWIND)
if (ActivePS::FeatureStackWalk(aLock) &&
@ -2251,12 +2251,12 @@ static inline void DoSharedSample(
DoNativeBacktrace(aLock, aRegisteredThread, aRegs, nativeStack);
MergeStacks(ActivePS::Features(aLock), aIsSynchronous, aRegisteredThread,
aRegs, nativeStack, collector, CorePS::JsFrames(aLock));
aRegs, nativeStack, collector, jsFrames, jsFramesCount);
} else
#endif
{
MergeStacks(ActivePS::Features(aLock), aIsSynchronous, aRegisteredThread,
aRegs, nativeStack, collector, CorePS::JsFrames(aLock));
aRegs, nativeStack, collector, jsFrames, jsFramesCount);
// We can't walk the whole native stack, but we can record the top frame.
if (ActivePS::FeatureLeaf(aLock) &&
@ -5923,6 +5923,10 @@ void profiler_suspend_and_sample_thread(int aThreadId, uint32_t aFeatures,
// The target thread is now suspended. Collect a native backtrace,
// and call the callback.
bool isSynchronous = false;
JsFrameBuffer& jsFrames = CorePS::JsFrames(lock);
const uint32_t jsFramesCount = ExtractJsFrames(
isSynchronous, registeredThread, aRegs, aCollector, jsFrames);
#if defined(HAVE_FASTINIT_NATIVE_UNWIND)
if (aSampleNative) {
// We can only use FramePointerStackWalk or MozStackWalk from
@ -5939,12 +5943,12 @@ void profiler_suspend_and_sample_thread(int aThreadId, uint32_t aFeatures,
# endif
MergeStacks(aFeatures, isSynchronous, registeredThread, aRegs,
nativeStack, aCollector, CorePS::JsFrames(lock));
nativeStack, aCollector, jsFrames, jsFramesCount);
} else
#endif
{
MergeStacks(aFeatures, isSynchronous, registeredThread, aRegs,
nativeStack, aCollector, CorePS::JsFrames(lock));
nativeStack, aCollector, jsFrames, jsFramesCount);
if (ProfilerFeature::HasLeaf(aFeatures)) {
aCollector.CollectNativeLeafAddr((void*)aRegs.mPC);