Backed out changeset fdd4de984fd3 (bug 1679763) for profiler related bustage CLOSED TREE

mozglue/baseprofiler/core/ProfilerMarkers.cpp

@@ -203,29 +203,3 @@ Span<const char> MarkerSchema::FormatToStringSpan(
 }
 
 }  // namespace mozilla
-
-template MFBT_API mozilla::MarkerSchema::DataRowVector::reference
-mozilla::MarkerSchema::DataRowVector::emplace_back(
-    mozilla::VariantType<mozilla::MarkerSchema::DynamicData>&&,
-    mozilla::MarkerSchema::DynamicData&&);
-
-template MFBT_API mozilla::MarkerSchema::DataRowVector::reference
-mozilla::MarkerSchema::DataRowVector::emplace_back(
-    mozilla::VariantType<mozilla::MarkerSchema::StaticData>&&,
-    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

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

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<std::string> mLabel;
@@ -854,23 +853,11 @@ class MarkerSchema {
     std::string mValue;
   };
   using DataRow = mozilla::Variant<DynamicData, StaticData>;
-  using DataRowVector = std::vector<DataRow>;
-
-  DataRowVector mData;
+  std::vector<DataRow> mData;
 };
 
 }  // namespace mozilla
 
-extern template MFBT_API mozilla::MarkerSchema::DataRowVector::reference
-mozilla::MarkerSchema::DataRowVector::emplace_back(
-    mozilla::VariantType<mozilla::MarkerSchema::DynamicData>&&,
-    mozilla::MarkerSchema::DynamicData&&);
-
-extern template MFBT_API mozilla::MarkerSchema::DataRowVector::reference
-mozilla::MarkerSchema::DataRowVector::emplace_back(
-    mozilla::VariantType<mozilla::MarkerSchema::StaticData>&&,
-    mozilla::MarkerSchema::StaticData&&);
-
 #endif  // MOZ_GECKO_PROFILER
 
 #endif  // BaseProfilerMarkersPrerequisites_h

tools/profiler/core/ProfilerMarkers.cpp

@@ -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&);

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",

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