Backed out 4 changesets (bug 1833104, bug 1831406) for causing failur…

…es in browser_startup_mainthreadio.js CLOSED TREE Backed out changeset 536375224eb1 (bug 1831406) Backed out changeset 3558266c434f (bug 1831406) Backed out changeset 0385612c48c5 (bug 1831406) Backed out changeset 256aac2b8a71 (bug 1833104)
iaxat · May 15, 2023 · 1dcd470 · 1dcd470
1 parent 5e348fb
commit 1dcd470
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 57 deletions.
diff --git a/browser/base/content/test/performance/browser_startup_mainthreadio.js b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -271,15 +271,6 @@ const startupPhases = {
       condition: WIN,
       stat: 1,
     },
-    {
-      // bug 1833104 has context - this is artifact-only so doesn't affect
-      // any real users, will just show up for developer builds and
-      // artifact trypushes so we include it here.
-      path: "GreD:jogfile.json",
-      condition:
-        WIN && Services.prefs.getBoolPref("telemetry.fog.artifact_build"),
-      stat: 1,
-    },
   ],
 
   // We reach this phase right after showing the first browser window.
@@ -398,34 +389,6 @@ const startupPhases = {
       condition: LINUX,
       close: 1,
     },
-    {
-      path: "XREAppFeat:[email protected]",
-      condition: !WIN,
-      ignoreIfUnused: true,
-      stat: 1,
-      close: 1,
-    },
-    {
-      // Bug 1660582 - access while running on windows10 hardware.
-      path: "ProfD:wmfvpxvideo.guard",
-      condition: WIN,
-      ignoreIfUnused: true,
-      stat: 1,
-      close: 1,
-    },
-    {
-      // Bug 1649590
-      path: "ProfD:extensions",
-      ignoreIfUnused: true,
-      condition: WIN,
-      stat: 1,
-    },
-  ],
-
-  // Things that are expected to be completely out of the startup path
-  // and loaded lazily when used for the first time by the user should
-  // be listed here.
-  "before becoming idle": [
     {
       // bug 1370516 - NSS should be initialized off main thread.
       path: `ProfD:cert9.db`,
@@ -455,45 +418,59 @@ const startupPhases = {
       // bug 1370516 - NSS should be initialized off main thread.
       path: `ProfD:key4.db`,
       condition: WIN,
-      read: 10,
+      read: 8,
       stat: AppConstants.NIGHTLY_BUILD ? 5 : 4,
     },
     {
       // bug 1370516 - NSS should be initialized off main thread.
       path: `ProfD:key4.db-journal`,
       condition: WIN,
-      stat: 7,
+      stat: 5,
     },
     {
       // bug 1370516 - NSS should be initialized off main thread.
       path: `ProfD:key4.db-wal`,
       condition: WIN,
-      stat: 7,
+      stat: 5,
     },
     {
-      path: "XREAppFeat:[email protected]",
+      path: "XREAppFeat:[email protected]",
+      condition: !WIN,
       ignoreIfUnused: true,
+      stat: 1,
       close: 1,
     },
     {
-      path: "XREAppFeat:[email protected]",
+      // Bug 1660582 - access while running on windows10 hardware.
+      path: "ProfD:wmfvpxvideo.guard",
+      condition: WIN,
       ignoreIfUnused: true,
       stat: 1,
       close: 1,
     },
     {
-      // bug 1833110, utility process instantiation due to JS ORB validator.
-      path: "*ld.so.conf*",
-      condition:
-        LINUX &&
-        !AppConstants.MOZ_CODE_COVERAGE &&
-        Services.prefs.getBoolPref(
-          "browser.opaqueResponseBlocking.javascriptValidator"
-        ),
-      read: 14,
-      /* Whether this happens before or after idle is racy: */
+      // Bug 1649590
+      path: "ProfD:extensions",
       ignoreIfUnused: true,
-      close: 7,
+      condition: WIN,
+      stat: 1,
+    },
+  ],
+
+  // Things that are expected to be completely out of the startup path
+  // and loaded lazily when used for the first time by the user should
+  // be listed here.
+  "before becoming idle": [
+    {
+      path: "XREAppFeat:[email protected]",
+      ignoreIfUnused: true,
+      close: 1,
+    },
+    {
+      path: "XREAppFeat:[email protected]",
+      ignoreIfUnused: true,
+      stat: 1,
+      close: 1,
     },
     {
       // bug 1391590
@@ -563,6 +540,16 @@ const startupPhases = {
       stat: 4,
       write: 1300,
     },
+    {
+      path: `ProfD:key4.db-journal`,
+      condition: WIN,
+      stat: 2,
+    },
+    {
+      path: `ProfD:key4.db-wal`,
+      condition: WIN,
+      stat: 2,
+    },
     {
       path: "ProfD:",
       condition: WIN,

diff --git a/browser/base/content/test/performance/io/browser.ini b/browser/base/content/test/performance/io/browser.ini
@@ -25,8 +25,9 @@ environment =
   MOZ_PROFILER_STARTUP_ENTRIES=10000000
 [../browser_startup_content_mainthreadio.js]
 [../browser_startup_mainthreadio.js]
-skip-if =
-  apple_silicon # bug 1707724
-  socketprocess_networking
-  os == "win" && bits == 32
+skip-if = true # bug 1831406 covers re-enabling this
+# skip-if =
+#   apple_silicon  # bug 1707724
+#   socketprocess_networking
+#  os = "win" && bits == 32
 [../browser_startup_syncIPC.js]