maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared process - further delay spawning

Browse source
This commit is contained in:
Benjamin Pasero 2021-02-24 17:12:33 +01:00
parent 20503c4da9
commit fc61668a51
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/vs/platform/ipc/electron-sandbox/sharedProcessService.ts → src/vs/workbench/services/ipc/electron-sandbox/sharedProcessService.ts
View file

@ -13,6 +13,9 @@ import { ILogService } from 'vs/platform/log/common/log';
import { Disposable } from 'vs/base/common/lifecycle';
import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
import { mark } from 'vs/base/common/performance';
import { ILifecycleService, LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { timeout } from 'vs/base/common/async';
export class SharedProcessService extends Disposable implements ISharedProcessService {
@ -22,7 +25,8 @@ export class SharedProcessService extends Disposable implements ISharedProcessSe
constructor(
@INativeHostService private readonly nativeHostService: INativeHostService,
@ILogService private readonly logService: ILogService
@ILogService private readonly logService: ILogService,
@ILifecycleService private readonly lifecycleService: ILifecycleService
) {
super();
@ -31,6 +35,17 @@ export class SharedProcessService extends Disposable implements ISharedProcessSe
private async connect(): Promise<MessagePortClient> {
this.logService.trace('Renderer->SharedProcess#connect');
// Our performance tests show that a connection to the shared
// process can have significant overhead to the startup time
// of the window because the shared process could be created
// as a result. As such, make sure we await the `Restored`
// phase before making a connection attempt, but also add a
// timeout to be safe against possible deadlocks.
// TODO@bpasero revisit this when the shared process connection
// is more cruicial.
await Promise.race([this.lifecycleService.when(LifecyclePhase.Restored), timeout(2000)]);
mark('code/willConnectSharedProcess');
// Ask to create message channel inside the window
@ -58,3 +73,5 @@ export class SharedProcessService extends Disposable implements ISharedProcessSe
this.withSharedProcessConnection.then(connection => connection.registerChannel(channelName, channel));
}
}
registerSingleton(ISharedProcessService, SharedProcessService, true);

4
src/vs/workbench/workbench.sandbox.main.ts
View file

@ -59,6 +59,7 @@ import 'vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService'
import 'vs/workbench/services/userDataSync/electron-sandbox/userDataSyncAccountService';
import 'vs/workbench/services/userDataSync/electron-sandbox/userDataSyncStoreManagementService';
import 'vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService';
import 'vs/workbench/services/ipc/electron-sandbox/sharedProcessService';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { ITimerService } from 'vs/workbench/services/timer/browser/timerService';
@ -66,13 +67,10 @@ import { TimerService } from 'vs/workbench/services/timer/electron-sandbox/timer
import { IUserDataInitializationService, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit';
import { IUserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
import { UserDataAutoSyncEnablementService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
import { ISharedProcessService } from 'vs/platform/ipc/electron-sandbox/services';
import { SharedProcessService } from 'vs/platform/ipc/electron-sandbox/sharedProcessService';
registerSingleton(ITimerService, TimerService);
registerSingleton(IUserDataInitializationService, UserDataInitializationService);
registerSingleton(IUserDataAutoSyncEnablementService, UserDataAutoSyncEnablementService);
registerSingleton(ISharedProcessService, SharedProcessService, true);
//#endregion