corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1925191: Moved the adding of profiler markers from performance.measure() calls into its own function r=mstange

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D233308
This commit is contained in:
Justin Link
2025-05-23 16:00:59 +00:00
committed by jlink@mozilla.com
parent 0f9c499eaf
commit 58a96c6abf
2 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
dom/performance/Performance.cpp
View File

@@ -713,6 +713,41 @@ void Performance::MaybeEmitExternalProfilerMarker(
fflush(sMarkerFile);
}
void MOZ_ALWAYS_INLINE Performance::MaybeAddProfileMarker(
const nsAString& aName,
const Maybe<const PerformanceMeasureOptions&>& options,
const Maybe<const nsAString&>& aStartMark,
const Optional<nsAString>& aEndMark) {
if (profiler_thread_is_being_profiled_for_markers()) {
AddProfileMarker(aName, options, aStartMark, aEndMark);
}
}
void MOZ_NEVER_INLINE Performance::AddProfileMarker(
const nsAString& aName,
const Maybe<const PerformanceMeasureOptions&>& options,
const Maybe<const nsAString&>& aStartMark,
const Optional<nsAString>& aEndMark) {
ErrorResult rv;
auto [startTimeStamp, endTimeStamp] =
GetTimeStampsForMarker(aStartMark, aEndMark, options, rv);
Maybe<nsString> endMark;
if (aEndMark.WasPassed()) {
endMark.emplace(aEndMark.Value());
}
Maybe<uint64_t> innerWindowId;
if (nsGlobalWindowInner* owner = GetOwnerWindow()) {
innerWindowId = Some(owner->WindowID());
}
profiler_add_marker("UserTiming", geckoprofiler::category::DOM,
{MarkerTiming::Interval(startTimeStamp, endTimeStamp),
MarkerInnerWindowId(innerWindowId)},
UserTimingMarker{}, aName, /* aIsMeasure */ true,
aStartMark, endMark);
}
already_AddRefed<PerformanceMeasure> Performance::Measure(
JSContext* aCx, const nsAString& aName,
const StringOrPerformanceMeasureOptions& aStartOrMeasureOptions,
@@ -810,25 +845,7 @@ already_AddRefed<PerformanceMeasure> Performance::Measure(
MaybeEmitExternalProfilerMarker(aName, options, startMark, aEndMark);
if (profiler_thread_is_being_profiled_for_markers()) {
auto [startTimeStamp, endTimeStamp] =
GetTimeStampsForMarker(startMark, aEndMark, options, aRv);
Maybe<nsString> endMark;
if (aEndMark.WasPassed()) {
endMark.emplace(aEndMark.Value());
}
Maybe<uint64_t> innerWindowId;
if (nsGlobalWindowInner* owner = GetOwnerWindow()) {
innerWindowId = Some(owner->WindowID());
}
profiler_add_marker("UserTiming", geckoprofiler::category::DOM,
{MarkerTiming::Interval(startTimeStamp, endTimeStamp),
MarkerInnerWindowId(innerWindowId)},
UserTimingMarker{}, aName, /* aIsMeasure */ true,
startMark, endMark);
}
MaybeAddProfileMarker(aName, options, startMark, aEndMark);
return performanceMeasure.forget();
}

9
dom/performance/Performance.h
View File

@@ -226,6 +226,15 @@ class Performance : public DOMEventTargetHelper {
void MaybeEmitExternalProfilerMarker(
const nsAString& aName, Maybe<const PerformanceMeasureOptions&> aOptions,
Maybe<const nsAString&> aStartMark, const Optional<nsAString>& aEndMark);
void MaybeAddProfileMarker(
const nsAString& aName,
const Maybe<const PerformanceMeasureOptions&>& options,
const Maybe<const nsAString&>& startMark,
const Optional<nsAString>& aEndMark);
void AddProfileMarker(const nsAString& aName,
const Maybe<const PerformanceMeasureOptions&>& options,
const Maybe<const nsAString&>& startMark,
const Optional<nsAString>& aEndMark);
// The attributes of a PerformanceMeasureOptions that we call
// ResolveTimestamp* on.