perf - wait for dom ready when waiting for services

microsoft · Apr 8, 2021 · c14109e · c14109e
1 parent 61dacc2
commit c14109e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
@@ -79,10 +79,9 @@ class BrowserMain extends Disposable {
 	}
 
 	async open(): Promise<IWorkbench> {
-		const services = await this.initServices();
 
-		await domContentLoaded();
-		mark('code/willStartWorkbench');
+		// Init services and wait for DOM to be ready in parallel
+		const [services] = await Promise.all([this.initServices(), domContentLoaded()]);
 
 		// Create Workbench
 		const workbench = new Workbench(this.domElement, services.serviceCollection, services.logService);

diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts
@@ -58,6 +58,9 @@ export class Workbench extends Layout {
 	) {
 		super(parent);
 
+		// Perf: measure workbench startup time
+		mark('code/willStartWorkbench');
+
 		this.registerErrorHandler(logService);
 	}
 
@@ -424,7 +427,7 @@ export class Workbench extends Layout {
 				this._register(runWhenIdle(() => lifecycleService.phase = LifecyclePhase.Eventually, 2500));
 			}, 2500);
 
-			// Telemetry: startup metrics
+			// Perf: signal workbench started
 			mark('code/didStartWorkbench');
 
 			// Perf reporting (devtools)

diff --git a/src/vs/workbench/electron-sandbox/shared.desktop.main.ts b/src/vs/workbench/electron-sandbox/shared.desktop.main.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { zoomLevelToZoomFactor } from 'vs/platform/windows/common/windows';
-import { mark } from 'vs/base/common/performance';
 import { Workbench } from 'vs/workbench/browser/workbench';
 import { NativeWindow } from 'vs/workbench/electron-sandbox/window';
 import { setZoomLevel, setZoomFactor, setFullscreen } from 'vs/base/browser/browser';
@@ -99,10 +98,9 @@ export abstract class SharedDesktopMain extends Disposable {
 	}
 
 	async open(): Promise<void> {
-		const services = await this.initServices();
 
-		await domContentLoaded();
-		mark('code/willStartWorkbench');
+		// Init services and wait for DOM to be ready in parallel
+		const [services] = await Promise.all([this.initServices(), domContentLoaded()]);
 
 		// Create Workbench
 		const workbench = new Workbench(document.body, services.serviceCollection, services.logService);