summaryrefslogtreecommitdiffstats
path: root/mozglue/baseprofiler
diff options
context:
space:
mode:
Diffstat (limited to 'mozglue/baseprofiler')
-rw-r--r--mozglue/baseprofiler/core/platform.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/mozglue/baseprofiler/core/platform.cpp b/mozglue/baseprofiler/core/platform.cpp
index 4f69aadd4a..6080ba88c6 100644
--- a/mozglue/baseprofiler/core/platform.cpp
+++ b/mozglue/baseprofiler/core/platform.cpp
@@ -1283,9 +1283,9 @@ struct NativeStack {
// Merges the profiling stack and native stack, outputting the details to
// aCollector.
-static void MergeStacks(uint32_t aFeatures, bool aIsSynchronous,
+static void MergeStacks(bool aIsSynchronous,
const RegisteredThread& aRegisteredThread,
- const Registers& aRegs, const NativeStack& aNativeStack,
+ const NativeStack& aNativeStack,
ProfilerStackCollector& aCollector) {
// WARNING: this function runs within the profiler's "critical section".
// WARNING: this function might be called while the profiler is inactive, and
@@ -1695,13 +1695,11 @@ static inline void DoSharedSample(
aCaptureOptions == StackCaptureOptions::Full) {
DoNativeBacktrace(aLock, aRegisteredThread, aRegs, nativeStack);
- MergeStacks(ActivePS::Features(aLock), aIsSynchronous, aRegisteredThread,
- aRegs, nativeStack, collector);
+ MergeStacks(aIsSynchronous, aRegisteredThread, nativeStack, collector);
} else
#endif
{
- MergeStacks(ActivePS::Features(aLock), aIsSynchronous, aRegisteredThread,
- aRegs, nativeStack, collector);
+ MergeStacks(aIsSynchronous, aRegisteredThread, nativeStack, collector);
// We can't walk the whole native stack, but we can record the top frame.
if (aCaptureOptions == StackCaptureOptions::Full) {
@@ -3786,13 +3784,11 @@ void profiler_suspend_and_sample_thread(BaseProfilerThreadId aThreadId,
# error "Invalid configuration"
# endif
- MergeStacks(aFeatures, isSynchronous, registeredThread, aRegs,
- nativeStack, aCollector);
+ MergeStacks(isSynchronous, registeredThread, nativeStack, aCollector);
} else
#endif
{
- MergeStacks(aFeatures, isSynchronous, registeredThread, aRegs,
- nativeStack, aCollector);
+ MergeStacks(isSynchronous, registeredThread, nativeStack, aCollector);
aCollector.CollectNativeLeafAddr((void*)aRegs.mPC);
}