development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 13:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-enable process unresponsive checking

Browse source
This commit is contained in:
Daniel Imms 2021-03-06 19:11:02 -08:00
parent 5cc1775bbf
commit 74532eb261
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/platform/terminal/node/ptyHostService.ts
View file

@ -139,9 +139,9 @@ export class PtyHostService extends Disposable implements IPtyService {
}
async createProcess(shellLaunchConfig: IShellLaunchConfig, cwd: string, cols: number, rows: number, env: IProcessEnvironment, executableEnv: IProcessEnvironment, windowsEnableConpty: boolean, shouldPersist: boolean, workspaceId: string, workspaceName: string): Promise<number> {
// const timeout = setTimeout(() => this._handleUnresponsiveCreateProcess(), HeartbeatConstants.CreateProcessTimeout);
const timeout = setTimeout(() => this._handleUnresponsiveCreateProcess(), HeartbeatConstants.CreateProcessTimeout);
const id = await this._proxy.createProcess(shellLaunchConfig, cwd, cols, rows, env, executableEnv, windowsEnableConpty, shouldPersist, workspaceId, workspaceName);
// clearTimeout(timeout);
clearTimeout(timeout);
lastPtyId = Math.max(lastPtyId, id);
return id;
}
@ -220,11 +220,11 @@ export class PtyHostService extends Disposable implements IPtyService {
this._onPtyHostUnresponsive.fire();
}
// private _handleUnresponsiveCreateProcess() {
// this._clearHeartbeatTimeouts();
// this._logService.error(`No ptyHost response to createProcess after ${HeartbeatConstants.CreateProcessTimeout / 1000} seconds`);
// this._onPtyHostUnresponsive.fire();
// }
private _handleUnresponsiveCreateProcess() {
this._clearHeartbeatTimeouts();
this._logService.error(`No ptyHost response to createProcess after ${HeartbeatConstants.CreateProcessTimeout / 1000} seconds`);
this._onPtyHostUnresponsive.fire();
}
private _clearHeartbeatTimeouts() {
if (this._heartbeatFirstTimeout) {