Add a mechanism to help collecting performance profile while initiali…

…zation process #3097
piroor · Feb 12, 2025 · 4e6f8cd · 4e6f8cd
1 parent 464fe78
commit 4e6f8cd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/webextensions/background/background.js b/webextensions/background/background.js
@@ -12,6 +12,7 @@ import {
   wait,
   configs,
   sanitizeForHTMLText,
+  waitUntilStartupOperationsUnblocked,
 } from '/common/common.js';
 import * as ApiTabs from '/common/api-tabs.js';
 import * as Constants from '/common/constants.js';
@@ -107,7 +108,7 @@ export async function init() {
       promisedWindows = getAllWindows();
     }),
     ContextualIdentities.init(),
-    configs.$loaded
+    configs.$loaded.then(waitUntilStartupOperationsUnblocked),
   ]));
   MetricsData.add('init: prepare');
   EventListenerManager.debug = configs.debug;

diff --git a/webextensions/common/common.js b/webextensions/common/common.js
@@ -11,6 +11,7 @@ import EventListenerManager from '/extlib/EventListenerManager.js';
 import * as Constants from './constants.js';
 
 export const DEVICE_SPECIFIC_CONFIG_KEYS = mapAndFilter(`
+  blockStartupOperations
   chunkedSyncDataLocal0
   chunkedSyncDataLocal1
   chunkedSyncDataLocal2
@@ -553,6 +554,7 @@ export const configs = new Configs({
 
 
   debug:     false,
+  blockStartupOperations: false, // to collect performance profile around the initialization process
   runTestsParameters: '',
   syncEnabled: true,
   APIEnabled: true,
@@ -1216,6 +1218,23 @@ export function isFirefoxViewTab(tab) {
 }
 
 
+export function waitUntilStartupOperationsUnblocked() {
+  if (!configs.blockStartupOperations)
+    return;
+
+  return new Promise((resolve, _reject) => {
+    const waitUntilUblocked = key => {
+      if (key != 'blockStartupOperations' ||
+          configs[key])
+        return;
+      configs.$removeObserver(waitUntilUblocked);
+      resolve();
+    };
+    configs.$addObserver(waitUntilUblocked);
+  });
+}
+
+
 export function isLinux() {
   return configs.enableLinuxBehaviors || /^Linux/i.test(navigator.platform);
 }

diff --git a/webextensions/sidebar/sidebar.js b/webextensions/sidebar/sidebar.js
@@ -18,6 +18,7 @@ import {
   isMacOS,
   isRTL,
   notify,
+  waitUntilStartupOperationsUnblocked,
 } from '/common/common.js';
 import * as ApiTabs from '/common/api-tabs.js';
 import * as Bookmark from '/common/bookmark.js';
@@ -193,7 +194,7 @@ export async function init() {
 
       return tabs;
     }),
-    configs.$loaded
+    configs.$loaded.then(waitUntilStartupOperationsUnblocked),
   ]);
   MetricsData.add('browser.tabs.query finish, configs are loaded.');
   EventListenerManager.debug = configs.debug;