diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 2a272aad57d..b170929a193 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -679,26 +679,7 @@ export class IssueReporter extends Disposable { private updateProcessInfo = (state) => { const target = document.querySelector('.block-process .block-info'); - - let tableHtml = ` - - pid - CPU % - Memory (MB) - Name - `; - - state.processInfo.forEach(p => { - tableHtml += ` - - ${p.pid} - ${p.cpu} - ${p.memory} - ${p.name} - `; - }); - - target.innerHTML = `${tableHtml}
`; + target.innerHTML = `${state.processInfo}`; } private updateWorkspaceInfo = (state) => { diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts index 13488d6630b..a6ec8153424 100644 --- a/src/vs/code/electron-browser/issue/issueReporterModel.ts +++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts @@ -144,20 +144,15 @@ ${this.getInfos()} } private generateProcessInfoMd(): string { - let md = `
+ return `
Process Info -|pid|CPU|Memory (MB)|Name| -|---|---|---|---| +\`\`\` +${this._data.processInfo} +\`\`\` + +
`; - - this._data.processInfo.forEach(p => { - md += `|${p.pid}|${p.cpu}|${p.memory}|${p.name}|\n`; - }); - - md += '\n
'; - - return md; } private generateWorkspaceInfoMd(): string { diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index 9dbd37e3230..5b88384e8ad 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -52,9 +52,9 @@ export default (): string => ` -
+
 						
-					
+
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css index 9a91f4a0582..a4ea6ea8057 100644 --- a/src/vs/code/electron-browser/issue/media/issueReporter.css +++ b/src/vs/code/electron-browser/issue/media/issueReporter.css @@ -126,7 +126,7 @@ body { overflow-wrap: break-word; } pre { - margin: 0; + margin: 10px 20px; } pre code { font-family: 'Menlo', 'Courier New', 'Courier', monospace; diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index 20101529482..8de2d49423c 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -39,7 +39,7 @@ export interface ProcessInfo { } export interface PerformanceInfo { - processInfo?: ProcessInfo[]; + processInfo?: string; workspaceInfo?: string; } @@ -78,7 +78,7 @@ export function getPerformanceInfo(info: IMainProcessInfo): Promise(); - info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title)); - - const processes: ProcessInfo[] = []; - - if (rootProcess) { - getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0); - } - - return processes; -} - -function getProcessItem(mapPidToWindowTitle: Map, processes: ProcessInfo[], item: ProcessItem, indent: number): void { - const isRoot = (indent === 0); - - const MB = 1024 * 1024; - - // Format name with indent - let name: string; - if (isRoot) { - name = `${product.applicationName} main`; - } else { - name = `${repeat('--', indent)} ${item.name}`; - - if (item.name === 'window') { - name = `${name} (${mapPidToWindowTitle.get(item.pid)})`; - } - } - const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100)); - processes.push({ - cpu: Number(item.load.toFixed(0)), - memory: Number((memory / MB).toFixed(0)), - pid: Number((item.pid).toFixed(0)), - name - }); - - // Recurse into children if any - if (Array.isArray(item.children)) { - item.children.forEach(child => getProcessItem(mapPidToWindowTitle, processes, child, indent + 1)); - } -} - function formatEnvironment(info: IMainProcessInfo): string { const MB = 1024 * 1024; const GB = 1024 * MB;