From 9a436b55dd0af1fc5c9d4d2322df544d07b9b3a1 Mon Sep 17 00:00:00 2001 From: liufei Date: Wed, 4 Sep 2024 15:11:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:0904=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liufei --- ide/src/base-ui/select/LitSelectV.ts | 3 ++- ide/src/trace/component/SpSystemTrace.ts | 2 +- .../trace/component/chart/SpProcessChart.ts | 6 +++--- .../trace/sheet/frequsage/TabPaneFreqUsage.ts | 20 +++++++++---------- .../trace/sheet/process/TabPaneSliceChild.ts | 2 +- .../ProcedureLogicWorkerSchedulingAnalysis.ts | 16 +++++++++++++-- ide/src/trace/database/sql/Func.sql.ts | 2 +- .../database/ui-worker/ProcedureWorkerHang.ts | 9 ++++++--- 8 files changed, 38 insertions(+), 22 deletions(-) diff --git a/ide/src/base-ui/select/LitSelectV.ts b/ide/src/base-ui/select/LitSelectV.ts index a6d2e5cd..b88b8c86 100644 --- a/ide/src/base-ui/select/LitSelectV.ts +++ b/ide/src/base-ui/select/LitSelectV.ts @@ -302,7 +302,8 @@ export class LitSelectV extends BaseElement { this.shadowRoot?.querySelectorAll('lit-select-option').forEach((o) => { o.removeAttribute('selected'); }); - option.setAttribute('selected', ''); // @ts-ignore + option.setAttribute('selected', ''); + //@ts-ignore this.selectVInputEl!.value = option.textContent!; this.currentvalueStr = option.textContent!; }); diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 5d1c75c9..8445cf3b 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -2309,7 +2309,7 @@ export class SpSystemTrace extends BaseElement { return dataList; } - showStruct(previous: boolean, currentIndex: number, structs: Array, retargetIndex?: number): number { + showStruct(previous: boolean, currentIndex: number, structs: Array, retargetIndex?: number): number { let tagIndex = spSystemTraceShowStruct(this, previous, currentIndex, structs, retargetIndex); return tagIndex === -1 ? currentIndex : tagIndex; } diff --git a/ide/src/trace/component/chart/SpProcessChart.ts b/ide/src/trace/component/chart/SpProcessChart.ts index 4ac0f5cc..9a5ea115 100644 --- a/ide/src/trace/component/chart/SpProcessChart.ts +++ b/ide/src/trace/component/chart/SpProcessChart.ts @@ -883,7 +883,7 @@ export class SpProcessChart { if (data.pid === thread.tid) { let hangsRow = TraceRow.skeleton(); hangsRow.rowType = TraceRow.ROW_TYPE_HANG_INNER; - hangsRow.rowId = `${data.processName ?? 'Process'} ${data.pid}` + hangsRow.rowId = `${data.processName ?? 'Process'} ${data.pid}`; hangsRow.rowParentId = `${data.pid}`; hangsRow.rowHidden = !processRow.expansion; hangsRow.style.width = '100%'; @@ -1387,7 +1387,7 @@ export class SpProcessChart { let param: Array = aggregateData[key]; //@ts-ignore this.makeAddAsyncFunction(param, it, processRow, key); - }) + }); //@ts-ignore Reflect.ownKeys(asyncCat).map((key: unknown) => { //@ts-ignore @@ -1399,7 +1399,7 @@ export class SpProcessChart { //@ts-ignore this.makeAddAsyncFunction(param, it, processRow, key, param[0].tid); } - }) + }); } else { //不聚合异步trace let asyncFuncGroup = Utils.groupBy(asyncFuncList, 'funName'); diff --git a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts index f5ba6087..ee8402c3 100644 --- a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts +++ b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts @@ -224,21 +224,21 @@ export class TabPaneFreqUsage extends BaseElement { i--; continue; } - if (arr[i].thread?.indexOf("P") !== -1) { + if (arr[i].thread?.indexOf('P') !== -1) { trackId = Number(arr[i].thread?.slice(1)!); - arr[i].thread = `${Utils.getInstance().getProcessMap(traceId).get(trackId) || "Process"} ${trackId}`; - } else if (arr[i].thread === "summary data") { + arr[i].thread = `${Utils.getInstance().getProcessMap(traceId).get(trackId) || 'Process'} ${trackId}`; + } else if (arr[i].thread === 'summary data') { } else { - trackId = Number(arr[i].thread!.split("_")[1]); - arr[i].thread = `${Utils.getInstance().getThreadMap(traceId).get(trackId) || "Thread"} ${trackId}`; + trackId = Number(arr[i].thread!.split('_')[1]); + arr[i].thread = `${Utils.getInstance().getThreadMap(traceId).get(trackId) || 'Thread'} ${trackId}`; } if (arr[i].cpu < 0) { // @ts-ignore - arr[i].cpu = ""; + arr[i].cpu = ''; } // @ts-ignore if (arr[i].frequency < 0) { - arr[i].frequency = ""; + arr[i].frequency = ''; } if (!arr[i].cpuload) { // @ts-ignore @@ -255,9 +255,9 @@ export class TabPaneFreqUsage extends BaseElement { arr[i].consumption = (arr[i].consumption / CONS_MUTIPLE).toFixed(MIN_FREQ); // @ts-ignore arr[i].consumpower = (arr[i].consumpower / TIME_MUTIPLE).toFixed(MIN_FREQ); - if (arr[i].frequency !== "") { - if (arr[i].frequency === "unknown") { - arr[i].frequency = "unknown"; + if (arr[i].frequency !== '') { + if (arr[i].frequency === 'unknown') { + arr[i].frequency = 'unknown'; } else { arr[i].frequency = arr[i].frequency; } diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts index 9e7e1aaa..1e3cdfa8 100644 --- a/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts +++ b/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts @@ -23,7 +23,7 @@ import { getTabDetails, getGhDetails, getSfDetails } from '../../../../database/ @element('box-slice-child') export class TabPaneSliceChild extends BaseElement { private sliceChildTbl: LitTable | null | undefined; - private boxChildSource: Array = []; + private boxChildSource: Array = []; private sliceChildParam: { param: SliceBoxJumpParam, selection: SelectionParam } | null | undefined; set data(boxChildValue: { param: SliceBoxJumpParam, selection: SelectionParam | null | undefined }) { diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts index 2944bd58..9533835a 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts @@ -358,34 +358,46 @@ export class ProcedureLogicWorkerSchedulingAnalysis extends LogicHandler { this.queryThreadStateByTid(data.params.tid); } } - private schedulingProTop10Swicount(data: any): void { + private schedulingProTop10Swicount(data: unknown): void { + // @ts-ignore if (data.params.list) { + // @ts-ignore let arr = convertJSON(data.params.list) || []; self.postMessage({ + // @ts-ignore id: data.id, + // @ts-ignore action: data.action, results: arr, }); arr = []; } else { + // @ts-ignore if (data.params.pid) { + // @ts-ignore this.queryThrTop10Swicount(data.params.pid); } else { this.queryProTop10Swicount(); } } } - private schedulingProcessRunTime(data: any): void { + private schedulingProcessRunTime(data: unknown): void { + // @ts-ignore if (data.params.list) { + // @ts-ignore let arr = convertJSON(data.params.list) || []; self.postMessage({ + // @ts-ignore id: data.id, + // @ts-ignore action: data.action, results: arr, }); arr = []; } else { + // @ts-ignore if (data.params.pid) { + // @ts-ignore this.queryThrTop10RunTime(data.params.pid); } else { this.queryProTop10RunTime(); diff --git a/ide/src/trace/database/sql/Func.sql.ts b/ide/src/trace/database/sql/Func.sql.ts index cb1f230f..f2a47dc5 100644 --- a/ide/src/trace/database/sql/Func.sql.ts +++ b/ide/src/trace/database/sql/Func.sql.ts @@ -348,7 +348,7 @@ export const getTabSlicesAsyncFunc = ( order by wallDuration desc;`; return query('getTabSlicesAsyncFunc', sql, {}); -} +}; export const getTabDetails = ( asyncNames: Array, diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHang.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHang.ts index 74af12b2..203c80e0 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerHang.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHang.ts @@ -83,9 +83,12 @@ export class HangStruct extends BaseStruct { dur: number | undefined; tid: number | undefined; pid: number | undefined; - type: HangType | undefined; // 手动补充 按时间分类 - pname: string | undefined; // 手动补充 - content: string | undefined; // 手动补充 在tab页中需要手动解析内容 + // 手动补充 按时间分类 + type: HangType | undefined; + // 手动补充 + pname: string | undefined; + // 手动补充 在tab页中需要手动解析内容 + content: string | undefined; name: string | undefined; static getFrameColor(data: HangStruct): string { -- Gitee