diff --git a/mozglue/baseprofiler/public/BaseProfilerMarkers.h b/mozglue/baseprofiler/public/BaseProfilerMarkers.h index 5821997e7cbb..580527aae610 100644 --- a/mozglue/baseprofiler/public/BaseProfilerMarkers.h +++ b/mozglue/baseprofiler/public/BaseProfilerMarkers.h @@ -203,16 +203,19 @@ class MOZ_RAII AutoProfilerTextMarker { mText(aText) { MOZ_ASSERT(mOptions.Timing().EndTime().IsNull(), "AutoProfilerTextMarker options shouldn't have an end time"); - if (mOptions.Timing().StartTime().IsNull()) { + if (profiler_is_active_and_unpaused() && + mOptions.Timing().StartTime().IsNull()) { mOptions.Set(MarkerTiming::InstantNow()); } } ~AutoProfilerTextMarker() { - mOptions.TimingRef().SetIntervalEnd(); - AUTO_PROFILER_STATS(AUTO_BASE_PROFILER_MARKER_TEXT); - AddMarker(ProfilerString8View::WrapNullTerminatedString(mMarkerName), - mCategory, std::move(mOptions), markers::TextMarker{}, mText); + if (profiler_is_active_and_unpaused()) { + mOptions.TimingRef().SetIntervalEnd(); + AUTO_PROFILER_STATS(AUTO_BASE_PROFILER_MARKER_TEXT); + AddMarker(ProfilerString8View::WrapNullTerminatedString(mMarkerName), + mCategory, std::move(mOptions), markers::TextMarker{}, mText); + } } protected: diff --git a/tools/profiler/public/ProfilerMarkers.h b/tools/profiler/public/ProfilerMarkers.h index 34a335700555..a4a5ad024e03 100644 --- a/tools/profiler/public/ProfilerMarkers.h +++ b/tools/profiler/public/ProfilerMarkers.h @@ -216,19 +216,22 @@ class MOZ_RAII AutoProfilerTextMarker { mText(aText) { MOZ_ASSERT(mOptions.Timing().EndTime().IsNull(), "AutoProfilerTextMarker options shouldn't have an end time"); - if (mOptions.Timing().StartTime().IsNull()) { + if (profiler_is_active_and_unpaused() && + mOptions.Timing().StartTime().IsNull()) { mOptions.Set(mozilla::MarkerTiming::InstantNow()); } } ~AutoProfilerTextMarker() { - AUTO_PROFILER_LABEL("TextMarker", PROFILER); - mOptions.TimingRef().SetIntervalEnd(); - AUTO_PROFILER_STATS(AUTO_PROFILER_MARKER_TEXT); - profiler_add_marker( - mozilla::ProfilerString8View::WrapNullTerminatedString(mMarkerName), - mCategory, std::move(mOptions), geckoprofiler::markers::TextMarker{}, - mText); + if (profiler_is_active_and_unpaused()) { + AUTO_PROFILER_LABEL("TextMarker", PROFILER); + mOptions.TimingRef().SetIntervalEnd(); + AUTO_PROFILER_STATS(AUTO_PROFILER_MARKER_TEXT); + profiler_add_marker( + mozilla::ProfilerString8View::WrapNullTerminatedString(mMarkerName), + mCategory, std::move(mOptions), geckoprofiler::markers::TextMarker{}, + mText); + } } protected: