From 93eb4a8b7b7ce791ad0badc097054d981b8f7b6f Mon Sep 17 00:00:00 2001 From: danghongquan Date: Mon, 18 Dec 2023 16:24:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: danghongquan --- .../trace/component/chart/SpAllAppStartups.ts | 84 +++++++------------ 1 file changed, 29 insertions(+), 55 deletions(-) diff --git a/ide/src/trace/component/chart/SpAllAppStartups.ts b/ide/src/trace/component/chart/SpAllAppStartups.ts index d3c356780..b6076adbc 100644 --- a/ide/src/trace/component/chart/SpAllAppStartups.ts +++ b/ide/src/trace/component/chart/SpAllAppStartups.ts @@ -17,7 +17,11 @@ import { SpSystemTrace } from '../SpSystemTrace'; import { TraceRow } from '../trace/base/TraceRow'; import { renders } from '../../database/ui-worker/ProcedureWorker'; import { CpuFreqStruct } from '../../database/ui-worker/ProcedureWorkerFreq'; -import { queryAppStartupProcessIds, queryProcessStartup, querySingleAppStartupsName } from '../../database/SqlLite'; +import { + queryAppStartupProcessIds, + queryProcessStartup, + querySingleAppStartupsName, +} from '../../database/SqlLite'; import { FlagsConfig } from '../SpFlags'; import { AllAppStartupStruct, AllAppStartupRender } from '../../database/ui-worker/ProcedureWorkerAllAppStartup'; @@ -26,7 +30,7 @@ export class SpAllAppStartupsChart { static APP_STARTUP_PID_ARR: Array = []; static jsonRow: TraceRow | undefined; static trace: SpSystemTrace; - static AllAppStartupsNameArr: string[] = []; + static AllAppStartupsNameArr: any[] = []; static allAppStartupsAva: number[] = []; constructor(trace: SpSystemTrace) { @@ -36,9 +40,6 @@ export class SpAllAppStartupsChart { - constructor(trace: SpSystemTrace) { - SpAllAppStartupsChart.trace = trace; - } async init() { SpAllAppStartupsChart.APP_STARTUP_PID_ARR = []; @@ -57,9 +58,6 @@ export class SpAllAppStartupsChart { let loadAppStartup: boolean = FlagsConfig.getFlagsConfigEnableStatus('AppStartup'); if (loadAppStartup && SpAllAppStartupsChart.allAppStartupsAva.length) await this.initFolder(); } - let loadAppStartup: boolean = FlagsConfig.getFlagsConfigEnableStatus('AppStartup'); - if (loadAppStartup && SpAllAppStartupsChart.allAppStartupsAva.length) await this.initFolder(); - } async initFolder() { let row: TraceRow = TraceRow.skeleton(); @@ -71,9 +69,8 @@ export class SpAllAppStartupsChart { row.folder = false; row.style.height = '40px'; row.name = `All App Startups`; - row.addTemplateTypes('AppStartup'); - row.favoriteChangeHandler = SpAllAppStartupsChart.trace.favoriteChangeHandler; row.selectChangeHandler = SpAllAppStartupsChart.trace.selectChangeHandler; + row.favoriteChangeHandler = SpAllAppStartupsChart.trace.favoriteChangeHandler; row.supplier = async (): Promise> => { let sendRes: AllAppStartupStruct[] | PromiseLike = []; for (let i = 0; i < SpAllAppStartupsChart.allAppStartupsAva.length; i++) { @@ -118,50 +115,27 @@ export class SpAllAppStartupsChart { } ) } - }); - } else if (tmpResArr.length === 1) { - minStartTs = tmpResArr[0].startTs; - singleDur = tmpResArr[0].dur; + return sendRes } - sendRes.push({ - dur: singleDur, - value: undefined, - startTs: minStartTs, - pid: SpAllAppStartupsChart.allAppStartupsAva[i], - process: undefined, - itid: undefined, - endItid: undefined, - tid: SpAllAppStartupsChart.allAppStartupsAva[i], - startName: undefined, - stepName: SpAllAppStartupsChart.AllAppStartupsNameArr[i], - translateY: undefined, - frame: undefined, - isHover: false, - }); - } - return sendRes; - }; - row.onThreadHandler = (useCache): void => { - let context: CanvasRenderingContext2D; - if (row.currentContext) { - context = row.currentContext; - } else { - context = row.collect - ? SpAllAppStartupsChart.trace.canvasFavoritePanelCtx! - : SpAllAppStartupsChart.trace.canvasPanelCtx!; - } - row.canvasSave(context); - (renders['all-app-start-up'] as AllAppStartupRender).renderMainThread( - { - appStartupContext: context, - useCache: useCache, - type: `app-startup ${row.rowId}`, - }, - row - ); - row.canvasRestore(context); - }; - SpAllAppStartupsChart.trace.rowsEL?.appendChild(row); - } -} + row.onThreadHandler = (useCache): void => { + let context: CanvasRenderingContext2D; + if (row.currentContext) { + context = row.currentContext; + } else { + context = row.collect ? SpAllAppStartupsChart.trace.canvasFavoritePanelCtx! : SpAllAppStartupsChart.trace.canvasPanelCtx!; + } + row.canvasSave(context); + (renders['all-app-start-up'] as AllAppStartupRender).renderMainThread( + { + appStartupContext: context, + useCache: useCache, + type: `app-startup ${row.rowId}`, + }, + row + ); + row.canvasRestore(context); + }; + SpAllAppStartupsChart.trace.rowsEL?.appendChild(row); + } +} \ No newline at end of file -- Gitee From 4c77a5c916775bd4080dc9e6f5c8c8346f847cc9 Mon Sep 17 00:00:00 2001 From: danghongquan Date: Mon, 18 Dec 2023 17:15:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: danghongquan --- ide/src/trace/component/chart/SpAllAppStartups.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ide/src/trace/component/chart/SpAllAppStartups.ts b/ide/src/trace/component/chart/SpAllAppStartups.ts index b6076adbc..37e0ff5f5 100644 --- a/ide/src/trace/component/chart/SpAllAppStartups.ts +++ b/ide/src/trace/component/chart/SpAllAppStartups.ts @@ -69,6 +69,7 @@ export class SpAllAppStartupsChart { row.folder = false; row.style.height = '40px'; row.name = `All App Startups`; + row.addTemplateTypes('AppStartup'); row.selectChangeHandler = SpAllAppStartupsChart.trace.selectChangeHandler; row.favoriteChangeHandler = SpAllAppStartupsChart.trace.favoriteChangeHandler; row.supplier = async (): Promise> => { -- Gitee