Bug 1575448 - De/serialize ProfilerMarkerPayload derived objects - r=…

…gregtatum Payloads will serialize themselves into a `BlocksRingBuffer` entry when first captured. Later they will be deserialized, to stream JSON for the output profile. Differential Revision: https://phabricator.services.mozilla.com/D43428 --HG-- extra : moz-landing-system : lando
dothq · Sep 18, 2019 · fc93e3d · fc93e3d
1 parent 0ffe75f
commit fc93e3d
Show file tree

Hide file tree

Showing 11 changed files with 1,846 additions and 162 deletions.
diff --git a/dom/media/mediasink/VideoSink.cpp b/dom/media/mediasink/VideoSink.cpp
@@ -54,16 +54,45 @@ class VideoFrameMarkerPayload : public ProfilerMarkerPayload {
         mAudioPositionUs(aAudioPositionUs),
         mVideoFrameTimeUs(aVideoFrameTimeUs) {}
 
+  BlocksRingBuffer::Length TagAndSerializationBytes() const override {
+    return CommonPropsTagAndSerializationBytes() +
+           BlocksRingBuffer::SumBytes(mAudioPositionUs, mVideoFrameTimeUs);
+  }
+
+  void SerializeTagAndPayload(
+      BlocksRingBuffer::EntryWriter& aEntryWriter) const override {
+    static const DeserializerTag tag = TagForDeserializer(Deserialize);
+    SerializeTagAndCommonProps(tag, aEntryWriter);
+    aEntryWriter.WriteObject(mAudioPositionUs);
+    aEntryWriter.WriteObject(mVideoFrameTimeUs);
+  }
+
+  static UniquePtr<ProfilerMarkerPayload> Deserialize(
+      BlocksRingBuffer::EntryReader& aEntryReader) {
+    ProfilerMarkerPayload::CommonProps props =
+        DeserializeCommonProps(aEntryReader);
+    auto audioPositionUs = aEntryReader.ReadObject<int64_t>();
+    auto videoFrameTimeUs = aEntryReader.ReadObject<int64_t>();
+    return UniquePtr<ProfilerMarkerPayload>(new VideoFrameMarkerPayload(
+        std::move(props), audioPositionUs, videoFrameTimeUs));
+  }
+
   void StreamPayload(SpliceableJSONWriter& aWriter,
                      const TimeStamp& aProcessStartTime,
-                     UniqueStacks& aUniqueStacks) {
+                     UniqueStacks& aUniqueStacks) const override {
     StreamCommonProps("UpdateRenderVideoFrames", aWriter, aProcessStartTime,
                       aUniqueStacks);
     aWriter.IntProperty("audio", mAudioPositionUs);
     aWriter.IntProperty("video", mVideoFrameTimeUs);
   }
 
  private:
+  VideoFrameMarkerPayload(CommonProps&& aCommonProps, int64_t aAudioPositionUs,
+                          int64_t aVideoFrameTimeUs)
+      : ProfilerMarkerPayload(std::move(aCommonProps)),
+        mAudioPositionUs(aAudioPositionUs),
+        mVideoFrameTimeUs(aVideoFrameTimeUs) {}
+
   int64_t mAudioPositionUs;
   int64_t mVideoFrameTimeUs;
 };

diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -2536,12 +2536,32 @@ int32_t RecordContentFrameTime(
       ContentFramePayload(const mozilla::TimeStamp& aStartTime,
                           const mozilla::TimeStamp& aEndTime)
           : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-      virtual void StreamPayload(SpliceableJSONWriter& aWriter,
-                                 const TimeStamp& aProcessStartTime,
-                                 UniqueStacks& aUniqueStacks) override {
+      mozilla::BlocksRingBuffer::Length TagAndSerializationBytes()
+          const override {
+        return CommonPropsTagAndSerializationBytes();
+      }
+      void SerializeTagAndPayload(
+          mozilla::BlocksRingBuffer::EntryWriter& aEntryWriter) const override {
+        static const DeserializerTag tag = TagForDeserializer(Deserialize);
+        SerializeTagAndCommonProps(tag, aEntryWriter);
+      }
+      void StreamPayload(SpliceableJSONWriter& aWriter,
+                         const TimeStamp& aProcessStartTime,
+                         UniqueStacks& aUniqueStacks) const override {
         StreamCommonProps("CONTENT_FRAME_TIME", aWriter, aProcessStartTime,
                           aUniqueStacks);
       }
+
+     private:
+      explicit ContentFramePayload(CommonProps&& aCommonProps)
+          : ProfilerMarkerPayload(std::move(aCommonProps)) {}
+      static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(
+          mozilla::BlocksRingBuffer::EntryReader& aEntryReader) {
+        ProfilerMarkerPayload::CommonProps props =
+            DeserializeCommonProps(aEntryReader);
+        return UniquePtr<ProfilerMarkerPayload>(
+            new ContentFramePayload(std::move(props)));
+      }
     };
     AUTO_PROFILER_STATS(add_marker_with_ContentFramePayload);
     profiler_add_marker_for_thread(

diff --git a/gfx/layers/ipc/ContentCompositorBridgeParent.cpp b/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
@@ -367,12 +367,32 @@ void ContentCompositorBridgeParent::ShadowLayersUpdated(
       ContentBuildPayload(const mozilla::TimeStamp& aStartTime,
                           const mozilla::TimeStamp& aEndTime)
           : ProfilerMarkerPayload(aStartTime, aEndTime) {}
-      virtual void StreamPayload(SpliceableJSONWriter& aWriter,
-                                 const TimeStamp& aProcessStartTime,
-                                 UniqueStacks& aUniqueStacks) override {
+      mozilla::BlocksRingBuffer::Length TagAndSerializationBytes()
+          const override {
+        return CommonPropsTagAndSerializationBytes();
+      }
+      void SerializeTagAndPayload(
+          mozilla::BlocksRingBuffer::EntryWriter& aEntryWriter) const override {
+        static const DeserializerTag tag = TagForDeserializer(Deserialize);
+        SerializeTagAndCommonProps(tag, aEntryWriter);
+      }
+      void StreamPayload(SpliceableJSONWriter& aWriter,
+                         const TimeStamp& aProcessStartTime,
+                         UniqueStacks& aUniqueStacks) const override {
         StreamCommonProps("CONTENT_FULL_PAINT_TIME", aWriter, aProcessStartTime,
                           aUniqueStacks);
       }
+
+     private:
+      explicit ContentBuildPayload(CommonProps&& aCommonProps)
+          : ProfilerMarkerPayload(std::move(aCommonProps)) {}
+      static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(
+          mozilla::BlocksRingBuffer::EntryReader& aEntryReader) {
+        ProfilerMarkerPayload::CommonProps props =
+            DeserializeCommonProps(aEntryReader);
+        return UniquePtr<ProfilerMarkerPayload>(
+            new ContentBuildPayload(std::move(props)));
+      }
     };
     AUTO_PROFILER_STATS(add_marker_with_ContentBuildPayload);
     profiler_add_marker_for_thread(

diff --git a/gfx/layers/wr/WebRenderBridgeParent.cpp b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -211,12 +211,34 @@ class SceneBuiltNotification : public wr::NotificationHandler {
               ContentFullPaintPayload(const mozilla::TimeStamp& aStartTime,
                                       const mozilla::TimeStamp& aEndTime)
                   : ProfilerMarkerPayload(aStartTime, aEndTime) {}
+              mozilla::BlocksRingBuffer::Length TagAndSerializationBytes()
+                  const override {
+                return CommonPropsTagAndSerializationBytes();
+              }
+              void SerializeTagAndPayload(
+                  mozilla::BlocksRingBuffer::EntryWriter& aEntryWriter)
+                  const override {
+                static const DeserializerTag tag =
+                    TagForDeserializer(Deserialize);
+                SerializeTagAndCommonProps(tag, aEntryWriter);
+              }
               void StreamPayload(SpliceableJSONWriter& aWriter,
                                  const TimeStamp& aProcessStartTime,
-                                 UniqueStacks& aUniqueStacks) override {
+                                 UniqueStacks& aUniqueStacks) const override {
                 StreamCommonProps("CONTENT_FULL_PAINT_TIME", aWriter,
                                   aProcessStartTime, aUniqueStacks);
               }
+
+             private:
+              explicit ContentFullPaintPayload(CommonProps&& aCommonProps)
+                  : ProfilerMarkerPayload(std::move(aCommonProps)) {}
+              static mozilla::UniquePtr<ProfilerMarkerPayload> Deserialize(
+                  mozilla::BlocksRingBuffer::EntryReader& aEntryReader) {
+                ProfilerMarkerPayload::CommonProps props =
+                    DeserializeCommonProps(aEntryReader);
+                return UniquePtr<ProfilerMarkerPayload>(
+                    new ContentFullPaintPayload(std::move(props)));
+              }
             };
 
             AUTO_PROFILER_STATS(add_marker_with_ContentFullPaintPayload);