From 24ca702e1882dccadcbffa5b553896e2483370b5 Mon Sep 17 00:00:00 2001 From: Bogdan Tara Date: Wed, 2 Dec 2020 21:10:06 +0200 Subject: [PATCH] Backed out changeset fdd4de984fd3 (bug 1679763) for profiler related bustage CLOSED TREE --- mozglue/baseprofiler/core/ProfilerMarkers.cpp | 26 --------------- .../baseprofiler/public/BaseProfilerMarkers.h | 12 ------- .../public/BaseProfilerMarkersPrerequisites.h | 15 +-------- tools/profiler/core/ProfilerMarkers.cpp | 32 ------------------- tools/profiler/moz.build | 1 - tools/profiler/public/ProfilerMarkers.h | 25 --------------- 6 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 tools/profiler/core/ProfilerMarkers.cpp diff --git a/mozglue/baseprofiler/core/ProfilerMarkers.cpp b/mozglue/baseprofiler/core/ProfilerMarkers.cpp index 223e05be6d67..4044733e9f1c 100644 --- a/mozglue/baseprofiler/core/ProfilerMarkers.cpp +++ b/mozglue/baseprofiler/core/ProfilerMarkers.cpp @@ -203,29 +203,3 @@ Span MarkerSchema::FormatToStringSpan( } } // namespace mozilla - -template MFBT_API mozilla::MarkerSchema::DataRowVector::reference -mozilla::MarkerSchema::DataRowVector::emplace_back( - mozilla::VariantType&&, - mozilla::MarkerSchema::DynamicData&&); - -template MFBT_API mozilla::MarkerSchema::DataRowVector::reference -mozilla::MarkerSchema::DataRowVector::emplace_back( - mozilla::VariantType&&, - mozilla::MarkerSchema::StaticData&&); - -namespace mozilla::baseprofiler { -template MFBT_API ProfileBufferBlockIndex AddMarker(const ProfilerString8View&, - const MarkerCategory&, - MarkerOptions&&, - markers::TextMarker, - const std::string&); - -template MFBT_API ProfileBufferBlockIndex -AddMarkerToBuffer(ProfileChunkedBuffer&, const ProfilerString8View&, - const MarkerCategory&, MarkerOptions&&, markers::NoPayload); - -template MFBT_API ProfileBufferBlockIndex AddMarkerToBuffer( - ProfileChunkedBuffer&, const ProfilerString8View&, const MarkerCategory&, - MarkerOptions&&, markers::TextMarker, const std::string&); -} // namespace mozilla::baseprofiler diff --git a/mozglue/baseprofiler/public/BaseProfilerMarkers.h b/mozglue/baseprofiler/public/BaseProfilerMarkers.h index e1c38a29c628..a737f43c5fe9 100644 --- a/mozglue/baseprofiler/public/BaseProfilerMarkers.h +++ b/mozglue/baseprofiler/public/BaseProfilerMarkers.h @@ -215,18 +215,6 @@ class MOZ_RAII AutoProfilerTextMarker { std::string mText; }; -extern template MFBT_API ProfileBufferBlockIndex -AddMarker(const ProfilerString8View&, const MarkerCategory&, MarkerOptions&&, - markers::TextMarker, const std::string&); - -extern template MFBT_API ProfileBufferBlockIndex -AddMarkerToBuffer(ProfileChunkedBuffer&, const ProfilerString8View&, - const MarkerCategory&, MarkerOptions&&, markers::NoPayload); - -extern template MFBT_API ProfileBufferBlockIndex AddMarkerToBuffer( - ProfileChunkedBuffer&, const ProfilerString8View&, const MarkerCategory&, - MarkerOptions&&, markers::TextMarker, const std::string&); - } // namespace mozilla::baseprofiler // Creates an AutoProfilerTextMarker RAII object. This macro is safe to use diff --git a/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h b/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h index 31abaf1a47f5..ee30063647ed 100644 --- a/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h +++ b/mozglue/baseprofiler/public/BaseProfilerMarkersPrerequisites.h @@ -842,7 +842,6 @@ class MarkerSchema { std::string mTooltipLabel; std::string mTableLabel; // Main display, made of zero or more rows of key+label+format or label+value. - private: struct DynamicData { std::string mKey; mozilla::Maybe mLabel; @@ -854,23 +853,11 @@ class MarkerSchema { std::string mValue; }; using DataRow = mozilla::Variant; - using DataRowVector = std::vector; - - DataRowVector mData; + std::vector mData; }; } // namespace mozilla -extern template MFBT_API mozilla::MarkerSchema::DataRowVector::reference -mozilla::MarkerSchema::DataRowVector::emplace_back( - mozilla::VariantType&&, - mozilla::MarkerSchema::DynamicData&&); - -extern template MFBT_API mozilla::MarkerSchema::DataRowVector::reference -mozilla::MarkerSchema::DataRowVector::emplace_back( - mozilla::VariantType&&, - mozilla::MarkerSchema::StaticData&&); - #endif // MOZ_GECKO_PROFILER #endif // BaseProfilerMarkersPrerequisites_h diff --git a/tools/profiler/core/ProfilerMarkers.cpp b/tools/profiler/core/ProfilerMarkers.cpp deleted file mode 100644 index 7c299678d109..000000000000 --- a/tools/profiler/core/ProfilerMarkers.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "mozilla/ProfilerMarkers.h" - -template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer( - mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&, - const mozilla::MarkerCategory&, mozilla::MarkerOptions&&, - mozilla::baseprofiler::markers::NoPayload); - -template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer( - mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&, - const mozilla::MarkerCategory&, mozilla::MarkerOptions&&, - mozilla::baseprofiler::markers::TextMarker, const std::string&); - -template mozilla::ProfileBufferBlockIndex profiler_add_marker( - const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&, - mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker, - const std::string&); - -template mozilla::ProfileBufferBlockIndex profiler_add_marker( - const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&, - mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker, - const nsCString&); - -template mozilla::ProfileBufferBlockIndex profiler_add_marker( - const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&, - mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::Tracing, - const mozilla::ProfilerString8View&); diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index 2d8d7d1b2a7c..e0acf801dfcd 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -26,7 +26,6 @@ if CONFIG["MOZ_GECKO_PROFILER"]: "core/ProfiledThreadData.cpp", "core/ProfilerBacktrace.cpp", "core/ProfilerCodeAddressService.cpp", - "core/ProfilerMarkers.cpp", "core/RegisteredThread.cpp", "gecko/ChildProfilerController.cpp", "gecko/nsProfilerStartParams.cpp", diff --git a/tools/profiler/public/ProfilerMarkers.h b/tools/profiler/public/ProfilerMarkers.h index de2e6f881d70..87e900e0e351 100644 --- a/tools/profiler/public/ProfilerMarkers.h +++ b/tools/profiler/public/ProfilerMarkers.h @@ -264,31 +264,6 @@ class MOZ_RAII AutoProfilerTracing { categoryString, markerName, geckoprofiler::category::categoryPair, \ profiler_get_inner_window_id_from_docshell(docShell)) -extern template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer( - mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&, - const mozilla::MarkerCategory&, mozilla::MarkerOptions&&, - mozilla::baseprofiler::markers::NoPayload); - -extern template mozilla::ProfileBufferBlockIndex AddMarkerToBuffer( - mozilla::ProfileChunkedBuffer&, const mozilla::ProfilerString8View&, - const mozilla::MarkerCategory&, mozilla::MarkerOptions&&, - mozilla::baseprofiler::markers::TextMarker, const std::string&); - -extern template mozilla::ProfileBufferBlockIndex profiler_add_marker( - const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&, - mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker, - const std::string&); - -extern template mozilla::ProfileBufferBlockIndex profiler_add_marker( - const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&, - mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::TextMarker, - const nsCString&); - -extern template mozilla::ProfileBufferBlockIndex profiler_add_marker( - const mozilla::ProfilerString8View&, const mozilla::MarkerCategory&, - mozilla::MarkerOptions&&, mozilla::baseprofiler::markers::Tracing, - const mozilla::ProfilerString8View&); - #endif // nfed MOZ_GECKO_PROFILER else #endif // ProfilerMarkers_h