Bug 1615546 - Remove the optimizations field from profiler frame tabl…

…e r=julienw This requires firefox-devtools/profiler#4432 to be landed and deployed. We bump the profile version in this patch. Afaik we never used the optimizations field of the frame table in the profiler frontend and this pfield was null for more than 3 years (since Bug 1614622). We don't have any plans to make use of it any time soon. It's good to cleanup this field so it doesn't clutter the profile data and we can reduce the profile data size. Differential Revision: https://phabricator.services.mozilla.com/D167290
iaxat · Jan 24, 2023 · 6cb27ee · 6cb27ee
1 parent 6ce716e
commit 6cb27ee
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 29 deletions.
diff --git a/mozglue/baseprofiler/core/ProfileBufferEntry.cpp b/mozglue/baseprofiler/core/ProfileBufferEntry.cpp
@@ -294,11 +294,10 @@ void UniqueStacks::StreamNonJITFrame(const FrameKey& aFrame) {
     RELEVANT_FOR_JS = 1,
     INNER_WINDOW_ID = 2,
     IMPLEMENTATION = 3,
-    OPTIMIZATIONS = 4,
-    LINE = 5,
-    COLUMN = 6,
-    CATEGORY = 7,
-    SUBCATEGORY = 8
+    LINE = 4,
+    COLUMN = 5,
+    CATEGORY = 6,
+    SUBCATEGORY = 7
   };
 
   AutoArraySchemaWithStringsWriter writer(mFrameTableWriter, *mUniqueStrings);

diff --git a/mozglue/baseprofiler/core/ProfileBufferEntry.h b/mozglue/baseprofiler/core/ProfileBufferEntry.h
@@ -292,11 +292,10 @@ class UniqueStacks {
 //       "relevantForJS": 1,  /* bool */
 //       "innerWindowID": 2,  /* inner window ID of global JS `window` object */
 //       "implementation": 3, /* index into stringTable */
-//       "optimizations": 4,  /* arbitrary JSON */
-//       "line": 5,           /* number */
-//       "column": 6,         /* number */
-//       "category": 7,       /* index into profile.meta.categories */
-//       "subcategory": 8     /* index into
+//       "line": 4,           /* number */
+//       "column": 5,         /* number */
+//       "category": 6,       /* index into profile.meta.categories */
+//       "subcategory": 7     /* index into
 //       profile.meta.categories[category].subcategories */
 //     },
 //     "data":

diff --git a/mozglue/baseprofiler/core/ProfiledThreadData.cpp b/mozglue/baseprofiler/core/ProfiledThreadData.cpp
@@ -62,7 +62,6 @@ void ProfiledThreadData::StreamJSON(const ProfileBuffer& aBuffer,
         schema.WriteField("relevantForJS");
         schema.WriteField("innerWindowID");
         schema.WriteField("implementation");
-        schema.WriteField("optimizations");
         schema.WriteField("line");
         schema.WriteField("column");
         schema.WriteField("category");

diff --git a/mozglue/baseprofiler/core/platform.cpp b/mozglue/baseprofiler/core/platform.cpp
@@ -1841,7 +1841,7 @@ static void StreamMetaJSCustomObject(PSLockRef aLock,
                                      bool aIsShuttingDown) {
   MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
 
-  aWriter.IntProperty("version", 26);
+  aWriter.IntProperty("version", 27);
 
   // The "startTime" field holds the number of milliseconds since midnight
   // January 1, 1970 GMT. This grotty code computes (Now - (Now -

diff --git a/tools/profiler/core/ProfileBufferEntry.cpp b/tools/profiler/core/ProfileBufferEntry.cpp
@@ -493,11 +493,10 @@ void UniqueStacks::StreamNonJITFrame(const FrameKey& aFrame) {
     RELEVANT_FOR_JS = 1,
     INNER_WINDOW_ID = 2,
     IMPLEMENTATION = 3,
-    OPTIMIZATIONS = 4,
-    LINE = 5,
-    COLUMN = 6,
-    CATEGORY = 7,
-    SUBCATEGORY = 8
+    LINE = 4,
+    COLUMN = 5,
+    CATEGORY = 6,
+    SUBCATEGORY = 7
   };
 
   AutoArraySchemaWithStringsWriter writer(mFrameTableWriter, *mUniqueStrings);
@@ -538,11 +537,10 @@ static void StreamJITFrame(JSContext* aContext, SpliceableJSONWriter& aWriter,
     RELEVANT_FOR_JS = 1,
     INNER_WINDOW_ID = 2,
     IMPLEMENTATION = 3,
-    OPTIMIZATIONS = 4,
-    LINE = 5,
-    COLUMN = 6,
-    CATEGORY = 7,
-    SUBCATEGORY = 8
+    LINE = 4,
+    COLUMN = 5,
+    CATEGORY = 6,
+    SUBCATEGORY = 7
   };
 
   AutoArraySchemaWithStringsWriter writer(aWriter, aUniqueStrings);

diff --git a/tools/profiler/core/ProfileBufferEntry.h b/tools/profiler/core/ProfileBufferEntry.h
@@ -464,11 +464,10 @@ class UniqueStacks final : public mozilla::FailureLatch {
 //       "relevantForJS": 1,  /* bool */
 //       "innerWindowID": 2,  /* inner window ID of global JS `window` object */
 //       "implementation": 3, /* index into stringTable */
-//       "optimizations": 4,  /* arbitrary JSON */
-//       "line": 5,           /* number */
-//       "column": 6,         /* number */
-//       "category": 7,       /* index into profile.meta.categories */
-//       "subcategory": 8     /* index into
+//       "line": 4,           /* number */
+//       "column": 5,         /* number */
+//       "category": 6,       /* index into profile.meta.categories */
+//       "subcategory": 7     /* index into
 //       profile.meta.categories[category].subcategories */
 //     },
 //     "data":

diff --git a/tools/profiler/core/ProfiledThreadData.cpp b/tools/profiler/core/ProfiledThreadData.cpp
@@ -66,7 +66,6 @@ static void StreamTables(UniqueStacks&& aUniqueStacks, JSContext* aCx,
       schema.WriteField("relevantForJS");
       schema.WriteField("innerWindowID");
       schema.WriteField("implementation");
-      schema.WriteField("optimizations");
       schema.WriteField("line");
       schema.WriteField("column");
       schema.WriteField("category");

diff --git a/tools/profiler/core/platform.cpp b/tools/profiler/core/platform.cpp
@@ -2810,7 +2810,7 @@ static void StreamMetaJSCustomObject(
     const PreRecordedMetaInformation& aPreRecordedMetaInformation) {
   MOZ_RELEASE_ASSERT(CorePS::Exists() && ActivePS::Exists(aLock));
 
-  aWriter.IntProperty("version", 26);
+  aWriter.IntProperty("version", 27);
 
   // The "startTime" field holds the number of milliseconds since midnight
   // January 1, 1970 GMT. This grotty code computes (Now - (Now -