ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-29 16:20:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

Browse Source
This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/contrib/performance/electron-browser/perfviewEditor.ts
View File

@@ -177,10 +177,10 @@ class PerfModelContentProvider implements ITextModelContentProvider {
if (!times) {
continue;
}
if (times.startup) {
eager.push([id, times.startup, times.codeLoadingTime, times.activateCallTime, times.activateResolvedTime, times.activationEvent]);
if (times.activationReason.startup) {
eager.push([id, times.activationReason.startup, times.codeLoadingTime, times.activateCallTime, times.activateResolvedTime, times.activationReason.activationEvent, times.activationReason.extensionId.value]);
} else {
normal.push([id, times.startup, times.codeLoadingTime, times.activateCallTime, times.activateResolvedTime, times.activationEvent]);
normal.push([id, times.activationReason.startup, times.codeLoadingTime, times.activateCallTime, times.activateResolvedTime, times.activationReason.activationEvent, times.activationReason.extensionId.value]);
}
}
@@ -188,7 +188,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
if (table.length > 0) {
md.heading(2, 'Extension Activation Stats');
md.table(
['Extension', 'Eager', 'Load Code', 'Call Activate', 'Finish Activate', 'Event'],
['Extension', 'Eager', 'Load Code', 'Call Activate', 'Finish Activate', 'Event', 'By'],
table
);
}

6
src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts
View File

@@ -11,7 +11,6 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import product from 'vs/platform/product/common/product';
import { IWindowsService } from 'vs/platform/windows/common/windows';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { PerfviewInput } from 'vs/workbench/contrib/performance/electron-browser/perfviewEditor';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
@@ -23,7 +22,6 @@ import { IElectronService } from 'vs/platform/electron/node/electron';
export class StartupProfiler implements IWorkbenchContribution {
constructor(
@IWindowsService private readonly _windowsService: IWindowsService,
@IDialogService private readonly _dialogService: IDialogService,
@IEnvironmentService private readonly _environmentService: IEnvironmentService,
@ITextModelService private readonly _textModelResolverService: ITextModelService,
@@ -95,13 +93,13 @@ export class StartupProfiler implements IWorkbenchContribution {
secondaryButton: undefined
}).then(() => {
// now we are ready to restart
this._windowsService.relaunch({ removeArgs });
this._electronService.relaunch({ removeArgs });
});
});
} else {
// simply restart
this._windowsService.relaunch({ removeArgs });
this._electronService.relaunch({ removeArgs });
}
});
});

8
src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts
View File

@@ -13,7 +13,7 @@ import { ILifecycleService, StartupKind } from 'vs/platform/lifecycle/common/lif
import product from 'vs/platform/product/common/product';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IUpdateService } from 'vs/platform/update/common/update';
import { IWindowsService } from 'vs/platform/windows/common/windows';
import { IElectronService } from 'vs/platform/electron/node/electron';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import * as files from 'vs/workbench/contrib/files/common/files';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -27,7 +27,7 @@ export class StartupTimings implements IWorkbenchContribution {
constructor(
@ITimerService private readonly _timerService: ITimerService,
@IWindowsService private readonly _windowsService: IWindowsService,
@IElectronService private readonly _electronService: IElectronService,
@IEditorService private readonly _editorService: IEditorService,
@IViewletService private readonly _viewletService: IViewletService,
@IPanelService private readonly _panelService: IPanelService,
@@ -76,10 +76,10 @@ export class StartupTimings implements IWorkbenchContribution {
]).then(([startupMetrics]) => {
return promisify(appendFile)(appendTo, `${startupMetrics.ellapsed}\t${product.nameShort}\t${(product.commit || '').slice(0, 10) || '0000000000'}\t${sessionId}\t${isStandardStartup ? 'standard_start' : 'NO_standard_start'}\n`);
}).then(() => {
this._windowsService.quit();
this._electronService.quit();
}).catch(err => {
console.error(err);
this._windowsService.quit();
this._electronService.quit();
});
}