From 31b104cb90a93b95c3e9c15ffbca68e9e3be12b4 Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 09:57:42 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=20feat-hisysevent=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/base-ui/select/LitAllocationSelect.ts | 2 +- ide/src/base-ui/utils/CSVFormater.ts | 2 +- ide/src/trace/SpApplication.ts | 32 +- ide/src/trace/bean/BoxSelection.ts | 2 + ide/src/trace/component/SpKeyboard.ts | 225 ------- ide/src/trace/component/SpRecordTrace.ts | 7 +- ide/src/trace/component/SpSystemTrace.ts | 17 +- .../trace/component/chart/SpChartManager.ts | 4 + ide/src/trace/component/chart/SpHiSysEvent.ts | 79 +++ .../trace/component/setting/SpHisysEvent.ts | 262 ++++---- .../setting/bean/ProfilerServiceTypes.ts | 3 +- .../trace/component/trace/base/ColorUtils.ts | 15 + .../trace/component/trace/base/TraceRow.ts | 12 + .../component/trace/base/TraceSheetConfig.ts | 12 + .../trace/sheet/cpu/TabPaneFrequencySample.ts | 2 +- .../hisysevent/TabPaneHiSysEventSummary.ts | 334 ++++++++++ .../sheet/hisysevent/TabPaneHisysEvents.ts | 569 ++++++++++++++++++ ide/src/trace/database/SqlLite.ts | 42 ++ .../database/ui-worker/ProcedureWorker.ts | 2 + .../ui-worker/ProcedureWorkerHiSysEvent.ts | 152 +++++ .../prebuilts/patch_hiperf/hiviewdfx_BUILD.gn | 2 +- 21 files changed, 1401 insertions(+), 376 deletions(-) delete mode 100644 ide/src/trace/component/SpKeyboard.ts create mode 100644 ide/src/trace/component/chart/SpHiSysEvent.ts create mode 100644 ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts create mode 100644 ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts create mode 100644 ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts diff --git a/ide/src/base-ui/select/LitAllocationSelect.ts b/ide/src/base-ui/select/LitAllocationSelect.ts index d39a5099b..53f187bde 100644 --- a/ide/src/base-ui/select/LitAllocationSelect.ts +++ b/ide/src/base-ui/select/LitAllocationSelect.ts @@ -139,7 +139,7 @@ export class LitAllocationSelect extends BaseElement { .multipleSelect{ display: flex; width: 100%; - z-index: 2999; + z-index: 98; position: relative; padding: 3px 6px; font-size: 1rem; diff --git a/ide/src/base-ui/utils/CSVFormater.ts b/ide/src/base-ui/utils/CSVFormater.ts index 349b23038..816351c26 100644 --- a/ide/src/base-ui/utils/CSVFormater.ts +++ b/ide/src/base-ui/utils/CSVFormater.ts @@ -178,7 +178,7 @@ export class JSONToCSV { let dataIndex = column.getAttribute('data-index'); let columnName = column.getAttribute('title'); if (columnName == '') { - columnName = dataIndex == 'busyTimeStr' ? 'GetBusyTime(ms)' : dataIndex; + columnName = dataIndex; } if (columnName !== ' ') { titleList.push(columnName); diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts index b44accd54..e268dadef 100644 --- a/ide/src/trace/SpApplication.ts +++ b/ide/src/trace/SpApplication.ts @@ -55,8 +55,6 @@ import './component/trace/base/CustomThemeColor.js'; import { CustomThemeColor, Theme } from './component/trace/base/CustomThemeColor.js'; import { convertPool } from './database/Convert.js'; import { LongTraceDBUtils } from './database/LongTraceDBUtils.js'; -import { SpKeyboard } from './component/SpKeyboard.js'; -import './component/SpKeyboard.js'; @element('sp-application') export class SpApplication extends BaseElement { @@ -503,10 +501,8 @@ export class SpApplication extends BaseElement { display: flex; } -
+
-
@@ -576,7 +572,6 @@ export class SpApplication extends BaseElement { let spSystemTrace = this.shadowRoot!.querySelector('#sp-system-trace'); this.spHelp = this.shadowRoot!.querySelector('#sp-help'); let spFlags = this.shadowRoot!.querySelector('#sp-flags') as SpFlags; - let SpKeyboard = this.shadowRoot!.querySelector('#sp-keyboard') as SpKeyboard; let spRecordTrace = this.shadowRoot!.querySelector('#sp-record-trace'); let spRecordTemplate = this.shadowRoot!.querySelector('#sp-record-template'); let spSchedulingAnalysis = this.shadowRoot!.querySelector( @@ -613,7 +608,6 @@ export class SpApplication extends BaseElement { this.spHelp, spRecordTemplate, spFlags, - SpKeyboard, ]; document.addEventListener('visibilitychange', function () { if (document.visibilityState === 'visible') { @@ -1448,18 +1442,6 @@ export class SpApplication extends BaseElement { showContent(spFlags); }, }, - { - title: 'Keyboard shortcuts', - icon: 'menu', - clickHandler: function (item: MenuItem) { - SpStatisticsHttpUtil.addOrdinaryVisitAction({ - event: 'Keyboard shortcuts', - action: 'Keyboard shortcuts', - }); - that.search = false; - showContent(SpKeyboard); - }, - }, ], }); if (res.status) { @@ -1871,18 +1853,6 @@ export class SpApplication extends BaseElement { }); }, }, - { - title: 'Keyboard shortcuts', - icon: 'smart-help', - clickHandler: function (item: MenuItem) { - that.search = false; - showContent(SpKeyboard); - SpStatisticsHttpUtil.addOrdinaryVisitAction({ - event: 'Keyboard shortcuts', - action: 'Keyboard shortcuts', - }); - }, - }, ], }, ]; diff --git a/ide/src/trace/bean/BoxSelection.ts b/ide/src/trace/bean/BoxSelection.ts index 60daf4f47..726974ea7 100644 --- a/ide/src/trace/bean/BoxSelection.ts +++ b/ide/src/trace/bean/BoxSelection.ts @@ -22,6 +22,7 @@ import { FrameAnimationStruct } from '../database/ui-worker/ProcedureWorkerFrame import { FrameSpacingStruct } from '../database/ui-worker/ProcedureWorkerFrameSpacing.js'; import { JsCpuProfilerChartFrame } from './JsStruct.js'; import { LogStruct } from '../database/ui-worker/ProcedureWorkerLog.js'; +import { HiSysEventStruct } from '../database/ui-worker/ProcedureWorkerHiSysEvent.js'; export class SelectionParam { recordStartNs: number = 0; @@ -107,6 +108,7 @@ export class SelectionParam { dmaVmTrackerData: Array = []; gpuMemoryTrackerData: Array = []; hiLogs: Array = []; + hiSysEvents: Array = []; } export class BoxJumpParam { diff --git a/ide/src/trace/component/SpKeyboard.ts b/ide/src/trace/component/SpKeyboard.ts deleted file mode 100644 index cbd70e359..000000000 --- a/ide/src/trace/component/SpKeyboard.ts +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { BaseElement, element } from '../../base-ui/BaseElement.js'; -@element('sp-keyboard') -export class SpKeyboard extends BaseElement{ - private bodyEl: HTMLElement | undefined | null; - initElements(): void { - let parentElement = this.parentNode as HTMLElement; - parentElement.style.overflow = 'hidden'; - this.bodyEl = this.shadowRoot?.querySelector('.body'); - let closeWindow = this.shadowRoot?.querySelector('.close-icon'); - let keyboard_div = document.querySelector('body > sp-application')!.shadowRoot!.querySelector('#sp-keyboard')!; - let welcon_div = document.querySelector('body > sp-application')!.shadowRoot!.querySelector('#sp-welcome')!; - let shadow_box = this.shadowRoot?.querySelector('.shadow-box')!; - closeWindow!.addEventListener('click',()=>{ - keyboard_div.style.visibility = 'hidden'; - welcon_div.style.visibility = 'visible'; - }) - shadow_box!.addEventListener('click',()=>{ - keyboard_div.style.visibility = 'hidden'; - welcon_div.style.visibility = 'visible'; - }) - } - initHtml(): string { - return ` - ${this.initHtmlStyle()} -
-
-
-
-

SmartPerf help

- ✕ -
-
-
-

Navigation

- - - - - - - - - -
-
w
/ -
s
- 		放大/缩小
-
a
/ -
d
- 		左移/右移
-

Mouse Controls

- - - - - - - - - - - - - - - - - -
Click点选
Click + Drag框选
Ctrl + Scroll wheel放大/缩小
Ctrl + Click + Drag拖拽左移/右移
-

Making SQL queries from the query page

- - - - - -
-
Ctrl
+ -
Enter
- 		在数据库查询界面写好查询语句后进行查询
-

Other

- - - - - - - - - - - - - - - - - - - - - - - - - -
-
f
(with event selected) - 		聚焦
-
m
(with event or area selected) - 		临时框选标记
-
Shift
+ -
m
(with event or area selected) - 		永久框选标记
-
Ctrl
+ -
,
/ -
.
- 		定位到上一个/下一个旗子标记的时间点
-
Ctrl
+ -
[
/ -
]
- 		定位到上一个/下一个用shift + m 框选的位置
-
?
- 		展示快捷方式
-
-
-
-
- `; - } - private initHtmlStyle(): string { - return ` - - `; - } - -} \ No newline at end of file diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index f8794aa04..d60747b1d 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -1682,7 +1682,7 @@ export class SpRecordTrace extends BaseElement { request.pluginConfigs.push(this.createSdkConfig()); } if (this.spHisysEvent?.startSamp) { - request.pluginConfigs.push(this.createHiSystemEventPluginConfig(this.spHisysEvent.process)); + request.pluginConfigs.push(this.createHiSystemEventPluginConfig(this.spHisysEvent.domain, this.spHisysEvent.eventName)); } if (this.spArkTs!.process != '' && this.spArkTs!.startSamp) { request.pluginConfigs.push(this.createArkTsConfig()); @@ -2310,10 +2310,11 @@ export class SpRecordTrace extends BaseElement { return fpsPlugin; } - private createHiSystemEventPluginConfig(appName: string): ProfilerPluginConfig { + private createHiSystemEventPluginConfig(domainName: string, eventName: string): ProfilerPluginConfig { let hiSystemEventConfig: HiSystemEventConfig = { msg: 'hisysevent-plugin', - processName: appName, + subscribe_domain : domainName, + subscribe_event : eventName, }; let hiSystemEventPlugin: ProfilerPluginConfig = { pluginName: 'hisysevent-plugin', diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 1aafbd7c8..a67844b2f 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -103,7 +103,7 @@ import { TabPaneCounterSample } from './trace/sheet/cpu/TabPaneCounterSample.js' import { LitSearch } from './trace/search/Search.js'; import { TabPaneFlag } from './trace/timer-shaft/TabPaneFlag.js'; import { LitTabpane } from '../../base-ui/tabs/lit-tabpane.js'; -import {SpKeyboard} from '../component/SpKeyboard.js' +import { HiSysEventStruct } from '../database/ui-worker/ProcedureWorkerHiSysEvent.js'; function dpr() { return window.devicePixelRatio || 1; @@ -1226,6 +1226,13 @@ export class SpSystemTrace extends BaseElement { selection.hiLogs.push(...batch); currentIndex += batchSize; } + } else if (it.rowType === TraceRow.ROW_TYPE_HI_SYSEVENT) { + let systemEvents: HiSysEventStruct[] = it.dataList.filter( + (systemEventStruct: HiSysEventStruct) => + (systemEventStruct.ts ?? 0) >= TraceRow.rangeSelectObject!.startNS! && + (systemEventStruct.ts ?? 0) <= TraceRow.rangeSelectObject!.endNS! + ); + selection.hiSysEvents.push(...systemEvents); } if (this.rangeTraceRow!.length !== rows.length) { let event = this.createPointEvent(it); @@ -2003,14 +2010,6 @@ export class SpSystemTrace extends BaseElement { }; documentOnKeyUp = (ev: KeyboardEvent) => { - if(ev.key.toLocaleLowerCase() === '?'){ - document.querySelector('body > sp-application')!.shadowRoot!.querySelector('#sp-keyboard')!.style.visibility = 'visible'; - } - if(ev.key.toLocaleLowerCase() === 'escape'){ - document.querySelector('body > sp-application')!.shadowRoot!.querySelector('#sp-keyboard')!.style.visibility = 'hidden'; - document.querySelector('body > sp-application')!.shadowRoot!.querySelector('#sp-welcome')!.style.visibility = 'visible'; - - } if (!this.loadTraceCompleted) return; let keyPress = ev.key.toLocaleLowerCase(); if (keyPress === 'w' || keyPress === 'a' || keyPress === 's' || keyPress === 'd') { diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index 122a11805..dafe1e73d 100644 --- a/ide/src/trace/component/chart/SpChartManager.ts +++ b/ide/src/trace/component/chart/SpChartManager.ts @@ -48,6 +48,7 @@ import { SpArkTsChart } from './SpArkTsChart.js'; import { MemoryConfig } from '../../bean/MemoryConfig.js'; import { FlagsConfig } from '../SpFlags.js'; import { SpLogChart } from './SpLogChart.js'; +import { SpHiSysEvent } from './SpHiSysEvent.js'; export class SpChartManager { static APP_STARTUP_PID_ARR: Array = []; @@ -70,6 +71,7 @@ export class SpChartManager { frameTimeChart: SpFrameTimeChart; public arkTsChart: SpArkTsChart; private logChart: SpLogChart; + private spHiSysEvent: SpHiSysEvent; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -90,6 +92,7 @@ export class SpChartManager { this.frameTimeChart = new SpFrameTimeChart(trace); this.arkTsChart = new SpArkTsChart(trace); this.logChart = new SpLogChart(trace); + this.spHiSysEvent = new SpHiSysEvent(trace); } async init(progress: Function) { @@ -128,6 +131,7 @@ export class SpChartManager { progress('cpu freq', 80); await this.freq.init(); await this.logChart.init(); + await this.spHiSysEvent.init(); progress('Clock init', 82); await this.clockChart.init(); progress('Irq init', 84); diff --git a/ide/src/trace/component/chart/SpHiSysEvent.ts b/ide/src/trace/component/chart/SpHiSysEvent.ts new file mode 100644 index 000000000..1c735f7b7 --- /dev/null +++ b/ide/src/trace/component/chart/SpHiSysEvent.ts @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +import { SpSystemTrace } from '../SpSystemTrace.js'; +import { TraceRow } from '../trace/base/TraceRow.js'; +import { renders } from '../../database/ui-worker/ProcedureWorker.js'; +import { HiSysEventRender, HiSysEventStruct } from '../../database/ui-worker/ProcedureWorkerHiSysEvent.js'; +import { queryHiSysEventData } from '../../database/SqlLite.js'; + +export class SpHiSysEvent { + private trace: SpSystemTrace; + + constructor(trace: SpSystemTrace) { + this.trace = trace; + } + + async init(): Promise { + let hiSysEventData = await queryHiSysEventData(); + if (hiSysEventData.length === 0) { + return; + } + let eventRow = await this.initRow(hiSysEventData); + this.trace.rowsEL?.appendChild(eventRow); + } + async initRow(hiSysEventData: HiSysEventStruct[]): Promise> { + let unitIndex: number = 1; + let unitHeight: number = 20; + let maxHeight: number = (Math.max(...hiSysEventData.map((it) => it.depth || 0)) + unitIndex) * unitHeight; + let hiSysEventRow = TraceRow.skeleton(); + hiSysEventRow.rowParentId = ''; + hiSysEventRow.rowId = 'Hisysevent'; + hiSysEventRow.rowType = TraceRow.ROW_TYPE_HI_SYSEVENT; + hiSysEventRow.name = 'Hisysevent'; + hiSysEventRow.style.width = '100%'; + hiSysEventRow.style.height = `${maxHeight}px`; + hiSysEventRow.setAttribute('height', `${maxHeight}`); + hiSysEventRow.setAttribute('children', ''); + hiSysEventRow.dataList = hiSysEventData; + hiSysEventRow.supplier = (): Promise => + new Promise((resolve): void => { + resolve(hiSysEventData); + }); + hiSysEventRow.addTemplateTypes('Hisysevent'); + hiSysEventRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + hiSysEventRow.selectChangeHandler = this.trace.selectChangeHandler; + hiSysEventRow.onThreadHandler = (useCache: boolean): void => { + let context: CanvasRenderingContext2D; + if (hiSysEventRow.currentContext) { + context = hiSysEventRow.currentContext; + } else { + context = hiSysEventRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + hiSysEventRow!.canvasSave(context); + (renders.hiSysEvent as HiSysEventRender).renderMainThread( + { + context: context, + useCache: useCache, + type: 'hisys_event', + }, + hiSysEventRow! + ); + hiSysEventRow!.canvasRestore(context); + }; + return hiSysEventRow; + } +} \ No newline at end of file diff --git a/ide/src/trace/component/setting/SpHisysEvent.ts b/ide/src/trace/component/setting/SpHisysEvent.ts index e6e0f4e82..0bd437b5b 100644 --- a/ide/src/trace/component/setting/SpHisysEvent.ts +++ b/ide/src/trace/component/setting/SpHisysEvent.ts @@ -16,32 +16,45 @@ import { BaseElement, element } from '../../../base-ui/BaseElement.js'; import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js'; import '../../../base-ui/select/LitAllocationSelect.js'; - import '../../../base-ui/switch/lit-switch.js'; -import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; import { SpRecordTrace } from '../SpRecordTrace.js'; -import { Cmd } from '../../../command/Cmd.js'; -import { CmdConstant } from '../../../command/CmdConstant.js'; import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js'; +import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; @element('sp-hisys-event') export class SpHisysEvent extends BaseElement { - private eventProcessInput: LitAllocationSelect | undefined | null; - private selectProcess: HTMLInputElement | undefined | null; + private domainInputEL: LitAllocationSelect | undefined | null; + private eventNameInputEL: LitAllocationSelect | undefined | null; + private sysEventConfigList: NodeListOf | undefined | null; + private sysEventSwitch: LitSwitch | undefined | null; + private domainInputEl: HTMLInputElement | undefined | null; + private nameInputEl: HTMLInputElement | undefined | null; + private eventConfig: unknown = {}; set startSamp(start: boolean) { if (start) { this.setAttribute('startSamp', ''); + this.domainInputEL!.removeAttribute('readonly'); + this.eventNameInputEL!.removeAttribute('readonly'); } else { this.removeAttribute('startSamp'); - let eventInput = this.eventProcessInput?.shadowRoot?.querySelector('#singleInput'); - eventInput!.value = ''; + this.domainInputEL!.setAttribute('readonly', 'readonly'); + this.eventNameInputEL!.setAttribute('readonly', 'readonly'); + this.domainInputEL!.value = ''; + this.eventNameInputEL!.value = ''; } } - get process(): string { - if (this.eventProcessInput!.value.length > 0) { - return this.eventProcessInput!.value; + get domain(): string { + if (this.domainInputEL!.value.length > 0 && this.domainInputEL!.value !== 'ALL-Domain') { + return this.domainInputEL!.value; + } + return ''; + } + + get eventName(): string { + if (this.eventNameInputEL!.value.length > 0) { + return this.eventNameInputEL!.value; } return ''; } @@ -50,85 +63,128 @@ export class SpHisysEvent extends BaseElement { return this.hasAttribute('startSamp'); } + get sysEventConfigPath(): string { + return '/system/etc/hiview/hisysevent.def'; + } + initElements(): void { - let hisysEventSwitch = this.shadowRoot?.querySelector('lit-switch') as LitSwitch; - hisysEventSwitch.addEventListener('change', (event: CustomEventInit) => { + this.domainInputEL = this.shadowRoot?.querySelector('.record-domain-input'); + this.eventNameInputEL = this.shadowRoot?.querySelector('.record-event-input'); + this.sysEventConfigList = this.shadowRoot?.querySelectorAll('.record-input'); + this.sysEventSwitch = this.shadowRoot?.querySelector('lit-switch') as LitSwitch; + this.sysEventSwitch?.addEventListener('change', (event: CustomEventInit) => { let detail = event.detail; - if (detail!.checked) { - this.startSamp = true; - this.unDisable(); - } else { - this.startSamp = false; - this.disable(); - } + this.startSamp = detail!.checked; + this.updateDisable(detail!.checked); }); - this.eventProcessInput = this.shadowRoot?.querySelector('lit-allocation-select'); - let hisyEventProcessInput = this.eventProcessInput?.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; - this.selectProcess = this.eventProcessInput!.shadowRoot?.querySelector('input') as HTMLInputElement; - hisyEventProcessInput!.addEventListener('mousedown', (ev) => { - if (SpRecordTrace.serialNumber === '') { - this.eventProcessInput!.processData = []; - this.eventProcessInput!.initData(); - } + this.updateDisable(false); + this.domainInputEl = this.domainInputEL?.shadowRoot?.querySelector('.multipleSelect') as HTMLInputElement; + this.nameInputEl = this.eventNameInputEL?.shadowRoot?.querySelector('.multipleSelect') as HTMLInputElement; + this.domainInputEl.addEventListener('valuable', () => { + this.eventNameInputEL!.value = ''; }); - hisyEventProcessInput!.addEventListener('mouseup', () => { - if (SpRecordTrace.serialNumber === '') { - this.eventProcessInput!.processData = []; - this.eventProcessInput!.initData(); - } else { - Cmd.getProcess().then((processList) => { - this.eventProcessInput!.processData = processList; - this.eventProcessInput!.initData(); - }); - } - }); - this.disable(); } - private unDisable(): void { - let hisysEventConfigVals = this.shadowRoot?.querySelectorAll('.config'); - hisysEventConfigVals!.forEach((hisysEventConfigVal) => { - hisysEventConfigVal.removeAttribute('disabled'); - }); + connectedCallback(): void { + super.connectedCallback(); + this.domainInputEl?.addEventListener('mousedown', this.domainInputEvent); + this.nameInputEl?.addEventListener('mousedown', this.nameInputEvent); } - private disable(): void { - let hisysEventConfigVals = this.shadowRoot?.querySelectorAll('.config'); - hisysEventConfigVals!.forEach((hisysEventConfigVal) => { - if (hisysEventConfigVal.title !== 'Start Hisystem Event Tracker Record') { - hisysEventConfigVal.setAttribute('disabled', ''); + disconnectedCallback(): void { + super.disconnectedCallback(); + this.domainInputEl?.removeEventListener('mousedown', this.domainInputEvent); + this.nameInputEl?.removeEventListener('mousedown', this.nameInputEvent); + } + + domainInputEvent = (): void => { + if (SpRecordTrace.serialNumber === '') { + this.domainInputEL!.processData = []; + this.domainInputEL!.initData(); + } else { + HdcDeviceManager.fileRecv(this.sysEventConfigPath, () => { + }).then((pullRes) => { + pullRes.arrayBuffer().then((buffer) => { + if (buffer.byteLength > 0) { + let dec = new TextDecoder(); + this.eventConfig = JSON.parse(dec.decode(buffer)); + let domainList = Object.keys(this.eventConfig!); + if (domainList.length > 0 && this.startSamp) { + this.domainInputEl!.setAttribute('readonly', 'readonly'); + domainList.unshift('ALL-Domain'); + } + this.domainInputEL!.processData = domainList; + this.domainInputEL!.initData(); + } + }); + }); + } + }; + + nameInputEvent = (): void => { + if (SpRecordTrace.serialNumber === '') { + this.eventNameInputEL!.processData = []; + this.eventNameInputEL!.initData(); + } else { + let domain = this.domainInputEL?.value; + // @ts-ignore + let eventConfigElement = this.eventConfig[domain]; + if (eventConfigElement) { + let eventNameList = Object.keys(eventConfigElement); + if (eventNameList?.length > 0 && this.startSamp) { + this.nameInputEl!.setAttribute('readonly', 'readonly'); + this.eventNameInputEL!.processData = eventNameList; + this.eventNameInputEL!.initData(); + } + } else { + this.eventNameInputEL!.value = ''; + this.eventNameInputEL!.processData = []; + this.eventNameInputEL!.initData(); + } + } + }; + + private updateDisable(isDisable: boolean): void { + this.sysEventConfigList!.forEach((configEL) => { + if (isDisable) { + configEL.removeAttribute('disabled'); + } else { + configEL.setAttribute('disabled', ''); } }); } - initHtml(): string { + private getCssStyle(): string { return ` `; + } - .event-input { - border: 1px solid var(--dark-background5,#ccc); - font-family: Helvetica; - font-size: 14px; - color: var(--dark-color1,#212121); - text-align: left; - line-height: 20px; - font-weight: 400; - } - + initHtml(): string { + return ` + ${this.getCssStyle()}
-
+
Start Hisystem Event Tracker Record
-
+
+
+ Domain + Record Domain Name +
+ + +
+
- AppName - Record AppName + EventName + Record Event Name
- + +
`; diff --git a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts index 21d8430d2..e6f458fd2 100644 --- a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts +++ b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts @@ -911,7 +911,8 @@ export interface HiperfPluginConfig { export interface HiSystemEventConfig { msg: string; - processName: string; + subscribe_domain: string; + subscribe_event: string; } export interface ArkTSConfig { diff --git a/ide/src/trace/component/trace/base/ColorUtils.ts b/ide/src/trace/component/trace/base/ColorUtils.ts index fe7cea2de..c3c75ef11 100644 --- a/ide/src/trace/component/trace/base/ColorUtils.ts +++ b/ide/src/trace/component/trace/base/ColorUtils.ts @@ -116,6 +116,21 @@ export class ColorUtils { return logColor; } + public static getHisysEventColor(level: string): string { + let eventColor: string = '#00000'; + switch (level) { + case 'MINOR': + eventColor = '#000000'; + break; + case 'CRITICAL': + eventColor = '#FF4040'; + break; + default: + break; + } + return eventColor; + } + public static hash(str: string, max: number): number { let colorA: number = 0x811c9dc5; let colorB: number = 0xfffffff; diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index 5852e6472..d454bfbda 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -119,6 +119,7 @@ export class TraceRow extends HTMLElement { static FRAME_WIDTH: number = 0; static range: TimeRange | undefined | null; static rangeSelectObject: RangeSelectStruct | undefined; + static ROW_TYPE_HI_SYSEVENT = 'hi-sysevent'; public obj: TraceRowObject | undefined | null; isHover: boolean = false; hoverX: number = 0; @@ -291,6 +292,10 @@ export class TraceRow extends HTMLElement { this.rowSettingTree!.treeData = value || []; } + set rowSettingMultiple(value: boolean) { + this.rowSettingTree!.multiple = value; + } + get rowSettingList(): TreeItemData[] | null | undefined { return this._rowSettingList; } @@ -696,6 +701,13 @@ export class TraceRow extends HTMLElement { this.rowSettingTree!.onChange = (e: any): void => { // @ts-ignore this.rowSettingPop!.visible = false; + if (this.rowSettingTree?.multiple) { + // @ts-ignore + this.rowSettingPop!.visible = true; + } else { + // @ts-ignore + this.rowSettingPop!.visible = false; + } this.onRowSettingChangeHandler?.(this.rowSettingTree!.getCheckdKeys(), this.rowSettingTree!.getCheckdNodes()); }; this.checkType = '-1'; diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts index 7b2f793a2..323b686c8 100644 --- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts +++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts @@ -120,6 +120,8 @@ import { TabPaneGpuResourceVmTracker } from '../sheet/vmtracker/TabPaneGpuResour import { TabPaneGpuGraph } from '../sheet/gpu/TabPaneGraph.js'; import { TabPaneFreqUsage } from '../sheet/frequsage/TabPaneFreqUsage.js'; import { TabPaneFreqDataCut } from '../sheet/frequsage/TabPaneFreqDataCut.js'; +import { TabPaneHisysEvents } from '../sheet/hisysevent/TabPaneHisysEvents.js'; +import { TabPaneHiSysEventSummary } from '../sheet/hisysevent/TabPaneHiSysEventSummary.js'; export let tabConfig: any = { 'current-selection': { @@ -638,4 +640,14 @@ export let tabConfig: any = { type: TabPaneFreqDataCut, require: (param: SelectionParam) => param.threadIds.length > 0 && param.threadIds.length < 2, }, + 'tab-hisysevents': { + title: 'HiSysevents', + type: TabPaneHisysEvents, + require: (param: SelectionParam) => param.hiSysEvents.length > 0, + }, + 'tab-hisysevents-summary': { + title: 'Statistics', + type: TabPaneHiSysEventSummary, + require: (param: SelectionParam) => param.hiSysEvents.length > 0, + }, }; diff --git a/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts b/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts index 44069d6cf..2306d1da1 100644 --- a/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts +++ b/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts @@ -322,7 +322,7 @@ export class TabPaneFrequencySample extends BaseElement { - + `; diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts new file mode 100644 index 000000000..8e891e002 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts @@ -0,0 +1,334 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { LitIcon } from '../../../../../base-ui/icon/LitIcon.js'; +import { HiSysEventStruct } from '../../../../database/ui-worker/ProcedureWorkerHiSysEvent.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { ColorUtils } from '../../base/ColorUtils.js'; + +@element('tab-hi-sysevent-summary') +export class TabPaneHiSysEventSummary extends BaseElement { + private summarySource: Array = []; + private eventSummaryTable: HTMLDivElement | undefined | null; + private summaryTable: LitTable | undefined | null; + private eventTreeNodes: HiSysEventTreeNode[] = []; + private expansionDiv: HTMLDivElement | undefined | null; + private expansionUpIcon: LitIcon | undefined | null; + private expansionDownIcon: LitIcon | undefined | null; + private expandedNodeList: Set = new Set(); + private selectTreeDepth: number = 0; + private currentSelection: SelectionParam | undefined; + + set data(systemEventParam: SelectionParam) { + if (systemEventParam === this.currentSelection) { + return; + } + this.currentSelection = systemEventParam; + this.summarySource = []; + this.expandedNodeList.clear(); + this.expansionUpIcon!.name = 'up'; + this.expansionDownIcon!.name = 'down'; + this.eventSummaryTable!.innerHTML = ''; + this.summaryTable!.recycleDataSource = []; + this.summarySource = systemEventParam.hiSysEvents; + if (this.summarySource?.length !== 0 && systemEventParam) { + this.refreshRowNodeTable(); + } + } + + initElements(): void { + this.eventSummaryTable = this.shadowRoot?.querySelector('#tab-summary'); + this.summaryTable = this.shadowRoot?.querySelector('#tb-event-summary'); + this.expansionDiv = this.shadowRoot?.querySelector('.expansion-div'); + this.expansionUpIcon = this.shadowRoot?.querySelector('.expansion-up-icon'); + this.expansionDownIcon = this.shadowRoot?.querySelector('.expansion-down-icon'); + let summaryTreeLevel: string[] = ['Level', '/Domain', '/EventName']; + this.shadowRoot?.querySelectorAll('.head-label').forEach((summaryTreeHead) => { + summaryTreeHead.addEventListener('click', () => { + this.selectTreeDepth = summaryTreeLevel.indexOf(summaryTreeHead.textContent!); + this.expandedNodeList.clear(); + this.refreshSelectDepth(this.eventTreeNodes); + this.refreshRowNodeTable(true); + }); + }); + this.eventSummaryTable?.addEventListener('scroll', ()=>{ + let treeTableEl = this.shadowRoot?.querySelector('.event-tree-table'); + if (treeTableEl) { + treeTableEl.scrollTop = this.eventSummaryTable?.scrollTop || 0; + } + }); + } + + initHtml(): string { + return ` +
+
+
+ + +
+ + + +
+ +
+
+ + `; + } + + connectedCallback(): void { + super.connectedCallback(); + new ResizeObserver(() => { + this.parentElement!.style.overflow = 'hidden'; + this.refreshRowNodeTable(); + }).observe(this.parentElement!); + this.expansionDiv?.addEventListener('click', this.expansionClickEvent); + } + + disconnectedCallback(): void { + super.disconnectedCallback(); + this.expansionDiv?.removeEventListener('click', this.expansionClickEvent); + } + + expansionClickEvent = (): void => { + this.expandedNodeList.clear(); + if (this.expansionUpIcon?.name === 'down') { + this.selectTreeDepth = 0; + this.expansionUpIcon!.name = 'up'; + this.expansionDownIcon!.name = 'down'; + } else { + this.selectTreeDepth = 2; + this.expansionUpIcon!.name = 'down'; + this.expansionDownIcon!.name = 'up'; + } + this.refreshSelectDepth(this.eventTreeNodes); + this.refreshRowNodeTable(true); + }; + + private refreshSelectDepth(eventTreeNodes: HiSysEventTreeNode[]): void { + eventTreeNodes.forEach((item) => { + if (item.depth < this.selectTreeDepth) { + this.expandedNodeList.add(item.id); + if (item.children.length > 0) { + this.refreshSelectDepth(item.children); + } + } + }); + } + private createRowNodeTableEL(rowNodeList: HiSysEventTreeNode[], tableTreeEl: HTMLDivElement, + tableCountEl: HTMLDivElement, rowColor: string = ''): void{ + let unitPadding: number = 20; + let leftPadding: number = 5; + rowNodeList.forEach((rowNode) => { + let tableRowEl: HTMLElement = document.createElement('tr'); + tableRowEl.className = 'tree-row-tr'; + tableRowEl.title = rowNode.summaryName!; + let tdEl: HTMLElement = document.createElement('td'); + tdEl.style.paddingLeft = `${rowNode.depth * unitPadding + leftPadding}px`; + tableRowEl.appendChild(tdEl); + this.addToggleIconEl(rowNode, tableRowEl); + let rowNodeTextEL: HTMLElement = document.createElement('td'); + rowNodeTextEL.textContent = rowNode.summaryName!; + rowNodeTextEL.className = 'row-name-td'; + tableRowEl.appendChild(rowNodeTextEL); + tableTreeEl.appendChild(tableRowEl); + let tableCountRowEl: HTMLElement = document.createElement('tr'); + let countEL: HTMLElement = document.createElement('td'); + countEL.textContent = rowNode.count.toString(); + countEL.className = 'count-column-td'; + if (rowNode.depth === 0) { + rowNodeTextEL.style.color = ColorUtils.getHisysEventColor(rowNode.summaryName!); + countEL.style.color = ColorUtils.getHisysEventColor(rowNode.summaryName!); + } else { + rowNodeTextEL.style.color = rowColor; + countEL.style.color = rowColor; + } + tableCountRowEl.appendChild(countEL); + tableCountEl.appendChild(tableCountRowEl); + if (rowNode.children && this.expandedNodeList.has(rowNode.id)) { + this.createRowNodeTableEL(rowNode.children, tableTreeEl, tableCountEl, countEL.style.color); + } + }); + } + + private addToggleIconEl(rowNode: HiSysEventTreeNode, tableRowEl: HTMLElement): void { + let toggleIconEl: HTMLElement = document.createElement('td'); + let expandIcon = document.createElement('lit-icon'); + expandIcon.classList.add('tree-icon'); + if (rowNode.children && rowNode.children.length > 0) { + toggleIconEl.appendChild(expandIcon); + // @ts-ignore + expandIcon.name = this.expandedNodeList.has(rowNode.id) ? 'minus-square' : 'plus-square'; + toggleIconEl.classList.add('expand-icon'); + toggleIconEl.addEventListener('click', () => { + let scrollTop = this.eventSummaryTable?.scrollTop ?? 0; + this.changeNode(rowNode.id); + this.eventSummaryTable!.scrollTop = scrollTop; + }); + } + tableRowEl.appendChild(toggleIconEl); + } + + private changeNode(currentNode: number): void { + if (this.expandedNodeList.has(currentNode)) { + this.expandedNodeList['delete'](currentNode); + } else { + this.expandedNodeList.add(currentNode); + } + this.refreshRowNodeTable(); + } + + private refreshRowNodeTable(useCacheRefresh: boolean = false): void { + this.eventSummaryTable!.innerHTML = ''; + if (this.eventSummaryTable && this.parentElement) { + this.eventSummaryTable.style.height = `${this.parentElement.clientHeight - 30}px`; + } + if (!useCacheRefresh) { + this.eventTreeNodes = this.buildTreeTblNodes(this.summarySource); + if (this.eventTreeNodes.length > 0) { + this.summaryTable!.recycleDataSource = this.eventTreeNodes; + } else { + this.summaryTable!.recycleDataSource = []; + } + } + let tableFragmentEl: DocumentFragment = document.createDocumentFragment(); + let tableTreeEl: HTMLDivElement = document.createElement('div'); + tableTreeEl.className = 'event-tree-table'; + let tableCountEl: HTMLDivElement = document.createElement('div'); + if (this.parentElement) { + tableTreeEl.style.height = `${this.parentElement!.clientHeight - 40}px`; + } + this.createRowNodeTableEL(this.eventTreeNodes, tableTreeEl, tableCountEl, ''); + const emptyTr = document.createElement('tr'); + emptyTr.className = 'tree-row-tr'; + tableTreeEl?.appendChild(emptyTr); + const emptyCountTr = document.createElement('tr'); + emptyCountTr.className = 'tree-row-tr'; + tableCountEl?.appendChild(emptyCountTr); + tableFragmentEl.appendChild(tableTreeEl); + tableFragmentEl.appendChild(tableCountEl); + this.eventSummaryTable!.appendChild(tableFragmentEl); + } + + private buildTreeTblNodes(eventTreeNodes: HiSysEventStruct[]): HiSysEventTreeNode[] { + let id = 0; + let root: HiSysEventTreeNode = { id: id, depth: 0, children: [], summaryName: 'All', count: 0 }; + eventTreeNodes.forEach((item) => { + id++; + let levelNode = root.children.find((node) => node.summaryName === item.level); + if (levelNode) { + levelNode.count++; + } else { + id++; + levelNode = { id: id, depth: 0, children: [], summaryName: item.level, count: 1 }; + root.children.push(levelNode); + } + let domainNode = levelNode.children.find((node) => node.summaryName === item.domain); + if (domainNode) { + domainNode.count++; + } else { + id++; + domainNode = { id: id, depth: 1, children: [], summaryName: item.domain, count: 1 }; + levelNode.children.push(domainNode); + } + let eventNameNode = domainNode.children.find((node) => node.summaryName === item.eventName); + if (eventNameNode) { + eventNameNode.count++; + } else { + id++; + eventNameNode = { id: id, depth: 2, children: [], summaryName: item.eventName, count: 1 }; + domainNode.children.push(eventNameNode); + } + root.count++; + }); + return root.children.sort((leftData, rightData) => { + return leftData.summaryName!.length - rightData.summaryName!.length; + }); + } +} + +export interface HiSysEventTreeNode { + id: number; + depth: number; + children: HiSysEventTreeNode[]; + summaryName: string | undefined; + count: number; +} diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts new file mode 100644 index 000000000..d98870349 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts @@ -0,0 +1,569 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { HiSysEventStruct } from '../../../../database/ui-worker/ProcedureWorkerHiSysEvent.js'; +import { ns2x, Rect } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { LitPageTable } from '../../../../../base-ui/table/LitPageTable.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { LitSlicerTrack } from '../../../../../base-ui/slicer/lit-slicer.js'; +import { TraceRow } from '../../base/TraceRow.js'; +import { Flag } from '../../timer-shaft/Flag.js'; +import { TraceSheet } from '../../base/TraceSheet.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { ColorUtils } from '../../base/ColorUtils.js'; +import { queryRealTime } from '../../../../database/SqlLite.js'; + +@element('tab-hisysevents') +export class TabPaneHisysEvents extends BaseElement { + private hisysEventSource: Array = []; + private filterDataList: HiSysEventStruct[] = []; + private hiSysEventTable: LitPageTable | undefined | null; + private currentSelection: SelectionParam | undefined; + private domainFilterInput: HTMLInputElement | undefined | null; + private eventNameFilterInput: HTMLInputElement | undefined | null; + private levelFilter: HTMLSelectElement | undefined | null; + private contentFilterInput: HTMLInputElement | undefined | null; + private domainTag: Set = new Set(); + private domainTagDiv: HTMLDivElement | undefined | null; + private eventNameTag: Set = new Set(); + private eventNameTagDiv: HTMLDivElement | undefined | null; + private traceSheetEl: TraceSheet | undefined | null; + private spSystemTrace: SpSystemTrace | undefined | null; + private detailsTbl: LitTable | null | undefined; + private boxDetails: HTMLDivElement | null | undefined; + private slicerTrack: LitSlicerTrack | null | undefined; + private tableElement: HTMLDivElement | undefined | null; + private detailbox: HTMLDivElement | null | undefined; + private changeInput: HTMLInputElement | null | undefined; + private currentDetailList: Array<{ key: string, value: string }> = []; + private realTime: number = 0; + private baseTime: string = ''; + + set data(systemEventParam: SelectionParam) { + if (systemEventParam === this.currentSelection) { + return; + } + if (this.hiSysEventTable) { + this.hiSysEventTable.recycleDataSource = []; + } + this.initTabSheetEl(); + queryRealTime().then((result) => { + if (result && result.length > 0) { + this.realTime = Math.floor(result[0].ts / millisecond); + } + this.currentSelection = systemEventParam; + this.hiSysEventTable!.recycleDataSource = systemEventParam.hiSysEvents; + this.hisysEventSource = systemEventParam.hiSysEvents; + this.detailsTbl!.recycleDataSource = []; + }); + } + + initElements(): void { + this.boxDetails = this.shadowRoot?.querySelector('.box-details'); + this.hiSysEventTable = this.shadowRoot?.querySelector('#tb-hisysevent'); + this.hiSysEventTable!.getItemTextColor = (data) => { + return ColorUtils.getHisysEventColor(data.level); + }; + this.domainTagDiv = this.shadowRoot?.querySelector('#domainTagFilter'); + this.eventNameTagDiv = this.shadowRoot?.querySelector('#eventNameTagFilter'); + this.domainFilterInput = this.shadowRoot?.querySelector('#domain-filter'); + this.eventNameFilterInput = this.shadowRoot?.querySelector('#event-name-filter'); + this.levelFilter = this.shadowRoot?.querySelector('#level-filter'); + this.spSystemTrace = document.querySelector('body > sp-application') + ?.shadowRoot?.querySelector('#sp-system-trace'); + this.traceSheetEl = this.spSystemTrace!.shadowRoot?.querySelector('.trace-sheet'); + this.contentFilterInput = this.shadowRoot?.querySelector('#contents-filter'); + this.changeInput = this.shadowRoot?.querySelector('#contents-change'); + this.detailsTbl = this.shadowRoot?.querySelector('#tb-hisysevent-data'); + this.slicerTrack = this.shadowRoot?.querySelector('lit-slicer-track'); + this.detailbox = this.shadowRoot?.querySelector('.detail-content'); + this.tableElement = this.hiSysEventTable?.shadowRoot?.querySelector('.table') as HTMLDivElement; + this.hiSysEventTable!.addEventListener('row-click', (e) => { + this.changeInput!.value = ''; + // @ts-ignore + this.convertData(e.detail.data); + this.updateDetail(this.baseTime); + }); + this.hiSysEventTable!.addEventListener('row-hover', (e) => { + // @ts-ignore + let data = e.detail.data; + if (data) { + this.drawFlag(data.ts, '#999999'); + } + }); + this.hiSysEventTable!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.sortByColumn(evt.detail); + }); + this.tableElement.addEventListener('mouseout', () => { + this.traceSheetEl!.systemLogFlag = undefined; + this.spSystemTrace?.refreshCanvas(false); + }); + this.detailsTbl!.addEventListener('row-hover', (e) => { + // @ts-ignore + let data = e.detail.data; + if (data && data.key) { + if (data.key.endsWith('_TIME') || data.key.endsWith('_LATENCY')) { + this.drawFlag(data.value, '#999999'); + return; + } + } + this.traceSheetEl!.systemLogFlag = undefined; + this.spSystemTrace?.refreshCanvas(false); + }); + } + + initTabSheetEl(): void { + this.levelFilter!.selectedIndex = 0; + this.domainFilterInput!.value = ''; + this.domainTagDiv!.innerHTML = ''; + this.domainTag.clear(); + this.eventNameFilterInput!.value = ''; + this.eventNameTagDiv!.innerHTML = ''; + this.eventNameTag.clear(); + this.contentFilterInput!.value = ''; + this.boxDetails!.style.width = '100%'; + this.detailbox!.style.display = 'none'; + this.slicerTrack!.style.visibility = 'hidden'; + this.detailsTbl!.style.paddingLeft = '0px'; + } + + initHtml(): string { + return ` + +
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + + + + + +
+
`; + } + + connectedCallback(): void { + this.domainFilterInput?.addEventListener('keyup', this.domainKeyEvent); + this.eventNameFilterInput?.addEventListener('keyup', this.eventNameKeyEvent); + this.contentFilterInput?.addEventListener('input', this.filterInputEvent); + this.levelFilter?.addEventListener('change', this.filterInputEvent); + this.domainTagDiv?.addEventListener('click', this.domainDivClickEvent); + this.eventNameTagDiv?.addEventListener('click', this.eventNameDivClickEvent); + this.changeInput?.addEventListener('input', this.changeInputEvent); + new ResizeObserver(() => { + this.tableElement!.style.height = `${this.parentElement!.clientHeight - 20 - 35}px`; + this.hiSysEventTable?.reMeauseHeight(); + // @ts-ignore + this.detailsTbl?.shadowRoot?.querySelector('.table').style.height = + `${this.parentElement!.clientHeight - 20 - 35}px`; + // @ts-ignore + this.detailsTbl?.shadowRoot?.querySelector('.table').style = 'hidden'; + this.parentElement!.style.overflow = 'hidden'; + this.detailsTbl?.reMeauseHeight(); + this.updateData(); + }).observe(this.parentElement!); + } + + disconnectedCallback(): void { + super.disconnectedCallback(); + this.domainFilterInput?.removeEventListener('keyup', this.domainKeyEvent); + this.eventNameFilterInput?.removeEventListener('keyup', this.eventNameKeyEvent); + this.contentFilterInput?.removeEventListener('input', this.filterInputEvent); + this.levelFilter?.addEventListener('change', this.filterInputEvent); + this.changeInput?.addEventListener('input', this.changeInputEvent); + this.domainTagDiv?.removeEventListener('click', this.domainDivClickEvent); + this.eventNameTagDiv?.removeEventListener('click', this.eventNameDivClickEvent); + } + + filterInputEvent = (): void => { + this.updateData(); + }; + + domainDivClickEvent = (ev: Event): void => { + // @ts-ignore + let parentNode = ev.target.parentNode; + if (parentNode && this.domainTagDiv!.contains(parentNode)) { + this.domainTagDiv!.removeChild(parentNode); + this.domainTag['delete'](parentNode.textContent.trim().toLowerCase()); + } + this.updateData(); + }; + + eventNameDivClickEvent = (ev: Event): void => { + // @ts-ignore + let parentNode = ev.target.parentNode; + if (parentNode && this.eventNameTagDiv!.contains(parentNode)) { + this.eventNameTagDiv!.removeChild(parentNode); + this.eventNameTag['delete'](parentNode.textContent.trim().toLowerCase()); + } + this.updateData(); + }; + + domainKeyEvent = (e: KeyboardEvent): void => { + let domainValue = this.domainFilterInput!.value.trim(); + if (e.code === 'Enter') { + if (domainValue !== '' && !this.domainTag.has(domainValue.toLowerCase())) { + let tagElement = this.buildTag(domainValue); + this.domainTag.add(domainValue.toLowerCase()); + this.domainTagDiv!.append(tagElement); + this.domainFilterInput!.value = ''; + } + } else if (e.code === 'Backspace') { + let index = this.domainTagDiv!.childNodes.length - 1; + if (index >= 0 && domainValue === '') { + let childNode = this.domainTagDiv!.childNodes[index]; + this.domainTagDiv!.removeChild(childNode); + this.domainTag['delete'](childNode.textContent!.trim().toLowerCase()); + } + } + this.updateData(); + }; + + private buildTag(domainValue: string): HTMLDivElement { + let tagElement = document.createElement('div'); + tagElement.className = 'tagElement'; + tagElement.id = domainValue; + let tag = document.createElement('div'); + tag.className = 'tag'; + tag.innerHTML = domainValue; + let closeButton = document.createElement('lit-icon'); + closeButton.setAttribute('name', 'close-light'); + closeButton.style.color = '#FFFFFF'; + tagElement.append(tag); + tagElement.append(closeButton); + return tagElement; + } + + eventNameKeyEvent = (e: KeyboardEvent): void => { + let eventNameValue = this.eventNameFilterInput!.value.trim(); + if (e.code === 'Enter') { + if (eventNameValue !== '' && !this.eventNameTag.has(eventNameValue.toLowerCase())) { + let tagElement = this.buildTag(eventNameValue); + this.eventNameTag!.add(eventNameValue.toLowerCase()); + this.eventNameTagDiv!.append(tagElement); + this.eventNameFilterInput!.value = ''; + } + } else if (e.code === 'Backspace') { + let index = this.eventNameTagDiv!.childNodes.length - 1; + if (index >= 0 && eventNameValue === '') { + let childNode = this.eventNameTagDiv!.childNodes[index]; + this.eventNameTagDiv!.removeChild(childNode); + this.eventNameTag['delete'](childNode.textContent!.trim().toLowerCase()); + } + } + this.updateData(); + }; + + updateData(): void { + if (this.hisysEventSource.length > 0) { + this.filterDataList = this.hisysEventSource.filter((data) => this.filterData(data)); + } + if (this.filterDataList.length > 0) { + this.hiSysEventTable!.recycleDataSource = this.filterDataList; + } else { + this.hiSysEventTable!.recycleDataSource = []; + } + } + + filterData(data: HiSysEventStruct): boolean { + let level = this.levelFilter?.value; + let contentsValue = this.contentFilterInput?.value.toLowerCase() || ''; + contentsValue = contentsValue.replace(/\s/g, ''); + return ( + (level === 'ALL' || data.level! === level) && + (this.domainTag.size === 0 || this.domainTag.has(data.domain!.toLowerCase())) && + (this.eventNameTag.size === 0 || this.eventNameTag.has(data.eventName!.toLowerCase())) && + (contentsValue === '' || data.contents!.toLowerCase().replace(/\s/g, '').indexOf(contentsValue) >= 0) + ); + } + + changeInputEvent = (): void => { + const changeValue = this.changeInput!.value; + const currentValue = changeValue; + if (!/^[0-9]*$/.test(changeValue) || isNaN(Number(currentValue))) { + this.changeInput!.value = ''; + this.updateDetail(this.baseTime); + } else { + this.updateDetail(this.changeInput!.value); + } + } + + updateDetail(baseTime: string): void { + const latencySuffix = '_LATENCY'; + let detailList: Array<{ key: string, value: string }> = []; + this.currentDetailList.forEach(item => { + const latencyValue = item.key && item.key.endsWith(latencySuffix) ? item.value + Number(baseTime) : item.value; + detailList.push({ + key: item.key, + value: latencyValue + }); + }); + this.detailsTbl!.recycleDataSource = detailList; + console.log(this.detailsTbl!.recycleDataSource) + const tr = this.detailsTbl!.shadowRoot?.querySelector('.tr:nth-of-type(1)'); + if (tr) { + tr.style.fontWeight = 'bolder'; + } + } + + convertData = (data: HiSysEventStruct): void => { + this.baseTime = ''; + this.currentDetailList = [{ + key: 'key', + value: 'value'}]; + const content = JSON.parse(data.contents ?? '{}'); + if (content && typeof content === 'object') { + let isFirstTime = false; + let inputTimeTs = ''; + let keyList = Object.keys(content); + keyList.forEach(key => { + const value: string = content[key]; + let contentValue = value; + if (key.endsWith('_TIME')) { + if (this.realTime === 0) { + contentValue = ((Number(value) - this.realTime) > 0) ? String(Number(value) - this.realTime) : value; + } + if (!isNaN(Number(value))) { + let diffTime = (Number(value) - this.realTime) * millisecond; + // @ts-ignore + contentValue = String(diffTime - (window.recordStartNS || 0)); + if (!isFirstTime) { + this.baseTime = contentValue; + isFirstTime = true; + } + } + if (key === 'INPUT_TIME') { + inputTimeTs = contentValue; + } + } + this.currentDetailList.push({ + key: key, + value: contentValue + }); + }); + if (keyList.indexOf('INPUT_TIME') >= 0) { + this.baseTime = inputTimeTs; + } + } + this.changeInput!.value = `${this.baseTime}`; + this.detailsTbl!.recycleDataSource = this.currentDetailList; + this.slicerTrack!.style.visibility = 'visible'; + this.detailsTbl!.style.paddingLeft = '20px'; + this.boxDetails!.style.width = '65%'; + this.detailbox!.style.display = 'block'; + } + + sortByColumn(framesDetail: { sort: number; key: string }): void { + let compare = function (property: string, sort: number, type: string) { + return function ( + eventLeftData: HiSysEventStruct, + eventRightData: HiSysEventStruct + ): number { + let firstSortNumber: number = -1; + let SecondSortNumber: number = 1; + let thirdSortNumber: number = 2; + // @ts-ignore + let rightEventData = eventRightData[property]; + // @ts-ignore + let leftEventData = eventLeftData[property]; + if (type === 'number') { + return sort === thirdSortNumber ? + parseFloat(rightEventData) - parseFloat(leftEventData) : + parseFloat(leftEventData) - parseFloat(rightEventData); + } else { + if (rightEventData > leftEventData) { + return sort === thirdSortNumber ? SecondSortNumber : firstSortNumber; + } else { + if (rightEventData === leftEventData) { + return 0; + } else { + return sort === thirdSortNumber ? firstSortNumber : SecondSortNumber; + } + } + } + }; + }; + this.hisysEventSource.sort(compare(framesDetail.key, framesDetail.sort, 'number')); + this.hiSysEventTable!.recycleDataSource = this.hisysEventSource; + } + + drawFlag(value: number, color: string): void { + let pointX: number = ns2x( + value || 0, + TraceRow.range!.startNS, + TraceRow.range!.endNS, + TraceRow.range!.totalNS, + new Rect(0, 0, TraceRow.FRAME_WIDTH, 0) + ); + this.traceSheetEl!.systemLogFlag = new Flag(Math.floor(pointX), 0, 0, 0, value!, color, true, ''); + this.spSystemTrace?.refreshCanvas(false); + } +} +const millisecond = 1000_000; \ No newline at end of file diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index 9fdde25ff..4cb6571f0 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -89,6 +89,7 @@ import { type FrameAnimationStruct } from './ui-worker/ProcedureWorkerFrameAnima import { type SnapshotStruct } from './ui-worker/ProcedureWorkerSnapshot.js'; import { type MemoryConfig } from '../bean/MemoryConfig.js'; import { LogStruct } from './ui-worker/ProcedureWorkerLog.js'; +import { HiSysEventStruct } from './ui-worker/ProcedureWorkerHiSysEvent.js'; class DataWorkerThread extends Worker { taskMap: any = {}; @@ -5589,3 +5590,44 @@ export const queryCpuFreqFilterId = (): Promise> => name='cpu_frequency' ` ); + +export const queryRealTime = (): Promise< + Array<{ + ts: number; + value: string; + }> + > => + query( + 'queryRealTime', + `select CS.ts -TR.start_ts as ts ,clock_name + from clock_snapshot as CS ,trace_range as TR + where clock_name = 'realtime';` + ); +export const queryHiSysEventData = (): Promise> => + query( + 'queryHiSysEventData', + `SELECT S.id, + D2.data AS domain, + D.data AS eventName, + type AS eventType, + time_zone AS tz, + pid, + tid, + uid, + info, + level, + seq, + contents, + S.ts - TR.start_ts AS ts, + 1 AS dur, + CASE + WHEN level = 'MINOR' THEN + 0 + WHEN level = 'CRITICAL' THEN + 1 + END AS depth + FROM hisys_all_event AS S ,trace_range AS TR + LEFT JOIN data_dict AS D on S.event_name_id = D.id + LEFT JOIN data_dict AS D2 on S.domain_id = D2.id + ORDER BY S.ts` + ); \ No newline at end of file diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts index bfeef7d29..537f89d52 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts @@ -56,6 +56,7 @@ import { FrameSpacingRender } from './ProcedureWorkerFrameSpacing.js'; import { JsCpuProfilerRender } from './ProcedureWorkerCpuProfiler.js'; import { SnapshotRender } from './ProcedureWorkerSnapshot.js'; import { LogRender } from './ProcedureWorkerLog.js'; +import { HiSysEventRender } from './ProcedureWorkerHiSysEvent.js'; let dataList: any = {}; let dataList2: any = {}; @@ -109,6 +110,7 @@ export let renders: any = { 'js-cpu-profiler': new JsCpuProfilerRender(), snapshot: new SnapshotRender(), logs: new LogRender(), + hiSysEvent: new HiSysEventRender(), }; function match(type: string, req: RequestMessage): void { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts new file mode 100644 index 000000000..840e03bcc --- /dev/null +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { TraceRow } from '../../component/trace/base/TraceRow.js'; +import { BaseStruct, ns2x, Rect, Render } from './ProcedureWorkerCommon.js'; +import { ColorUtils } from '../../component/trace/base/ColorUtils.js'; + +export class HiSysEventRender extends Render { + renderMainThread( + req: { + useCache: boolean; + context: CanvasRenderingContext2D; + type: string; + }, + row: TraceRow + ): void { + let hiSysEventList = row.dataList; + let hiSysEventFilter = row.dataListCache; + hiSysEvent( + hiSysEventList, + hiSysEventFilter, + TraceRow.range!.startNS, + TraceRow.range!.endNS, + TraceRow.range!.totalNS, + row, + req.useCache || !TraceRow.range!.refresh + ); + req.context.beginPath(); + let find = false; + for (let re of hiSysEventFilter) { + HiSysEventStruct.draw(req.context, re); + } + if (!find && row.isHover) { + HiSysEventStruct.hoverHiSysEventStruct = undefined; + } + req.context.closePath(); + } +} + +export function hiSysEvent( + hiSysEventList: Array, + hiSysEventFilter: Array, + startNS: number, + endNS: number, + totalNS: number, + row: TraceRow, + use: boolean +): void { + if (use && hiSysEventFilter.length > 0) { + for (let i = 0, len = hiSysEventFilter.length; i < len; i++) { + let item = hiSysEventFilter[i]; + if ((item.ts || 0) + (item.dur || 0) >= startNS && (item.ts || 0) <= endNS) { + HiSysEventStruct.setSysEventFrame(item, startNS, endNS, totalNS, row.frame); + } else { + item.frame = undefined; + } + } + return; + } + hiSysEventFilter.length = 0; + if (hiSysEventList) { + for (let index = 0; index < hiSysEventList.length; index++) { + let item = hiSysEventList[index]; + if ((item.ts || 0) + (item.dur || 0) >= startNS && (item.ts || 0) <= endNS) { + HiSysEventStruct.setSysEventFrame(item, startNS, endNS, totalNS, row.frame); + if ( + index > 0 && + (hiSysEventList[index - 1].frame?.x || 0) === (item.frame?.x || 0) && + (hiSysEventList[index - 1].frame?.width || 0) === (item.frame?.width || 0) && + (hiSysEventList[index - 1].depth === item.depth) + ) { + } else { + hiSysEventFilter.push(item); + } + } + } + } +} + +export class HiSysEventStruct extends BaseStruct{ + static hoverHiSysEventStruct: HiSysEventStruct | undefined; + static selectHiSysEventStruct: HiSysEventStruct | undefined; + id: number | undefined; + domain: string | undefined; + eventName: string | undefined; + eventType: string | undefined; + ts: number | undefined; + tz: string | undefined; + pid: number | undefined; + tid: number | undefined; + uid: number | undefined; + info: string | undefined; + level: string | undefined; + seq: string | undefined; + contents: string | undefined; + dur: number | undefined; + depth: number | undefined; + static setSysEventFrame( + sysEventNode: HiSysEventStruct, + startNS: number, + endNS: number, + totalNS: number, + frame: Rect + ): void { + let x1: number, x2: number; + if ((sysEventNode.ts || 0) >= startNS && (sysEventNode.ts || 0) <= endNS) { + x1 = ns2x(sysEventNode.ts || 0, startNS, endNS, totalNS, frame); + } else { + x1 = 0; + } + if ((sysEventNode.ts || 0) + (sysEventNode.dur || 0) >= startNS && (sysEventNode.ts || 0) + + (sysEventNode.dur || 0) <= endNS) { + x2 = ns2x((sysEventNode.ts || 0) + (sysEventNode.dur || 0), startNS, endNS, totalNS, frame); + } else { + x2 = frame.width; + } + if (!sysEventNode.frame) { + sysEventNode.frame = new Rect(0, 0, 0, 0); + } + let getV: number = x2 - x1 < 1 ? 1 : x2 - x1; + sysEventNode.frame.x = Math.floor(x1); + sysEventNode.frame.y = sysEventNode.depth! * rectHeight + padding * 2; + sysEventNode.frame.width = Math.ceil(getV); + sysEventNode.frame.height = 20; + } + + static draw(ctx: CanvasRenderingContext2D, data: HiSysEventStruct): void { + if (data.depth === undefined || data.depth === null) { + return; + } + if (data.frame) { + ctx.globalAlpha = 1; + ctx.fillStyle = ColorUtils.getHisysEventColor(data.level!); + ctx.fillRect(data.frame.x, data.frame.y + padding * data.depth, data.frame.width, rectHeight); + } + } +} +const padding = 5; +const rectHeight = 10; + diff --git a/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn b/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn index 7d00cdd98..35db42cbb 100644 --- a/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn +++ b/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/ts.gni") ohos_source_set("hiviewdfx_source") { configs -= [ trace_cfg_path ] - configs += [ "${TS_DIR}/gn:hiperf_trace_cfg" ] + configs += [ "//gn:hiperf_trace_cfg" ] subsystem_name = "developtools" part_name = "smartperf_host" cflags = [ "-D ALWAYSTRUE" ] -- Gitee From 5f507e94c956073964026a965dea671a6c3569e0 Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 09:59:08 +0800 Subject: [PATCH 02/15] =?UTF-8?q?feat=E5=95=86=E7=94=A8=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E5=86=85=E5=AD=98=E8=B0=83=E4=BC=98=E5=8A=9F=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/base-ui/select/LitAllocationSelect.ts | 2 +- ide/src/base-ui/table/lit-table.ts | 34 +- ide/src/doc/md/quickstart_smaps.md | 62 + ide/src/doc/quickstart_smaps.html | 1010 ++++++++++++++++ ide/src/figures/smaps/smapschart.jpg | Bin 0 -> 45395 bytes ide/src/figures/smaps/smapsexcuting.jpg | Bin 0 -> 77444 bytes ide/src/figures/smaps/smapslist.jpg | Bin 0 -> 138713 bytes ide/src/figures/smaps/smapsrecord.jpg | Bin 0 -> 34101 bytes ide/src/figures/smaps/smapssetting.jpg | Bin 0 -> 13479 bytes ide/src/figures/smaps/smapsstatistics.jpg | Bin 0 -> 113839 bytes ide/src/figures/smaps/smapssummary.jpg | Bin 0 -> 105031 bytes ide/src/trace/bean/BoxSelection.ts | 4 +- ide/src/trace/bean/FrameChartStruct.ts | 5 + ide/src/trace/component/SpHelp.ts | 13 + ide/src/trace/component/SpRecordTrace.ts | 7 +- .../trace/component/SpRecyclerSystemTrace.ts | 788 ------------- ide/src/trace/component/SpSystemTrace.ts | 42 +- ide/src/trace/component/Utils.ts | 3 + ide/src/trace/component/chart/FrameChart.ts | 46 +- .../trace/component/chart/SpChartManager.ts | 4 - ide/src/trace/component/chart/SpHiPerf.ts | 73 +- .../component/chart/SpNativeMemoryChart.ts | 194 ++-- .../trace/component/setting/SpAllocations.ts | 36 +- .../trace/component/setting/SpHilogRecord.ts | 2 +- .../trace/component/setting/SpHisysEvent.ts | 262 ++--- .../trace/component/setting/SpProbesConfig.ts | 81 +- .../component/setting/SpRecordSetting.ts | 6 +- .../setting/bean/ProfilerServiceTypes.ts | 7 +- .../setting/utils/PluginConvertUtils.ts | 2 +- .../trace/component/trace/base/ColorUtils.ts | 15 - .../trace/component/trace/base/Extension.ts | 2 + .../trace/component/trace/base/TraceRow.ts | 12 - .../trace/component/trace/base/TraceSheet.ts | 103 +- .../component/trace/base/TraceSheetConfig.ts | 12 - ide/src/trace/component/trace/base/Utils.ts | 6 +- .../trace/component/trace/sheet/SheetUtils.ts | 18 + .../component/trace/sheet/TabPaneFilter.ts | 362 ++++-- .../sheet/ark-ts/TabPaneJsCpuStatistics.ts | 8 - .../sheet/file-system/TabPaneCallTree.ts | 80 +- .../file-system/TabPaneFileSystemCalltree.ts | 122 +- .../TabPaneFilesystemStatisticsAnalysis.ts | 758 ++++++------ .../TabPaneIOTierStatisticsAnalysis.ts | 734 +++++++----- .../TabPaneVirtualMemoryStatisticsAnalysis.ts | 753 +++++++----- .../sheet/frequsage/TabPaneFreqDataCut.ts | 857 ++++++++------ .../trace/sheet/hilog/TabPaneHiLogSummary.ts | 9 - .../trace/sheet/hilog/TabPaneHiLogs.ts | 5 +- .../trace/sheet/hiperf/TabPanePerfAnalysis.ts | 538 +++++---- .../trace/sheet/hiperf/TabPerfBottomUp.ts | 10 +- .../trace/sheet/hiperf/TabPerfProfile.ts | 120 +- .../sheet/native-memory/TabPaneNMCallTree.ts | 222 ++-- .../native-memory/TabPaneNMSampleList.ts | 67 +- .../TabPaneNMStatisticAnalysis.ts | 1021 +++++++++-------- .../sheet/native-memory/TabPaneNMStatstics.ts | 128 ++- .../sheet/native-memory/TabPaneNMemory.ts | 59 +- ide/src/trace/database/SqlLite.ts | 114 +- ide/src/trace/database/TraceWorker.ts | 6 +- .../ProcedureLogicWorkerFileSystem.ts | 143 ++- .../ProcedureLogicWorkerNativeNemory.ts | 255 ++-- .../logic-worker/ProcedureLogicWorkerPerf.ts | 330 +++--- .../database/ui-worker/ProcedureWorker.ts | 2 - .../ui-worker/ProcedureWorkerCommon.ts | 35 +- .../ui-worker/ProcedureWorkerHiPerfCPU.ts | 15 +- .../ui-worker/ProcedureWorkerHiPerfProcess.ts | 9 +- .../ui-worker/ProcedureWorkerHiPerfThread.ts | 9 +- 64 files changed, 5551 insertions(+), 4071 deletions(-) create mode 100644 ide/src/doc/md/quickstart_smaps.md create mode 100644 ide/src/doc/quickstart_smaps.html create mode 100644 ide/src/figures/smaps/smapschart.jpg create mode 100644 ide/src/figures/smaps/smapsexcuting.jpg create mode 100644 ide/src/figures/smaps/smapslist.jpg create mode 100644 ide/src/figures/smaps/smapsrecord.jpg create mode 100644 ide/src/figures/smaps/smapssetting.jpg create mode 100644 ide/src/figures/smaps/smapsstatistics.jpg create mode 100644 ide/src/figures/smaps/smapssummary.jpg delete mode 100644 ide/src/trace/component/SpRecyclerSystemTrace.ts diff --git a/ide/src/base-ui/select/LitAllocationSelect.ts b/ide/src/base-ui/select/LitAllocationSelect.ts index 53f187bde..d39a5099b 100644 --- a/ide/src/base-ui/select/LitAllocationSelect.ts +++ b/ide/src/base-ui/select/LitAllocationSelect.ts @@ -139,7 +139,7 @@ export class LitAllocationSelect extends BaseElement { .multipleSelect{ display: flex; width: 100%; - z-index: 98; + z-index: 2999; position: relative; padding: 3px 6px; font-size: 1rem; diff --git a/ide/src/base-ui/table/lit-table.ts b/ide/src/base-ui/table/lit-table.ts index 68cf01f07..3eb989daa 100644 --- a/ide/src/base-ui/table/lit-table.ts +++ b/ide/src/base-ui/table/lit-table.ts @@ -23,7 +23,6 @@ import { JSONToCSV } from '../utils/CSVFormater.js'; import { NodeType } from '../../js-heap/model/DatabaseStruct.js'; import { ConstructorType } from '../../js-heap/model/UiStruct.js'; import { LitIcon } from '../icon/LitIcon.js'; -import { JsCpuProfilerStatisticsStruct } from '../../trace/bean/JsStruct.js'; const iconWidth = 20; const iconPadding = 5; @element('lit-table') @@ -415,6 +414,7 @@ export class LitTable extends HTMLElement { } if (this.hasAttribute('tree')) { if (value.length === 0) { + this.value = []; this.recycleDs = this.meauseTreeRowElement(value); } else { if ( @@ -810,13 +810,13 @@ export class LitTable extends HTMLElement { this.dispatchEvent( new CustomEvent('button-click', { detail: { - key: key, + key: key }, - composed: true, + composed: true }) ); - event.stopPropagation(); - }); + event.stopPropagation() + }) } h.style.justifyContent = a.getAttribute('align'); this.gridTemplateColumns.push(a.getAttribute('width') || '1fr'); @@ -1318,13 +1318,7 @@ export class LitTable extends HTMLElement { td.style.whiteSpace = 'nowrap'; let text = this.formatName(dataIndex, rowData.data[dataIndex]); if (text.indexOf('<') === -1) { - if (dataIndex === 'selfTimeStr' && rowData.data.chartFrameChildren) { - td.title = rowData.data.selfTime + 'ns'; - } else if (dataIndex === 'totalTimeStr' && rowData.data.chartFrameChildren) { - td.title = rowData.data.totalTime + 'ns'; - } else { - td.title = text; - } + td.title = text; } td.dataIndex = dataIndex; td.style.justifyContent = column.getAttribute('align') || 'flex-start'; @@ -1555,11 +1549,7 @@ export class LitTable extends HTMLElement { td.style.justifyContent = column.getAttribute('align') || 'flex-start'; let text = this.formatName(dataIndex, rowData.data[dataIndex]); if (text.indexOf('<') === -1) { - if (dataIndex === 'totalTimeStr' && rowData.data.chartFrameChildren) { - td.title = rowData.data.totalTime + 'ns'; - } else { - td.title = text; - } + td.title = text; } // 如果表格中有模板的情况，将模板中的数据放进td中，没有模板，直接将文本放进td // 但是对于Current Selection tab页来说，表格前两列是时间，第三列是input标签，第四列是button标签 @@ -1824,15 +1814,7 @@ export class LitTable extends HTMLElement { (child as HTMLElement).title = text; } else { (child as HTMLElement).innerHTML = text; - if (dataIndex === 'selfTimeStr' && rowObject.data.chartFrameChildren) { - (child as HTMLElement).title = rowObject.data.selfTime + 'ns'; - } else if (dataIndex === 'totalTimeStr' && rowObject.data.chartFrameChildren) { - (child as HTMLElement).title = rowObject.data.totalTime + 'ns'; - } else if (dataIndex === 'timeStr' && rowObject.data instanceof JsCpuProfilerStatisticsStruct) { - (child as HTMLElement).title = rowObject.data.time + 'ns'; - } else { - (child as HTMLElement).title = text; - } + (child as HTMLElement).title = text; } } }); diff --git a/ide/src/doc/md/quickstart_smaps.md b/ide/src/doc/md/quickstart_smaps.md new file mode 100644 index 000000000..b0117a5db --- /dev/null +++ b/ide/src/doc/md/quickstart_smaps.md @@ -0,0 +1,62 @@ +# 进程 smaps 的抓取和展示说明 + +smaps 展示了一个进程的内存消耗。 + +## smaps 的抓取 + +### smaps 抓取配置参数 + +![GitHub Logo](../../figures/smaps/smapssetting.jpg) +配置项说明： + +- Start VM Tracker Record：配置项的总开关。 +- Process：smaps的抓取只能选择单进程抓取。 + +再点击 Record setting，在 output file path 输入文件名 hiprofiler_data_smaps.htrace，拖动滚动条设置 buffer size 大小是 64M，抓取时长是 50s。 +![GitHub Logo](../../figures/smaps/smapsrecord.jpg) +点击 Trace command，就会根据上面的配置生成抓取命令，点击 Record 抓取，抓取过程中会显示抓取时长。 +![GitHub Logo](../../figures/smaps/smapsexcuting.jpg) + +### smaps 展示说明 + +抓取结束后 smaps 的 trace 会自动加载展示。 +![GitHub Logo](../../figures/smaps/smapssummary.jpg) + +界面布局介绍：smaps 整体界面布局分为 3 个部分： + +- 红色区域：泳道图。 +- 绿色区域：详细信息。 + +### smaps 泳道图展示 + +smaps 泳道图展示当前时刻该进程的内存消耗。 +![GitHub Logo](../../figures/smaps/smapschart.jpg) + +### smaps 泳道图的框选功能 + +可以对泳道图进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有两个个 tab 页。 +VM Tracker Statistics 的 Tab 页如图： +![GitHub Logo](../../figures/smaps/smapsstatistics.jpg) + +- Type： 将抓取到的信息根据Type归类，分四类，Data，Text，Const，Other。 +- % of Res： 每行的Resident Size 占总Ressident Size的比例。 +- #Reg：统计的类型个数。 +- Path：虚拟内存块路径，类型中有多个则显示multiple。 +- Resident Size： smaps节点中Rss(Shared_Clean+Shared_Dirty+Private_Clean+Private_Dirty)。 +- Dirty Size：smaps节点中Shared_Dirty + Private_Dirty。 +- Swapped： smaps节点中Swap + SwapPss。 +- Virtual Size：smaps节点中Size。 +- Pss： smaps节点中Pss。 +- Res. %：Resident Size / Virtual Size 比值。 + VM Tracker Record List 的 Tab 页如图： + ![GitHub Logo](../../figures/smaps/smapslist.jpg) +- Type： 将抓取到的信息根据Type归类，Data，Text，Const，Other。 +- Address Range： 每段虚拟内存段的开始和结束位置。 +- Dirty Size：smaps节点中Shared_Dirty + Private_Dirty。 +- Swapper： smaps节点中Swap + SwapPss。 +- Resident Size：smaps节点中Rss(Shared_Clean+Shared_Dirty+Private_Clean+Private_Dirty)。 +- Virtual Size：smaps节点中Size。 +- Pss：smaps节点中Pss。 +- Reside： Rss / Size 比值。 +- Protection： 内存块的权限(读写执行执行)。 +- Path： 内存段路径。 diff --git a/ide/src/doc/quickstart_smaps.html b/ide/src/doc/quickstart_smaps.html new file mode 100644 index 000000000..644dda7fe --- /dev/null +++ b/ide/src/doc/quickstart_smaps.html @@ -0,0 +1,1010 @@ + + + + + quickstart_smaps + + + + + + +
+

进程smaps的抓取和展示说明

+ +

smaps展示了一个进程的内存消耗。

+

smaps的抓取

+ +

smaps抓取配置参数

+ +

+ GitHub Logo
+ 配置项说明： +

+
    +
  • + 
    +Start VM Tracker Record：配置项的总开关。
+
    +
    • +
  • + 
    +Process：smaps的抓取只能选择单进程抓取。
+
    +
    • +
+

+ 再点击Record setting，在output file path输入文件名hiprofiler_data_smaps.htrace，拖动滚动条设置buffer + size大小是64M，抓取时长是50s。
+ GitHub Logo
+ 点击Trace command，就会根据上面的配置生成抓取命令，点击Record抓取，抓取过程中会显示抓取时长。
+ GitHub Logo +

+

smaps展示说明

+ +

+ 抓取结束后smaps的trace会自动加载展示。
+ GitHub Logo +

+

界面布局介绍：smaps整体界面布局分为3个部分：

+
    +
  • + 
    +红色区域：泳道图。
+
    +
    • +
  • + 
    +绿色区域：详细信息。
+
    +
    • +
+

smaps泳道图展示

+ +

+ smaps泳道图展示当前时刻该进程的内存消耗。
+ GitHub Logo +

+

smaps泳道图的框选功能

+ +

+ 可以对泳道图进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有两个个tab页。
+ VM Tracker Statistics的Tab页如图：
+ GitHub Logo +

+
    +
  • + 
    +Type： 将抓取到的信息根据Type归类，分四类，Data，Text，Const，Other。
+
    +
    • +
  • + 
    +% of Res： 每行的Resident Size 占总Ressident Size的比例。
+
    +
    • +
  • + 
    +#Reg：统计的类型个数。
+
    +
    • +
  • + 
    +Path：虚拟内存块路径，类型中有多个则显示multiple。
+
    +
    • +
  • + 
    +Resident Size： smaps节点中Rss(Shared_Clean+Shared_Dirty+Private_Clean+Private_Dirty)。
+
    +
    • +
  • + 
    +Dirty Size：smaps节点中Shared_Dirty + Private_Dirty。
+
    +
    • +
  • + 
    +Swapped： smaps节点中Swap + SwapPss。
+
    +
    • +
  • + 
    +Virtual Size：smaps节点中Size。
+
    +
    • +
  • + 
    +Pss： smaps节点中Pss。
+
    +
    • +
  • + 
    +Res. %：Resident Size / Virtual Size 比值。
+
    +
    • +
+

+ VM Tracker Record List的Tab页如图：
+ GitHub Logo +

+
    +
  • + 
    +Type： 将抓取到的信息根据Type归类，Data，Text，Const，Other。
+
    +
    • +
  • + 
    +Address Range： 每段虚拟内存段的开始和结束位置。
+
    +
    • +
  • + 
    +Dirty Size：smaps节点中Shared_Dirty + Private_Dirty。
+
    +
    • +
  • + 
    +Swapper： smaps节点中Swap + SwapPss。
+
    +
    • +
  • + 
    +Resident Size：smaps节点中Rss(Shared_Clean+Shared_Dirty+Private_Clean+Private_Dirty)。
+
    +
    • +
  • + 
    +Virtual Size：smaps节点中Size。
+
    +
    • +
  • + 
    +Pss：smaps节点中Pss。
+
    +
    • +
  • + 
    +Reside： Rss / Size 比值。
+
    +
    • +
  • + 
    +Protection： 内存块的权限(读写执行执行)。
+
    +
    • +
  • + 
    +Path： 内存段路径。
+
    +
    • +
+
+ + + + diff --git a/ide/src/figures/smaps/smapschart.jpg b/ide/src/figures/smaps/smapschart.jpg new file mode 100644 index 0000000000000000000000000000000000000000..032d543261f85121367fa3f7e260e688b018d815 GIT binary patch literal 45395 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
UUKX%7M*HaG^X_R07uycajn-GaH}|3_4+8 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 literal 0 HcmV?d00001 diff --git a/ide/src/figures/smaps/smapsexcuting.jpg b/ide/src/figures/smaps/smapsexcuting.jpg new file mode 100644 index 0000000000000000000000000000000000000000..53f86e1472c53801d7d3637ffadae6d493233921 GIT binary patch literal 77444 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
  • mDC*1yABEY&zQItCX5&tAffPht&~qVcmwYT! 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 literal 0 HcmV?d00001 diff --git a/ide/src/figures/smaps/smapsrecord.jpg b/ide/src/figures/smaps/smapsrecord.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9380722264bf06e22a1b1231e97eca0f06a0db1f GIT binary patch literal 34101 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 literal 0 HcmV?d00001 diff --git a/ide/src/figures/smaps/smapsstatistics.jpg b/ide/src/figures/smaps/smapsstatistics.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4af1ef5ad619eeb8a0ed024286c868421118c428 GIT binary patch literal 113839 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%0D$p>Op^FnYktY#6POUcrp)JAM8>v(BRm6w`W-d$ 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 = []; nativeMemory: Array = []; nativeMemoryStatistic: Array = []; + nativeMemoryAllProcess: Array<{pid: number,ipid: number}> = []; + nativeMemoryCurrentIPid: number = -1; cpuAbilityIds: Array = []; memoryAbilityIds: Array = []; diskAbilityIds: Array = []; @@ -108,7 +109,6 @@ export class SelectionParam { dmaVmTrackerData: Array = []; gpuMemoryTrackerData: Array = []; hiLogs: Array = []; - hiSysEvents: Array = []; } export class BoxJumpParam { diff --git a/ide/src/trace/bean/FrameChartStruct.ts b/ide/src/trace/bean/FrameChartStruct.ts index 7c31ff179..08c31e8cf 100644 --- a/ide/src/trace/bean/FrameChartStruct.ts +++ b/ide/src/trace/bean/FrameChartStruct.ts @@ -51,6 +51,11 @@ export class ChartStruct extends BaseStruct { drawDur: number = 0; drawEventCount: number = 0; + threadPercent: number = 0; + threadEventPercent: number = 0; + processPercent: number = 0; + processEventPercent: number = 0; + parent: ChartStruct | undefined; children: Array = []; percent: number = 0; // 0 - 1 该node所占整体的百分比 diff --git a/ide/src/trace/component/SpHelp.ts b/ide/src/trace/component/SpHelp.ts index c87c806a5..2db6c0f34 100644 --- a/ide/src/trace/component/SpHelp.ts +++ b/ide/src/trace/component/SpHelp.ts @@ -186,6 +186,19 @@ export class SpHelp extends BaseElement { `/application/doc/quickstart_bio.html?${that.dark} width="100%" height="100%">`; }, }, + { + title: '进程smaps抓取和展示说明', + icon: '', + clickHandler: function (item: MenuItem) { + SpStatisticsHttpUtil.addOrdinaryVisitAction({ + event: 'smaps', + action: 'help_doc', + }); + that.appContent!.innerHTML = + ' { + private createHiSystemEventPluginConfig(appName: string): ProfilerPluginConfig { let hiSystemEventConfig: HiSystemEventConfig = { msg: 'hisysevent-plugin', - subscribe_domain : domainName, - subscribe_event : eventName, + processName: appName, }; let hiSystemEventPlugin: ProfilerPluginConfig = { pluginName: 'hisysevent-plugin', diff --git a/ide/src/trace/component/SpRecyclerSystemTrace.ts b/ide/src/trace/component/SpRecyclerSystemTrace.ts deleted file mode 100644 index 3dcd23320..000000000 --- a/ide/src/trace/component/SpRecyclerSystemTrace.ts +++ /dev/null @@ -1,788 +0,0 @@ -// @ts-nocheck -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { BaseElement, element } from '../../base-ui/BaseElement.js'; -import './trace/TimerShaftElement.js'; -import './trace/base/TraceRow.js'; -import './trace/base/TraceRowRecyclerView.js'; -import { - getCpuUtilizationRate, - getFps, - getFunDataByTid, - queryCpuData, - queryCpuFreq, - queryCpuFreqData, - queryCpuMax, - queryCpuMaxFreq, - queryProcess, - queryProcessData, - queryProcessMem, - queryProcessMemData, - queryProcessThreads, - queryThreadData, - queryTotalTime, - threadPool, -} from '../database/SqlLite.js'; -import { TraceRow } from './trace/base/TraceRow.js'; -import { TimerShaftElement } from './trace/TimerShaftElement.js'; -import { TimeRange } from './trace/timer-shaft/RangeRuler.js'; -import { CpuStruct } from '../bean/CpuStruct.js'; -import { CpuFreqStruct } from '../bean/CpuFreqStruct.js'; -import { ProcessStruct } from '../bean/ProcessStruct.js'; -import { ColorUtils } from './trace/base/ColorUtils.js'; -import './trace/base/TraceSheet.js'; -import { TraceSheet } from './trace/base/TraceSheet.js'; -import { ThreadStruct } from '../bean/ThreadStruct.js'; -import { ProcessMemStruct } from '../bean/ProcessMemStruct.js'; -import { FuncStruct } from '../bean/FuncStruct.js'; -import { FpsStruct } from '../bean/FpsStruct.js'; -import { RangeSelect } from './trace/base/RangeSelect.js'; -import { SelectionParam } from '../bean/BoxSelection.js'; -import { procedurePool } from '../database/Procedure.js'; -import { SportRuler } from './trace/timer-shaft/SportRuler.js'; -import { TraceRowRecyclerView } from './trace/base/TraceRowRecyclerView.js'; -import { TraceRowObject } from './trace/base/TraceRowObject.js'; -import { Rect } from './trace/timer-shaft/Rect.js'; - -@element('sp-recycler-system-trace') -export class SpRecyclerSystemTrace extends BaseElement { - static scrollViewWidth = 0; - rowsEL: TraceRowRecyclerView | undefined | null; - private timerShaftEL: TimerShaftElement | null | undefined; - private range: TimeRange | undefined; - private traceSheetEL: TraceSheet | undefined | null; - private rangeSelect!: RangeSelect; - private processThreads: Array = []; - private processAsyncEvent: Array = []; - private processMem: Array = []; - - initElements(): void { - this.rowsEL = this.shadowRoot?.querySelector('.rows'); - this.timerShaftEL = this.shadowRoot?.querySelector('.recycle-timer-shaft'); - this.traceSheetEL = this.shadowRoot?.querySelector('.recycle-trace-sheet'); - this.rangeSelect = new RangeSelect(this.timerShaftEL); - this.rangeSelect.rowsEL = this.rowsEL; - document?.addEventListener('flag-change', (event: any) => { - let flag = event.detail; - this.timerShaftEL?.modifyFlagList(event.detail.type, event.detail.flagObj); - if (flag.hidden) { - this.traceSheetEL?.setAttribute('mode', 'hidden'); - } - }); - SpRecyclerSystemTrace.scrollViewWidth = this.getScrollWidth(); - this.rangeSelect.selectHandler = (rows) => { - let selection = new SelectionParam(); - // 框选的 cpu ,无则不传 - selection.cpus = []; - // 框选的 线程 id,无则不传 - selection.threadIds = []; - // 款选的函数的 线程id ,无则不传 - selection.funTids = []; - // 框选的 内存 trackId ,无则不传 - selection.processTrackIds = []; - // 框选的起始时间 - selection.leftNs = 0; - // 框选的结束时间 - selection.rightNs = 0; - rows.forEach((it) => { - if (it.rowType == TraceRow.ROW_TYPE_CPU) { - selection.cpus.push(parseInt(it.rowId!)); - } else if (it.rowType == TraceRow.ROW_TYPE_THREAD) { - selection.threadIds.push(parseInt(it.rowId!)); - } else if (it.rowType == TraceRow.ROW_TYPE_FUNC) { - selection.funTids.push(parseInt(it.rowId!)); - } else if (it.rowType == TraceRow.ROW_TYPE_MEM) { - selection.trackIds.push(parseInt(it.rowId!)); - } else if (it.rowType == TraceRow.ROW_TYPE_FPS) { - selection.hasFps = true; - } else if (it.rowType == TraceRow.ROW_TYPE_HEAP) { - selection.nativeMemory.push(parseInt(it.rowId!)); - } - if (it.rangeSelect && it.rangeSelect.startNS) { - selection.leftNs = it.rangeSelect.startNS; - } - if (it.rangeSelect && it.rangeSelect.endNS) { - selection.rightNs = it.rangeSelect.endNS; - } - }); - this.traceSheetEL?.rangeSelect(selection); - }; - // @ts-ignore - new ResizeObserver((entries) => { - let width = entries[0].contentRect.width - 1 - SpRecyclerSystemTrace.scrollViewWidth; - requestAnimationFrame(() => { - this.timerShaftEL?.updateWidth(width); - this.shadowRoot!.querySelectorAll>('trace-row').forEach((it) => it.updateWidth(width)); - }); - }).observe(this); - // @ts-ignore - new ResizeObserver((entries) => { - let width = this.clientWidth - 1 - SpRecyclerSystemTrace.scrollViewWidth; - requestAnimationFrame(() => { - this.timerShaftEL?.updateWidth(width); - this.shadowRoot!.querySelectorAll>('trace-row').forEach((it) => it.updateWidth(width)); - }); - }).observe(window.document.body); - } - - getScrollWidth() { - let noScroll, - scroll, - oDiv = document.createElement('div'); - oDiv.style.cssText = 'position:absolute; top:-1000px; width:100px; height:100px; overflow:hidden;'; - noScroll = document.body.appendChild(oDiv).clientWidth; - oDiv.style.overflowY = 'scroll'; - scroll = oDiv.clientWidth; - document.body.removeChild(oDiv); - return noScroll - scroll + 1; - } - - getVisibleRows(): Array> { - return [...this.rowsEL!.shadowRoot!.querySelectorAll>('trace-row')]; - } - - timerShaftELRangeChange = (e: any) => { - this.range = e.detail; - TraceRow.range = this.range; - let scrollTop = this.rowsEL?.scrollTop || 0; - let scrollHeight = this.rowsEL?.clientHeight || 0; - //在rowsEL显示范围内的 trace-row组件将收到时间区间变化通知 - this.getVisibleRows().forEach((it) => { - it.dataListCache.length = 0; - this.hoverStructNull(); - it.drawObject(); - }); - }; - - rowsElOnScroll = (e: any) => { - this.hoverStructNull(); - let rows = this.getVisibleRows(); - rows.forEach((it, index) => { - if (index == 0 || index == rows.length - 1) { - it.dataListCache.length = 0; - it.drawObject(); - } - }); - }; - - documentOnMouseDown = (ev: MouseEvent) => { - this.rangeSelect.mouseDown(ev); - }; - - documentOnMouseUp = (ev: MouseEvent) => { - this.rangeSelect.mouseUp(ev); - }; - - documentOnMouseMove = (ev: MouseEvent) => { - let rows = this.getVisibleRows(); - this.rangeSelect.mouseMove(rows, ev); - rows.forEach((tr) => { - let x = ev.offsetX - (tr.canvasContainer?.offsetLeft || 0); - let y = ev.offsetY - (tr.canvasContainer?.offsetTop || 0) + (this.rowsEL?.scrollTop || 0); - //判断鼠标是否在当前 trace-row - if (x > tr.frame.x && x < tr.frame.x + tr.frame.width && y > tr.frame.y && y < tr.frame.y + tr.frame.height) { - this.hoverStructNull(); - if (tr.rowType === TraceRow.ROW_TYPE_CPU) { - CpuStruct.hoverCpuStruct = tr.onMouseHover(x, y); - if (CpuStruct.hoverCpuStruct) { - tr.tip = `P：${CpuStruct.hoverCpuStruct.processName || 'Process'} [${ - CpuStruct.hoverCpuStruct.processId - }]T：${CpuStruct.hoverCpuStruct.name} [${CpuStruct.hoverCpuStruct.tid}]`; - } - tr.setTipLeft(x, CpuStruct.hoverCpuStruct); - } else if (tr.rowType === TraceRow.ROW_TYPE_CPU_FREQ) { - CpuFreqStruct.hoverCpuFreqStruct = tr.onMouseHover(x, y); - if (CpuFreqStruct.hoverCpuFreqStruct) { - tr.tip = `${ColorUtils.formatNumberComma(CpuFreqStruct.hoverCpuFreqStruct.value!)} kHz`; - } - tr.setTipLeft(x, CpuFreqStruct.hoverCpuFreqStruct); - } else if (tr.rowType === TraceRow.ROW_TYPE_THREAD) { - ThreadStruct.hoverThreadStruct = tr.onMouseHover(x, y, false); - } else if (tr.rowType === TraceRow.ROW_TYPE_FUNC) { - FuncStruct.hoverFuncStruct = tr.onMouseHover(x, y, false); - } else if (tr.rowType === TraceRow.ROW_TYPE_HEAP) { - HeapStruct.hoverHeapStruct = tr.onMouseHover(x, y, false); - if (HeapStruct.hoverHeapStruct) { - tr.tip = `${ColorUtils.formatNumberComma(HeapStruct.hoverHeapStruct.heapsize!)} byte`; - } - tr.setTipLeft(x, HeapStruct.hoverHeapStruct); - } else { - this.hoverStructNull(); - } - } else { - tr.onMouseLeave(x, y); - } - tr.drawObject(); - }); - }; - - hoverStructNull() { - CpuStruct.hoverCpuStruct = undefined; - CpuFreqStruct.hoverCpuFreqStruct = undefined; - ThreadStruct.hoverThreadStruct = undefined; - FuncStruct.hoverFuncStruct = undefined; - } - - selectStructNull() { - CpuStruct.selectCpuStruct = undefined; - CpuFreqStruct.selectCpuFreqStruct = undefined; - ThreadStruct.selectThreadStruct = undefined; - FuncStruct.selectFuncStruct = undefined; - } - - documentOnClick = (ev: MouseEvent) => { - if (this.rangeSelect.isDrag()) { - return; - } - this.rowsEL?.querySelectorAll>('trace-row').forEach((it) => (it.rangeSelect = undefined)); - this.selectStructNull(); - if (CpuStruct.hoverCpuStruct) { - CpuStruct.selectCpuStruct = CpuStruct.hoverCpuStruct; - this.traceSheetEL?.displayCpuData(CpuStruct.hoverCpuStruct); - } else if (ThreadStruct.hoverThreadStruct) { - ThreadStruct.selectThreadStruct = ThreadStruct.hoverThreadStruct; - this.traceSheetEL?.displayThreadData(ThreadStruct.hoverThreadStruct); - } else if (FuncStruct.hoverFuncStruct) { - FuncStruct.selectFuncStruct = FuncStruct.hoverFuncStruct; - this.traceSheetEL?.displayFuncData(['current-selection'], FuncStruct.hoverFuncStruct); - } else if (SportRuler.rulerFlagObj) { - } else { - this.traceSheetEL?.setAttribute('mode', 'hidden'); - } - this.documentOnMouseMove(ev); - }; - - connectedCallback() { - /** - * 监听时间轴区间变化 - */ - this.timerShaftEL?.addEventListener('range-change', this.timerShaftELRangeChange); - /** - * 监听rowsEL的滚动时间，刷新可见区域的trace-row组件的时间区间（将触发trace-row组件重绘） - */ - this.rowsEL?.addEventListener('scroll', this.rowsElOnScroll); - /** - * 监听document的mousemove事件 坐标通过换算后找到当前鼠标所在的trace-row组件，将坐标传入 - */ - document.addEventListener('mousemove', this.documentOnMouseMove); - document.addEventListener('mousedown', this.documentOnMouseDown); - document.addEventListener('mouseup', this.documentOnMouseUp); - document.addEventListener('click', this.documentOnClick); - } - - disconnectedCallback() { - this.timerShaftEL?.removeEventListener('range-change', this.timerShaftELRangeChange); - this.rowsEL?.removeEventListener('scroll', this.rowsElOnScroll); - document.removeEventListener('mousemove', this.documentOnMouseMove); - document.removeEventListener('click', this.documentOnClick); - } - - loadDatabaseUrl(url: string, complete?: Function) { - this.init({ url: url }).then(() => { - let scrollTop = this.rowsEL?.scrollTop || 0; - let scrollHeight = this.rowsEL?.clientHeight || 0; - this.rowsEL?.querySelectorAll('trace-row').forEach((rowItem: any) => { - let top = rowItem.offsetTop - (this.rowsEL?.offsetTop || 0); - if ( - top + rowItem.clientHeight > scrollTop && - top + rowItem.clientHeight < scrollTop + scrollHeight + rowItem.clientHeight - ) { - (rowItem as TraceRow).dataListCache.length = 0; - } - }); - if (complete) { - complete(); - } - }); - } - - loadDatabaseArrayBuffer(buf: ArrayBuffer, complete?: Function) { - this.init({ buf }).then(() => { - let scrollTop = this.rowsEL?.scrollTop || 0; - let scrollHeight = this.rowsEL?.clientHeight || 0; - this.rowsEL?.querySelectorAll('trace-row').forEach((item: any) => { - let top = item.offsetTop - (this.rowsEL?.offsetTop || 0); - if ( - top + item.clientHeight > scrollTop && - top + item.clientHeight < scrollTop + scrollHeight + item.clientHeight - ) { - (item as TraceRow).dataListCache.length = 0; - } - }); - if (complete) { - complete(); - } - }); - } - - init = async (param: { buf?: ArrayBuffer; url?: string }) => { - if (this.rowsEL) this.rowsEL.innerHTML = ''; - this.traceSheetEL?.setAttribute('mode', 'hidden'); - this.timerShaftEL?.reset(); - procedurePool.clearCache(); - param.buf && (await threadPool.initSqlite(param.buf)); - param.url && (await threadPool.initServer(param.url)); - this.processThreads = await queryProcessThreads(); - this.processMem = await queryProcessMem(); - await this.initTotalTime(); - let cpuObjs = await this.initCpu(); - await this.initCpuRate(); - let freqObjs = await this.initCpuFreq(); - let fpsObjs = await this.initFPS(); - let processObjs = await this.initProcess(); - this.rowsEL.dataSource = [...cpuObjs, ...freqObjs, ...fpsObjs, ...processObjs]; - this.getVisibleRows().forEach((it) => it.drawObject()); - }; - initCpuRate = async () => { - let rates = await getCpuUtilizationRate(0, this.timerShaftEL?.totalNS || 0); - if (this.timerShaftEL) this.timerShaftEL.cpuUsage = rates; - }; - initTotalTime = async () => { - let res = await queryTotalTime(); - if (this.timerShaftEL) { - this.timerShaftEL.totalNS = res[0].total; - this.timerShaftEL.loadComplete = true; - } - }; - initCpu = async () => { - let objs = []; - let array = await queryCpuMax(); - if (array && array.length > 0 && array[0]) { - let cpuMax = array[0].cpu; - CpuStruct.cpuCount = cpuMax + 1; - for (let i1 = 0; i1 < CpuStruct.cpuCount; i1++) { - const cpuId = i1; - let cpuTraceRow = new TraceRowObject(); - cpuTraceRow.rowId = `${cpuId}`; - cpuTraceRow.rowType = TraceRow.ROW_TYPE_CPU; - cpuTraceRow.rowParentId = ''; - cpuTraceRow.rowHeight = 40; - cpuTraceRow.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, cpuTraceRow.rowHeight); - cpuTraceRow.name = `Cpu ${cpuId}`; - cpuTraceRow.supplier = () => queryCpuData(cpuId, 0, this.timerShaftEL?.totalNS || 0); - cpuTraceRow.onThreadHandler = (row, ctx) => { - procedurePool.submitWithName( - 'cpu', - `cpu${cpuId}`, - { - list: cpuTraceRow.must ? cpuTraceRow.dataList : undefined, - startNS: TraceRow.range?.startNS || 0, - endNS: TraceRow.range?.endNS || 0, - totalNS: TraceRow.range?.totalNS || 0, - frame: cpuTraceRow.frame, - }, - (res: any) => { - cpuTraceRow.dataListCache = res; - cpuTraceRow.must = false; - row.clearCanvas(); - row.c!.beginPath(); - row.drawLines(); - for (let i = 0; i < res.length; i++) { - CpuStruct.draw(ctx, res[i]); - } - row.drawSelection(); - row.c!.closePath(); - } - ); - }; - objs.push(cpuTraceRow); - } - } - return objs; - }; - - initCpuFreq = async () => { - let objs = []; - let freqList = await queryCpuFreq(); - let freqMaxList = await queryCpuMaxFreq(); - CpuFreqStruct.maxFreq = freqMaxList[0].maxFreq; - let math = () => { - let units: Array = ['', 'K', 'M', 'G', 'T', 'E']; - let sb = ' '; - CpuFreqStruct.maxFreqName = ' '; - if (CpuFreqStruct.maxFreq > 0) { - let log10: number = Math.ceil(Math.log10(CpuFreqStruct.maxFreq)); - let pow10: number = Math.pow(10, log10); - let afterCeil: number = Math.ceil(CpuFreqStruct.maxFreq / (pow10 / 4)) * (pow10 / 4); - CpuFreqStruct.maxFreq = afterCeil; - let unitIndex: number = Math.floor(log10 / 3); - sb = `${afterCeil / Math.pow(10, unitIndex * 3)}${units[unitIndex + 1]}hz`; - } - CpuFreqStruct.maxFreqName = sb.toString(); - }; - math(); - for (let i = 0; i < freqList.length; i++) { - const it = freqList[i]; - let cpuFreqTraceRow = new TraceRowObject(); - cpuFreqTraceRow.rowId = `${it.cpu}`; - cpuFreqTraceRow.rowType = TraceRow.ROW_TYPE_CPU_FREQ; - cpuFreqTraceRow.rowParentId = ''; - cpuFreqTraceRow.rowHeight = 40; - cpuFreqTraceRow.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, cpuFreqTraceRow.rowHeight); - cpuFreqTraceRow.name = `Cpu ${it.cpu} Frequency`; - cpuFreqTraceRow.supplier = () => queryCpuFreqData(it.cpu); - cpuFreqTraceRow.onThreadHandler = (row, ctx) => { - procedurePool.submitWithName( - 'freq', - `freq${it.cpu}`, - { - list: cpuFreqTraceRow.must ? cpuFreqTraceRow.dataList : undefined, - startNS: TraceRow.range?.startNS || 0, - endNS: TraceRow.range?.endNS || 0, - totalNS: TraceRow.range?.totalNS || 0, - frame: cpuFreqTraceRow.frame, - }, - (res: any) => { - cpuFreqTraceRow.dataListCache = res; - cpuFreqTraceRow.must = false; - row.clearCanvas(); - row.drawLines(); - row.c!.beginPath(); - for (let i = 0; i < res.length; i++) { - CpuFreqStruct.draw(ctx, res[i]); - } - row.drawSelection(); - row.c!.closePath(); - let s = CpuFreqStruct.maxFreqName; - let textMetrics = ctx.measureText(s); - row.c!.globalAlpha = 0.8; - row.c!.fillStyle = '#f0f0f0'; - row.c!.fillRect(0, 5, textMetrics.width + 8, 18); - row.c!.globalAlpha = 1; - row.c!.fillStyle = '#333'; - ctx.textBaseline = 'middle'; - ctx.fillText(maxFps, 4, 5 + 9); - } - ); - }; - objs.push(cpuFreqTraceRow); - } - return objs; - }; - - initFPS = async () => { - let objs = []; - let fpsRow = new TraceRowObject(); - fpsRow.rowId = `fps`; - fpsRow.rowType = TraceRow.ROW_TYPE_FPS; - fpsRow.rowParentId = ''; - FpsStruct.maxFps = 0; - fpsRow.rowHeight = 40; - fpsRow.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, fpsRow.rowHeight); - fpsRow.name = 'FPS'; - fpsRow.supplier = () => getFps(); - fpsRow.onDrawHandler = (row, ctx) => { - if (fpsRow.dataListCache.length > 0) { - for (let i = 0; i < fpsRow.dataListCache.length; i++) { - FpsStruct.draw(ctx, fpsRow.dataListCache[i]); - } - } else { - if (fpsRow.dataList) { - for (let i = 0; i < fpsRow.dataList.length; i++) { - let it = fpsRow.dataList[i]; - if ((it.fps || 0) > FpsStruct.maxFps) { - FpsStruct.maxFps = it.fps || 0; - } - if (i === fpsRow.dataList.length - 1) { - it.dur = (TraceRow.range?.endNS || 0) - (it.startNS || 0); - } else { - it.dur = (fpsRow.dataList[i + 1].startNS || 0) - (it.startNS || 0); - } - if ( - (it.startNS || 0) + (it.dur || 0) > (TraceRow.range?.startNS || 0) && - (it.startNS || 0) < (TraceRow.range?.endNS || 0) - ) { - FpsStruct.setFrame( - fpsRow.dataList[i], - 5, - TraceRow.range?.startNS || 0, - TraceRow.range?.endNS || 0, - TraceRow.range?.totalNS || 0, - fpsRow.frame - ); - if ( - i > 0 && - (fpsRow.dataList[i - 1].frame?.x || 0) == (fpsRow.dataList[i].frame?.x || 0) && - (fpsRow.dataList[i - 1].frame?.width || 0) == (fpsRow.dataList[i].frame?.width || 0) - ) { - } else { - fpsRow.dataListCache.push(fpsRow.dataList[i]); - FpsStruct.draw(ctx, fpsRow.dataList[i]); - } - } - } - } - } - if (ctx) { - let maxFps = FpsStruct.maxFps + 'FPS'; - let textMetrics = ctx.measureText(maxFps); - ctx.globalAlpha = 0.8; - ctx.fillStyle = '#f0f0f0'; - ctx.fillRect(0, 5, textMetrics.width + 8, 18); - ctx.globalAlpha = 1; - ctx.fillStyle = '#333'; - ctx.textBaseline = 'middle'; - ctx.fillText(maxFps, 4, 5 + 9); - } - }; - objs.push(fpsRow); - return objs; - }; - - /** - * 添加进程信息 - */ - initProcess = async () => { - let objs = []; - let processList = await queryProcess(); - for (let i = 0; i < processList.length; i++) { - const it = processList[i]; - let processRow = new TraceRowObject(); - processRow.rowId = `${it.pid}`; - processRow.rowType = TraceRow.ROW_TYPE_PROCESS; - processRow.rowParentId = ''; - processRow.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, processRow.rowHeight); - processRow.folder = true; - processRow.name = `${it.processName || 'Process'} ${it.pid}`; - processRow.supplier = () => queryProcessData(it.pid || -1, 0, TraceRow.range?.totalNS || 0); - processRow.onThreadHandler = (row, ctx) => { - procedurePool.submitWithName( - 'process', - `process ${it.pid} ${it.processName}`, - { - list: processRow.must ? processRow.dataList : undefined, - startNS: TraceRow.range?.startNS || 0, - endNS: TraceRow.range?.endNS || 0, - totalNS: TraceRow.range?.totalNS || 0, - frame: processRow.frame, - }, - (res: any) => { - processRow.dataListCache = res; - processRow.must = false; - row.clearCanvas(); - row.drawLines(); - row.c!.beginPath(); - for (let i = 0; i < res.length; i++) { - ProcessStruct.draw(ctx, res[i]); - } - row.drawSelection(); - row.c!.closePath(); - } - ); - }; - objs.push(processRow); - - /** - * 添加进程内存信息 - */ - let processMem = this.processMem.filter((mem) => mem.pid === it.pid); - processMem.forEach((mem) => { - let row = new TraceRowObject(); - row.rowId = `${mem.trackId}`; - row.rowType = TraceRow.ROW_TYPE_MEM; - row.rowParentId = `${it.pid}`; - row.rowHidden = !processRow.expansion; - row.rowHeight = 40; - row.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, row.rowHeight); - row.name = `${mem.trackName}`; - row.children = true; - row.supplier = () => - queryProcessMemData(mem.trackId).then((res) => { - let maxValue = Math.max(...res.map((it) => it.value || 0)); - for (let j = 0; j < res.length; j++) { - res[j].maxValue = maxValue; - if (j == res.length - 1) { - res[j].duration = this.range?.totalNS || 0; - } else { - res[j].duration = (res[j + 1].startTime || 0) - (res[j].startTime || 0); - } - if (j > 0) { - res[j].delta = (res[j].value || 0) - (res[j - 1].value || 0); - } else { - res[j].delta = 0; - } - } - return res; - }); - row.onThreadHandler = (r, ctx) => { - procedurePool.submitWithName( - 'mem', - `mem ${mem.trackId} ${mem.trackName}`, - { - list: row.must ? row.dataList : undefined, - startNS: TraceRow.range?.startNS || 0, - endNS: TraceRow.range?.endNS || 0, - totalNS: TraceRow.range?.totalNS || 0, - frame: row.frame, - }, - (res: any) => { - row.dataListCache = res; - row.must = false; - r.clearCanvas(); - r.drawLines(); - r.c!.beginPath(); - for (let i = 0; i < res.length; i++) { - ProcessMemStruct.draw(ctx, res[i]); - } - r.drawSelection(); - r.c!.closePath(); - } - ); - }; - objs.push(row); - }); - /** - * 添加进程线程信息 - */ - let threads = this.processThreads.filter( - (thread) => thread.pid === it.pid && thread.tid != 0 && thread.threadName != null - ); - threads.forEach((thread, i) => { - let threadRow = new TraceRowObject(); - threadRow.rowId = `${thread.tid}`; - threadRow.rowType = TraceRow.ROW_TYPE_THREAD; - threadRow.rowParentId = `${it.pid}`; - threadRow.rowHidden = !processRow.expansion; - threadRow.rowHeight = 40; - threadRow.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, threadRow.rowHeight); - threadRow.name = `${thread.threadName} ${thread.tid}`; - threadRow.children = true; - threadRow.supplier = () => - queryThreadData(thread.tid || 0).then((res) => { - getFunDataByTid(thread.tid || 0).then((funs) => { - if (funs.length > 0) { - let maxHeight = (Math.max(...funs.map((it) => it.depth || 0)) + 1) * 20 + 20; - let funcRow = new TraceRowObject(); - funcRow.rowId = `${thread.tid}`; - funcRow.rowType = TraceRow.ROW_TYPE_FUNC; - funcRow.rowParentId = `${it.pid}`; - funcRow.rowHidden = !processRow.expansion; - funcRow.rowHeight = maxHeight; - funcRow.frame = new Rect(0, 0, this.rowsEL.clientWidth - 248, funcRow.rowHeight); - funcRow.name = `${thread.threadName} ${thread.tid}`; - funcRow.children = true; - funcRow.supplier = () => new Promise((resolve, reject) => resolve(funs)); - funcRow.onThreadHandler = (r, ctx) => { - procedurePool.submitWithName( - 'func', - `func ${thread.tid} ${thread.threadName}`, - { - list: funcRow.must ? funcRow.dataList : undefined, - startNS: TraceRow.range?.startNS || 0, - endNS: TraceRow.range?.endNS || 0, - totalNS: TraceRow.range?.totalNS || 0, - frame: threadRow.frame, - }, - (res: any) => { - funcRow.must = false; - funcRow.dataListCache = res; - r.clearCanvas(); - r.drawLines(); - r.c!.beginPath(); - for (let i = 0; i < res.length; i++) { - FuncStruct.draw(ctx, res[i]); - } - r.drawSelection(); - r.c!.closePath(); - } - ); - }; - } - }); - return res; - }); - threadRow.onThreadHandler = (r, ctx) => { - procedurePool.submitWithName( - 'thread', - `thread ${thread.tid} ${thread.threadName}`, - { - list: threadRow.must ? threadRow.dataList : undefined, - startNS: TraceRow.range?.startNS || 0, - endNS: TraceRow.range?.endNS || 0, - totalNS: TraceRow.range?.totalNS || 0, - frame: threadRow.frame, - }, - (res: any) => { - threadRow.dataListCache = res; - threadRow.must = false; - r.clearCanvas(); - r.drawLines(); - r.c!.beginPath(); - for (let i = 0; i < res.length; i++) { - ThreadStruct.draw(ctx, res[i]); - } - r.drawSelection(); - r.c!.closePath(); - } - ); - }; - objs.push(threadRow); - }); - } - return objs; - }; - - insertAfter(newEl: HTMLElement, targetEl: HTMLElement) { - let parentEl = targetEl.parentNode; - if (parentEl!.lastChild == targetEl) { - parentEl!.appendChild(newEl); - } else { - parentEl!.insertBefore(newEl, targetEl.nextSibling); - } - } - - initHtml(): string { - return ` - -
    - - - - - - -
    - `; - } -} diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index a67844b2f..01467700a 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -44,7 +44,6 @@ import { drawLogsLineSegment, drawWakeUp, drawWakeUpList, - isFrameContainPoint, LineType, ns2x, ns2xByTimeShaft, @@ -96,14 +95,13 @@ import { TabPaneSummary } from './trace/sheet/ark-ts/TabPaneSummary.js'; import { JsCpuProfilerChartFrame } from '../bean/JsStruct.js'; import { FileInfo } from '../../js-heap/model/UiStruct.js'; import { SnapshotStruct } from '../database/ui-worker/ProcedureWorkerSnapshot.js'; -import { setSelectState, intersectData } from './Utils.js'; +import { setSelectState, intersectData, isExistPidInArray } from './Utils.js'; import { LogStruct } from '../database/ui-worker/ProcedureWorkerLog.js'; import { TabPaneFrequencySample } from './trace/sheet/cpu/TabPaneFrequencySample.js'; import { TabPaneCounterSample } from './trace/sheet/cpu/TabPaneCounterSample.js'; import { LitSearch } from './trace/search/Search.js'; import { TabPaneFlag } from './trace/timer-shaft/TabPaneFlag.js'; import { LitTabpane } from '../../base-ui/tabs/lit-tabpane.js'; -import { HiSysEventStruct } from '../database/ui-worker/ProcedureWorkerHiSysEvent.js'; function dpr() { return window.devicePixelRatio || 1; @@ -698,6 +696,17 @@ export class SpSystemTrace extends BaseElement { if (!it.expansion) { memoryRows = [...it.childrenList]; } + const rowKey = it.rowId!.split(' '); + const process = { + ipid: Number(rowKey[rowKey.length - 1]), + pid: Number(rowKey[rowKey.length - 2]) + } + if (!isExistPidInArray(selection.nativeMemoryAllProcess,process.pid)){ + selection.nativeMemoryAllProcess.push(process); + } + if (selection.nativeMemoryCurrentIPid === -1){ + selection.nativeMemoryCurrentIPid = process.ipid; + } memoryRows.forEach((th) => { th.rangeSelect = true; th.checkType = '2'; @@ -756,6 +765,19 @@ export class SpSystemTrace extends BaseElement { selection.hasFps = true; info('load FPS traceRow id is : ', it.rowId); } else if (it.rowType == TraceRow.ROW_TYPE_HEAP) { + const key = it.rowParentId!.split(' '); + const process = { + ipid: Number(key[key.length - 1]), + pid: Number(key[key.length - 2]) + }; + + if (!isExistPidInArray(selection.nativeMemoryAllProcess,process.pid)){ + selection.nativeMemoryAllProcess.push(process); + } + if (selection.nativeMemoryCurrentIPid === -1){ + selection.nativeMemoryCurrentIPid = process.ipid; + } + if (selection.nativeMemoryAllProcess) if (it.getAttribute('heap-type') === 'native_hook_statistic') { selection.nativeMemoryStatistic.push(it.rowId!); } else { @@ -1226,13 +1248,6 @@ export class SpSystemTrace extends BaseElement { selection.hiLogs.push(...batch); currentIndex += batchSize; } - } else if (it.rowType === TraceRow.ROW_TYPE_HI_SYSEVENT) { - let systemEvents: HiSysEventStruct[] = it.dataList.filter( - (systemEventStruct: HiSysEventStruct) => - (systemEventStruct.ts ?? 0) >= TraceRow.rangeSelectObject!.startNS! && - (systemEventStruct.ts ?? 0) <= TraceRow.rangeSelectObject!.endNS! - ); - selection.hiSysEvents.push(...systemEvents); } if (this.rangeTraceRow!.length !== rows.length) { let event = this.createPointEvent(it); @@ -3636,6 +3651,9 @@ export class SpSystemTrace extends BaseElement { it.checkType = data.isCheck ? '2' : '0'; }); }); + window.subscribe(window.SmartEvent.UI.ProcessSwitch, (data) => { + this.traceSheetEL?.updateRangeSelect(data); + }); } favoriteAreaSearchHandler(row: TraceRow): void { @@ -3885,10 +3903,10 @@ export class SpSystemTrace extends BaseElement { processList.push(row.rowId!); }); if (query.includes('_')) { - query = query.replace(/_/g, '\\_'); + query = query.replace('_', '\\_'); } if (query.includes('%')) { - query = query.replace(/%/g, '\\%'); + query = query.replace('%', '\\%'); } let list = await querySceneSearchFunc(query, processList); cpuList = cpuList.concat(list); diff --git a/ide/src/trace/component/Utils.ts b/ide/src/trace/component/Utils.ts index 7c34052ec..84ac77a5d 100644 --- a/ide/src/trace/component/Utils.ts +++ b/ide/src/trace/component/Utils.ts @@ -61,3 +61,6 @@ export function intersectData(row: TraceRow): any[] { }); return intersectData; } +export function isExistPidInArray(arr: Array<{pid: number,ipid:number}>,pid:number): boolean{ + return arr.some((item) => item.pid === pid); +} diff --git a/ide/src/trace/component/chart/FrameChart.ts b/ide/src/trace/component/chart/FrameChart.ts index b99cfe187..b39f3eaaf 100644 --- a/ide/src/trace/component/chart/FrameChart.ts +++ b/ide/src/trace/component/chart/FrameChart.ts @@ -199,7 +199,7 @@ export class FrameChart extends BaseElement { currentValuePercent = this.total / this.rootNode.size; break; case ChartMode.Count: - currentValue = this.total + ''; + currentValue = `${this.total}`; currentValuePercent = this.total / this.rootNode.count; break; case ChartMode.Duration: @@ -207,11 +207,13 @@ export class FrameChart extends BaseElement { currentValuePercent = this.total / this.rootNode.dur; break; case ChartMode.EventCount: - currentValue = this.total + ''; + currentValue = `${this.total}`; currentValuePercent = this.total / this.rootNode.eventCount; break; } - this.rootNode.symbol = `Root : ${currentValue} (${(currentValuePercent * 100).toFixed(2)}%)`; + this.rootNode.symbol = currentValuePercent + ? `Root : ${currentValue} (${(currentValuePercent * 100).toFixed(2)}%)` + : `Root : ${currentValue}`; } /** @@ -410,7 +412,7 @@ export class FrameChart extends BaseElement { break; case ChartMode.EventCount: case ChartMode.Count: - calibration = Math.ceil(((this.total * sizeRatio) / 10) * i) + ''; + calibration = `${Math.ceil(((this.total * sizeRatio) / 10) * i)}`; break; } const size = this.canvasContext!.measureText(calibration).width; @@ -797,7 +799,23 @@ export class FrameChart extends BaseElement {
    Addr: ${hoverNode?.addr}
    - Count: ${count} (${percent}%)`; + Count: ${count}`; + if (hoverNode.threadEventPercent) { + this.hintContent += ` +
    + percentage in current Thread: ${ + hoverNode.threadPercent ? (hoverNode.threadPercent * 100).toFixed(2) : '' + }%`; + } + if (hoverNode.processEventPercent) { + this.hintContent += ` +
    + percentage in current Process: ${ + hoverNode.processPercent ? (hoverNode.processPercent * 100).toFixed(2) : '' + }%`; + } + this.hintContent += `
    + percentage in all Process: ${percent}%`; break; case ChartMode.Duration: const duration = Utils.getProbablyTime(this.getNodeValue(hoverNode)); @@ -816,7 +834,23 @@ export class FrameChart extends BaseElement {
    Addr: ${hoverNode?.addr}
    - EventCount: ${eventCount} (${percent}%)`; + EventCount: ${eventCount}`; + if (hoverNode.threadEventPercent) { + this.hintContent += ` +
    + percentage in current Thread: ${ + hoverNode.threadEventPercent ? (hoverNode.threadEventPercent * 100).toFixed(2) + '%' : '' + }`; + } + if (hoverNode.processEventPercent) { + this.hintContent += ` +
    + percentage in current Process: ${ + hoverNode.processEventPercent ? (hoverNode.processEventPercent * 100).toFixed(2) + '%' : '' + }%`; + } + this.hintContent += `
    + percentage in all Process: ${percent}%`; } } diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index dafe1e73d..122a11805 100644 --- a/ide/src/trace/component/chart/SpChartManager.ts +++ b/ide/src/trace/component/chart/SpChartManager.ts @@ -48,7 +48,6 @@ import { SpArkTsChart } from './SpArkTsChart.js'; import { MemoryConfig } from '../../bean/MemoryConfig.js'; import { FlagsConfig } from '../SpFlags.js'; import { SpLogChart } from './SpLogChart.js'; -import { SpHiSysEvent } from './SpHiSysEvent.js'; export class SpChartManager { static APP_STARTUP_PID_ARR: Array = []; @@ -71,7 +70,6 @@ export class SpChartManager { frameTimeChart: SpFrameTimeChart; public arkTsChart: SpArkTsChart; private logChart: SpLogChart; - private spHiSysEvent: SpHiSysEvent; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -92,7 +90,6 @@ export class SpChartManager { this.frameTimeChart = new SpFrameTimeChart(trace); this.arkTsChart = new SpArkTsChart(trace); this.logChart = new SpLogChart(trace); - this.spHiSysEvent = new SpHiSysEvent(trace); } async init(progress: Function) { @@ -131,7 +128,6 @@ export class SpChartManager { progress('cpu freq', 80); await this.freq.init(); await this.logChart.init(); - await this.spHiSysEvent.init(); progress('Clock init', 82); await this.clockChart.init(); progress('Irq init', 84); diff --git a/ide/src/trace/component/chart/SpHiPerf.ts b/ide/src/trace/component/chart/SpHiPerf.ts index 6058aee8c..0c913ce60 100644 --- a/ide/src/trace/component/chart/SpHiPerf.ts +++ b/ide/src/trace/component/chart/SpHiPerf.ts @@ -19,9 +19,9 @@ import { queryHiPerfCpuData, queryHiPerfCpuMergeData, queryHiPerfCpuMergeData2, - queryHiPerfEventList, queryHiPerfProcessData, queryHiPerfThreadData, + queryPerfEventType, queryPerfCmdline, queryPerfThread, } from '../../database/SqlLite.js'; @@ -57,7 +57,7 @@ export class SpHiPerf { private trace: SpSystemTrace; private group: any; private rowList: TraceRow[] | undefined; - private eventTypeList: Array<{ id: number; report_value: string }> = []; + private eventTypeList: Array<{ id: number; report: string }> = []; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -67,7 +67,7 @@ export class SpHiPerf { await this.initCmdLine(); this.rowList = []; this.perfThreads = await queryPerfThread(); - this.eventTypeList = await queryHiPerfEventList(); + this.eventTypeList = await queryPerfEventType(); info('PerfThread Data size is: ', this.perfThreads!.length); this.group = Utils.groupBy(this.perfThreads || [], 'pid'); this.cpuData = await queryHiPerfCpuMergeData2(); @@ -113,6 +113,45 @@ export class SpHiPerf { row.rowType = TraceRow.ROW_TYPE_HIPERF; row.rowParentId = ''; row.folder = true; + row.rowSetting = 'enable'; + row.rowSettingPopoverDirection = 'bottomLeft'; + row.rowSettingList = [ + { + key: '-2', + title: 'Cpu Usage', + checked: true, + }, + { + key: '-1', + title: 'Event Type', + children: this.eventTypeList.map(et => { + return { + key: `${et.id}`, + title: et.report + }; + }), + }, + ]; + row.onRowSettingChangeHandler = (value) => { + let drawType = parseInt(value[0]); + row.childrenList.forEach((child) => { + if (child.drawType !== drawType) { + child.drawType = drawType; + child.dataList2 = []; + child.childrenList.forEach((sz) => { + sz.drawType = drawType + sz.dataList2 = []; + }); + } + }); + this.trace.getCollectRows((row) => row.rowType!.startsWith('hiperf-')).forEach((it) => { + if (it.drawType !== drawType) { + it.drawType = drawType; + it.dataList2 = []; + } + }); + this.trace.refreshCanvas(false); + }; row.style.height = '40px'; if (SpHiPerf.stringResult?.existA === true) { row.name = `HiPerf (All)`; @@ -155,6 +194,7 @@ export class SpHiPerf { cpuMergeRow.rowParentId = 'HiPerf'; cpuMergeRow.rowHidden = !this.rowFolder.expansion; cpuMergeRow.folder = false; + cpuMergeRow.drawType = -2; cpuMergeRow.name = `HiPerf`; cpuMergeRow.style.height = '40px'; cpuMergeRow.setAttribute('children', ''); @@ -200,6 +240,7 @@ export class SpHiPerf { perfCpuRow.rowParentId = 'HiPerf'; perfCpuRow.rowHidden = !this.rowFolder.expansion; perfCpuRow.folder = false; + perfCpuRow.drawType = -2; perfCpuRow.name = `Cpu ${i}`; perfCpuRow.setAttribute('children', ''); perfCpuRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; @@ -248,6 +289,7 @@ export class SpHiPerf { row.rowParentId = 'HiPerf'; row.rowHidden = !this.rowFolder.expansion; row.folder = true; + row.drawType = -2; if (SpChartManager.APP_STARTUP_PID_ARR.find((pid) => pid === process.pid) !== undefined) { row.addTemplateTypes('AppStartup'); } @@ -297,6 +339,7 @@ export class SpHiPerf { thread.rowParentId = row.rowId; thread.rowHidden = !row.expansion; thread.folder = false; + thread.drawType = -2; thread.name = `${thObj.threadName || 'Thread'} [${thObj.tid}]`; thread.setAttribute('children', ''); thread.folderPaddingLeft = 0; @@ -355,15 +398,23 @@ export class SpHiPerf { | undefined ) { let tip = ''; + let groupBy10MS = (TraceRow.range?.scale || 50) > 30_000_000; if (struct) { - let num = 0; - if (struct instanceof HiPerfEventStruct) { - num = Math.trunc(((struct.sum || 0) / (struct.max || 0)) * 100); - } else { - num = Math.trunc(((struct.height || 0) / 40) * 100); - } - if (num > 0) { - tip = `${num * (this.maxCpuId + 1)}% (10.00ms)`; + if (groupBy10MS) { + if (row.drawType === -2) { + let num = 0; + if (struct instanceof HiPerfEventStruct) { + num = Math.trunc(((struct.sum || 0) / (struct.max || 0)) * 100); + } else { + num = Math.trunc(((struct.height || 0) / 40) * 100); + } + if (num > 0) { + tip = `${num * (this.maxCpuId + 1)}% (10.00ms)`; + } + } else { + tip = `${struct.eventCount} (10.00ms)`; + } + } else { let perfCall = perfDataQuery.callChainMap.get(struct.callchain_id || 0); tip = `${perfCall ? perfCall.name : ''} (${perfCall ? perfCall.depth : '0'} other frames)`; diff --git a/ide/src/trace/component/chart/SpNativeMemoryChart.ts b/ide/src/trace/component/chart/SpNativeMemoryChart.ts index a7e8ba90f..b2c8d91bb 100644 --- a/ide/src/trace/component/chart/SpNativeMemoryChart.ts +++ b/ide/src/trace/component/chart/SpNativeMemoryChart.ts @@ -24,11 +24,12 @@ import { import { TraceRow } from '../trace/base/TraceRow.js'; import { info } from '../../../log/Log.js'; import { procedurePool } from '../../database/Procedure.js'; -import { NativeEventHeap } from '../../bean/NativeHook.js'; +import { type NativeEventHeap } from '../../bean/NativeHook.js'; import { HeapRender, HeapStruct } from '../../database/ui-worker/ProcedureWorkerHeap.js'; import { Utils } from '../trace/base/Utils.js'; import { renders } from '../../database/ui-worker/ProcedureWorker.js'; import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; +import { type BaseStruct } from '../../bean/BaseStruct.js'; export class SpNativeMemoryChart { static EVENT_HEAP: Array = []; @@ -39,35 +40,57 @@ export class SpNativeMemoryChart { this.trace = trace; } - initChart = async () => { - let time = new Date().getTime(); - let nativeMemoryType = 'native_hook'; - let nmsCount = await queryNativeHookStatisticsCount(); - if (nmsCount && nmsCount[0] && (nmsCount[0] as any).num > 0) { - nativeMemoryType = 'native_hook_statistic'; - } - let nativeProcess = await queryNativeHookProcess(nativeMemoryType); - info('NativeHook Process data size is: ', nativeProcess!.length); - if (nativeProcess.length == 0) { - return; - } - await this.initNativeMemory(); - SpNativeMemoryChart.EVENT_HEAP = await queryHeapGroupByEvent(nativeMemoryType); - let nativeRow = TraceRow.skeleton(); - let process = ''; - if (nativeProcess.length > 0) { - process = ` ${nativeProcess[0].pid}`; - } - nativeRow.rowId = `native-memory`; + folderThreadHandler(row: TraceRow): void { + row.onThreadHandler = (useCache): void => { + row.canvasSave(this.trace.canvasPanelCtx!); + if (row.expansion) { + this.trace.canvasPanelCtx?.clearRect(0, 0, row.frame.width, row.frame.height); + } else { + (renders.empty as EmptyRender).renderMainThread( + { + context: this.trace.canvasPanelCtx, + useCache: useCache, + type: '', + }, + row + ); + } + row.canvasRestore(this.trace.canvasPanelCtx!); + }; + } + + chartThreadHandler(row: TraceRow): void { + row.onThreadHandler = (useCache): void => { + let context: CanvasRenderingContext2D; + if (row.currentContext) { + context = row.currentContext; + } else { + context = row.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + row.canvasSave(context); + (renders.heap as HeapRender).renderMainThread( + { + context: context, + useCache: useCache, + type: 'heap', + }, + row + ); + row.canvasRestore(context); + }; + } + + initNativeMemoryFolder(process: number, ipid: number): TraceRow { + const nativeRow = TraceRow.skeleton(); + nativeRow.rowId = `native-memory ${process} ${ipid}`; nativeRow.index = 0; nativeRow.rowType = TraceRow.ROW_TYPE_NATIVE_MEMORY; nativeRow.drawType = 0; nativeRow.style.height = '40px'; nativeRow.rowParentId = ''; nativeRow.folder = true; - nativeRow.addTemplateTypes('NativeMemory'); - nativeRow.addTemplateTypes('Memory'); - nativeRow.name = `Native Memory` + process; + nativeRow.addTemplateTypes('NativeMemory', 'Memory'); + nativeRow.name = `Native Memory (${process})`; nativeRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; nativeRow.selectChangeHandler = this.trace.selectChangeHandler; nativeRow.rowSetting = 'enable'; @@ -83,41 +106,29 @@ export class SpNativeMemoryChart { title: 'Native Memory Density', }, ]; - nativeRow.onRowSettingChangeHandler = (value) => { + nativeRow.onRowSettingChangeHandler = (value): void => { nativeRow.childrenList.forEach((row) => (row.drawType = parseInt(value[0]))); - this.trace.getCollectRows((row) => row.rowType === 'heap').forEach((it) => { - it.drawType = parseInt(value[0]); - }); + this.trace + .getCollectRows((row) => row.rowType === 'heap') + .forEach((it) => { + it.drawType = parseInt(value[0]); + }); this.trace.refreshCanvas(false); }; - nativeRow.supplier = () => new Promise>((resolve) => resolve([])); - nativeRow.onThreadHandler = (useCache) => { - nativeRow.canvasSave(this.trace.canvasPanelCtx!); - if (nativeRow.expansion) { - this.trace.canvasPanelCtx?.clearRect(0, 0, nativeRow.frame.width, nativeRow.frame.height); - } else { - (renders['empty'] as EmptyRender).renderMainThread( - { - context: this.trace.canvasPanelCtx, - useCache: useCache, - type: ``, - }, - nativeRow - ); - } - nativeRow.canvasRestore(this.trace.canvasPanelCtx!); - }; + nativeRow.supplier = (): Promise => new Promise>((resolve) => resolve([])); + this.folderThreadHandler(nativeRow); this.trace.rowsEL?.appendChild(nativeRow); - /** - * 添加heap信息 - */ - let native_memory = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; - for (let i = 0; i < native_memory.length; i++) { - let nm = native_memory[i]; - let allHeapRow = TraceRow.skeleton(); + return nativeRow; + } + + initAllocMapChart(folder: TraceRow, type: string, process: { pid: number; ipid: number }): void { + const chartList = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; + for (let i = 0; i < chartList.length; i++) { + const nm = chartList[i]; + const allHeapRow = TraceRow.skeleton(); allHeapRow.index = i; - allHeapRow.rowParentId = `native-memory`; - allHeapRow.rowHidden = !nativeRow.expansion; + allHeapRow.rowParentId = `native-memory ${process.pid} ${process.ipid}`; + allHeapRow.rowHidden = !folder.expansion; allHeapRow.style.height = '40px'; allHeapRow.name = nm; allHeapRow.rowId = nm; @@ -127,9 +138,9 @@ export class SpNativeMemoryChart { allHeapRow.rowType = TraceRow.ROW_TYPE_HEAP; allHeapRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; allHeapRow.selectChangeHandler = this.trace.selectChangeHandler; - allHeapRow.setAttribute('heap-type', nativeMemoryType); + allHeapRow.setAttribute('heap-type', type); allHeapRow.setAttribute('children', ''); - allHeapRow.focusHandler = () => { + allHeapRow.focusHandler = (): void => { let tip = ''; if (HeapStruct.hoverHeapStruct) { if (allHeapRow.drawType === 1) { @@ -140,34 +151,38 @@ export class SpNativeMemoryChart { } this.trace?.displayTip(allHeapRow, HeapStruct.hoverHeapStruct, tip); }; - allHeapRow.findHoverStruct = () => { + allHeapRow.findHoverStruct = (): void => { HeapStruct.hoverHeapStruct = allHeapRow.getHoverStruct(); }; - allHeapRow.supplier = () => { - return nativeMemoryType === 'native_hook' - ? this.getNativeMemoryDataByChartType(i, allHeapRow.drawType) + allHeapRow.supplier = (): Promise => { + return type === 'native_hook' + ? this.getNativeMemoryDataByChartType(i, allHeapRow.drawType, process.ipid) : this.getNativeMemoryStatisticByChartType(i - 1); }; - allHeapRow.onThreadHandler = (useCache) => { - let context: CanvasRenderingContext2D; - if (allHeapRow.currentContext) { - context = allHeapRow.currentContext; - } else { - context = allHeapRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; - } - allHeapRow.canvasSave(context); - (renders['heap'] as HeapRender).renderMainThread( - { - context: context, - useCache: useCache, - type: `heap`, - }, - allHeapRow - ); - allHeapRow.canvasRestore(context); - }; - nativeRow.addChildTraceRow(allHeapRow); + this.chartThreadHandler(allHeapRow); + folder.addChildTraceRow(allHeapRow); + } + } + + initChart = async (): Promise => { + let time = new Date().getTime(); + let nativeMemoryType = 'native_hook'; + let nmsCount = await queryNativeHookStatisticsCount(); + if (nmsCount && nmsCount[0] && nmsCount[0].num > 0) { + nativeMemoryType = 'native_hook_statistic'; } + let nativeProcess = await queryNativeHookProcess(nativeMemoryType); + info('NativeHook Process data size is: ', nativeProcess!.length); + if (nativeProcess.length === 0) { + return; + } + await this.initNativeMemory(); + SpNativeMemoryChart.EVENT_HEAP = await queryHeapGroupByEvent(nativeMemoryType); + for (const process of nativeProcess) { + const nativeRow = this.initNativeMemoryFolder(process.pid, process.ipid); + this.initAllocMapChart(nativeRow, nativeMemoryType, process); + } + let durTime = new Date().getTime() - time; info('The time to load the Native Memory data is: ', durTime); }; @@ -183,7 +198,7 @@ export class SpNativeMemoryChart { (res: any) => { nmStatisticArray = nmStatisticArray.concat(res.data); res.data = null; - if (res.tag == 'end') { + if (res.tag === 'end') { resolve(nmStatisticArray); } } @@ -192,18 +207,23 @@ export class SpNativeMemoryChart { return nmStatisticArray; }; - getNativeMemoryDataByChartType = async (nativeMemoryType: number, chartType: number): Promise> => { - let args = new Map(); + getNativeMemoryDataByChartType = async ( + nativeMemoryType: number, + chartType: number, + ipid: number + ): Promise> => { + let args = new Map(); args.set('nativeMemoryType', nativeMemoryType); args.set('chartType', chartType); args.set('totalNS', TraceRow.range?.totalNS!); args.set('actionType', 'memory-chart'); + args.set('ipid', ipid); let nmArray: Array = []; - await new Promise>((resolve, reject) => { + await new Promise>((resolve) => { procedurePool.submitWithName('logic1', 'native-memory-chart-action', args, undefined, (res: any) => { nmArray = nmArray.concat(res.data); res.data = null; - if (res.tag == 'end') { + if (res.tag === 'end') { resolve(nmArray); } }); @@ -211,7 +231,7 @@ export class SpNativeMemoryChart { return nmArray; }; - initNativeMemory = async () => { + initNativeMemory = async (): Promise => { let time = new Date().getTime(); let isRealtime = false; let realTimeDif = 0; @@ -219,13 +239,13 @@ export class SpNativeMemoryChart { let queryTime = await queryNativeMemoryRealTime(); let bootTime = await queryBootTime(); if (queryTime.length > 0) { - isRealtime = queryTime[0].clock_name == 'realtime'; + isRealtime = queryTime[0].clock_name === 'realtime'; } if (bootTime.length > 0 && isRealtime) { realTimeDif = queryTime[0].ts - bootTime[0].ts; SpNativeMemoryChart.REAL_TIME_DIF = realTimeDif; } - await new Promise((resolve, reject) => { + await new Promise((resolve) => { procedurePool.submitWithName( 'logic1', 'native-memory-init', diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts index a3d187303..b04c73e16 100644 --- a/ide/src/trace/component/setting/SpAllocations.ts +++ b/ide/src/trace/component/setting/SpAllocations.ts @@ -43,8 +43,6 @@ export class SpAllocations extends BaseElement { private startupMode: LitSwitch | null | undefined; private recordStatisticsResult: HTMLDivElement | null | undefined; - private filterSize: HTMLInputElement | null | undefined; - set startSamp(allocationStart: boolean) { if (allocationStart) { this.setAttribute('startSamp', ''); @@ -154,12 +152,6 @@ export class SpAllocations extends BaseElement { }; initElements(): void { - this.filterSize = this.shadowRoot?.querySelector('#filterSized'); - this.filterSize!.addEventListener('keydown', (ev: any) => { - if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { - ev.preventDefault(); - } - }); this.processId = this.shadowRoot?.getElementById('pid') as LitAllocationSelect; let process = this.processId.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; let sp = document.querySelector('sp-application') as SpApplication; @@ -198,16 +190,6 @@ export class SpAllocations extends BaseElement { let stepValue = [0, 1, 10, 30, 60, 300, 600, 1800, 3600]; this.statisticsSlider = this.shadowRoot?.querySelector('#interval-slider') as LitSlider; - this.unwindEL.addEventListener('keydown', (ev: any) => { - if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { - ev.preventDefault(); - } - }); - this.shareMemory.addEventListener('keydown', (ev: any) => { - if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { - ev.preventDefault(); - } - }); this.recordStatisticsResult = this.shadowRoot?.querySelector( '.record-statistics-result' ) as HTMLDivElement; @@ -222,11 +204,6 @@ export class SpAllocations extends BaseElement { }; let parentElement = this.statisticsSlider!.parentNode as Element; this.intervalResultInput = this.shadowRoot?.querySelector('.interval-result') as HTMLInputElement; - this.intervalResultInput!.addEventListener('keydown', (ev: any) => { - if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { - ev.preventDefault(); - } - }); this.intervalResultInput.value = '10'; this.statisticsSlider.addEventListener('input', (evt) => { this.statisticsSlider!.sliderStyle = { @@ -276,9 +253,8 @@ export class SpAllocations extends BaseElement { defaultSize = stepIndex * stepSize; break; } else if (inputValue < currentValue && stepIndex !== 0) { - defaultSize = - ((inputValue - stepValue[stepIndex - 1]) / (currentValue - stepValue[stepIndex - 1])) * stepSize + - stepSize * (stepIndex - 1); + defaultSize = (inputValue - stepValue[stepIndex - 1]) / + (currentValue - stepValue[stepIndex - 1]) * stepSize + (stepSize * (stepIndex - 1)); break; } } @@ -595,13 +571,13 @@ export class SpAllocations extends BaseElement {
    Max unwind level Max Unwind Level Rang is 0 - 512, default 10 - +
    Shared Memory Size (One page equals 4 KB) Shared Memory Size Range is 0 - 131072 page, default 16384 page
    - + Page
    @@ -609,7 +585,7 @@ export class SpAllocations extends BaseElement { Filter Memory Size Filter size Range is 0 - 65535 byte, default 0 byte
    - + Byte
    @@ -637,7 +613,7 @@ export class SpAllocations extends BaseElement {
    - + S
    diff --git a/ide/src/trace/component/setting/SpHilogRecord.ts b/ide/src/trace/component/setting/SpHilogRecord.ts index fbb07bd80..4a4de4495 100644 --- a/ide/src/trace/component/setting/SpHilogRecord.ts +++ b/ide/src/trace/component/setting/SpHilogRecord.ts @@ -84,7 +84,7 @@ export class SpHilogRecord extends BaseElement { } getHiLogLevel(): string[] { - return ['ALL-Level', 'Debug', 'Info', 'Warn', 'Error', 'Fatal']; + return ['ALL-Level', 'Debug', 'Info', 'Warn', 'Error']; } initHtml(): string { diff --git a/ide/src/trace/component/setting/SpHisysEvent.ts b/ide/src/trace/component/setting/SpHisysEvent.ts index 0bd437b5b..e6e0f4e82 100644 --- a/ide/src/trace/component/setting/SpHisysEvent.ts +++ b/ide/src/trace/component/setting/SpHisysEvent.ts @@ -16,45 +16,32 @@ import { BaseElement, element } from '../../../base-ui/BaseElement.js'; import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js'; import '../../../base-ui/select/LitAllocationSelect.js'; + import '../../../base-ui/switch/lit-switch.js'; +import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; import { SpRecordTrace } from '../SpRecordTrace.js'; +import { Cmd } from '../../../command/Cmd.js'; +import { CmdConstant } from '../../../command/CmdConstant.js'; import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js'; -import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; @element('sp-hisys-event') export class SpHisysEvent extends BaseElement { - private domainInputEL: LitAllocationSelect | undefined | null; - private eventNameInputEL: LitAllocationSelect | undefined | null; - private sysEventConfigList: NodeListOf | undefined | null; - private sysEventSwitch: LitSwitch | undefined | null; - private domainInputEl: HTMLInputElement | undefined | null; - private nameInputEl: HTMLInputElement | undefined | null; - private eventConfig: unknown = {}; + private eventProcessInput: LitAllocationSelect | undefined | null; + private selectProcess: HTMLInputElement | undefined | null; set startSamp(start: boolean) { if (start) { this.setAttribute('startSamp', ''); - this.domainInputEL!.removeAttribute('readonly'); - this.eventNameInputEL!.removeAttribute('readonly'); } else { this.removeAttribute('startSamp'); - this.domainInputEL!.setAttribute('readonly', 'readonly'); - this.eventNameInputEL!.setAttribute('readonly', 'readonly'); - this.domainInputEL!.value = ''; - this.eventNameInputEL!.value = ''; + let eventInput = this.eventProcessInput?.shadowRoot?.querySelector('#singleInput'); + eventInput!.value = ''; } } - get domain(): string { - if (this.domainInputEL!.value.length > 0 && this.domainInputEL!.value !== 'ALL-Domain') { - return this.domainInputEL!.value; - } - return ''; - } - - get eventName(): string { - if (this.eventNameInputEL!.value.length > 0) { - return this.eventNameInputEL!.value; + get process(): string { + if (this.eventProcessInput!.value.length > 0) { + return this.eventProcessInput!.value; } return ''; } @@ -63,128 +50,85 @@ export class SpHisysEvent extends BaseElement { return this.hasAttribute('startSamp'); } - get sysEventConfigPath(): string { - return '/system/etc/hiview/hisysevent.def'; - } - initElements(): void { - this.domainInputEL = this.shadowRoot?.querySelector('.record-domain-input'); - this.eventNameInputEL = this.shadowRoot?.querySelector('.record-event-input'); - this.sysEventConfigList = this.shadowRoot?.querySelectorAll('.record-input'); - this.sysEventSwitch = this.shadowRoot?.querySelector('lit-switch') as LitSwitch; - this.sysEventSwitch?.addEventListener('change', (event: CustomEventInit) => { + let hisysEventSwitch = this.shadowRoot?.querySelector('lit-switch') as LitSwitch; + hisysEventSwitch.addEventListener('change', (event: CustomEventInit) => { let detail = event.detail; - this.startSamp = detail!.checked; - this.updateDisable(detail!.checked); + if (detail!.checked) { + this.startSamp = true; + this.unDisable(); + } else { + this.startSamp = false; + this.disable(); + } }); - this.updateDisable(false); - this.domainInputEl = this.domainInputEL?.shadowRoot?.querySelector('.multipleSelect') as HTMLInputElement; - this.nameInputEl = this.eventNameInputEL?.shadowRoot?.querySelector('.multipleSelect') as HTMLInputElement; - this.domainInputEl.addEventListener('valuable', () => { - this.eventNameInputEL!.value = ''; + this.eventProcessInput = this.shadowRoot?.querySelector('lit-allocation-select'); + let hisyEventProcessInput = this.eventProcessInput?.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; + this.selectProcess = this.eventProcessInput!.shadowRoot?.querySelector('input') as HTMLInputElement; + hisyEventProcessInput!.addEventListener('mousedown', (ev) => { + if (SpRecordTrace.serialNumber === '') { + this.eventProcessInput!.processData = []; + this.eventProcessInput!.initData(); + } }); + hisyEventProcessInput!.addEventListener('mouseup', () => { + if (SpRecordTrace.serialNumber === '') { + this.eventProcessInput!.processData = []; + this.eventProcessInput!.initData(); + } else { + Cmd.getProcess().then((processList) => { + this.eventProcessInput!.processData = processList; + this.eventProcessInput!.initData(); + }); + } + }); + this.disable(); } - connectedCallback(): void { - super.connectedCallback(); - this.domainInputEl?.addEventListener('mousedown', this.domainInputEvent); - this.nameInputEl?.addEventListener('mousedown', this.nameInputEvent); - } - - disconnectedCallback(): void { - super.disconnectedCallback(); - this.domainInputEl?.removeEventListener('mousedown', this.domainInputEvent); - this.nameInputEl?.removeEventListener('mousedown', this.nameInputEvent); + private unDisable(): void { + let hisysEventConfigVals = this.shadowRoot?.querySelectorAll('.config'); + hisysEventConfigVals!.forEach((hisysEventConfigVal) => { + hisysEventConfigVal.removeAttribute('disabled'); + }); } - domainInputEvent = (): void => { - if (SpRecordTrace.serialNumber === '') { - this.domainInputEL!.processData = []; - this.domainInputEL!.initData(); - } else { - HdcDeviceManager.fileRecv(this.sysEventConfigPath, () => { - }).then((pullRes) => { - pullRes.arrayBuffer().then((buffer) => { - if (buffer.byteLength > 0) { - let dec = new TextDecoder(); - this.eventConfig = JSON.parse(dec.decode(buffer)); - let domainList = Object.keys(this.eventConfig!); - if (domainList.length > 0 && this.startSamp) { - this.domainInputEl!.setAttribute('readonly', 'readonly'); - domainList.unshift('ALL-Domain'); - } - this.domainInputEL!.processData = domainList; - this.domainInputEL!.initData(); - } - }); - }); - } - }; - - nameInputEvent = (): void => { - if (SpRecordTrace.serialNumber === '') { - this.eventNameInputEL!.processData = []; - this.eventNameInputEL!.initData(); - } else { - let domain = this.domainInputEL?.value; - // @ts-ignore - let eventConfigElement = this.eventConfig[domain]; - if (eventConfigElement) { - let eventNameList = Object.keys(eventConfigElement); - if (eventNameList?.length > 0 && this.startSamp) { - this.nameInputEl!.setAttribute('readonly', 'readonly'); - this.eventNameInputEL!.processData = eventNameList; - this.eventNameInputEL!.initData(); - } - } else { - this.eventNameInputEL!.value = ''; - this.eventNameInputEL!.processData = []; - this.eventNameInputEL!.initData(); - } - } - }; - - private updateDisable(isDisable: boolean): void { - this.sysEventConfigList!.forEach((configEL) => { - if (isDisable) { - configEL.removeAttribute('disabled'); - } else { - configEL.setAttribute('disabled', ''); + private disable(): void { + let hisysEventConfigVals = this.shadowRoot?.querySelectorAll('.config'); + hisysEventConfigVals!.forEach((hisysEventConfigVal) => { + if (hisysEventConfigVal.title !== 'Start Hisystem Event Tracker Record') { + hisysEventConfigVal.setAttribute('disabled', ''); } }); } - private getCssStyle(): string { + initHtml(): string { return ` `; - } - initHtml(): string { - return ` - ${this.getCssStyle()} + .event-input { + border: 1px solid var(--dark-background5,#ccc); + font-family: Helvetica; + font-size: 14px; + color: var(--dark-color1,#212121); + text-align: left; + line-height: 20px; + font-weight: 400; + } +
    -
    +
    Start Hisystem Event Tracker Record
    -
    -
    - Domain - Record Domain Name -
    - - -
    -
    +
    - EventName - Record Event Name + AppName + Record AppName
    - - +
    `; diff --git a/ide/src/trace/component/setting/SpProbesConfig.ts b/ide/src/trace/component/setting/SpProbesConfig.ts index 83e799a54..30daee587 100644 --- a/ide/src/trace/component/setting/SpProbesConfig.ts +++ b/ide/src/trace/component/setting/SpProbesConfig.ts @@ -35,8 +35,6 @@ export class SpProbesConfig extends BaseElement { private ftraceBufferSizeResult: HTMLDivElement | null | undefined; private ftraceSlider: LitSlider | null | undefined; - private ftraceBuffSizeResultInput: HTMLInputElement | null | undefined; - set startSamp(allocationStart: boolean) { if (allocationStart) { this.setAttribute('startSamp', ''); @@ -112,12 +110,6 @@ export class SpProbesConfig extends BaseElement { } initElements(): void { - this.ftraceBuffSizeResultInput = this.shadowRoot?.querySelector('.ftrace-buff-size-result') as HTMLInputElement; - this.ftraceBuffSizeResultInput!.addEventListener('keydown', (ev: any) => { - if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { - ev.preventDefault(); - } - }); this.traceConfigList = [ { value: 'Scheduling details', @@ -382,50 +374,45 @@ export class SpProbesConfig extends BaseElement { private unDisable() { this.startSamp = true; - let checkDesBoxDis = this.shadowRoot?.querySelectorAll('check-des-box'); - let litCheckBoxDis = this.shadowRoot?.querySelectorAll('lit-check-box'); - - let defaultSelected: any = []; - defaultSelected = defaultSelected.concat( - this.traceConfigList, - this.memoryConfigList, - this.abilityConfigList, - this.hitraceConfigList - ); - - this.shadowRoot?.querySelector("[value='Hitrace categories']")?.setAttribute('checked', 'true'); - this.ftraceSlider!.removeAttribute('disabled'); - - checkDesBoxDis?.forEach((item: any) => { - item.removeAttribute('disabled'); - }); - - litCheckBoxDis?.forEach((item: any) => { - item.removeAttribute('disabled'); - }); - - defaultSelected.filter((item: any) => { - if (item.isSelect) - this.shadowRoot?.querySelector(`[value='${item.value}']`)?.setAttribute('checked', 'true'); - }); + let checkDesBoxDis=this.shadowRoot?.querySelectorAll('check-des-box') + let litCheckBoxDis=this.shadowRoot?.querySelectorAll('lit-check-box') + + let defaultSelected:any=[] + defaultSelected=defaultSelected.concat(this.traceConfigList,this.memoryConfigList,this.abilityConfigList,this.hitraceConfigList) + + this.shadowRoot?.querySelector("[value='Hitrace categories']")?.setAttribute('checked','true') + this.ftraceSlider!.removeAttribute('disabled') + + checkDesBoxDis?.forEach((item:any)=>{ + item.removeAttribute('disabled') + }) + + litCheckBoxDis?.forEach((item:any)=>{ + item.removeAttribute('disabled') + }) + + defaultSelected.filter((item:any)=>{ + if(item.isSelect) this.shadowRoot?.querySelector(`[value='${item.value}']`)?.setAttribute('checked','true') + }) } private disable() { this.startSamp = false; - let checkDesBoxDis = this.shadowRoot?.querySelectorAll('check-des-box'); - let litCheckBoxDis = this.shadowRoot?.querySelectorAll('lit-check-box'); + let checkDesBoxDis=this.shadowRoot?.querySelectorAll('check-des-box') + let litCheckBoxDis=this.shadowRoot?.querySelectorAll('lit-check-box') - this.ftraceSlider!.setAttribute('disabled', ''); + this.ftraceSlider!.setAttribute('disabled','') + + checkDesBoxDis?.forEach((item:any)=>{ + item.setAttribute('disabled','') + item.checked=false + }) - checkDesBoxDis?.forEach((item: any) => { - item.setAttribute('disabled', ''); - item.checked = false; - }); + litCheckBoxDis?.forEach((item:any)=>{ + item.setAttribute('disabled','') + item.checked=false + }) - litCheckBoxDis?.forEach((item: any) => { - item.setAttribute('disabled', ''); - item.checked = false; - }); } initHtml(): string { @@ -586,8 +573,8 @@ export class SpProbesConfig extends BaseElement {
    -
    - +
    + KB
    diff --git a/ide/src/trace/component/setting/SpRecordSetting.ts b/ide/src/trace/component/setting/SpRecordSetting.ts index 0421f3630..757f4a3d4 100644 --- a/ide/src/trace/component/setting/SpRecordSetting.ts +++ b/ide/src/trace/component/setting/SpRecordSetting.ts @@ -132,7 +132,7 @@ export class SpRecordSetting extends BaseElement { this.bufferNumber = this.shadowRoot?.querySelector('.buffer-size') as HTMLElement; this.durationNumber = this.shadowRoot?.querySelector('.max-duration') as HTMLElement; let inputs = this.shadowRoot?.querySelectorAll('input'); - inputs!.forEach((item) => { + inputs!.forEach(item => { item.addEventListener('keydown', (ev) => { // @ts-ignore if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { @@ -168,7 +168,7 @@ export class SpRecordSetting extends BaseElement {
    - + MB
    `; @@ -555,7 +555,7 @@ export class SpRecordSetting extends BaseElement {
    - + MB
    diff --git a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts index e6f458fd2..fb9361959 100644 --- a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts +++ b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts @@ -836,9 +836,6 @@ export function levelFromJSON(object: any): Level { case 4: case 'Warn': return Level.LOG_WARN; - case 5: - case 'Fatal': - return Level.LOG_FATAL; case -1: case 'UNRECOGNIZED': default: @@ -852,7 +849,6 @@ export enum Level { LOG_INFO = 'INFO', LOG_DEBUG = 'DEBUG', LOG_WARN = 'WARN', - LOG_FATAL = 'FATAL', UNRECOGNIZED = -1, } @@ -911,8 +907,7 @@ export interface HiperfPluginConfig { export interface HiSystemEventConfig { msg: string; - subscribe_domain: string; - subscribe_event: string; + processName: string; } export interface ArkTSConfig { diff --git a/ide/src/trace/component/setting/utils/PluginConvertUtils.ts b/ide/src/trace/component/setting/utils/PluginConvertUtils.ts index b3b9ff0fe..4d97e5d19 100644 --- a/ide/src/trace/component/setting/utils/PluginConvertUtils.ts +++ b/ide/src/trace/component/setting/utils/PluginConvertUtils.ts @@ -241,4 +241,4 @@ export class PluginConvertUtils { } } -const LevelConfigEnumList = ['LEVEL_UNSPECIFIED', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] +const LevelConfigEnumList = ['LEVEL_UNSPECIFIED', 'DEBUG', 'INFO', 'WARN', 'ERROR'] diff --git a/ide/src/trace/component/trace/base/ColorUtils.ts b/ide/src/trace/component/trace/base/ColorUtils.ts index c3c75ef11..fe7cea2de 100644 --- a/ide/src/trace/component/trace/base/ColorUtils.ts +++ b/ide/src/trace/component/trace/base/ColorUtils.ts @@ -116,21 +116,6 @@ export class ColorUtils { return logColor; } - public static getHisysEventColor(level: string): string { - let eventColor: string = '#00000'; - switch (level) { - case 'MINOR': - eventColor = '#000000'; - break; - case 'CRITICAL': - eventColor = '#FF4040'; - break; - default: - break; - } - return eventColor; - } - public static hash(str: string, max: number): number { let colorA: number = 0x811c9dc5; let colorB: number = 0xfffffff; diff --git a/ide/src/trace/component/trace/base/Extension.ts b/ide/src/trace/component/trace/base/Extension.ts index ab3cd8c4c..ac74308db 100644 --- a/ide/src/trace/component/trace/base/Extension.ts +++ b/ide/src/trace/component/trace/base/Extension.ts @@ -58,6 +58,7 @@ declare global { WakeupList: string; //show wakeup list table DeviceConnect: string; DeviceDisConnect: string; + ProcessSwitch: string }; }; @@ -113,6 +114,7 @@ window.SmartEvent = { WakeupList: 'SmartEvent-UI-WakeupList', DeviceConnect: 'SmartEvent-DEVICE_CONNECT', DeviceDisConnect: 'SmartEvent-DEVICE_DISCONNECT', + ProcessSwitch: 'SmartEvent-Process_Switch' }, }; Window.prototype.subscribe = (ev, fn) => EventCenter.subscribe(ev, fn); diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index d454bfbda..5852e6472 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -119,7 +119,6 @@ export class TraceRow extends HTMLElement { static FRAME_WIDTH: number = 0; static range: TimeRange | undefined | null; static rangeSelectObject: RangeSelectStruct | undefined; - static ROW_TYPE_HI_SYSEVENT = 'hi-sysevent'; public obj: TraceRowObject | undefined | null; isHover: boolean = false; hoverX: number = 0; @@ -292,10 +291,6 @@ export class TraceRow extends HTMLElement { this.rowSettingTree!.treeData = value || []; } - set rowSettingMultiple(value: boolean) { - this.rowSettingTree!.multiple = value; - } - get rowSettingList(): TreeItemData[] | null | undefined { return this._rowSettingList; } @@ -701,13 +696,6 @@ export class TraceRow extends HTMLElement { this.rowSettingTree!.onChange = (e: any): void => { // @ts-ignore this.rowSettingPop!.visible = false; - if (this.rowSettingTree?.multiple) { - // @ts-ignore - this.rowSettingPop!.visible = true; - } else { - // @ts-ignore - this.rowSettingPop!.visible = false; - } this.onRowSettingChangeHandler?.(this.rowSettingTree!.getCheckdKeys(), this.rowSettingTree!.getCheckdNodes()); }; this.checkType = '-1'; diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts index 5d70b5305..9148d35d3 100644 --- a/ide/src/trace/component/trace/base/TraceSheet.ts +++ b/ide/src/trace/component/trace/base/TraceSheet.ts @@ -29,7 +29,7 @@ import { CpuFreqStruct } from '../../../database/ui-worker/ProcedureWorkerFreq.j import { CpuFreqLimitsStruct } from '../../../database/ui-worker/ProcedureWorkerCpuFreqLimits.js'; import { type ThreadStruct } from '../../../database/ui-worker/ProcedureWorkerThread.js'; import { type FuncStruct } from '../../../database/ui-worker/ProcedureWorkerFunc.js'; -import { type ProcessMemStruct } from '../../../database/ui-worker/ProcedureWorkerMem.js'; +import { ProcessMemStruct } from '../../../database/ui-worker/ProcedureWorkerMem.js'; import { CpuStateStruct } from '../../../database/ui-worker/ProcedureWorkerCpuState.js'; import { type ClockStruct } from '../../../database/ui-worker/ProcedureWorkerClock.js'; import { type IrqStruct } from '../../../database/ui-worker/ProcedureWorkerIrq.js'; @@ -76,20 +76,26 @@ import { type TabPaneJsCpuStatistics } from '../sheet/ark-ts/TabPaneJsCpuStatist import { type TabPaneGpuClickSelectComparison } from '../sheet/gpu/TabPaneGpuClickSelectComparison.js'; import { Utils } from './Utils.js'; import { TabPaneHiLogs } from '../sheet/hilog/TabPaneHiLogs.js'; -import { TabPaneHiLogSummary } from '../sheet/hilog/TabPaneHiLogSummary.js'; import { TabPaneGpuResourceVmTracker } from '../sheet/vmtracker/TabPaneGpuResourceVmTracker.js'; import { type LitPageTable } from '../../../../base-ui/table/LitPageTable.js'; +import '../../../../base-ui/popover/LitPopoverV.js'; +import { LitPopover } from '../../../../base-ui/popover/LitPopoverV.js'; +import { LitTree, TreeItemData } from '../../../../base-ui/tree/LitTree.js'; @element('trace-sheet') export class TraceSheet extends BaseElement { systemLogFlag: Flag | undefined | null; private litTabs: LitTabs | undefined | null; + private switchDiv: LitPopover | undefined | null; + private processTree: LitTree | undefined | null; private importDiv: HTMLDivElement | undefined | null; private exportBt: LitIcon | undefined | null; private nav: HTMLDivElement | undefined | null; private selection: SelectionParam | undefined | null; private currentPaneID: string = 'current-selection'; private fragment: DocumentFragment | undefined; + private lastSelectIPid: number = -1; + private lastProcessSet: Set = new Set(); static get observedAttributes(): string[] { return ['mode']; @@ -115,6 +121,7 @@ export class TraceSheet extends BaseElement { displayTab(...names: string[]): T { this.setAttribute('mode', 'max'); this.showUploadSoBt(null); + this.showSwitchProcessBt(null); this.shadowRoot ?.querySelectorAll('#tabs lit-tabpane') .forEach((it) => (it.hidden = !names.some((k) => k === it.id))); @@ -139,6 +146,20 @@ export class TraceSheet extends BaseElement { initElements(): void { this.litTabs = this.shadowRoot?.querySelector('#tabs'); this.importDiv = this.shadowRoot?.querySelector('#import_div'); + this.switchDiv = this.shadowRoot?.querySelector('#select-process'); + this.processTree = this.shadowRoot?.querySelector('#processTree'); + this.processTree!.onChange = (e: any): void => { + const select = this.processTree!.getCheckdKeys(); + const selectIPid = Number(select[0]); + if (selectIPid === this.lastSelectIPid) { + return; + } + this.switchDiv!.visible = 'false'; + window.publish(window.SmartEvent.UI.ProcessSwitch, { ipid: selectIPid }); + this.lastSelectIPid = selectIPid; + }; + + // }; this.buildTabs(this.litTabs); this.litTabs!.onTabClick = (e: any): void => this.loadTabPaneData(e.detail.key); this.litTabs!.addEventListener('close-handler', () => { @@ -295,11 +316,11 @@ export class TraceSheet extends BaseElement { tabs!.style.height = navRoot!.offsetHeight + 'px'; litTabpane!.forEach((node: HTMLDivElement) => (node!.style.height = '0px')); tabsPackUp!.name = 'up'; - tabsPackUp!.title = '恢复'; + tabsPackUp!.title = 'Reset Tab'; (window as any).isPackUpTable = true; } else { tabsPackUp!.name = 'down'; - tabsPackUp!.title = '最小化'; + tabsPackUp!.title = 'Minimize Tab'; tabs!.style.height = initialHeight.tabs; litTabpane!.forEach((node: HTMLDivElement) => (node!.style.height = initialHeight.node)); } @@ -375,22 +396,38 @@ export class TraceSheet extends BaseElement { height: 30vh; background-color: var(--dark-background,#FFFFFF); } + #check-popover[visible="true"] #check-des{ + color: #0A59F7; + } + .popover{ + color: var(--dark-color1,#4b5766); + justify-content: center; + align-items: center; + margin-right: 10px; + z-index: 2; + }
    -
    + +
    + +
    + +     +
    - + - + - +
    @@ -428,10 +465,11 @@ export class TraceSheet extends BaseElement { val.nativeMemoryStatistic.push(rowType); val.nativeMemory = []; val.leftNs = data.startTime!; - val.rightNs = data.dur === 0 ? data.startTime! : (data.startTime! + data.dur! - 1); + val.rightNs = data.dur === 0 ? data.startTime! : data.startTime! + data.dur! - 1; this.selection = val; this.displayTab('box-native-statistic-analysis', 'box-native-calltree').data = val; this.showUploadSoBt(val); + this.showSwitchProcessBt(val); }; displayGpuSelectedData = (type: string, startTs: number, dataList: Array): void => { @@ -625,6 +663,7 @@ export class TraceSheet extends BaseElement { this.selection = selection; this.exportBt!.style.display = 'flex'; this.showUploadSoBt(selection); + this.showSwitchProcessBt(selection); Reflect.ownKeys(tabConfig) .reverse() .forEach((id) => { @@ -657,7 +696,7 @@ export class TraceSheet extends BaseElement { } } - updateRangeSelect(): boolean { + updateRangeSelect(data?: any): boolean { if ( this.selection && (this.selection.nativeMemory.length > 0 || @@ -674,6 +713,10 @@ export class TraceSheet extends BaseElement { Object.assign(param, this.selection); if (param.nativeMemory.length > 0 || param.nativeMemoryStatistic.length > 0) { Utils.getInstance().initResponseTypeList(param); + if (data) { + Utils.getInstance().setCurrentSelectIPid(Number(data.ipid)); + param.nativeMemoryCurrentIPid = Number(data.ipid); + } } this.rangeSelect(param, true); return true; @@ -700,6 +743,46 @@ export class TraceSheet extends BaseElement { this.importDiv!.style.display = 'none'; } } + isProcessEqual(treeData: Array<{ pid: number; ipid: number }>): boolean { + if (treeData.length !== this.lastProcessSet.size) { + return false; + } + for (let process of treeData) { + if (!this.lastProcessSet.has(process.ipid)) { + return false; + } + } + return true; + } + + showSwitchProcessBt(selection: SelectionParam | null | undefined): void { + // 2个及以上进程再显示 + if (selection && selection.nativeMemoryAllProcess.length > 1) { + this.switchDiv!.style.display = 'flex'; + if (this.isProcessEqual(selection.nativeMemoryAllProcess)) { + return; + } + this.lastProcessSet = new Set(); + const processArray: Array = []; + let isFirst: boolean = true; + for (let process of selection.nativeMemoryAllProcess) { + const treeData: TreeItemData = { + key: `${process.ipid}`, + title: `Process ${process.pid}`, + checked: isFirst, + }; + if (isFirst) { + this.lastSelectIPid = process.ipid; + isFirst = false; + } + processArray.push(treeData); + this.lastProcessSet.add(process.ipid); + } + this.processTree!.treeData = processArray; + } else { + this.switchDiv!.style.display = 'none'; + } + } loadTabPaneData(key: string): void { let component: any = this.shadowRoot diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts index 323b686c8..7b2f793a2 100644 --- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts +++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts @@ -120,8 +120,6 @@ import { TabPaneGpuResourceVmTracker } from '../sheet/vmtracker/TabPaneGpuResour import { TabPaneGpuGraph } from '../sheet/gpu/TabPaneGraph.js'; import { TabPaneFreqUsage } from '../sheet/frequsage/TabPaneFreqUsage.js'; import { TabPaneFreqDataCut } from '../sheet/frequsage/TabPaneFreqDataCut.js'; -import { TabPaneHisysEvents } from '../sheet/hisysevent/TabPaneHisysEvents.js'; -import { TabPaneHiSysEventSummary } from '../sheet/hisysevent/TabPaneHiSysEventSummary.js'; export let tabConfig: any = { 'current-selection': { @@ -640,14 +638,4 @@ export let tabConfig: any = { type: TabPaneFreqDataCut, require: (param: SelectionParam) => param.threadIds.length > 0 && param.threadIds.length < 2, }, - 'tab-hisysevents': { - title: 'HiSysevents', - type: TabPaneHisysEvents, - require: (param: SelectionParam) => param.hiSysEvents.length > 0, - }, - 'tab-hisysevents-summary': { - title: 'Statistics', - type: TabPaneHiSysEventSummary, - require: (param: SelectionParam) => param.hiSysEvents.length > 0, - }, }; diff --git a/ide/src/trace/component/trace/base/Utils.ts b/ide/src/trace/component/trace/base/Utils.ts index 57c435742..12cbe7751 100644 --- a/ide/src/trace/component/trace/base/Utils.ts +++ b/ide/src/trace/component/trace/base/Utils.ts @@ -456,7 +456,7 @@ export class Utils { return Math.max(startTime, startTime1) <= Math.min(endTime, endTime1); } - initResponseTypeList(val: SelectionParam | any) { + initResponseTypeList(val: SelectionParam): void { const isStatistic = val.nativeMemoryStatistic.length > 0; const selection = isStatistic ? val.nativeMemoryStatistic : val.nativeMemory; let types: Array = []; @@ -486,4 +486,8 @@ export class Utils { procedurePool.submitWithName('logic1', 'native-memory-init-responseType', res, undefined, () => {}); }); } + + setCurrentSelectIPid(ipid: number): void{ + procedurePool.submitWithName('logic1', 'native-memory-set-current_ipid', ipid, undefined, () => {}); + } } diff --git a/ide/src/trace/component/trace/sheet/SheetUtils.ts b/ide/src/trace/component/trace/sheet/SheetUtils.ts index b86760973..9635f1965 100644 --- a/ide/src/trace/component/trace/sheet/SheetUtils.ts +++ b/ide/src/trace/component/trace/sheet/SheetUtils.ts @@ -168,3 +168,21 @@ export class ParseExpression { } } } + +export function initSort(table: LitTable, sortKey: string, sortType: number, filterValue?: string): void { + sortKey = ''; + sortType = 0; + if (filterValue) { + filterValue = ''; + } + const theadTable = table!.shadowRoot?.querySelector('.thead'); + const thTable = theadTable?.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (theadTable!.hasAttribute('sort')) { + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg): void => { + svg.style.display = 'none'; + }); + }); + } +} diff --git a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts index 51a1fb9e3..f53778d42 100644 --- a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts +++ b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts @@ -59,6 +59,17 @@ export class TabPaneFilter extends BaseElement { private cutList: Array | undefined; private libraryList: Array | undefined; private transferChecked: string | undefined; + private isStatisticsMem: Boolean = false; + + get isStatisticsMemory() { + return this.isStatisticsMem; + } + set isStatisticsMemory(value) { + if (value) { + let hideThreadEL = this.shadowRoot?.querySelector('.popover .tree-check:nth-child(4)'); + hideThreadEL?.classList.add('hide'); + } + } filterData(type: string, data: object = {}) { return { @@ -73,7 +84,7 @@ export class TabPaneFilter extends BaseElement { }; } - showThird(b: boolean) { + showThird(b: boolean): void { if (b) { if (this.thirdSelectEL?.value) { this.setAttribute('third', ''); @@ -85,11 +96,11 @@ export class TabPaneFilter extends BaseElement { } } - disabledTransfer(b: boolean, str?: string) { + disabledTransfer(b: boolean, str?: string): void { if (b) { this.setAttribute('disableTransfer', ''); } else { - if (str == 'perf') { + if (str === 'perf') { this.setAttribute('perf', 'perf'); } this.removeAttribute('disableTransfer'); @@ -104,40 +115,40 @@ export class TabPaneFilter extends BaseElement { this.iconEL = this.shadowRoot?.querySelector('#icon'); this.statisticsName = this.shadowRoot?.querySelector('.statistics-name'); let transferEL = this.shadowRoot?.querySelector('.transfer-text'); - this.iconEL!.onclick = (e) => { - if (this.iconEL!.name == 'statistics') { + this.iconEL!.onclick = (e): void => { + if (this.iconEL!.name === 'statistics') { this.iconEL!.name = 'menu'; this.iconEL!.size = 18; if (this.getFilter) { this.getFilter(this.filterData('icon')); } - if (this.getAttribute('perf') == 'perf') { + if (this.getAttribute('perf') === 'perf') { this.disabledTransfer(false); } - } else if (this.iconEL!.name == 'menu') { + } else if (this.iconEL!.name === 'menu') { this.iconEL!.name = 'statistics'; this.iconEL!.size = 16; if (this.getFilter) { this.getFilter(this.filterData('icon')); } - if(this.getAttribute('perf') == 'perf') { + if (this.getAttribute('perf') === 'perf') { this.disabledTransfer(true); } } }; - transferEL!.onclick = () => { + transferEL!.onclick = (): void => { this.getTransferList(); }; - this.markButtonEL!.onclick = (e) => { + this.markButtonEL!.onclick = (e: MouseEvent): void => { if (this.getFilter) { this.getFilter(this.filterData('mark', { mark: true })); } }; - this.filterInputEL?.addEventListener('keyup', (event: any) => { - if (event.keyCode == 13) { + this.filterInputEL?.addEventListener('keyup', (event: any): void => { + if (event.keyCode === 13) { if (this.getFilter) { this.getFilter( this.filterData('inputValue', { @@ -149,7 +160,7 @@ export class TabPaneFilter extends BaseElement { event.stopPropagation(); }); - this.filterInputEL?.addEventListener('keypress', (event: any) => { + this.filterInputEL?.addEventListener('keypress', (event: any): void => { event.stopPropagation(); }); @@ -163,24 +174,26 @@ export class TabPaneFilter extends BaseElement { this.initializeLibrary(); - this.shadowRoot!.querySelectorAll('.mining-button').forEach((e, idx) => { - e!.onclick = (ev) => { - if (idx == 0) { - const restoreList = this.cutList!.filter((item) => item.highlight === true); - const list = this.cutList!.filter((item) => item.highlight === false); - this.cutList = list; - if (this.getMining) { - this.getMining({ - type: 'button', - item: 'restore', - remove: restoreList, - }); + this.shadowRoot!.querySelectorAll('.mining-button').forEach( + (e: HTMLDivElement, idx: number): void => { + e!.onclick = (ev): void => { + if (idx === 0) { + const restoreList = this.cutList!.filter((item: any): boolean => item.highlight === true); + const list = this.cutList!.filter((item): boolean => item.highlight === false); + this.cutList = list; + if (this.getMining) { + this.getMining({ + type: 'button', + item: 'restore', + remove: restoreList, + }); + } + this.initializeMining(); } - this.initializeMining(); - } - }; - }); - this.shadowRoot!.querySelector('.library-button')!.onclick = (ev) => { + }; + } + ); + this.shadowRoot!.querySelector('.library-button')!.onclick = (ev): void => { const restoreList = this.libraryList!.filter((item) => item.highlight === true); const list = this.libraryList!.filter((item) => item.highlight === false); this.libraryList = list; @@ -194,18 +207,18 @@ export class TabPaneFilter extends BaseElement { this.initializeLibrary(); }; - this.shadowRoot!.querySelector('#data-mining')!.onclick = (e) => { + this.shadowRoot!.querySelector('#data-mining')!.onclick = (e): void => { if (this.getMining) { this.getMining({ type: 'button', item: 'symbol' }); } }; - this.shadowRoot!.querySelector('#data-library')!.onclick = (e) => { + this.shadowRoot!.querySelector('#data-library')!.onclick = (e): void => { if (this.getLibrary) { this.getLibrary({ type: 'button', item: 'library' }); } }; - this.shadowRoot!.querySelector('.sort')!.onclick = (e) => { - let statisticsType = this.statisticsName!.textContent == 'Statistics by Operation'; + this.shadowRoot!.querySelector('.sort')!.onclick = (e): void => { + let statisticsType = this.statisticsName!.textContent === 'Statistics by Operation'; this.statisticsName!.textContent = statisticsType ? 'Statistics by Thread' : 'Statistics by Operation'; if (this.getStatisticsType) { this.getStatisticsType(statisticsType ? 'thread' : 'operation'); @@ -217,7 +230,7 @@ export class TabPaneFilter extends BaseElement { this.firstSelectEL!.value = value; } - get firstSelect() { + get firstSelect(): string { return this.firstSelectEL?.value || ''; } @@ -225,7 +238,7 @@ export class TabPaneFilter extends BaseElement { this.secondSelectEL!.value = value; } - get secondSelect() { + get secondSelect(): string { return this.secondSelectEL?.value || ''; } @@ -233,7 +246,7 @@ export class TabPaneFilter extends BaseElement { this.filterInputEL!.value = value; } - get filterValue() { + get filterValue(): string { return this.filterInputEL!.value; } @@ -241,15 +254,15 @@ export class TabPaneFilter extends BaseElement { this.thirdSelectEL!.value = value; } - get thirdSelect() { + get thirdSelect(): string { return this.thirdSelectEL?.value || ''; } - get inputPlaceholder() { + get inputPlaceholder(): string { return this.getAttribute('inputPlaceholder') || 'Detail Filter'; } - get icon() { + get icon(): string { if (this.getAttribute('icon') != 'false') { if (this.iconEL!.name == 'statistics') { return 'tree'; @@ -273,7 +286,7 @@ export class TabPaneFilter extends BaseElement { } } - get disabledMining() { + get disabledMining(): boolean { return this.hasAttribute('disabledMining'); } @@ -285,27 +298,27 @@ export class TabPaneFilter extends BaseElement { } } - setFilterModuleSelect(module: string, styleName: any, value: any) { + setFilterModuleSelect(module: string, styleName: any, value: any): void { this.shadowRoot!.querySelector(module)!.style[styleName] = value; } - getCallTreeData(getCallTree: (v: any) => void) { + getCallTreeData(getCallTree: (v: any) => void): void { this.getCallTree = getCallTree; } - getCallTransferData(getCallTransfer: (v: any) => void) { + getCallTransferData(getCallTransfer: (v: any) => void): void { this.getCallTransfer = getCallTransfer; } - getCallTreeConstraintsData(getCallTreeConstraints: (v: any) => void) { + getCallTreeConstraintsData(getCallTreeConstraints: (v: any) => void): void { this.getCallTreeConstraints = getCallTreeConstraints; } - getFilterData(getFilter: (v: FilterData) => void) { + getFilterData(getFilter: (v: FilterData) => void): void { this.getFilter = getFilter; } - getStatisticsTypeData(getStatisticsType: (v: any) => void) { + getStatisticsTypeData(getStatisticsType: (v: any) => void): void { this.getStatisticsType = getStatisticsType; } @@ -316,7 +329,7 @@ export class TabPaneFilter extends BaseElement { secondTitle = 'Allocation Type', thirdList: Array | null | undefined = null, thirdTitle = 'Responsible Library' - ) { + ): void { let sLE = this.shadowRoot?.querySelector('#load'); let html = ``; if (firstList) { @@ -345,7 +358,7 @@ export class TabPaneFilter extends BaseElement { } thtml += ``; if (thirdList) { - if (thirdTitle != '') { + if (thirdTitle !== '') { thtml += `${thirdTitle}`; } thirdList!.forEach((a, b) => { @@ -357,7 +370,7 @@ export class TabPaneFilter extends BaseElement { if (!firstList && !secondList) { this.thirdSelectEL!.outerHTML = thtml; this.thirdSelectEL = this.shadowRoot?.querySelector('#third-select'); - this.thirdSelectEL!.onchange = (e) => { + this.thirdSelectEL!.onchange = (e): void => { if (this.getFilter) { this.getFilter(this.filterData('thirdSelect')); } @@ -379,53 +392,153 @@ export class TabPaneFilter extends BaseElement { this.firstSelectEL = this.shadowRoot?.querySelector('#first-select'); this.secondSelectEL = this.shadowRoot?.querySelector('#second-select'); - this.firstSelectEL!.onchange = (e) => { + this.firstSelectEL!.onchange = (e): void => { if (this.getFilter) { this.getFilter(this.filterData('firstSelect')); } }; - this.secondSelectEL!.onchange = (e) => { + this.secondSelectEL!.onchange = (e): void => { if (this.getFilter) { this.getFilter(this.filterData('secondSelect')); } }; - this.thirdSelectEL!.onchange = (e) => { + this.thirdSelectEL!.onchange = (e): void => { if (this.getFilter) { this.getFilter(this.filterData('thirdSelect')); } }; } + setOptionsList(list: Array) { + let divEl = this.shadowRoot!.querySelector('#check-popover > div'); + divEl!.innerHTML = ''; + for (let text of list) { + let idName = text.replace(/\s/g, ''); + idName = idName[0].toLocaleLowerCase() + idName.slice(1); + divEl!.innerHTML += `
    ${text}
    `; + } + } + initializeCallTree() { let row = this.shadowRoot!.querySelectorAll('.tree-check'); - row.forEach((e, idx) => { + row.forEach((e, idx): void => { let check = e.querySelector('lit-check-box'); - e.querySelector('div')!.onclick = (ev) => { + e.querySelector('div')!.onclick = (ev): void => { if (this.getCallTree) { - if (idx == 0) { + if (idx === 0) { + this.getCallTree({ + checks: [ + !check!.checked, + row[1].querySelector('lit-check-box')!.checked, + row[2].querySelector('lit-check-box')!.checked, + row[3].querySelector('lit-check-box')!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], + value: idx, + }); + } else if (idx === 1) { + this.getCallTree({ + checks: [ + row[0].querySelector('lit-check-box')!.checked, + !check!.checked, + row[2].querySelector('lit-check-box')!.checked, + row[3].querySelector('lit-check-box')!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], + value: idx, + }); + } else if (idx === 2) { + this.getCallTree({ + checks: [ + row[0].querySelector('lit-check-box')!.checked, + row[1].querySelector('lit-check-box')!.checked, + !check!.checked, + row[3].querySelector('lit-check-box')!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], + value: idx, + }); + } else if (idx === 3) { this.getCallTree({ - checks: [!check!.checked, row[1].querySelector('lit-check-box')!.checked], + checks: [ + row[0].querySelector('lit-check-box')!.checked, + row[1].querySelector('lit-check-box')!.checked, + row[2].querySelector('lit-check-box')!.checked, + !check!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], value: idx, }); - } else { + } else if (idx === 4) { this.getCallTree({ - checks: [row[0].querySelector('lit-check-box')!.checked, !check!.checked], + checks: [ + row[0].querySelector('lit-check-box')!.checked, + row[1].querySelector('lit-check-box')!.checked, + row[2].querySelector('lit-check-box')!.checked, + row[3].querySelector('lit-check-box')!.checked, + !check!.checked, + ], value: idx, }); } } check!.checked = !check!.checked; }; - check!.onchange = (ev: any) => { + check!.onchange = (ev: any): void => { if (this.getCallTree) { - if (idx == 0) { + if (idx === 0) { + this.getCallTree({ + checks: [ + ev.target.checked, + row[1].querySelector('lit-check-box')!.checked, + row[2].querySelector('lit-check-box')!.checked, + row[3].querySelector('lit-check-box')!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], + value: idx, + }); + } else if (idx === 1) { + this.getCallTree({ + checks: [ + row[0].querySelector('lit-check-box')!.checked, + ev.target.checked, + row[2].querySelector('lit-check-box')!.checked, + row[3].querySelector('lit-check-box')!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], + value: idx, + }); + } else if (idx === 2) { + this.getCallTree({ + checks: [ + row[0].querySelector('lit-check-box')!.checked, + row[1].querySelector('lit-check-box')!.checked, + ev.target.checked, + row[3].querySelector('lit-check-box')!.checked, + row[4].querySelector('lit-check-box')!.checked, + ], + value: idx, + }); + } else if (idx === 3) { this.getCallTree({ - checks: [ev.target.checked, row[1].querySelector('lit-check-box')!.checked], + checks: [ + row[0].querySelector('lit-check-box')!.checked, + row[1].querySelector('lit-check-box')!.checked, + row[2].querySelector('lit-check-box')!.checked, + ev.target.checked, + row[4].querySelector('lit-check-box')!.checked, + ], value: idx, }); - } else { + } else if (idx === 4) { this.getCallTree({ - checks: [row[0].querySelector('lit-check-box')!.checked, ev.target.checked], + checks: [ + row[0].querySelector('lit-check-box')!.checked, + row[1].querySelector('lit-check-box')!.checked, + row[2].querySelector('lit-check-box')!.checked, + row[3].querySelector('lit-check-box')!.checked, + ev.target.checked, + ], value: idx, }); } @@ -434,13 +547,13 @@ export class TabPaneFilter extends BaseElement { }); } - initializeTreeTransfer() { + initializeTreeTransfer(): void { let radioList = this.shadowRoot!.querySelectorAll('.radio'); let divElement = this.shadowRoot!.querySelectorAll('.tree-radio'); if (this.transferChecked && this.transferChecked !== 'count') { radioList![Number(this.transferChecked)].checked = true; - } else if (this.transferChecked && this.transferChecked == 'count') { + } else if (this.transferChecked && this.transferChecked === 'count') { radioList![radioList.length - 1].checked = true; } @@ -471,23 +584,23 @@ export class TabPaneFilter extends BaseElement { }); } - refreshTreeTransfer() { + refreshTreeTransfer(): void { let radioList = this.shadowRoot!.querySelectorAll('.radio'); if (this.transferChecked && this.transferChecked !== 'count') { radioList![Number(this.transferChecked)].checked = false; - } else if (this.transferChecked && this.transferChecked == 'count') { + } else if (this.transferChecked && this.transferChecked === 'count') { radioList![radioList.length - 1].checked = false; } this.transferChecked = ''; } - initializeTreeConstraints() { + initializeTreeConstraints(): void { let inputs = this.shadowRoot!.querySelectorAll('.constraints-input'); let check = this.shadowRoot!.querySelector('#constraints-check'); - check!.onchange = (ev: any) => { - inputs.forEach((e: any, idx) => { - if (inputs[idx].value == '') { - inputs[idx].value = idx == 0 ? '0' : '∞'; + check!.onchange = (ev: any): void => { + inputs.forEach((e: any, idx: number): void => { + if (inputs[idx].value === '') { + inputs[idx].value = idx === 0 ? '0' : '∞'; } ev.target.checked ? e.removeAttribute('disabled') : e.setAttribute('disabled', ''); }); @@ -499,22 +612,22 @@ export class TabPaneFilter extends BaseElement { }); } }; - inputs.forEach((e, idx) => { + inputs.forEach((e: HTMLInputElement, idx: number): void => { e.oninput = function () { // @ts-ignore this.value = this.value.replace(/\D/g, ''); }; - e.addEventListener('keyup', (event: any) => { + e.addEventListener('keyup', (event: any): void => { event.stopPropagation(); - if (event.keyCode == '13') { - if (event?.target.value == '') { - inputs[idx].value = idx == 0 ? '0' : '∞'; + if (event.keyCode === '13') { + if (event?.target.value === '') { + inputs[idx].value = idx === 0 ? '0' : '∞'; } if (this.getCallTreeConstraints) { this.getCallTreeConstraints({ checked: check!.checked, - min: idx == 0 ? event?.target.value : inputs[0].value, - max: idx == 1 ? event?.target.value : inputs[1].value, + min: idx === 0 ? event?.target.value : inputs[0].value, + max: idx === 1 ? event?.target.value : inputs[1].value, }); } } @@ -522,9 +635,9 @@ export class TabPaneFilter extends BaseElement { }); } - initializeMining() { + initializeMining(): void { let html = ``; - this.cutList!.forEach((a, b) => { + this.cutList!.forEach((a: any, b: number): void => { html += `
    ('#mining-row')!.innerHTML = html; let row = this.shadowRoot!.querySelector('#mining-row')!.childNodes; - row!.forEach((e: any, idx) => { - e!.querySelector('#title')!.onclick = (ev: any) => { - if (e.getAttribute('highlight') == '') { + row!.forEach((e: any, idx: number): void => { + e!.querySelector('#title')!.onclick = (ev: any): void => { + if (e.getAttribute('highlight') === '') { e.removeAttribute('highlight'); this.cutList![idx].highlight = false; } else { @@ -546,7 +659,7 @@ export class TabPaneFilter extends BaseElement { } }; // @ts-ignore - e!.querySelector('lit-check-box')!.onchange = (ev) => { + e!.querySelector('lit-check-box')!.onchange = (ev): void => { // @ts-ignore this.cutList[idx].checked = e!.querySelector('lit-check-box')!.checked; if (this.getMining) { @@ -556,9 +669,9 @@ export class TabPaneFilter extends BaseElement { }); } - initializeLibrary() { + initializeLibrary(): void { let html = ``; - this.libraryList!.forEach((a, b) => { + this.libraryList!.forEach((a: any, b: number): void => { html += `
    ('#library-row')!.innerHTML = html; let row = this.shadowRoot!.querySelector('#library-row')!.childNodes; - row!.forEach((e: any, idx) => { - e!.querySelector('#title')!.onclick = (ev: any) => { - if (e.getAttribute('highlight') == '') { + row!.forEach((e: any, idx: number): void => { + e!.querySelector('#title')!.onclick = (ev: any): void => { + if (e.getAttribute('highlight') === '') { e.removeAttribute('highlight'); this.libraryList![idx].highlight = false; } else { @@ -581,7 +694,7 @@ export class TabPaneFilter extends BaseElement { }; // @ts-ignore - e!.querySelector('lit-check-box')!.onchange = (ev) => { + e!.querySelector('lit-check-box')!.onchange = (ev: any): void => { // @ts-ignore this.libraryList[idx].checked = e!.querySelector('lit-check-box')!.checked; if (this.getLibrary) { @@ -594,18 +707,18 @@ export class TabPaneFilter extends BaseElement { }); } - getDataMining(getMining: (v: MiningData) => void) { + getDataMining(getMining: (v: MiningData) => void): void { this.getMining = getMining; } - getDataLibrary(getLibrary: (v: MiningData) => void) { + getDataLibrary(getLibrary: (v: MiningData) => void): void { this.getLibrary = getLibrary; } - addDataMining(data: any, type: string) { - let list: Array = (type == 'symbol' ? this.cutList : this.libraryList) || []; - let idx = list!.findIndex((e) => e.name == data.name); - if (idx == -1) { + addDataMining(data: any, type: string): number { + let list: Array = (type === 'symbol' ? this.cutList : this.libraryList) || []; + let idx = list!.findIndex((e) => e.name === data.name); + if (idx === -1) { list!.push({ type: type, name: data.name, @@ -629,12 +742,20 @@ export class TabPaneFilter extends BaseElement { return idx; } - getFilterTreeData() { + getFilterTreeData(): { + callTree: boolean[]; + callTreeConstraints: { + checked: boolean; + inputs: string[]; + }; + dataMining: any[] | undefined; + dataLibrary: any[] | undefined; + } { let row = this.shadowRoot!.querySelectorAll('.tree-check lit-check-box'); let inputs = this.shadowRoot!.querySelectorAll('.constraints-input'); let check = this.shadowRoot!.querySelector('#constraints-check'); let data = { - callTree: [row[0]!.checked, row[1]!.checked], + callTree: [row[0]!.checked, row[1]!.checked, row[2]!.checked, row[3]!.checked, row[4]!.checked], callTreeConstraints: { checked: check!.checked, inputs: [inputs[0].value == '' ? '0' : inputs[0].value, inputs[1].value == '' ? '∞' : inputs[1].value], @@ -645,10 +766,10 @@ export class TabPaneFilter extends BaseElement { return data; } - async getTransferList() { + async getTransferList(): Promise { let dataCmd: { id: number; cmdStr: string }[] = (await queryTransferList()) as { id: number; cmdStr: string }[]; let html = ''; - dataCmd.forEach((item) => { + dataCmd.forEach((item: { id: number; cmdStr: string }): void => { html += `
    ${item.cmdStr}
    `; }); @@ -658,10 +779,10 @@ export class TabPaneFilter extends BaseElement { this.initializeTreeTransfer(); } - initializeFilterTree(callTree: boolean = true, treeConstraints: boolean = true, mining: boolean = true) { + initializeFilterTree(callTree: boolean = true, treeConstraints: boolean = true, mining: boolean = true): void { if (callTree) { let row = this.shadowRoot!.querySelectorAll('.tree-check'); - row.forEach((e, idx) => { + row.forEach((e: Element, idx: number): void => { let check = e.querySelector('lit-check-box'); check!.checked = false; }); @@ -771,6 +892,21 @@ export class TabPaneFilter extends BaseElement { :host(:not([input])) #pane-filter-input{ display: none; } + :host(:not([fileSystem])) .popover .tree-check:nth-child(3){ + display: none; + } + :host([fileSystem]) .popover .tree-check:nth-child(5){ + display: none; + } + :host([nativeMemory]) .popover .tree-check:nth-child(3){ + display:none; + } + :host([nativeMemory]) .popover .tree-check:nth-child(5){ + display:none; + } + :host([isStatisticsMemory]) .popover .tree-check:nth-child(4){ + display:none; + } :host(:not([mark])) #mark{ display: none; } @@ -798,6 +934,9 @@ export class TabPaneFilter extends BaseElement { :host(:not([icon])) #icon{ display: none; } + :host(:not([options])) #check-popover{ + display: none; + } #icon[name="statistics"]{ margin-left: 12px; } @@ -829,6 +968,9 @@ export class TabPaneFilter extends BaseElement { #call-tree-popover[visible="true"] #call-tree{ color: #0A59F7; } + #check-popover[visible="true"] #check-des{ + color: #0A59F7; + } #tree-constraints-popover[visible="true"] #tree-constraints{ color: #0A59F7; } @@ -868,7 +1010,7 @@ export class TabPaneFilter extends BaseElement { width: 250px; overflow-y: auto; } - .tree-check{ + .check-wrap, .tree-check{ margin-bottom: 5px; display: flex; align-content: center; @@ -898,6 +1040,9 @@ export class TabPaneFilter extends BaseElement { .radio{ cursor: pointer; } + .hide{ + display: none; + } Input Filter @@ -910,8 +1055,15 @@ export class TabPaneFilter extends BaseElement {
    Invert
    Hide System so
    +
    Hide Event
    +
    Hide Thread
    +
    Hide Thread State
    Options + + +
    + Options
    diff --git a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts index 69c37acb3..cc47674bb 100644 --- a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts +++ b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts @@ -33,16 +33,8 @@ export class TabPaneJsCpuStatistics extends BaseElement { private sortKey = 'timeStr'; private sortType = 2; private statisticsPie: LitChartPie | null | undefined; - private currentSelection: SelectionParam | undefined; set data(data: SelectionParam | Array) { - if (data instanceof SelectionParam) { - if (data === this.currentSelection) { - return; - } - this.currentSelection = data; - } - this.init(); this.clearData(); this.progress!.loading = true; diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts index 6aa14a6d8..a5a10c009 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts @@ -23,7 +23,10 @@ import { FilterData, TabPaneFilter } from '../TabPaneFilter.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { MerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; import { showButtonMenu } from '../SheetUtils.js'; -import { findSearchNode } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; + +const InvertOptionIndex: number = 0; +const hideEventOptionIndex: number = 2; +const hideThreadOptionIndex: number = 3; @element('tabpane-calltree') export class TabPaneCallTree extends BaseElement { @@ -35,14 +38,14 @@ export class TabPaneCallTree extends BaseElement { private callTreeRightSource: Array = []; private callTreeFilter: any; private callTreeDataSource: any[] = []; - private callTreeSortKey = 'weight'; - private callTreeSortType = 0; + private callTreeSortKey: string = 'weight'; + private callTreeSortType: number = 0; private callTreeSelectedData: any = undefined; private frameChart: FrameChart | null | undefined; private isChartShow: boolean = false; - private systmeRuleName = '/system/'; - private callTreeNumRuleName = '/max/min/'; - private needShowMenu = true; + private systmeRuleName: string = '/system/'; + private callTreeNumRuleName: string = '/max/min/'; + private needShowMenu: boolean = true; private searchValue: string = ''; private loadingList: number[] = []; private loadingPage: any; @@ -63,6 +66,7 @@ export class TabPaneCallTree extends BaseElement { } else { this.callTreeFilter!.style.display = 'none'; } + procedurePool.submitWithName('logic0', 'fileSystem-reset', [], undefined, () => {}); this.callTreeFilter!.initializeFilterTree(true, true, true); this.callTreeFilter!.filterValue = ''; this.callTreeProgressEL!.loading = true; @@ -92,7 +96,7 @@ export class TabPaneCallTree extends BaseElement { ); } - initModeAndAction() { + initModeAndAction(): void { if (this.procedureAction === '' && this.hasAttribute('action')) { this.procedureAction = this.getAttribute('action') || ''; } @@ -145,14 +149,14 @@ export class TabPaneCallTree extends BaseElement { return false; } - setRightTableData(bean: MerageBean) { + setRightTableData(bean: MerageBean): void { let parents: Array = []; let children: Array = []; this.getParentTree(this.callTreeDataSource, bean, parents); - let maxId = bean.id; - let maxDur = 0; + let maxId: string = bean.id; + let maxDur: number = 0; - function findMaxStack(bean: MerageBean) { + function findMaxStack(bean: MerageBean): void { if (bean.children.length === 0) { if (bean.dur > maxDur) { maxDur = bean.dur; @@ -177,8 +181,8 @@ export class TabPaneCallTree extends BaseElement { this.callTreeTbr!.dataSource = len === 0 ? [] : callTreeArr; } - connectedCallback() { - this.parentElement!.onscroll = () => { + connectedCallback(): void { + this.parentElement!.onscroll = (): void => { this.frameChart!.tabPaneScrollTop = this.parentElement!.scrollTop; }; this.frameChart!.addChartClickListener((needShowMenu: boolean) => { @@ -187,7 +191,7 @@ export class TabPaneCallTree extends BaseElement { this.needShowMenu = needShowMenu; }); let filterHeight = 0; - new ResizeObserver((entries) => { + new ResizeObserver((entries: ResizeObserverEntry[]): void => { let callTreeTabFilter = this.shadowRoot!.querySelector('#filter') as HTMLElement; if (callTreeTabFilter.clientHeight > 0) filterHeight = callTreeTabFilter.clientHeight; if (this.parentElement!.clientHeight > filterHeight) { @@ -198,7 +202,7 @@ export class TabPaneCallTree extends BaseElement { if (this.callTreeTbl!.style.visibility === 'hidden') { callTreeTabFilter.style.display = 'none'; } - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { if (this.isChartShow) { this.frameChart?.updateCanvas(false, entries[0].contentRect.width); this.frameChart?.calculateChartData(); @@ -244,7 +248,7 @@ export class TabPaneCallTree extends BaseElement { } }); this.callTreeTbr = this.shadowRoot?.querySelector('#tb-list'); - this.callTreeTbr!.addEventListener('row-click', (evt: any) => { + this.callTreeTbr!.addEventListener('row-click', (evt: any): void => { // @ts-ignore let data = evt.detail.data as MerageBean; this.callTreeTbl?.clearAllSelection(data); @@ -256,7 +260,7 @@ export class TabPaneCallTree extends BaseElement { (evt.detail as any).callBack(true); } }); - let filterFunc = (data: any) => { + let filterFunc = (data: any): void => { let callTreeFuncArgs: any[] = []; if (data.type === 'check') { if (data.item.checked) { @@ -296,7 +300,7 @@ export class TabPaneCallTree extends BaseElement { if (this.callTreeSelectedData && !this.callTreeSelectedData.canCharge) { return; } - if (this.callTreeSelectedData != undefined) { + if (this.callTreeSelectedData !== undefined) { this.callTreeFilter!.addDataMining({ name: this.callTreeSelectedData.symbolName }, data.item); callTreeFuncArgs.push({ funcName: 'splitTree', @@ -309,7 +313,7 @@ export class TabPaneCallTree extends BaseElement { if (this.callTreeSelectedData && !this.callTreeSelectedData.canCharge) { return; } - if (this.callTreeSelectedData != undefined && this.callTreeSelectedData.libName != '') { + if (this.callTreeSelectedData !== undefined && this.callTreeSelectedData.libName !== '') { this.callTreeFilter!.addDataMining({ name: this.callTreeSelectedData.libName }, data.item); callTreeFuncArgs.push({ funcName: 'splitTree', @@ -319,7 +323,7 @@ export class TabPaneCallTree extends BaseElement { return; } } else if (data.item === 'restore') { - if (data.remove != undefined && data.remove.length > 0) { + if (data.remove !== undefined && data.remove.length > 0) { let list = data.remove.map((item: any) => { return item.name; }); @@ -356,7 +360,7 @@ export class TabPaneCallTree extends BaseElement { this.callTreeFilter!.getDataLibrary(filterFunc); this.callTreeFilter!.getDataMining(filterFunc); this.callTreeFilter!.getCallTreeData((data: any) => { - if (data.value === 0) { + if ([InvertOptionIndex, hideThreadOptionIndex, hideEventOptionIndex].includes(data.value)) { this.refreshAllNode({ ...this.callTreeFilter!.getFilterTreeData(), callTree: data.checks, @@ -421,7 +425,7 @@ export class TabPaneCallTree extends BaseElement { }); }); this.callTreeFilter!.getFilterData((callTreeFilterData: FilterData) => { - if (this.searchValue != this.callTreeFilter!.filterValue) { + if (this.searchValue !== this.callTreeFilter!.filterValue) { this.searchValue = this.callTreeFilter!.filterValue; let callTreeArgs = [ { @@ -433,7 +437,7 @@ export class TabPaneCallTree extends BaseElement { funcArgs: [], }, ]; - this.getDataByWorker(callTreeArgs, (result: any[]) => { + this.getDataByWorker(callTreeArgs, (result: any[]): void => { this.callTreeTbl!.isSearch = true; this.callTreeTbl!.setStatus(result, true); this.setLTableData(result); @@ -444,7 +448,7 @@ export class TabPaneCallTree extends BaseElement { this.switchFlameChart(callTreeFilterData); } }); - this.callTreeTbl!.addEventListener('column-click', (evt) => { + this.callTreeTbl!.addEventListener('column-click', (evt: Event): void => { // @ts-ignore this.callTreeSortKey = evt.detail.key; // @ts-ignore @@ -476,11 +480,21 @@ export class TabPaneCallTree extends BaseElement { } } - refreshAllNode(filterData: any) { + refreshAllNode(filterData: any): void { let callTreeArgs: any[] = []; let isTopDown: boolean = !filterData.callTree[0]; let isHideSystemLibrary = filterData.callTree[1]; + let isHideEvent: boolean = filterData.callTree[2]; + let isHideThread: boolean = filterData.callTree[3]; let list = filterData.dataMining.concat(filterData.dataLibrary); + callTreeArgs.push({ + funcName: 'hideThread', + funcArgs: [isHideThread], + }); + callTreeArgs.push({ + funcName: 'hideEvent', + funcArgs: [isHideEvent], + }); callTreeArgs.push({ funcName: 'getCallChainsBySampleIds', funcArgs: [isTopDown, this.queryFuncName], @@ -506,20 +520,20 @@ export class TabPaneCallTree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - this.getDataByWorker(callTreeArgs, (result: any[]) => { + this.getDataByWorker(callTreeArgs, (result: any[]): void => { this.setLTableData(result); this.frameChart!.data = this.callTreeDataSource; if (this.isChartShow) this.frameChart?.calculateChartData(); }); } - setLTableData(resultData: any[]) { + setLTableData(resultData: any[]): void { this.callTreeDataSource = this.sortCallFnTree(resultData); this.callTreeTbl!.recycleDataSource = this.callTreeDataSource; } sortCallFnTree(arr: Array): Array { - let sortArr = arr.sort((compareFnA, compareFnB) => { + let sortArr = arr.sort((compareFnA: any, compareFnB: any): number => { if (this.callTreeSortKey === 'self') { if (this.callTreeSortType === 0) { return compareFnB.dur - compareFnA.dur; @@ -538,13 +552,13 @@ export class TabPaneCallTree extends BaseElement { } } }); - sortArr.map((call) => { + sortArr.map((call: any): void => { call.children = this.sortCallFnTree(call.children); }); return sortArr; } - getDataByWorker(args: any[], handler: Function) { + getDataByWorker(args: any[], handler: Function): void { this.loadingList.push(1); this.loadingPage.style.visibility = 'visible'; this.callTreeProgressEL!.loading = true; @@ -553,7 +567,7 @@ export class TabPaneCallTree extends BaseElement { this.procedureAction, { args, callType: this.queryFuncName }, undefined, - (callTreeResults: any) => { + (callTreeResults: any): void => { handler(callTreeResults); this.loadingList.splice(0, 1); if (this.loadingList.length === 0) { @@ -631,11 +645,11 @@ export class TabPaneCallTree extends BaseElement {
    - + - +
    `; } diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts index 7399533a2..e6cdea03f 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts @@ -27,7 +27,10 @@ import '../TabPaneFilter.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { FileMerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerFileSystem.js'; import { showButtonMenu } from '../SheetUtils.js'; -import { findSearchNode } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; + +const InvertOptionIndex: number = 0; +const hideEventOptionIndex: number = 2; +const hideThreadOptionIndex: number = 3; @element('tabpane-filesystem-calltree') export class TabpaneFilesystemCalltree extends BaseElement { @@ -38,14 +41,14 @@ export class TabpaneFilesystemCalltree extends BaseElement { private fsCallTreeFilter: any; private fsCallTreeDataSource: any[] = []; private fsCallTreeSortKey = 'weight'; - private fsCallTreeSortType = 0; + private fsCallTreeSortType: number = 0; private fsCallTreeCurrentSelectedData: any = undefined; private frameChart: FrameChart | null | undefined; private isChartShow: boolean = false; - private systmeRuleName = '/system/'; - private fsCallTreeNumRuleName = '/max/min/'; + private systmeRuleName: string = '/system/'; + private fsCallTreeNumRuleName: string = '/max/min/'; private modal: DisassemblingWindow | null | undefined; - private needShowMenu = true; + private needShowMenu: boolean = true; private searchValue: string = ''; private loadingList: number[] = []; private loadingPage: any; @@ -65,6 +68,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { } else { this.fsCallTreeFilter!.style.display = 'none'; } + procedurePool.submitWithName('logic0', 'fileSystem-reset', [], undefined, () => {}); this.fsCallTreeFilter!.initializeFilterTree(true, true, true); this.fsCallTreeFilter!.filterValue = ''; this.fsCallTreeProgressEL!.loading = true; @@ -81,7 +85,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcArgs: [{ queryFuncName: 'fileSystem', ...fsCallTreeSelection }], }, ], - (fsCallTreeResults: any[]) => { + (fsCallTreeResults: any[]): void => { this.setLTableData(fsCallTreeResults); this.fsCallTreeTbr!.recycleDataSource = []; this.frameChart!.mode = ChartMode.Duration; @@ -100,7 +104,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { parents: Array ): boolean { for (let fsCallTreeBean of fsCallTreeSrc) { - if (fsCallTreeBean.id == fsCallTreeTarget.id) { + if (fsCallTreeBean.id === fsCallTreeTarget.id) { parents.push(fsCallTreeBean); return true; } else { @@ -115,7 +119,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { getChildTree(fsCallTreeSrc: Array, id: string, children: Array): boolean { for (let fsCallTreeBean of fsCallTreeSrc) { - if (fsCallTreeBean.id == id && fsCallTreeBean.children.length == 0) { + if (fsCallTreeBean.id === id && fsCallTreeBean.children.length === 0) { children.push(fsCallTreeBean); return true; } else { @@ -128,21 +132,21 @@ export class TabpaneFilesystemCalltree extends BaseElement { return false; } - setRightTableData(merageBean: FileMerageBean) { + setRightTableData(merageBean: FileMerageBean): void { let parents: Array = []; let children: Array = []; this.getParentTree(this.fsCallTreeDataSource, merageBean, parents); - let maxId = merageBean.id; - let maxDur = 0; + let maxId: string = merageBean.id; + let maxDur: number = 0; - function findMaxStack(fsMerageBean: FileMerageBean) { - if (fsMerageBean.children.length == 0) { + function findMaxStack(fsMerageBean: FileMerageBean): void { + if (fsMerageBean.children.length === 0) { if (fsMerageBean.dur > maxDur) { maxDur = fsMerageBean.dur; maxId = fsMerageBean.id; } } else { - fsMerageBean.children.map((callChild: any) => { + fsMerageBean.children.map((callChild: any): void => { findMaxStack(callChild); }); } @@ -157,7 +161,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { } let len = fsMerageParentsList.length; this.fsCallTreeRightSource = fsMerageParentsList; - this.fsCallTreeTbr!.dataSource = len == 0 ? [] : fsMerageParentsList; + this.fsCallTreeTbr!.dataSource = len === 0 ? [] : fsMerageParentsList; } initElements(): void { @@ -194,7 +198,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { } }); this.fsCallTreeTbr = this.shadowRoot?.querySelector('#tb-filesystem-list'); - this.fsCallTreeTbr!.addEventListener('row-click', (evt: any) => { + this.fsCallTreeTbr!.addEventListener('row-click', (evt: any): void => { // @ts-ignore let data = evt.detail.data as FileMerageBean; this.fsCallTreeTbl?.clearAllSelection(data); @@ -206,18 +210,18 @@ export class TabpaneFilesystemCalltree extends BaseElement { (evt.detail as any).callBack(true); } }); - this.modal!.setCloseListener(() => { + this.modal!.setCloseListener((): void => { this.modal!.style.display = 'none'; this.fsCallTreeTbl!.style.visibility = 'visible'; this.shadowRoot!.querySelector('#filter')!.style.display = 'flex'; }); - let filterFunc = (data: any) => { + let filterFunc = (data: any): void => { let fsCallTreeFuncArgs: any[] = []; - if (data.type == 'check') { + if (data.type === 'check') { if (data.item.checked) { fsCallTreeFuncArgs.push({ funcName: 'splitTree', - funcArgs: [data.item.name, data.item.select == '0', data.item.type == 'symbol'], + funcArgs: [data.item.name, data.item.select === '0', data.item.type === 'symbol'], }); } else { fsCallTreeFuncArgs.push({ @@ -233,7 +237,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcArgs: [data.item.name], }); } - } else if (data.type == 'select') { + } else if (data.type === 'select') { fsCallTreeFuncArgs.push({ funcName: 'resotreAllNode', funcArgs: [[data.item.name]], @@ -246,12 +250,12 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcName: 'splitTree', funcArgs: [data.item.name, data.item.select == '0', data.item.type == 'symbol'], }); - } else if (data.type == 'button') { + } else if (data.type === 'button') { if (data.item == 'symbol') { if (this.fsCallTreeCurrentSelectedData && !this.fsCallTreeCurrentSelectedData.canCharge) { return; } - if (this.fsCallTreeCurrentSelectedData != undefined) { + if (this.fsCallTreeCurrentSelectedData !== undefined) { this.fsCallTreeFilter!.addDataMining({ name: this.fsCallTreeCurrentSelectedData.symbolName }, data.item); fsCallTreeFuncArgs.push({ funcName: 'splitTree', @@ -260,11 +264,11 @@ export class TabpaneFilesystemCalltree extends BaseElement { } else { return; } - } else if (data.item == 'library') { + } else if (data.item === 'library') { if (this.fsCallTreeCurrentSelectedData && !this.fsCallTreeCurrentSelectedData.canCharge) { return; } - if (this.fsCallTreeCurrentSelectedData != undefined && this.fsCallTreeCurrentSelectedData.libName != '') { + if (this.fsCallTreeCurrentSelectedData !== undefined && this.fsCallTreeCurrentSelectedData.libName !== '') { this.fsCallTreeFilter!.addDataMining({ name: this.fsCallTreeCurrentSelectedData.libName }, data.item); fsCallTreeFuncArgs.push({ funcName: 'splitTree', @@ -273,8 +277,8 @@ export class TabpaneFilesystemCalltree extends BaseElement { } else { return; } - } else if (data.item == 'restore') { - if (data.remove != undefined && data.remove.length > 0) { + } else if (data.item === 'restore') { + if (data.remove !== undefined && data.remove.length > 0) { let list = data.remove.map((item: any) => { return item.name; }); @@ -295,7 +299,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { } } } - this.getDataByWorker(fsCallTreeFuncArgs, (result: any[]) => { + this.getDataByWorker(fsCallTreeFuncArgs, (result: any[]): void => { this.setLTableData(result); this.frameChart!.data = this.fsCallTreeDataSource; if (this.isChartShow) this.frameChart?.calculateChartData(); @@ -310,8 +314,8 @@ export class TabpaneFilesystemCalltree extends BaseElement { }; this.fsCallTreeFilter!.getDataLibrary(filterFunc); this.fsCallTreeFilter!.getDataMining(filterFunc); - this.fsCallTreeFilter!.getCallTreeData((data: any) => { - if (data.value == 0) { + this.fsCallTreeFilter!.getCallTreeData((data: any): void => { + if ([InvertOptionIndex, hideThreadOptionIndex, hideEventOptionIndex].includes(data.value)) { this.refreshAllNode({ ...this.fsCallTreeFilter!.getFilterTreeData(), callTree: data.checks, @@ -369,13 +373,13 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - this.getDataByWorker(fsCallTreeConstraintsArgs, (result: any[]) => { + this.getDataByWorker(fsCallTreeConstraintsArgs, (result: any[]): void => { this.setLTableData(result); this.frameChart!.data = this.fsCallTreeDataSource; if (this.isChartShow) this.frameChart?.calculateChartData(); }); }); - this.fsCallTreeFilter!.getFilterData((data: FilterData) => { + this.fsCallTreeFilter!.getFilterData((data: FilterData): void => { if (this.searchValue != this.fsCallTreeFilter!.filterValue) { this.searchValue = this.fsCallTreeFilter!.filterValue; let fileArgs = [ @@ -388,7 +392,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcArgs: [], }, ]; - this.getDataByWorker(fileArgs, (result: any[]) => { + this.getDataByWorker(fileArgs, (result: any[]): void => { this.fsCallTreeTbl!.isSearch = true; this.fsCallTreeTbl!.setStatus(result, true); this.setLTableData(result); @@ -399,7 +403,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { this.switchFlameChart(data); } }); - this.fsCallTreeTbl!.addEventListener('column-click', (evt) => { + this.fsCallTreeTbl!.addEventListener('column-click', (evt): void => { // @ts-ignore this.fsCallTreeSortKey = evt.detail.key; // @ts-ignore @@ -410,10 +414,10 @@ export class TabpaneFilesystemCalltree extends BaseElement { }); } - connectedCallback() { + connectedCallback(): void { super.connectedCallback(); let filterHeight = 0; - new ResizeObserver((entries) => { + new ResizeObserver((entries: ResizeObserverEntry[]): void => { let fsCallTreeTabFilter = this.shadowRoot!.querySelector('#filter') as HTMLElement; if (fsCallTreeTabFilter.clientHeight > 0) filterHeight = fsCallTreeTabFilter.clientHeight; if (this.parentElement!.clientHeight > filterHeight) { @@ -422,10 +426,10 @@ export class TabpaneFilesystemCalltree extends BaseElement { fsCallTreeTabFilter.style.display = 'none'; } this.modal!.style.height = this.fsCallTreeTbl!.clientHeight - 2 + 'px'; //2 is borderWidth - if (this.fsCallTreeTbl!.style.visibility == 'hidden') { + if (this.fsCallTreeTbl!.style.visibility === 'hidden') { fsCallTreeTabFilter.style.display = 'none'; } - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { if (this.isChartShow) { this.frameChart?.updateCanvas(false, entries[0].contentRect.width); this.frameChart?.calculateChartData(); @@ -441,22 +445,22 @@ export class TabpaneFilesystemCalltree extends BaseElement { this.loadingPage.style.height = this.parentElement!.clientHeight - 24 + 'px'; } }).observe(this.parentElement!); - this.parentElement!.onscroll = () => { + this.parentElement!.onscroll = (): void => { this.frameChart!.tabPaneScrollTop = this.parentElement!.scrollTop; }; } - switchFlameChart(data?: any) { + switchFlameChart(data?: any): void { let fsCallTreePageTab = this.shadowRoot?.querySelector('#show_table'); let fsCallTreePageChart = this.shadowRoot?.querySelector('#show_chart'); - if (!data || data.icon == 'block') { + if (!data || data.icon === 'block') { fsCallTreePageChart?.setAttribute('class', 'show'); fsCallTreePageTab?.setAttribute('class', ''); this.isChartShow = true; this.fsCallTreeFilter!.disabledMining = true; showButtonMenu(this.fsCallTreeFilter, this.needShowMenu); this.frameChart?.calculateChartData(); - } else if (data.icon == 'tree') { + } else if (data.icon === 'tree') { fsCallTreePageChart?.setAttribute('class', ''); fsCallTreePageTab?.setAttribute('class', 'show'); showButtonMenu(this.fsCallTreeFilter, true); @@ -467,11 +471,21 @@ export class TabpaneFilesystemCalltree extends BaseElement { } } - refreshAllNode(filterData: any) { + refreshAllNode(filterData: any): void { let fileSysCallTreeArgs: any[] = []; let isTopDown: boolean = !filterData.callTree[0]; let isHideSystemLibrary = filterData.callTree[1]; + let isHideEvent: boolean = filterData.callTree[2]; + let isHideThread: boolean = filterData.callTree[3]; let list = filterData.dataMining.concat(filterData.dataLibrary); + fileSysCallTreeArgs.push({ + funcName: 'hideThread', + funcArgs: [isHideThread], + }); + fileSysCallTreeArgs.push({ + funcName: 'hideEvent', + funcArgs: [isHideEvent], + }); fileSysCallTreeArgs.push({ funcName: 'getCallChainsBySampleIds', funcArgs: [isTopDown, 'fileSystem'], @@ -497,32 +511,32 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - this.getDataByWorker(fileSysCallTreeArgs, (result: any[]) => { + this.getDataByWorker(fileSysCallTreeArgs, (result: any[]): void => { this.setLTableData(result); this.frameChart!.data = this.fsCallTreeDataSource; if (this.isChartShow) this.frameChart?.calculateChartData(); }); } - setLTableData(resultData: any[]) { + setLTableData(resultData: any[]): void { this.fsCallTreeDataSource = this.sortTree(resultData); this.fsCallTreeTbl!.recycleDataSource = this.fsCallTreeDataSource; } sortTree(arr: Array): Array { let fsCallTreeSortArr = arr.sort((fsCallTreeA, fsCallTreeB) => { - if (this.fsCallTreeSortKey == 'self') { - if (this.fsCallTreeSortType == 0) { + if (this.fsCallTreeSortKey === 'self') { + if (this.fsCallTreeSortType === 0) { return fsCallTreeB.dur - fsCallTreeA.dur; - } else if (this.fsCallTreeSortType == 1) { + } else if (this.fsCallTreeSortType === 1) { return fsCallTreeA.selfDur - fsCallTreeB.selfDur; } else { return fsCallTreeB.selfDur - fsCallTreeA.selfDur; } } else { - if (this.fsCallTreeSortType == 0) { + if (this.fsCallTreeSortType === 0) { return fsCallTreeB.dur - fsCallTreeA.dur; - } else if (this.fsCallTreeSortType == 1) { + } else if (this.fsCallTreeSortType === 1) { return fsCallTreeA.dur - fsCallTreeB.dur; } else { return fsCallTreeB.dur - fsCallTreeA.dur; @@ -535,7 +549,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { return fsCallTreeSortArr; } - getDataByWorker(args: any[], handler: Function) { + getDataByWorker(args: any[], handler: Function): void { this.loadingList.push(1); this.fsCallTreeProgressEL!.loading = true; this.loadingPage.style.visibility = 'visible'; @@ -547,7 +561,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { (fsCallTreeResults: any) => { handler(fsCallTreeResults); this.loadingList.splice(0, 1); - if (this.loadingList.length == 0) { + if (this.loadingList.length === 0) { this.fsCallTreeProgressEL!.loading = false; this.loadingPage.style.visibility = 'hidden'; } @@ -623,11 +637,11 @@ export class TabpaneFilesystemCalltree extends BaseElement {
    - + - +
    `; } diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts index 63fd95caa..b15270b59 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts @@ -21,10 +21,13 @@ import '../../../../../base-ui/chart/pie/LitChartPie.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar'; import { Utils } from '../../base/Utils.js'; import { procedurePool } from '../../../../database/Procedure.js'; +import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; +import { TabPaneFilter } from '../TabPaneFilter.js'; +import { initSort } from '../SheetUtils.js'; @element('tabpane-file-statistics-analysis') export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { - private fileStatisticsAnalysisPie: LitChartPie | null | undefined; + private fsPieChart: LitChartPie | null | undefined; private fileStatisticsAnalysisCurrentSelection: SelectionParam | null | undefined; private fileStatisticsAnalysisProcessData: any; private fileStatisticsAnalysisThreadData!: any[]; @@ -39,13 +42,13 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { private fileStatisticsAnalysisTableFunction: LitTable | null | undefined; private sumDur: number = 0; private fileStatisticsAnalysisRange: HTMLLabelElement | null | undefined; - private back: HTMLDivElement | null | undefined; + private fsBack: HTMLDivElement | null | undefined; private tabName: HTMLDivElement | null | undefined; private fileStatisticsAnalysisProgressEL: LitProgressBar | null | undefined; - private fileStatisticsAnalysisProcessName: string = ''; + private fsProcessName: string = ''; private fileStatisticsAnalysisThreadName: string = ''; - private fileStatisticsAnalysisSortColumn: string = ''; - private fileStatisticsAnalysisSortType: number = 0; + private fsSortColumn: string = ''; + private fsSortType: number = 0; private typeName: string = ''; private currentLevel = -1; private currentLevelData!: Array; @@ -54,6 +57,13 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { private threadStatisticsData!: {}; private libStatisticsData!: {}; private functionStatisticsData!: {}; + private titleEl: HTMLDivElement | undefined | null; + private filterEl: TabPaneFilter | undefined | null; + private hideProcessCheckBox: LitCheckBox | undefined | null; + private hideThreadCheckBox: LitCheckBox | undefined | null; + private checkBoxs: NodeListOf | undefined | null; + private fsTableArray: NodeListOf | undefined | null; + set data(val: SelectionParam) { if (val === this.fileStatisticsAnalysisCurrentSelection) { this.fileStatisticsAnalysisPidData.unshift(this.processStatisticsData); @@ -62,15 +72,16 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisPidData.shift(this.processStatisticsData); return; } - this.clearData(); this.fileStatisticsAnalysisCurrentSelection = val; - this.fileStatisticsAnalysisTableProcess!.style.display = 'grid'; - this.fileStatisticsAnalysisTableThread!.style.display = 'none'; - this.fileStatisticsAnalysisTableSo!.style.display = 'none'; - this.fileStatisticsAnalysisTableType!.style.display = 'none'; - this.fileStatisticsAnalysisTableFunction!.style.display = 'none'; - this.back!.style.visibility = 'hidden'; - this.shadowRoot!.querySelector('.title')!.textContent = ''; + if (this.fsTableArray && this.fsTableArray.length > 0) { + for (let fsTable of this.fsTableArray) { + initSort(fsTable!, this.fsSortColumn, this.fsSortType); + } + } + this.reset(this.fileStatisticsAnalysisTableProcess!, false); + this.hideProcessCheckBox!.checked = false; + this.hideThreadCheckBox!.checked = false; + this.titleEl!.textContent = ''; this.tabName!.textContent = ''; this.fileStatisticsAnalysisRange!.textContent = 'Selected range: ' + parseFloat(((val.rightNs - val.leftNs) / 1000000.0).toFixed(5)) + ' ms'; @@ -93,63 +104,181 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { } initElements(): void { this.fileStatisticsAnalysisRange = this.shadowRoot?.querySelector('#time-range'); - this.fileStatisticsAnalysisPie = this.shadowRoot!.querySelector('#fs-chart-pie'); + this.fsPieChart = this.shadowRoot!.querySelector('#fs-chart-pie'); this.fileStatisticsAnalysisTableProcess = this.shadowRoot!.querySelector('#tb-process-usage'); this.fileStatisticsAnalysisTableThread = this.shadowRoot!.querySelector('#tb-thread-usage'); this.fileStatisticsAnalysisTableSo = this.shadowRoot!.querySelector('#tb-so-usage'); this.fileStatisticsAnalysisTableFunction = this.shadowRoot!.querySelector('#tb-function-usage'); - this.back = this.shadowRoot!.querySelector('.fs-go-back'); + this.fsBack = this.shadowRoot!.querySelector('.fs-go-back'); this.tabName = this.shadowRoot!.querySelector('.fs-subheading'); this.fileStatisticsAnalysisTableType = this.shadowRoot!.querySelector('#tb-type-usage'); this.fileStatisticsAnalysisProgressEL = this.shadowRoot?.querySelector('.progress') as LitProgressBar; this.goBack(); + this.titleEl = this.shadowRoot!.querySelector('.title'); + this.filterEl = this.shadowRoot?.querySelector('#filter'); + this.filterEl!.setOptionsList(['Hide Process', 'Hide Thread']); + let popover = this.filterEl!.shadowRoot!.querySelector('#check-popover'); + this.hideProcessCheckBox = popover!!.querySelector('div > #hideProcess'); + this.hideThreadCheckBox = popover!!.querySelector('div > #hideThread'); + this.checkBoxs = popover!.querySelectorAll('.check-wrap > lit-check-box'); + this.fsTableArray = this.shadowRoot!.querySelectorAll('lit-table') as NodeListOf; + for (let fsTable of this.fsTableArray) { + fsTable!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.fsSortColumn = evt.detail.key; + // @ts-ignore + this.fsSortType = evt.detail.sort; + this.sortByColumn(); + }); + fsTable!.addEventListener('row-hover', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.data) { + let tableData = detail.data; + tableData.isHover = true; + if (detail.callBack) { + detail.callBack(true); + } + } + this.fsPieChart?.showHover(); + this.fsPieChart?.hideTip(); + }); + } + for (let box of this.checkBoxs) { + box!.addEventListener('change', (event) => { + if (this.hideProcessCheckBox!.checked && this.hideThreadCheckBox!.checked) { + this.hideThread(); + this.fsBack!.style.visibility = 'hidden'; + } else if (this.hideProcessCheckBox!.checked && !this.hideThreadCheckBox!.checked) { + this.hideProcess(); + } else { + this.reset(this.fileStatisticsAnalysisTableProcess!, false); + this.getFilesystemProcess(this.fileStatisticsAnalysisProcessData); + } + }); + } + this.fileStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.fileProcessLevelClickEvent(data); + } + }); + this.fileStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.fileTypeLevelClickEvent(data); + } + }); + this.fileStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.fileThreadLevelClickEvent(data); + } + }); + this.fileStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.fileSoLevelClickEvent(data); + } + }); + } + + private reset(showTable: LitTable, isShowBack: boolean): void { + this.clearData(); + if (isShowBack) { + this.fsBack!.style.visibility = 'visible'; + } else { + this.fsBack!.style.visibility = 'hidden'; + this.titleEl!.textContent = ''; + } + if (this.fsTableArray) { + for (let table of this.fsTableArray) { + if (table === showTable) { + initSort(table!, this.fsSortColumn, this.fsSortType); + table.style.display = 'grid'; + table.setAttribute('hideDownload', ''); + } else { + table!.style.display = 'none'; + table!.removeAttribute('hideDownload'); + } + } + } } - clearData(): void { - this.fileStatisticsAnalysisPie!.dataSource = []; + + private clearData(): void { + this.fsPieChart!.dataSource = []; this.fileStatisticsAnalysisTableProcess!.recycleDataSource = []; this.fileStatisticsAnalysisTableThread!.recycleDataSource = []; this.fileStatisticsAnalysisTableType!.recycleDataSource = []; this.fileStatisticsAnalysisTableSo!.recycleDataSource = []; this.fileStatisticsAnalysisTableFunction!.recycleDataSource = []; } - goBack(): void { - this.back!.addEventListener('click', () => { + + private showAssignLevel(showFsTable: LitTable, hideFsTable: LitTable, currentLevel: number): void { + showFsTable!.style.display = 'grid'; + hideFsTable!.style.display = 'none'; + hideFsTable.setAttribute('hideDownload', ''); + showFsTable?.removeAttribute('hideDownload'); + this.currentLevel = currentLevel; + } + + private goBack(): void { + this.fsBack!.addEventListener('click', () => { if (this.tabName!.textContent === 'Statistic By type AllDuration') { - this.fileStatisticsAnalysisTableProcess!.style.display = 'grid'; - this.fileStatisticsAnalysisTableType!.style.display = 'none'; - this.back!.style.visibility = 'hidden'; - this.fileStatisticsAnalysisTableType!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableProcess?.removeAttribute('hideDownload'); - this.currentLevel = 0; + this.fsBack!.style.visibility = 'hidden'; + this.showAssignLevel(this.fileStatisticsAnalysisTableProcess!, this.fileStatisticsAnalysisTableType!, 0); this.processPieChart(); } else if (this.tabName!.textContent === 'Statistic By Thread AllDuration') { - this.fileStatisticsAnalysisTableType!.style.display = 'grid'; - this.fileStatisticsAnalysisTableThread!.style.display = 'none'; - this.fileStatisticsAnalysisTableThread!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableType?.removeAttribute('hideDownload'); - this.currentLevel = 1; + if (this.hideProcessCheckBox?.checked) { + this.fsBack!.style.visibility = 'hidden'; + } else { + this.fsBack!.style.visibility = 'visible'; + } + this.showAssignLevel(this.fileStatisticsAnalysisTableType!, this.fileStatisticsAnalysisTableThread!, 1); this.typePieChart(); } else if (this.tabName!.textContent === 'Statistic By Library AllDuration') { - this.fileStatisticsAnalysisTableThread!.style.display = 'grid'; - this.fileStatisticsAnalysisTableSo!.style.display = 'none'; - this.fileStatisticsAnalysisTableSo!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableThread?.removeAttribute('hideDownload'); - this.currentLevel = 2; - this.threadPieChart(); + if (this.hideThreadCheckBox?.checked) { + if (this.hideProcessCheckBox?.checked) { + this.fsBack!.style.visibility = 'hidden'; + } + this.showAssignLevel(this.fileStatisticsAnalysisTableType!, this.fileStatisticsAnalysisTableSo!, 1); + this.typePieChart(); + } else { + this.showAssignLevel(this.fileStatisticsAnalysisTableThread!, this.fileStatisticsAnalysisTableSo!, 2); + this.threadPieChart(); + } } else if (this.tabName!.textContent === 'Statistic By Function AllDuration') { - this.fileStatisticsAnalysisTableSo!.style.display = 'grid'; - this.fileStatisticsAnalysisTableFunction!.style.display = 'none'; - this.fileStatisticsAnalysisTableFunction!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableSo?.removeAttribute('hideDownload'); - this.currentLevel = 3; + this.showAssignLevel(this.fileStatisticsAnalysisTableSo!, this.fileStatisticsAnalysisTableFunction!, 3); this.libraryPieChart(); } }); } - processPieChart(): void { + + private hideProcess(): void { + this.reset(this.fileStatisticsAnalysisTableType!, false); + this.fsProcessName = ''; + this.getFilesystemType(null); + } + + private hideThread(it?: any): void { + this.reset(this.fileStatisticsAnalysisTableType!, true); + this.fsProcessName = ''; + this.fileStatisticsAnalysisThreadName = ''; + if (it) { + this.getFilesystemType(it); + } else { + this.getFilesystemType(null); + } + } + + private processPieChart(): void { // @ts-ignore this.sumDur = this.processStatisticsData.allDuration; - this.fileStatisticsAnalysisPie!.config = { + this.fsPieChart!.config = { appendPadding: 0, data: this.getFsPieChartData(this.fileStatisticsAnalysisPidData), angleField: 'duration', @@ -161,7 +290,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { tip: this.getFsTip(), angleClick: (fsPieClickItem): void => { // @ts-ignore - if (fsPieClickItem.tableName != 'other') { + if (fsPieClickItem.tableName !== 'other') { this.fileProcessLevelClickEvent(fsPieClickItem); } }, @@ -178,20 +307,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, ], }; - this.fileStatisticsAnalysisTableProcess!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let processData = evt.detail; - if (processData.data) { - let fspData = processData.data; - fspData.isHover = true; - if (processData.callBack) { - processData.callBack(true); - } - } - this.fileStatisticsAnalysisPie?.showHover(); - this.fileStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = ''; + this.titleEl!.textContent = ''; this.tabName!.textContent = 'Statistic By Process AllDuration'; this.fileStatisticsAnalysisPidData.unshift(this.processStatisticsData); this.fileStatisticsAnalysisTableProcess!.recycleDataSource = this.fileStatisticsAnalysisPidData; @@ -199,33 +315,19 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisPidData.shift(this.processStatisticsData); this.currentLevelData = this.fileStatisticsAnalysisPidData; this.fileStatisticsAnalysisTableProcess?.reMeauseHeight(); - this.fileStatisticsAnalysisTableProcess!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.fileStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileProcessLevelClickEvent(data); - } - }); } - fileProcessLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.fileStatisticsAnalysisTableProcess!.style.display = 'none'; - this.fileStatisticsAnalysisTableType!.style.display = 'grid'; - this.fileStatisticsAnalysisTableProcess!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableType?.removeAttribute('hideDownload'); + + private fileProcessLevelClickEvent(it: any): void { + this.reset(this.fileStatisticsAnalysisTableType!, true); this.getFilesystemType(it); // @ts-ignore - this.fileStatisticsAnalysisProcessName = it.tableName; - this.shadowRoot!.querySelector('.title')!.textContent = this.fileStatisticsAnalysisProcessName; - this.fileStatisticsAnalysisPie?.hideTip(); + this.fsProcessName = it.tableName; + this.titleEl!.textContent = this.fsProcessName; + this.fsPieChart?.hideTip(); } - typePieChart(): void { - this.fileStatisticsAnalysisPie!.config = { + + private typePieChart(): void { + this.fsPieChart!.config = { appendPadding: 0, data: this.fileStatisticsAnalysisTypeData, angleField: 'duration', @@ -251,20 +353,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, ], }; - this.fileStatisticsAnalysisTableType!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let typeData = evt.detail; - if (typeData.data) { - let fsaData = typeData.data; - fsaData.isHover = true; - if (typeData.callBack) { - typeData.callBack(true); - } - } - this.fileStatisticsAnalysisPie?.showHover(); - this.fileStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = this.fileStatisticsAnalysisProcessName; + this.titleEl!.textContent = this.fsProcessName; this.tabName!.textContent = 'Statistic By type AllDuration'; this.fileStatisticsAnalysisTypeData.unshift(this.typeStatisticsData); this.fileStatisticsAnalysisTableType!.recycleDataSource = this.fileStatisticsAnalysisTypeData; @@ -272,18 +361,8 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisTypeData.shift(this.typeStatisticsData); this.currentLevelData = this.fileStatisticsAnalysisTypeData; this.fileStatisticsAnalysisTableType?.reMeauseHeight(); - this.fileStatisticsAnalysisTableType!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.fileStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileTypeLevelClickEvent(data); - } - }); } + private getFileTypeTip() { return (obj: { obj: { tableName: any; durFormat: any; percent: any } }): string => { return `
    @@ -294,23 +373,32 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { `; }; } - fileTypeLevelClickEvent(it: any): void { - this.clearData(); - this.fileStatisticsAnalysisTableType!.style.display = 'none'; - this.fileStatisticsAnalysisTableThread!.style.display = 'grid'; - this.fileStatisticsAnalysisTableType!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableThread?.removeAttribute('hideDownload'); - this.getFilesystemThread(it); + + private fileTypeLevelClickEvent(it: any): void { + if (this.hideThreadCheckBox!.checked) { + this.reset(this.fileStatisticsAnalysisTableSo!, true); + this.getFilesystemSo(it); + } else { + this.reset(this.fileStatisticsAnalysisTableThread!, true); + this.getFilesystemThread(it); + } // @ts-ignore this.typeName = it.tableName; - this.shadowRoot!.querySelector('.title')!.textContent = - this.fileStatisticsAnalysisProcessName + ' / ' + this.typeName; - this.fileStatisticsAnalysisPie?.hideTip(); + let title = ''; + if (this.fsProcessName.length > 0) { + title += this.fsProcessName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName; + } + this.titleEl!.textContent = title; + this.fsPieChart?.hideTip(); } - threadPieChart(): void { + + private threadPieChart(): void { // @ts-ignore this.sumDur = this.threadStatisticsData.allDuration; - this.fileStatisticsAnalysisPie!.config = { + this.fsPieChart!.config = { appendPadding: 0, data: this.getFsPieChartData(this.fileStatisticsAnalysisThreadData), angleField: 'duration', @@ -339,21 +427,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, ], }; - this.fileStatisticsAnalysisTableThread!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let threadData = evt.detail; - if (threadData.data) { - let tableData = threadData.data; - tableData.isHover = true; - if (threadData.callBack) { - threadData.callBack(true); - } - } - this.fileStatisticsAnalysisPie?.showHover(); - this.fileStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = - this.fileStatisticsAnalysisProcessName + ' / ' + this.typeName; + let title = ''; + if (this.fsProcessName.length > 0) { + title += this.fsProcessName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Thread AllDuration'; this.fileStatisticsAnalysisThreadData.unshift(this.threadStatisticsData); this.fileStatisticsAnalysisTableThread!.recycleDataSource = this.fileStatisticsAnalysisThreadData; @@ -361,46 +442,41 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisThreadData.shift(this.threadStatisticsData); this.currentLevelData = this.fileStatisticsAnalysisThreadData; this.fileStatisticsAnalysisTableThread?.reMeauseHeight(); - this.fileStatisticsAnalysisTableThread!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.fileStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileThreadLevelClickEvent(data); - } - }); } + private getFsTip() { return (obj: { obj: { tableName: any; durFormat: any; percent: any } }): string => { return `
    -
    ThreadName:${obj.obj.tableName}
    -
    Duration:${obj.obj.durFormat}
    -
    Percent:${obj.obj.percent}%
    -
    - `; +
    ThreadName:${obj.obj.tableName}
    +
    Duration:${obj.obj.durFormat}
    +
    Percent:${obj.obj.percent}%
    +
    + `; }; } - fileThreadLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.fileStatisticsAnalysisTableThread!.style.display = 'none'; - this.fileStatisticsAnalysisTableSo!.style.display = 'grid'; - this.fileStatisticsAnalysisTableThread!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableSo?.removeAttribute('hideDownload'); + + private fileThreadLevelClickEvent(it: any): void { + this.reset(this.fileStatisticsAnalysisTableSo!, true); this.getFilesystemSo(it); // @ts-ignore this.fileStatisticsAnalysisThreadName = it.tableName; - this.shadowRoot!.querySelector('.title')!.textContent = - this.fileStatisticsAnalysisProcessName + ' / ' + this.typeName + ' / ' + this.fileStatisticsAnalysisThreadName; - this.fileStatisticsAnalysisPie?.hideTip(); + let title = ''; + if (this.fsProcessName.length > 0) { + title += this.fsProcessName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName + ' / '; + } + if (this.fileStatisticsAnalysisThreadName.length > 0) { + title += this.fileStatisticsAnalysisThreadName; + } + this.titleEl!.textContent = title; + this.fsPieChart?.hideTip(); } - libraryPieChart(): void { + private libraryPieChart(): void { // @ts-ignore this.sumDur = this.libStatisticsData.allDuration; - this.fileStatisticsAnalysisPie!.config = { + this.fsPieChart!.config = { appendPadding: 0, data: this.getFsPieChartData(this.fileStatisticsAnalysisSoData), angleField: 'duration', @@ -411,11 +487,11 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, tip: (fileSysObj): string => { return `
    -
    Library:${fileSysObj.obj.tableName}
    -
    Duration:${fileSysObj.obj.durFormat}
    -
    Percent:${fileSysObj.obj.percent}%
    -
    - `; +
    Library:${fileSysObj.obj.tableName}
    +
    Duration:${fileSysObj.obj.durFormat}
    +
    Percent:${fileSysObj.obj.percent}%
    +
    + `; }, angleClick: (fileSysBean): void => { // @ts-ignore @@ -436,21 +512,21 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, ], }; - this.fileStatisticsAnalysisTableSo!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let soData = evt.detail; - if (soData.data) { - let fsSoData = soData.data; - fsSoData.isHover = true; - if (soData.callBack) { - soData.callBack(true); - } + let title = ''; + if (this.fsProcessName.length > 0) { + title += this.fsProcessName + ' / '; + } + if (this.typeName.length > 0) { + if (this.hideThreadCheckBox?.checked) { + title += this.typeName; + } else { + title += this.typeName + ' / '; } - this.fileStatisticsAnalysisPie?.showHover(); - this.fileStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = - this.fileStatisticsAnalysisProcessName + ' / ' + this.typeName + ' / ' + this.fileStatisticsAnalysisThreadName; + } + if (this.fileStatisticsAnalysisThreadName.length > 0) { + title += this.fileStatisticsAnalysisThreadName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Library AllDuration'; this.fileStatisticsAnalysisSoData.unshift(this.libStatisticsData); this.fileStatisticsAnalysisTableSo!.recycleDataSource = this.fileStatisticsAnalysisSoData; @@ -458,40 +534,29 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisSoData.shift(this.libStatisticsData); this.currentLevelData = this.fileStatisticsAnalysisSoData; this.fileStatisticsAnalysisTableSo?.reMeauseHeight(); - this.fileStatisticsAnalysisTableSo!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.fileStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileSoLevelClickEvent(data); - } - }); } - fileSoLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.fileStatisticsAnalysisTableSo!.style.display = 'none'; - this.fileStatisticsAnalysisTableFunction!.style.display = 'grid'; - this.fileStatisticsAnalysisTableSo!.setAttribute('hideDownload', ''); - this.fileStatisticsAnalysisTableFunction?.removeAttribute('hideDownload'); + + private fileSoLevelClickEvent(it: any): void { + this.reset(this.fileStatisticsAnalysisTableFunction!, true); this.getFilesystemFunction(it); - this.shadowRoot!.querySelector('.title')!.textContent = - // @ts-ignore - this.fileStatisticsAnalysisProcessName + - ' / ' + - this.typeName + - ' / ' + - this.fileStatisticsAnalysisThreadName + - ' / ' + - it.tableName; - this.fileStatisticsAnalysisPie?.hideTip(); + let title = ''; + if (this.fsProcessName.length > 0) { + title += this.fsProcessName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName + ' / '; + } + if (this.fileStatisticsAnalysisThreadName.length > 0 && !this.hideThreadCheckBox!.checked) { + title += this.fileStatisticsAnalysisThreadName + ' / '; + } + if (it.tableName.length > 0) { + title += it.tableName; + } + this.titleEl!.textContent = title; + this.fsPieChart?.hideTip(); } - sortByColumn(column: string, fsaSort: number): void { - this.fileStatisticsAnalysisSortColumn = column; - this.fileStatisticsAnalysisSortType = fsaSort; + + private sortByColumn(): void { let fsaCurrentTable: LitTable | null | undefined; switch (this.currentLevel) { case 0: @@ -513,7 +578,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { if (!fsaCurrentTable) { return; } - if (fsaSort === 0) { + if (this.fsSortType === 0) { let fsaArr = [...this.currentLevelData]; switch (this.currentLevel) { case 0: @@ -535,9 +600,9 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { fsaCurrentTable!.recycleDataSource = fsaArr; } else { let fsaArray = [...this.currentLevelData]; - if (column === 'tableName') { + if (this.fsSortColumn === 'tableName') { fsaCurrentTable!.recycleDataSource = fsaArray.sort((firstElement, secondElement) => { - if (fsaSort === 1) { + if (this.fsSortType === 1) { if (firstElement.tableName > secondElement.tableName) { return 1; } else if (firstElement.tableName === secondElement.tableName) { @@ -555,9 +620,9 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { } } }); - } else if (column === 'durFormat' || column === 'percent') { + } else if (this.fsSortColumn === 'durFormat' || this.fsSortColumn === 'percent') { fsaCurrentTable!.recycleDataSource = fsaArray.sort((a, b) => { - return fsaSort === 1 ? a.duration - b.duration : b.duration - a.duration; + return this.fsSortType === 1 ? a.duration - b.duration : b.duration - a.duration; }); } switch (this.currentLevel) { @@ -580,7 +645,8 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { fsaCurrentTable!.recycleDataSource = fsaArray; } } - getFilesystemProcess(result: Array): void { + + private getFilesystemProcess(result: Array): void { this.fileStatisticsAnalysisProcessData = JSON.parse(JSON.stringify(result)); if (!this.fileStatisticsAnalysisProcessData || this.fileStatisticsAnalysisProcessData.length === 0) { this.fileStatisticsAnalysisPidData = []; @@ -605,10 +671,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { let analysisPidDataDur = 0; let pName = ''; for (let fileSysStatPidItem of value) { - pName = fileSysStatPidItem.processName = - fileSysStatPidItem.processName === null || fileSysStatPidItem.processName === undefined - ? `Process(${fileSysStatPidItem.pid})` - : `${fileSysStatPidItem.processName}(${fileSysStatPidItem.pid})`; + if (fileSysStatPidItem.fsProcessName && fileSysStatPidItem.fsProcessName.length > 0) { + if (!fileSysStatPidItem.fsProcessName.endsWith(`(${fileSysStatPidItem.pid})`)) { + fileSysStatPidItem.fsProcessName = `${fileSysStatPidItem.fsProcessName}(${fileSysStatPidItem.pid})`; + } + } else { + fileSysStatPidItem.fsProcessName = `Process(${fileSysStatPidItem.pid})`; + } + pName = fileSysStatPidItem.fsProcessName; analysisPidDataDur += fileSysStatPidItem.dur; } this.fileStatisticsAnalysisPidData.push({ @@ -624,32 +694,17 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.currentLevel = 0; this.fileStatisticsAnalysisProgressEL!.loading = false; this.processPieChart(); - new ResizeObserver(() => { - if (this.parentElement?.clientHeight != 0) { - this.fileStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.fileStatisticsAnalysisTableProcess?.reMeauseHeight(); - this.fileStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.fileStatisticsAnalysisTableThread?.reMeauseHeight(); - this.fileStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.fileStatisticsAnalysisTableSo?.reMeauseHeight(); - this.fileStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.fileStatisticsAnalysisTableFunction?.reMeauseHeight(); - this.fileStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.fileStatisticsAnalysisTableType?.reMeauseHeight(); - } - }).observe(this.parentElement!); } - getFilesystemType(fileSysStatTypeItem: any): void { + private getFilesystemType(fileSysStatTypeItem: any): void { this.fileStatisticsAnalysisProgressEL!.loading = true; let typeMap = new Map>(); - let pid = fileSysStatTypeItem.pid; let allDur = 0; if (!this.fileStatisticsAnalysisProcessData || this.fileStatisticsAnalysisProcessData.length == 0) { return; } for (let fsItem of this.fileStatisticsAnalysisProcessData) { - if (fsItem.pid !== pid) { + if (fileSysStatTypeItem && fsItem.pid !== fileSysStatTypeItem.pid && !this.hideProcessCheckBox?.checked) { continue; } allDur += fsItem.dur; @@ -669,7 +724,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { } const typeData = { tableName: this.typeIdToString(key), - pid: fileSysStatTypeItem.pid, + pid: fileSysStatTypeItem === null ? value[0].pid : fileSysStatTypeItem.pid, type: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -684,7 +739,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisProgressEL!.loading = false; } - getFilesystemThread(fileSysStatThreadItem: any): void { + private getFilesystemThread(fileSysStatThreadItem: any): void { this.fileStatisticsAnalysisProgressEL!.loading = true; let threadMap = new Map>(); let pid = fileSysStatThreadItem.pid; @@ -694,7 +749,11 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { return; } for (let fspItem of this.fileStatisticsAnalysisProcessData) { - if (fspItem.pid !== pid || fspItem.type !== type) { + if ( + (!this.hideProcessCheckBox?.checked && fspItem.pid !== pid) || + fspItem.type !== type || + (fspItem.type !== type && this.hideProcessCheckBox?.checked) + ) { continue; } allDur += fspItem.dur; @@ -712,10 +771,11 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { let tName = ''; for (let fileSysStatThreadItem of value) { dur += fileSysStatThreadItem.dur; - tName = fileSysStatThreadItem.threadName = - fileSysStatThreadItem.threadName === null || fileSysStatThreadItem.threadName === undefined + tName = fileSysStatThreadItem.fileStatisticsAnalysisThreadName = + fileSysStatThreadItem.fileStatisticsAnalysisThreadName === null || + fileSysStatThreadItem.fileStatisticsAnalysisThreadName === undefined ? `Thread(${fileSysStatThreadItem.tid})` - : `${fileSysStatThreadItem.threadName}`; + : `${fileSysStatThreadItem.fileStatisticsAnalysisThreadName}`; } const threadData = { tableName: tName, @@ -735,19 +795,30 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.threadPieChart(); } - getFilesystemSo(item: any): void { + private getFilesystemSo(item: any): void { this.fileStatisticsAnalysisProgressEL!.loading = true; - let tid = item.tid; - let pid = item.pid; - let type = item.type; let allDur = 0; let libMap = new Map>(); if (!this.fileStatisticsAnalysisProcessData || this.fileStatisticsAnalysisProcessData.length === 0) { return; } for (let itemData of this.fileStatisticsAnalysisProcessData) { - if (itemData.pid !== pid || itemData.tid !== tid || itemData.type !== type) { - continue; + if (!this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if (item && (itemData.pid !== item.pid || itemData.tid !== item.tid || itemData.type !== item.type)) { + continue; + } + } else if (!this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (item && (itemData.pid !== item.pid || itemData.type !== item.type)) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ((item && itemData.tid !== item.tid) || itemData.type !== item.type) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (item && itemData.type !== item.type) { + continue; + } } allDur += itemData.dur; if (libMap.has(itemData.libId)) { @@ -775,9 +846,9 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { } const soData = { tableName: soName, - pid: item.pid, - type: item.type, - tid: item.tid, + pid: item === null ? value[0].pid : item.pid, + type: item === null ? value[0].type : item.type, + tid: item === null ? value[0].tid : item.tid, libId: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -792,7 +863,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.libraryPieChart(); } - getFilesystemFunction(item: any): void { + private getFilesystemFunction(item: any): void { this.fileStatisticsAnalysisProgressEL!.loading = true; this.shadowRoot!.querySelector('.fs-subheading')!.textContent = 'Statistic By Function AllDuration'; let tid = item.tid; @@ -805,13 +876,27 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { return; } for (let fsProcessData of this.fileStatisticsAnalysisProcessData) { - if ( - fsProcessData.pid !== pid || - fsProcessData.tid !== tid || - fsProcessData.type !== type || - fsProcessData.libId !== libId - ) { - continue; + if (!this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ( + fsProcessData.pid !== pid || + fsProcessData.tid !== tid || + fsProcessData.type !== type || + fsProcessData.libId !== libId + ) { + continue; + } + } else if (!this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (fsProcessData.pid !== pid || fsProcessData.type !== type || fsProcessData.libId !== libId) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if (fsProcessData.tid !== tid || fsProcessData.type !== type || fsProcessData.libId !== libId) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (fsProcessData.type !== type || fsProcessData.libId !== libId) { + continue; + } } allDur += fsProcessData.dur; if (symbolMap.has(fsProcessData.symbolId)) { @@ -850,7 +935,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fileStatisticsAnalysisProgressEL!.loading = false; // @ts-ignore this.sumDur = this.functionStatisticsData.allDuration; - this.fileStatisticsAnalysisPie!.config = { + this.fsPieChart!.config = { appendPadding: 0, data: this.getFsPieChartData(this.fileStatisticsAnalysisFunctionData), angleField: 'duration', @@ -861,11 +946,11 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, tip: (fsaObj): string => { return `
    -
    Function:${fsaObj.obj.tableName}
    -
    Duration:${fsaObj.obj.durFormat}
    -
    percent:${fsaObj.obj.percent}
    -
    - `; +
    Function:${fsaObj.obj.tableName}
    +
    Duration:${fsaObj.obj.durFormat}
    +
    percent:${fsaObj.obj.percent}
    +
    + `; }, hoverHandler: (data): void => { if (data) { @@ -880,31 +965,15 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { }, ], }; - this.fileStatisticsAnalysisTableFunction!.addEventListener('row-hover', (fsStatRowClickEvent) => { - // @ts-ignore - let fsFunctionData = fsStatRowClickEvent.detail; - if (fsFunctionData.data) { - let data = fsFunctionData.data; - data.isHover = true; - if (fsFunctionData.callBack) { - fsFunctionData.callBack(true); - } - } - this.fileStatisticsAnalysisPie?.showHover(); - this.fileStatisticsAnalysisPie?.hideTip(); - }); this.fileStatisticsAnalysisFunctionData.unshift(this.functionStatisticsData); this.fileStatisticsAnalysisTableFunction!.recycleDataSource = this.fileStatisticsAnalysisFunctionData; this.fileStatisticsAnalysisTableFunction?.reMeauseHeight(); // @ts-ignore this.fileStatisticsAnalysisFunctionData.shift(this.functionStatisticsData); this.currentLevelData = this.fileStatisticsAnalysisFunctionData; - this.fileStatisticsAnalysisTableFunction!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); } - typeIdToString(transformType: number): string { + + private typeIdToString(transformType: number): string { let fsReleaseType: string; if (transformType === 0) { fsReleaseType = 'OPEN'; @@ -918,7 +987,13 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { // @ts-ignore return fsReleaseType; } - totalDurationData(durationTS: number): { durFormat: string; percent: string; tableName: string; duration: number } { + + private totalDurationData(durationTS: number): { + durFormat: string; + percent: string; + tableName: string; + duration: number; + } { return { durFormat: Utils.getProbablyTime(durationTS), percent: ((durationTS / durationTS) * 100).toFixed(2), @@ -926,7 +1001,8 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { duration: 0, }; } - getFsPieChartData(fsPieChartData: any[]): unknown[] { + + private getFsPieChartData(fsPieChartData: any[]): unknown[] { if (fsPieChartData.length > 20) { let fsPieChartArr: string[] = []; let other: any = { @@ -950,7 +1026,7 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { return fsPieChartData; } - getDataByWorker(args: any[], handler: Function): void { + private getDataByWorker(args: any[], handler: Function): void { procedurePool.submitWithName( 'logic0', 'fileSystem-action', @@ -963,6 +1039,28 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { ); } + public connectedCallback(): void { + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + this.fileStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.fileStatisticsAnalysisTableProcess?.reMeauseHeight(); + this.fileStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.fileStatisticsAnalysisTableThread?.reMeauseHeight(); + this.fileStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.fileStatisticsAnalysisTableSo?.reMeauseHeight(); + this.fileStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.fileStatisticsAnalysisTableFunction?.reMeauseHeight(); + this.fileStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.fileStatisticsAnalysisTableType?.reMeauseHeight(); + if (this.parentElement!.clientHeight >= 0 && this.parentElement!.clientHeight <= 31) { + this.filterEl!.style.display = 'none'; + } else { + this.filterEl!.style.display = 'flex'; + } + } + }).observe(this.parentElement!); + } + initHtml(): string { return `
    -
    -
    -
    -
    - -
    -
    -
    +
    +
    +
    +
    +
    -
    - -
    -
    - - - - - - - - - - - - -
    - +
    +
    +
    + +
    +
    + + + + + + + + + + + + + +
    + `; } } diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts index 50479966c..8ba832aa4 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts @@ -21,10 +21,13 @@ import { SelectionParam } from '../../../../bean/BoxSelection.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar'; import { Utils } from '../../base/Utils.js'; import { procedurePool } from '../../../../database/Procedure.js'; +import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; +import { TabPaneFilter } from '../TabPaneFilter.js'; +import { initSort } from '../SheetUtils.js'; @element('tabpane-tb-vm-statistics') export class TabPaneIOTierStatisticsAnalysis extends BaseElement { - private iOTierStatisticsAnalysisPie: LitChartPie | null | undefined; + private ioPieChart: LitChartPie | null | undefined; private currentSelection: SelectionParam | null | undefined; private processData: any; private pidData!: any[]; @@ -44,8 +47,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { private progressEL: LitProgressBar | null | undefined; private processName: string = ''; private threadName: string = ''; - private sortColumn: string = ''; - private sortType: number = 0; + private ioSortColumn: string = ''; + private ioSortType: number = 0; private typeName: string = ''; private currentLevel = -1; private currentLevelData!: Array; @@ -54,6 +57,13 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { private threadStatisticsData!: {}; private libStatisticsData!: {}; private functionStatisticsData!: {}; + private titleEl: HTMLDivElement | undefined | null; + private filterEl: TabPaneFilter | undefined | null; + private hideProcessCheckBox: LitCheckBox | undefined | null; + private hideThreadCheckBox: LitCheckBox | undefined | null; + private checkBoxs: NodeListOf | undefined | null; + private ioTableArray: NodeListOf | undefined | null; + set data(ioTierStatisticsAnalysisSelection: SelectionParam) { if (ioTierStatisticsAnalysisSelection === this.currentSelection) { this.pidData.unshift(this.processStatisticsData); @@ -62,15 +72,16 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.pidData.shift(this.processStatisticsData); return; } - this.clearData(); + if (this.ioTableArray && this.ioTableArray.length > 0) { + for (let ioTable of this.ioTableArray) { + initSort(ioTable!, this.ioSortColumn, this.ioSortType); + } + } + this.reset(this.ioTierTableProcess!, false); + this.hideProcessCheckBox!.checked = false; + this.hideThreadCheckBox!.checked = false; this.currentSelection = ioTierStatisticsAnalysisSelection; - this.ioTierTableProcess!.style.display = 'grid'; - this.tableType!.style.display = 'none'; - this.ioTierTableThread!.style.display = 'none'; - this.ioTierTableSo!.style.display = 'none'; - this.tableFunction!.style.display = 'none'; - this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden'; - this.shadowRoot!.querySelector('.title')!.textContent = ''; + this.titleEl!.textContent = ''; this.tabName!.textContent = ''; this.range!.textContent = 'Selected range: ' + @@ -91,13 +102,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, ], (results: any[]) => { - this.getIOTierProcess(results); + this.processData = JSON.parse(JSON.stringify(results)); + this.getIOTierProcess(this.processData); } ); } initElements(): void { this.range = this.shadowRoot?.querySelector('#time-range'); - this.iOTierStatisticsAnalysisPie = this.shadowRoot!.querySelector('#io-tier-chart-pie'); + this.ioPieChart = this.shadowRoot!.querySelector('#io-tier-chart-pie'); this.ioTierTableProcess = this.shadowRoot!.querySelector('#tb-process-usage'); this.ioTierTableThread = this.shadowRoot!.querySelector('#tb-thread-usage'); this.ioTierTableSo = this.shadowRoot!.querySelector('#tb-so-usage'); @@ -107,53 +119,172 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.tabName = this.shadowRoot!.querySelector('.io-tier-subheading'); this.progressEL = this.shadowRoot?.querySelector('.progress') as LitProgressBar; this.goBack(); + this.titleEl = this.shadowRoot!.querySelector('.title'); + this.filterEl = this.shadowRoot?.querySelector('#filter'); + this.filterEl!.setOptionsList(['Hide Process', 'Hide Thread']); + let popover = this.filterEl!.shadowRoot!.querySelector('#check-popover'); + this.hideProcessCheckBox = popover!!.querySelector('div > #hideProcess'); + this.hideThreadCheckBox = popover!!.querySelector('div > #hideThread'); + this.checkBoxs = popover!.querySelectorAll('.check-wrap > lit-check-box'); + this.ioTableArray = this.shadowRoot!.querySelectorAll('lit-table') as NodeListOf; + for (let ioTable of this.ioTableArray) { + ioTable.shadowRoot!.querySelector('.table')!.style.height = 'calc(100% - 31px)'; + ioTable!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.ioSortColumn = evt.detail.key; + // @ts-ignore + this.ioSortType = evt.detail.sort; + this.sortByColumn(); + }); + ioTable!.addEventListener('row-hover', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.data) { + let tableData = detail.data; + tableData.isHover = true; + if (detail.callBack) { + detail.callBack(true); + } + } + this.ioPieChart?.showHover(); + this.ioPieChart?.hideTip(); + }); + } + for (let box of this.checkBoxs) { + box!.addEventListener('change', (event) => { + if (this.hideProcessCheckBox!.checked && this.hideThreadCheckBox!.checked) { + this.hideThread(); + this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden'; + } else if (this.hideProcessCheckBox!.checked && !this.hideThreadCheckBox!.checked) { + this.hideProcess(); + } else { + this.reset(this.ioTierTableProcess!, false); + this.getIOTierProcess(this.processData); + } + }); + } + this.ioTierTableProcess!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.ioTierProcessLevelClickEvent(data); + } + }); + this.tableType!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.ioTierTypeLevelClickEvent(data); + } + }); + this.ioTierTableThread!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.ioTierThreadLevelClickEvent(data); + } + }); + this.ioTierTableSo!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.ioTierSoLevelClickEvent(data); + } + }); + } + + private reset(showTable: LitTable, isShowBack: boolean): void { + this.clearData(); + if (isShowBack) { + this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible'; + } else { + this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden'; + this.titleEl!.textContent = ''; + } + if (this.ioTableArray) { + for (let table of this.ioTableArray) { + if (table === showTable) { + initSort(table!, this.ioSortColumn, this.ioSortType); + table.style.display = 'grid'; + table.setAttribute('hideDownload', ''); + } else { + table!.style.display = 'none'; + table!.removeAttribute('hideDownload'); + } + } + } } - clearData(): void { - this.iOTierStatisticsAnalysisPie!.dataSource = []; + + private clearData(): void { + this.ioPieChart!.dataSource = []; this.ioTierTableProcess!.recycleDataSource = []; this.tableType!.recycleDataSource = []; this.ioTierTableThread!.recycleDataSource = []; this.ioTierTableSo!.recycleDataSource = []; this.tableFunction!.recycleDataSource = []; } - goBack(): void { + + private showAssignLevel(showIoTable: LitTable, hideIoTable: LitTable, currentLevel: number): void { + showIoTable!.style.display = 'grid'; + hideIoTable!.style.display = 'none'; + hideIoTable.setAttribute('hideDownload', ''); + showIoTable?.removeAttribute('hideDownload'); + this.currentLevel = currentLevel; + } + + private goBack(): void { this.iOTierStatisticsAnalysisBack!.addEventListener('click', () => { if (this.tabName!.textContent === 'Statistic By type AllDuration') { - this.ioTierTableProcess!.style.display = 'grid'; - this.tableType!.style.display = 'none'; this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden'; - this.tableType!.setAttribute('hideDownload', ''); - this.ioTierTableProcess?.removeAttribute('hideDownload'); - this.currentLevel = 0; + this.showAssignLevel(this.ioTierTableProcess!, this.tableType!, 0); this.processPieChart(); } else if (this.tabName!.textContent === 'Statistic By Thread AllDuration') { - this.tableType!.style.display = 'grid'; - this.ioTierTableThread!.style.display = 'none'; - this.ioTierTableThread!.setAttribute('hideDownload', ''); - this.tableType?.removeAttribute('hideDownload'); - this.currentLevel = 1; + if (this.hideProcessCheckBox?.checked) { + this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden'; + } else { + this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible'; + } + this.showAssignLevel(this.tableType!, this.ioTierTableThread!, 1); this.typePieChart(); } else if (this.tabName!.textContent === 'Statistic By Library AllDuration') { - this.ioTierTableThread!.style.display = 'grid'; - this.ioTierTableSo!.style.display = 'none'; - this.ioTierTableSo!.setAttribute('hideDownload', ''); - this.ioTierTableThread?.removeAttribute('hideDownload'); - this.currentLevel = 2; - this.threadPieChart(); + if (this.hideThreadCheckBox?.checked) { + if (this.hideProcessCheckBox?.checked) { + this.iOTierStatisticsAnalysisBack!.style.visibility = 'hidden'; + } + this.showAssignLevel(this.tableType!, this.ioTierTableSo!, 1); + this.typePieChart(); + } else { + this.showAssignLevel(this.ioTierTableThread!, this.ioTierTableSo!, 2); + this.threadPieChart(); + } } else if (this.tabName!.textContent === 'Statistic By Function AllDuration') { - this.ioTierTableSo!.style.display = 'grid'; - this.tableFunction!.style.display = 'none'; - this.tableFunction!.setAttribute('hideDownload', ''); - this.ioTierTableSo?.removeAttribute('hideDownload'); - this.currentLevel = 3; + this.showAssignLevel(this.ioTierTableSo!, this.tableFunction!, 3); this.libraryPieChart(); } }); } - processPieChart(): void { + + private hideProcess(): void { + this.reset(this.tableType!, false); + this.processName = ''; + this.getIOTierType(null); + } + + private hideThread(it?: any): void { + this.reset(this.tableType!, true); + this.processName = ''; + this.threadName = ''; + if (it) { + this.getIOTierType(it); + } else { + this.getIOTierType(null); + } + } + + private processPieChart(): void { // @ts-ignore this.sumDur = this.processStatisticsData.allDuration; - this.iOTierStatisticsAnalysisPie!.config = { + this.ioPieChart!.config = { appendPadding: 0, data: this.getIOTierPieChartData(this.pidData), angleField: 'duration', @@ -182,20 +313,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, ], }; - this.ioTierTableProcess!.addEventListener('row-hover', (event) => { - // @ts-ignore - let ioTierProcessData = event.detail; - if (ioTierProcessData.data) { - let processData = ioTierProcessData.data; - processData.isHover = true; - if (ioTierProcessData.callBack) { - ioTierProcessData.callBack(true); - } - } - this.iOTierStatisticsAnalysisPie?.showHover(); - this.iOTierStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = ''; + this.titleEl!.textContent = ''; this.tabName!.textContent = 'Statistic By Process AllDuration'; this.pidData.unshift(this.processStatisticsData); this.ioTierTableProcess!.recycleDataSource = this.pidData; @@ -203,32 +321,18 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.pidData.shift(this.processStatisticsData); this.currentLevelData = this.pidData; this.ioTierTableProcess?.reMeauseHeight(); - this.ioTierTableProcess!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.ioTierTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierProcessLevelClickEvent(data); - } - }); } - ioTierProcessLevelClickEvent(it: any): void { - this.clearData(); - this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible'; - this.ioTierTableProcess!.style.display = 'none'; - this.tableType!.style.display = 'grid'; - this.ioTierTableProcess!.setAttribute('hideDownload', ''); - this.tableType?.removeAttribute('hideDownload'); + + private ioTierProcessLevelClickEvent(it: any): void { + this.reset(this.tableType!, true); this.getIOTierType(it); this.processName = it.tableName; - this.iOTierStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName; + this.ioPieChart?.hideTip(); + this.titleEl!.textContent = this.processName; } - typePieChart(): void { - this.iOTierStatisticsAnalysisPie!.config = { + + private typePieChart(): void { + this.ioPieChart!.config = { appendPadding: 0, data: this.typeData, angleField: 'duration', @@ -256,20 +360,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, ], }; - this.tableType!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let ioTypeData = evt.detail; - if (ioTypeData.data) { - let tableData = ioTypeData.data; - tableData.isHover = true; - if (ioTypeData.callBack) { - ioTypeData.callBack(true); - } - } - this.iOTierStatisticsAnalysisPie?.showHover(); - this.iOTierStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName; + this.titleEl!.textContent = this.processName; this.tabName!.textContent = 'Statistic By type AllDuration'; this.typeData.unshift(this.typeStatisticsData); this.tableType!.recycleDataSource = this.typeData; @@ -277,33 +368,32 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.typeData.shift(this.typeStatisticsData); this.currentLevelData = this.typeData; this.tableType?.reMeauseHeight(); - this.tableType!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.tableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierTypeLevelClickEvent(data); - } - }); } - ioTierTypeLevelClickEvent(it: any): void { - this.clearData(); - this.tableType!.style.display = 'none'; - this.ioTierTableThread!.style.display = 'grid'; - this.tableType!.setAttribute('hideDownload', ''); - this.ioTierTableThread?.removeAttribute('hideDownload'); - this.getIOTierThread(it); + + private ioTierTypeLevelClickEvent(it: any): void { + if (this.hideThreadCheckBox!.checked) { + this.reset(this.ioTierTableSo!, true); + this.getIOTierSo(it); + } else { + this.reset(this.ioTierTableThread!, true); + this.getIOTierThread(it); + } this.typeName = it.tableName; - this.iOTierStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName + ' / ' + this.typeName; + this.ioPieChart?.hideTip(); + let title = ''; + if (this.processName.length > 0) { + title += this.processName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName; + } + this.titleEl!.textContent = title; } - threadPieChart(): void { + + private threadPieChart(): void { // @ts-ignore this.sumDur = this.threadStatisticsData.allDuration; - this.iOTierStatisticsAnalysisPie!.config = { + this.ioPieChart!.config = { appendPadding: 0, data: this.getIOTierPieChartData(this.threadData), angleField: 'duration', @@ -334,20 +424,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, ], }; - this.ioTierTableThread!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let ioThreadData = evt.detail; - if (ioThreadData.data) { - let threadData = ioThreadData.data; - threadData.isHover = true; - if (ioThreadData.callBack) { - ioThreadData.callBack(true); - } - } - this.iOTierStatisticsAnalysisPie?.showHover(); - this.iOTierStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName + ' / ' + this.typeName; + let title = ''; + if (this.processName.length > 0) { + title += this.processName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Thread AllDuration'; this.threadData.unshift(this.threadStatisticsData); this.ioTierTableThread!.recycleDataSource = this.threadData; @@ -355,43 +439,39 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.threadData.shift(this.threadStatisticsData); this.currentLevelData = this.threadData; this.ioTierTableThread?.reMeauseHeight(); - this.ioTierTableThread!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.ioTierTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierThreadLevelClickEvent(data); - } - }); } + private getIoTierTip(obj: { obj: { tableName: any; durFormat: any; percent: any } }): string { return `
    -
    ThreadName:${obj.obj.tableName}
    -
    Duration:${obj.obj.durFormat}
    -
    Percent:${obj.obj.percent}%
    -
    - `; +
    ThreadName:${obj.obj.tableName}
    +
    Duration:${obj.obj.durFormat}
    +
    Percent:${obj.obj.percent}%
    +
    + `; } - ioTierThreadLevelClickEvent(it: any): void { - this.clearData(); - this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible'; - this.ioTierTableThread!.style.display = 'none'; - this.ioTierTableSo!.style.display = 'grid'; - this.ioTierTableThread!.setAttribute('hideDownload', ''); - this.ioTierTableSo?.removeAttribute('hideDownload'); + + private ioTierThreadLevelClickEvent(it: any): void { + this.reset(this.ioTierTableSo!, true); this.getIOTierSo(it); this.threadName = it.tableName; - this.iOTierStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = - this.processName + ' / ' + this.typeName + ' / ' + this.threadName; + this.ioPieChart?.hideTip(); + let title = ''; + if (this.processName.length > 0) { + title += this.processName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName + ' / '; + } + if (this.threadName.length > 0) { + title += this.threadName; + } + this.titleEl!.textContent = title; } - libraryPieChart(): void { + + private libraryPieChart(): void { // @ts-ignore this.sumDur = this.libStatisticsData.allDuration; - this.iOTierStatisticsAnalysisPie!.config = { + this.ioPieChart!.config = { appendPadding: 0, data: this.getIOTierPieChartData(this.soData), angleField: 'duration', @@ -402,11 +482,11 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, tip: (ioTierObj): string => { return `
    -
    Library:${ioTierObj.obj.tableName}
    -
    Duration:${ioTierObj.obj.durFormat}
    -
    Percent:${ioTierObj.obj.percent}%
    -
    - `; +
    Library:${ioTierObj.obj.tableName}
    +
    Duration:${ioTierObj.obj.durFormat}
    +
    Percent:${ioTierObj.obj.percent}%
    +
    + `; }, angleClick: (ioTierBean): void => { // @ts-ignore @@ -427,21 +507,21 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, ], }; - this.ioTierTableSo!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let ioTierSoData = evt.detail; - if (ioTierSoData.data) { - let soData = ioTierSoData.data; - soData.isHover = true; - if (ioTierSoData.callBack) { - ioTierSoData.callBack(true); - } + let title = ''; + if (this.processName.length > 0) { + title += this.processName + ' / '; + } + if (this.typeName.length > 0) { + if (this.hideThreadCheckBox?.checked) { + title += this.typeName; + } else { + title += this.typeName + ' / '; } - this.iOTierStatisticsAnalysisPie?.showHover(); - this.iOTierStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = - this.processName + ' / ' + this.typeName + ' / ' + this.threadName; + } + if (this.threadName.length > 0) { + title += this.threadName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Library AllDuration'; this.soData.unshift(this.libStatisticsData); this.ioTierTableSo!.recycleDataSource = this.soData; @@ -449,33 +529,29 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.soData.shift(this.libStatisticsData); this.currentLevelData = this.soData; this.ioTierTableSo?.reMeauseHeight(); - this.ioTierTableSo!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.ioTierTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierSoLevelClickEvent(data); - } - }); } - ioTierSoLevelClickEvent(it: any): void { - this.clearData(); - this.iOTierStatisticsAnalysisBack!.style.visibility = 'visible'; - this.ioTierTableSo!.style.display = 'none'; - this.tableFunction!.style.display = 'grid'; - this.ioTierTableSo!.setAttribute('hideDownload', ''); - this.tableFunction?.removeAttribute('hideDownload'); + + private ioTierSoLevelClickEvent(it: any): void { + this.reset(this.tableFunction!, true); this.getIOTierFunction(it); - this.iOTierStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = - this.processName + ' / ' + this.typeName + ' / ' + this.threadName + ' / ' + it.tableName; + this.ioPieChart?.hideTip(); + let title = ''; + if (this.processName.length > 0) { + title += this.processName + ' / '; + } + if (this.typeName.length > 0) { + title += this.typeName + ' / '; + } + if (this.threadName.length > 0 && !this.hideThreadCheckBox!.checked) { + title += this.threadName + ' / '; + } + if (it.tableName.length > 0) { + title += it.tableName; + } + this.titleEl!.textContent = title; } - sortByColumn(column: string, ioSort: number): void { - this.sortColumn = column; - this.sortType = ioSort; + + private sortByColumn(): void { let ioTierCurrentTable: LitTable | null | undefined; switch (this.currentLevel) { case 0: @@ -497,7 +573,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { if (!ioTierCurrentTable) { return; } - if (ioSort === 0) { + if (this.ioSortType === 0) { let sortZeroIoArr = [...this.currentLevelData]; switch (this.currentLevel) { case 0: @@ -519,9 +595,9 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { ioTierCurrentTable!.recycleDataSource = sortZeroIoArr; } else { let sortIoArr = [...this.currentLevelData]; - if (column === 'tableName') { + if (this.ioSortColumn === 'tableName') { ioTierCurrentTable!.recycleDataSource = sortIoArr.sort((firstIOElement, secondIOElement) => { - if (ioSort === 1) { + if (this.ioSortType === 1) { if (firstIOElement.tableName > secondIOElement.tableName) { return 1; } else if (firstIOElement.tableName === secondIOElement.tableName) { @@ -539,9 +615,9 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { } } }); - } else if (column === 'durFormat' || column === 'percent') { + } else if (this.ioSortColumn === 'durFormat' || this.ioSortColumn === 'percent') { ioTierCurrentTable!.recycleDataSource = sortIoArr.sort((a, b) => { - return ioSort === 1 ? a.duration - b.duration : b.duration - a.duration; + return this.ioSortType === 1 ? a.duration - b.duration : b.duration - a.duration; }); } switch (this.currentLevel) { @@ -564,8 +640,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { ioTierCurrentTable!.recycleDataSource = sortIoArr; } } - getIOTierProcess(result: Array): void { - this.processData = JSON.parse(JSON.stringify(result)); + + private getIOTierProcess(result: Array): void { if (!this.processData || this.processData.length === 0) { this.pidData = []; this.processStatisticsData = []; @@ -589,10 +665,14 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { let ioPidDataDur = 0; let pName = ''; for (let item of value) { - pName = item.processName = - item.processName === null || item.processName === undefined - ? `Process(${item.pid})` - : `${item.processName}(${item.pid})`; + if (item.processName && item.processName.length > 0) { + if (!item.processName.endsWith(`(${item.pid})`)) { + item.processName = `${item.processName}(${item.pid})`; + } + } else { + item.processName = `Process(${item.pid})`; + } + pName = item.processName; ioPidDataDur += item.dur; } this.pidData.push({ @@ -608,31 +688,17 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.currentLevel = 0; this.progressEL!.loading = false; this.processPieChart(); - new ResizeObserver(() => { - if (this.parentElement?.clientHeight !== 0) { - this.ioTierTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.ioTierTableProcess?.reMeauseHeight(); - this.ioTierTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.ioTierTableThread?.reMeauseHeight(); - this.ioTierTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.ioTierTableSo?.reMeauseHeight(); - this.tableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.tableFunction?.reMeauseHeight(); - this.tableType!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.tableType?.reMeauseHeight(); - } - }).observe(this.parentElement!); } - getIOTierType(item: any): void { + + private getIOTierType(item: any): void { this.progressEL!.loading = true; let ioTypeMap = new Map>(); - let pid = item.pid; let allDur = 0; if (!this.processData || this.processData.length === 0) { return; } for (let processItem of this.processData) { - if (processItem.pid !== pid) { + if (item && processItem.pid !== item.pid && !this.hideProcessCheckBox?.checked) { continue; } allDur += processItem.dur; @@ -652,7 +718,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { } const ioTypeData = { tableName: this.typeIdToString(key), - pid: item.pid, + pid: item === null ? value[0].pid : item.pid, type: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -666,7 +732,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.typePieChart(); this.progressEL!.loading = false; } - getIOTierThread(item: any): void { + + private getIOTierThread(item: any): void { this.progressEL!.loading = true; let threadMap = new Map>(); let pid = item.pid; @@ -676,7 +743,11 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { return; } for (let itemData of this.processData) { - if (itemData.pid !== pid || itemData.type !== type) { + if ( + (!this.hideProcessCheckBox?.checked && itemData.pid !== pid) || + itemData.type !== type || + (itemData.type !== type && this.hideProcessCheckBox?.checked) + ) { continue; } allDur += itemData.dur; @@ -714,19 +785,34 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.progressEL!.loading = false; this.threadPieChart(); } - getIOTierSo(item: any): void { + + private getIOTierSo(item: any): void { this.progressEL!.loading = true; - let tid = item.tid; - let pid = item.pid; - let type = item.type; let allDur = 0; let libMap = new Map>(); if (!this.processData || this.processData.length === 0) { return; } for (let processItemData of this.processData) { - if (processItemData.pid !== pid || processItemData.tid !== tid || processItemData.type !== type) { - continue; + if (!this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ( + item && + (processItemData.pid !== item.pid || processItemData.tid !== item.tid || processItemData.type !== item.type) + ) { + continue; + } + } else if (!this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (item && (processItemData.pid !== item.pid || processItemData.type !== item.type)) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ((item && processItemData.tid !== item.tid) || processItemData.type !== item.type) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (item && processItemData.type !== item.type) { + continue; + } } allDur += processItemData.dur; if (libMap.has(processItemData.libId)) { @@ -754,9 +840,9 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { } const soData = { tableName: libName, - pid: item.pid, - type: item.type, - tid: item.tid, + pid: item === null ? value[0].pid : item.pid, + type: item === null ? value[0].type : item.type, + tid: item === null ? value[0].tid : item.tid, libId: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -770,7 +856,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.progressEL!.loading = false; this.libraryPieChart(); } - getIOTierFunction(item: any): void { + + private getIOTierFunction(item: any): void { this.progressEL!.loading = true; this.shadowRoot!.querySelector('.io-tier-subheading')!.textContent = 'Statistic By Function AllDuration'; @@ -784,13 +871,27 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { return; } for (let processData of this.processData) { - if ( - processData.pid !== pid || - processData.tid !== tid || - processData.type !== type || - processData.libId !== libId - ) { - continue; + if (!this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ( + processData.pid !== pid || + processData.tid !== tid || + processData.type !== type || + processData.libId !== libId + ) { + continue; + } + } else if (!this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (processData.pid !== pid || processData.type !== type || processData.libId !== libId) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if (processData.tid !== tid || processData.type !== type || processData.libId !== libId) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (processData.type !== type || processData.libId !== libId) { + continue; + } } allDur += processData.dur; if (symbolMap.has(processData.symbolId)) { @@ -829,7 +930,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.progressEL!.loading = false; // @ts-ignore this.sumDur = this.functionStatisticsData.allDuration; - this.iOTierStatisticsAnalysisPie!.config = { + this.ioPieChart!.config = { appendPadding: 0, data: this.getIOTierPieChartData(this.functionData), angleField: 'duration', @@ -852,43 +953,26 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }, ], }; - this.tableFunction!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let ioFunctionData = evt.detail; - if (ioFunctionData.data) { - let funData = ioFunctionData.data; - funData.isHover = true; - if (ioFunctionData.callBack) { - ioFunctionData.callBack(true); - } - } - this.iOTierStatisticsAnalysisPie?.showHover(); - this.iOTierStatisticsAnalysisPie?.hideTip(); - }); this.functionData.unshift(this.functionStatisticsData); this.tableFunction!.recycleDataSource = this.functionData; this.tableFunction?.reMeauseHeight(); // @ts-ignore this.functionData.shift(this.functionStatisticsData); this.currentLevelData = this.functionData; - this.tableFunction!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); } private getTip() { return (obj: { obj: { tableName: any; durFormat: any; percent: any } }): string => { return `
    -
    Function:${obj.obj.tableName}
    -
    Duration:${obj.obj.durFormat}
    -
    percent:${obj.obj.percent}
    -
    - `; +
    Function:${obj.obj.tableName}
    +
    Duration:${obj.obj.durFormat}
    +
    percent:${obj.obj.percent}
    + + `; }; } - typeIdToString(type: number): string { + private typeIdToString(type: number): string { let ioTierReleaseType: string; if (type === 1) { ioTierReleaseType = 'DATA_READ'; @@ -902,7 +986,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { // @ts-ignore return ioTierReleaseType; } - totalDurationData(duration: number): { + + private totalDurationData(duration: number): { durFormat: string; percent: string; tableName: string; @@ -919,7 +1004,8 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { }; return allDuration; } - getIOTierPieChartData(res: any[]): unknown[] { + + private getIOTierPieChartData(res: any[]): unknown[] { if (res.length > 20) { let IOTierPieChartArr: string[] = []; let other: any = { @@ -943,7 +1029,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { return res; } - getIoTierDataByWorker(args: any[], handler: Function): void { + private getIoTierDataByWorker(args: any[], handler: Function): void { procedurePool.submitWithName( 'logic0', 'fileSystem-action', @@ -956,6 +1042,28 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { ); } + public connectedCallback(): void { + new ResizeObserver(() => { + if (this.parentElement?.clientHeight !== 0) { + this.ioTierTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.ioTierTableProcess?.reMeauseHeight(); + this.ioTierTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.ioTierTableThread?.reMeauseHeight(); + this.ioTierTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.ioTierTableSo?.reMeauseHeight(); + this.tableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.tableFunction?.reMeauseHeight(); + this.tableType!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.tableType?.reMeauseHeight(); + if (this.parentElement!.clientHeight >= 0 && this.parentElement!.clientHeight <= 31) { + this.filterEl!.style.display = 'none'; + } else { + this.filterEl!.style.display = 'flex'; + } + } + }).observe(this.parentElement!); + } + initHtml(): string { return `
    -
    -
    -
    -
    - -
    -
    -
    +
    +
    +
    +
    +
    -
    - -
    -
    - - - - - - - - - - - - -
    - +
    +
    +
    + +
    +
    + + + + + + + + + + + + + +
    + `; } } diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts index d999bebac..ac5bf9f1d 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts @@ -21,10 +21,13 @@ import '../../../../../base-ui/chart/pie/LitChartPie.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar'; import { Utils } from '../../base/Utils.js'; import { procedurePool } from '../../../../database/Procedure.js'; +import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; +import { TabPaneFilter } from '../TabPaneFilter.js'; +import { initSort } from '../SheetUtils.js'; @element('tabpane-virtual-memory-statistics-analysis') export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { - private vmStatisticsAnalysisPie: LitChartPie | null | undefined; + private vmPieChart: LitChartPie | null | undefined; private vmStatisticsAnalysisCurrentSelection: SelectionParam | null | undefined; private vmStatisticsAnalysisProcessData: any; private vmStatisticsAnalysisPidData!: any[]; @@ -39,14 +42,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { private vmStatisticsAnalysisTableFunction: LitTable | null | undefined; private sumDur: number = 0; private vmStatisticsAnalysisRange: HTMLLabelElement | null | undefined; - private back: HTMLDivElement | null | undefined; + private vmBack: HTMLDivElement | null | undefined; private tabName: HTMLDivElement | null | undefined; private vmStatisticsAnalysisProgressEL: LitProgressBar | null | undefined; - private processName: string = ''; - private typeName: string = ''; - private threadName: string = ''; - private vmStatisticsAnalysisSortColumn: string = ''; - private vmStatisticsAnalysisSortType: number = 0; + private vmProcessName: string = ''; + private vmtypeName: string = ''; + private vmThreadName: string = ''; + private vmSortColumn: string = ''; + private vmSortType: number = 0; private currentLevel = -1; private currentLevelData!: Array; private processStatisticsData!: {}; @@ -54,6 +57,13 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { private threadStatisticsData!: {}; private libStatisticsData!: {}; private functionStatisticsData!: {}; + private titleEl: HTMLDivElement | undefined | null; + private filterEl: TabPaneFilter | undefined | null; + private hideProcessCheckBox: LitCheckBox | undefined | null; + private hideThreadCheckBox: LitCheckBox | undefined | null; + private checkBoxs: NodeListOf | undefined | null; + private vmTableArray: NodeListOf | undefined | null; + set data(vmStatisticsAnalysisSelection: SelectionParam) { if (vmStatisticsAnalysisSelection === this.vmStatisticsAnalysisCurrentSelection) { this.vmStatisticsAnalysisPidData.unshift(this.processStatisticsData); @@ -62,15 +72,16 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmStatisticsAnalysisPidData.shift(this.processStatisticsData); return; } - this.clearData(); + if (this.vmTableArray && this.vmTableArray.length > 0) { + for (let vmTable of this.vmTableArray) { + initSort(vmTable!, this.vmSortColumn, this.vmSortType); + } + } + this.reset(this.vmStatisticsAnalysisTableProcess!, false); + this.hideProcessCheckBox!.checked = false; + this.hideThreadCheckBox!.checked = false; this.vmStatisticsAnalysisCurrentSelection = vmStatisticsAnalysisSelection; - this.vmStatisticsAnalysisTableProcess!.style.display = 'grid'; - this.vmStatisticsAnalysisTableType!.style.display = 'none'; - this.vmStatisticsAnalysisTableThread!.style.display = 'none'; - this.vmStatisticsAnalysisTableSo!.style.display = 'none'; - this.vmStatisticsAnalysisTableFunction!.style.display = 'none'; - this.back!.style.visibility = 'hidden'; - this.shadowRoot!.querySelector('.title')!.textContent = ''; + this.titleEl!.textContent = ''; this.tabName!.textContent = ''; this.vmStatisticsAnalysisRange!.textContent = 'Selected range: ' + @@ -95,65 +106,184 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { } ); } + initElements(): void { this.vmStatisticsAnalysisRange = this.shadowRoot?.querySelector('#time-range'); - this.vmStatisticsAnalysisPie = this.shadowRoot!.querySelector('#vm-chart-pie'); + this.vmPieChart = this.shadowRoot!.querySelector('#vm-chart-pie'); this.vmStatisticsAnalysisTableProcess = this.shadowRoot!.querySelector('#tb-process-usage'); this.vmStatisticsAnalysisTableType = this.shadowRoot!.querySelector('#tb-type-usage'); this.vmStatisticsAnalysisTableThread = this.shadowRoot!.querySelector('#tb-thread-usage'); this.vmStatisticsAnalysisTableSo = this.shadowRoot!.querySelector('#tb-so-usage'); this.vmStatisticsAnalysisTableFunction = this.shadowRoot!.querySelector('#tb-function-usage'); - this.back = this.shadowRoot!.querySelector('.vm-go-back'); + this.vmBack = this.shadowRoot!.querySelector('.vm-go-back'); this.tabName = this.shadowRoot!.querySelector('.vm-subheading'); this.vmStatisticsAnalysisProgressEL = this.shadowRoot?.querySelector('.vm-progress') as LitProgressBar; this.goBack(); + this.titleEl = this.shadowRoot!.querySelector('.title'); + this.filterEl = this.shadowRoot?.querySelector('#filter'); + this.filterEl!.setOptionsList(['Hide Process', 'Hide Thread']); + let popover = this.filterEl!.shadowRoot!.querySelector('#check-popover'); + this.hideProcessCheckBox = popover!!.querySelector('div > #hideProcess'); + this.hideThreadCheckBox = popover!!.querySelector('div > #hideThread'); + this.checkBoxs = popover!.querySelectorAll('.check-wrap > lit-check-box'); + this.vmTableArray = this.shadowRoot!.querySelectorAll('lit-table') as NodeListOf; + for (let vmTable of this.vmTableArray) { + vmTable!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.vmSortColumn = evt.detail.key; + // @ts-ignore + this.vmSortType = evt.detail.sort; + this.sortByColumn(); + }); + vmTable!.addEventListener('row-hover', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.data) { + let tableData = detail.data; + tableData.isHover = true; + if (detail.callBack) { + detail.callBack(true); + } + } + this.vmPieChart?.showHover(); + this.vmPieChart?.hideTip(); + }); + } + for (let box of this.checkBoxs) { + box!.addEventListener('change', (event) => { + if (this.hideProcessCheckBox!.checked && this.hideThreadCheckBox!.checked) { + this.hideThread(); + this.vmBack!.style.visibility = 'hidden'; + } else if (this.hideProcessCheckBox!.checked && !this.hideThreadCheckBox!.checked) { + this.hideProcess(); + } else { + this.reset(this.vmStatisticsAnalysisTableProcess!, false); + this.getVirtualMemoryProcess(this.vmStatisticsAnalysisProcessData); + } + }); + } + this.vmStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.vmProcessLevelClickEvent(data); + } + }); + this.vmStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.vmTypeLevelClickEvent(data); + } + }); + this.vmStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.vmThreadLevelClickEvent(data); + } + }); + this.vmStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.duration !== 0) { + this.vmSoLevelClickEvent(data); + } + }); + } + + private reset(showTable: LitTable, isShowBack: boolean): void { + this.clearData(); + if (isShowBack) { + this.vmBack!.style.visibility = 'visible'; + } else { + this.vmBack!.style.visibility = 'hidden'; + this.titleEl!.textContent = ''; + } + if (this.vmTableArray) { + for (let table of this.vmTableArray) { + if (table === showTable) { + initSort(table!, this.vmSortColumn, this.vmSortType); + table.style.display = 'grid'; + table.setAttribute('hideDownload', ''); + } else { + table!.style.display = 'none'; + table!.removeAttribute('hideDownload'); + } + } + } } - clearData(): void { - this.vmStatisticsAnalysisPie!.dataSource = []; + + private clearData(): void { + this.vmPieChart!.dataSource = []; this.vmStatisticsAnalysisTableProcess!.recycleDataSource = []; this.vmStatisticsAnalysisTableType!.recycleDataSource = []; this.vmStatisticsAnalysisTableThread!.recycleDataSource = []; this.vmStatisticsAnalysisTableSo!.recycleDataSource = []; this.vmStatisticsAnalysisTableFunction!.recycleDataSource = []; } - goBack(): void { - this.back!.addEventListener('click', () => { + + private showAssignLevel(showVmTable: LitTable, hideVmTable: LitTable, currentLevel: number): void { + showVmTable!.style.display = 'grid'; + hideVmTable!.style.display = 'none'; + hideVmTable.setAttribute('hideDownload', ''); + showVmTable?.removeAttribute('hideDownload'); + this.currentLevel = currentLevel; + } + + private goBack(): void { + this.vmBack!.addEventListener('click', () => { if (this.tabName!.textContent === 'Statistic By type AllDuration') { - this.vmStatisticsAnalysisTableProcess!.style.display = 'grid'; - this.vmStatisticsAnalysisTableType!.style.display = 'none'; - this.back!.style.visibility = 'hidden'; - this.vmStatisticsAnalysisTableType!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableProcess?.removeAttribute('hideDownload'); - this.currentLevel = 0; + this.vmBack!.style.visibility = 'hidden'; + this.showAssignLevel(this.vmStatisticsAnalysisTableProcess!, this.vmStatisticsAnalysisTableType!, 0); this.processPieChart(); } else if (this.tabName!.textContent === 'Statistic By Thread AllDuration') { - this.vmStatisticsAnalysisTableType!.style.display = 'grid'; - this.vmStatisticsAnalysisTableThread!.style.display = 'none'; - this.vmStatisticsAnalysisTableThread!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableType?.removeAttribute('hideDownload'); - this.currentLevel = 1; + if (this.hideProcessCheckBox?.checked) { + this.vmBack!.style.visibility = 'hidden'; + } else { + this.vmBack!.style.visibility = 'visible'; + } + this.showAssignLevel(this.vmStatisticsAnalysisTableType!, this.vmStatisticsAnalysisTableThread!, 1); this.typePieChart(); } else if (this.tabName!.textContent === 'Statistic By Library AllDuration') { - this.vmStatisticsAnalysisTableThread!.style.display = 'grid'; - this.vmStatisticsAnalysisTableSo!.style.display = 'none'; - this.vmStatisticsAnalysisTableSo!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableThread?.removeAttribute('hideDownload'); - this.currentLevel = 2; - this.threadPieChart(); + if (this.hideThreadCheckBox?.checked) { + if (this.hideProcessCheckBox?.checked) { + this.vmBack!.style.visibility = 'hidden'; + } + this.showAssignLevel(this.vmStatisticsAnalysisTableType!, this.vmStatisticsAnalysisTableSo!, 1); + this.typePieChart(); + } else { + this.showAssignLevel(this.vmStatisticsAnalysisTableThread!, this.vmStatisticsAnalysisTableSo!, 2); + this.threadPieChart(); + } } else if (this.tabName!.textContent === 'Statistic By Function AllDuration') { - this.vmStatisticsAnalysisTableSo!.style.display = 'grid'; - this.vmStatisticsAnalysisTableFunction!.style.display = 'none'; - this.vmStatisticsAnalysisTableFunction!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableSo?.removeAttribute('hideDownload'); - this.currentLevel = 3; + this.showAssignLevel(this.vmStatisticsAnalysisTableSo!, this.vmStatisticsAnalysisTableFunction!, 3); this.libraryPieChart(); } }); } - processPieChart(): void { + + private hideProcess(): void { + this.reset(this.vmStatisticsAnalysisTableType!, false); + this.vmProcessName = ''; + this.getVirtualMemoryType(null); + } + + private hideThread(it?: any): void { + this.reset(this.vmStatisticsAnalysisTableType!, true); + this.vmProcessName = ''; + this.vmThreadName = ''; + if (it) { + this.getVirtualMemoryType(it); + } else { + this.getVirtualMemoryType(null); + } + } + + private processPieChart(): void { // @ts-ignore this.sumDur = this.processStatisticsData.allDuration; - this.vmStatisticsAnalysisPie!.config = { + this.vmPieChart!.config = { appendPadding: 0, data: this.getVmPieChartData(this.vmStatisticsAnalysisPidData), angleField: 'duration', @@ -182,20 +312,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, ], }; - this.vmStatisticsAnalysisTableProcess!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let vmProcessData = evt.detail; - if (vmProcessData.data) { - let vmsData = vmProcessData.data; - vmsData.isHover = true; - if (vmProcessData.callBack) { - vmProcessData.callBack(true); - } - } - this.vmStatisticsAnalysisPie?.showHover(); - this.vmStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = ''; + this.titleEl!.textContent = ''; this.tabName!.textContent = 'Statistic By Process AllDuration'; this.vmStatisticsAnalysisPidData.unshift(this.processStatisticsData); this.vmStatisticsAnalysisTableProcess!.recycleDataSource = this.vmStatisticsAnalysisPidData; @@ -203,44 +320,29 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmStatisticsAnalysisPidData.shift(this.processStatisticsData); this.currentLevelData = this.vmStatisticsAnalysisPidData; this.vmStatisticsAnalysisTableProcess?.reMeauseHeight(); - this.vmStatisticsAnalysisTableProcess!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.vmStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmProcessLevelClickEvent(data); - } - }); } private getVmTip() { return (obj: { obj: { tableName: any; durFormat: any; percent: any } }): string => { return `
    -
    ProcessName:${obj.obj.tableName}
    -
    Duration:${obj.obj.durFormat}
    -
    Percent:${obj.obj.percent}%
    -
    - `; +
    ProcessName:${obj.obj.tableName}
    +
    Duration:${obj.obj.durFormat}
    +
    Percent:${obj.obj.percent}%
    +
    + `; }; } - vmProcessLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.vmStatisticsAnalysisTableProcess!.style.display = 'none'; - this.vmStatisticsAnalysisTableType!.style.display = 'grid'; - this.vmStatisticsAnalysisTableProcess!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableType?.removeAttribute('hideDownload'); + private vmProcessLevelClickEvent(it: any): void { + this.reset(this.vmStatisticsAnalysisTableType!, true); this.getVirtualMemoryType(it); - this.processName = it.tableName; - this.shadowRoot!.querySelector('.title')!.textContent = this.processName; - this.vmStatisticsAnalysisPie?.hideTip(); + this.vmProcessName = it.tableName; + this.titleEl!.textContent = this.vmProcessName; + this.vmPieChart?.hideTip(); } - typePieChart(): void { - this.vmStatisticsAnalysisPie!.config = { + + private typePieChart(): void { + this.vmPieChart!.config = { appendPadding: 0, data: this.vmStatisticsAnalysisTypeData, angleField: 'duration', @@ -266,20 +368,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, ], }; - this.vmStatisticsAnalysisTableType!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let vmTypeData = evt.detail; - if (vmTypeData.data) { - let satData = vmTypeData.data; - satData.isHover = true; - if (vmTypeData.callBack) { - vmTypeData.callBack(true); - } - } - this.vmStatisticsAnalysisPie?.showHover(); - this.vmStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName; + this.titleEl!.textContent = this.vmProcessName; this.tabName!.textContent = 'Statistic By type AllDuration'; this.vmStatisticsAnalysisTypeData.unshift(this.typeStatisticsData); this.vmStatisticsAnalysisTableType!.recycleDataSource = this.vmStatisticsAnalysisTypeData; @@ -287,33 +376,32 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmStatisticsAnalysisTypeData.shift(this.typeStatisticsData); this.currentLevelData = this.vmStatisticsAnalysisTypeData; this.vmStatisticsAnalysisTableType?.reMeauseHeight(); - this.vmStatisticsAnalysisTableType!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.vmStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmTypeLevelClickEvent(data); - } - }); } - vmTypeLevelClickEvent(it: any): void { - this.clearData(); - this.vmStatisticsAnalysisTableType!.style.display = 'none'; - this.vmStatisticsAnalysisTableThread!.style.display = 'grid'; - this.vmStatisticsAnalysisTableType!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableThread?.removeAttribute('hideDownload'); - this.getVirtualMemoryThread(it); - this.typeName = it.tableName; - this.vmStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName + ' / ' + this.typeName; + + private vmTypeLevelClickEvent(it: any): void { + if (this.hideThreadCheckBox!.checked) { + this.reset(this.vmStatisticsAnalysisTableSo!, true); + this.getVirtualMemorySo(it); + } else { + this.reset(this.vmStatisticsAnalysisTableThread!, true); + this.getVirtualMemoryThread(it); + } + this.vmtypeName = it.tableName; + this.vmPieChart?.hideTip(); + let title = ''; + if (this.vmProcessName.length > 0) { + title += this.vmProcessName + ' / '; + } + if (this.vmtypeName.length > 0) { + title += this.vmtypeName; + } + this.titleEl!.textContent = title; } - threadPieChart(): void { + + private threadPieChart(): void { // @ts-ignore this.sumDur = this.threadStatisticsData.allDuration; - this.vmStatisticsAnalysisPie!.config = { + this.vmPieChart!.config = { appendPadding: 0, data: this.getVmPieChartData(this.vmStatisticsAnalysisThreadData), angleField: 'duration', @@ -342,20 +430,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, ], }; - this.vmStatisticsAnalysisTableThread!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let vmThreadData = evt.detail; - if (vmThreadData.data) { - let threadData = vmThreadData.data; - threadData.isHover = true; - if (vmThreadData.callBack) { - vmThreadData.callBack(true); - } - } - this.vmStatisticsAnalysisPie?.showHover(); - this.vmStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = this.processName + ' / ' + this.typeName; + let title = ''; + if (this.vmProcessName.length > 0) { + title += this.vmProcessName + ' / '; + } + if (this.vmtypeName.length > 0) { + title += this.vmtypeName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Thread AllDuration'; this.vmStatisticsAnalysisThreadData.unshift(this.threadStatisticsData); this.vmStatisticsAnalysisTableThread!.recycleDataSource = this.vmStatisticsAnalysisThreadData; @@ -363,36 +445,30 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmStatisticsAnalysisThreadData.shift(this.threadStatisticsData); this.currentLevelData = this.vmStatisticsAnalysisThreadData; this.vmStatisticsAnalysisTableThread?.reMeauseHeight(); - this.vmStatisticsAnalysisTableThread!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.vmStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmThreadLevelClickEvent(data); - } - }); } - vmThreadLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.vmStatisticsAnalysisTableThread!.style.display = 'none'; - this.vmStatisticsAnalysisTableSo!.style.display = 'grid'; - this.vmStatisticsAnalysisTableThread!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableSo?.removeAttribute('hideDownload'); + private vmThreadLevelClickEvent(it: any): void { + this.reset(this.vmStatisticsAnalysisTableSo!, true); this.getVirtualMemorySo(it); - this.threadName = it.tableName; - this.vmStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = - this.processName + ' / ' + this.typeName + ' / ' + this.threadName; + this.vmThreadName = it.tableName; + this.vmPieChart?.hideTip(); + let title = ''; + if (this.vmProcessName.length > 0) { + title += this.vmProcessName + ' / '; + } + if (this.vmtypeName.length > 0) { + title += this.vmtypeName + ' / '; + } + if (this.vmThreadName.length > 0) { + title += this.vmThreadName; + } + this.titleEl!.textContent = title; } - libraryPieChart(): void { + + private libraryPieChart(): void { // @ts-ignore this.sumDur = this.libStatisticsData.allDuration; - this.vmStatisticsAnalysisPie!.config = { + this.vmPieChart!.config = { appendPadding: 0, data: this.getVmPieChartData(this.vmStatisticsAnalysisSoData), angleField: 'duration', @@ -403,11 +479,11 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, tip: (vmLibraryObj): string => { return `
    -
    Library:${vmLibraryObj.obj.tableName}
    -
    Duration:${vmLibraryObj.obj.durFormat}
    -
    percent:${vmLibraryObj.obj.percent}%
    -
    - `; +
    Library:${vmLibraryObj.obj.tableName}
    +
    Duration:${vmLibraryObj.obj.durFormat}
    +
    percent:${vmLibraryObj.obj.percent}%
    +
    + `; }, angleClick: (it): void => { // @ts-ignore @@ -428,21 +504,21 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, ], }; - this.vmStatisticsAnalysisTableSo!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let vmSoData = evt.detail; - if (vmSoData.data) { - let soData = vmSoData.data; - soData.isHover = true; - if (vmSoData.callBack) { - vmSoData.callBack(true); - } + let title = ''; + if (this.vmProcessName.length > 0) { + title += this.vmProcessName + ' / '; + } + if (this.vmtypeName.length > 0) { + if (this.hideThreadCheckBox?.checked) { + title += this.vmtypeName; + } else { + title += this.vmtypeName + ' / '; } - this.vmStatisticsAnalysisPie?.showHover(); - this.vmStatisticsAnalysisPie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = - this.processName + ' / ' + this.typeName + ' / ' + this.threadName; + } + if (this.vmThreadName.length > 0) { + title += this.vmThreadName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Library AllDuration'; this.vmStatisticsAnalysisSoData.unshift(this.libStatisticsData); this.vmStatisticsAnalysisTableSo!.recycleDataSource = this.vmStatisticsAnalysisSoData; @@ -450,33 +526,29 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmStatisticsAnalysisSoData.shift(this.libStatisticsData); this.currentLevelData = this.vmStatisticsAnalysisSoData; this.vmStatisticsAnalysisTableSo?.reMeauseHeight(); - this.vmStatisticsAnalysisTableSo!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.vmStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmSoLevelClickEvent(data); - } - }); } - vmSoLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.vmStatisticsAnalysisTableSo!.style.display = 'none'; - this.vmStatisticsAnalysisTableFunction!.style.display = 'grid'; - this.vmStatisticsAnalysisTableSo!.setAttribute('hideDownload', ''); - this.vmStatisticsAnalysisTableFunction?.removeAttribute('hideDownload'); + + private vmSoLevelClickEvent(it: any): void { + this.reset(this.vmStatisticsAnalysisTableFunction!, true); this.getVirtualMemoryFunction(it); - this.vmStatisticsAnalysisPie?.hideTip(); - this.shadowRoot!.querySelector('.title')!.textContent = - this.processName + ' / ' + this.typeName + ' / ' + this.threadName + ' / ' + it.tableName; + this.vmPieChart?.hideTip(); + let title = ''; + if (this.vmProcessName.length > 0) { + title += this.vmProcessName + ' / '; + } + if (this.vmtypeName.length > 0) { + title += this.vmtypeName + ' / '; + } + if (this.vmThreadName.length > 0 && !this.hideThreadCheckBox!.checked) { + title += this.vmThreadName + ' / '; + } + if (it.tableName.length > 0) { + title += it.tableName; + } + this.titleEl!.textContent = title; } - sortByColumn(column: string, vmsSort: number): void { - this.vmStatisticsAnalysisSortColumn = column; - this.vmStatisticsAnalysisSortType = vmsSort; + + private sortByColumn(): void { let vmsCurrentTable: LitTable | null | undefined; switch (this.currentLevel) { case 0: @@ -498,7 +570,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { if (!vmsCurrentTable) { return; } - if (vmsSort === 0) { + if (this.vmSortType === 0) { let vmsArr = [...this.currentLevelData]; switch (this.currentLevel) { case 0: @@ -520,9 +592,9 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { vmsCurrentTable!.recycleDataSource = vmsArr; } else { let vmsArray = [...this.currentLevelData]; - if (column === 'tableName') { + if (this.vmSortColumn === 'tableName') { vmsCurrentTable!.recycleDataSource = vmsArray.sort((firstVMElement, secondVMElement) => { - if (vmsSort === 1) { + if (this.vmSortType === 1) { if (firstVMElement.tableName > secondVMElement.tableName) { return 1; } else if (firstVMElement.tableName === secondVMElement.tableName) { @@ -540,9 +612,9 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { } } }); - } else if (column === 'durFormat' || column === 'percent') { + } else if (this.vmSortColumn === 'durFormat' || this.vmSortColumn === 'percent') { vmsCurrentTable!.recycleDataSource = vmsArray.sort((a, b) => { - return vmsSort === 1 ? a.duration - b.duration : b.duration - a.duration; + return this.vmSortType === 1 ? a.duration - b.duration : b.duration - a.duration; }); } switch (this.currentLevel) { @@ -565,7 +637,8 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { vmsCurrentTable!.recycleDataSource = vmsArray; } } - getVirtualMemoryProcess(result: Array): void { + + private getVirtualMemoryProcess(result: Array): void { this.vmStatisticsAnalysisProgressEL!.loading = true; this.vmStatisticsAnalysisProcessData = JSON.parse(JSON.stringify(result)); if (!this.vmStatisticsAnalysisProcessData || this.vmStatisticsAnalysisProcessData.length === 0) { @@ -591,10 +664,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { let vmPidDataDur = 0; let pName = ''; for (let item of value) { - pName = item.processName = - item.processName === null || item.processName === undefined - ? `Process(${item.pid})` - : `${item.processName}(${item.pid})`; + if (item.vmProcessName && item.vmProcessName.length > 0) { + if (!item.vmProcessName.endsWith(`(${item.pid})`)) { + item.vmProcessName = `${item.vmProcessName}(${item.pid})`; + } + } else { + item.vmProcessName = `Process(${item.pid})`; + } + pName = item.vmProcessName; vmPidDataDur += item.dur; } this.vmStatisticsAnalysisPidData.push({ @@ -610,31 +687,17 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.currentLevel = 0; this.vmStatisticsAnalysisProgressEL!.loading = false; this.processPieChart(); - new ResizeObserver(() => { - if (this.parentElement?.clientHeight != 0) { - this.vmStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.vmStatisticsAnalysisTableProcess?.reMeauseHeight(); - this.vmStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.vmStatisticsAnalysisTableType?.reMeauseHeight(); - this.vmStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.vmStatisticsAnalysisTableThread?.reMeauseHeight(); - this.vmStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.vmStatisticsAnalysisTableSo?.reMeauseHeight(); - this.vmStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px'; - this.vmStatisticsAnalysisTableFunction?.reMeauseHeight(); - } - }).observe(this.parentElement!); } - getVirtualMemoryType(item: any): void { + + private getVirtualMemoryType(item: any): void { this.vmStatisticsAnalysisProgressEL!.loading = true; let vmTypeMap = new Map>(); - let pid = item.pid; let allDur = 0; if (!this.vmStatisticsAnalysisProcessData || this.vmStatisticsAnalysisProcessData.length === 0) { return; } for (let vmsItem of this.vmStatisticsAnalysisProcessData) { - if (vmsItem.pid !== pid) { + if (item && vmsItem.pid !== item.pid && !this.hideProcessCheckBox?.checked) { continue; } allDur += vmsItem.dur; @@ -654,7 +717,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { } const vmTypeData = { tableName: this.typeIdToString(key), - pid: item.pid, + pid: item === null ? value[0].pid : item.pid, type: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -668,7 +731,8 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.typePieChart(); this.vmStatisticsAnalysisProgressEL!.loading = false; } - getVirtualMemoryThread(item: any): void { + + private getVirtualMemoryThread(item: any): void { this.vmStatisticsAnalysisProgressEL!.loading = true; let threadMap = new Map>(); let pid = item.pid; @@ -678,7 +742,11 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { return; } for (let vmapItem of this.vmStatisticsAnalysisProcessData) { - if (vmapItem.pid !== pid || vmapItem.type !== type) { + if ( + (!this.hideProcessCheckBox?.checked && vmapItem.pid !== pid) || + vmapItem.type !== type || + (vmapItem.type !== type && this.hideProcessCheckBox?.checked) + ) { continue; } allDur += vmapItem.dur; @@ -696,8 +764,10 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { let tName = ''; for (let item of value) { vmThreadDur += item.dur; - tName = item.threadName = - item.threadName === null || item.threadName === undefined ? `Thread(${item.tid})` : `${item.threadName}`; + tName = item.vmThreadName = + item.vmThreadName === null || item.vmThreadName === undefined + ? `Thread(${item.tid})` + : `${item.vmThreadName}`; } const threadData = { tableName: tName, @@ -716,19 +786,31 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmStatisticsAnalysisProgressEL!.loading = false; this.threadPieChart(); } - getVirtualMemorySo(item: any): void { + + private getVirtualMemorySo(item: any): void { this.vmStatisticsAnalysisProgressEL!.loading = true; - let tid = item.tid; - let pid = item.pid; - let type = item.type; let allDur = 0; let libMap = new Map>(); if (!this.vmStatisticsAnalysisProcessData || this.vmStatisticsAnalysisProcessData.length === 0) { return; } for (let vmItemData of this.vmStatisticsAnalysisProcessData) { - if (vmItemData.pid !== pid || vmItemData.tid !== tid || vmItemData.type !== type) { - continue; + if (!this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if (item && (vmItemData.pid !== item.pid || vmItemData.tid !== item.tid || vmItemData.type !== item.type)) { + continue; + } + } else if (!this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (item && (vmItemData.pid !== item.pid || vmItemData.type !== item.type)) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ((item && vmItemData.tid !== item.tid) || vmItemData.type !== item.type) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (item && vmItemData.type !== item.type) { + continue; + } } allDur += vmItemData.dur; if (libMap.has(vmItemData.libId)) { @@ -756,9 +838,9 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { } const soData = { tableName: vmLibName, - pid: item.pid, - type: item.type, - tid: item.tid, + pid: item === null ? value[0].pid : item.pid, + type: item === null ? value[0].type : item.type, + tid: item === null ? value[0].tid : item.tid, libId: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -773,7 +855,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.libraryPieChart(); } - getVirtualMemoryFunction(item: any): void { + private getVirtualMemoryFunction(item: any): void { this.vmStatisticsAnalysisProgressEL!.loading = true; this.shadowRoot!.querySelector('.vm-subheading')!.textContent = 'Statistic By Function AllDuration'; let tid = item.tid; @@ -786,13 +868,27 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { return; } for (let vmProcessData of this.vmStatisticsAnalysisProcessData) { - if ( - vmProcessData.pid !== pid || - vmProcessData.tid !== tid || - vmProcessData.type !== type || - vmProcessData.libId !== libId - ) { - continue; + if (!this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if ( + vmProcessData.pid !== pid || + vmProcessData.tid !== tid || + vmProcessData.type !== type || + vmProcessData.libId !== libId + ) { + continue; + } + } else if (!this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (vmProcessData.pid !== pid || vmProcessData.type !== type || vmProcessData.libId !== libId) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && !this.hideThreadCheckBox?.checked) { + if (vmProcessData.tid !== tid || vmProcessData.type !== type || vmProcessData.libId !== libId) { + continue; + } + } else if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + if (vmProcessData.type !== type || vmProcessData.libId !== libId) { + continue; + } } allDur += vmProcessData.dur; if (symbolMap.has(vmProcessData.symbolId)) { @@ -831,7 +927,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { // @ts-ignore this.sumDur = this.libStatisticsData.allDuration; this.vmStatisticsAnalysisProgressEL!.loading = false; - this.vmStatisticsAnalysisPie!.config = { + this.vmPieChart!.config = { appendPadding: 0, data: this.getVmPieChartData(this.vmStatisticsAnalysisFunctionData), angleField: 'duration', @@ -842,11 +938,11 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, tip: (vmObj): string => { return `
    -
    Function:${vmObj.obj.tableName}
    -
    Duration:${vmObj.obj.durFormat}
    -
    percent:${vmObj.obj.percent}
    -
    - `; +
    Function:${vmObj.obj.tableName}
    +
    Duration:${vmObj.obj.durFormat}
    +
    percent:${vmObj.obj.percent}
    + + `; }, hoverHandler: (vmPieData): void => { if (vmPieData) { @@ -861,31 +957,15 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { }, ], }; - this.vmStatisticsAnalysisTableFunction!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let vmFunctionData = evt.detail; - if (vmFunctionData.data) { - let data = vmFunctionData.data; - data.isHover = true; - if (vmFunctionData.callBack) { - vmFunctionData.callBack(true); - } - } - this.vmStatisticsAnalysisPie?.showHover(); - this.vmStatisticsAnalysisPie?.hideTip(); - }); this.vmStatisticsAnalysisFunctionData.unshift(this.functionStatisticsData); this.vmStatisticsAnalysisTableFunction!.recycleDataSource = this.vmStatisticsAnalysisFunctionData; this.vmStatisticsAnalysisTableFunction?.reMeauseHeight(); // @ts-ignore this.vmStatisticsAnalysisFunctionData.shift(this.functionStatisticsData); this.currentLevelData = this.vmStatisticsAnalysisFunctionData; - this.vmStatisticsAnalysisTableFunction!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); } - typeIdToString(type: number): string { + + private typeIdToString(type: number): string { let vmReleaseType: string; if (type === 1) { vmReleaseType = 'File Backed In'; @@ -895,7 +975,13 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { // @ts-ignore return vmReleaseType; } - totalDurationData(duration: number): { durFormat: string; percent: string; tableName: string; duration: number } { + + private totalDurationData(duration: number): { + durFormat: string; + percent: string; + tableName: string; + duration: number; + } { return { durFormat: Utils.getProbablyTime(duration), percent: ((duration / duration) * 100).toFixed(2), @@ -903,7 +989,8 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { duration: 0, }; } - getVmPieChartData(vmRes: any[]): unknown[] { + + private getVmPieChartData(vmRes: any[]): unknown[] { if (vmRes.length > 20) { let vmPieChartArr: string[] = []; let other: any = { @@ -927,7 +1014,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { return vmRes; } - getVmDataByWorker(args: any[], handler: Function): void { + private getVmDataByWorker(args: any[], handler: Function): void { procedurePool.submitWithName( 'logic0', 'fileSystem-action', @@ -940,6 +1027,28 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { ); } + public connectedCallback(): void { + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + this.vmStatisticsAnalysisTableProcess!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.vmStatisticsAnalysisTableProcess?.reMeauseHeight(); + this.vmStatisticsAnalysisTableType!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.vmStatisticsAnalysisTableType?.reMeauseHeight(); + this.vmStatisticsAnalysisTableThread!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.vmStatisticsAnalysisTableThread?.reMeauseHeight(); + this.vmStatisticsAnalysisTableSo!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.vmStatisticsAnalysisTableSo?.reMeauseHeight(); + this.vmStatisticsAnalysisTableFunction!.style.height = this.parentElement!.clientHeight - 50 + 'px'; + this.vmStatisticsAnalysisTableFunction?.reMeauseHeight(); + if (this.parentElement!.clientHeight >= 0 && this.parentElement!.clientHeight <= 31) { + this.filterEl!.style.display = 'none'; + } else { + this.filterEl!.style.display = 'flex'; + } + } + }).observe(this.parentElement!); + } + initHtml(): string { return `
    -
    -
    -
    -
    - -
    -
    -
    +
    +
    +
    +
    +
    -
    - -
    -
    - - - - - - - - - - - - -
    - +
    +
    +
    + +
    +
    + + + + + + + + + + + + + +
    + `; } } diff --git a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts index 4551fab84..0f3c712f8 100644 --- a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts +++ b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts @@ -16,164 +16,207 @@ import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; import { LitTable } from '../../../../../base-ui/table/lit-table'; import { SelectionData, SelectionParam } from '../../../../bean/BoxSelection'; -import '../../../StackBar.js' -import { getTabRunningPercent, querySearchFuncData, queryCpuFreqUsageData, queryCpuFreqFilterId } from '../../../../database/SqlLite.js'; +import '../../../StackBar.js'; +import { + getTabRunningPercent, + querySearchFuncData, + queryCpuFreqUsageData, + queryCpuFreqFilterId, +} from '../../../../database/SqlLite.js'; import { Utils } from '../../base/Utils.js'; import { log } from '../../../../../log/Log.js'; import { resizeObserver } from '../SheetUtils.js'; @element('tabpane-freqdatacut') export class TabPaneFreqDataCut extends BaseElement { - private threadStatesTbl: LitTable | null | undefined; - private threadStatesTblSource: Array = []; - private currentSelectionParam: SelectionParam | any; - private threadStatesDIV: Element | null | undefined; - private initData: Array = []; + private threadStatesTbl: LitTable | null | undefined; + private threadStatesTblSource: Array = []; + private currentSelectionParam: SelectionParam | any; + private threadStatesDIV: Element | null | undefined; + private initData: Array = []; - set data(threadStatesParam: SelectionParam | any) { - if (this.currentSelectionParam === threadStatesParam) { - return; - } - this.currentSelectionParam = threadStatesParam; - this.threadStatesTblSource = []; - this.threadStatesTbl!.recycleDataSource = []; - let tableValue: any = this.threadStatesTbl; - tableValue.value = []; - let divRoot1: any = this.shadowRoot?.querySelector('#dataCutThreadId'); - divRoot1.value = ''; - let divRoot2: any = this.shadowRoot?.querySelector('#dataCutThreadFunc'); - divRoot2.value = ''; - getTabRunningPercent(threadStatesParam.threadIds, threadStatesParam.leftNs, threadStatesParam.rightNs).then((result) => { - queryCpuFreqFilterId().then(r => { - let IdMap = new Map(); - let queryId = new Array(); - for (let i = 0; i < r.length; i++) { - queryId.push(r[i].id); - IdMap.set(r[i].id, r[i].cpu); + set data(threadStatesParam: SelectionParam | any) { + if (this.currentSelectionParam === threadStatesParam) { + return; + } + this.currentSelectionParam = threadStatesParam; + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + let tableValue: any = this.threadStatesTbl; + tableValue.value = []; + let divRoot1: any = this.shadowRoot?.querySelector('#dataCutThreadId'); + divRoot1.value = ''; + let divRoot2: any = this.shadowRoot?.querySelector('#dataCutThreadFunc'); + divRoot2.value = ''; + getTabRunningPercent(threadStatesParam.threadIds, threadStatesParam.leftNs, threadStatesParam.rightNs).then( + (result) => { + queryCpuFreqFilterId().then((r) => { + let IdMap = new Map(); + let queryId = new Array(); + for (let i = 0; i < r.length; i++) { + queryId.push(r[i].id); + IdMap.set(r[i].id, r[i].cpu); + } + queryCpuFreqUsageData(queryId).then((res) => { + if (result != null && result.length > 0) { + log('getTabRunningPercent result size : ' + result.length); + let sum = 0; + let dealArr = new Array(); + for (let i of res) { + dealArr.push({ + startNS: i.startNS + threadStatesParam.recordStartNs, + dur: i.dur, + value: i.value, + cpu: IdMap.get(i.filter_id), + }); + } + let targetList = new Array(); + let cpuArr = new Array(); + let finalResultArr = new Array(); + finalResultArr.push({ + thread: '', + count: 0, + cpu: '', + freq: '', + dur: 0, + percent: '100.00', + state: 'Running', + children: new Array(), + }); + for (let e of result) { + if (threadStatesParam.processIds.includes(e.pid) && e.state == 'Running') { + let process = Utils.PROCESS_MAP.get(e.pid); + let thread = Utils.THREAD_MAP.get(e.tid); + e.process = process == null || process.length == 0 ? '[NULL]' : process; + e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread; + e.stateJX = e.state; + e.state = Utils.getEndState(e.stateJX); + sum += e.dur; + targetList.push(e); + if (!cpuArr.includes(e.cpu)) { + cpuArr.push(e.cpu); + finalResultArr[0].thread = + finalResultArr[0].thread == '' ? e.tid + '_' + e.thread : finalResultArr[0].thread; + finalResultArr[0].children.push({ + thread: e.tid + '_' + e.thread, + count: 0, + cpu: e.cpu, + freq: '', + dur: 0, + percent: 0, + state: 'Running', + children: new Array(), + }); + } } - queryCpuFreqUsageData(queryId).then((res) => { - if (result != null && result.length > 0) { - log('getTabRunningPercent result size : ' + result.length); - let sum = 0; - let dealArr = new Array(); - for (let i of res) { - dealArr.push({ 'startNS': i.startNS + threadStatesParam.recordStartNs, 'dur': i.dur, 'value': i.value, 'cpu': IdMap.get(i.filter_id) }); - } - let targetList = new Array(); - let cpuArr = new Array(); - let finalResultArr = new Array(); - finalResultArr.push({ 'thread': '', 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': '100.00', 'state': 'Running', children: new Array() }); - for (let e of result) { - if (threadStatesParam.processIds.includes(e.pid) && e.state == 'Running') { - let process = Utils.PROCESS_MAP.get(e.pid); - let thread = Utils.THREAD_MAP.get(e.tid); - e.process = process == null || process.length == 0 ? '[NULL]' : process; - e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread; - e.stateJX = e.state; - e.state = Utils.getEndState(e.stateJX); - sum += e.dur; - targetList.push(e); - if (!cpuArr.includes(e.cpu)) { - cpuArr.push(e.cpu); - finalResultArr[0].thread = finalResultArr[0].thread == '' ? e.tid + '_' + e.thread : finalResultArr[0].thread; - finalResultArr[0].children.push({ 'thread': e.tid + '_' + e.thread, 'count': 0, 'cpu': e.cpu, 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); - } - } - } - // 用来存放数据切割之前的汇总数据 - let resultList = new Array(); - // 通过循环获取每个running状态线程的相关信息，此处或许可以进行算法优化 - const tsMutiple = 1000000000; - for (let i = 0; i < targetList.length; i++) { - for (let j = 0; j < dealArr.length; j++) { - if (targetList[i].cpu == dealArr[j].cpu) { - if (targetList[i].ts > dealArr[j].startNS) { - if (targetList[i].ts < (dealArr[j].startNS + dealArr[j].dur)) { - if (targetList[i].dur < (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts)) { - resultList.push({ 'thread': targetList[i].tid + '_' + targetList[i].thread, 'count': (dealArr[j].value * targetList[i].dur) / 1000, 'cpu': targetList[i].cpu, 'freq': dealArr[j].value, 'dur': targetList[i].dur, 'percent': targetList[i].dur / sum * 100, 'state': 'Running', 'ts': targetList[i].ts / tsMutiple }); - break; - } else { - resultList.push({ 'thread': targetList[i].tid + '_' + targetList[i].thread, 'count': (dealArr[j].value * (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts)) / 1000, 'cpu': targetList[i].cpu, 'freq': dealArr[j].value, 'dur': (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts), 'percent': (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) / sum * 100, 'state': 'Running', 'ts': targetList[i].ts / tsMutiple }); - } - } - } else { - if ((targetList[i].ts + targetList[i].dur) > dealArr[j].startNS) { - if ((targetList[i].dur + targetList[i].ts - dealArr[j].startNS) < dealArr[j].dur) { - resultList.push({ 'thread': targetList[i].tid + '_' + targetList[i].thread, 'count': (dealArr[j].value * (targetList[i].dur + targetList[i].ts - dealArr[j].startNS)) / 1000, 'cpu': targetList[i].cpu, 'freq': dealArr[j].value, 'dur': (targetList[i].dur + targetList[i].ts - dealArr[j].startNS), 'percent': (targetList[i].dur + targetList[i].ts - dealArr[j].startNS) / sum * 100, 'state': 'Running', 'ts': dealArr[j].startNS / tsMutiple }); - break; - } else { - resultList.push({ 'thread': targetList[i].tid + '_' + targetList[i].thread, 'count': (dealArr[j].value * dealArr[j].dur) / 1000, 'cpu': targetList[i].cpu, 'freq': dealArr[j].value, 'dur': dealArr[j].dur, 'percent': dealArr[j].dur / sum * 100, 'state': 'Running', 'ts': dealArr[j].startNS / tsMutiple }); - } - } else { - resultList.push({ 'thread': targetList[i].tid + '_' + targetList[i].thread, 'count': 0, 'cpu': targetList[i].cpu, 'freq': 'unknown', 'dur': targetList[i].dur, 'percent': targetList[i].dur / sum * 100, 'state': 'Running', 'ts': targetList[i].ts / tsMutiple }); - break; - } - } - } - } - } - // 深拷贝，用来进行数据切割操作，避免数据污染 - this.initData = JSON.parse(JSON.stringify(resultList)); - //合并同一线程内，当运行所在cpu和频点相同时，dur及percent进行累加求和，或许可以进行算法优化 - for (let i = 0; i < resultList.length; i++) { - for (let j = i + 1; j < resultList.length; j++) { - if (resultList[i].cpu == resultList[j].cpu && resultList[i].freq == resultList[j].freq) { - resultList[i].dur += resultList[j].dur; - resultList[i].percent += resultList[j].percent; - resultList[i].count += resultList[j].count; - resultList.splice(j, 1); - j--; - } - } - resultList[i].percent = Number((resultList[i].percent).toFixed(2)); - resultList[i].ts = (resultList[i].ts * tsMutiple - threadStatesParam.recordStartNs) / tsMutiple; - } - finalResultArr[0].children.sort((a: any, b: any) => a.cpu - b.cpu); - // 转成树结构数据进行展示 - for (let i = 0; i < finalResultArr[0].children.length; i++) { - for (let j = 0; j < resultList.length; j++) { - if (finalResultArr[0].children[i].cpu == resultList[j].cpu) { - finalResultArr[0].children[i].children.push(resultList[j]); - finalResultArr[0].children[i].dur += resultList[j].dur; - finalResultArr[0].children[i].percent += resultList[j].percent; - finalResultArr[0].children[i].count += resultList[j].count; - resultList.splice(j, 1); - j--; - } - } - finalResultArr[0].children[i].percent = finalResultArr[0].children[i].percent.toFixed(2); - finalResultArr[0].dur += finalResultArr[0].children[i].dur; - finalResultArr[0].count += finalResultArr[0].children[i].count; + } + // 用来存放数据切割之前的汇总数据 + let resultList = new Array(); + // 通过循环获取每个running状态线程的相关信息，此处或许可以进行算法优化 + const tsMutiple = 1000000000; + for (let i = 0; i < targetList.length; i++) { + for (let j = 0; j < dealArr.length; j++) { + if (targetList[i].cpu == dealArr[j].cpu) { + if (targetList[i].ts > dealArr[j].startNS) { + if (targetList[i].ts < dealArr[j].startNS + dealArr[j].dur) { + if (targetList[i].dur < dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) { + resultList.push({ + thread: targetList[i].tid + '_' + targetList[i].thread, + count: (dealArr[j].value * targetList[i].dur) / 1000, + cpu: targetList[i].cpu, + freq: dealArr[j].value, + dur: targetList[i].dur, + percent: (targetList[i].dur / sum) * 100, + state: 'Running', + ts: targetList[i].ts / tsMutiple, + }); + break; + } else { + resultList.push({ + thread: targetList[i].tid + '_' + targetList[i].thread, + count: (dealArr[j].value * (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts)) / 1000, + cpu: targetList[i].cpu, + freq: dealArr[j].value, + dur: dealArr[j].startNS + dealArr[j].dur - targetList[i].ts, + percent: ((dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) / sum) * 100, + state: 'Running', + ts: targetList[i].ts / tsMutiple, + }); } - this.threadStatesTblSource = finalResultArr; - this.threadStatesTbl!.recycleDataSource = finalResultArr; + } } else { - this.threadStatesTblSource = []; - this.threadStatesTbl!.recycleDataSource = []; - this.initData = []; + if (targetList[i].ts + targetList[i].dur > dealArr[j].startNS) { + if (targetList[i].dur + targetList[i].ts - dealArr[j].startNS < dealArr[j].dur) { + resultList.push({ + thread: targetList[i].tid + '_' + targetList[i].thread, + count: + (dealArr[j].value * (targetList[i].dur + targetList[i].ts - dealArr[j].startNS)) / 1000, + cpu: targetList[i].cpu, + freq: dealArr[j].value, + dur: targetList[i].dur + targetList[i].ts - dealArr[j].startNS, + percent: ((targetList[i].dur + targetList[i].ts - dealArr[j].startNS) / sum) * 100, + state: 'Running', + ts: dealArr[j].startNS / tsMutiple, + }); + break; + } else { + resultList.push({ + thread: targetList[i].tid + '_' + targetList[i].thread, + count: (dealArr[j].value * dealArr[j].dur) / 1000, + cpu: targetList[i].cpu, + freq: dealArr[j].value, + dur: dealArr[j].dur, + percent: (dealArr[j].dur / sum) * 100, + state: 'Running', + ts: dealArr[j].startNS / tsMutiple, + }); + } + } else { + resultList.push({ + thread: targetList[i].tid + '_' + targetList[i].thread, + count: 0, + cpu: targetList[i].cpu, + freq: 'unknown', + dur: targetList[i].dur, + percent: (targetList[i].dur / sum) * 100, + state: 'Running', + ts: targetList[i].ts / tsMutiple, + }); + break; + } } - }) - }) - + } + } + } + // 深拷贝，用来进行数据切割操作，避免数据污染 + this.initData = JSON.parse(JSON.stringify(resultList)); + } else { + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + this.initData = []; + } + }); }); - } - initElements(): void { - this.threadStatesTbl = this.shadowRoot?.querySelector('#tb-running-percent'); - // 暂时屏蔽列排序功能，后续增加则重写排序方法 - this.threadStatesDIV = this.shadowRoot?.querySelector('#dataCut'); - this.threadStatesDIV?.children[2].children[0].addEventListener('click', (e) => { - this.dataSingleCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); - }) - this.threadStatesDIV?.children[2].children[1].addEventListener('click', (e) => { - this.dataLoopCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); - }) - } - connectedCallback() { - super.connectedCallback(); - resizeObserver(this.parentElement!, this.threadStatesTbl!); - } - initHtml(): string { - return ` + } + ); + } + initElements(): void { + this.threadStatesTbl = this.shadowRoot?.querySelector('#tb-running-percent'); + // 暂时屏蔽列排序功能，后续增加则重写排序方法 + this.threadStatesDIV = this.shadowRoot?.querySelector('#dataCut'); + this.threadStatesDIV?.children[2].children[0].addEventListener('click', (e) => { + this.dataSingleCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); + }); + this.threadStatesDIV?.children[2].children[1].addEventListener('click', (e) => { + this.dataLoopCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); + }); + } + connectedCallback() { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.threadStatesTbl!); + } + initHtml(): string { + return ` -
    +
    -
    -
    -
    -
    - -
    -
    -
    +
    +
    +
    +
    +
    -
    - -
    -
    - - - -
    - +
    +
    +
    + +
    +
    + + + + +
    + `; } } diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts index 78ec4849b..317c43a4c 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts @@ -105,8 +105,6 @@ export class TabpanePerfBottomUp extends BaseElement { array.forEach((data) => { data.totalTimePercent = `${((data.totalTime / totalTime) * percentageDenominator).toFixed(percentFraction)}%`; data.selfTimePercent = `${((data.selfTime / totalTime) * percentageDenominator).toFixed(percentFraction)}%`; - data.selfTimeStr = `${data.selfTime.toFixed(timeFractionDigits)}ms`; - data.totalTimeStr = `${data.totalTime.toFixed(timeFractionDigits)}ms`; setTabData(data.children); }); }; @@ -203,7 +201,7 @@ export class TabpanePerfBottomUp extends BaseElement { return callTreeRightData.totalTime - callTreeLeftData.totalTime; } const CallTreeSortArr = arr.sort((callTreeLeftData, callTreeRightData) => { - if (this.sortKey === 'selfTimeStr' || this.sortKey === 'selfTimePercent') { + if (this.sortKey === 'selfTime' || this.sortKey === 'selfTimePercent') { if (this.sortType === defaultSortType) { return defaultSort(callTreeLeftData, callTreeRightData); } else if (this.sortType === 1) { @@ -268,11 +266,11 @@ export class TabpanePerfBottomUp extends BaseElement { - - @@ -285,7 +283,7 @@ export class TabpanePerfBottomUp extends BaseElement { - diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts index b14aebbc8..fc3291d4e 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts @@ -32,6 +32,11 @@ import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressB import { procedurePool } from '../../../../database/Procedure.js'; import { showButtonMenu } from '../SheetUtils.js'; +const InvertOptionIndex: number = 0; +const hideThreadOptionIndex: number = 3; +const hideThreadStateOptionIndex: number = 4; +const callTreeValueNoSample: number[] = [InvertOptionIndex, hideThreadOptionIndex, hideThreadStateOptionIndex]; + @element('tabpane-perf-profile') export class TabpanePerfProfile extends BaseElement { private perfProfilerTbl: LitTable | null | undefined; @@ -40,15 +45,15 @@ export class TabpanePerfProfile extends BaseElement { private perfProfilerRightSource: Array = []; private perfProfilerFilter: TabPaneFilter | null | undefined; private perfProfilerDataSource: any[] = []; - private perfProfileSortKey = 'weight'; - private perfProfileSortType = 0; + private perfProfileSortKey: string = 'weight'; + private perfProfileSortType: number = 0; private perfSelectedData: any = undefined; private perfProfileFrameChart: FrameChart | null | undefined; private isChartShow: boolean = false; - private systemRuleName = '/system/'; - private perfProfileNumRuleName = '/max/min/'; + private systemRuleName: string = '/system/'; + private perfProfileNumRuleName: string = '/max/min/'; private perfProfilerModal: DisassemblingWindow | null | undefined; - private needShowMenu = true; + private needShowMenu: boolean = true; private searchValue: string = ''; private perfProfileLoadingPage: any; private currentSelection: SelectionParam | undefined; @@ -66,6 +71,7 @@ export class TabpanePerfProfile extends BaseElement { } else { this.perfProfilerFilter!.style.display = 'none'; } + procedurePool.submitWithName('logic0', 'perf-reset', [], undefined, () => {}); this.perfProfilerFilter!.disabledTransfer(false, 'perf'); this.perfProfilerFilter!.initializeFilterTree(true, true, true); this.perfProfilerFilter!.filterValue = ''; @@ -157,21 +163,21 @@ export class TabpanePerfProfile extends BaseElement { return false; } - setRightTableData(chainMerageData: PerfCallChainMerageData) { + setRightTableData(chainMerageData: PerfCallChainMerageData): void { let parentsMerageData: Array = []; let childrenMerageData: Array = []; this.getParentTree(this.perfProfilerDataSource, chainMerageData, parentsMerageData); let maxId = chainMerageData.id; let maxDur = 0; - function findMaxStack(call: PerfCallChainMerageData) { + function findMaxStack(call: PerfCallChainMerageData): void { if (call.children.length === 0) { if (call.dur > maxDur) { maxDur = call.dur; maxId = call.id; } } else { - call.children.map((callChild) => { + call.children.map((callChild): void => { findMaxStack(callChild); }); } @@ -188,7 +194,7 @@ export class TabpanePerfProfile extends BaseElement { this.perfProfilerRightSource = perfProfileParentsList; let rightSource: Array = []; if (len != 0) { - rightSource = this.perfProfilerRightSource.filter((item) => { + rightSource = this.perfProfilerRightSource.filter((item): boolean => { return item.canCharge; }); } @@ -201,14 +207,14 @@ export class TabpanePerfProfile extends BaseElement { this.perfProfileFrameChart = this.shadowRoot?.querySelector('#framechart'); this.perfProfilerModal = this.shadowRoot?.querySelector('tab-native-data-modal'); this.perfProfileLoadingPage = this.shadowRoot?.querySelector('.perf-profile-loading'); - this.perfProfileFrameChart!.addChartClickListener((needShowMenu: boolean) => { + this.perfProfileFrameChart!.addChartClickListener((needShowMenu: boolean): void => { this.parentElement!.scrollTo(0, 0); showButtonMenu(this.perfProfilerFilter, needShowMenu); this.needShowMenu = needShowMenu; }); this.perfProfilerTbl!.rememberScrollTop = true; this.perfProfilerFilter = this.shadowRoot?.querySelector('#filter'); - this.perfProfilerTbl!.addEventListener('row-click', (evt: any) => { + this.perfProfilerTbl!.addEventListener('row-click', (evt: any): void => { // @ts-ignore let data = evt.detail.data as PerfCallChainMerageData; document.dispatchEvent( @@ -229,7 +235,7 @@ export class TabpanePerfProfile extends BaseElement { }); this.perfProfilerList = this.shadowRoot?.querySelector('#tb-perf-list'); let lastClikTime = 0; - this.perfProfilerList!.addEventListener('row-click', (evt: any) => { + this.perfProfilerList!.addEventListener('row-click', (evt: any): void => { // @ts-ignore let data = evt.detail.data as PerfCallChainMerageData; this.perfProfilerTbl?.clearAllSelection(data); @@ -244,7 +250,7 @@ export class TabpanePerfProfile extends BaseElement { if (Date.now() - lastClikTime < 200 && spApplication.vs) { this.perfProfilerTbl!.style.visibility = 'hidden'; this.perfProfilerFilter!.style.display = 'none'; - new ResizeObserver((entries) => { + new ResizeObserver((entries: ResizeObserverEntry[]): void => { this.perfProfilerModal!.style.width = this.perfProfilerTbl!.clientWidth + 'px'; this.perfProfilerModal!.style.height = this.perfProfilerTbl!.clientHeight + 'px'; }).observe(this.perfProfilerTbl!); @@ -270,20 +276,20 @@ export class TabpanePerfProfile extends BaseElement { const binDir = 'C:/binary_cache'; let binPath = binDir + perfProfilerPath; let cmd = 'C:/binary_cache/llvm-objdump.exe -S ' + binPath; - Cmd.execObjDump(cmd, perfProfilerAddrHex, (result: any) => { + Cmd.execObjDump(cmd, perfProfilerAddrHex, (result: any): void => { this.perfProfilerModal?.showContent(result, perfProfilerAddrHex); }); } } lastClikTime = Date.now(); }); - this.perfProfilerModal!.setCloseListener(() => { + this.perfProfilerModal!.setCloseListener((): void => { this.perfProfilerModal!.style.display = 'none'; this.perfProfilerTbl!.style.visibility = 'visible'; this.shadowRoot!.querySelector('#filter')!.style.display = 'flex'; }); this.perfProfilerList = this.shadowRoot?.querySelector('#tb-perf-list'); - let filterFunc = (data: any) => { + let filterFunc = (data: any): void => { let perfProfileFuncArgs: any[] = []; if (data.type === 'check') { if (data.item.checked) { @@ -323,7 +329,7 @@ export class TabpanePerfProfile extends BaseElement { if (this.perfSelectedData && !this.perfSelectedData.canCharge) { return; } - if (this.perfSelectedData != undefined) { + if (this.perfSelectedData !== undefined) { this.perfProfilerFilter!.addDataMining({ name: this.perfSelectedData.symbolName }, data.item); perfProfileFuncArgs.push({ funcName: 'splitTree', @@ -336,7 +342,7 @@ export class TabpanePerfProfile extends BaseElement { if (this.perfSelectedData && !this.perfSelectedData.canCharge) { return; } - if (this.perfSelectedData != undefined && this.perfSelectedData.libName != '') { + if (this.perfSelectedData !== undefined && this.perfSelectedData.libName !== '') { this.perfProfilerFilter!.addDataMining({ name: this.perfSelectedData.libName }, data.item); perfProfileFuncArgs.push({ funcName: 'splitTree', @@ -346,7 +352,7 @@ export class TabpanePerfProfile extends BaseElement { return; } } else if (data.item === 'restore') { - if (data.remove != undefined && data.remove.length > 0) { + if (data.remove !== undefined && data.remove.length > 0) { let list = data.remove.map((item: any) => { return item.name; }); @@ -358,7 +364,7 @@ export class TabpanePerfProfile extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - list.forEach((symbolName: string) => { + list.forEach((symbolName: string): void => { perfProfileFuncArgs.push({ funcName: 'clearSplitMapData', funcArgs: [symbolName], @@ -367,7 +373,7 @@ export class TabpanePerfProfile extends BaseElement { } } } - this.getDataByWorker(perfProfileFuncArgs, (result: any[]) => { + this.getDataByWorker(perfProfileFuncArgs, (result: any[]): void => { this.setPerfProfilerLeftTableData(result); this.perfProfileFrameChart!.data = this.perfProfilerDataSource; if (this.isChartShow) this.perfProfileFrameChart?.calculateChartData(); @@ -382,8 +388,8 @@ export class TabpanePerfProfile extends BaseElement { }; this.perfProfilerFilter!.getDataLibrary(filterFunc); this.perfProfilerFilter!.getDataMining(filterFunc); - this.perfProfilerFilter!.getCallTreeData((data: any) => { - if (data.value === 0) { + this.perfProfilerFilter!.getCallTreeData((data: any): void => { + if (callTreeValueNoSample.includes(data.value)) { this.refreshAllNode({ ...this.perfProfilerFilter!.getFilterTreeData(), callTree: data.checks, @@ -395,32 +401,28 @@ export class TabpanePerfProfile extends BaseElement { funcName: 'hideSystemLibrary', funcArgs: [], }); - perfProfileArgs.push({ - funcName: 'resetAllNode', - funcArgs: [], - }); } else { perfProfileArgs.push({ funcName: 'resotreAllNode', funcArgs: [[this.systemRuleName]], }); - perfProfileArgs.push({ - funcName: 'resetAllNode', - funcArgs: [], - }); perfProfileArgs.push({ funcName: 'clearSplitMapData', funcArgs: [this.systemRuleName], }); } - this.getDataByWorker(perfProfileArgs, (result: any[]) => { + perfProfileArgs.push({ + funcName: 'resetAllNode', + funcArgs: [], + }); + this.getDataByWorker(perfProfileArgs, (result: any[]): void => { this.setPerfProfilerLeftTableData(result); this.perfProfileFrameChart!.data = this.perfProfilerDataSource; if (this.isChartShow) this.perfProfileFrameChart?.calculateChartData(); }); } }); - this.perfProfilerFilter!.getCallTreeConstraintsData((data: any) => { + this.perfProfilerFilter!.getCallTreeConstraintsData((data: any): void => { let perfProfilerConstraintsArgs: any[] = [ { funcName: 'resotreAllNode', @@ -441,13 +443,13 @@ export class TabpanePerfProfile extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - this.getDataByWorker(perfProfilerConstraintsArgs, (result: any[]) => { + this.getDataByWorker(perfProfilerConstraintsArgs, (result: any[]): void => { this.setPerfProfilerLeftTableData(result); this.perfProfileFrameChart!.data = this.perfProfilerDataSource; if (this.isChartShow) this.perfProfileFrameChart?.calculateChartData(); }); }); - this.perfProfilerFilter!.getFilterData((data: FilterData) => { + this.perfProfilerFilter!.getFilterData((data: FilterData): void => { if (this.searchValue != this.perfProfilerFilter!.filterValue) { this.searchValue = this.perfProfilerFilter!.filterValue; let perfArgs = [ @@ -460,7 +462,7 @@ export class TabpanePerfProfile extends BaseElement { funcArgs: [], }, ]; - this.getDataByWorker(perfArgs, (result: any[]) => { + this.getDataByWorker(perfArgs, (result: any[]): void => { this.perfProfilerTbl!.isSearch = true; this.perfProfilerTbl!.setStatus(result, true); this.setPerfProfilerLeftTableData(result); @@ -471,7 +473,7 @@ export class TabpanePerfProfile extends BaseElement { this.switchFlameChart(data); } }); - this.perfProfilerTbl!.addEventListener('column-click', (evt) => { + this.perfProfilerTbl!.addEventListener('column-click', (evt): void => { // @ts-ignore this.perfProfileSortKey = evt.detail.key; // @ts-ignore @@ -482,13 +484,13 @@ export class TabpanePerfProfile extends BaseElement { }); } - connectedCallback() { + connectedCallback(): void { super.connectedCallback(); - this.parentElement!.onscroll = () => { + this.parentElement!.onscroll = (): void => { this.perfProfileFrameChart!.tabPaneScrollTop = this.parentElement!.scrollTop; }; let filterHeight = 0; - new ResizeObserver((entries) => { + new ResizeObserver((entries): void => { let perfProfileTabFilter = this.shadowRoot!.querySelector('#filter') as HTMLElement; if (perfProfileTabFilter.clientHeight > 0) filterHeight = perfProfileTabFilter.clientHeight; if (this.parentElement!.clientHeight > filterHeight) { @@ -500,7 +502,7 @@ export class TabpanePerfProfile extends BaseElement { if (this.perfProfilerTbl!.style.visibility === 'hidden') { perfProfileTabFilter.style.display = 'none'; } - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { if (this.isChartShow) { this.perfProfileFrameChart?.updateCanvas(false, entries[0].contentRect.width); this.perfProfileFrameChart?.calculateChartData(); @@ -541,11 +543,22 @@ export class TabpanePerfProfile extends BaseElement { } } - refreshAllNode(filterData: any) { + refreshAllNode(filterData: any): void { let perfProfileArgs: any[] = []; let isTopDown: boolean = !filterData.callTree[0]; - let isHideSystemLibrary = filterData.callTree[1]; + let isHideSystemLibrary: boolean = filterData.callTree[1]; + let isHideThread: boolean = filterData.callTree[3]; + let isHideThreadState: boolean = filterData.callTree[4]; let list = filterData.dataMining.concat(filterData.dataLibrary); + perfProfileArgs.push({ + funcName: 'hideThread', + funcArgs: [isHideThread], + }); + + perfProfileArgs.push({ + funcName: 'hideThreadState', + funcArgs: [isHideThreadState], + }); perfProfileArgs.push({ funcName: 'getCallChainsBySampleIds', funcArgs: [isTopDown], @@ -557,6 +570,7 @@ export class TabpanePerfProfile extends BaseElement { funcArgs: [], }); } + if (filterData.callTreeConstraints.checked) { perfProfileArgs.push({ funcName: 'hideNumMaxAndMin', @@ -571,21 +585,21 @@ export class TabpanePerfProfile extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - this.getDataByWorker(perfProfileArgs, (result: any[]) => { + this.getDataByWorker(perfProfileArgs, (result: any[]): void => { this.setPerfProfilerLeftTableData(result); this.perfProfileFrameChart!.data = this.perfProfilerDataSource; if (this.isChartShow) this.perfProfileFrameChart?.calculateChartData(); }); } - setPerfProfilerLeftTableData(resultData: any[]) { + setPerfProfilerLeftTableData(resultData: any[]): void { this.perfProfilerDataSource = this.sortTree(resultData); this.perfProfilerTbl!.recycleDataSource = this.perfProfilerDataSource; } sortTree(arr: Array): Array { - let perfProfileSortArr = arr.sort((perfProfileA, perfProfileB) => { - if (this.perfProfileSortKey === 'self') { + let perfProfileSortArr = arr.sort((perfProfileA, perfProfileB): number => { + if (this.perfProfileSortKey === 'selfDur') { if (this.perfProfileSortType === 0) { return perfProfileB.dur - perfProfileA.dur; } else if (this.perfProfileSortType === 1) { @@ -603,16 +617,16 @@ export class TabpanePerfProfile extends BaseElement { } } }); - perfProfileSortArr.map((call) => { + perfProfileSortArr.map((call: any): void => { call.children = this.sortTree(call.children); }); return perfProfileSortArr; } - getDataByWorker(args: any[], handler: Function) { + getDataByWorker(args: any[], handler: Function): void { this.perfProfileProgressEL!.loading = true; this.perfProfileLoadingPage.style.visibility = 'visible'; - procedurePool.submitWithName('logic0', 'perf-action', args, undefined, (results: any) => { + procedurePool.submitWithName('logic0', 'perf-action', args, undefined, (results: any): void => { handler(results); this.perfProfileProgressEL!.loading = false; this.perfProfileLoadingPage.style.visibility = 'hidden'; @@ -666,8 +680,8 @@ export class TabpanePerfProfile extends BaseElement { - - + + @@ -686,7 +700,7 @@ export class TabpanePerfProfile extends BaseElement {
    - + diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts index 490b8ec68..047579f10 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts @@ -27,23 +27,27 @@ import { queryNativeHookSubType, queryNativeHookStatisticSubType } from '../../. import { ParseExpression } from '../SheetUtils.js'; import { NativeMemoryExpression } from '../../../../bean/NativeHook.js'; +const InvertOpyionIndex: number = 0; +const HideSystemSoOptionIndex: number = 1; +const HideThreadOptionIndex: number = 3; + @element('tabpane-nm-calltree') export class TabpaneNMCalltree extends BaseElement { private nmCallTreeTbl: LitTable | null | undefined; private filesystemTbr: LitTable | null | undefined; private nmCallTreeProgressEL: LitProgressBar | null | undefined; - private nmCallTreeFilter: any; + private nmCallTreeFilter: TabPaneFilter | null | undefined; private nmCallTreeSource: any[] = []; - private native_type: Array = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; - private sortKey = 'heapSizeStr'; - private sortType = 0; + private nativeType: Array = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; + private sortKey: string = 'heapSizeStr'; + private sortType: number = 0; private currentSelectedData: any = undefined; private nmCallTreeFrameChart: FrameChart | null | undefined; private isChartShow: boolean = false; - private systmeRuleName = '/system/'; - private numRuleName = '/max/min/'; + private systmeRuleName: string = '/system/'; + private numRuleName: string = '/max/min/'; private modal: DisassemblingWindow | null | undefined; - private needShowMenu = true; + private needShowMenu: boolean = true; private searchValue: string = ''; private loadingList: number[] = []; private nmCallTreeLoadingPage: any; @@ -57,11 +61,15 @@ export class TabpaneNMCalltree extends BaseElement { private lastIsExpression = false; private currentNMCallTreeFilter: TabPaneFilter | undefined | null; private expressionStruct: NativeMemoryExpression | null = null; + private isHideThread: boolean = false; + private currentSelectIPid = 1; set data(nmCallTreeParam: SelectionParam | any) { if (nmCallTreeParam == this.currentSelection) { return; } + this.currentSelectIPid = nmCallTreeParam.nativeMemoryCurrentIPid; + this.isHideThread = false; this.searchValue = ''; this.currentSelection = nmCallTreeParam; this.modal!.style.display = 'none'; @@ -71,6 +79,7 @@ export class TabpaneNMCalltree extends BaseElement { } else { this.nmCallTreeFilter!.style.display = 'none'; } + procedurePool.submitWithName('logic1', 'native-memory-reset', [], undefined, () => {}); this.nmCallTreeFilter!.disabledTransfer(true); this.nmCallTreeFilter!.initializeFilterTree(true, true, nmCallTreeParam.nativeMemory.length > 0); this.nmCallTreeFilter!.filterValue = ''; @@ -79,26 +88,28 @@ export class TabpaneNMCalltree extends BaseElement { this.nmCallTreeLoadingPage.style.visibility = 'visible'; let types: Array = []; if (nmCallTreeParam.nativeMemory.length > 0) { - if (nmCallTreeParam.nativeMemory.indexOf(this.native_type[0]) != -1) { + this.nmCallTreeFilter!.isStatisticsMemory = false; + if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[0]) !== -1) { types.push("'AllocEvent'"); types.push("'MmapEvent'"); } else { - if (nmCallTreeParam.nativeMemory.indexOf(this.native_type[1]) != -1) { + if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[1]) !== -1) { types.push("'AllocEvent'"); } - if (nmCallTreeParam.nativeMemory.indexOf(this.native_type[2]) != -1) { + if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[2]) !== -1) { types.push("'MmapEvent'"); } } } else { - if (nmCallTreeParam.nativeMemoryStatistic.indexOf(this.native_type[0]) != -1) { + this.nmCallTreeFilter!.isStatisticsMemory = true; + if (nmCallTreeParam.nativeMemoryStatistic.indexOf(this.nativeType[0]) !== -1) { types.push(0); types.push(1); } else { - if (nmCallTreeParam.nativeMemoryStatistic.indexOf(this.native_type[1]) != -1) { + if (nmCallTreeParam.nativeMemoryStatistic.indexOf(this.nativeType[1]) !== -1) { types.push(0); } - if (nmCallTreeParam.nativeMemoryStatistic.indexOf(this.native_type[2]) != -1) { + if (nmCallTreeParam.nativeMemoryStatistic.indexOf(this.nativeType[2]) !== -1) { types.push(1); } } @@ -110,14 +121,14 @@ export class TabpaneNMCalltree extends BaseElement { rightNs: nmCallTreeParam.rightNs, types, }, - (results: any[]) => { + (results: any[]): void => { this.setLTableData(results); this.filesystemTbr!.recycleDataSource = []; this.nmCallTreeFrameChart!.mode = ChartMode.Byte; this.nmCallTreeFrameChart?.updateCanvas(true, initWidth); this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; this.switchFlameChart(); - this.nmCallTreeFilter.icon = 'block'; + this.nmCallTreeFilter!.icon = 'block'; } ); } @@ -128,7 +139,7 @@ export class TabpaneNMCalltree extends BaseElement { parents: Array ): boolean { for (let nmCallTreeBean of nmCallTreeSrc) { - if (nmCallTreeBean.id == nmCallTreeTarget.id) { + if (nmCallTreeBean.id === nmCallTreeTarget.id) { parents.push(nmCallTreeBean); return true; } else { @@ -143,7 +154,7 @@ export class TabpaneNMCalltree extends BaseElement { getChildTree(nmCallTreeSrc: Array, id: string, children: Array): boolean { for (let nmCallTreeBean of nmCallTreeSrc) { - if (nmCallTreeBean.id == id && nmCallTreeBean.children.length == 0) { + if (nmCallTreeBean.id === id && nmCallTreeBean.children.length === 0) { children.push(nmCallTreeBean); return true; } else { @@ -156,21 +167,21 @@ export class TabpaneNMCalltree extends BaseElement { return false; } - setRightTableData(fileMerageBean: FileMerageBean) { + setRightTableData(fileMerageBean: FileMerageBean): void { let parents: Array = []; let children: Array = []; this.getParentTree(this.nmCallTreeSource, fileMerageBean, parents); let maxId = fileMerageBean.id; let maxDur = 0; - function findMaxStack(merageBean: any) { - if (merageBean.children.length == 0) { + function findMaxStack(merageBean: any): void { + if (merageBean.children.length === 0) { if (merageBean.heapSize > maxDur) { maxDur = merageBean.heapSize; maxId = merageBean.id; } } else { - merageBean.children.map((callChild: any) => { + merageBean.children.map((callChild: any): void => { findMaxStack(callChild); }); } @@ -187,25 +198,25 @@ export class TabpaneNMCalltree extends BaseElement { this.filesystemTbr!.dataSource = resultLength == 0 ? [] : resultValue; } - showBottomMenu(isShow: boolean) { + showBottomMenu(isShow: boolean): void { if (isShow) { - this.nmCallTreeFilter.showThird(true); - this.nmCallTreeFilter.setAttribute('first', ''); - this.nmCallTreeFilter.setAttribute('second', ''); - this.nmCallTreeFilter.setAttribute('tree', ''); - this.nmCallTreeFilter.setAttribute('input', ''); - this.nmCallTreeFilter.setAttribute('inputLeftText', ''); + this.nmCallTreeFilter?.showThird(true); + this.nmCallTreeFilter?.setAttribute('first', ''); + this.nmCallTreeFilter?.setAttribute('second', ''); + this.nmCallTreeFilter?.setAttribute('tree', ''); + this.nmCallTreeFilter?.setAttribute('input', ''); + this.nmCallTreeFilter?.setAttribute('inputLeftText', ''); } else { - this.nmCallTreeFilter.showThird(false); - this.nmCallTreeFilter.removeAttribute('first'); - this.nmCallTreeFilter.removeAttribute('second'); - this.nmCallTreeFilter.removeAttribute('tree'); - this.nmCallTreeFilter.removeAttribute('input'); - this.nmCallTreeFilter.removeAttribute('inputLeftText'); + this.nmCallTreeFilter?.showThird(false); + this.nmCallTreeFilter?.removeAttribute('first'); + this.nmCallTreeFilter?.removeAttribute('second'); + this.nmCallTreeFilter?.removeAttribute('tree'); + this.nmCallTreeFilter?.removeAttribute('input'); + this.nmCallTreeFilter?.removeAttribute('inputLeftText'); } } - async initFilterTypes() { + async initFilterTypes(): Promise { this.currentNMCallTreeFilter = this.shadowRoot?.querySelector('#nm-call-tree-filter'); let secondFilterList = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; @@ -222,16 +233,20 @@ export class TabpaneNMCalltree extends BaseElement { } if (this.currentSelection!.nativeMemory!.length > 0) { - let subTypeList = await queryNativeHookSubType(this.currentSelection!.leftNs, this.currentSelection!.rightNs); + let subTypeList = await queryNativeHookSubType( + this.currentSelection!.leftNs, + this.currentSelection!.rightNs, + this.currentSelectIPid + ); addSubType(subTypeList); } else { let subTypeList = await queryNativeHookStatisticSubType( this.currentSelection!.leftNs, - this.currentSelection!.rightNs + this.currentSelection!.rightNs, + this.currentSelectIPid ); addSubType(subTypeList); } - procedurePool.submitWithName('logic1', 'native-memory-get-responseType', {}, undefined, (res: any) => { this.responseTypes = res; let nullIndex = this.responseTypes.findIndex((item) => { @@ -268,14 +283,14 @@ export class TabpaneNMCalltree extends BaseElement { this.nmCallTreeFrameChart = this.shadowRoot?.querySelector('#framechart'); this.modal = this.shadowRoot?.querySelector('tab-native-data-modal'); this.nmCallTreeLoadingPage = this.shadowRoot?.querySelector('.nm-call-tree-loading'); - this.nmCallTreeFrameChart!.addChartClickListener((needShowMenu: boolean) => { + this.nmCallTreeFrameChart!.addChartClickListener((needShowMenu: boolean): void => { this.parentElement!.scrollTo(0, 0); this.showBottomMenu(needShowMenu); this.needShowMenu = needShowMenu; }); this.nmCallTreeTbl!.rememberScrollTop = true; this.nmCallTreeFilter = this.shadowRoot?.querySelector('#nm-call-tree-filter'); - this.nmCallTreeTbl!.addEventListener('row-click', (event: any) => { + this.nmCallTreeTbl!.addEventListener('row-click', (event: any): void => { // @ts-ignore let data = event.detail.data as FileMerageBean; this.setRightTableData(data); @@ -295,7 +310,7 @@ export class TabpaneNMCalltree extends BaseElement { ); }); this.filesystemTbr = this.shadowRoot?.querySelector('#tb-filesystem-list'); - this.filesystemTbr!.addEventListener('row-click', (evt: any) => { + this.filesystemTbr!.addEventListener('row-click', (evt: any): void => { // @ts-ignore let data = evt.detail.data as FileMerageBean; this.nmCallTreeTbl?.clearAllSelection(data); @@ -307,21 +322,21 @@ export class TabpaneNMCalltree extends BaseElement { (evt.detail as any).callBack(true); } }); - this.modal!.setCloseListener(() => { + this.modal!.setCloseListener((): void => { this.modal!.style.display = 'none'; this.nmCallTreeTbl!.style.visibility = 'visible'; this.shadowRoot!.querySelector('#nm-call-tree-filter')!.style.display = 'flex'; }); - let filterFunc = (nmCallTreeFuncData: any) => { + let filterFunc = (nmCallTreeFuncData: any): void => { let nmCallTreeFuncArgs: any[] = []; - if (nmCallTreeFuncData.type == 'check') { + if (nmCallTreeFuncData.type === 'check') { if (nmCallTreeFuncData.item.checked) { nmCallTreeFuncArgs.push({ funcName: 'splitTree', funcArgs: [ nmCallTreeFuncData.item.name, - nmCallTreeFuncData.item.select == '0', - nmCallTreeFuncData.item.type == 'symbol', + nmCallTreeFuncData.item.select === '0', + nmCallTreeFuncData.item.type === 'symbol', ], }); } else { @@ -351,16 +366,16 @@ export class TabpaneNMCalltree extends BaseElement { funcName: 'splitTree', funcArgs: [ nmCallTreeFuncData.item.name, - nmCallTreeFuncData.item.select == '0', + nmCallTreeFuncData.item.select === '0', nmCallTreeFuncData.item.type == 'symbol', ], }); - } else if (nmCallTreeFuncData.type == 'button') { + } else if (nmCallTreeFuncData.type === 'button') { if (nmCallTreeFuncData.item == 'symbol') { if (this.currentSelectedData && !this.currentSelectedData.canCharge) { return; } - if (this.currentSelectedData != undefined) { + if (this.currentSelectedData !== undefined) { this.nmCallTreeFilter!.addDataMining( { name: this.currentSelectedData.symbolName }, nmCallTreeFuncData.item @@ -372,11 +387,11 @@ export class TabpaneNMCalltree extends BaseElement { } else { return; } - } else if (nmCallTreeFuncData.item == 'library') { + } else if (nmCallTreeFuncData.item === 'library') { if (this.currentSelectedData && !this.currentSelectedData.canCharge) { return; } - if (this.currentSelectedData != undefined && this.currentSelectedData.libName != '') { + if (this.currentSelectedData != undefined && this.currentSelectedData.libName !== '') { this.nmCallTreeFilter!.addDataMining({ name: this.currentSelectedData.libName }, nmCallTreeFuncData.item); nmCallTreeFuncArgs.push({ funcName: 'splitTree', @@ -385,9 +400,9 @@ export class TabpaneNMCalltree extends BaseElement { } else { return; } - } else if (nmCallTreeFuncData.item == 'restore') { + } else if (nmCallTreeFuncData.item === 'restore') { if (nmCallTreeFuncData.remove != undefined && nmCallTreeFuncData.remove.length > 0) { - let list = nmCallTreeFuncData.remove.map((item: any) => { + let list = nmCallTreeFuncData.remove.map((item: any): any => { return item.name; }); nmCallTreeFuncArgs.push({ @@ -398,7 +413,7 @@ export class TabpaneNMCalltree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - list.forEach((symbolName: string) => { + list.forEach((symbolName: string): void => { nmCallTreeFuncArgs.push({ funcName: 'clearSplitMapData', funcArgs: [symbolName], @@ -407,7 +422,7 @@ export class TabpaneNMCalltree extends BaseElement { } } } - this.getDataByWorker(nmCallTreeFuncArgs, (result: any[]) => { + this.getDataByWorker(nmCallTreeFuncArgs, (result: any[]): void => { this.setLTableData(result); this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; if (this.isChartShow) this.nmCallTreeFrameChart?.calculateChartData(); @@ -422,8 +437,8 @@ export class TabpaneNMCalltree extends BaseElement { }; this.nmCallTreeFilter!.getDataLibrary(filterFunc); this.nmCallTreeFilter!.getDataMining(filterFunc); - this.nmCallTreeFilter!.getCallTreeData((callTreeData: any) => { - if (callTreeData.value == 0) { + this.nmCallTreeFilter!.getCallTreeData((callTreeData: any): void => { + if ([InvertOpyionIndex, HideSystemSoOptionIndex, HideThreadOptionIndex].includes(callTreeData.value)) { this.refreshAllNode({ ...this.nmCallTreeFilter!.getFilterTreeData(), callTree: callTreeData.checks, @@ -453,14 +468,14 @@ export class TabpaneNMCalltree extends BaseElement { funcArgs: [this.systmeRuleName], }); } - this.getDataByWorker(resultArgs, (result: any[]) => { + this.getDataByWorker(resultArgs, (result: any[]): void => { this.setLTableData(result); this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; if (this.isChartShow) this.nmCallTreeFrameChart?.calculateChartData(); }); } }); - this.nmCallTreeFilter!.getCallTreeConstraintsData((nmCallTreeConstraintsData: any) => { + this.nmCallTreeFilter!.getCallTreeConstraintsData((nmCallTreeConstraintsData: any): void => { let nmCallTreeConstraintsArgs: any[] = [ { funcName: 'resotreAllNode', @@ -481,13 +496,13 @@ export class TabpaneNMCalltree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - this.getDataByWorker(nmCallTreeConstraintsArgs, (result: any[]) => { + this.getDataByWorker(nmCallTreeConstraintsArgs, (result: any[]): void => { this.setLTableData(result); this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; if (this.isChartShow) this.nmCallTreeFrameChart?.calculateChartData(); }); }); - this.nmCallTreeFilter!.getFilterData((nmCallTreeData: FilterData) => { + this.nmCallTreeFilter!.getFilterData((nmCallTreeData: FilterData): void => { if (this.currentSelection!.nativeMemoryStatistic.length > 0) { this.filterResponseSelect = ''; } @@ -498,9 +513,9 @@ export class TabpaneNMCalltree extends BaseElement { this.switchFlameChart(nmCallTreeData); } else { if ( - this.filterAllocationType != nmCallTreeData.firstSelect || - this.filterNativeType != nmCallTreeData.secondSelect || - this.filterResponseSelect != nmCallTreeData.thirdSelect + this.filterAllocationType !== nmCallTreeData.firstSelect || + this.filterNativeType !== nmCallTreeData.secondSelect || + this.filterResponseSelect !== nmCallTreeData.thirdSelect ) { this.filterAllocationType = nmCallTreeData.firstSelect || '0'; this.filterNativeType = nmCallTreeData.secondSelect || '0'; @@ -512,7 +527,7 @@ export class TabpaneNMCalltree extends BaseElement { this.searchValue = this.nmCallTreeFilter!.filterValue; this.expressionStruct = new ParseExpression(this.searchValue).parse(); this.refreshAllNode(this.nmCallTreeFilter!.getFilterTreeData()); - } else if (this.searchValue != this.nmCallTreeFilter!.filterValue) { + } else if (this.searchValue !== this.nmCallTreeFilter!.filterValue) { this.searchValue = this.nmCallTreeFilter!.filterValue; this.expressionStruct = new ParseExpression(this.searchValue).parse(); let nmArgs = []; @@ -536,7 +551,7 @@ export class TabpaneNMCalltree extends BaseElement { }); this.lastIsExpression = false; } - this.getDataByWorker(nmArgs, (result: any[]) => { + this.getDataByWorker(nmArgs, (result: any[]): void => { this.nmCallTreeTbl!.isSearch = true; this.nmCallTreeTbl!.setStatus(result, true); this.setLTableData(result); @@ -548,7 +563,7 @@ export class TabpaneNMCalltree extends BaseElement { } } }); - this.nmCallTreeTbl!.addEventListener('column-click', (evt) => { + this.nmCallTreeTbl!.addEventListener('column-click', (evt): void => { // @ts-ignore this.sortKey = evt.detail.key; // @ts-ignore @@ -559,46 +574,50 @@ export class TabpaneNMCalltree extends BaseElement { }); } - connectedCallback() { + connectedCallback(): void { super.connectedCallback(); let filterHeight = 0; - new ResizeObserver((entries) => { + new ResizeObserver((entries: ResizeObserverEntry[]): void => { let nmCallTreeTabFilter = this.shadowRoot!.querySelector('#nm-call-tree-filter') as HTMLElement; - if (nmCallTreeTabFilter.clientHeight > 0) filterHeight = nmCallTreeTabFilter.clientHeight; + if (nmCallTreeTabFilter.clientHeight > 0) { + filterHeight = nmCallTreeTabFilter.clientHeight; + } if (this.parentElement!.clientHeight > filterHeight) { nmCallTreeTabFilter.style.display = 'flex'; } else { nmCallTreeTabFilter.style.display = 'none'; } - this.modal!.style.height = this.nmCallTreeTbl!.clientHeight - 2 + 'px'; //2 is borderWidth - if (this.nmCallTreeTbl!.style.visibility == 'hidden') { + this.modal!.style.height = `${this.nmCallTreeTbl!.clientHeight - 2}px`; //2 is borderWidth + if (this.nmCallTreeTbl!.style.visibility === 'hidden') { nmCallTreeTabFilter.style.display = 'none'; } - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { if (this.isChartShow) { this.nmCallTreeFrameChart?.updateCanvas(false, entries[0].contentRect.width); this.nmCallTreeFrameChart?.calculateChartData(); } // @ts-ignore - this.nmCallTreeTbl?.shadowRoot.querySelector('.table').style.height = - this.parentElement!.clientHeight - 10 - 35 + 'px'; + this.nmCallTreeTbl?.shadowRoot.querySelector('.table').style.height = `${ + this.parentElement!.clientHeight - 10 - 35 + }px`; this.nmCallTreeTbl?.reMeauseHeight(); // @ts-ignore - this.filesystemTbr?.shadowRoot.querySelector('.table').style.height = - this.parentElement!.clientHeight - 45 - 21 + 'px'; + this.filesystemTbr?.shadowRoot.querySelector('.table').style.height = `${ + this.parentElement!.clientHeight - 45 - 21 + }px`; this.filesystemTbr?.reMeauseHeight(); - this.nmCallTreeLoadingPage.style.height = this.parentElement!.clientHeight - 24 + 'px'; + this.nmCallTreeLoadingPage.style.height = `${this.parentElement!.clientHeight - 24}px`; } }).observe(this.parentElement!); - this.parentElement!.onscroll = () => { + this.parentElement!.onscroll = (): void => { this.nmCallTreeFrameChart!.tabPaneScrollTop = this.parentElement!.scrollTop; }; } - switchFlameChart(flameChartData?: any) { + switchFlameChart(flameChartData?: any): void { let nmCallTreePageTab = this.shadowRoot?.querySelector('#show_table'); let nmCallTreePageChart = this.shadowRoot?.querySelector('#show_chart'); - if (!flameChartData || flameChartData.icon == 'block') { + if (!flameChartData || flameChartData.icon === 'block') { nmCallTreePageChart?.setAttribute('class', 'show'); nmCallTreePageTab?.setAttribute('class', ''); this.isChartShow = true; @@ -616,10 +635,11 @@ export class TabpaneNMCalltree extends BaseElement { } } - refreshAllNode(filterData: any) { + refreshAllNode(filterData: any): void { let nmCallTreeArgs: any[] = []; let isTopDown: boolean = !filterData.callTree[0]; let isHideSystemLibrary = filterData.callTree[1]; + this.isHideThread = filterData.callTree[3]; let list = filterData.dataMining.concat(filterData.dataLibrary); let groupArgs = new Map(); groupArgs.set('filterAllocType', this.filterAllocationType); @@ -635,7 +655,7 @@ export class TabpaneNMCalltree extends BaseElement { groupArgs.set('rightNs', this.currentSelection?.rightNs || 0); let selections: Array = []; if (this.subTypeArr.length > 0) { - this.subTypeArr.map((memory) => { + this.subTypeArr.map((memory): void => { selections.push({ memoryTap: memory, }); @@ -652,6 +672,10 @@ export class TabpaneNMCalltree extends BaseElement { funcArgs: [this.searchValue], }); } + nmCallTreeArgs.push({ + funcName: 'hideThread', + funcArgs: [this.isHideThread], + }); nmCallTreeArgs.push( { funcName: 'groupCallchainSample', @@ -690,13 +714,13 @@ export class TabpaneNMCalltree extends BaseElement { }); } - setLTableData(resultData: any[], sort?: boolean) { + setLTableData(resultData: any[], sort?: boolean): void { if (sort) { this.nmCallTreeSource = this.sortTree(resultData); } else { if (resultData && resultData[0]) { this.nmCallTreeSource = - this.currentSelection!.nativeMemory.length > 0 + this.currentSelection!.nativeMemory.length > 0 && !this.isHideThread ? this.sortTree(resultData) : this.sortTree(resultData[0].children || []); } else { @@ -707,32 +731,32 @@ export class TabpaneNMCalltree extends BaseElement { } sortTree(arr: Array): Array { - let nmCallTreeSortArr = arr.sort((callTreeLeftData, callTreeRightData) => { - if (this.sortKey == 'heapSizeStr' || this.sortKey == 'heapPercent') { - if (this.sortType == 0) { + let nmCallTreeSortArr = arr.sort((callTreeLeftData, callTreeRightData): number => { + if (this.sortKey === 'heapSizeStr' || this.sortKey === 'heapPercent') { + if (this.sortType === 0) { return callTreeRightData.size - callTreeLeftData.size; - } else if (this.sortType == 1) { + } else if (this.sortType === 1) { return callTreeLeftData.size - callTreeRightData.size; } else { return callTreeRightData.size - callTreeLeftData.size; } } else { - if (this.sortType == 0) { + if (this.sortType === 0) { return callTreeRightData.count - callTreeLeftData.count; - } else if (this.sortType == 1) { + } else if (this.sortType === 1) { return callTreeLeftData.count - callTreeRightData.count; } else { return callTreeRightData.count - callTreeLeftData.count; } } }); - nmCallTreeSortArr.map((call) => { + nmCallTreeSortArr.map((call): void => { call.children = this.sortTree(call.children); }); return nmCallTreeSortArr; } - getDataByWorker(args: any[], handler: Function) { + getDataByWorker(args: any[], handler: Function): void { this.loadingList.push(1); this.nmCallTreeProgressEL!.loading = true; this.nmCallTreeLoadingPage.style.visibility = 'visible'; @@ -741,10 +765,10 @@ export class TabpaneNMCalltree extends BaseElement { 'native-memory-calltree-action', args, undefined, - (callTreeActionResults: any) => { + (callTreeActionResults: any): void => { handler(callTreeActionResults); this.loadingList.splice(0, 1); - if (this.loadingList.length == 0) { + if (this.loadingList.length === 0) { this.nmCallTreeProgressEL!.loading = false; this.nmCallTreeLoadingPage.style.visibility = 'hidden'; } @@ -752,7 +776,7 @@ export class TabpaneNMCalltree extends BaseElement { ); } - getDataByWorkerQuery(args: any, handler: Function) { + getDataByWorkerQuery(args: any, handler: Function): void { this.loadingList.push(1); this.nmCallTreeProgressEL!.loading = true; this.nmCallTreeLoadingPage.style.visibility = 'visible'; @@ -763,10 +787,10 @@ export class TabpaneNMCalltree extends BaseElement { : 'native-memory-queryStatisticCallchainsSamples', args, undefined, - (callChainsResults: any) => { + (callChainsResults: any): void => { handler(callChainsResults); this.loadingList.splice(0, 1); - if (this.loadingList.length == 0) { + if (this.loadingList.length === 0) { this.nmCallTreeProgressEL!.loading = false; this.nmCallTreeLoadingPage.style.visibility = 'hidden'; } @@ -855,7 +879,7 @@ export class TabpaneNMCalltree extends BaseElement {
    - + diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts index dc69a1f00..f4186cccf 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts @@ -40,7 +40,7 @@ export class TabPaneNMSampleList extends BaseElement { static filterSelect: string = '0'; static samplerInfoSource: Array = []; static types: Array = []; - static native_type: Array = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; + static nativeType: Array = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; static tableMarkData: Array = []; static selectionParam: SelectionParam | undefined = undefined; static sampleTypes: Array = []; @@ -48,7 +48,7 @@ export class TabPaneNMSampleList extends BaseElement { private currentSelection: SelectionParam | undefined; set data(sampleParam: SelectionParam | any) { - if (sampleParam == this.currentSelection) { + if (sampleParam === this.currentSelection) { return; } this.currentSelection = sampleParam; @@ -56,49 +56,49 @@ export class TabPaneNMSampleList extends BaseElement { this.filterAllList(); } - static serSelection(sampleParam: SelectionParam) { + static serSelection(sampleParam: SelectionParam): void { if (this.selectionParam !== sampleParam) { this.clearData(); this.selectionParam = sampleParam; - this.initTypes(); + this.initTypes(sampleParam.nativeMemoryCurrentIPid); } - if (sampleParam.nativeMemory.indexOf(this.native_type[0]) != -1) { + if (sampleParam.nativeMemory.indexOf(this.nativeType[0]) !== -1) { this.types.push("'AllocEvent'"); this.types.push("'MmapEvent'"); } else { - if (sampleParam.nativeMemory.indexOf(this.native_type[1]) != -1) { + if (sampleParam.nativeMemory.indexOf(this.nativeType[1]) !== -1) { this.types.push("'AllocEvent'"); } - if (sampleParam.nativeMemory.indexOf(this.native_type[2]) != -1) { + if (sampleParam.nativeMemory.indexOf(this.nativeType[2]) !== -1) { this.types.push("'MmapEvent'"); } } } - static initTypes() { - queryNativeHookSnapshotTypes().then((result) => { + static initTypes(ipid: number): void { + queryNativeHookSnapshotTypes(ipid).then((result) => { if (result.length > 0) { this.sampleTypes = result; } }); } - static addSampleData(data: any) { - if (TabPaneNMSampleList.tableMarkData.indexOf(data) != -1) { + static addSampleData(data: any, ipid: number): void { + if (TabPaneNMSampleList.tableMarkData.indexOf(data) !== -1) { return; } TabPaneNMSampleList.tableMarkData.push(data); let rootSample = new NativeHookSamplerInfo(); - rootSample.snapshot = 'Snapshot' + this.numberToWord(this.samplerInfoSource.length + 1); + rootSample.snapshot = `Snapshot${this.numberToWord(this.samplerInfoSource.length + 1)}`; rootSample.startTs = data.startTs; rootSample.timestamp = - SpNativeMemoryChart.REAL_TIME_DIF == 0 + SpNativeMemoryChart.REAL_TIME_DIF === 0 ? getTimeString(data.startTs) : formatRealDateMs(data.startTs + SpNativeMemoryChart.REAL_TIME_DIF); rootSample.eventId = data.eventId; rootSample.threadId = data.threadId; rootSample.threadName = data.threadName; - this.queryAllHookInfo(data, rootSample); + this.queryAllHookInfo(data, rootSample, ipid); } static merageSampleData( @@ -106,21 +106,21 @@ export class TabPaneNMSampleList extends BaseElement { startNs: number, rootSample: NativeHookSampleQueryInfo, merageSample: NativeHookSampleQueryInfo - ) { + ): void { if (merageSample.endTs >= startNs) { rootSample.growth += merageSample.growth; } if (merageSample.startTs > leftTime) { rootSample.existing++; let childSample = new NativeHookSamplerInfo(); //新增最下层的叶子节点 - childSample.snapshot = '0x' + merageSample.addr; + childSample.snapshot = `0x${merageSample.addr}`; childSample.eventId = merageSample.eventId; childSample.heapSize = merageSample.growth; childSample.growth = Utils.getByteWithUnit(merageSample.growth); childSample.totalGrowth = childSample.growth; childSample.startTs = merageSample.startTs; childSample.timestamp = - SpNativeMemoryChart.REAL_TIME_DIF == 0 + SpNativeMemoryChart.REAL_TIME_DIF === 0 ? getTimeString(merageSample.startTs) : formatRealDateMs(merageSample.startTs + SpNativeMemoryChart.REAL_TIME_DIF); childSample.threadId = merageSample.threadId; @@ -131,14 +131,14 @@ export class TabPaneNMSampleList extends BaseElement { rootSample.total += merageSample.growth; } - static queryAllHookInfo(data: any, rootSample: NativeHookSamplerInfo) { + static queryAllHookInfo(data: any, rootSample: NativeHookSamplerInfo, ipid: number) { let copyTypes = this.sampleTypes.map((type) => { let copyType = new NativeHookSampleQueryInfo(); copyType.eventType = type.eventType; copyType.subType = type.subType; return copyType; }); - queryAllHookData(data.startTs).then((nmSamplerHookResult) => { + queryAllHookData(data.startTs, ipid).then((nmSamplerHookResult) => { if (nmSamplerHookResult.length > 0) { let nameGroup: any = {}; copyTypes.forEach((item) => { @@ -146,18 +146,18 @@ export class TabPaneNMSampleList extends BaseElement { nameGroup[item.eventType].push(item); }); let leftTime = - TabPaneNMSampleList.tableMarkData.length == 1 + TabPaneNMSampleList.tableMarkData.length === 1 ? 0 : TabPaneNMSampleList.tableMarkData[TabPaneNMSampleList.tableMarkData.length - 2].startTs; nmSamplerHookResult.forEach((item) => { item.threadId = rootSample.threadId; item.threadName = rootSample.threadName; - if (nameGroup[item.eventType] != undefined) { - if (item.subType == null) { + if (nameGroup[item.eventType] !== undefined) { + if (item.subType === null) { this.merageSampleData(leftTime, data.startTs, nameGroup[item.eventType][0], item); } else { let filter = nameGroup[item.eventType].filter((type: any) => { - return type.subType == item.subType; + return type.subType === item.subType; }); if (filter.length > 0) { this.merageSampleData(leftTime, data.startTs, filter[0], item); @@ -188,7 +188,7 @@ export class TabPaneNMSampleList extends BaseElement { }); } - static createTree(nameGroup: any, rootSample: NativeHookSamplerInfo) { + static createTree(nameGroup: any, rootSample: NativeHookSamplerInfo): void { Object.keys(nameGroup).forEach((key) => { let parentSample = new NativeHookSamplerInfo(); parentSample.snapshot = key; @@ -206,7 +206,7 @@ export class TabPaneNMSampleList extends BaseElement { childSample.threadName = rootSample.threadName; childSample.threadId = rootSample.threadId; parentSample.merageObj(childSample); - if (childSample.snapshot != parentSample.snapshot) { + if (childSample.snapshot !== parentSample.snapshot) { //根据名称是否一致来判断是否需要添加子节点 childSample.children.push(...child.children); parentSample.children.push(childSample); @@ -228,7 +228,7 @@ export class TabPaneNMSampleList extends BaseElement { currentMap[currentChild.snapshot] = currentChild; }); rootSample.children.forEach((rootChild) => { - if (currentMap[rootChild.snapshot] == undefined) { + if (currentMap[rootChild.snapshot] === undefined) { let perpSample = new NativeHookSamplerInfo(); perpSample.snapshot = rootChild.snapshot; currentMap[rootChild.snapshot] = perpSample; @@ -243,6 +243,7 @@ export class TabPaneNMSampleList extends BaseElement { this.samplerInfoSource = []; this.tblData!.dataSource = []; this.sampleTbl!.recycleDataSource = []; + TabPaneNMSampleList.sampleTbl!.recycleDataSource = []; this.sampleTypesList = []; this.tableMarkData = []; TabPaneNMSampleList.filter!.firstSelect = '0'; @@ -293,7 +294,7 @@ export class TabPaneNMSampleList extends BaseElement { }); TabPaneNMSampleList.tblData = this.shadowRoot?.querySelector('#tb-native-data'); TabPaneNMSampleList.filter = this.shadowRoot?.querySelector('#filter'); - this.shadowRoot?.querySelector('#filter')!.setSelectList(TabPaneNMSampleList.native_type, null); + this.shadowRoot?.querySelector('#filter')!.setSelectList(TabPaneNMSampleList.nativeType, null); this.shadowRoot?.querySelector('#filter')!.getFilterData((data: FilterData) => { if (data.firstSelect) { TabPaneNMSampleList.filterSelect = data.firstSelect; @@ -306,7 +307,7 @@ export class TabPaneNMSampleList extends BaseElement { connectedCallback() { super.connectedCallback(); new ResizeObserver((entries) => { - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { // @ts-ignore TabPaneNMSampleList.sampleTbl?.shadowRoot.querySelector('.table').style.height = this.parentElement!.clientHeight - 10 - 31 + 'px'; @@ -324,7 +325,7 @@ export class TabPaneNMSampleList extends BaseElement { nmRootSample.heapSize = 0; nmRootSample.existing = 0; nmRootSample.total = 0; - if (TabPaneNMSampleList.filterSelect == '0') { + if (TabPaneNMSampleList.filterSelect === '0') { nmRootSample.children = [...nmRootSample.tempList]; nmRootSample.tempList.forEach((parentSample) => { nmRootSample.heapSize += parentSample.heapSize; @@ -333,7 +334,7 @@ export class TabPaneNMSampleList extends BaseElement { }); nmRootSample.growth = Utils.getByteWithUnit(nmRootSample.heapSize); nmRootSample.totalGrowth = Utils.getByteWithUnit(nmRootSample.total); - } else if (TabPaneNMSampleList.filterSelect == '2') { + } else if (TabPaneNMSampleList.filterSelect === '2') { if (nmRootSample.tempList.length > 1) { nmRootSample.children = [nmRootSample.tempList[1]]; nmRootSample.heapSize += nmRootSample.tempList[1].heapSize; @@ -396,9 +397,9 @@ export class TabPaneNMSampleList extends BaseElement { diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts index 6f9b782a8..276cf23ef 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts @@ -21,6 +21,9 @@ import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressB import { Utils } from '../../base/Utils.js'; import { SpSystemTrace } from '../../../SpSystemTrace.js'; import { procedurePool } from '../../../../database/Procedure.js'; +import { TabPaneFilter } from '../TabPaneFilter.js'; +import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; +import { initSort } from '../SheetUtils.js'; const TYPE_ALLOC_STRING = 'AllocEvent'; const TYPE_MAP_STRING = 'MmapEvent'; @@ -34,7 +37,7 @@ const PIE_CHART_LIMIT = 20; class AnalysisObj { tName?: string; - tid?: number; + tid: number = 0; typeName?: string; typeId?: number; libName?: string; @@ -83,8 +86,9 @@ class SizeObj { @element('tabpane-nm-statistic-analysis') export class TabPaneNMStatisticAnalysis extends BaseElement { - private currentSelection: SelectionParam | null | undefined; - private pie: LitChartPie | null | undefined; + private currentSelection: SelectionParam | any; + private nmPieChart: LitChartPie | null | undefined; + private nmTableBox: HTMLDivElement | undefined | null; private processData!: Array; private eventTypeData!: Array; private threadData!: Array; @@ -95,10 +99,11 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { private soUsageTbl: LitTable | null | undefined; private functionUsageTbl: LitTable | null | undefined; private range: HTMLLabelElement | null | undefined; - private back: HTMLDivElement | null | undefined; + private nmBack: HTMLDivElement | null | undefined; + private threadName: string = ''; private tabName: HTMLDivElement | null | undefined; private progressEL: LitProgressBar | null | undefined; - private type: string | null | undefined; + private type: string = ''; private isStatistic = false; private typeMap!: Map>; private currentLevel = -1; @@ -110,8 +115,15 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { private currentLevelExistCount = 0; private currentLevelData!: Array; private typeStatisticsData!: {}; + private threadStatisticsData!: {}; private libStatisticsData!: {}; private functionStatisticsData!: {}; + private nmTableArray: NodeListOf | undefined | null; + private nmSortColumn: string = ''; + private nmSortType: number = 0; + private titleEl: HTMLDivElement | undefined | null; + private filterEl: TabPaneFilter | undefined | null; + private hideThreadCheckBox: LitCheckBox | undefined | null; set data(statisticAnalysisParam: SelectionParam) { if (statisticAnalysisParam === this.currentSelection) { @@ -122,7 +134,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.eventTypeData.shift(this.typeStatisticsData); return; } + if (this.nmTableArray) { + for (let table of this.nmTableArray) { + initSort(table!, this.nmSortColumn, this.nmSortType); + } + } + this.hideThreadCheckBox!.checked = false; if (statisticAnalysisParam.nativeMemoryStatistic.length > 0) { + Utils.getInstance().setCurrentSelectIPid(statisticAnalysisParam.nativeMemoryCurrentIPid); Utils.getInstance().initResponseTypeList(statisticAnalysisParam); } // @ts-ignore @@ -130,72 +149,182 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { // @ts-ignore this.soUsageTbl?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 30 + 'px'; // @ts-ignore - this.functionUsageTbl?.shadowRoot?.querySelector('.table').style.height = - this.parentElement!.clientHeight - 30 + 'px'; + this.functionUsageTbl?.shadowRoot?.querySelector('.table').style.height = `${ + this.parentElement!.clientHeight - 30 + }px`; this.clearData(); this.currentSelection = statisticAnalysisParam; - this.tableType!.style.display = 'grid'; - this.threadUsageTbl!.style.display = 'none'; - this.soUsageTbl!.style.display = 'none'; - this.functionUsageTbl!.style.display = 'none'; - this.back!.style.visibility = 'hidden'; - this.shadowRoot!.querySelector('.title')!.textContent = ''; + this.reset(this.tableType!, false); + this.titleEl!.textContent = ''; this.tabName!.textContent = ''; - this.range!.textContent = - 'Selected range: ' + - parseFloat(((statisticAnalysisParam.rightNs - statisticAnalysisParam.leftNs) / 1000000.0).toFixed(5)) + - ' ms'; + this.range!.textContent = `Selected range: ${parseFloat( + ((statisticAnalysisParam.rightNs - statisticAnalysisParam.leftNs) / 1000000.0).toFixed(5) + )} ms`; this.isStatistic = statisticAnalysisParam.nativeMemory.length === 0; - + if (this.isStatistic) { + this.threadName = ''; + } this.getNMEventTypeSize(statisticAnalysisParam); } initElements(): void { this.range = this.shadowRoot?.querySelector('#time-range'); - this.pie = this.shadowRoot!.querySelector('#nm-chart-pie'); + this.nmPieChart = this.shadowRoot!.querySelector('#nm-chart-pie'); + this.nmTableBox = this.shadowRoot!.querySelector('.nm-table-box'); this.tableType = this.shadowRoot!.querySelector('#tb-eventtype-usage'); this.threadUsageTbl = this.shadowRoot!.querySelector('#tb-thread-usage'); this.soUsageTbl = this.shadowRoot!.querySelector('#tb-so-usage'); this.functionUsageTbl = this.shadowRoot!.querySelector('#tb-function-usage'); - this.back = this.shadowRoot!.querySelector('.nm-go-back'); + this.nmBack = this.shadowRoot!.querySelector('.nm-go-back'); this.tabName = this.shadowRoot!.querySelector('.nm-subheading'); this.progressEL = this.shadowRoot?.querySelector('.nm-progress') as LitProgressBar; this.getBack(); + this.titleEl = this.shadowRoot!.querySelector('.title'); + this.filterEl = this.shadowRoot?.querySelector('#filter'); + this.filterEl!.setOptionsList(['Hide Thread']); + let popover = this.filterEl!.shadowRoot!.querySelector('#check-popover'); + this.hideThreadCheckBox = popover!!.querySelector('div > #hideThread'); + this.nmTableArray = this.shadowRoot!.querySelectorAll('lit-table') as NodeListOf; + this.hideThreadCheckBox?.addEventListener('change', (evt) => { + this.reset(this.tableType!, false); + this.getNMTypeSize(this.currentSelection, this.processData); + }); + for (let nmTable of this.nmTableArray) { + nmTable!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.nmSortColumn = evt.detail.key; + // @ts-ignore + this.nmSortType = evt.detail.sort; + this.sortByColumn(); + }); + nmTable!.addEventListener('row-hover', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.data) { + let data = detail.data; + data.isHover = true; + if (detail.callBack) { + detail.callBack(true); + } + } + this.nmPieChart?.showHover(); + this.nmPieChart?.hideTip(); + }); + } + this.tableType!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.existSize !== 0) { + this.nativeProcessLevelClickEvent(data); + } + }); + this.threadUsageTbl!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.existSize !== 0) { + this.nativeThreadLevelClickEvent(data); + } + }); + + this.soUsageTbl!.addEventListener('row-click', (evt) => { + // @ts-ignore + let data = evt.detail.data; + if (data.tableName !== '' && data.existSize !== 0) { + this.nativeSoLevelClickEvent(data); + } + }); + } + + private getDataFromWorker(val: SelectionParam, typeFilter: Array): void { + this.getDataByWorkerQuery( + { + leftNs: val.leftNs, + rightNs: val.rightNs, + types: typeFilter, + isStatistic: this.isStatistic, + }, + (results: any) => { + this.processData = JSON.parse(JSON.stringify(results)); + this.getNMTypeSize(val, this.processData); + } + ); + } + + private getDataByWorkerQuery(args: any, handler: Function): void { + this.progressEL!.loading = true; + procedurePool.submitWithName('logic1', 'native-memory-queryAnalysis', args, undefined, (results: any) => { + handler(results); + this.progressEL!.loading = false; + }); + } + + private reset(showTable: LitTable, isShowBack: boolean): void { + this.clearData(); + if (isShowBack) { + this.nmBack!.style.visibility = 'visible'; + } else { + this.nmBack!.style.visibility = 'hidden'; + } + if (this.nmTableArray) { + for (let table of this.nmTableArray) { + if (table === showTable) { + initSort(table, this.nmSortColumn, this.nmSortType); + table.style.display = 'grid'; + table.setAttribute('hideDownload', ''); + } else { + table!.style.display = 'none'; + table!.removeAttribute('hideDownload'); + } + } + } } - clearData(): void { - this.pie!.dataSource = []; + private clearData(): void { + this.nmPieChart!.dataSource = []; this.tableType!.recycleDataSource = []; this.threadUsageTbl!.recycleDataSource = []; this.soUsageTbl!.recycleDataSource = []; this.functionUsageTbl!.recycleDataSource = []; } - getBack(): void { - this.back!.addEventListener('click', () => { - if (this.tabName!.textContent === 'Statistic By Library Existing') { - this.tableType!.style.display = 'grid'; - this.soUsageTbl!.style.display = 'none'; - this.back!.style.visibility = 'hidden'; - this.soUsageTbl!.setAttribute('hideDownload', ''); - this.tableType?.removeAttribute('hideDownload'); - this.currentLevel = 0; - this.currentLevelData = this.eventTypeData; + private showAssignLevel( + showNMTable: LitTable, + hideNMTable: LitTable, + currentLevel: number, + currentLevelData: Array + ): void { + showNMTable!.style.display = 'grid'; + hideNMTable!.style.display = 'none'; + hideNMTable.setAttribute('hideDownload', ''); + showNMTable?.removeAttribute('hideDownload'); + this.currentLevel = currentLevel; + this.currentLevelData = currentLevelData; + } + + private getBack(): void { + this.nmBack!.addEventListener('click', () => { + if (this.tabName!.textContent === 'Statistic By Thread Existing') { + this.showAssignLevel(this.tableType!, this.threadUsageTbl!, 0, this.eventTypeData); + this.nmBack!.style.visibility = 'hidden'; this.typePieChart(); + } else if (this.tabName!.textContent === 'Statistic By Library Existing') { + if (this.hideThreadCheckBox?.checked || this.isStatistic) { + this.showAssignLevel(this.tableType!, this.soUsageTbl!, 0, this.eventTypeData); + this.nmBack!.style.visibility = 'hidden'; + this.typePieChart(); + } else { + this.showAssignLevel(this.threadUsageTbl!, this.soUsageTbl!, 1, this.threadData); + this.threadPieChart(); + } } else if (this.tabName!.textContent === 'Statistic By Function Existing') { - this.soUsageTbl!.style.display = 'grid'; - this.functionUsageTbl!.style.display = 'none'; - this.functionUsageTbl!.setAttribute('hideDownload', ''); - this.soUsageTbl?.removeAttribute('hideDownload'); - this.currentLevelData = this.soData; - this.currentLevel = 1; + this.showAssignLevel(this.soUsageTbl!, this.functionUsageTbl!, 2, this.soData); this.libraryPieChart(); } }); } - typePieChart(): void { - this.pie!.config = { + private typePieChart(): void { + this.nmPieChart!.config = { appendPadding: 0, data: this.getPieChartData(this.eventTypeData), angleField: 'existSize', @@ -206,14 +335,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, tip: (typeTipValue): string => { return `
    -
    Memory Type:${typeTipValue.obj.tableName}
    -
    Existing:${typeTipValue.obj.existSizeFormat} (${typeTipValue.obj.existSizePercent}%)
    -
    # Existing:${typeTipValue.obj.existCount} (${typeTipValue.obj.existCountPercent}%)
    -
    Total Bytes:${typeTipValue.obj.applySizeFormat} (${typeTipValue.obj.applySizePercent}%)
    -
    # Total:${typeTipValue.obj.applyCount} (${typeTipValue.obj.applyCountPercent}%)
    -
    Transient:${typeTipValue.obj.releaseSizeFormat} (${typeTipValue.obj.releaseSizePercent}%)
    -
    # Transient:${typeTipValue.obj.releaseCount} (${typeTipValue.obj.releaseCountPercent}%)
    -
    `; +
    Memory Type:${typeTipValue.obj.tableName}
    +
    Existing:${typeTipValue.obj.existSizeFormat} (${typeTipValue.obj.existSizePercent}%)
    +
    # Existing:${typeTipValue.obj.existCount} (${typeTipValue.obj.existCountPercent}%)
    +
    Total Bytes:${typeTipValue.obj.applySizeFormat} (${typeTipValue.obj.applySizePercent}%)
    +
    # Total:${typeTipValue.obj.applyCount} (${typeTipValue.obj.applyCountPercent}%)
    +
    Transient:${typeTipValue.obj.releaseSizeFormat} (${typeTipValue.obj.releaseSizePercent}%)
    +
    # Transient:${typeTipValue.obj.releaseCount} (${typeTipValue.obj.releaseCountPercent}%)
    +
    `; }, angleClick: (it): void => { // @ts-ignore @@ -234,47 +363,20 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, ], }; - this.tableType!.addEventListener('row-hover', (nmStatAnalysisTblRowHover) => { - // @ts-ignore - let nmStatAnalysisTblData = nmStatAnalysisTblRowHover.detail; - if (nmStatAnalysisTblData.data) { - let data = nmStatAnalysisTblData.data; - data.isHover = true; - if (nmStatAnalysisTblData.callBack) { - nmStatAnalysisTblData.callBack(true); - } - } - this.pie?.showHover(); - this.pie?.hideTip(); - }); - this.shadowRoot!.querySelector('.title')!.textContent = ''; + + this.titleEl!.textContent = ''; this.tabName!.textContent = 'Statistic By Event Type Existing'; // @ts-ignore this.eventTypeData.unshift(this.typeStatisticsData); this.tableType!.recycleDataSource = this.eventTypeData; - this.tableType?.reMeauseHeight(); // @ts-ignore this.eventTypeData.shift(this.typeStatisticsData); + this.tableType?.reMeauseHeight(); this.currentLevelData = this.eventTypeData; } - nativeProcessLevelClickEvent(it: any): void { - this.clearData(); - this.back!.style.visibility = 'visible'; - this.tableType!.style.display = 'none'; - this.soUsageTbl!.style.display = 'grid'; - this.tableType!.setAttribute('hideDownload', ''); - this.soUsageTbl?.removeAttribute('hideDownload'); - this.getLibSize(it); - const typeName = it.typeName === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : it.typeName; - this.shadowRoot!.querySelector('.title')!.textContent = typeName; - // @ts-ignore - this.type = it.typeName; - this.pie?.hideTip(); - } - - threadPieChart(): void { - this.pie!.config = { + private threadPieChart(): void { + this.nmPieChart!.config = { appendPadding: 0, data: this.getPieChartData(this.threadData), angleField: 'existSize', @@ -285,28 +387,19 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, tip: (threadTipValue): string => { return `
    -
    Thread:${threadTipValue.obj.tableName}
    -
    Existing:${threadTipValue.obj.existSizeFormat} (${threadTipValue.obj.existSizePercent}%)
    -
    # Existing:${threadTipValue.obj.existCount} (${threadTipValue.obj.existCountPercent}%)
    -
    Total Bytes:${threadTipValue.obj.applySizeFormat} (${threadTipValue.obj.applySizePercent}%)
    -
    # Total:${threadTipValue.obj.applyCount} (${threadTipValue.obj.applyCountPercent}%)
    -
    Transient:${threadTipValue.obj.releaseSizeFormat} (${threadTipValue.obj.releaseSizePercent}%)
    -
    # Transient:${threadTipValue.obj.releaseCount} (${threadTipValue.obj.releaseCountPercent}%)
    -
    `; +
    Thread:${threadTipValue.obj.tableName}
    +
    Existing:${threadTipValue.obj.existSizeFormat} (${threadTipValue.obj.existSizePercent}%)
    +
    # Existing:${threadTipValue.obj.existCount} (${threadTipValue.obj.existCountPercent}%)
    +
    Total Bytes:${threadTipValue.obj.applySizeFormat} (${threadTipValue.obj.applySizePercent}%)
    +
    # Total:${threadTipValue.obj.applyCount} (${threadTipValue.obj.applyCountPercent}%)
    +
    Transient:${threadTipValue.obj.releaseSizeFormat} (${threadTipValue.obj.releaseSizePercent}%)
    +
    # Transient:${threadTipValue.obj.releaseCount} (${threadTipValue.obj.releaseCountPercent}%)
    +
    `; }, angleClick: (it: any): void => { // @ts-ignore if (it.tid != 'other') { - this.clearData(); - this.threadUsageTbl!.style.display = 'none'; - this.soUsageTbl!.style.display = 'grid'; - this.getLibSize(it); - // @ts-ignore - const typeName = it.type === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : it.type; - this.shadowRoot!.querySelector('.title')!.textContent = typeName + ' / ' + 'Thread ' + it.tid; - // @ts-ignore - this.tid = it.tid; - this.pie?.hideTip(); + this.nativeThreadLevelClickEvent(it); } }, hoverHandler: (data): void => { @@ -322,28 +415,20 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, ], }; - this.threadUsageTbl!.addEventListener('row-hover', (nmStatAnalysisThreadRowHover) => { - // @ts-ignore - let nmStatAnalysisThreadData = nmStatAnalysisThreadRowHover.detail; - if (nmStatAnalysisThreadData.data) { - let data = nmStatAnalysisThreadData.data; - data.isHover = true; - if (nmStatAnalysisThreadData.callBack) { - nmStatAnalysisThreadData.callBack(true); - } - } - this.pie?.showHover(); - this.pie?.hideTip(); - }); const typeName = this.type === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : this.type; - this.shadowRoot!.querySelector('.title')!.textContent = typeName + ''; + this.titleEl!.textContent = typeName + ''; this.tabName!.textContent = 'Statistic By Thread Existing'; + // @ts-ignore + this.threadData.unshift(this.threadStatisticsData); this.threadUsageTbl!.recycleDataSource = this.threadData; + // @ts-ignore + this.threadData.shift(this.threadStatisticsData); + this.currentLevelData = this.threadData; this.threadUsageTbl?.reMeauseHeight(); } - libraryPieChart(): void { - this.pie!.config = { + private libraryPieChart(item?: any): void { + this.nmPieChart!.config = { appendPadding: 0, data: this.getPieChartData(this.soData), angleField: 'existSize', @@ -354,14 +439,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, tip: (libraryTipValue): string => { return `
    -
    Library:${libraryTipValue.obj.libName}
    -
    Existing:${libraryTipValue.obj.existSizeFormat} (${libraryTipValue.obj.existSizePercent}%)
    -
    # Existing:${libraryTipValue.obj.existCount} (${libraryTipValue.obj.existCountPercent}%)
    -
    Total Bytes:${libraryTipValue.obj.applySizeFormat} (${libraryTipValue.obj.applySizePercent}%)
    -
    # Total:${libraryTipValue.obj.applyCount} (${libraryTipValue.obj.applyCountPercent}%)
    -
    Transient:${libraryTipValue.obj.releaseSizeFormat} (${libraryTipValue.obj.releaseSizePercent}%)
    -
    # Transient:${libraryTipValue.obj.releaseCount} (${libraryTipValue.obj.releaseCountPercent}%)
    -
    `; +
    Library:${libraryTipValue.obj.libName}
    +
    Existing:${libraryTipValue.obj.existSizeFormat} (${libraryTipValue.obj.existSizePercent}%)
    +
    # Existing:${libraryTipValue.obj.existCount} (${libraryTipValue.obj.existCountPercent}%)
    +
    Total Bytes:${libraryTipValue.obj.applySizeFormat} (${libraryTipValue.obj.applySizePercent}%)
    +
    # Total:${libraryTipValue.obj.applyCount} (${libraryTipValue.obj.applyCountPercent}%)
    +
    Transient:${libraryTipValue.obj.releaseSizeFormat} (${libraryTipValue.obj.releaseSizePercent}%)
    +
    # Transient:${libraryTipValue.obj.releaseCount} (${libraryTipValue.obj.releaseCountPercent}%)
    +
    `; }, angleClick: (it): void => { // @ts-ignore @@ -383,20 +468,11 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { ], }; const typeName = this.type === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : this.type; - this.shadowRoot!.querySelector('.title')!.textContent = typeName + ''; - this.soUsageTbl!.addEventListener('row-hover', (nmStatAnalysisUsageRowHover) => { - // @ts-ignore - let nmStatAnalysisUsageData = nmStatAnalysisUsageRowHover.detail; - if (nmStatAnalysisUsageData.data) { - let data = nmStatAnalysisUsageData.data; - data.isHover = true; - if (nmStatAnalysisUsageData.callBack) { - nmStatAnalysisUsageData.callBack(true); - } - } - this.pie?.showHover(); - this.pie?.hideTip(); - }); + let title = typeName; + if (!this.hideThreadCheckBox?.checked && this.threadName.length > 0) { + title += ' / ' + this.threadName; + } + this.titleEl!.textContent = title; this.tabName!.textContent = 'Statistic By Library Existing'; // @ts-ignore this.soData.unshift(this.libStatisticsData); @@ -405,34 +481,10 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.soData.shift(this.libStatisticsData); this.currentLevelData = this.soData; this.soUsageTbl?.reMeauseHeight(); - this.soUsageTbl!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.soUsageTbl!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.existSize !== 0) { - this.nativeSoLevelClickEvent(data); - } - }); - } - - nativeSoLevelClickEvent(it: object): void { - this.clearData(); - this.soUsageTbl!.style.display = 'none'; - this.functionUsageTbl!.style.display = 'grid'; - this.soUsageTbl!.setAttribute('hideDownload', ''); - this.functionUsageTbl?.removeAttribute('hideDownload'); - this.getNMFunctionSize(it); - const typeName = this.type === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : this.type; - // @ts-ignore - this.shadowRoot!.querySelector('.title')!.textContent = typeName + ' / ' + it.libName; - this.pie?.hideTip(); } - functionPieChart(): void { - this.pie!.config = { + private functionPieChart(): void { + this.nmPieChart!.config = { appendPadding: 0, data: this.getPieChartData(this.functionData), angleField: 'existSize', @@ -443,14 +495,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, tip: (functionTipValue): string => { return `
    -
    Function:${functionTipValue.obj.symbolName}
    -
    Existing:${functionTipValue.obj.existSizeFormat} (${functionTipValue.obj.existSizePercent}%)
    -
    # Existing:${functionTipValue.obj.existCount} (${functionTipValue.obj.existCountPercent}%)
    -
    Total Bytes:${functionTipValue.obj.applySizeFormat} (${functionTipValue.obj.applySizePercent}%)
    -
    # Total:${functionTipValue.obj.applyCount} (${functionTipValue.obj.applyCountPercent}%)
    -
    Transient:${functionTipValue.obj.releaseSizeFormat} (${functionTipValue.obj.releaseSizePercent}%)
    -
    # Transient:${functionTipValue.obj.releaseCount} (${functionTipValue.obj.releaseCountPercent}%)
    -
    `; +
    Function:${functionTipValue.obj.symbolName}
    +
    Existing:${functionTipValue.obj.existSizeFormat} (${functionTipValue.obj.existSizePercent}%)
    +
    # Existing:${functionTipValue.obj.existCount} (${functionTipValue.obj.existCountPercent}%)
    +
    Total Bytes:${functionTipValue.obj.applySizeFormat} (${functionTipValue.obj.applySizePercent}%)
    +
    # Total:${functionTipValue.obj.applyCount} (${functionTipValue.obj.applyCountPercent}%)
    +
    Transient:${functionTipValue.obj.releaseSizeFormat} (${functionTipValue.obj.releaseSizePercent}%)
    +
    # Transient:${functionTipValue.obj.releaseCount} (${functionTipValue.obj.releaseCountPercent}%)
    + `; }, hoverHandler: (data): void => { if (data) { @@ -465,19 +517,6 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }, ], }; - this.functionUsageTbl!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let functionAnalysisData = evt.detail; - if (functionAnalysisData.data) { - let data = functionAnalysisData.data; - data.isHover = true; - if (functionAnalysisData.callBack) { - functionAnalysisData.callBack(true); - } - } - this.pie?.showHover(); - this.pie?.hideTip(); - }); // @ts-ignore this.functionData.unshift(this.functionStatisticsData); this.functionUsageTbl!.recycleDataSource = this.functionData; @@ -485,145 +524,55 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.functionData.shift(this.functionStatisticsData); this.currentLevelData = this.functionData; this.functionUsageTbl?.reMeauseHeight(); - this.functionUsageTbl!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); } - sortByColumn(column: string, sort: number): void { - let nmCurrentTable: LitTable | null | undefined; - switch (this.currentLevel) { - case 0: - nmCurrentTable = this.tableType; - break; - case 1: - nmCurrentTable = this.soUsageTbl; - break; - case 2: - nmCurrentTable = this.functionUsageTbl; - break; + private nativeProcessLevelClickEvent(it: any): void { + if (this.hideThreadCheckBox?.checked || this.isStatistic) { + this.reset(this.soUsageTbl!, true); + this.getNMLibSize(it); + } else { + this.reset(this.threadUsageTbl!, true); + this.getNMThreadSize(it); } - if (!nmCurrentTable) { - return; + const typeName = it.typeName === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : it.typeName; + this.titleEl!.textContent = typeName; + // @ts-ignore + this.type = it.typeName; + this.nmPieChart?.hideTip(); + } + + private nativeThreadLevelClickEvent(it: AnalysisObj): void { + this.reset(this.soUsageTbl!, true); + this.getNMLibSize(it); + const typeName = this.type === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : this.type; + + // @ts-ignore + let title = typeName; + if (!this.hideThreadCheckBox?.checked) { + this.threadName = `(Thread)${ it.tid}`; + title += ` / ${ this.threadName}`; } - if (sort === 0) { - let sortColumnZeroArr = [...this.currentLevelData]; - switch (this.currentLevel) { - case 0: - sortColumnZeroArr.unshift(this.typeStatisticsData); - break; - case 1: - sortColumnZeroArr.unshift(this.libStatisticsData); - break; - case 2: - sortColumnZeroArr.unshift(this.functionStatisticsData); - break; - } - nmCurrentTable!.recycleDataSource = sortColumnZeroArr; - } else { - let sortColumnArr = [...this.currentLevelData]; - switch (column) { - case 'tableName': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - if (sort === 1) { - if (statisticAnalysisLeftData.tableName > statisticAnalysisRightData.tableName) { - return 1; - } else if (statisticAnalysisLeftData.tableName === statisticAnalysisRightData.tableName) { - return 0; - } else { - return -1; - } - } else { - if (statisticAnalysisRightData.tableName > statisticAnalysisLeftData.tableName) { - return 1; - } else if (statisticAnalysisLeftData.tableName === statisticAnalysisRightData.tableName) { - return 0; - } else { - return -1; - } - } - } - ); - break; - case 'existSizeFormat': - case 'existSizePercent': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - return sort === 1 - ? statisticAnalysisLeftData.existSize - statisticAnalysisRightData.existSize - : statisticAnalysisRightData.existSize - statisticAnalysisLeftData.existSize; - } - ); - break; - case 'existCount': - case 'existCountPercent': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - return sort === 1 - ? statisticAnalysisLeftData.existCount - statisticAnalysisRightData.existCount - : statisticAnalysisRightData.existCount - statisticAnalysisLeftData.existCount; - } - ); - break; - case 'releaseSizeFormat': - case 'releaseSizePercent': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - return sort === 1 - ? statisticAnalysisLeftData.releaseSize - statisticAnalysisRightData.releaseSize - : statisticAnalysisRightData.releaseSize - statisticAnalysisLeftData.releaseSize; - } - ); - break; - case 'releaseCount': - case 'releaseCountPercent': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - return sort === 1 - ? statisticAnalysisLeftData.releaseCount - statisticAnalysisRightData.releaseCount - : statisticAnalysisRightData.releaseCount - statisticAnalysisLeftData.releaseCount; - } - ); - break; - case 'applySizeFormat': - case 'applySizePercent': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - return sort === 1 - ? statisticAnalysisLeftData.applySize - statisticAnalysisRightData.applySize - : statisticAnalysisRightData.applySize - statisticAnalysisLeftData.applySize; - } - ); - break; - case 'applyCount': - case 'applyCountPercent': - nmCurrentTable!.recycleDataSource = sortColumnArr.sort( - (statisticAnalysisLeftData, statisticAnalysisRightData) => { - return sort === 1 - ? statisticAnalysisLeftData.applyCount - statisticAnalysisRightData.applyCount - : statisticAnalysisRightData.applyCount - statisticAnalysisLeftData.applyCount; - } - ); - break; - } - switch (this.currentLevel) { - case 0: - sortColumnArr.unshift(this.typeStatisticsData); - break; - case 1: - sortColumnArr.unshift(this.libStatisticsData); - break; - case 2: - sortColumnArr.unshift(this.functionStatisticsData); - break; - } - nmCurrentTable!.recycleDataSource = sortColumnArr; + this.titleEl!.textContent = title; + this.nmPieChart?.hideTip(); + } + + private nativeSoLevelClickEvent(it: any): void { + this.reset(this.functionUsageTbl!, true); + this.getNMFunctionSize(it); + const typeName = this.type === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : this.type; + // @ts-ignore + let title = typeName || ''; + if (!this.hideThreadCheckBox?.checked && this.threadName.length > 0) { + title += ` / ${ this.threadName}`; + } + if (it.libName.length > 0) { + title += ` / ${ it.libName}`; } + this.titleEl!.textContent = title; + this.nmPieChart?.hideTip(); } - getNMEventTypeSize(val: SelectionParam): void { + private getNMEventTypeSize(val: SelectionParam): void { this.progressEL!.loading = true; let typeFilter = []; if (this.isStatistic) { @@ -652,37 +601,9 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { } this.getDataFromWorker(val, typeFilter); } - - this.tableType!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); - this.tableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.existSize !== 0) { - this.nativeProcessLevelClickEvent(data); - } - }); - new ResizeObserver(() => { - // @ts-ignore - if (this.parentElement?.clientHeight != 0) { - // @ts-ignore - this.tableType?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 40 + 'px'; - this.tableType?.reMeauseHeight(); - // @ts-ignore - this.soUsageTbl?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 40 + 'px'; - this.soUsageTbl?.reMeauseHeight(); - // @ts-ignore - this.functionUsageTbl?.shadowRoot?.querySelector('.table').style.height = - this.parentElement!.clientHeight - 40 + 'px'; - this.functionUsageTbl?.reMeauseHeight(); - } - }).observe(this.parentElement!); } - private calTypeSize(val: SelectionParam, result: any): void { - this.processData = JSON.parse(JSON.stringify(result)); + private getNMTypeSize(val: SelectionParam, result: any): void { this.resetCurrentLevelData(); this.typeMap = this.typeSizeGroup(this.processData); this.currentLevelExistSize = this.currentLevelApplySize - this.currentLevelReleaseSize; @@ -731,7 +652,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.typePieChart(); } - getNMThreadSize(item: any, val: SelectionParam): void { + private getNMThreadSize(item: any): void { this.progressEL!.loading = true; let threadMap = new Map>(); let types = this.getTypes(item); @@ -758,21 +679,19 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { analysis.typeId = item.typeId; analysis.typeName = item.typeName; analysis.tid = tid; - analysis.tName = 'Thread ' + tid; + analysis.tName = `Thread ${ tid}`; analysis.tableName = analysis.tName; this.threadData.push(analysis); }); this.threadData.sort((a, b) => b.existSize - a.existSize); + this.threadStatisticsData = this.totalData(this.threadStatisticsData); + this.currentLevel = 1; this.currentLevelData = this.threadData; this.progressEL!.loading = false; this.threadPieChart(); - this.threadUsageTbl!.addEventListener('column-click', (evt) => { - // @ts-ignore - this.sortByColumn(evt.detail.key, evt.detail.sort); - }); } - getLibSize(item: any): void { + private getNMLibSize(item: any): void { this.progressEL!.loading = true; let typeId = item.typeId; let typeName = item.typeName; @@ -848,12 +767,12 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }); this.soData.sort((a, b) => b.existSize - a.existSize); this.libStatisticsData = this.totalData(this.libStatisticsData); - this.currentLevel = 1; - this.libraryPieChart(); + this.currentLevel = 2; + this.libraryPieChart(item); this.progressEL!.loading = false; } - getNMFunctionSize(item: any): void { + private getNMFunctionSize(item: any): void { this.progressEL!.loading = true; this.shadowRoot!.querySelector('.nm-subheading')!.textContent = 'Statistic By Function Existing'; let typeId = item.typeId; @@ -932,19 +851,20 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.functionData.sort((a, b) => b.existSize - a.existSize); // @ts-ignore this.functionStatisticsData = this.totalData(this.functionStatisticsData); - this.currentLevel = 2; + this.currentLevel = 3; this.progressEL!.loading = false; this.functionPieChart(); } - getPieChartData(res: any[]): unknown[] { + private getPieChartData(res: any[]): unknown[] { if (res.length > PIE_CHART_LIMIT) { let pieChartArr: string[] = []; let other: any = { tableName: 'other', + tName: 'other', + libName: 'other', symbolName: 'other', existSizePercent: 0, - libName: 'other', existSize: 0, existSizeFormat: '', existCount: 0, @@ -987,7 +907,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { return res; } - setTypeMap(typeMap: Map, tyeId: number, typeName: string): AnalysisObj | null { + private setTypeMap(typeMap: Map, tyeId: number, typeName: string): AnalysisObj | null { let applySize = 0; let releaseSize = 0; let applyCount = 0; @@ -1100,29 +1020,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { return typeMap; } - totalData(total: {}): {} { - total = { - existSizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelExistSize), - existSizePercent: ((this.currentLevelExistSize / this.currentLevelExistSize) * 100).toFixed(2), - existCount: this.currentLevelExistCount, - existCountPercent: ((this.currentLevelExistCount / this.currentLevelExistCount) * 100).toFixed(2), - releaseSizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelReleaseSize), - releaseSizePercent: ((this.currentLevelReleaseSize / this.currentLevelReleaseSize) * 100).toFixed(2), - releaseCount: this.currentLevelReleaseCount, - releaseCountPercent: ((this.currentLevelReleaseCount / this.currentLevelReleaseCount) * 100).toFixed(2), - applySizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelApplySize), - applySizePercent: ((this.currentLevelApplySize / this.currentLevelApplySize) * 100).toFixed(2), - applyCount: this.currentLevelApplyCount, - applyCountPercent: ((this.currentLevelApplyCount / this.currentLevelApplyCount) * 100).toFixed(2), - existSize: 0, - tableName: '', - libName: '', - symbolName: '', - }; - return total; - } - - calSizeObj(dbData: Array): SizeObj { + private calSizeObj(dbData: Array): SizeObj { let sizeObj = new SizeObj(); for (let item of dbData) { if (this.isStatistic) { @@ -1143,7 +1041,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { return sizeObj; } - getTypes(parent: AnalysisObj): Array { + private getTypes(parent: AnalysisObj): Array { let types = new Array(); types.push(parent.typeId!); types.push(parent.typeName!); @@ -1159,26 +1057,193 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { return types; } - getDataFromWorker(val: SelectionParam, typeFilter: Array): void { - this.getDataByWorkerQuery( - { - leftNs: val.leftNs, - rightNs: val.rightNs, - types: typeFilter, - isStatistic: this.isStatistic, - }, - (results: any) => { - this.calTypeSize(val, results); + private totalData(total: {}): {} { + total = { + existSizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelExistSize), + existSizePercent: ((this.currentLevelExistSize / this.currentLevelExistSize) * 100).toFixed(2), + existCount: this.currentLevelExistCount, + existCountPercent: ((this.currentLevelExistCount / this.currentLevelExistCount) * 100).toFixed(2), + releaseSizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelReleaseSize), + releaseSizePercent: ((this.currentLevelReleaseSize / this.currentLevelReleaseSize) * 100).toFixed(2), + releaseCount: this.currentLevelReleaseCount, + releaseCountPercent: ((this.currentLevelReleaseCount / this.currentLevelReleaseCount) * 100).toFixed(2), + applySizeFormat: Utils.getBinaryByteWithUnit(this.currentLevelApplySize), + applySizePercent: ((this.currentLevelApplySize / this.currentLevelApplySize) * 100).toFixed(2), + applyCount: this.currentLevelApplyCount, + applyCountPercent: ((this.currentLevelApplyCount / this.currentLevelApplyCount) * 100).toFixed(2), + existSize: 0, + tableName: '', + tName: '', + libName: '', + symbolName: '', + }; + return total; + } + + private sortByColumn(): void { + let nmCurrentTable: LitTable | null | undefined; + switch (this.currentLevel) { + case 0: + nmCurrentTable = this.tableType; + break; + case 1: + nmCurrentTable = this.threadUsageTbl; + break; + case 2: + nmCurrentTable = this.soUsageTbl; + break; + case 3: + nmCurrentTable = this.functionUsageTbl; + break; + } + if (!nmCurrentTable) { + return; + } + if (this.nmSortType === 0) { + let sortColumnZeroArr = [...this.currentLevelData]; + switch (this.currentLevel) { + case 0: + sortColumnZeroArr.unshift(this.typeStatisticsData); + break; + case 1: + sortColumnZeroArr.unshift(this.threadStatisticsData); + break; + case 2: + sortColumnZeroArr.unshift(this.libStatisticsData); + break; + case 3: + sortColumnZeroArr.unshift(this.functionStatisticsData); + break; } - ); + nmCurrentTable!.recycleDataSource = sortColumnZeroArr; + } else { + let sortColumnArr = [...this.currentLevelData]; + switch (this.nmSortColumn) { + case 'tableName': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + if (this.nmSortType === 1) { + if (statisticAnalysisLeftData.tableName > statisticAnalysisRightData.tableName) { + return 1; + } else if (statisticAnalysisLeftData.tableName === statisticAnalysisRightData.tableName) { + return 0; + } else { + return -1; + } + } else { + if (statisticAnalysisRightData.tableName > statisticAnalysisLeftData.tableName) { + return 1; + } else if (statisticAnalysisLeftData.tableName === statisticAnalysisRightData.tableName) { + return 0; + } else { + return -1; + } + } + } + ); + break; + case 'existSizeFormat': + case 'existSizePercent': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + return this.nmSortType === 1 + ? statisticAnalysisLeftData.existSize - statisticAnalysisRightData.existSize + : statisticAnalysisRightData.existSize - statisticAnalysisLeftData.existSize; + } + ); + break; + case 'existCount': + case 'existCountPercent': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + return this.nmSortType === 1 + ? statisticAnalysisLeftData.existCount - statisticAnalysisRightData.existCount + : statisticAnalysisRightData.existCount - statisticAnalysisLeftData.existCount; + } + ); + break; + case 'releaseSizeFormat': + case 'releaseSizePercent': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + return this.nmSortType === 1 + ? statisticAnalysisLeftData.releaseSize - statisticAnalysisRightData.releaseSize + : statisticAnalysisRightData.releaseSize - statisticAnalysisLeftData.releaseSize; + } + ); + break; + case 'releaseCount': + case 'releaseCountPercent': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + return this.nmSortType === 1 + ? statisticAnalysisLeftData.releaseCount - statisticAnalysisRightData.releaseCount + : statisticAnalysisRightData.releaseCount - statisticAnalysisLeftData.releaseCount; + } + ); + break; + case 'applySizeFormat': + case 'applySizePercent': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + return this.nmSortType === 1 + ? statisticAnalysisLeftData.applySize - statisticAnalysisRightData.applySize + : statisticAnalysisRightData.applySize - statisticAnalysisLeftData.applySize; + } + ); + break; + case 'applyCount': + case 'applyCountPercent': + nmCurrentTable!.recycleDataSource = sortColumnArr.sort( + (statisticAnalysisLeftData, statisticAnalysisRightData) => { + return this.nmSortType === 1 + ? statisticAnalysisLeftData.applyCount - statisticAnalysisRightData.applyCount + : statisticAnalysisRightData.applyCount - statisticAnalysisLeftData.applyCount; + } + ); + break; + } + switch (this.currentLevel) { + case 0: + sortColumnArr.unshift(this.typeStatisticsData); + break; + case 1: + sortColumnArr.unshift(this.threadStatisticsData); + break; + case 2: + sortColumnArr.unshift(this.libStatisticsData); + break; + case 3: + sortColumnArr.unshift(this.functionStatisticsData); + break; + } + nmCurrentTable!.recycleDataSource = sortColumnArr; + } } - getDataByWorkerQuery(args: any, handler: Function): void { - this.progressEL!.loading = true; - procedurePool.submitWithName('logic1', 'native-memory-queryAnalysis', args, undefined, (results: any) => { - handler(results); - this.progressEL!.loading = false; - }); + public connectedCallback(): void { + new ResizeObserver(() => { + // @ts-ignore + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.tableType?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 40 + 'px'; + this.tableType?.reMeauseHeight(); + // @ts-ignore + this.soUsageTbl?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 40 + 'px'; + this.soUsageTbl?.reMeauseHeight(); + // @ts-ignore + this.functionUsageTbl?.shadowRoot?.querySelector('.table').style.height = + this.parentElement!.clientHeight - 40 + 'px'; + this.functionUsageTbl?.reMeauseHeight(); + if ((this.parentElement!.clientHeight >= 0 && this.parentElement!.clientHeight <= 31) || this.isStatistic) { + this.filterEl!.style.display = 'none'; + this.nmPieChart!.style.marginBottom = '0px'; + this.nmTableBox!.style.marginBottom = '0px'; + } else { + this.filterEl!.style.display = 'flex'; + } + } + }).observe(this.parentElement!); } initHtml(): string { @@ -1190,12 +1255,14 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { } #nm-chart-pie{ height: 300px; + margin-bottom: 31px; } .nm-table-box{ width: 60%; border-left: solid 1px var(--dark-border1,#e0e0e0); border-radius: 5px; padding: 10px; + margin-bottom: 31px; } .nm-go-back{ display:flex; @@ -1224,86 +1291,94 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { height: 1px; left: 0; right: 0; - } + } + lit-table{ + min-height: 380px; + } + #filter{ + position: absolute; + bottom: 0px; + }
    - -
    -
    -
    -
    - -
    -
    -
    + +
    +
    +
    +
    +
    -
    - -
    -
    - - - - - - - - - - - - - - - - - -
    +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    + `; } } diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts index 35577c37f..59033ab87 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts @@ -26,24 +26,26 @@ import { Utils } from '../../base/Utils.js'; import { SpSystemTrace } from '../../../SpSystemTrace.js'; import '../TabProgressBar.js'; import { SpNativeMemoryChart } from '../../../chart/SpNativeMemoryChart.js'; -import { procedurePool } from '../../../../database/Procedure.js'; import { resizeObserver } from '../SheetUtils.js'; import { TabPaneNMSampleList } from './TabPaneNMSampleList.js'; +import { env } from 'process'; @element('tabpane-native-statistics') export class TabPaneNMStatstics extends BaseElement { private nativeStatisticsTbl: LitTable | null | undefined; private nativeStatisticsSource: Array = []; - private native_type: Array = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; + private nativeType: Array = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; private allMax: number = 0; private sortColumn: string = ''; private sortType: number = 0; private currentSelection: SelectionParam | undefined; + private currentSelectIPid = 1; - set data(nativeStatisticsParam: SelectionParam | any) { - if (nativeStatisticsParam == this.currentSelection) { + set data(nativeStatisticsParam: SelectionParam) { + if (nativeStatisticsParam === this.currentSelection) { return; } + this.currentSelectIPid = nativeStatisticsParam.nativeMemoryCurrentIPid; this.currentSelection = nativeStatisticsParam; this.allMax = 0; TabPaneNMSampleList.clearData(); @@ -51,33 +53,47 @@ export class TabPaneNMStatstics extends BaseElement { this.allMax += heap.sumHeapSize; }); if (nativeStatisticsParam.nativeMemory.length > 0) { + Utils.getInstance().setCurrentSelectIPid(this.currentSelectIPid); Utils.getInstance().initResponseTypeList(nativeStatisticsParam); } // @ts-ignore - this.nativeStatisticsTbl?.shadowRoot.querySelector('.table').style.height = - this.parentElement!.clientHeight - 25 + 'px'; + this.nativeStatisticsTbl?.shadowRoot.querySelector('.table').style.height = `${ + this.parentElement!.clientHeight - 25 + }px`; // @ts-ignore this.nativeStatisticsTbl?.recycleDataSource = []; this.nativeStatisticsTbl!.loading = true; + this.queryData(nativeStatisticsParam); + } + + queryData(nativeStatisticsParam: SelectionParam): void { Promise.all([ - queryNativeHookStatistics(nativeStatisticsParam.leftNs, nativeStatisticsParam.rightNs), - queryNativeHookStatisticsSubType(nativeStatisticsParam.leftNs, nativeStatisticsParam.rightNs), - queryNativeHookStatisticsMalloc(nativeStatisticsParam.leftNs, nativeStatisticsParam.rightNs), + queryNativeHookStatistics(nativeStatisticsParam.leftNs, nativeStatisticsParam.rightNs, this.currentSelectIPid), + queryNativeHookStatisticsSubType( + nativeStatisticsParam.leftNs, + nativeStatisticsParam.rightNs, + this.currentSelectIPid + ), + queryNativeHookStatisticsMalloc( + nativeStatisticsParam.leftNs, + nativeStatisticsParam.rightNs, + this.currentSelectIPid + ), ]).then((values) => { this.nativeStatisticsTbl!.loading = false; let arr: Array = []; - let index1 = nativeStatisticsParam.nativeMemory.indexOf(this.native_type[0]); - let index2 = nativeStatisticsParam.nativeMemory.indexOf(this.native_type[1]); - let index3 = nativeStatisticsParam.nativeMemory.indexOf(this.native_type[2]); + let index1 = nativeStatisticsParam.nativeMemory.indexOf(this.nativeType[0]); + let index2 = nativeStatisticsParam.nativeMemory.indexOf(this.nativeType[1]); + let index3 = nativeStatisticsParam.nativeMemory.indexOf(this.nativeType[2]); this.setMemoryTypeData(nativeStatisticsParam, values[0], arr); - if (index1 != -1 || index3 != -1) { + if (index1 !== -1 || index3 !== -1) { this.setSubTypeTableData(values[1], arr); } let type = 0; - if (index1 != -1 || (index2 != -1 && index3 != -1)) { + if (index1 !== -1 || (index2 !== -1 && index3 !== -1)) { type = 0; } else { - type = index2 != -1 ? 1 : 2; + type = index2 !== -1 ? 1 : 2; } this.setMallocTableData(values[2], arr, type); this.nativeStatisticsSource = arr; @@ -85,13 +101,13 @@ export class TabPaneNMStatstics extends BaseElement { }); } - setMallocTableData(result: Array, arr: Array, type: number) { + setMallocTableData(result: Array, arr: Array, type: number): void { result.map((malloc) => { let data = new NativeHookStatisticsTableData(); - if (malloc.eventType == 'AllocEvent') { - data.memoryTap = 'Malloc ' + Utils.getByteWithUnit(malloc.heapSize); + if (malloc.eventType === 'AllocEvent') { + data.memoryTap = `Malloc ${Utils.getByteWithUnit(malloc.heapSize)}`; } else { - data.memoryTap = 'Mmap ' + Utils.getByteWithUnit(malloc.heapSize); + data.memoryTap = `Mmap ${Utils.getByteWithUnit(malloc.heapSize)}`; } data.existing = malloc.allocByte - malloc.freeByte; data.allocCount = malloc.allocCount - malloc.freeCount; @@ -105,21 +121,21 @@ export class TabPaneNMStatstics extends BaseElement { data.totalBytesString = Utils.getByteWithUnit(data.totalBytes); data.maxStr = Utils.getByteWithUnit(malloc.heapSize); data.existingValue = [data.existing, data.totalBytes, this.allMax]; - if (type == 0) { + if (type === 0) { arr.push(data); - } else if (type == 1 && malloc.eventType == 'AllocEvent') { + } else if (type === 1 && malloc.eventType === 'AllocEvent') { arr.push(data); - } else if (type == 2 && malloc.eventType == 'MmapEvent') { + } else if (type === 2 && malloc.eventType === 'MmapEvent') { arr.push(data); } else { } }); } - setSubTypeTableData(result: Array, arr: Array) { + setSubTypeTableData(result: Array, arr: Array): void { result.map((sub) => { let subType = SpSystemTrace.DATA_DICT.get(sub.subTypeId); - if (subType != null && subType != undefined) { + if (subType !== null && subType !== undefined) { let data = new NativeHookStatisticsTableData(); data.memoryTap = subType; data.existing = sub.allocByte - sub.freeByte; @@ -139,24 +155,28 @@ export class TabPaneNMStatstics extends BaseElement { }); } - setMemoryTypeData(val: SelectionParam, result: Array, arr: Array) { + setMemoryTypeData( + val: SelectionParam, + result: Array, + arr: Array + ): void { let all: NativeHookStatisticsTableData | null = null; let heap: NativeHookStatisticsTableData | null = null; let anonymous: NativeHookStatisticsTableData | null = null; - if (val.nativeMemory.indexOf(this.native_type[0]) != -1) { + if (val.nativeMemory.indexOf(this.nativeType[0]) !== -1) { all = new NativeHookStatisticsTableData(); - all.memoryTap = this.native_type[0]; + all.memoryTap = this.nativeType[0]; } - if (val.nativeMemory.indexOf(this.native_type[1]) != -1) { + if (val.nativeMemory.indexOf(this.nativeType[1]) !== -1) { heap = new NativeHookStatisticsTableData(); - heap.memoryTap = this.native_type[1]; + heap.memoryTap = this.nativeType[1]; } - if (val.nativeMemory.indexOf(this.native_type[2]) != -1) { + if (val.nativeMemory.indexOf(this.nativeType[2]) !== -1) { anonymous = new NativeHookStatisticsTableData(); - anonymous.memoryTap = this.native_type[2]; + anonymous.memoryTap = this.nativeType[2]; } for (let hook of result) { - if (all != null) { + if (all !== null) { all.totalBytes += hook.allocByte; all.totalCount += hook.allocCount; all.freeByte += hook.freeByte; @@ -166,7 +186,7 @@ export class TabPaneNMStatstics extends BaseElement { all.maxStr = Utils.getByteWithUnit(all.max); } } - if (heap != null && hook.eventType == 'AllocEvent') { + if (heap !== null && hook.eventType === 'AllocEvent') { heap.totalBytes += hook.allocByte; heap.totalCount += hook.allocCount; heap.freeByte += hook.freeByte; @@ -176,7 +196,7 @@ export class TabPaneNMStatstics extends BaseElement { heap.maxStr = Utils.getByteWithUnit(heap.max); } } - if (anonymous != null && hook.eventType == 'MmapEvent') { + if (anonymous !== null && hook.eventType === 'MmapEvent') { anonymous.totalBytes += hook.allocByte; anonymous.totalCount += hook.allocCount; anonymous.freeByte += hook.freeByte; @@ -187,7 +207,7 @@ export class TabPaneNMStatstics extends BaseElement { } } } - if (all != null) { + if (all !== null) { all.existing = all.totalBytes - all.freeByte; all.allocCount = all.totalCount - all.freeCount; all.existingString = Utils.getByteWithUnit(all.existing); @@ -196,7 +216,7 @@ export class TabPaneNMStatstics extends BaseElement { all.existingValue = [all.existing, all.totalBytes, this.allMax]; arr.push(all); } - if (heap != null) { + if (heap !== null) { heap.existing = heap.totalBytes - heap.freeByte; heap.allocCount = heap.totalCount - heap.freeCount; heap.existingString = Utils.getByteWithUnit(heap.existing); @@ -205,7 +225,7 @@ export class TabPaneNMStatstics extends BaseElement { heap.existingValue = [heap.existing, heap.totalBytes, this.allMax]; arr.push(heap); } - if (anonymous != null) { + if (anonymous !== null) { anonymous.existing = anonymous.totalBytes - anonymous.freeByte; anonymous.allocCount = anonymous.totalCount - anonymous.freeCount; anonymous.existingString = Utils.getByteWithUnit(anonymous.existing); @@ -224,38 +244,38 @@ export class TabPaneNMStatstics extends BaseElement { }); } - connectedCallback() { + connectedCallback(): void { super.connectedCallback(); resizeObserver(this.parentElement!, this.nativeStatisticsTbl!, 25); } - sortByColumn(nmStatColumn: string, nmStatSort: number) { + sortByColumn(nmStatColumn: string, nmStatSort: number): void { this.sortColumn = nmStatColumn; this.sortType = nmStatSort; - if (nmStatSort == 0) { + if (nmStatSort === 0) { this.nativeStatisticsTbl!.recycleDataSource = this.nativeStatisticsSource; } else { let arr = [...this.nativeStatisticsSource]; - if (nmStatColumn == 'existingString') { + if (nmStatColumn === 'existingString') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.existing - nativeStatisticsRightData.existing : nativeStatisticsRightData.existing - nativeStatisticsLeftData.existing; } ); - } else if (nmStatColumn == 'allocCount') { + } else if (nmStatColumn === 'allocCount') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.allocCount - nativeStatisticsRightData.allocCount : nativeStatisticsRightData.allocCount - nativeStatisticsLeftData.allocCount; } ); - } else if (nmStatColumn == 'freeByteString') { + } else if (nmStatColumn === 'freeByteString') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.totalBytes - nativeStatisticsLeftData.existing - (nativeStatisticsRightData.totalBytes - nativeStatisticsRightData.existing) @@ -264,34 +284,34 @@ export class TabPaneNMStatstics extends BaseElement { (nativeStatisticsLeftData.totalBytes - nativeStatisticsLeftData.existing); } ); - } else if (nmStatColumn == 'freeCount') { + } else if (nmStatColumn === 'freeCount') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.freeCount - nativeStatisticsRightData.freeCount : nativeStatisticsRightData.freeCount - nativeStatisticsLeftData.freeCount; } ); - } else if (nmStatColumn == 'totalBytesString') { + } else if (nmStatColumn === 'totalBytesString') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.totalBytes - nativeStatisticsRightData.totalBytes : nativeStatisticsRightData.totalBytes - nativeStatisticsLeftData.totalBytes; } ); - } else if (nmStatColumn == 'maxStr') { + } else if (nmStatColumn === 'maxStr') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.max - nativeStatisticsRightData.max : nativeStatisticsRightData.max - nativeStatisticsLeftData.max; } ); - } else if (nmStatColumn == 'totalCount') { + } else if (nmStatColumn === 'totalCount') { this.nativeStatisticsTbl!.recycleDataSource = arr.sort( (nativeStatisticsLeftData, nativeStatisticsRightData) => { - return nmStatSort == 1 + return nmStatSort === 1 ? nativeStatisticsLeftData.totalCount - nativeStatisticsRightData.totalCount : nativeStatisticsRightData.totalCount - nativeStatisticsLeftData.totalCount; } diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts index 189976be6..be2bdb2e2 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts @@ -43,7 +43,7 @@ export class TabPaneNMemory extends BaseElement { private nmMemoryLoadingList: number[] = []; private loadingPage: any; private memorySource: Array = []; - private native_type: Array = [...this.defaultNativeTypes]; + private nativeType: Array = [...this.defaultNativeTypes]; private statsticsSelection: Array = []; private filterAllocationType: string = '0'; private filterNativeType: string = '0'; @@ -66,22 +66,22 @@ export class TabPaneNMemory extends BaseElement { queryData(memoryParam: SelectionParam | any): void { this.eventTypes = []; - if (memoryParam.nativeMemory.indexOf(this.defaultNativeTypes[0]) != -1) { + if (memoryParam.nativeMemory.indexOf(this.defaultNativeTypes[0]) !== -1) { this.eventTypes.push("'AllocEvent'"); this.eventTypes.push("'MmapEvent'"); } else { - if (memoryParam.nativeMemory.indexOf(this.defaultNativeTypes[1]) != -1) { + if (memoryParam.nativeMemory.indexOf(this.defaultNativeTypes[1]) !== -1) { this.eventTypes.push("'AllocEvent'"); } - if (memoryParam.nativeMemory.indexOf(this.defaultNativeTypes[2]) != -1) { + if (memoryParam.nativeMemory.indexOf(this.defaultNativeTypes[2]) !== -1) { this.eventTypes.push("'MmapEvent'"); } } TabPaneNMSampleList.serSelection(memoryParam); // @ts-ignore - this.memoryTbl?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 20 - 31 + 'px'; + this.memoryTbl?.shadowRoot?.querySelector('.table').style.height = `${this.parentElement.clientHeight - 20 - 31}px`; // @ts-ignore - this.tblData?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 20 - 31 + 'px'; + this.tblData?.shadowRoot?.querySelector('.table').style.height = `${this.parentElement.clientHeight - 20 - 31}px`; // @ts-ignore this.tblData?.recycleDataSource = []; // @ts-ignore @@ -167,18 +167,18 @@ export class TabPaneNMemory extends BaseElement { this.initFilterTypes(() => { this.currentSelection = val; this.filterSetSelectList(nmFilterEl!, typeIndexOf); - this.filterNativeType = typeIndexOf + ''; + this.filterNativeType = `${typeIndexOf}`; this.queryData(val); }); } - let typeIndexOf = this.native_type.indexOf(val.statisticsSelectData.memoryTap); + let typeIndexOf = this.nativeType.indexOf(val.statisticsSelectData.memoryTap); if (this.statsticsSelection.indexOf(val.statisticsSelectData) === -1 && typeIndexOf === -1) { this.statsticsSelection.push(val.statisticsSelectData); - this.native_type.push(val.statisticsSelectData.memoryTap); - typeIndexOf = this.native_type.length - 1; + this.nativeType.push(val.statisticsSelectData.memoryTap); + typeIndexOf = this.nativeType.length - 1; } else { let index = this.statsticsSelection.findIndex((mt) => mt.memoryTap === val.statisticsSelectData.memoryTap); - if (index != -1) { + if (index !== -1) { this.statsticsSelection[index] = val.statisticsSelectData; } } @@ -186,7 +186,7 @@ export class TabPaneNMemory extends BaseElement { this.tblData!.recycleDataSource = []; this.rowSelectData = undefined; this.filterSetSelectList(nmFilterEl!, typeIndexOf); - this.filterNativeType = typeIndexOf + ''; + this.filterNativeType = `${typeIndexOf}`; //直接将当前数据过滤即可 this.getDataByNativeMemoryWorker(val); } @@ -195,24 +195,24 @@ export class TabPaneNMemory extends BaseElement { private filterSetSelectList(nmFilterEl: TabPaneFilter, typeIndexOf: number): void { nmFilterEl!.setSelectList( null, - this.native_type, + this.nativeType, 'Allocation Lifespan', 'Allocation Type', this.responseTypes.map((item: any) => { return item.value; }) ); - nmFilterEl!.secondSelect = typeIndexOf + ''; + nmFilterEl!.secondSelect = `${typeIndexOf}`; nmFilterEl!.thirdSelect = this.filterResponseSelect; } - initFilterTypes(initCallback?: () => void) { - this.native_type = [...this.defaultNativeTypes]; + initFilterTypes(initCallback?: () => void): void { + this.nativeType = [...this.defaultNativeTypes]; this.statsticsSelection = []; procedurePool.submitWithName('logic1', 'native-memory-get-responseType', {}, undefined, (res: any) => { this.filter!.setSelectList( null, - this.native_type, + this.nativeType, 'Allocation Lifespan', 'Allocation Type', res.map((item: any) => { @@ -292,7 +292,10 @@ export class TabPaneNMemory extends BaseElement { let minTs = 0; let minItem: any = undefined; let filterTemp = this.memorySource.filter((tempItem) => { - if (minTs === 0 || (tempItem.startTs - checkTs != 0 && Math.abs(tempItem.startTs - checkTs) < minTs)) { + if ( + minTs === 0 || + (tempItem.startTs - checkTs != 0 && Math.abs(tempItem.startTs - checkTs) < minTs) + ) { minTs = Math.abs(tempItem.startTs - checkTs); minItem = tempItem; } @@ -311,8 +314,8 @@ export class TabPaneNMemory extends BaseElement { let args = new Map(); args.set('startTs', this.rowSelectData.startTs); args.set('actionType', 'native-memory-state-change'); - this.startNmMemoryWorker('native-memory-action', args, (results: any[]) => { }); - TabPaneNMSampleList.addSampleData(this.rowSelectData); + this.startNmMemoryWorker('native-memory-action', args, (results: any[]) => {}); + TabPaneNMSampleList.addSampleData(this.rowSelectData,this.currentSelection!.nativeMemoryCurrentIPid); this.memoryTbl!.scrollToData(this.rowSelectData); } } @@ -338,21 +341,23 @@ export class TabPaneNMemory extends BaseElement { connectedCallback() { super.connectedCallback(); new ResizeObserver((entries) => { - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { // @ts-ignore - this.memoryTbl?.shadowRoot.querySelector('.table').style.height = - this.parentElement!.clientHeight - 10 - 31 + 'px'; + this.memoryTbl?.shadowRoot.querySelector('.table').style.height = `${ + this.parentElement!.clientHeight - 10 - 31 + }px`; this.memoryTbl?.reMeauseHeight(); // @ts-ignore - this.tblData?.shadowRoot.querySelector('.table').style.height = - this.parentElement!.clientHeight - 10 - 31 + 'px'; + this.tblData?.shadowRoot.querySelector('.table').style.height = `${ + this.parentElement!.clientHeight - 10 - 31 + }px`; this.tblData?.reMeauseHeight(); - this.loadingPage.style.height = this.parentElement!.clientHeight - 24 + 'px'; + this.loadingPage.style.height = `${this.parentElement!.clientHeight - 24}px`; } }).observe(this.parentElement!); } - setRightTableData(nativeMemoryHook: NativeMemory) { + setRightTableData(nativeMemoryHook: NativeMemory): void { let args = new Map(); args.set('eventId', nativeMemoryHook.eventId); args.set('actionType', 'memory-stack'); diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index 4cb6571f0..bba6f151e 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -89,7 +89,6 @@ import { type FrameAnimationStruct } from './ui-worker/ProcedureWorkerFrameAnima import { type SnapshotStruct } from './ui-worker/ProcedureWorkerSnapshot.js'; import { type MemoryConfig } from '../bean/MemoryConfig.js'; import { LogStruct } from './ui-worker/ProcedureWorkerLog.js'; -import { HiSysEventStruct } from './ui-worker/ProcedureWorkerHiSysEvent.js'; class DataWorkerThread extends Worker { taskMap: any = {}; @@ -865,7 +864,7 @@ export const getTabSlices = ( on T.id = C.callid where - C.ts > 0 + C.ts not null and c.dur >= 0 and @@ -909,7 +908,7 @@ export const getTabSlicesAsyncFunc = ( A.id = C.callid left join process P on P.id = A.ipid where - C.ts > 0 + C.ts not null and c.dur >= -1 and @@ -1515,7 +1514,11 @@ export const queryHeapAllData = ( { ipids: ipids, $startTs: startTs, $endTs: endTs } ); -export const queryNativeHookStatistics = (leftNs: number, rightNs: number): Promise> => +export const queryNativeHookStatistics = ( + leftNs: number, + rightNs: number, + ipid: number +): Promise> => query( 'queryNativeHookStatistics', ` @@ -1533,11 +1536,16 @@ export const queryNativeHookStatistics = (leftNs: number, rightNs: number): Prom where (A.start_ts - B.start_ts) between ${leftNs} and ${rightNs} and (event_type = 'AllocEvent' or event_type = 'MmapEvent') + and group by event_type;`, { $leftNs: leftNs, $rightNs: rightNs } ); -export const queryNativeHookStatisticsMalloc = (leftNs: number, rightNs: number): Promise> => +export const queryNativeHookStatisticsMalloc = ( + leftNs: number, + rightNs: number, + ipid: number +): Promise> => query( 'queryNativeHookStatisticsMalloc', ` @@ -1557,6 +1565,7 @@ export const queryNativeHookStatisticsMalloc = (leftNs: number, rightNs: number) (event_type = 'AllocEvent' or event_type = 'MmapEvent') and sub_type_id is null + and ipid = ${ipid} group by event_type, heap_size @@ -1565,7 +1574,11 @@ export const queryNativeHookStatisticsMalloc = (leftNs: number, rightNs: number) { $leftNs: leftNs, $rightNs: rightNs } ); -export const queryNativeHookStatisticsSubType = (leftNs: number, rightNs: number): Promise> => +export const queryNativeHookStatisticsSubType = ( + leftNs: number, + rightNs: number, + ipid: number +): Promise> => query( 'queryNativeHookStatisticsSubType', ` @@ -1584,13 +1597,14 @@ export const queryNativeHookStatisticsSubType = (leftNs: number, rightNs: number (NH.start_ts - TR.start_ts) between ${leftNs} and ${rightNs} and (event_type = 'MmapEvent') + and ipid = ${ipid} group by event_type,sub_type_id; `, { $leftNs: leftNs, $rightNs: rightNs } ); -export const queryNativeHookSubType = (leftNs: number, rightNs: number): Promise> => +export const queryNativeHookSubType = (leftNs: number, rightNs: number, ipid: number): Promise> => query( 'queryNativeHookSubType', `select distinct( @@ -1603,11 +1617,12 @@ export const queryNativeHookSubType = (leftNs: number, rightNs: number): Promise left join data_dict DD on NH.sub_type_id = DD.id where event_type = 'MmapEvent' and (NH.start_ts - TR.start_ts) between ${leftNs} and ${rightNs} + and ipid = ${ipid} `, { $leftNs: leftNs, $rightNs: rightNs } ); -export const queryNativeHookStatisticSubType = (leftNs: number, rightNs: number): Promise> => +export const queryNativeHookStatisticSubType = (leftNs: number, rightNs: number, ipid: number): Promise> => query( 'queryNativeHookStatisticSubType', `SELECT DISTINCT @@ -1628,11 +1643,12 @@ export const queryNativeHookStatisticSubType = (leftNs: number, rightNs: number) WHERE NHS.type > 1 AND (NHS.ts - TR.start_ts) between ${leftNs} and ${rightNs} + AND ipid = ${ipid} `, { $leftNs: leftNs, $rightNs: rightNs } ); -export const queryNativeHookStatisticsCount = (): Promise> => +export const queryNativeHookStatisticsCount = (): Promise> => query('queryNativeHookStatisticsCount', `select count(1) num from native_hook_statistic`, {}); export const queryNativeHookProcess = (table: string): Promise> => { @@ -1651,7 +1667,7 @@ export const queryNativeHookProcess = (table: string): Promise> => +export const queryNativeHookSnapshotTypes = (ipid: number): Promise> => query( 'queryNativeHookSnapshotTypes', ` @@ -1662,12 +1678,13 @@ select native_hook left join data_dict on native_hook.sub_type_id = data_dict.id where (event_type = 'AllocEvent' or event_type = 'MmapEvent') + and ipid = ${ipid} group by event_type,data;`, {} ); -export const queryAllHookData = (rightNs: number): Promise> => +export const queryAllHookData = (rightNs: number,ipid: number): Promise> => query( 'queryAllHookData', ` @@ -1684,6 +1701,7 @@ export const queryAllHookData = (rightNs: number): Promise> => 'queryHiPerfCpuData', ` select s.callchain_id, - (s.timestamp_trace-t.start_ts) startNS + (s.timestamp_trace-t.start_ts) startNS, event_count, event_type_id from perf_sample s,trace_range t where cpu_id=${cpu} @@ -1763,7 +1781,7 @@ export const queryHiPerfCpuData = (cpu: number): Promise> => export const queryHiPerfCpuMergeData = (): Promise> => query( 'queryHiPerfCpuData', - `select s.callchain_id,(s.timestamp_trace-t.start_ts) startNS from perf_sample s,trace_range t + `select s.callchain_id,(s.timestamp_trace-t.start_ts) startNS, event_count, event_type_id from perf_sample s,trace_range t where s.thread_id != 0;`, {} ); @@ -1782,7 +1800,9 @@ SELECT sp.callchain_id, th.thread_name, th.thread_id tid, th.process_id pid, - sp.timestamp_trace - tr.start_ts startNS + sp.timestamp_trace - tr.start_ts startNS, + event_count, + event_type_id from perf_sample sp, trace_range tr left join perf_thread th on th.thread_id = sp.thread_id @@ -1798,14 +1818,15 @@ SELECT sp.callchain_id, th.thread_name, th.thread_id tid, th.process_id pid, - sp.timestamp_trace - tr.start_ts startNS + sp.timestamp_trace - tr.start_ts startNS, + event_count, + event_type_id from perf_sample sp, trace_range tr left join perf_thread th on th.thread_id = sp.thread_id where tid = ${tid} and sp.thread_id != 0 ;`, { $tid: tid } ); - export const querySelectTraceStats = (): Promise< Array<{ event_name: string; @@ -2727,6 +2748,15 @@ export const queryPerfCmdline = (): Promise> => `, {} ); +export const queryPerfEventType = (): Promise> => + query( + 'queryPerfEventType', + ` + select id,report_value as report from perf_report where id in ( +select distinct event_type_id from perf_sample); + `, + {} + ); export const queryCPuAbilityMaxData = (): Promise> => query( @@ -2756,7 +2786,7 @@ export const querySceneSearchFunc = (search: string, processList: Array) select c.cookie,c.id,c.name as funName,c.ts - r.start_ts as startTime,c.dur,c.depth,t.tid,t.name as threadName ,p.pid ,'func' as type from callstack c left join thread t on c.callid = t.id left join process p on t.ipid = p.id left join trace_range r - where c.name like '%${search}%' ESCAPE '\\' and startTime > 0 and p.pid in (${processList.join(',')}); + where c.name like '%${search}%' and startTime > 0 and p.pid in (${processList.join(',')}); `, { $search: search } ); @@ -5501,7 +5531,7 @@ export const queryTraceType = (): Promise< export const queryTransferList = (): Promise> => query('queryTransferList', `select id, report_value as cmdStr from perf_report where report_type = 'config_name'`); - export const getTabRunningPercent = (tIds: Array, leftNS: number, rightNS: number): Promise> => +export const getTabRunningPercent = (tIds: Array, leftNS: number, rightNS: number): Promise> => query( 'getTabRunningPercent', ` @@ -5522,7 +5552,12 @@ export const queryTransferList = (): Promise, leftNS: number, rightNS: number): Promise> => +export const querySearchFuncData = ( + funcName: string, + tIds: Array, + leftNS: number, + rightNS: number +): Promise> => query( 'querySearchFuncData', ` @@ -5590,44 +5625,3 @@ export const queryCpuFreqFilterId = (): Promise> => name='cpu_frequency' ` ); - -export const queryRealTime = (): Promise< - Array<{ - ts: number; - value: string; - }> - > => - query( - 'queryRealTime', - `select CS.ts -TR.start_ts as ts ,clock_name - from clock_snapshot as CS ,trace_range as TR - where clock_name = 'realtime';` - ); -export const queryHiSysEventData = (): Promise> => - query( - 'queryHiSysEventData', - `SELECT S.id, - D2.data AS domain, - D.data AS eventName, - type AS eventType, - time_zone AS tz, - pid, - tid, - uid, - info, - level, - seq, - contents, - S.ts - TR.start_ts AS ts, - 1 AS dur, - CASE - WHEN level = 'MINOR' THEN - 0 - WHEN level = 'CRITICAL' THEN - 1 - END AS depth - FROM hisys_all_event AS S ,trace_range AS TR - LEFT JOIN data_dict AS D on S.event_name_id = D.id - LEFT JOIN data_dict AS D2 on S.domain_id = D2.id - ORDER BY S.ts` - ); \ No newline at end of file diff --git a/ide/src/trace/database/TraceWorker.ts b/ide/src/trace/database/TraceWorker.ts index b58ca480e..7eea2a995 100644 --- a/ide/src/trace/database/TraceWorker.ts +++ b/ide/src/trace/database/TraceWorker.ts @@ -283,11 +283,7 @@ self.onmessage = async (e: MessageEvent) => { const dataSlice = uint8Array.subarray(wrSize, wrSize + sliceLen); Module.HEAPU8.set(dataSlice, reqBufferAddr); wrSize += sliceLen; - if (wrSize >= uint8Array.length) { - r2 = Module._TraceStreamerParseDataEx(sliceLen, 1); - } else { - r2 = Module._TraceStreamerParseDataEx(sliceLen, 0); - } + r2 = Module._TraceStreamerParseDataEx(sliceLen); if (r2 == -1) { break; } diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts index 582366a4f..5be598c8b 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts @@ -58,11 +58,11 @@ const PF_TYPE = 1; const BIO_TYPE = 2; export class ProcedureLogicWorkerFileSystem extends LogicHandler { - private dataCache = DataCache.getInstance(); + private dataCache: DataCache = DataCache.getInstance(); handlerMap: Map = new Map(); currentEventId: string = ''; tab: string = ''; - isAnalysis = false; + isAnalysis: boolean = false; handle(data: any): void { if (data.id) { @@ -207,11 +207,14 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { this.queryIOEvents(data.params.leftNs, data.params.rightNs, data.params.diskIOipids); } break; + case 'fileSystem-reset': + this.handlerMap.get('fileSystem').isHideEvent = false; + this.handlerMap.get('fileSystem').isHideThread = false; } } } - clearAll() { + clearAll(): void { this.dataCache.clearEBpf(); for (let key of this.handlerMap.keys()) { if (this.handlerMap.get(key).clear) { @@ -221,10 +224,10 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { this.handlerMap.clear(); } - queryFileSysEvents(leftNs: number, rightNs: number, typeArr: Array, tab: string) { - let types = Array.from(typeArr).join(','); - let sql = ''; - if (tab == 'events') { + queryFileSysEvents(leftNs: number, rightNs: number, typeArr: Array, tab: string): void { + let types: string = Array.from(typeArr).join(','); + let sql: string = ''; + if (tab === 'events') { sql = ` select A.callchain_id as callchainId, @@ -250,7 +253,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { ) order by A.end_ts; `; - } else if (tab == 'history') { + } else if (tab === 'history') { sql = ` select A.callchain_id as callchainId, @@ -297,7 +300,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); } - queryVMEvents(leftNs: number, rightNs: number, typeArr: Array) { + queryVMEvents(leftNs: number, rightNs: number, typeArr: Array): void { let types = Array.from(typeArr).join(','); let sql = `select A.callchain_id as callchainId, @@ -322,7 +325,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); } - queryIOEvents(leftNs: number, rightNs: number, diskIOipids: Array) { + queryIOEvents(leftNs: number, rightNs: number, diskIOipids: Array): void { let ipidsSql = ''; if (diskIOipids.length > 0) { ipidsSql += `and A.ipid in (${diskIOipids.join(',')})`; @@ -353,7 +356,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); } - getStacksByCallchainId(id: number) { + getStacksByCallchainId(id: number): Stack[] { let stacks = this.dataCache.eBpfCallChainsMap.get(id) ?? []; let arr: Array = []; for (let s of stacks) { @@ -366,13 +369,13 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { return arr; } - supplementIoEvents(res: Array) { - return res.map((event) => { - if (typeof event.pathId == 'string') { + supplementIoEvents(res: Array): IoCompletionTimes[] { + return res.map((event): IoCompletionTimes => { + if (typeof event.pathId === 'string') { event.pathId = parseInt(event.pathId); } event.startTsStr = getTimeString(event.startTs); - event.durPer4kStr = event.durPer4k == 0 ? '-' : getProbablyTime(event.durPer4k); + event.durPer4kStr = event.durPer4k === 0 ? '-' : getProbablyTime(event.durPer4k); event.sizeStr = getByteWithUnit(event.size); event.durStr = getProbablyTime(event.dur); event.path = event.pathId ? this.dataCache.dataDict?.get(event.pathId) ?? '-' : '-'; @@ -382,7 +385,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { if (stacks.length > 0) { let stack = stacks[0]; event.backtrace = [ - stack.symbolsId == null ? stack.ip : this.dataCache.dataDict?.get(stack.symbolsId) ?? '', + stack.symbolsId === null ? stack.ip : this.dataCache.dataDict?.get(stack.symbolsId) ?? '', `(${stacks.length} other frames)`, ]; } else { @@ -392,8 +395,8 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); } - supplementVMEvents(res: Array) { - return res.map((event) => { + supplementVMEvents(res: Array): VirtualMemoryEvent[] { + return res.map((event): VirtualMemoryEvent => { event.startTsStr = getTimeString(event.startTs); event.sizeStr = getByteWithUnit(event.size * 4096); event.durStr = getProbablyTime(event.dur); @@ -403,12 +406,12 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); } - supplementFileSysEvents(res: Array, tab: string) { - res.map((r) => { + supplementFileSysEvents(res: Array, tab: string): FileSysEvent[] { + res.map((r): void => { let stacks = this.dataCache.eBpfCallChainsMap.get(r.callchainId); r.startTsStr = getTimeString(r.startTs); r.durStr = getProbablyTime(r.dur); - if (tab == 'events') { + if (tab === 'events') { r.firstArg = r.firstArg ?? '0x0'; r.secondArg = r.secondArg ?? '0x0'; r.thirdArg = r.thirdArg ?? '0x0'; @@ -422,8 +425,8 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { if (stacks && stacks.length > 0) { let stack = stacks[0]; r.depth = stacks.length; - r.symbol = stack.symbolsId == null ? stack.ip : this.dataCache.dataDict?.get(stack.symbolsId) ?? ''; - if (tab != 'events') { + r.symbol = stack.symbolsId === null ? stack.ip : this.dataCache.dataDict?.get(stack.symbolsId) ?? ''; + if (tab !== 'events') { r.path = this.dataCache.dataDict?.get(r.fileId) ?? '-'; } r.backtrace = [r.symbol, `(${r.depth} other frames)`]; @@ -437,9 +440,9 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { return res; } - initCallchains() { + initCallchains(): void { if (this.handlerMap.size > 0) { - this.handlerMap.forEach((value) => { + this.handlerMap.forEach((value: any): void => { value.clearAll(); }); this.handlerMap.clear(); @@ -455,9 +458,9 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { ); } - initCallChainTopDown(list: any[]) { + initCallChainTopDown(list: any[]): void { const callChainsMap = this.dataCache.eBpfCallChainsMap; - list.forEach((callchain: FileCallChain) => { + list.forEach((callchain: FileCallChain): void => { if (callChainsMap.has(callchain.callChainId)) { callChainsMap.get(callchain.callChainId)!.push(callchain); } else { @@ -528,6 +531,8 @@ class FileSystemCallTreeHandler { splitMapData: any = {}; searchValue: string = ''; currentEventId: string = ''; + isHideThread: boolean = false; + isHideEvent: boolean = false; queryData = (eventId: string, action: string, sql: string, args: any) => {}; constructor(type: string, queryData: any) { @@ -535,7 +540,7 @@ class FileSystemCallTreeHandler { this.queryData = queryData; } - clear() { + clear(): void { this.allProcess.length = 0; this.dataSource.length = 0; this.currentTreeList.length = 0; @@ -543,10 +548,10 @@ class FileSystemCallTreeHandler { this.splitMapData = {}; } - setEventId(eventId: string) { + setEventId(eventId: string): void { this.currentEventId = eventId; } - queryCallChainsSamples(selectionParam: any) { + queryCallChainsSamples(selectionParam: any): void { switch (this.currentDataType) { case 'fileSystem': this.queryFileSamples(selectionParam); @@ -560,9 +565,9 @@ class FileSystemCallTreeHandler { } } - queryFileSamples(selectionParam: any) { + queryFileSamples(selectionParam: any): void { let sql = ''; - if (selectionParam.fileSystemType != undefined && selectionParam.fileSystemType.length > 0) { + if (selectionParam.fileSystemType !== undefined && selectionParam.fileSystemType.length > 0) { sql += ' and s.type in ('; sql += selectionParam.fileSystemType.join(','); sql += ')'; @@ -570,7 +575,7 @@ class FileSystemCallTreeHandler { if ( selectionParam.diskIOipids.length > 0 && !selectionParam.diskIOLatency && - selectionParam.fileSystemType.length == 0 + selectionParam.fileSystemType.length === 0 ) { sql += ` and s.ipid in (${selectionParam.diskIOipids.join(',')})`; } @@ -588,7 +593,7 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} ); } - queryIOSamples(selectionParam: any) { + queryIOSamples(selectionParam: any): void { let sql = ''; const types: number[] = []; if (selectionParam.diskIOReadIds.length > 0) { @@ -616,7 +621,7 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} ); } - queryPageFaultSamples(selectionParam: any) { + queryPageFaultSamples(selectionParam: any): void { let sql = ''; if ( selectionParam.diskIOipids.length > 0 && @@ -639,24 +644,24 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} ); } - freshCurrentCallChains(samples: FileSample[], isTopDown: boolean) { + freshCurrentCallChains(samples: FileSample[], isTopDown: boolean): void { this.currentTreeMapData = {}; this.currentTreeList = []; this.allProcess = []; this.dataSource = []; let totalCount = 0; - samples.forEach((sample) => { + samples.forEach((sample: FileSample): void => { totalCount += sample.dur; let callChains = this.createThreadAndType(sample); - if (callChains.length == 2) { + if (callChains.length === 2) { return; } let topIndex = isTopDown ? 0 : callChains.length - 1; if (callChains.length > 1) { let root = this.currentTreeMapData[callChains[topIndex].symbolsId + '' + callChains[topIndex].pathId + sample.pid]; - if (root == undefined) { + if (root === undefined) { root = new FileMerageBean(); this.currentTreeMapData[callChains[topIndex].symbolsId + '' + callChains[topIndex].pathId + sample.pid] = root; @@ -668,8 +673,8 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} }); let rootMerageMap: any = {}; // @ts-ignore - Object.values(this.currentTreeMapData).forEach((merageData: any) => { - if (rootMerageMap[merageData.pid] == undefined) { + Object.values(this.currentTreeMapData).forEach((merageData: any): void => { + if (rootMerageMap[merageData.pid] === undefined) { let fileMerageBean = new FileMerageBean(); //新增进程的节点数据 fileMerageBean.canCharge = false; fileMerageBean.symbolName = merageData.processName; @@ -698,15 +703,15 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} merageData.parentNode = rootMerageMap[merageData.pid]; //子节点添加父节点的引用 }); let id = 0; - this.currentTreeList.forEach((currentNode) => { + this.currentTreeList.forEach((currentNode: any): void => { currentNode.total = totalCount; this.setMerageName(currentNode); - if (currentNode.id == '') { + if (currentNode.id === '') { currentNode.id = id + ''; id++; } if (currentNode.parentNode) { - if (currentNode.parentNode.id == '') { + if (currentNode.parentNode.id === '') { currentNode.parentNode.id = id + ''; id++; } @@ -717,11 +722,11 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} this.allProcess = Object.values(rootMerageMap); } - createThreadAndType(sample: FileSample) { + createThreadAndType(sample: FileSample): FileCallChain[] { let typeCallChain = new FileCallChain(); typeCallChain.callChainId = sample.callChainId; let map: any = {}; - if (this.currentDataType == 'fileSystem') { + if (this.currentDataType === 'fileSystem') { map = FILE_TYPE_MAP; } else if (this.currentDataType === 'io') { map = DISKIO_TYPE_MAP; @@ -737,8 +742,16 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} threadCallChain.ip = (sample.threadName || 'Thread') + `-${sample.tid}`; threadCallChain.symbolsId = sample.tid; threadCallChain.pathId = -1; + let list: FileCallChain[] = []; const eBpfCallChainsMap = DataCache.getInstance().eBpfCallChainsMap; - return [typeCallChain, threadCallChain, ...(eBpfCallChainsMap.get(sample.callChainId) || [])]; + if (!this.isHideEvent) { + list.push(typeCallChain); + } + if (!this.isHideThread) { + list.push(threadCallChain); + } + list.push(...(eBpfCallChainsMap.get(sample.callChainId) || [])); + return list; } merageChildrenByIndex( @@ -747,24 +760,24 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} index: number, sample: FileSample, isTopDown: boolean - ) { + ): void { isTopDown ? index++ : index--; - let isEnd = isTopDown ? callChainDataList.length == index + 1 : index == 0; + let isEnd = isTopDown ? callChainDataList.length === index + 1 : index === 0; let node: FileMerageBean; if ( currentNode.initChildren.filter((child: any) => { if ( - child.ip == callChainDataList[index]?.ip || - (child.symbolsId != null && - child.symbolsId == callChainDataList[index]?.symbolsId && - child.pathId == callChainDataList[index]?.pathId) + child.ip === callChainDataList[index]?.ip || + (child.symbolsId !== null && + child.symbolsId === callChainDataList[index]?.symbolsId && + child.pathId === callChainDataList[index]?.pathId) ) { node = child; FileMerageBean.merageCallChainSample(child, callChainDataList[index], sample, isEnd); return true; } return false; - }).length == 0 + }).length === 0 ) { node = new FileMerageBean(); FileMerageBean.merageCallChainSample(node, callChainDataList[index], sample, isEnd); @@ -776,8 +789,8 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} if (node! && !isEnd) this.merageChildrenByIndex(node, callChainDataList, index, sample, isTopDown); } - setMerageName(currentNode: FileMerageBean) { - if (currentNode.pathId == -1) { + setMerageName(currentNode: FileMerageBean): void { + if (currentNode.pathId === -1) { currentNode.canCharge = false; currentNode.symbol = currentNode.ip; currentNode.symbolName = currentNode.symbol; @@ -793,9 +806,9 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} currentNode.symbolName = `${currentNode.symbol} (${currentNode.libName})`; } } - resolvingAction(params: any[]) { + resolvingAction(params: any[]): FileMerageBean[] { if (params.length > 0) { - params.forEach((paramItem) => { + params.forEach((paramItem: any): void => { if (paramItem.funcName && paramItem.funcArgs) { switch (paramItem.funcName) { case 'getCallChainsBySampleIds': @@ -815,6 +828,12 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} paramItem.funcArgs[1] ); break; + case 'hideThread': + this.isHideThread = paramItem.funcArgs[0]; + break; + case 'hideEvent': + this.isHideEvent = paramItem.funcArgs[0]; + break; case 'splitAllProcess': merageBeanDataSplit.splitAllProcess(this.allProcess, this.splitMapData, paramItem.funcArgs[0]); break; @@ -844,7 +863,7 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} } } }); - this.dataSource = this.allProcess.filter((process) => { + this.dataSource = this.allProcess.filter((process: FileMerageBean): boolean => { return process.children && process.children.length > 0; }); } @@ -863,7 +882,7 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} this.currentDataType = ''; } - clearSplitMapData(symbolName: string) { + clearSplitMapData(symbolName: string): void { delete this.splitMapData[symbolName]; } } @@ -909,13 +928,13 @@ export class FileMerageBean extends MerageBean { sample: FileSample, isEnd: boolean ) { - if (currentNode.processName == '') { + if (currentNode.processName === '') { currentNode.ip = callChain.ip; currentNode.pid = sample.pid; currentNode.canCharge = true; currentNode.pathId = callChain.pathId; currentNode.symbolsId = callChain.symbolsId; - currentNode.processName = sample.processName || `Process(${sample.pid})`; + currentNode.processName = `${sample.processName || 'Process'} ${sample.pid})`; } if (isEnd) { currentNode.selfDur += sample.dur; diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts index 5adc2d8c6..2475f2fea 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts @@ -48,6 +48,8 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { clearBoxSelectionData: boolean = false; nativeMemoryArgs?: Map; private dataCache = DataCache.getInstance(); + isHideThread: boolean = false; + private currentSelectIPid : number = 1; handle(data: any): void { this.currentEventId = data.id; @@ -221,11 +223,16 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { this.queryNativeHookStatistic(data.params.type); } break; + case 'native-memory-reset': + this.isHideThread = false; + break; + case 'native-memory-set-current_ipid': + this.currentSelectIPid = data.params; } } } - initNMChartData() { + initNMChartData(): void { this.queryData( this.currentEventId, 'native-memory-queryNMChartData', @@ -234,7 +241,8 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { select h.start_ts - t.start_ts as startTime, h.heap_size as heapSize, - (case when h.event_type = 'AllocEvent' then 0 else 1 end) as eventType + (case when h.event_type = 'AllocEvent' then 0 else 1 end) as eventType, + ipid from native_hook h ,trace_range t where h.start_ts between t.start_ts and t.end_ts and (h.event_type = 'AllocEvent' or h.event_type = 'MmapEvent') @@ -242,7 +250,8 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { select h.end_ts - t.start_ts as startTime, h.heap_size as heapSize, - (case when h.event_type = 'AllocEvent' then 2 else 3 end) as eventType + (case when h.event_type = 'AllocEvent' then 2 else 3 end) as eventType, + ipid from native_hook h ,trace_range t where h.start_ts between t.start_ts and t.end_ts @@ -264,15 +273,15 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { } else { condition = ''; } - let sql = ` -select callchain_id callchainId, + let sql = `select callchain_id callchainId, ts - start_ts as ts, apply_count applyCount, apply_size applySize, release_count releaseCount, release_size releaseSize -from native_hook_statistic,trace_range -where ts between start_ts and end_ts ${condition}; + from native_hook_statistic,trace_range + where ts between start_ts and end_ts ${condition} + and ipid = ${this.currentSelectIPid}; `; this.queryData(this.currentEventId, 'native-memory-queryNativeHookStatistic', sql, {}); } @@ -281,7 +290,7 @@ where ts between start_ts and end_ts ${condition}; let condition = types.length === 1 ? `and A.event_type = ${types[0]}` - : `and (A.event_type = 'AllocEvent' or A.event_type = 'MmapEvent')`; + : "and (A.event_type = 'AllocEvent' or A.event_type = 'MmapEvent')"; let libId = this.nativeMemoryArgs?.get('filterResponseType'); let allocType = this.nativeMemoryArgs?.get('filterAllocType'); let eventType = this.nativeMemoryArgs?.get('filterEventType'); @@ -321,6 +330,7 @@ where ts between start_ts and end_ts ${condition}; A.itid = t.id where A.start_ts - B.start_ts between ${leftNs} and ${rightNs} ${condition} + and A.ipid = ${this.currentSelectIPid} `; this.queryData(this.currentEventId, 'native-memory-queryNativeHookEvent', sql, {}); } @@ -335,7 +345,7 @@ where ts between start_ts and end_ts ${condition}; } } - fillNativeHook(memory: NativeMemory, index: number) { + fillNativeHook(memory: NativeMemory, index: number): void { if (memory.subTypeId !== null && memory.subType === undefined) { memory.subType = this.dataCache.dataDict.get(memory.subTypeId) || '-'; } @@ -343,7 +353,7 @@ where ts between start_ts and end_ts ${condition}; let arr = this.dataCache.nmHeapFrameMap.get(memory.eventId) || []; let frame = Array.from(arr) .reverse() - .find((item) => { + .find((item: HeapTreeDataBean): boolean => { let fileName = this.dataCache.dataDict.get(item.fileId); return !((fileName ?? '').includes('libc++') || (fileName ?? '').includes('musl')); }); @@ -361,7 +371,12 @@ where ts between start_ts and end_ts ${condition}; } } - statisticDataHandler(arr: Array) { + statisticDataHandler(arr: Array): { + startTime: number; + heapsize: number; + density: number; + dur: number; + }[] { let callGroupMap: Map = new Map(); let obj = {}; for (let hook of arr) { @@ -413,13 +428,18 @@ where ts between start_ts and end_ts ${condition}; density: number; dur: number; }[] - ) { + ): { + startTime: number; + heapsize: number; + density: number; + dur: number; + }[] { let maxSize = 0, maxDensity = 0, minSize = 0, minDensity = 0; for (let i = 0, len = arr.length; i < len; i++) { - if (i == len - 1) { + if (i === len - 1) { arr[i].dur = this.totalNS - arr[i].startTime; } else { arr[i + 1].heapsize = arr[i].heapsize + arr[i + 1].heapsize; @@ -439,15 +459,15 @@ where ts between start_ts and end_ts ${condition}; return it; }); } - initResponseTypeList(list: any[]) { + initResponseTypeList(list: any[]): void { this.responseTypes = [ { key: -1, value: 'ALL', }, ]; - list.forEach((item) => { - if (item.lastLibId == null) { + list.forEach((item: any): void => { + if (item.lastLibId === null) { this.responseTypes.push({ key: 0, value: '-', @@ -460,7 +480,7 @@ where ts between start_ts and end_ts ${condition}; } }); } - initNMFrameData() { + initNMFrameData(): void { this.queryData( this.currentEventId, 'native-memory-queryNMFrameData', @@ -471,8 +491,8 @@ where ts between start_ts and end_ts ${condition}; {} ); } - initNMStack(frameArr: Array) { - frameArr.map((frame) => { + initNMStack(frameArr: Array): void { + frameArr.map((frame): void => { let frameEventId = frame.eventId; if (this.dataCache.nmHeapFrameMap.has(frameEventId)) { this.dataCache.nmHeapFrameMap.get(frameEventId)!.push(frame); @@ -501,20 +521,21 @@ where ts between start_ts and end_ts ${condition}; resolvingActionNativeMemoryChartData(paramMap: Map): Array { let nativeMemoryType: number = paramMap.get('nativeMemoryType') as number; let totalNS: number = paramMap.get('totalNS') as number; + let currentIPid = paramMap.get('ipid') as number; let arr: Array = []; - let nmMaxSize = 0; - let nmMaxDensity = 0; - let nmMinSize = 0; - let nmMinDensity = 0; - let nmTempSize = 0; - let nmTempDensity = 0; - let nmFilterLen = 0; - let nmFilterLevel = 0; - let putArr = (ne: NativeEvent, filterLevel: number, finish: boolean) => { + let nmMaxSize: number = 0; + let nmMaxDensity: number = 0; + let nmMinSize: number = 0; + let nmMinDensity: number = 0; + let nmTempSize: number = 0; + let nmTempDensity: number = 0; + let nmFilterLen: number = 0; + let nmFilterLevel: number = 0; + let putArr = (ne: NativeEvent, filterLevel: number, finish: boolean): void => { let nmHeapStruct = new HeapStruct(); nmHeapStruct.startTime = ne.startTime; - if (arr.length == 0) { - if (ne.eventType == 0 || ne.eventType == 1) { + if (arr.length === 0) { + if (ne.eventType === 0 || ne.eventType === 1) { nmHeapStruct.density = 1; nmHeapStruct.heapsize = ne.heapSize; } else { @@ -530,7 +551,7 @@ where ts between start_ts and end_ts ${condition}; let last = arr[arr.length - 1]; last.dur = nmHeapStruct.startTime! - last.startTime!; if (last.dur > filterLevel || finish) { - if (ne.eventType == 0 || ne.eventType == 1) { + if (ne.eventType === 0 || ne.eventType === 1) { nmHeapStruct.density = last.density! + nmTempDensity + 1; nmHeapStruct.heapsize = last.heapsize! + nmTempSize + ne.heapSize; } else { @@ -553,7 +574,7 @@ where ts between start_ts and end_ts ${condition}; } arr.push(nmHeapStruct); } else { - if (ne.eventType == 0 || ne.eventType == 1) { + if (ne.eventType === 0 || ne.eventType === 1) { nmTempDensity = nmTempDensity + 1; nmTempSize = nmTempSize + ne.heapSize; } else { @@ -563,43 +584,41 @@ where ts between start_ts and end_ts ${condition}; } } }; - if (nativeMemoryType == 1) { - let temp = this.NATIVE_MEMORY_DATA.filter((ne) => ne.eventType === 0 || ne.eventType === 2); + const currentPidData = this.NATIVE_MEMORY_DATA.filter((ne: NativeEvent): boolean => ne.ipid === currentIPid); + if (nativeMemoryType === 1) { + let temp = currentPidData.filter((ne: NativeEvent): boolean => ne.eventType === 0 || ne.eventType === 2); nmFilterLen = temp.length; nmFilterLevel = this.getFilterLevel(nmFilterLen); - temp.map((ne, index) => putArr(ne, nmFilterLevel, index === nmFilterLen - 1)); + temp.map((ne: NativeEvent, index: number): void => putArr(ne, nmFilterLevel, index === nmFilterLen - 1)); temp.length = 0; - } else if (nativeMemoryType == 2) { - let temp = this.NATIVE_MEMORY_DATA.filter((ne) => ne.eventType === 1 || ne.eventType === 3); + } else if (nativeMemoryType === 2) { + let temp = currentPidData.filter((ne: NativeEvent): boolean => ne.eventType === 1 || ne.eventType === 3); nmFilterLen = temp.length; nmFilterLevel = this.getFilterLevel(nmFilterLen); - temp.map((ne, index) => putArr(ne, nmFilterLevel, index === nmFilterLen - 1)); + temp.map((ne: NativeEvent, index: number): void => putArr(ne, nmFilterLevel, index === nmFilterLen - 1)); temp.length = 0; } else { - nmFilterLen = this.NATIVE_MEMORY_DATA.length; + nmFilterLen = currentPidData.length; let filterLevel = this.getFilterLevel(nmFilterLen); - this.NATIVE_MEMORY_DATA.map((ne, index) => putArr(ne, filterLevel, index === nmFilterLen - 1)); + currentPidData.map((ne, index) => putArr(ne, filterLevel, index === nmFilterLen - 1)); } if (arr.length > 0) { arr[arr.length - 1].dur = totalNS - arr[arr.length - 1].startTime!; } - arr.map((heapStruct) => { + arr.map((heapStruct: HeapStruct): void => { heapStruct.maxHeapSize = nmMaxSize; heapStruct.maxDensity = nmMaxDensity; heapStruct.minHeapSize = nmMinSize; heapStruct.minDensity = nmMinDensity; }); this.chartComplete.set(nativeMemoryType, true); - if (this.chartComplete.has(0) && this.chartComplete.has(1) && this.chartComplete.has(2)) { - this.NATIVE_MEMORY_DATA = []; - } return arr; } - resolvingActionNativeMemoryStack(paramMap: Map) { + resolvingActionNativeMemoryStack(paramMap: Map): NativeHookCallInfo[] { let eventId = paramMap.get('eventId'); let frameArr = this.dataCache.nmHeapFrameMap.get(eventId) || []; let arr: Array = []; - frameArr.map((frame) => { + frameArr.map((frame: HeapTreeDataBean): void => { let target = new NativeHookCallInfo(); target.eventId = frame.eventId; target.depth = frame.depth; @@ -629,16 +648,16 @@ where ts between start_ts and end_ts ${condition}; (filterEventType !== undefined && filterEventType !== 0) || (filterResponseType !== undefined && filterResponseType !== -1) ) { - filter = this.boxRangeNativeHook.filter((item) => { + filter = this.boxRangeNativeHook.filter((item: NativeMemory): boolean => { let filterAllocation = true; let freed = item.endTs > leftNs && item.endTs <= rightNs && item.endTs !== 0 && item.endTs !== null; if (filterAllocType === '1') { filterAllocation = !freed; - } else if (filterAllocType == '2') { + } else if (filterAllocType === '2') { filterAllocation = freed; } let filterNative = this.getTypeFromIndex(parseInt(filterEventType), item, statisticsSelection); - let filterLastLib = filterResponseType == -1 ? true : filterResponseType == item.lastLibId; + let filterLastLib = filterResponseType === -1 ? true : filterResponseType === item.lastLibId; return filterAllocation && filterNative && filterLastLib; }); } @@ -653,7 +672,7 @@ where ts between start_ts and end_ts ${condition}; if (nmMemorySort === 0) { return list; } else { - return list.sort((memoryLeftData: any, memoryRightData: any) => { + return list.sort((memoryLeftData: any, memoryRightData: any): number => { if (nmMemoryColumn === 'index' || nmMemoryColumn === 'startTs' || nmMemoryColumn === 'heapSize') { return nmMemorySort === 1 ? memoryLeftData[nmMemoryColumn] - memoryRightData[nmMemoryColumn] @@ -690,10 +709,10 @@ where ts between start_ts and end_ts ${condition}; this.dataCache.nmFileDict.set(fileId, currentPath); name = currentPath; } - return name == '' ? '-' : name; + return name === '' ? '-' : name; } - traverseSampleTree(stack: NativeHookCallInfo, hook: NativeHookStatistics) { + traverseSampleTree(stack: NativeHookCallInfo, hook: NativeHookStatistics): void { stack.count += 1; stack.countValue = `${stack.count}`; stack.countPercent = `${((stack.count / this.selectTotalCount) * 100).toFixed(1)}%`; @@ -705,12 +724,12 @@ where ts between start_ts and end_ts ${condition}; stack.countArray.push(...(hook.countArray || hook.count)); stack.tsArray.push(...(hook.tsArray || hook.startTs)); if (stack.children.length > 0) { - stack.children.map((child) => { + stack.children.map((child: MerageBean): void => { this.traverseSampleTree(child as NativeHookCallInfo, hook); }); } } - traverseTree(stack: NativeHookCallInfo, hook: NativeHookStatistics) { + traverseTree(stack: NativeHookCallInfo, hook: NativeHookStatistics): void { stack.count = 1; stack.countValue = `${stack.count}`; stack.countPercent = `${((stack!.count / this.selectTotalCount) * 100).toFixed(1)}%`; @@ -732,26 +751,26 @@ where ts between start_ts and end_ts ${condition}; item: NativeHookStatistics | NativeMemory, statisticsSelection: Array ): boolean { - if (indexOf == -1) { + if (indexOf === -1) { return false; } if (indexOf < 3) { - if (indexOf == 0) { + if (indexOf === 0) { return true; - } else if (indexOf == 1) { - return item.eventType == 'AllocEvent'; - } else if (indexOf == 2) { - return item.eventType == 'MmapEvent'; + } else if (indexOf === 1) { + return item.eventType === 'AllocEvent'; + } else if (indexOf === 2) { + return item.eventType === 'MmapEvent'; } } else if (indexOf - 3 < statisticsSelection.length) { let selectionElement = statisticsSelection[indexOf - 3]; - if (selectionElement.memoryTap != undefined && selectionElement.max != undefined) { - if (selectionElement.memoryTap.indexOf('Malloc') != -1) { - return item.eventType == 'AllocEvent' && item.heapSize == selectionElement.max; - } else if (selectionElement.memoryTap.indexOf('Mmap') != -1) { - return item.eventType == 'MmapEvent' && item.heapSize == selectionElement.max && item.subTypeId === null; + if (selectionElement.memoryTap !== undefined && selectionElement.max !== undefined) { + if (selectionElement.memoryTap.indexOf('Malloc') !== -1) { + return item.eventType === 'AllocEvent' && item.heapSize === selectionElement.max; + } else if (selectionElement.memoryTap.indexOf('Mmap') !== -1) { + return item.eventType === 'MmapEvent' && item.heapSize === selectionElement.max && item.subTypeId === null; } else { - return item.subType == selectionElement.memoryTap; + return item.subType === selectionElement.memoryTap; } } if (selectionElement.max === undefined && typeof selectionElement.memoryTap === 'number') { @@ -760,7 +779,7 @@ where ts between start_ts and end_ts ${condition}; } return false; } - clearAll() { + clearAll(): void { this.dataCache.clearNM(); this.splitMapData = {}; this.currentSamples = []; @@ -774,9 +793,10 @@ where ts between start_ts and end_ts ${condition}; this.responseTypes.length = 0; this.boxRangeNativeHook = []; this.nativeMemoryArgs?.clear(); + this.isHideThread = false; } - queryCallchainsSamples(action: string, leftNs: number, rightNs: number, types: Array) { + queryCallchainsSamples(action: string, leftNs: number, rightNs: number, types: Array): void { this.queryData( this.currentEventId, action, @@ -802,11 +822,12 @@ where ts between start_ts and end_ts ${condition}; where A.start_ts - B.start_ts between ${leftNs} and ${rightNs} and A.event_type in (${types.join(',')}) + and A.ipid = ${this.currentSelectIPid} `, {} ); } - queryStatisticCallchainsSamples(action: string, leftNs: number, rightNs: number, types: Array) { + queryStatisticCallchainsSamples(action: string, leftNs: number, rightNs: number, types: Array): void { let condition = ''; if (types.length === 1) { if (types[0] === 0) { @@ -837,6 +858,7 @@ where ts between start_ts and end_ts ${condition}; A.ts - B.start_ts between ${leftNs} and ${rightNs} ${condition} + and A.ipid = ${this.currentSelectIPid} group by callchain_id; `, {} @@ -943,7 +965,7 @@ where ts between start_ts and end_ts ${condition}; return analysisSampleList; } - setApplyIsRelease(sample: AnalysisSample, arr: Array) { + setApplyIsRelease(sample: AnalysisSample, arr: Array): void { let idx = arr.length - 1; for (idx; idx >= 0; idx--) { let item = arr[idx]; @@ -955,13 +977,13 @@ where ts between start_ts and end_ts ${condition}; } } - freshCurrentCallchains(samples: NativeHookStatistics[], isTopDown: boolean) { + freshCurrentCallchains(samples: NativeHookStatistics[], isTopDown: boolean): void { this.currentTreeMapData = {}; this.currentTreeList = []; let totalSize = 0; let totalCount = 0; - samples.forEach((nativeHookSample) => { - if (nativeHookSample.eventId == -1) { + samples.forEach((nativeHookSample: NativeHookStatistics): void => { + if (nativeHookSample.eventId === -1) { return; } totalSize += nativeHookSample.heapSize; @@ -977,7 +999,7 @@ where ts between start_ts and end_ts ${condition}; '-' + (callChains[topIndex].fileId || '') ]; - if (root == undefined) { + if (root === undefined) { root = new NativeHookCallInfo(); root.threadName = nativeHookSample.threadName; this.currentTreeMapData[ @@ -998,8 +1020,14 @@ where ts between start_ts and end_ts ${condition}; let rootMerageMap: any = {}; // @ts-ignore let threads = Object.values(this.currentTreeMapData); - threads.forEach((merageData: any) => { - if (rootMerageMap[merageData.tid] == undefined) { + + // 不隐藏时走这里 + threads.forEach((merageData: any): void => { + if (this.isHideThread) { + merageData.tid = 0; + merageData.threadName = undefined; + } + if (rootMerageMap[merageData.tid] === undefined) { let threadMerageData = new NativeHookCallInfo(); //新增进程的节点数据 threadMerageData.canCharge = false; threadMerageData.type = -1; @@ -1030,27 +1058,27 @@ where ts between start_ts and end_ts ${condition}; } merageData.parentNode = rootMerageMap[merageData.tid]; //子节点添加父节点的引用 }); + let id = 0; - this.currentTreeList.forEach((nmTreeNode) => { + this.currentTreeList.forEach((nmTreeNode: any): void => { nmTreeNode.totalCount = totalCount; nmTreeNode.totalSize = totalSize; this.setMerageName(nmTreeNode); - if (nmTreeNode.id == '') { + if (nmTreeNode.id === '') { nmTreeNode.id = id + ''; id++; } if (nmTreeNode.parentNode) { - if (nmTreeNode.parentNode.id == '') { + if (nmTreeNode.parentNode.id === '') { nmTreeNode.parentNode.id = id + ''; id++; } nmTreeNode.parentId = nmTreeNode.parentNode.id; } }); - // @ts-ignore this.allThreads = Object.values(rootMerageMap) as NativeHookCallInfo[]; } - groupCallchainSample(paramMap: Map) { + groupCallchainSample(paramMap: Map): void { let groupMap: any = {}; let filterAllocType = paramMap.get('filterAllocType'); let filterEventType = paramMap.get('filterEventType'); @@ -1060,19 +1088,19 @@ where ts between start_ts and end_ts ${condition}; let rightNs = paramMap.get('rightNs'); let nativeHookType = paramMap.get('nativeHookType'); let statisticsSelection = paramMap.get('statisticsSelection'); - if (!libTree && filterAllocType == '0' && filterEventType == '0' && filterResponseType == -1) { + if (!libTree && filterAllocType === '0' && filterEventType === '0' && filterResponseType === -1) { this.currentSamples = this.queryAllCallchainsSamples; return; } - let filter = this.queryAllCallchainsSamples.filter((item) => { + let filter = this.queryAllCallchainsSamples.filter((item: NativeHookStatistics): boolean => { let filterAllocation = true; if (nativeHookType === 'native-hook') { - if (filterAllocType == '1') { + if (filterAllocType === '1') { filterAllocation = item.startTs >= leftNs && item.startTs <= rightNs && - (item.endTs > rightNs || item.endTs == 0 || item.endTs == null); - } else if (filterAllocType == '2') { + (item.endTs > rightNs || item.endTs === 0 || item.endTs === null); + } else if (filterAllocType === '2') { filterAllocation = item.startTs >= leftNs && item.startTs <= rightNs && @@ -1081,7 +1109,7 @@ where ts between start_ts and end_ts ${condition}; item.endTs != null; } } else { - if (filterAllocType == '1') { + if (filterAllocType === '1') { filterAllocation = item.heapSize > item.freeSize; } else if (filterAllocType == '2') { filterAllocation = item.heapSize === item.freeSize; @@ -1092,17 +1120,17 @@ where ts between start_ts and end_ts ${condition}; filterLastLib = this.filterExpressionSample(item, libTree); this.searchValue = ''; } else { - filterLastLib = filterResponseType == -1 ? true : filterResponseType == item.lastLibId; + filterLastLib = filterResponseType === -1 ? true : filterResponseType === item.lastLibId; } let filterNative = this.getTypeFromIndex(parseInt(filterEventType), item, statisticsSelection); return filterAllocation && filterNative && filterLastLib; }); - filter.forEach((sample) => { + filter.forEach((sample: NativeHookStatistics): void => { let currentNode = groupMap[sample.tid + '-' + sample.eventId] || new NativeHookStatistics(); - if (currentNode.count == 0) { + if (currentNode.count === 0) { Object.assign(currentNode, sample); - if (filterAllocType == '1' && nativeHookType !== 'native-hook') { + if (filterAllocType === '1' && nativeHookType !== 'native-hook') { currentNode.heapSize = sample.heapSize - sample.freeSize; currentNode.count = sample.count - sample.freeCount; } @@ -1130,7 +1158,7 @@ where ts between start_ts and end_ts ${condition}; return false; } - function isMatch(libTree: Map, match: boolean) { + function isMatch(libTree: Map, match: boolean): boolean { for (const [lib, symbols] of libTree) { // lib不包含则跳过 if (!itemLibName!.toLowerCase().includes(lib.toLowerCase()) && lib !== '*') { @@ -1172,7 +1200,7 @@ where ts between start_ts and end_ts ${condition}; return includeMatch && !abandonMatch; } - createThreadSample(sample: NativeHookStatistics) { + createThreadSample(sample: NativeHookStatistics): HeapTreeDataBean[] { return this.dataCache.nmHeapFrameMap.get(sample.eventId) || []; } merageChildrenByIndex( @@ -1181,19 +1209,22 @@ where ts between start_ts and end_ts ${condition}; index: number, sample: NativeHookStatistics, isTopDown: boolean - ) { + ): void { isTopDown ? index++ : index--; - let isEnd = isTopDown ? callChainDataList.length == index + 1 : index == 0; + let isEnd = isTopDown ? callChainDataList.length === index + 1 : index === 0; let node: NativeHookCallInfo; if ( - currentNode.initChildren.filter((child: any) => { - if (child.symbolId == callChainDataList[index]?.symbolId && child.fileId == callChainDataList[index]?.fileId) { + currentNode.initChildren.filter((child: any): boolean => { + if ( + child.symbolId === callChainDataList[index]?.symbolId && + child.fileId === callChainDataList[index]?.fileId + ) { node = child; NativeHookCallInfo.merageCallChainSample(child, callChainDataList[index], sample); return true; } return false; - }).length == 0 + }).length === 0 ) { node = new NativeHookCallInfo(); NativeHookCallInfo.merageCallChainSample(node, callChainDataList[index], sample); @@ -1202,9 +1233,11 @@ where ts between start_ts and end_ts ${condition}; this.currentTreeList.push(node); node.parentNode = currentNode; } - if (node! && !isEnd) this.merageChildrenByIndex(node, callChainDataList, index, sample, isTopDown); + if (node! && !isEnd) { + this.merageChildrenByIndex(node, callChainDataList, index, sample, isTopDown); + } } - setMerageName(currentNode: NativeHookCallInfo) { + setMerageName(currentNode: NativeHookCallInfo): void { currentNode.symbol = this.groupCutFilePath(currentNode.symbolId, this.dataCache.dataDict.get(currentNode.symbolId) || '') ?? 'unknown'; currentNode.path = this.dataCache.dataDict.get(currentNode.fileId) || 'unknown'; @@ -1218,14 +1251,17 @@ where ts between start_ts and end_ts ${condition}; ? 0 : 1; } - clearSplitMapData(symbolName: string) { + clearSplitMapData(symbolName: string): void { delete this.splitMapData[symbolName]; } - resolvingNMCallAction(params: any[]) { + resolvingNMCallAction(params: any[]): NativeHookCallInfo[] { if (params.length > 0) { - params.forEach((item) => { + params.forEach((item: any): void => { if (item.funcName && item.funcArgs) { switch (item.funcName) { + case 'hideThread': + this.isHideThread = item.funcArgs[0]; + break; case 'groupCallchainSample': this.groupCallchainSample(item.funcArgs[0] as Map); break; @@ -1273,7 +1309,7 @@ where ts between start_ts and end_ts ${condition}; } }); } - return this.allThreads.filter((thread) => { + return this.allThreads.filter((thread: NativeHookCallInfo): boolean => { return thread.children && thread.children.length > 0; }); } @@ -1340,11 +1376,11 @@ export class NativeHookCallInfo extends MerageBean { isSelected: boolean = false; set totalCount(total: number) { this.#totalCount = total; - this.countValue = this.count + ''; + this.countValue = `${this.count}`; this.size = this.heapSize; this.countPercent = `${((this.count / total) * 100).toFixed(1)}%`; } - get totalCount() { + get totalCount(): number { return this.#totalCount; } set totalSize(total: number) { @@ -1352,15 +1388,15 @@ export class NativeHookCallInfo extends MerageBean { this.heapSizeStr = `${getByteWithUnit(this.heapSize)}`; this.heapPercent = `${((this.heapSize / total) * 100).toFixed(1)}%`; } - get totalSize() { + get totalSize(): number { return this.#totalSize; } static merageCallChainSample( currentNode: NativeHookCallInfo, callChain: HeapTreeDataBean, sample: NativeHookStatistics - ) { - if (currentNode.symbol == undefined || currentNode.symbol == '') { + ): void { + if (currentNode.symbol === undefined || currentNode.symbol === '') { currentNode.symbol = callChain.AllocationFunction || ''; currentNode.addr = callChain.addr; currentNode.eventId = sample.eventId; @@ -1417,6 +1453,7 @@ export class NativeEvent { startTime: number = 0; heapSize: number = 0; eventType: number = 0; + ipid: number = -1; } export class StatisticsSelection { memoryTap: string = ''; diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts index 751466878..74d6614bb 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts @@ -16,9 +16,9 @@ import { LogicHandler, ChartStruct, convertJSON, DataCache, PerfCall } from './ProcedureLogicWorkerCommon.js'; import { PerfBottomUpStruct } from '../../bean/PerfBottomUpStruct.js'; -const systemRuleName = '/system/'; -const numRuleName = '/max/min/'; -const maxDepth = 128; +const systemRuleName: string = '/system/'; +const numRuleName: string = '/max/min/'; +const maxDepth: number = 128; export class ProcedureLogicWorkerPerf extends LogicHandler { filesData: any = {}; @@ -36,6 +36,10 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { currentEventId: string = ''; isAnalysis: boolean = false; isPerfBottomUp: boolean = false; + isHideThread: boolean = false; + isHideThreadState: boolean = false; + processMap = new Map(); + threadMap = new Map(); eventTypeId?: string = ''; private dataCache = DataCache.getInstance(); @@ -59,7 +63,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { break; case 'perf-queryPerfThread': let threads = convertJSON(data.params.list) || []; - threads.forEach((thread: any) => { + threads.forEach((thread: any): void => { this.threadData[thread.tid] = thread; }); this.initPerfCalls(); @@ -67,7 +71,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { case 'perf-queryPerfCalls': let perfCalls = convertJSON(data.params.list) || []; if (perfCalls.length !== 0) { - perfCalls.forEach((perfCall: any) => { + perfCalls.forEach((perfCall: any): void => { this.dataCache.perfCallChainMap.set(perfCall.sampleId, perfCall); }); } @@ -116,8 +120,8 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { break; case 'perf-action': if (data.params) { - let filter = data.params.filter((item: any) => item.funcName == 'getCurrentDataFromDb'); - if (filter.length == 0) { + let filter = data.params.filter((item: any): boolean => item.funcName === 'getCurrentDataFromDb'); + if (filter.length === 0) { // @ts-ignore self.postMessage({ id: data.id, @@ -129,11 +133,14 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } break; + case 'perf-reset': + this.isHideThread = false; + this.isHideThreadState = false; } } } - initPerfFiles() { + initPerfFiles(): void { this.clearAll(); this.queryData( this.currentEventId, @@ -144,7 +151,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { ); } - initPerfThreads() { + initPerfThreads(): void { this.queryData( this.currentEventId, 'perf-queryPerfThread', @@ -155,7 +162,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { ); } - initPerfCalls() { + initPerfCalls(): void { this.queryData( this.currentEventId, 'perf-queryPerfCalls', @@ -167,7 +174,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { ); } - initPerfCallchains() { + initPerfCallchains(): void { this.queryData( this.currentEventId, 'perf-queryPerfCallchains', @@ -226,7 +233,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { ); } - clearAll() { + clearAll(): void { this.filesData = {}; this.samplesData = {}; this.threadData = {}; @@ -241,25 +248,25 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.eventTypeId = undefined; } - initPerfCallChainBottomUp(callChains: PerfCallChain[]) { - callChains.forEach((callChain, index) => { - if (this.threadData[callChain.tid] == undefined) { + initPerfCallChainBottomUp(callChains: PerfCallChain[]): void { + callChains.forEach((callChain: PerfCallChain, index: number): void => { + if (this.threadData[callChain.tid] === undefined) { return; } this.setPerfCallChainFrameName(callChain); this.addPerfGroupData(callChain); - if (index + 1 < callChains.length && callChains[index + 1].sampleId == callChain.sampleId) { + if (index + 1 < callChains.length && callChains[index + 1].sampleId === callChain.sampleId) { PerfCallChain.setPreviousNode(callChain, callChains[index + 1]); } - if (callChains.length == index + 1 || callChains[index + 1].sampleId != callChain.sampleId) { + if (callChains.length === index + 1 || callChains[index + 1].sampleId !== callChain.sampleId) { this.addProcessThreadStateData(callChain); } }); } - initPerfCallChainTopDown(callChains: PerfCallChain[]) { + initPerfCallChainTopDown(callChains: PerfCallChain[]): void { this.callChainData = {}; - callChains.forEach((callChain, index) => { + callChains.forEach((callChain: PerfCallChain, index: number): void => { this.setPerfCallChainFrameName(callChain); this.addPerfGroupData(callChain); let callChainDatum = this.callChainData[callChain.sampleId]; @@ -269,10 +276,10 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { }); } - setPerfCallChainFrameName(callChain: PerfCallChain) { + setPerfCallChainFrameName(callChain: PerfCallChain): void { //设置调用栈的名称 callChain.canCharge = true; - if (callChain.symbolId == -1) { + if (callChain.symbolId === -1) { if (this.filesData[callChain.fileId] && this.filesData[callChain.fileId].length > 0) { callChain.fileName = this.filesData[callChain.fileId][0].fileName; callChain.path = this.filesData[callChain.fileId][0].path; @@ -289,14 +296,14 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } - addProcessThreadStateData(callChain: PerfCallChain) { + addProcessThreadStateData(callChain: PerfCallChain): void { //当调用栈为调用的根节点时 this.addPerfCallData(callChain); let threadCallChain = new PerfCallChain(); //新增的线程数据 threadCallChain.depth = 0; PerfCallChain.merageCallChain(threadCallChain, callChain); threadCallChain.canCharge = false; - threadCallChain.name = (this.threadData[callChain.tid].threadName || 'Thread') + '(' + callChain.tid + ')'; + threadCallChain.name = `${this.threadData[callChain.tid].threadName || 'Thread'}(${callChain.tid})`; let threadStateCallChain = new PerfCallChain(); //新增的线程状态数据 PerfCallChain.merageCallChain(threadStateCallChain, callChain); threadStateCallChain.name = callChain.threadState || 'Unknown State'; @@ -308,7 +315,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { PerfCallChain.setNextNode(threadStateCallChain, callChain); } - addPerfCallData(callChain: PerfCallChain) { + addPerfCallData(callChain: PerfCallChain): void { let perfCall = new PerfCall(); perfCall.depth = this.callChainData[callChain.sampleId]?.length || 0; perfCall.sampleId = callChain.sampleId; @@ -316,7 +323,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.dataCache.perfCallChainMap.set(callChain.sampleId, perfCall); } - addPerfGroupData(callChain: PerfCallChain) { + addPerfGroupData(callChain: PerfCallChain): void { const currentCallChain = this.callChainData[callChain.sampleId] || []; this.callChainData[callChain.sampleId] = currentCallChain; if (currentCallChain.length > maxDepth) { @@ -325,7 +332,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { currentCallChain.push(callChain); } - getPerfCallChainsBySampleIds(sampleIds: string[], isTopDown: boolean) { + getPerfCallChainsBySampleIds(sampleIds: string[], isTopDown: boolean): PerfCallChainMerageData[] { this.allProcess = this.groupNewTreeNoId(sampleIds, isTopDown); return this.allProcess; } @@ -334,20 +341,42 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { let threadCallChain = new PerfCallChain(); //新增的线程数据 threadCallChain.tid = countSample.tid; threadCallChain.canCharge = false; - threadCallChain.name = this.threadData[countSample.tid].threadName || 'Thread' + '(' + countSample.tid + ')'; + threadCallChain.name = `${this.threadData[countSample.tid].threadName || 'Thread'}(${countSample.tid})`; let threadStateCallChain = new PerfCallChain(); //新增的线程状态数据 threadStateCallChain.tid = countSample.tid; threadStateCallChain.name = countSample.threadState || 'Unknown State'; threadStateCallChain.fileName = threadStateCallChain.name === '-' ? 'Unknown Thread State' : ''; threadStateCallChain.canCharge = false; - list.unshift(threadCallChain, threadStateCallChain); + if (!this.isHideThreadState) { + list.unshift(threadStateCallChain); + } + if (!this.isHideThread) { + list.unshift(threadCallChain); + } } - freshPerfCallchains(perfCountSamples: PerfCountSample[], isTopDown: boolean) { + freshPerfCallchains(perfCountSamples: PerfCountSample[], isTopDown: boolean): void { this.currentTreeMapData = {}; this.currentTreeList = []; let totalSamplesCount = 0; + this.processMap = new Map(); + this.threadMap = new Map(); perfCountSamples.forEach((perfSample) => { + if (this.processMap.has(perfSample.pid)) { + this.processMap.get(perfSample.pid)!.count += perfSample.count; + this.processMap.get(perfSample.pid)!.eventCount += perfSample.eventCount; + } else { + this.processMap.set(perfSample.pid, { count: perfSample.count, eventCount: perfSample.eventCount }); + } + if (this.threadMap.has(perfSample.tid)) { + this.threadMap.get(perfSample.tid)!.count += perfSample.count; + this.threadMap.get(perfSample.tid)!.eventCount += perfSample.eventCount; + } else { + this.threadMap.set(perfSample.tid, { count: perfSample.count, eventCount: perfSample.eventCount }); + } + }); + + perfCountSamples.forEach((perfSample): void => { totalSamplesCount += perfSample.count; if (this.callChainData[perfSample.sampleId] && this.callChainData[perfSample.sampleId].length > 0) { let perfCallChains = [...this.callChainData[perfSample.sampleId]]; @@ -361,14 +390,21 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.currentTreeList.push(perfRootNode); } - PerfCallChainMerageData.merageCallChainSample(perfRootNode, perfCallChains[topIndex], perfSample, false); + PerfCallChainMerageData.merageCallChainSample( + perfRootNode, + perfCallChains[topIndex], + perfSample, + false, + this.processMap, + this.threadMap + ); this.mergeChildrenByIndex(perfRootNode, perfCallChains, topIndex, perfSample, isTopDown); } } }); let rootMerageMap: any = {}; // @ts-ignore - Object.values(this.currentTreeMapData).forEach((merageData: any) => { + Object.values(this.currentTreeMapData).forEach((merageData: any): void => { if (rootMerageMap[merageData.pid] === undefined) { let perfProcessMerageData = new PerfCallChainMerageData(); //新增进程的节点数据 perfProcessMerageData.canCharge = false; @@ -398,7 +434,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { merageData.parentNode = rootMerageMap[merageData.pid]; //子节点添加父节点的引用 }); let id = 0; - this.currentTreeList.forEach((perfTreeNode) => { + this.currentTreeList.forEach((perfTreeNode: any): void => { perfTreeNode.total = totalSamplesCount; if (perfTreeNode.id === '') { perfTreeNode.id = id + ''; @@ -422,22 +458,43 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { index: number, sample: PerfCountSample, isTopDown: boolean - ) { + ): void { + if ((isTopDown && index >= callChainDataList.length - 1) || (!isTopDown && index <= 0)) { + return; + } isTopDown ? index++ : index--; - let isEnd = isTopDown ? callChainDataList.length == index + 1 : index == 0; + let isEnd = isTopDown ? callChainDataList.length === index + 1 : index === 0; let node: PerfCallChainMerageData; if ( - currentNode.initChildren.filter((child: PerfCallChainMerageData) => { - if (child.symbolName == callChainDataList[index]?.name) { + currentNode.initChildren.filter((child: PerfCallChainMerageData): boolean => { + if (child.symbolName === callChainDataList[index]?.name) { node = child; - PerfCallChainMerageData.merageCallChainSample(child, callChainDataList[index], sample, isEnd); + PerfCallChainMerageData.merageCallChainSample( + child, + callChainDataList[index], + sample, + isEnd, + this.processMap, + this.threadMap + ); return true; } return false; - }).length == 0 + }).length === 0 ) { node = new PerfCallChainMerageData(); - PerfCallChainMerageData.merageCallChainSample(node, callChainDataList[index], sample, isEnd); + PerfCallChainMerageData.merageCallChainSample( + node, + callChainDataList[index], + sample, + isEnd, + this.processMap, + this.threadMap + ); + node.processPercent = node.count / this.processMap.get(node.pid)!.count; + node.processEventPercent = node.eventCount / this.processMap.get(node.pid)!.eventCount; + node.threadPercent = node.count / this.threadMap.get(node.tid)!.count; + node.threadEventPercent = node.eventCount / this.threadMap.get(node.tid)!.eventCount; currentNode.children.push(node); currentNode.initChildren.push(node); this.currentTreeList.push(node); @@ -451,11 +508,11 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.currentTreeList = []; for (let i = 0; i < sampleIds.length; i++) { let callChains = this.callChainData[sampleIds[i]]; - if (callChains == undefined) continue; + if (callChains === undefined) continue; let topIndex = isTopDown ? 0 : callChains.length - 1; if (callChains.length > 0) { let root = this.currentTreeMapData[callChains[topIndex].name + callChains[topIndex].pid]; - if (root == undefined) { + if (root === undefined) { root = new PerfCallChainMerageData(); this.currentTreeMapData[callChains[topIndex].name + callChains[topIndex].pid] = root; this.currentTreeList.push(root); @@ -466,8 +523,8 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } let rootMerageMap: any = {}; // @ts-ignore - Object.values(this.currentTreeMapData).forEach((merageData: any) => { - if (rootMerageMap[merageData.pid] == undefined) { + Object.values(this.currentTreeMapData).forEach((merageData: any): void => { + if (rootMerageMap[merageData.pid] === undefined) { let processMerageData = new PerfCallChainMerageData(); //新增进程的节点数据 processMerageData.canCharge = false; processMerageData.symbolName = this.threadData[merageData.tid].processName || `Process(${merageData.pid})`; @@ -491,14 +548,14 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { merageData.parentNode = rootMerageMap[merageData.pid]; //子节点添加父节点的引用 }); let id = 0; - this.currentTreeList.forEach((node) => { + this.currentTreeList.forEach((node: any): void => { node.total = sampleIds.length; - if (node.id == '') { + if (node.id === '') { node.id = id + ''; id++; } if (node.parentNode) { - if (node.parentNode.id == '') { + if (node.parentNode.id === '') { node.parentNode.id = id + ''; id++; } @@ -509,19 +566,21 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { return Object.values(rootMerageMap); } - merageChildren(currentNode: PerfCallChainMerageData, callChain: any, isTopDown: boolean) { + merageChildren(currentNode: PerfCallChainMerageData, callChain: any, isTopDown: boolean): void { let nextNodeKey = isTopDown ? 'nextNode' : 'previousNode'; - if (callChain[nextNodeKey] == undefined) return; + if (callChain[nextNodeKey] === undefined) { + return; + } let node; if ( - currentNode.initChildren.filter((child: PerfCallChainMerageData) => { - if (child.symbolName == callChain[nextNodeKey]?.name) { + currentNode.initChildren.filter((child: PerfCallChainMerageData): boolean => { + if (child.symbolName === callChain[nextNodeKey]?.name) { node = child; PerfCallChainMerageData.merageCallChain(child, callChain[nextNodeKey], isTopDown); return true; } return false; - }).length == 0 + }).length === 0 ) { node = new PerfCallChainMerageData(); PerfCallChainMerageData.merageCallChain(node, callChain[nextNodeKey], isTopDown); @@ -530,12 +589,14 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.currentTreeList.push(node); node.parentNode = currentNode; } - if (node) this.merageChildren(node, callChain[nextNodeKey], isTopDown); + if (node) { + this.merageChildren(node, callChain[nextNodeKey], isTopDown); + } } //所有的操作都是针对整个树结构的 不区分特定的数据 - splitPerfTree(samples: PerfCallChainMerageData[], name: string, isCharge: boolean, isSymbol: boolean) { - samples.forEach((process) => { + splitPerfTree(samples: PerfCallChainMerageData[], name: string, isCharge: boolean, isSymbol: boolean): void { + samples.forEach((process: PerfCallChainMerageData): void => { process.children = []; if (isCharge) { this.recursionPerfChargeInitTree(process, name, isSymbol); @@ -546,36 +607,36 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.resetAllNode(samples); } - recursionPerfChargeInitTree(sample: PerfCallChainMerageData, symbolName: string, isSymbol: boolean) { - if ((isSymbol && sample.symbolName == symbolName) || (!isSymbol && sample.libName == symbolName)) { + recursionPerfChargeInitTree(sample: PerfCallChainMerageData, symbolName: string, isSymbol: boolean): void { + if ((isSymbol && sample.symbolName === symbolName) || (!isSymbol && sample.libName === symbolName)) { (this.splitMapData[symbolName] = this.splitMapData[symbolName] || []).push(sample); sample.isStore++; } if (sample.initChildren.length > 0) { - sample.initChildren.forEach((child) => { + sample.initChildren.forEach((child: PerfCallChainMerageData): void => { this.recursionPerfChargeInitTree(child, symbolName, isSymbol); }); } } - recursionPerfPruneInitTree(node: PerfCallChainMerageData, symbolName: string, isSymbol: boolean) { - if ((isSymbol && node.symbolName == symbolName) || (!isSymbol && node.libName == symbolName)) { + recursionPerfPruneInitTree(node: PerfCallChainMerageData, symbolName: string, isSymbol: boolean): void { + if ((isSymbol && node.symbolName === symbolName) || (!isSymbol && node.libName === symbolName)) { (this.splitMapData[symbolName] = this.splitMapData[symbolName] || []).push(node); node.isStore++; this.pruneChildren(node, symbolName); } else if (node.initChildren.length > 0) { - node.initChildren.forEach((child) => { + node.initChildren.forEach((child): void => { this.recursionPerfPruneInitTree(child, symbolName, isSymbol); }); } } //symbol lib prune - recursionPruneTree(sample: PerfCallChainMerageData, symbolName: string, isSymbol: boolean) { - if ((isSymbol && sample.symbolName == symbolName) || (!isSymbol && sample.libName == symbolName)) { + recursionPruneTree(sample: PerfCallChainMerageData, symbolName: string, isSymbol: boolean): void { + if ((isSymbol && sample.symbolName === symbolName) || (!isSymbol && sample.libName === symbolName)) { sample.parent && sample.parent.children.splice(sample.parent.children.indexOf(sample), 1); } else { - sample.children.forEach((child) => { + sample.children.forEach((child: PerfCallChainMerageData): void => { this.recursionPruneTree(child, symbolName, isSymbol); }); } @@ -585,9 +646,9 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { sample: PerfCallChainMerageData, ruleName: string, rule: (node: PerfCallChainMerageData) => boolean - ) { + ): void { if (sample.initChildren.length > 0) { - sample.initChildren.forEach((child) => { + sample.initChildren.forEach((child): void => { if (rule(child)) { (this.splitMapData[ruleName] = this.splitMapData[ruleName] || []).push(child); child.isStore++; @@ -597,9 +658,9 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } - pruneChildren(sample: PerfCallChainMerageData, symbolName: string) { + pruneChildren(sample: PerfCallChainMerageData, symbolName: string): void { if (sample.initChildren.length > 0) { - sample.initChildren.forEach((child) => { + sample.initChildren.forEach((child: PerfCallChainMerageData): void => { child.isStore++; (this.splitMapData[symbolName] = this.splitMapData[symbolName] || []).push(child); this.pruneChildren(child, symbolName); @@ -607,66 +668,66 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } - hideSystemLibrary() { - this.allProcess.forEach((item) => { + hideSystemLibrary(): void { + this.allProcess.forEach((item: PerfCallChainMerageData): void => { item.children = []; - this.recursionChargeByRule(item, systemRuleName, (node) => { + this.recursionChargeByRule(item, systemRuleName, (node: PerfCallChainMerageData): boolean => { return node.path.startsWith(systemRuleName); }); }); } - hideNumMaxAndMin(startNum: number, endNum: string) { + hideNumMaxAndMin(startNum: number, endNum: string): void { let max = endNum === '∞' ? Number.POSITIVE_INFINITY : parseInt(endNum); - this.allProcess.forEach((item) => { + this.allProcess.forEach((item: PerfCallChainMerageData): void => { item.children = []; - this.recursionChargeByRule(item, numRuleName, (node) => { + this.recursionChargeByRule(item, numRuleName, (node: PerfCallChainMerageData): boolean => { return node.dur < startNum || node.dur > max; }); }); } - clearSplitMapData(symbolName: string) { + clearSplitMapData(symbolName: string): void { delete this.splitMapData[symbolName]; } - resetAllSymbol(symbols: string[]) { - symbols.forEach((symbol) => { + resetAllSymbol(symbols: string[]): void { + symbols.forEach((symbol: string): void => { let list = this.splitMapData[symbol]; - if (list != undefined) { - list.forEach((item: any) => { + if (list !== undefined) { + list.forEach((item: any): void => { item.isStore--; }); } }); } - resetAllNode(sample: PerfCallChainMerageData[]) { + resetAllNode(sample: PerfCallChainMerageData[]): void { this.clearSearchNode(); - sample.forEach((process) => { + sample.forEach((process: PerfCallChainMerageData): void => { process.searchShow = true; process.isSearch = false; }); this.resetNewAllNode(sample); - if (this.searchValue != '') { + if (this.searchValue !== '') { this.findSearchNode(sample, this.searchValue, false); this.resetNewAllNode(sample); } } - resetNewAllNode(sampleArray: PerfCallChainMerageData[]) { - sampleArray.forEach((process) => { + resetNewAllNode(sampleArray: PerfCallChainMerageData[]): void { + sampleArray.forEach((process: PerfCallChainMerageData): void => { process.children = []; }); - let values = this.currentTreeList.map((item: any) => { + let values = this.currentTreeList.map((item: any): any => { item.children = []; return item; }); - values.forEach((sample: any) => { - if (sample.parentNode != undefined) { - if (sample.isStore == 0 && sample.searchShow) { + values.forEach((sample: any): void => { + if (sample.parentNode !== undefined) { + if (sample.isStore === 0 && sample.searchShow) { let parentNode = sample.parentNode; - while (parentNode != undefined && !(parentNode.isStore == 0 && parentNode.searchShow)) { + while (parentNode !== undefined && !(parentNode.isStore === 0 && parentNode.searchShow)) { parentNode = parentNode.parentNode; } if (parentNode) { @@ -678,14 +739,14 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { }); } - findSearchNode(sampleArray: PerfCallChainMerageData[], search: string, parentSearch: boolean) { + findSearchNode(sampleArray: PerfCallChainMerageData[], search: string, parentSearch: boolean): void { search = search.toLocaleLowerCase(); - sampleArray.forEach((sample) => { + sampleArray.forEach((sample: PerfCallChainMerageData): void => { if ((sample.symbol && sample.symbol.toLocaleLowerCase().includes(search)) || parentSearch) { sample.searchShow = true; let parentNode = sample.parent; - sample.isSearch = sample.symbol != undefined && sample.symbol.toLocaleLowerCase().includes(search); - while (parentNode != undefined && !parentNode.searchShow) { + sample.isSearch = sample.symbol !== undefined && sample.symbol.toLocaleLowerCase().includes(search); + while (parentNode !== undefined && !parentNode.searchShow) { parentNode.searchShow = true; parentNode = parentNode.parent; } @@ -699,20 +760,20 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { }); } - clearSearchNode() { - this.currentTreeList.forEach((sample) => { + clearSearchNode(): void { + this.currentTreeList.forEach((sample: any): void => { sample.searchShow = true; sample.isSearch = false; }); } - splitAllProcess(processArray: any[]) { - processArray.forEach((item: any) => { - this.allProcess.forEach((process) => { - if (item.select == '0') { - this.recursionPerfChargeInitTree(process, item.name, item.type == 'symbol'); + splitAllProcess(processArray: any[]): void { + processArray.forEach((item: any): void => { + this.allProcess.forEach((process): void => { + if (item.select === '0') { + this.recursionPerfChargeInitTree(process, item.name, item.type === 'symbol'); } else { - this.recursionPerfPruneInitTree(process, item.name, item.type == 'symbol'); + this.recursionPerfPruneInitTree(process, item.name, item.type === 'symbol'); } }); if (!item.checked) { @@ -721,7 +782,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { }); } - resolvingAction(params: any[]) { + resolvingAction(params: any[]): PerfCallChainMerageData[] | PerfAnalysisSample[] | PerfBottomUpStruct[] { if (params.length > 0) { for (let item of params) { if (item.funcName && item.funcArgs) { @@ -735,6 +796,12 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { case 'hideSystemLibrary': this.hideSystemLibrary(); break; + case 'hideThread': + this.isHideThread = item.funcArgs[0]; + break; + case 'hideThreadState': + this.isHideThreadState = item.funcArgs[0]; + break; case 'hideNumMaxAndMin': this.hideNumMaxAndMin(item.funcArgs[0], item.funcArgs[1]); break; @@ -772,7 +839,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } } - this.dataSource = this.allProcess.filter((process) => { + this.dataSource = this.allProcess.filter((process: PerfCallChainMerageData): boolean => { return process.children && process.children.length > 0; }); } @@ -780,7 +847,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } combineCallChainForAnalysis(): PerfAnalysisSample[] { - let sampleCallChainList = new Array(); + let sampleCallChainList: Array = []; for (let sample of this.samplesData) { let callChains = [...this.callChainData[sample.sampleId]]; const lastCallChain = callChains[callChains.length - 1]; @@ -809,7 +876,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { getBottomUp(): PerfBottomUpStruct[] { const topUp = new PerfBottomUpStruct('topUp'); - let perfTime = this.dataCache.perfCountToMs; + let perfTime = 1; for (let sample of this.samplesData) { let currentNode = topUp; let callChains = this.callChainData[sample.sampleId]; @@ -819,7 +886,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } let item = callChains[i]; const existingNode = currentNode.children.find( - (child) => child.symbolName === item.name + '(' + item.fileName + ')' + (child) => child.symbolName === `${item.name}(${item.fileName})` ); if (existingNode) { existingNode.tsArray.push(...sample.ts.split(',').map(Number)); @@ -828,7 +895,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { existingNode.calculateSelfTime(); existingNode.notifyParentUpdateSelfTime(); } else { - let newNode = new PerfBottomUpStruct(item.name + '(' + item.fileName + ')'); + let newNode = new PerfBottomUpStruct(`${item.name}(${item.fileName})`); newNode.totalTime = perfTime * sample.count; newNode.tsArray = sample.ts.split(',').map(Number); currentNode.addChildren(newNode); @@ -838,7 +905,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } } - topUp.children.forEach((child) => { + topUp.children.forEach((child: PerfBottomUpStruct): void => { child.parentNode = undefined; }); @@ -851,7 +918,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { private topUpDataToBottomUpData(perfPositiveArray: Array): Array { let reverseTreeArray: Array = []; - const recursionTree = (perfBottomUpStruct: PerfBottomUpStruct) => { + const recursionTree = (perfBottomUpStruct: PerfBottomUpStruct): void => { if (perfBottomUpStruct.selfTime > 0) { const clonePerfBottomUpStruct = new PerfBottomUpStruct(perfBottomUpStruct.symbolName); clonePerfBottomUpStruct.selfTime = perfBottomUpStruct.selfTime; @@ -878,7 +945,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { parent: PerfBottomUpStruct | null ): Array { const sameSymbolMap = new Map(); - const currentLevelData = new Array(); + const currentLevelData: Array = []; const dataArray = reverseTreeArray || parent?.frameChildren; if (!dataArray) { return []; @@ -937,7 +1004,7 @@ export class PerfFile { path: string = ''; fileName: string = ''; - static setFileName(data: PerfFile) { + static setFileName(data: PerfFile): void { if (data.path) { let number = data.path.lastIndexOf('/'); if (number > 0) { @@ -948,7 +1015,7 @@ export class PerfFile { data.fileName = data.path; } - setFileName() { + setFileName(): void { if (this.path) { let number = this.path.lastIndexOf('/'); if (number > 0) { @@ -994,17 +1061,17 @@ export class PerfCallChain { previousNode: PerfCallChain | undefined = undefined; //将list转换为一个链表结构 nextNode: PerfCallChain | undefined = undefined; - static setNextNode(currentNode: PerfCallChain, nextNode: PerfCallChain) { + static setNextNode(currentNode: PerfCallChain, nextNode: PerfCallChain): void { currentNode.nextNode = nextNode; nextNode.previousNode = currentNode; } - static setPreviousNode(currentNode: PerfCallChain, prevNode: PerfCallChain) { + static setPreviousNode(currentNode: PerfCallChain, prevNode: PerfCallChain): void { currentNode.previousNode = prevNode; prevNode.nextNode = currentNode; } - static merageCallChain(currentNode: PerfCallChain, callChain: PerfCallChain) { + static merageCallChain(currentNode: PerfCallChain, callChain: PerfCallChain): void { currentNode.startNS = callChain.startNS; currentNode.tid = callChain.tid; currentNode.pid = callChain.pid; @@ -1025,7 +1092,6 @@ export class PerfCallChainMerageData extends ChartStruct { symbol: string = ''; libName: string = ''; path: string = ''; - self: string = '0s'; weight: string = ''; weightPercent: string = ''; selfDur: number = 0; @@ -1041,26 +1107,30 @@ export class PerfCallChainMerageData extends ChartStruct { isSelected: boolean = false; searchShow: boolean = true; isSearch: boolean = false; + processPercent: number = 0; + threadEventPercent: number = 0; + threadPercent: number = 0; + processEventPercent: number = 0; set parentNode(data: PerfCallChainMerageData | undefined) { this.parent = data; this.#parentNode = data; } - get parentNode() { + get parentNode(): PerfCallChainMerageData | undefined { return this.#parentNode; } set total(data: number) { this.#total = data; - this.weight = `${timeMsFormat2p(this.dur * (DataCache.getInstance().perfCountToMs || 1))}`; + this.weight = `${this.dur}`; this.weightPercent = `${((this.dur / data) * 100).toFixed(1)}%`; } - get total() { + get total(): number { return this.#total; } - static merageCallChain(currentNode: PerfCallChainMerageData, callChain: PerfCallChain, isTopDown: boolean) { + static merageCallChain(currentNode: PerfCallChainMerageData, callChain: PerfCallChain, isTopDown: boolean): void { if (currentNode.symbolName === '') { currentNode.symbol = `${callChain.name} ${callChain.fileName ? `(${callChain.fileName})` : ''}`; currentNode.symbolName = callChain.name; @@ -1077,7 +1147,6 @@ export class PerfCallChainMerageData extends ChartStruct { } if (callChain[isTopDown ? 'nextNode' : 'previousNode'] === undefined) { currentNode.selfDur += callChain.count; - currentNode.self = timeMsFormat2p(currentNode.selfDur * (DataCache.getInstance().perfCountToMs || 1)); } currentNode.dur += callChain.count; currentNode.count += callChain.count; @@ -1088,8 +1157,10 @@ export class PerfCallChainMerageData extends ChartStruct { currentNode: PerfCallChainMerageData, callChain: PerfCallChain, sample: PerfCountSample, - isEnd: boolean - ) { + isEnd: boolean, + processMap: Map, + threadMap: Map + ): void { if (currentNode.symbolName === '') { currentNode.symbol = `${callChain.name} ${callChain.fileName ? `(${callChain.fileName})` : ''}`; currentNode.symbolName = callChain.name; @@ -1106,11 +1177,14 @@ export class PerfCallChainMerageData extends ChartStruct { } if (isEnd) { currentNode.selfDur += sample.count; - currentNode.self = timeMsFormat2p(currentNode.selfDur * (DataCache.getInstance().perfCountToMs || 1)); } currentNode.dur += sample.count; currentNode.count += sample.count; currentNode.eventCount += sample.eventCount; + currentNode.processPercent = currentNode.count / processMap.get(currentNode.pid)!.count; + currentNode.processEventPercent = currentNode.eventCount / processMap.get(currentNode.pid)!.eventCount; + currentNode.threadPercent = currentNode.count / threadMap.get(currentNode.tid)!.count; + currentNode.threadEventPercent = currentNode.eventCount / threadMap.get(currentNode.tid)!.eventCount; currentNode.tsArray.push(...sample.ts.split(',').map(Number)); } } @@ -1163,26 +1237,26 @@ class PerfAnalysisSample extends PerfCountSample { } } -export function timeMsFormat2p(ns: number) { +export function timeMsFormat2p(ns: number): string { let currentNs = ns; let hour1 = 3600_000; let minute1 = 60_000; let second1 = 1_000; // 1 second let perfResult = ''; if (currentNs >= hour1) { - perfResult += Math.floor(currentNs / hour1).toFixed(2) + 'h'; + perfResult += `${Math.floor(currentNs / hour1).toFixed(2)}h`; return perfResult; } if (currentNs >= minute1) { - perfResult += Math.floor(currentNs / minute1).toFixed(2) + 'min'; + perfResult += `${Math.floor(currentNs / minute1).toFixed(2)}min`; return perfResult; } if (currentNs >= second1) { - perfResult += Math.floor(currentNs / second1).toFixed(2) + 's'; + perfResult += `${Math.floor(currentNs / second1).toFixed(2)}s`; return perfResult; } if (currentNs > 0) { - perfResult += currentNs.toFixed(2) + 'ms'; + perfResult += `${currentNs.toFixed(2)}ms`; return perfResult; } if (perfResult === '') { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts index 537f89d52..bfeef7d29 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts @@ -56,7 +56,6 @@ import { FrameSpacingRender } from './ProcedureWorkerFrameSpacing.js'; import { JsCpuProfilerRender } from './ProcedureWorkerCpuProfiler.js'; import { SnapshotRender } from './ProcedureWorkerSnapshot.js'; import { LogRender } from './ProcedureWorkerLog.js'; -import { HiSysEventRender } from './ProcedureWorkerHiSysEvent.js'; let dataList: any = {}; let dataList2: any = {}; @@ -110,7 +109,6 @@ export let renders: any = { 'js-cpu-profiler': new JsCpuProfilerRender(), snapshot: new SnapshotRender(), logs: new LogRender(), - hiSysEvent: new HiSysEventRender(), }; function match(type: string, req: RequestMessage): void { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts index a10edceb7..f4165328d 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts @@ -1196,6 +1196,7 @@ export class HiPerfStruct extends BaseStruct { endNS: number | undefined; dur: number | undefined; height: number | undefined; + eventCount: number | undefined; static drawRoundRectPath(cxt: Path2D, x: number, y: number, width: number, height: number, radius: number) { cxt.arc(x + width - radius, y + height - radius, radius, 0, Math.PI / 2); @@ -1257,28 +1258,52 @@ export class HiPerfStruct extends BaseStruct { } } - static groupBy10MS(groupArray: Array, intervalPerf: number, maxCpu?: number | undefined): Array { + static groupBy10MS( + groupArray: Array, + intervalPerf: number, + maxCpu?: number | undefined, + usage?: boolean, + event?: number + ): Array { + let maxEventCount = 0; let obj = groupArray .map((it) => { it.timestamp_group = Math.trunc(it.startNS / 1_000_000_0) * 1_000_000_0; return it; }) .reduce((pre, current) => { - (pre[current['timestamp_group']] = pre[current['timestamp_group']] || []).push(current); + if (usage || current.event_type_id === event || event === -1) { + if (pre[current['timestamp_group']]) { + pre[current['timestamp_group']].sampleCount += 1; + pre[current['timestamp_group']].eventCount += current.event_count; + } else { + pre[current['timestamp_group']] = { + sampleCount: 1, + eventCount: current.event_count, + }; + } + maxEventCount = Math.max(pre[current['timestamp_group']].eventCount, maxEventCount); + } + return pre; }, {}); let arr = []; for (let aKey in obj) { let ns = parseInt(aKey); let height: number = 0; - if (maxCpu != undefined) { - height = Math.floor((obj[aKey].length / (10 / intervalPerf) / maxCpu) * 40); + if (usage) { + if (maxCpu != undefined) { + height = Math.floor((obj[aKey].sampleCount / (10 / intervalPerf) / maxCpu) * 40); + } else { + height = Math.floor((obj[aKey].sampleCount / (10 / intervalPerf)) * 40); + } } else { - height = Math.floor((obj[aKey].length / (10 / intervalPerf)) * 40); + height = Math.floor((obj[aKey].eventCount / maxEventCount) * 40); } arr.push({ startNS: ns, dur: 1_000_000_0, + eventCount: obj[aKey].eventCount, height: height, }); } diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.ts index e535924ff..831f27a9f 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.ts @@ -15,18 +15,12 @@ import { ColorUtils } from '../../component/trace/base/ColorUtils.js'; import { - BaseStruct, - drawFlagLine, - drawLines, - drawLoading, - drawSelection, HiPerfStruct, hiPerf, PerfRender, RequestMessage, } from './ProcedureWorkerCommon.js'; import { TraceRow } from '../../component/trace/base/TraceRow.js'; -import { HiPerfThreadStruct } from './ProcedureWorkerHiPerfThread.js'; export class HiperfCpuRender extends PerfRender { renderMainThread(req: any, row: TraceRow): void { @@ -34,10 +28,15 @@ export class HiperfCpuRender extends PerfRender { let filter = row.dataListCache; let groupBy10MS = req.scale > 30_000_000; if (list && row.dataList2.length == 0) { - row.dataList2 = HiPerfCpuStruct.groupBy10MS(list, req.intervalPerf, req.maxCpu); + let drawType = row.drawType; + let usage = row.drawType === -2; + let event = drawType; + row.dataList2 = HiPerfCpuStruct.groupBy10MS(list, req.intervalPerf, req.maxCpu, usage, event); } hiPerf( - list, + groupBy10MS || row.drawType === -2 || row.drawType === -1 + ? list + : list.filter((it) => it.event_type_id === row.drawType), row.dataList2, filter, TraceRow.range?.startNS ?? 0, diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.ts index fb79f3630..51db538f4 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.ts @@ -23,10 +23,15 @@ export class HiperfProcessRender extends PerfRender { let filter = row.dataListCache; let groupBy10MS = hiPerfProcessReq.scale > 30_000_000; if (list && row.dataList2.length === 0) { - row.dataList2 = HiPerfProcessStruct.groupBy10MS(list, hiPerfProcessReq.intervalPerf); + let drawType = row.drawType; + let usage = row.drawType === -2; + let event = drawType; + row.dataList2 = HiPerfProcessStruct.groupBy10MS(list, hiPerfProcessReq.intervalPerf, undefined, usage, event); } hiPerf( - list, + groupBy10MS || row.drawType === -2 || row.drawType === -1 + ? list + : list.filter((it) => it.event_type_id === row.drawType), row.dataList2, filter, TraceRow.range?.startNS ?? 0, diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfThread.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfThread.ts index 012890c89..eb8a668e8 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfThread.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfThread.ts @@ -23,10 +23,15 @@ export class HiperfThreadRender extends PerfRender { let filter = row.dataListCache; let groupBy10MS = hiPerfThreadReq.scale > 30_000_000; if (list && row.dataList2.length === 0) { - row.dataList2 = HiPerfThreadStruct.groupBy10MS(list, hiPerfThreadReq.intervalPerf); + let drawType = row.drawType; + let usage = row.drawType === -2; + let event = drawType; + row.dataList2 = HiPerfThreadStruct.groupBy10MS(list, hiPerfThreadReq.intervalPerf, undefined, usage, event); } hiPerf( - list, + groupBy10MS || row.drawType === -2 || row.drawType === -1 + ? list + : list.filter((it) => it.event_type_id === row.drawType), row.dataList2, filter, TraceRow.range?.startNS ?? 0, -- Gitee From 2ed13a870635666ca352c28358e383ca1af5d2ec Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 10:01:40 +0800 Subject: [PATCH 03/15] =?UTF-8?q?feat-hiperfeventcount=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=92=91=E7=BB=9F=E4=B8=80=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E5=8A=9F=E8=80=97=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/base-ui/headline/lit-headline.ts | 109 ++++ ide/src/base-ui/select/LitAllocationSelect.ts | 2 +- ide/src/base-ui/table/lit-table.ts | 205 +++--- ide/src/base-ui/tree/LitTree.ts | 1 + ide/src/base-ui/tree/LitTreeNode.ts | 8 +- .../doc/md/quickstart_ability_monitor.html | 387 ++++++++++++ ide/src/trace/bean/BoxSelection.ts | 4 + ide/src/trace/bean/EbpfStruct.ts | 24 + ide/src/trace/bean/FrameChartStruct.ts | 2 + ide/src/trace/bean/NativeHook.ts | 31 + ide/src/trace/bean/PerfBottomUpStruct.ts | 2 + ide/src/trace/bean/PerfProfile.ts | 9 + ide/src/trace/bean/PerfStruct.ts | 69 ++ ide/src/trace/component/SpHelp.ts | 13 - ide/src/trace/component/SpRecordTrace.ts | 7 +- ide/src/trace/component/SpSystemTrace.ts | 69 +- ide/src/trace/component/chart/FrameChart.ts | 123 ++-- .../trace/component/chart/PerfDataQuery.ts | 14 + .../trace/component/chart/SpChartManager.ts | 6 +- ide/src/trace/component/chart/SpHiPerf.ts | 278 +++++++-- .../component/chart/SpNativeMemoryChart.ts | 6 +- .../trace/component/chart/SpProcessChart.ts | 3 + .../trace/component/setting/SpAllocations.ts | 36 +- .../trace/component/setting/SpHilogRecord.ts | 2 +- .../trace/component/setting/SpHisysEvent.ts | 262 +++++--- .../trace/component/setting/SpProbesConfig.ts | 81 ++- .../component/setting/SpRecordSetting.ts | 6 +- .../setting/bean/ProfilerServiceTypes.ts | 7 +- .../setting/utils/PluginConvertUtils.ts | 2 +- .../trace/component/trace/base/ColorUtils.ts | 15 + .../trace/component/trace/base/TraceRow.ts | 93 ++- .../trace/component/trace/base/TraceSheet.ts | 49 +- .../component/trace/base/TraceSheetConfig.ts | 12 + .../component/trace/sheet/TabPaneFilter.ts | 2 +- .../sheet/ark-ts/TabPaneJsCpuStatistics.ts | 8 + .../sheet/file-system/TabPaneCallTree.ts | 135 +++- .../file-system/TabPaneFileSystemCalltree.ts | 150 ++++- .../TabPaneFilesystemStatisticsAnalysis.ts | 83 ++- .../TabPaneIOTierStatisticsAnalysis.ts | 81 ++- .../TabPaneVirtualMemoryStatisticsAnalysis.ts | 83 ++- .../trace/sheet/hilog/TabPaneHiLogSummary.ts | 9 + .../trace/sheet/hilog/TabPaneHiLogs.ts | 5 +- .../trace/sheet/hiperf/TabPanePerfAnalysis.ts | 275 ++++---- .../trace/sheet/hiperf/TabPerfBottomUp.ts | 20 +- .../trace/sheet/hiperf/TabPerfProfile.ts | 208 +++--- .../trace/sheet/hiperf/TabPerfSampleList.ts | 51 +- .../sheet/native-memory/TabPaneNMCallTree.ts | 182 +++++- .../TabPaneNMStatisticAnalysis.ts | 96 ++- ide/src/trace/database/SqlLite.ts | 55 +- ide/src/trace/database/TraceWorker.ts | 6 +- .../ProcedureLogicWorkerCommon.ts | 32 + .../ProcedureLogicWorkerFileSystem.ts | 226 +++++-- .../ProcedureLogicWorkerNativeNemory.ts | 43 +- .../logic-worker/ProcedureLogicWorkerPerf.ts | 590 +++++++++++------- .../database/ui-worker/ProcedureWorker.ts | 4 + .../database/ui-worker/ProcedureWorkerFunc.ts | 8 +- .../database/ui-worker/ProcedureWorkerHeap.ts | 5 + .../ProcedureWorkerHiPerfCallChart.ts | 211 +++++++ 58 files changed, 3404 insertions(+), 1101 deletions(-) create mode 100644 ide/src/base-ui/headline/lit-headline.ts create mode 100644 ide/src/doc/md/quickstart_ability_monitor.html create mode 100644 ide/src/trace/bean/EbpfStruct.ts create mode 100644 ide/src/trace/bean/PerfStruct.ts create mode 100644 ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCallChart.ts diff --git a/ide/src/base-ui/headline/lit-headline.ts b/ide/src/base-ui/headline/lit-headline.ts new file mode 100644 index 000000000..ed0e7c5dd --- /dev/null +++ b/ide/src/base-ui/headline/lit-headline.ts @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../BaseElement.js'; + +@element('lit-headline') +export class LitHeadLine extends BaseElement { + private titleContent: string = ''; + private _isShow: Boolean = false; + private headline: HTMLDivElement | null | undefined; + private closeBtn: HTMLDivElement | null | undefined; + private _titleContext: HTMLLabelElement | null | undefined; + private _width: number = 0; + public closeCallback = function (): void {}; + static get observedAttributes(): string[] { + return ['_isShow', 'width', 'titleTxt']; + } + set isShow(value: Boolean) { + this._isShow = value; + if (value) { + this.headline!.style.display = 'block'; + } else { + this.headline!.style.display = 'none'; + } + } + get isShow(): Boolean { + return this._isShow; + } + set titleTxt(value: string) { + this.titleContent = value; + this._titleContext!.innerHTML = value; + } + get titleTxt(): string { + return this.titleContent || ''; + } + connectedCallback(): void {} + initElements(): void { + this.closeBtn = this.shadowRoot?.querySelector('.icon-box'); + this.headline = this.shadowRoot?.querySelector('#headline'); + this._titleContext = this.shadowRoot?.querySelector('#titleContext'); + this.closeBtn!.addEventListener('click', () => { + this.headline!.style.display = 'none'; + this.closeCallback(); + }); + } + clear(): void { + this.titleTxt = ''; + this.isShow = false; + } + + initHtml(): string { + return ` + +
    +
    +
    + +
    + +
    +
    + `; + } +} diff --git a/ide/src/base-ui/select/LitAllocationSelect.ts b/ide/src/base-ui/select/LitAllocationSelect.ts index d39a5099b..53f187bde 100644 --- a/ide/src/base-ui/select/LitAllocationSelect.ts +++ b/ide/src/base-ui/select/LitAllocationSelect.ts @@ -139,7 +139,7 @@ export class LitAllocationSelect extends BaseElement { .multipleSelect{ display: flex; width: 100%; - z-index: 2999; + z-index: 98; position: relative; padding: 3px 6px; font-size: 1rem; diff --git a/ide/src/base-ui/table/lit-table.ts b/ide/src/base-ui/table/lit-table.ts index 3eb989daa..a7259fa60 100644 --- a/ide/src/base-ui/table/lit-table.ts +++ b/ide/src/base-ui/table/lit-table.ts @@ -23,6 +23,7 @@ import { JSONToCSV } from '../utils/CSVFormater.js'; import { NodeType } from '../../js-heap/model/DatabaseStruct.js'; import { ConstructorType } from '../../js-heap/model/UiStruct.js'; import { LitIcon } from '../icon/LitIcon.js'; +import { JsCpuProfilerStatisticsStruct } from '../../trace/bean/JsStruct.js'; const iconWidth = 20; const iconPadding = 5; @element('lit-table') @@ -309,7 +310,7 @@ export class LitTable extends HTMLElement { `; } - static get observedAttributes() { + static get observedAttributes(): string[] { return [ 'scroll-y', 'selectable', @@ -332,7 +333,7 @@ export class LitTable extends HTMLElement { this.exportProgress!.loading = value; } - get hideDownload() { + get hideDownload(): boolean { return this.hasAttribute('hideDownload'); } @@ -344,7 +345,7 @@ export class LitTable extends HTMLElement { } } - get selectable() { + get selectable(): boolean { return this.hasAttribute('selectable'); } @@ -356,7 +357,7 @@ export class LitTable extends HTMLElement { } } - get scrollY() { + get scrollY(): string { return this.getAttribute('scroll-y') || 'auto'; } @@ -364,7 +365,7 @@ export class LitTable extends HTMLElement { this.setAttribute('scroll-y', value); } - get dataSource() { + get dataSource(): any[] { return this.ds || []; } @@ -387,11 +388,11 @@ export class LitTable extends HTMLElement { } } - get noRecycle() { + get noRecycle(): boolean { return this.hasAttribute('noRecycle'); } - get recycleDataSource() { + get recycleDataSource(): any[] { return this.ds || []; } @@ -436,7 +437,7 @@ export class LitTable extends HTMLElement { } } - get snapshotDataSource() { + get snapshotDataSource(): any[] { return this.ds || []; } @@ -449,19 +450,19 @@ export class LitTable extends HTMLElement { } } - move1px() { + move1px(): void { this.tableElement!.scrollTop = this.tableElement!.scrollTop + 1; } - dataExportInit() { + dataExportInit(): void { let exportDiv = this.shadowRoot!.querySelector('.export'); exportDiv && - (exportDiv.onclick = () => { + (exportDiv.onclick = (): void => { this.exportData(); }); } - exportData() { + exportData(): void { if (this.exportLoading || this.ds.length === 0) { return; } @@ -471,7 +472,7 @@ export class LitTable extends HTMLElement { JSONToCSV.csvExport({ columns: this.columns as any[], tables: this.ds, - fileName: date.getTime() + '', + fileName: `${date.getTime()}`, columnFormatter: this.itemTextHandleMap, }).then((res) => { this.exportLoading = false; @@ -479,25 +480,25 @@ export class LitTable extends HTMLElement { }); } - exportExcelData() { + exportExcelData(): void { let now = Date.now(); ExcelFormater.testExport( [ { columns: this.columns as any[], tables: this.ds, - sheetName: now + '', + sheetName: `${now}`, }, ], - now + '' + `${now}` ); } formatExportData(dataSource: any[]): any[] { - if (dataSource == undefined || dataSource.length == 0) { + if (dataSource === undefined || dataSource.length === 0) { return []; } - if (this.columns == undefined) { + if (this.columns === undefined) { return []; } return dataSource.map((item) => { @@ -505,14 +506,14 @@ export class LitTable extends HTMLElement { this.columns!.forEach((column) => { let dataIndex = column.getAttribute('data-index'); let columnName = column.getAttribute('title'); - if (columnName == '') { + if (columnName === '') { columnName = dataIndex; } if (dataIndex && columnName && item[dataIndex] != undefined) { formatData[columnName] = item[dataIndex]; } }); - if (item.children != undefined) { + if (item.children !== undefined) { formatData.children = this.formatExportData(item.children); } return formatData; @@ -520,7 +521,7 @@ export class LitTable extends HTMLElement { } formatExportCsvData(dataSource: any[]): string { - if (dataSource == undefined || dataSource.length == 0) { + if (dataSource === undefined || dataSource.length === 0) { return ''; } if (this.columns == undefined) { @@ -530,7 +531,7 @@ export class LitTable extends HTMLElement { str += this.columns!.map((column) => { let dataIndex = column.getAttribute('data-index'); let columnName = column.getAttribute('title'); - if (columnName == '') { + if (columnName === '') { columnName = dataIndex; } return columnName; @@ -548,17 +549,17 @@ export class LitTable extends HTMLElement { return `"${item[dataIndex] || ''}" `; }) .join(','); - if (item.children != undefined) { + if (item.children !== undefined) { concatStr += this.recursionExportTableData(columns, item.children); } - if (index != dataSource.length - 1) { + if (index !== dataSource.length - 1) { concatStr += '\r\n'; } }); return concatStr; } - injectColumns() { + injectColumns(): void { this.columns = this.st!.assignedElements(); this.columns.forEach((column) => { if (column.tagName === 'LIT-TABLE-COLUMN') { @@ -567,7 +568,7 @@ export class LitTable extends HTMLElement { }); } - setStatus(list: any, status: boolean, depth: number = 0) { + setStatus(list: any, status: boolean, depth: number = 0): void { this.tableElement!.scrollTop = 0; // 添加depth参数，让切换图标的代码在递归中只走一遍 if (depth === 0) { @@ -581,14 +582,14 @@ export class LitTable extends HTMLElement { } for (let item of list) { item.status = status; - if (item.children != undefined && item.children.length > 0) { + if (item.children !== undefined && item.children.length > 0) { this.setStatus(item.children, status, depth + 1); } } } //当 custom element首次被插入文档DOM时，被调用。 - connectedCallback() { + connectedCallback(): void { this.st = this.shadowRoot?.querySelector('#slot'); this.tableElement = this.shadowRoot?.querySelector('.table'); this.exportProgress = this.shadowRoot?.querySelector('#export_progress_bar'); @@ -614,7 +615,7 @@ export class LitTable extends HTMLElement { formatStr += ' '; } formatStr += strings[i]; - if (i != 0 && i % length == length - 1) { + if (i !== 0 && i % length === length - 1) { formatStr += '\n'; } } @@ -810,13 +811,13 @@ export class LitTable extends HTMLElement { this.dispatchEvent( new CustomEvent('button-click', { detail: { - key: key + key: key, }, - composed: true + composed: true, }) ); - event.stopPropagation() - }) + event.stopPropagation(); + }); } h.style.justifyContent = a.getAttribute('align'); this.gridTemplateColumns.push(a.getAttribute('width') || '1fr'); @@ -871,7 +872,7 @@ export class LitTable extends HTMLElement { private beforeResizeWidth1: number = 0; private beforeResizeWidth2: number = 0; - resizeEventHandler(header: HTMLDivElement, element: HTMLDivElement, index: number) { + resizeEventHandler(header: HTMLDivElement, element: HTMLDivElement, index: number): void { header.addEventListener('mousemove', (event) => { if (!this.columnResizeEnable) return; if (this.isResize) { @@ -940,15 +941,15 @@ export class LitTable extends HTMLElement { } // Is called when the custom element is removed from the document DOM. - disconnectedCallback() {} + disconnectedCallback(): void {} // It is called when the custom element is moved to a new document. - adoptedCallback() {} + adoptedCallback(): void {} // It is called when a custom element adds, deletes, or modifies its own properties. - attributeChangedCallback(name: string, oldValue: string, newValue: string) {} + attributeChangedCallback(name: string, oldValue: string, newValue: string): void {} - fixed(td: HTMLElement, placement: string, bgColor: string) { + fixed(td: HTMLElement, placement: string, bgColor: string): void { td.style.position = 'sticky'; if (placement === 'left') { td.style.left = '0px'; @@ -959,7 +960,7 @@ export class LitTable extends HTMLElement { } } - getCheckRows() { + getCheckRows(): any[] { // @ts-ignore return [...this.shadowRoot!.querySelectorAll('div[class=tr][checked]')] .map((a) => (a as any).data) @@ -969,7 +970,7 @@ export class LitTable extends HTMLElement { }); } - deleteRowsCondition(fn: any) { + deleteRowsCondition(fn: any): void { this.shadowRoot!.querySelectorAll('div[class=tr]').forEach((tr) => { // @ts-ignore if (fn(tr.data)) { @@ -978,11 +979,11 @@ export class LitTable extends HTMLElement { }); } - meauseElementHeight(rowData: any) { + meauseElementHeight(rowData: any): number { return 27; } - meauseTreeElementHeight(rowData: any, depth: number) { + meauseTreeElementHeight(rowData: any, depth: number): number { return 27; } @@ -1302,9 +1303,9 @@ export class LitTable extends HTMLElement { this.setMouseIn(false, [newTableElement]); } }; - td.onclick = () => { + td.onmouseup = (e: MouseEvent) => { let indexOf = this.currentTreeDivList.indexOf(td); - this.dispatchRowClickEvent(rowData, [td, newTableElement]); + this.dispatchRowClickEvent(rowData, [td, newTableElement], e); }; this.setHighLight(rowData.data.isSearch, td); this.treeElement!.style.width = column.getAttribute('width'); @@ -1318,7 +1319,13 @@ export class LitTable extends HTMLElement { td.style.whiteSpace = 'nowrap'; let text = this.formatName(dataIndex, rowData.data[dataIndex]); if (text.indexOf('<') === -1) { - td.title = text; + if (dataIndex === 'selfTimeStr' && rowData.data.chartFrameChildren) { + td.title = rowData.data.selfTime + 'ns'; + } else if (dataIndex === 'totalTimeStr' && rowData.data.chartFrameChildren) { + td.title = rowData.data.totalTime + 'ns'; + } else { + td.title = text; + } } td.dataIndex = dataIndex; td.style.justifyContent = column.getAttribute('align') || 'flex-start'; @@ -1359,14 +1366,14 @@ export class LitTable extends HTMLElement { this.setMouseIn(false, [this.treeElement?.children[indexOf] as HTMLElement]); } }; - newTableElement.onclick = (e) => { + newTableElement.onmouseup = (e: MouseEvent) => { let indexOf = this.currentRecycleList.indexOf(newTableElement); - this.dispatchRowClickEvent(rowData, [this.treeElement?.children[indexOf] as HTMLElement, newTableElement]); + this.dispatchRowClickEvent(rowData, [this.treeElement?.children[indexOf] as HTMLElement, newTableElement], e); }; return newTableElement; } - createBtn(rowData: any) { + createBtn(rowData: any): any { let btn: any = document.createElement('lit-icon'); btn.classList.add('tree-icon'); if (rowData.data.expanded) { @@ -1404,7 +1411,7 @@ export class LitTable extends HTMLElement { return btn; } - createExpandBtn(rowData: any) { + createExpandBtn(rowData: any): any { let btn: any = document.createElement('lit-icon'); btn.classList.add('tree-icon'); // @ts-ignore @@ -1472,8 +1479,8 @@ export class LitTable extends HTMLElement { return btn; } - reMeauseHeight() { - if (this.currentRecycleList.length == 0) { + reMeauseHeight(): void { + if (this.currentRecycleList.length === 0) { return; } let totalHeight = 0; @@ -1497,7 +1504,7 @@ export class LitTable extends HTMLElement { } } let reduce = this.currentRecycleList.map((item) => item.clientHeight).reduce((a, b) => a + b, 0); - if (reduce == 0) { + if (reduce === 0) { return; } while (reduce <= this.tableElement!.clientHeight + 1) { @@ -1549,7 +1556,11 @@ export class LitTable extends HTMLElement { td.style.justifyContent = column.getAttribute('align') || 'flex-start'; let text = this.formatName(dataIndex, rowData.data[dataIndex]); if (text.indexOf('<') === -1) { - td.title = text; + if (dataIndex === 'totalTimeStr' && rowData.data.chartFrameChildren) { + td.title = rowData.data.totalTime + 'ns'; + } else { + td.title = text; + } } // 如果表格中有模板的情况，将模板中的数据放进td中，没有模板，直接将文本放进td // 但是对于Current Selection tab页来说，表格前两列是时间，第三列是input标签，第四列是button标签 @@ -1582,8 +1593,8 @@ export class LitTable extends HTMLElement { } newTableElement.append(td); }); - newTableElement.onclick = () => { - this.dispatchRowClickEvent(rowData, [newTableElement]); + newTableElement.onmouseup = (e: MouseEvent) => { + this.dispatchRowClickEvent(rowData, [newTableElement], e); }; newTableElement.onmouseenter = () => { this.dispatchRowHoverEvent(rowData, [newTableElement]); @@ -1603,7 +1614,7 @@ export class LitTable extends HTMLElement { return newTableElement; } - getWheelStatus(element: any) { + getWheelStatus(element: any): void { element.addEventListener('wheel', (event: WheelEvent) => { if (element.scrollWidth !== element.offsetWidth) { event.preventDefault(); @@ -1612,9 +1623,13 @@ export class LitTable extends HTMLElement { }); } - renderTable() { - if (!this.columns) return; - if (!this.ds) return; // If no data source is set, it is returned directly + renderTable(): void { + if (!this.columns) { + return; + } + if (!this.ds) { + return; + } // If no data source is set, it is returned directly this.normalDs = []; this.tbodyElement!.innerHTML = ''; // Clear the table contents this.ds.forEach((rowData: any) => { @@ -1645,6 +1660,9 @@ export class LitTable extends HTMLElement { tblRowElement.appendChild(tblBox); } this.tableColumns!.forEach((tblColumn) => { + tblColumn.addEventListener('contextmenu', (e) => { + e.preventDefault(); + }); let dataIndex = tblColumn.getAttribute('data-index') || '1'; gridTemplateColumns.push(tblColumn.getAttribute('width') || '1fr'); if (tblColumn.template) { @@ -1706,7 +1724,7 @@ export class LitTable extends HTMLElement { }); } - freshCurrentLine(element: HTMLElement, rowObject: TableRowObject, firstElement?: HTMLElement) { + freshCurrentLine(element: HTMLElement, rowObject: TableRowObject, firstElement?: HTMLElement): void { if (!rowObject) { if (firstElement) { firstElement.style.display = 'none'; @@ -1719,8 +1737,8 @@ export class LitTable extends HTMLElement { element.childNodes.forEach((child) => { if (child.nodeType != 1) return; childIndex++; - let idx = firstElement != undefined ? childIndex + 1 : childIndex; - if (firstElement != undefined && childIndex == 0) { + let idx = firstElement !== undefined ? childIndex + 1 : childIndex; + if (firstElement !== undefined && childIndex === 0) { this.setHighLight(rowObject.data.isSearch, firstElement); (firstElement as any).data = rowObject.data; if ((this.columns![0] as any).template) { @@ -1780,9 +1798,9 @@ export class LitTable extends HTMLElement { edgeNameText.append(span); } if ( - (rowObject.data.nodeType == NodeType.STRING || - rowObject.data.nodeType == NodeType.CONCATENATED_STRING || - rowObject.data.nodeType == NodeType.SLICED_STRING) && + (rowObject.data.nodeType === NodeType.STRING || + rowObject.data.nodeType === NodeType.CONCATENATED_STRING || + rowObject.data.nodeType === NodeType.SLICED_STRING) && rowObject.data.type != ConstructorType.ClassType ) { nodeText.style.color = '#d53d3d'; @@ -1793,11 +1811,11 @@ export class LitTable extends HTMLElement { if (rowObject.data.rowName === 'cpu-profiler') { this.createTextColor(rowObject, firstElement); } - firstElement.onclick = () => { - this.dispatchRowClickEvent(rowObject, [firstElement, element]); + firstElement.onmouseup = (e: MouseEvent) => { + this.dispatchRowClickEvent(rowObject, [firstElement, element], e); }; firstElement.style.transform = `translateY(${rowObject.top - this.tableElement!.scrollTop}px)`; - if (rowObject.data.isSelected != undefined) { + if (rowObject.data.isSelected !== undefined) { this.setSelectedRow(rowObject.data.isSelected, [firstElement]); } else { this.setSelectedRow(false, [firstElement]); @@ -1814,34 +1832,42 @@ export class LitTable extends HTMLElement { (child as HTMLElement).title = text; } else { (child as HTMLElement).innerHTML = text; - (child as HTMLElement).title = text; + if (dataIndex === 'selfTimeStr' && rowObject.data.chartFrameChildren) { + (child as HTMLElement).title = rowObject.data.selfTime + 'ns'; + } else if (dataIndex === 'totalTimeStr' && rowObject.data.chartFrameChildren) { + (child as HTMLElement).title = rowObject.data.totalTime + 'ns'; + } else if (dataIndex === 'timeStr' && rowObject.data instanceof JsCpuProfilerStatisticsStruct) { + (child as HTMLElement).title = rowObject.data.time + 'ns'; + } else { + (child as HTMLElement).title = text; + } } } }); - if (element.style.display == 'none') { + if (element.style.display === 'none') { element.style.display = 'grid'; } element.style.transform = `translateY(${rowObject.top}px)`; - if (firstElement && firstElement.style.display == 'none') { + if (firstElement && firstElement.style.display === 'none') { firstElement.style.display = 'flex'; } - element.onclick = (e) => { - if (firstElement != undefined) { - this.dispatchRowClickEvent(rowObject, [firstElement, element]); + element.onmouseup = (e: MouseEvent) => { + if (firstElement !== undefined) { + this.dispatchRowClickEvent(rowObject, [firstElement, element], e); } else { - this.dispatchRowClickEvent(rowObject, [element]); + this.dispatchRowClickEvent(rowObject, [element], e); } }; element.onmouseenter = () => { this.dispatchRowHoverEvent(rowObject, [element]); }; (element as any).data = rowObject.data; - if (rowObject.data.isSelected != undefined) { + if (rowObject.data.isSelected !== undefined) { this.setSelectedRow(rowObject.data.isSelected, [element]); } else { this.setSelectedRow(false, [element]); } - if (rowObject.data.isHover != undefined) { + if (rowObject.data.isHover !== undefined) { this.setMouseIn(rowObject.data.isHover, [element]); } else { this.setMouseIn(false, [element]); @@ -1851,10 +1877,12 @@ export class LitTable extends HTMLElement { } } - setSelectedRow(isSelected: boolean, rows: any[]) { + setSelectedRow(isSelected: boolean, rows: any[]): void { if (isSelected) { rows.forEach((row) => { - if (row.classList.contains('mouse-in')) row.classList.remove('mouse-in'); + if (row.classList.contains('mouse-in')) { + row.classList.remove('mouse-in'); + } row.classList.add('mouse-select'); }); } else { @@ -1864,7 +1892,7 @@ export class LitTable extends HTMLElement { } } - setMouseIn(isMouseIn: boolean, rows: any[]) { + setMouseIn(isMouseIn: boolean, rows: any[]): void { if (isMouseIn) { rows.forEach((row) => { row.classList.add('mouse-in'); @@ -1876,11 +1904,11 @@ export class LitTable extends HTMLElement { } } - scrollToData(data: any) { + scrollToData(data: any): void { if (this.isRecycleList) { if (this.recycleDs.length > 0) { let filter = this.recycleDs.filter((item) => { - return item.data == data; + return item.data === data; }); if (filter.length > 0) { this.tableElement!.scrollTop = filter[0].top; @@ -1890,7 +1918,7 @@ export class LitTable extends HTMLElement { } else { if (this.normalDs.length > 0) { let filter = this.normalDs.filter((item) => { - return item.data == data; + return item.data === data; }); if (filter.length > 0) { this.tableElement!.scrollTop = filter[0].top; @@ -1899,7 +1927,7 @@ export class LitTable extends HTMLElement { } } - expandList(datasource: any[]) { + expandList(datasource: any[]): void { let filter = this.recycleDs.filter((item) => { return datasource.indexOf(item.data) != -1; }); @@ -1912,7 +1940,7 @@ export class LitTable extends HTMLElement { this.reMeauseHeight(); } - clearAllSelection(rowObjectData: any) { + clearAllSelection(rowObjectData: any): void { if (this.isRecycleList) { this.recycleDs.forEach((item) => { if (item.data != rowObjectData && item.data.isSelected) { @@ -1931,7 +1959,7 @@ export class LitTable extends HTMLElement { } } - clearAllHover(rowObjectData: any) { + clearAllHover(rowObjectData: any): void { if (this.isRecycleList) { this.recycleDs.forEach((item) => { if (item.data != rowObjectData && item.data.isHover) { @@ -1950,7 +1978,7 @@ export class LitTable extends HTMLElement { } } - mouseOut() { + mouseOut(): void { if (this.isRecycleList) { this.recycleDs.forEach((item) => (item.data.isHover = false)); this.setMouseIn(false, this.currentTreeDivList); @@ -2041,10 +2069,11 @@ export class LitTable extends HTMLElement { ); } - dispatchRowClickEvent(rowObject: any, elements: any[]): void { + dispatchRowClickEvent(rowObject: any, elements: any[], event: MouseEvent): void { this.dispatchEvent( new CustomEvent('row-click', { detail: { + button: event.button, ...rowObject.data, data: rowObject.data, callBack: (isSelected: boolean): void => { diff --git a/ide/src/base-ui/tree/LitTree.ts b/ide/src/base-ui/tree/LitTree.ts index 9890d8bbc..86ab8286c 100644 --- a/ide/src/base-ui/tree/LitTree.ts +++ b/ide/src/base-ui/tree/LitTree.ts @@ -23,6 +23,7 @@ export interface TreeItemData { icon?: string; //节点的自定义图标 设置show-icon才会生效 selected?: boolean; //控制是否选择该节点 checked?: boolean; + disable?: boolean; //控制是否显示checkbox children?: Array | null | undefined; } diff --git a/ide/src/base-ui/tree/LitTreeNode.ts b/ide/src/base-ui/tree/LitTreeNode.ts index a89002870..3bae8087c 100644 --- a/ide/src/base-ui/tree/LitTreeNode.ts +++ b/ide/src/base-ui/tree/LitTreeNode.ts @@ -152,6 +152,9 @@ export class LitTreeNode extends BaseElement { }; this.checkboxElement!.onchange = (e: any): boolean => { e.stopPropagation(); + if (this._data && this._data.disable === true) { + return false; + } this.onChange(e.detail.checked); return false; }; @@ -161,6 +164,9 @@ export class LitTreeNode extends BaseElement { }; this.itemElement!.onclick = (e): void => { e.stopPropagation(); + if (this._data && this._data.disable === true) { + return; + } this.onChange(!this.data?.checked); }; } @@ -467,7 +473,7 @@ export class LitTreeNode extends BaseElement { } } else if (name === 'checkable') { if (this.checkboxElement) { - if (newValue === 'true') { + if (newValue === 'true' && this._data!.disable !== true) { this.checkboxElement!.style.display = 'inline-block'; } else { this.checkboxElement!.style.display = 'none'; diff --git a/ide/src/doc/md/quickstart_ability_monitor.html b/ide/src/doc/md/quickstart_ability_monitor.html new file mode 100644 index 000000000..23fa882ad --- /dev/null +++ b/ide/src/doc/md/quickstart_ability_monitor.html @@ -0,0 +1,387 @@ + + quickstart_ability_monitor + + + + + + + + + + + + + +
    + +

    Ability Monitor 抓取和展示说明

    +

    抓取和展示处理的 CPU，内存，磁盘 IO 和网络使用情况统计。

    +

    Ability Monitor 的抓取

    +

    Ability Monitor 抓取界面配置说明

    +

    点击 Probes config，如选择抓取 AbilityMonitor。
    +GitHub Logo

    +

    Ability Monitor 文件的抓取

    +

    点击 Record setting，在 output file path 输入文件名 hiprofiler_data_abilitymonitor.htrace，拖动滚动条设置 buffer size 大小是 64M，抓取时长是 50s。
    +GitHub Logo
    +点击 Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。
    +GitHub Logo
    +输入 hdc_shell，进入设备，执行命令。
    +GitHub Logo
    +进入指定目录，cd /data/local/tmp 进入到目录，会看到生成的 trace 文件。
    +GitHub Logo

    +

    Ability Monitor 功能介绍

    +

    将抓取的文件导入到 smartperf 工具查看，能了解 CPU，内存，磁盘 IO 和网络的使用情况。

    +

    Ability Monitor 泳道图展示

    +

    Ability Monitor 展开就可以看到泳道图，包括 CPU，内存，磁盘 IO，网络的使用情况。
    +GitHub Logo

    +
      +
    • +
      CPU Total Load：总的CPU使用率。
+
      +
      • +
    • +
      CPU User Load：CPU在用户态空间运行的使用率。
+
      +
      • +
    • +
      CPU System Load：CPU在内核空间运行的使用率。
+
      +
      • +
    • +
      MemoryTotal： 总计物理内存的大小。
+
      +
      • +
    • +
      Cached：缓存的大小。
+
      +
      • +
    • +
      SwapTotal： 虚拟内存。
+
      +
      • +
    • +
      Disk Bytes Read/Sec：每秒从磁盘读取到内存的字节数。
+
      +
      • +
    • +
      Disk Bytes Written/Sec： 每秒从内存写入磁盘的字节数。
+
      +
      • +
    • +
      Disk Read Ops/Sec：读入的字节数。
+
      +
      • +
    • +
      Disk Written Ops/Sec： 写入的字节数。
+
      +
      • +
    • +
      Network Bytes In/Sec：每秒接收的网络数据字节数。
+
      +
      • +
    • +
      Network Bytes Out/Sec： 每秒发送的网络数据字节数。
+
      +
      • +
    • +
      Network Packets In/Sec：每秒接收的网络数据包数。
+
      +
      • +
    • +
      Network Packets Out/Sec： 每秒发送的网络数据包数。
+
      +
      • +
    +

    Ability Monitor 泳道图的框选功能

    +

    可以对 CPU，内存，磁盘 IO 和网络的数据进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有六个 tab 页。
    +Live Processes 的 Tab 页如图：
    +GitHub Logo

    +
      +
    • +
      Process ID：进程的ID。
+
      +
      • +
    • +
      Process Name：进程名称。
+
      +
      • +
    • +
      Responsible Process：父进程ID。
+
      +
      • +
    • +
      User ID：用户ID。
+
      +
      • +
    • +
      %CPU：进程的CPU占用率。
+
      +
      • +
    • +
      CPU Time：CPU运行时间。
+
      +
      • +
    • +
      #Threads：进程的线程数量。
+
      +
      • +
    • +
      Memory：内存值。
+
      +
      • +
    • +
      Disk Writes(B)：磁盘读入的字节数。
+
      +
      • +
    • +
      Disk Reads(B)：磁盘写入的字节数。
+
      +Processes History 的 Tab 页如图：
      +GitHub Logo
      • +
    • +
      Process ID：进程ID。
+
      +
      • +
    • +
      Alive：进程是否存活。
+
      +
      • +
    • +
      First Seen：开始时间。
+
      +
      • +
    • +
      Last Seen：所选区域的结束时间。
+
      +
      • +
    • +
      Process Name：进程名称。
+
      +
      • +
    • +
      Responsible Process：父进程ID。
+
      +
      • +
    • +
      User ID：用户ID。
+
      +
      • +
    • +
      CPU Time：CPU运行时间。
+
      +框选 CPU Total Load，CPU User Load，CPU System Load 三个区域的泳道图，会展示 System CPU Summary 的 Tab 页。
      +GitHub Logo
      • +
    • +
      Start Time：采集时间的时间戳。
+
      +
      • +
    • +
      Duration：前一次采集到本次采集的时间差。
+
      +
      • +
    • +
      TotalLoad%：总的CPU使用率。
+
      +
      • +
    • +
      UserLoad%：CPU在用户态空间运行的使用率。
+
      +
      • +
    • +
      SystemLoad%：CPU在内核空间运行的使用率。
+
      +
      • +
    • +
      Process：进程号。
+
      +框选 MemoryTotal，Cached，SwapTota 三个区域的泳道图，会展示 System Memory Summary 的 Tab 页。
      +GitHub Logo
      • +
    • +
      Start Time：采集时间的时间戳。
+
      +
      • +
    • +
      Duration：前一次采集到本次采集的时间差。
+
      +
      • +
    • +
      MemTotal：总内存大小。
+
      +
      • +
    • +
      MemFree：空闲内存大小。
+
      +
      • +
    • +
      Buffers：文件的缓冲大小。
+
      +
      • +
    • +
      Cached：缓存的大小。
+
      +
      • +
    • +
      Shmem：已被分配的共享内存大小。
+
      +
      • +
    • +
      Slab：内核数据缓存大小。
+
      +
      • +
    • +
      SUnreclaim：不可回收的Slab大小。
+
      +
      • +
    • +
      Swap Toal：交换空间的总大小。
+
      +
      • +
    • +
      SwapFree：未被使用交换空间的大小。
+
      +
      • +
    • +
      Mapped：设备和文件等映射的大小。
+
      +
      • +
    • +
      VmallocUsed：已被使用的虚拟内存大小。
+
      +
      • +
    • +
      PageTables：管理内存分页的索引表大小。
+
      +
      • +
    • +
      KernelStack：Kernel消耗的内存。
+
      +
      • +
    • +
      Active： 在活跃使用中的缓冲或高速缓冲存储器页面文件的大小。
+
      +
      • +
    • +
      Inactive：在不经常使用中的缓冲或高速缓冲存储器页面文件的大小。
+
      +
      • +
    • +
      Unevictable：不能被释放的内存页。
+
      +
      • +
    • +
      VmallocTotal：可以vmalloc虚拟内存大小。
+
      +
      • +
    • +
      CmaTotal：总的连续可用内存。
+
      +
      • +
    • +
      CmaFree：空闲的可用内存。
+
      +框选 Disk Bytes Read/Sec，Disk Bytes Written/Sec，Disk Read Ops/Sec，Disk Written Ops/Sec 四个区域的泳道图，会展示 System Disk Summary 的 Tab 页。
      +GitHub Logo
      • +
    • +
      Start Time：采集时间的时间戳。
+
      +
      • +
    • +
      Duration：前一次采集到本次采集的时间差。
+
      +
      • +
    • +
      Data Read：从磁盘读取到内存的总字节数。
+
      +
      • +
    • +
      Data Read/sec：每秒从磁盘读取到内存的字节数。
+
      +
      • +
    • +
      Data Write：从内存写入磁盘的总字节数。
+
      +
      • +
    • +
      Data Write/sec：每秒从内存写入磁盘的字节数。
+
      +
      • +
    • +
      Reads In：读入的字节数。
+
      +
      • +
    • +
      Reads In/sec：每秒读入的字节数。
+
      +
      • +
    • +
      Write Out：写入的字节数。
+
      +
      • +
    • +
      Write Out/sec：每秒写入的字节数。
+
      +框选 Network Bytes In/Sec，Network Bytes Out/Sec，Network Packets In/Sec，Network Packets Out/Sec 四个区域的泳道图，会展示 System Network Summary 的 Tab 页。
      +GitHub Logo
      • +
    • +
      Start Time：采集时间的时间戳。
+
      +
      • +
    • +
      Duration：前一次采集到本次采集的时间差。
+
      +
      • +
    • +
      Data Received：接收的网络数据总字节数。
+
      +
      • +
    • +
      Data Received/sec：每秒接收的网络数据字节数。
+
      +
      • +
    • +
      Data Send：发送的网络数据总字节数。
+
      +
      • +
    • +
      Data Send/sec：每秒发送的网络数据字节数。
+
      +
      • +
    • +
      Packets In：接收的网络总数据包数。
+
      +
      • +
    • +
      Packets In/sec：每秒接收的网络数据包数。
+
      +
      • +
    • +
      Packets Out：发送的网络总数据包数。
+
      +
      • +
    • +
      Packets Out/sec：每秒发送的网络数据包数。
+
      +
      • +
    + +
    + + + + + + + + + + \ No newline at end of file diff --git a/ide/src/trace/bean/BoxSelection.ts b/ide/src/trace/bean/BoxSelection.ts index 7863db6c8..3f32e165c 100644 --- a/ide/src/trace/bean/BoxSelection.ts +++ b/ide/src/trace/bean/BoxSelection.ts @@ -22,6 +22,7 @@ import { FrameAnimationStruct } from '../database/ui-worker/ProcedureWorkerFrame import { FrameSpacingStruct } from '../database/ui-worker/ProcedureWorkerFrameSpacing.js'; import { JsCpuProfilerChartFrame } from './JsStruct.js'; import { LogStruct } from '../database/ui-worker/ProcedureWorkerLog.js'; +import { HiSysEventStruct } from '../database/ui-worker/ProcedureWorkerHiSysEvent.js'; export class SelectionParam { recordStartNs: number = 0; @@ -40,6 +41,7 @@ export class SelectionParam { isCurrentPane: boolean = false; startup: boolean = false; staticInit: boolean = false; + isRowClick: boolean = false; cpus: Array = []; cpuStateRowsId: Array = []; @@ -65,6 +67,7 @@ export class SelectionParam { diskAbilityIds: Array = []; networkAbilityIds: Array = []; perfSampleIds: Array = []; + perfEventTypeId?: number; perfCpus: Array = []; perfProcess: Array = []; perfThread: Array = []; @@ -109,6 +112,7 @@ export class SelectionParam { dmaVmTrackerData: Array = []; gpuMemoryTrackerData: Array = []; hiLogs: Array = []; + hiSysEvents: Array = []; } export class BoxJumpParam { diff --git a/ide/src/trace/bean/EbpfStruct.ts b/ide/src/trace/bean/EbpfStruct.ts new file mode 100644 index 000000000..45c37c288 --- /dev/null +++ b/ide/src/trace/bean/EbpfStruct.ts @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export class CallTreeLevel { + processId?: number; + threadId?: number; + typeId?: number; + libId?: number; + libName?: string; + symbolId?: number; + symbolName?: string; +} diff --git a/ide/src/trace/bean/FrameChartStruct.ts b/ide/src/trace/bean/FrameChartStruct.ts index 08c31e8cf..f44e5477c 100644 --- a/ide/src/trace/bean/FrameChartStruct.ts +++ b/ide/src/trace/bean/FrameChartStruct.ts @@ -66,6 +66,8 @@ export class ChartStruct extends BaseStruct { tsArray: Array = []; countArray: Array = []; durArray: Array = []; + isThread: boolean = false; + isProcess: boolean = false; } export enum ChartMode { diff --git a/ide/src/trace/bean/NativeHook.ts b/ide/src/trace/bean/NativeHook.ts index 34ae8c57d..e5a617fce 100644 --- a/ide/src/trace/bean/NativeHook.ts +++ b/ide/src/trace/bean/NativeHook.ts @@ -165,3 +165,34 @@ export class NativeMemoryExpression { includeLib: Map = new Map(); abandonLib: Map = new Map(); } + +export class FilterByAnalysis { + symbolId?: number; + symbolName?: string; + libId?: number; + libName?: string; + tid?: number; + tName?: string; + type?: string; + typeId?: number; + + constructor( + typeId: number| undefined, + type: string | undefined, + tName: string | undefined, + tid: number | undefined, + libId: number | undefined, + libName: string | undefined, + symbolId: number | undefined, + symbolName: string | undefined + ) { + this.typeId = typeId; + this.libId = libId || -1; + this.libName = libName; + this.tid = tid; + this.tName = tName; + this.symbolId = symbolId; + this.symbolName = symbolName; + this.type = type; + } +} diff --git a/ide/src/trace/bean/PerfBottomUpStruct.ts b/ide/src/trace/bean/PerfBottomUpStruct.ts index ce0a8efef..beccdf1ad 100644 --- a/ide/src/trace/bean/PerfBottomUpStruct.ts +++ b/ide/src/trace/bean/PerfBottomUpStruct.ts @@ -22,6 +22,8 @@ export class PerfBottomUpStruct { totalTime: number = 0; totalTimeStr?: string; totalTimePercent: string = ''; + eventCount: number = 0; + eventPercent: string = ''; children: Array; frameChildren?: Array; isSearch: boolean = false; diff --git a/ide/src/trace/bean/PerfProfile.ts b/ide/src/trace/bean/PerfProfile.ts index de3ba331c..38eb16455 100644 --- a/ide/src/trace/bean/PerfProfile.ts +++ b/ide/src/trace/bean/PerfProfile.ts @@ -126,3 +126,12 @@ export class PerfStack { export class PerfCmdLine { report_value: string = ''; } + +export class PerfLevelStruct { + process?: number; + thread?: number; + libId?: number; + libName?: number; + symbolId?: number; + symbolName?: string; +} diff --git a/ide/src/trace/bean/PerfStruct.ts b/ide/src/trace/bean/PerfStruct.ts new file mode 100644 index 000000000..3952180f7 --- /dev/null +++ b/ide/src/trace/bean/PerfStruct.ts @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const ROW_TYPE = 'hiperf'; + +export class PerfFireChartStruct { + thread_id:number; + name: string; + depth: number; + selfTime: number; + totalTime: number; + id: number; + + constructor( + id: number, + name: string, + depth: number, + selfTime: number, + totalTime: number, + thread_id:number, + ) { + this.id = id; + this.name = name; + this.depth = depth; + this.selfTime = selfTime; + this.totalTime = totalTime; + this.thread_id = thread_id; + } +} + +// 绘图所需树结构模板 +export class HiPerfChartFrame extends PerfFireChartStruct { + startTime: number; + endTime: number; + children: Array; + isSelect: boolean = false; + line: number = 0; + column: number = 0; + thread_id: number=0; + + constructor( + id: number, + name: string, + startTime: number, + endTime: number, + totalTime: number, + depth: number, + thread_id:number, + ) { + super(id, name, depth, 0, totalTime,thread_id); + this.id = id; + this.startTime = startTime; + this.endTime = endTime; + this.thread_id = thread_id; + this.children = new Array(); + } +} \ No newline at end of file diff --git a/ide/src/trace/component/SpHelp.ts b/ide/src/trace/component/SpHelp.ts index 2db6c0f34..c87c806a5 100644 --- a/ide/src/trace/component/SpHelp.ts +++ b/ide/src/trace/component/SpHelp.ts @@ -186,19 +186,6 @@ export class SpHelp extends BaseElement { `/application/doc/quickstart_bio.html?${that.dark} width="100%" height="100%">`; }, }, - { - title: '进程smaps抓取和展示说明', - icon: '', - clickHandler: function (item: MenuItem) { - SpStatisticsHttpUtil.addOrdinaryVisitAction({ - event: 'smaps', - action: 'help_doc', - }); - that.appContent!.innerHTML = - ' { + private createHiSystemEventPluginConfig(domainName: string, eventName: string): ProfilerPluginConfig { let hiSystemEventConfig: HiSystemEventConfig = { msg: 'hisysevent-plugin', - processName: appName, + subscribe_domain : domainName, + subscribe_event : eventName, }; let hiSystemEventPlugin: ProfilerPluginConfig = { pluginName: 'hisysevent-plugin', diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 01467700a..1ab5d8b8e 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -102,6 +102,8 @@ import { TabPaneCounterSample } from './trace/sheet/cpu/TabPaneCounterSample.js' import { LitSearch } from './trace/search/Search.js'; import { TabPaneFlag } from './trace/timer-shaft/TabPaneFlag.js'; import { LitTabpane } from '../../base-ui/tabs/lit-tabpane.js'; +import { HiPerfCallChartStruct } from '../database/ui-worker/ProcedureWorkerHiPerfCallChart.js'; +import { HiSysEventStruct } from '../database/ui-worker/ProcedureWorkerHiSysEvent.js'; function dpr() { return window.devicePixelRatio || 1; @@ -696,15 +698,15 @@ export class SpSystemTrace extends BaseElement { if (!it.expansion) { memoryRows = [...it.childrenList]; } - const rowKey = it.rowId!.split(' '); + const rowKey = it.rowId!.split(' '); const process = { ipid: Number(rowKey[rowKey.length - 1]), - pid: Number(rowKey[rowKey.length - 2]) - } - if (!isExistPidInArray(selection.nativeMemoryAllProcess,process.pid)){ + pid: Number(rowKey[rowKey.length - 2]), + }; + if (!isExistPidInArray(selection.nativeMemoryAllProcess, process.pid)) { selection.nativeMemoryAllProcess.push(process); } - if (selection.nativeMemoryCurrentIPid === -1){ + if (selection.nativeMemoryCurrentIPid === -1) { selection.nativeMemoryCurrentIPid = process.ipid; } memoryRows.forEach((th) => { @@ -768,21 +770,21 @@ export class SpSystemTrace extends BaseElement { const key = it.rowParentId!.split(' '); const process = { ipid: Number(key[key.length - 1]), - pid: Number(key[key.length - 2]) + pid: Number(key[key.length - 2]), }; - if (!isExistPidInArray(selection.nativeMemoryAllProcess,process.pid)){ + if (!isExistPidInArray(selection.nativeMemoryAllProcess, process.pid)) { selection.nativeMemoryAllProcess.push(process); } - if (selection.nativeMemoryCurrentIPid === -1){ + if (selection.nativeMemoryCurrentIPid === -1) { selection.nativeMemoryCurrentIPid = process.ipid; } if (selection.nativeMemoryAllProcess) - if (it.getAttribute('heap-type') === 'native_hook_statistic') { - selection.nativeMemoryStatistic.push(it.rowId!); - } else { - selection.nativeMemory.push(it.rowId!); - } + if (it.getAttribute('heap-type') === 'native_hook_statistic') { + selection.nativeMemoryStatistic.push(it.rowId!); + } else { + selection.nativeMemory.push(it.rowId!); + } info('load nativeMemory traceRow id is : ', it.rowId); } else if (it.rowType == TraceRow.ROW_TYPE_MONITOR) { let abilityChildRows: Array> = [ @@ -851,7 +853,22 @@ export class SpSystemTrace extends BaseElement { if (it.rowType == TraceRow.ROW_TYPE_HIPERF_EVENT || it.rowType == TraceRow.ROW_TYPE_HIPERF_REPORT) { return; } + selection.perfEventTypeId = it.drawType === -2 ? undefined : it.drawType; selection.perfSampleIds.push(1); + if (it.rowType === TraceRow.ROW_TYPE_PERF_CALLCHART) { + let setting = it.getRowSettingKeys(); + if (setting && setting.length > 0) { + // 0:cpu,1:thread + let type = setting[0].indexOf('c') > -1 ? 0 : 1; + let id = Number(setting[0].indexOf('c') > -1 ? + setting[0].substring(0, setting[0].indexOf('c')) : setting[0].substring(0, setting[0].indexOf('t'))); + if (type === 0) { + selection.perfCpus.push(id); + } else { + selection.perfThread.push(id); + } + } + } if (it.rowType == TraceRow.ROW_TYPE_HIPERF_PROCESS) { let hiperfProcessRows: Array> = [ ...this.shadowRoot!.querySelectorAll>(`trace-row[row-parent-id='${it.rowId}']`), @@ -1248,6 +1265,13 @@ export class SpSystemTrace extends BaseElement { selection.hiLogs.push(...batch); currentIndex += batchSize; } + } else if (it.rowType === TraceRow.ROW_TYPE_HI_SYSEVENT) { + let systemEvents: HiSysEventStruct[] = it.dataList.filter( + (systemEventStruct: HiSysEventStruct) => + (systemEventStruct.ts ?? 0) >= TraceRow.rangeSelectObject!.startNS! && + (systemEventStruct.ts ?? 0) <= TraceRow.rangeSelectObject!.endNS! + ); + selection.hiSysEvents.push(...systemEvents); } if (this.rangeTraceRow!.length !== rows.length) { let event = this.createPointEvent(it); @@ -1602,6 +1626,7 @@ export class SpSystemTrace extends BaseElement { itln[0].y = itln[0].rowEL.translateY + itln[0].offsetY; itln[1].y = itln[1].rowEL.translateY + itln[1].offsetY; }); + this.hoverStructNull(); if (this.scrollTimer) { clearTimeout(this.scrollTimer); } @@ -2274,7 +2299,6 @@ export class SpSystemTrace extends BaseElement { } else { if (!this.rowsPaneEL!.containPoint(ev, { left: 248 })) { this.hoverStructNull(); - this.tipEL!.style.display = 'none'; } rows .filter((it) => it.focusContain(ev, this.inFavoriteArea!) && it.collect === this.inFavoriteArea) @@ -2291,7 +2315,6 @@ export class SpSystemTrace extends BaseElement { .forEach((tr) => { this.hoverStructNull(); if (this.currentRowType != tr.rowType) { - this.tipEL!.style.display = 'none'; this.currentRowType = tr.rowType || ''; } tr.findHoverStruct?.(); @@ -2330,6 +2353,8 @@ export class SpSystemTrace extends BaseElement { FrameSpacingStruct.hoverFrameSpacingStruct = undefined; JsCpuProfilerStruct.hoverJsCpuProfilerStruct = undefined; SnapshotStruct.hoverSnapshotStruct = undefined; + HiPerfCallChartStruct.hoverPerfCallCutStruct = undefined; + this.tipEL!.style.display = 'none'; } selectStructNull() { @@ -2353,6 +2378,7 @@ export class SpSystemTrace extends BaseElement { FrameDynamicStruct.selectFrameDynamicStruct = undefined; JsCpuProfilerStruct.selectJsCpuProfilerStruct = undefined; SnapshotStruct.selectSnapshotStruct = undefined; + HiPerfCallChartStruct.selectStruct = undefined; } isWASDKeyPress() { @@ -2915,7 +2941,12 @@ export class SpSystemTrace extends BaseElement { HeapStruct.hoverHeapStruct ) { HeapStruct.selectHeapStruct = HeapStruct.hoverHeapStruct; - this.traceSheetEL?.displayNativeHookData(HeapStruct.selectHeapStruct, row.rowId!); + const key = row.rowParentId!.split(' '); + let ipid = 1; + if (key.length > 0) { + ipid = Number(key[key.length - 1]); + } + this.traceSheetEL?.displayNativeHookData(HeapStruct.selectHeapStruct, row.rowId!, ipid); this.timerShaftEL?.modifyFlagList(undefined); } else if (clickRowType === TraceRow.ROW_TYPE_JANK && JankStruct.hoverJankStruct) { JankStruct.selectJankStructList.length = 0; @@ -3903,10 +3934,10 @@ export class SpSystemTrace extends BaseElement { processList.push(row.rowId!); }); if (query.includes('_')) { - query = query.replace('_', '\\_'); + query = query.replace(/_/g, '\\_'); } if (query.includes('%')) { - query = query.replace('%', '\\%'); + query = query.replace(/%/g, '\\%'); } let list = await querySceneSearchFunc(query, processList); cpuList = cpuList.concat(list); @@ -4439,7 +4470,7 @@ export class SpSystemTrace extends BaseElement { } if (this.tipEL) { this.tipEL.innerHTML = html; - if (row.rowType === TraceRow.ROW_TYPE_JS_CPU_PROFILER) { + if (row.rowType === TraceRow.ROW_TYPE_JS_CPU_PROFILER || row.rowType === TraceRow.ROW_TYPE_PERF_CALLCHART) { this.tipEL.style.maxWidth = row.clientWidth / 3 + 'px'; this.tipEL.style.wordBreak = ' break-all'; this.tipEL.style.height = 'unset'; diff --git a/ide/src/trace/component/chart/FrameChart.ts b/ide/src/trace/component/chart/FrameChart.ts index b39f3eaaf..1b4779108 100644 --- a/ide/src/trace/component/chart/FrameChart.ts +++ b/ide/src/trace/component/chart/FrameChart.ts @@ -18,7 +18,6 @@ import { Rect } from '../trace/timer-shaft/Rect.js'; import { ChartMode, ChartStruct, draw, setFuncFrame } from '../../bean/FrameChartStruct.js'; import { SpApplication } from '../../SpApplication.js'; import { Utils } from '../trace/base/Utils.js'; -import { SpHiPerf } from './SpHiPerf.js'; const scaleHeight = 30; // 刻度尺高度 const depthHeight = 20; // 调用栈高度 @@ -780,6 +779,8 @@ export class FrameChart extends BaseElement { } const name = hoverNode?.symbol.replace(//g, '>'); const percent = ((hoverNode?.percent || 0) * 100).toFixed(2); + const threadPercent = this.getCurrentPercentOfThread(hoverNode); + const processPercent = this.getCurrentPercentOfProcess(hoverNode); switch (this._mode) { case ChartMode.Byte: const size = Utils.getByteWithUnit(this.getNodeValue(hoverNode)); @@ -791,69 +792,90 @@ export class FrameChart extends BaseElement { Size: ${size} (${percent}%)
    Count: ${hoverNode?.count} (${countPercent}%)`; break; - case ChartMode.Count: - const count = this.getNodeValue(hoverNode); + case ChartMode.Duration: + const duration = Utils.getProbablyTime(this.getNodeValue(hoverNode)); this.hintContent = ` Name: ${name}
    Lib: ${hoverNode?.lib}
    - Addr: ${hoverNode?.addr} -
    - Count: ${count}`; - if (hoverNode.threadEventPercent) { + Addr: ${hoverNode?.addr}
    + Duration: ${duration} (${percent}%)`; + if (threadPercent) { this.hintContent += ` -
    - percentage in current Thread: ${ - hoverNode.threadPercent ? (hoverNode.threadPercent * 100).toFixed(2) : '' - }%`; +
    + % in current Thread: ${threadPercent}%`; } - if (hoverNode.processEventPercent) { + if (processPercent) { this.hintContent += ` -
    - percentage in current Process: ${ - hoverNode.processPercent ? (hoverNode.processPercent * 100).toFixed(2) : '' - }%`; +
    + % in current Process: ${processPercent}%`; } this.hintContent += `
    - percentage in all Process: ${percent}%`; - break; - case ChartMode.Duration: - const duration = Utils.getProbablyTime(this.getNodeValue(hoverNode)); - this.hintContent = ` - Name: ${name}
    - Lib: ${hoverNode?.lib} -
    - Addr: ${hoverNode?.addr}
    - Duration: ${duration} (${percent}%)`; + % in all Process: ${percent}%`; break; case ChartMode.EventCount: - const eventCount = this.getNodeValue(hoverNode); + case ChartMode.Count: + const label = ChartMode.Count === this._mode ? 'Count' : 'EventCount'; + const count = this.getNodeValue(hoverNode); this.hintContent = ` Name: ${name}
    Lib: ${hoverNode?.lib}
    Addr: ${hoverNode?.addr}
    - EventCount: ${eventCount}`; - if (hoverNode.threadEventPercent) { - this.hintContent += ` -
    - percentage in current Thread: ${ - hoverNode.threadEventPercent ? (hoverNode.threadEventPercent * 100).toFixed(2) + '%' : '' - }`; + ${label}: ${count}`; + if (threadPercent) { + this.hintContent += ` +
    + % in current Thread: ${threadPercent}%`; } - if (hoverNode.processEventPercent) { + if (processPercent) { this.hintContent += ` -
    - percentage in current Process: ${ - hoverNode.processEventPercent ? (hoverNode.processEventPercent * 100).toFixed(2) + '%' : '' - }%`; +
    + % in current Process: ${processPercent}%`; } this.hintContent += `
    - percentage in all Process: ${percent}%`; + % in all Process: ${percent}%`; + break; } } + private getCurrentPercentOfThread(node: ChartStruct): string { + const threadNode = this.findCurrentNodeThread(node); + if (threadNode) { + return ((this.getNodeValue(node) / this.getNodeValue(threadNode)) * 100).toFixed(2); + } + return ''; + } + + private getCurrentPercentOfProcess(node: ChartStruct): string { + const processNode = this.findCurrentNodeProcess(node); + if (processNode) { + return ((this.getNodeValue(node) / this.getNodeValue(processNode)) * 100).toFixed(2); + } + return ''; + } + + private findCurrentNodeThread(node: ChartStruct): ChartStruct | null { + while (node.parent) { + if (node.parent.isThread) { + return node.parent; + } + node = node.parent; + } + return null; + } + + private findCurrentNodeProcess(node: ChartStruct): ChartStruct | null { + while (node.parent) { + if (node.parent.isProcess) { + return node.parent; + } + node = node.parent; + } + return null; + } + /** * mouse on canvas move event */ @@ -886,14 +908,21 @@ export class FrameChart extends BaseElement { */ private listenerResize(): void { new ResizeObserver(() => { - if (this.canvas!.getBoundingClientRect()) { - const box = this.canvas!.getBoundingClientRect(); - const element = document.documentElement; - this.startX = box.left + Math.max(element.scrollLeft, document.body.scrollLeft) - element.clientLeft; - this.startY = - box.top + Math.max(element.scrollTop, document.body.scrollTop) - element.clientTop + this.canvasScrollTop; + this.resizeChange(); + if (this.rootNode) { + this.rootNode.frame!.width = this.canvas.clientWidth; } - }).observe(document.documentElement); + }).observe(this); + } + + public resizeChange(): void { + if (this.canvas!.getBoundingClientRect()) { + const box = this.canvas!.getBoundingClientRect(); + const element = document.documentElement; + this.startX = box.left + Math.max(element.scrollLeft, document.body.scrollLeft) - element.clientLeft; + this.startY = + box.top + Math.max(element.scrollTop, document.body.scrollTop) - element.clientTop + this.canvasScrollTop; + } } public initElements(): void { diff --git a/ide/src/trace/component/chart/PerfDataQuery.ts b/ide/src/trace/component/chart/PerfDataQuery.ts index 75af5bf4f..bd78066c5 100644 --- a/ide/src/trace/component/chart/PerfDataQuery.ts +++ b/ide/src/trace/component/chart/PerfDataQuery.ts @@ -18,6 +18,7 @@ import { PerfCall, PerfFile } from '../../bean/PerfProfile.js'; import { info } from '../../../log/Log.js'; import { SpHiPerf } from './SpHiPerf.js'; import { procedurePool } from '../../database/Procedure.js'; +import {PerfCallChain} from "../../database/logic-worker/ProcedureLogicWorkerPerf"; export class PerfDataQuery { filesData: any = {}; @@ -48,6 +49,19 @@ export class PerfDataQuery { this.callChainMap = results as any; info('Perf Files Data initialized'); } + + getLibName(fileId: number, symbolId: number) { + if (symbolId == -1) { + if (this.filesData[fileId] && this.filesData[fileId].length > 0) { + return this.filesData[fileId][0].fileName; + } + } else { + if (this.filesData[fileId] && this.filesData[fileId].length > symbolId) { + return this.filesData[fileId][symbolId].fileName; + } + } + return 'unknown'; + } } export const perfDataQuery = new PerfDataQuery(); diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index 122a11805..d9e4157b5 100644 --- a/ide/src/trace/component/chart/SpChartManager.ts +++ b/ide/src/trace/component/chart/SpChartManager.ts @@ -48,6 +48,7 @@ import { SpArkTsChart } from './SpArkTsChart.js'; import { MemoryConfig } from '../../bean/MemoryConfig.js'; import { FlagsConfig } from '../SpFlags.js'; import { SpLogChart } from './SpLogChart.js'; +import { SpHiSysEvent } from './SpHiSysEvent.js'; export class SpChartManager { static APP_STARTUP_PID_ARR: Array = []; @@ -70,6 +71,7 @@ export class SpChartManager { frameTimeChart: SpFrameTimeChart; public arkTsChart: SpArkTsChart; private logChart: SpLogChart; + private spHiSysEvent: SpHiSysEvent; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -90,6 +92,7 @@ export class SpChartManager { this.frameTimeChart = new SpFrameTimeChart(trace); this.arkTsChart = new SpArkTsChart(trace); this.logChart = new SpLogChart(trace); + this.spHiSysEvent = new SpHiSysEvent(trace); } async init(progress: Function) { @@ -128,6 +131,7 @@ export class SpChartManager { progress('cpu freq', 80); await this.freq.init(); await this.logChart.init(); + await this.spHiSysEvent.init(); progress('Clock init', 82); await this.clockChart.init(); progress('Irq init', 84); @@ -175,7 +179,7 @@ export class SpChartManager { await perfDataQuery.initPerfCache(); await this.nativeMemory.initNativeMemory(); await this.fileSystem.initFileCallchain(); - this.perf.updateChartData(); + this.perf.resetAllChartData(); } handleProcessThread(arr: { id: number; name: string; type: string }[]) { diff --git a/ide/src/trace/component/chart/SpHiPerf.ts b/ide/src/trace/component/chart/SpHiPerf.ts index 0c913ce60..e5f4562f2 100644 --- a/ide/src/trace/component/chart/SpHiPerf.ts +++ b/ide/src/trace/component/chart/SpHiPerf.ts @@ -28,6 +28,7 @@ import { import { Utils } from '../trace/base/Utils.js'; import { PerfThread } from '../../bean/PerfProfile.js'; import { HiperfCpuRender, HiPerfCpuStruct } from '../../database/ui-worker/ProcedureWorkerHiPerfCPU.js'; +import { HiPerfCallChartRender, HiPerfCallChartStruct } from '../../database/ui-worker/ProcedureWorkerHiPerfCallChart.js'; import { HiperfThreadRender, HiPerfThreadStruct } from '../../database/ui-worker/ProcedureWorkerHiPerfThread.js'; import { HiperfProcessRender, HiPerfProcessStruct } from '../../database/ui-worker/ProcedureWorkerHiPerfProcess.js'; import { info } from '../../../log/Log.js'; @@ -37,6 +38,8 @@ import { renders } from '../../database/ui-worker/ProcedureWorker.js'; import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; import { type HiPerfReportStruct } from '../../database/ui-worker/ProcedureWorkerHiPerfReport.js'; import { SpChartManager } from './SpChartManager.js'; +import { procedurePool } from '../../database/Procedure.js'; +import { HiPerfChartFrame } from '../../bean/PerfStruct.js'; export interface ResultData { existA: boolean | null | undefined; @@ -58,6 +61,12 @@ export class SpHiPerf { private group: any; private rowList: TraceRow[] | undefined; private eventTypeList: Array<{ id: number; report: string }> = []; + private allCombineDataMap = new Map(); + private callChartType: number = 0; + private callChartId: number = 0; + private eventTypeId: number = -2; + + public threadDataList: any = []; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -65,15 +74,22 @@ export class SpHiPerf { async init() { await this.initCmdLine(); + this.eventTypeList = await queryPerfEventType(); this.rowList = []; this.perfThreads = await queryPerfThread(); - this.eventTypeList = await queryPerfEventType(); info('PerfThread Data size is: ', this.perfThreads!.length); this.group = Utils.groupBy(this.perfThreads || [], 'pid'); + Reflect.ownKeys(this.group).forEach((v, i) => { + this.threadDataList.push((this.group[v] as Array).filter((item: any) => { return item.pid === item.tid })[0]) + }) this.cpuData = await queryHiPerfCpuMergeData2(); + this.callChartType = 0; + this.callChartId = 0; + this.eventTypeId = -2; this.maxCpuId = this.cpuData.length > 0 ? this.cpuData[0].cpu_id : -Infinity; if (this.cpuData.length > 0) { await this.initFolder(); + await this.initCallChart(); await this.initCpuMerge(); await this.initCpu(); await this.initProcess(); @@ -113,6 +129,7 @@ export class SpHiPerf { row.rowType = TraceRow.ROW_TYPE_HIPERF; row.rowParentId = ''; row.folder = true; + row.drawType = -2; row.rowSetting = 'enable'; row.rowSettingPopoverDirection = 'bottomLeft'; row.rowSettingList = [ @@ -121,36 +138,35 @@ export class SpHiPerf { title: 'Cpu Usage', checked: true, }, - { - key: '-1', - title: 'Event Type', - children: this.eventTypeList.map(et => { - return { - key: `${et.id}`, - title: et.report - }; - }), - }, + ...this.eventTypeList.map(et => { + return { + key: `${et.id}`, + title: et.report + }; + }), ]; row.onRowSettingChangeHandler = (value) => { let drawType = parseInt(value[0]); - row.childrenList.forEach((child) => { - if (child.drawType !== drawType) { - child.drawType = drawType; - child.dataList2 = []; - child.childrenList.forEach((sz) => { - sz.drawType = drawType - sz.dataList2 = []; - }); - } - }); - this.trace.getCollectRows((row) => row.rowType!.startsWith('hiperf-')).forEach((it) => { - if (it.drawType !== drawType) { - it.drawType = drawType; - it.dataList2 = []; - } - }); - this.trace.refreshCanvas(false); + if (this.eventTypeId !== drawType) { + this.eventTypeId = drawType; + row.drawType = drawType; + row.childrenList.forEach((child) => { + if (child.drawType !== drawType) { + child.drawType = drawType; + if (child.rowType === TraceRow.ROW_TYPE_PERF_CALLCHART) { + this.resetChartData(child); + } else { + child.drawType = drawType; + child.dataList2 = []; + child.childrenList.forEach((sz) => { + sz.drawType = drawType + sz.dataList2 = []; + }); + } + } + }); + this.trace.refreshCanvas(false); + } }; row.style.height = '40px'; if (SpHiPerf.stringResult?.existA === true) { @@ -186,6 +202,131 @@ export class SpHiPerf { this.trace.rowsEL?.appendChild(row); } + // callchartӾ + async initCallChart() { + let perfCallCutRow = TraceRow.skeleton(); + perfCallCutRow.rowId = `HiPerf-callchart`; + perfCallCutRow.index = 0; + perfCallCutRow.rowType = TraceRow.ROW_TYPE_PERF_CALLCHART; + perfCallCutRow.enableCollapseChart(); + perfCallCutRow.rowParentId = 'HiPerf'; + perfCallCutRow.rowHidden = !this.rowFolder.expansion; + perfCallCutRow.folder = false; + perfCallCutRow.drawType = -2; + perfCallCutRow.name = 'CallChart [cpu0]'; + perfCallCutRow.setAttribute('children', ''); + perfCallCutRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + perfCallCutRow.selectChangeHandler = this.trace.selectChangeHandler; + this.rowFolder.addChildTraceRow(perfCallCutRow); + perfCallCutRow.focusHandler = (): void => { + let hoverStruct = HiPerfCallChartStruct.hoverPerfCallCutStruct; + if (hoverStruct) { + let selfDur = hoverStruct?.totalTime || 0; + hoverStruct?.children?.forEach(child => { + selfDur -= child.totalTime; + }); + this.trace?.displayTip( + perfCallCutRow!, + HiPerfCallChartStruct.hoverPerfCallCutStruct, + `Name: + ${HiPerfCallChartStruct.hoverPerfCallCutStruct?.name || ''}
    + Lib: + ${perfDataQuery.getLibName(hoverStruct!.fileId,hoverStruct!.symbolId)}
    + Self Time: + ${Utils.getProbablyTime(selfDur || 0)}
    + Event Count: + ${HiPerfCallChartStruct.hoverPerfCallCutStruct?.eventCount || ''}
    ` + ); + } + }; + // @ts-ignore + perfCallCutRow.supplier = () => this.getHiPerfChartData(this.callChartType, this.callChartId, this.eventTypeId, perfCallCutRow); + perfCallCutRow.findHoverStruct = () => { + HiPerfCallChartStruct.hoverPerfCallCutStruct = perfCallCutRow.getHoverStruct(); + }; + await this.setCallTotalRow(perfCallCutRow, this.cpuData, this.threadDataList); + } + + // callchartѡť + async setCallTotalRow(row: TraceRow, cpuData: any = Array, threadData: any = Array) { + row.addTemplateTypes('hiperf-callchart'); + row.rowSetting = 'enable'; + row.rowSettingList = [ + { + key: "cpu", + title: 'Cpu', + disable: true, + children: [ + ...cpuData.reverse().map((it: any): { + key: string; + title: string; + checked?: boolean + } => { + return { + key: `${it.cpu_id}c`, + checked: it.cpu_id === 0, + title: `cpu${it.cpu_id}`, + }; + } + ), + ] + }, + { + key: "thread", + title: 'Thread', + disable: true, + children: [ + ...threadData.map( + (it: any): { + key: string; + title: string; + } => { + return { + key: `${it.tid}t`, + title: `${it.threadName || 'Thread'}(${it.tid})` + } + } + ) + ] + } + ]; + row.onRowSettingChangeHandler = (setting: any, nodes): void => { + if (setting && setting.length > 0) { + // 0:cpu,1:thread + let key = setting[0]; + let type = key.indexOf('c') > -1 ? 0 : 1; + let id = Number(key.indexOf('c') > -1 ? + key.substring(0, key.indexOf('c')) : key.substring(0, key.indexOf('t'))); + if (this.callChartType === type && this.callChartId === id) { + return; + } + this.callChartType = type; + this.callChartId = id; + row.name = `CallChart [${nodes[0].title}]`; + this.resetChartData(row); + this.trace.refreshCanvas(false); + } + }; + row.onThreadHandler = (useCache: any) => { + let context: CanvasRenderingContext2D; + if (row.currentContext) { + context = row.currentContext; + } else { + context = row.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + row.canvasSave(context); + (renders['HiPerf-callchart'] as HiPerfCallChartRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `HiPerf-callchart`, + }, + row + ); + row.canvasRestore(context); + }; + } + async initCpuMerge() { let cpuMergeRow = TraceRow.skeleton(); cpuMergeRow.rowId = `HiPerf-cpu-merge`; @@ -378,13 +519,79 @@ export class SpHiPerf { }); } - updateChartData() { - this.rowList?.forEach((it) => { - it.dataList = []; - it.dataList2 = []; - it.dataListCache = []; - it.isComplete = false; - }); + async getHiPerfChartData(type: number, id: number, eventTypeId: number, row: TraceRow) { + let source: Array = []; + await new Promise((resolve) => { + procedurePool.submitWithName('logic0', 'perf-callstack-chart', [type, id, eventTypeId], undefined, (res: any) => { + this.onlyOneSampleHandler(res); + this.getAllCombineData(res, source); + this.allCombineDataMap = new Map(); + for (let data of source) { + this.allCombineDataMap.set(data.id, data); + } + let max = 1; + for (let i = 0; i < source.length; i++) { + if (source[i].depth > max) { + max = source[i].depth + } + } + let maxHeight = max * 20; + row.funcMaxHeight = maxHeight; + if (row.funcExpand) { + row!.style.height = `${maxHeight}px`; + if (row.collect) { + window.publish(window.SmartEvent.UI.RowHeightChange, { + expand: true, + value: row.funcMaxHeight - 20, + }); + } + } + resolve(source); + }); + }) + return source; + } + + getAllCombineData( + combineData: Array, + allCombineData: Array + ): void { + for (let data of combineData) { + if (data.name != 'name') { + allCombineData.push(data); + } + if (data.children && data.children.length > 0) { + this.getAllCombineData(data.children, allCombineData); + } + } + } + + onlyOneSampleHandler(res: Array) : void{ + if (res.length === 1 && res[0].totalTime === 0) { + let deepFunc = (data: HiPerfChartFrame) => { + if (data.totalTime === 0) { + data.endTime = (window as any).totalNS; + data.totalTime = data.endTime - data.startTime; + if (data.children && data.children.length > 0) { + for (const child of data.children) { + deepFunc(child); + } + } + } + }; + deepFunc(res[0]); + } + } + + resetChartData(row: TraceRow) { + row.dataList = []; + row.dataList2 = []; + row.dataListCache = []; + row.isComplete = false; + } + + resetAllChartData() : void { + this.rowList?.forEach(row => this.resetChartData(row)); } hoverTip( @@ -414,7 +621,6 @@ export class SpHiPerf { } else { tip = `${struct.eventCount} (10.00ms)`; } - } else { let perfCall = perfDataQuery.callChainMap.get(struct.callchain_id || 0); tip = `${perfCall ? perfCall.name : ''} (${perfCall ? perfCall.depth : '0'} other frames)`; diff --git a/ide/src/trace/component/chart/SpNativeMemoryChart.ts b/ide/src/trace/component/chart/SpNativeMemoryChart.ts index b2c8d91bb..f620975de 100644 --- a/ide/src/trace/component/chart/SpNativeMemoryChart.ts +++ b/ide/src/trace/component/chart/SpNativeMemoryChart.ts @@ -157,7 +157,7 @@ export class SpNativeMemoryChart { allHeapRow.supplier = (): Promise => { return type === 'native_hook' ? this.getNativeMemoryDataByChartType(i, allHeapRow.drawType, process.ipid) - : this.getNativeMemoryStatisticByChartType(i - 1); + : this.getNativeMemoryStatisticByChartType(i - 1, process.ipid); }; this.chartThreadHandler(allHeapRow); folder.addChildTraceRow(allHeapRow); @@ -187,13 +187,13 @@ export class SpNativeMemoryChart { info('The time to load the Native Memory data is: ', durTime); }; - getNativeMemoryStatisticByChartType = async (chartType: number): Promise> => { + getNativeMemoryStatisticByChartType = async (chartType: number, ipid: number): Promise> => { let nmStatisticArray: Array = []; await new Promise>((resolve, reject) => { procedurePool.submitWithName( 'logic1', 'native-memory-queryNativeHookStatistic', - { type: chartType, totalNS: TraceRow.range?.totalNS! }, + { type: chartType, totalNS: TraceRow.range?.totalNS!,ipid: ipid}, undefined, (res: any) => { nmStatisticArray = nmStatisticArray.concat(res.data); diff --git a/ide/src/trace/component/chart/SpProcessChart.ts b/ide/src/trace/component/chart/SpProcessChart.ts index 5dbddebee..d4e2d0684 100644 --- a/ide/src/trace/component/chart/SpProcessChart.ts +++ b/ide/src/trace/component/chart/SpProcessChart.ts @@ -128,6 +128,7 @@ export class SpProcessChart { funcRow.asyncFuncName = asyncFuncGroups[0].funName; funcRow.asyncFuncNamePID = key; funcRow.rowType = TraceRow.ROW_TYPE_FUNC; + funcRow.enableCollapseChart(); //允许折叠泳道图 funcRow.rowParentId = `${row.rowId}`; funcRow.rowHidden = !row.expansion; funcRow.style.width = '100%'; @@ -539,6 +540,7 @@ export class SpProcessChart { funcRow.asyncFuncName = asyncFunctions[0].funName; funcRow.asyncFuncNamePID = it.pid; funcRow.rowType = TraceRow.ROW_TYPE_FUNC; + funcRow.enableCollapseChart(); //允许折叠泳道图 funcRow.rowParentId = `${it.pid}`; funcRow.rowHidden = !processRow.expansion; funcRow.style.width = '100%'; @@ -701,6 +703,7 @@ export class SpProcessChart { let funcRow = TraceRow.skeleton(); funcRow.rowId = `${thread.tid}`; funcRow.rowType = TraceRow.ROW_TYPE_FUNC; + funcRow.enableCollapseChart(); //允许折叠泳道图 funcRow.rowParentId = `${it.pid}`; funcRow.rowHidden = !processRow.expansion; funcRow.checkType = threadRow.checkType; diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts index b04c73e16..a3d187303 100644 --- a/ide/src/trace/component/setting/SpAllocations.ts +++ b/ide/src/trace/component/setting/SpAllocations.ts @@ -43,6 +43,8 @@ export class SpAllocations extends BaseElement { private startupMode: LitSwitch | null | undefined; private recordStatisticsResult: HTMLDivElement | null | undefined; + private filterSize: HTMLInputElement | null | undefined; + set startSamp(allocationStart: boolean) { if (allocationStart) { this.setAttribute('startSamp', ''); @@ -152,6 +154,12 @@ export class SpAllocations extends BaseElement { }; initElements(): void { + this.filterSize = this.shadowRoot?.querySelector('#filterSized'); + this.filterSize!.addEventListener('keydown', (ev: any) => { + if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { + ev.preventDefault(); + } + }); this.processId = this.shadowRoot?.getElementById('pid') as LitAllocationSelect; let process = this.processId.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; let sp = document.querySelector('sp-application') as SpApplication; @@ -190,6 +198,16 @@ export class SpAllocations extends BaseElement { let stepValue = [0, 1, 10, 30, 60, 300, 600, 1800, 3600]; this.statisticsSlider = this.shadowRoot?.querySelector('#interval-slider') as LitSlider; + this.unwindEL.addEventListener('keydown', (ev: any) => { + if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { + ev.preventDefault(); + } + }); + this.shareMemory.addEventListener('keydown', (ev: any) => { + if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { + ev.preventDefault(); + } + }); this.recordStatisticsResult = this.shadowRoot?.querySelector( '.record-statistics-result' ) as HTMLDivElement; @@ -204,6 +222,11 @@ export class SpAllocations extends BaseElement { }; let parentElement = this.statisticsSlider!.parentNode as Element; this.intervalResultInput = this.shadowRoot?.querySelector('.interval-result') as HTMLInputElement; + this.intervalResultInput!.addEventListener('keydown', (ev: any) => { + if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { + ev.preventDefault(); + } + }); this.intervalResultInput.value = '10'; this.statisticsSlider.addEventListener('input', (evt) => { this.statisticsSlider!.sliderStyle = { @@ -253,8 +276,9 @@ export class SpAllocations extends BaseElement { defaultSize = stepIndex * stepSize; break; } else if (inputValue < currentValue && stepIndex !== 0) { - defaultSize = (inputValue - stepValue[stepIndex - 1]) / - (currentValue - stepValue[stepIndex - 1]) * stepSize + (stepSize * (stepIndex - 1)); + defaultSize = + ((inputValue - stepValue[stepIndex - 1]) / (currentValue - stepValue[stepIndex - 1])) * stepSize + + stepSize * (stepIndex - 1); break; } } @@ -571,13 +595,13 @@ export class SpAllocations extends BaseElement {
    Max unwind level Max Unwind Level Rang is 0 - 512, default 10 - +
    Shared Memory Size (One page equals 4 KB) Shared Memory Size Range is 0 - 131072 page, default 16384 page
    - + Page
    @@ -585,7 +609,7 @@ export class SpAllocations extends BaseElement { Filter Memory Size Filter size Range is 0 - 65535 byte, default 0 byte
    - + Byte
    @@ -613,7 +637,7 @@ export class SpAllocations extends BaseElement {
    - + S
    diff --git a/ide/src/trace/component/setting/SpHilogRecord.ts b/ide/src/trace/component/setting/SpHilogRecord.ts index 4a4de4495..fbb07bd80 100644 --- a/ide/src/trace/component/setting/SpHilogRecord.ts +++ b/ide/src/trace/component/setting/SpHilogRecord.ts @@ -84,7 +84,7 @@ export class SpHilogRecord extends BaseElement { } getHiLogLevel(): string[] { - return ['ALL-Level', 'Debug', 'Info', 'Warn', 'Error']; + return ['ALL-Level', 'Debug', 'Info', 'Warn', 'Error', 'Fatal']; } initHtml(): string { diff --git a/ide/src/trace/component/setting/SpHisysEvent.ts b/ide/src/trace/component/setting/SpHisysEvent.ts index e6e0f4e82..0bd437b5b 100644 --- a/ide/src/trace/component/setting/SpHisysEvent.ts +++ b/ide/src/trace/component/setting/SpHisysEvent.ts @@ -16,32 +16,45 @@ import { BaseElement, element } from '../../../base-ui/BaseElement.js'; import LitSwitch, { LitSwitchChangeEvent } from '../../../base-ui/switch/lit-switch.js'; import '../../../base-ui/select/LitAllocationSelect.js'; - import '../../../base-ui/switch/lit-switch.js'; -import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; import { SpRecordTrace } from '../SpRecordTrace.js'; -import { Cmd } from '../../../command/Cmd.js'; -import { CmdConstant } from '../../../command/CmdConstant.js'; import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js'; +import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; @element('sp-hisys-event') export class SpHisysEvent extends BaseElement { - private eventProcessInput: LitAllocationSelect | undefined | null; - private selectProcess: HTMLInputElement | undefined | null; + private domainInputEL: LitAllocationSelect | undefined | null; + private eventNameInputEL: LitAllocationSelect | undefined | null; + private sysEventConfigList: NodeListOf | undefined | null; + private sysEventSwitch: LitSwitch | undefined | null; + private domainInputEl: HTMLInputElement | undefined | null; + private nameInputEl: HTMLInputElement | undefined | null; + private eventConfig: unknown = {}; set startSamp(start: boolean) { if (start) { this.setAttribute('startSamp', ''); + this.domainInputEL!.removeAttribute('readonly'); + this.eventNameInputEL!.removeAttribute('readonly'); } else { this.removeAttribute('startSamp'); - let eventInput = this.eventProcessInput?.shadowRoot?.querySelector('#singleInput'); - eventInput!.value = ''; + this.domainInputEL!.setAttribute('readonly', 'readonly'); + this.eventNameInputEL!.setAttribute('readonly', 'readonly'); + this.domainInputEL!.value = ''; + this.eventNameInputEL!.value = ''; } } - get process(): string { - if (this.eventProcessInput!.value.length > 0) { - return this.eventProcessInput!.value; + get domain(): string { + if (this.domainInputEL!.value.length > 0 && this.domainInputEL!.value !== 'ALL-Domain') { + return this.domainInputEL!.value; + } + return ''; + } + + get eventName(): string { + if (this.eventNameInputEL!.value.length > 0) { + return this.eventNameInputEL!.value; } return ''; } @@ -50,85 +63,128 @@ export class SpHisysEvent extends BaseElement { return this.hasAttribute('startSamp'); } + get sysEventConfigPath(): string { + return '/system/etc/hiview/hisysevent.def'; + } + initElements(): void { - let hisysEventSwitch = this.shadowRoot?.querySelector('lit-switch') as LitSwitch; - hisysEventSwitch.addEventListener('change', (event: CustomEventInit) => { + this.domainInputEL = this.shadowRoot?.querySelector('.record-domain-input'); + this.eventNameInputEL = this.shadowRoot?.querySelector('.record-event-input'); + this.sysEventConfigList = this.shadowRoot?.querySelectorAll('.record-input'); + this.sysEventSwitch = this.shadowRoot?.querySelector('lit-switch') as LitSwitch; + this.sysEventSwitch?.addEventListener('change', (event: CustomEventInit) => { let detail = event.detail; - if (detail!.checked) { - this.startSamp = true; - this.unDisable(); - } else { - this.startSamp = false; - this.disable(); - } + this.startSamp = detail!.checked; + this.updateDisable(detail!.checked); }); - this.eventProcessInput = this.shadowRoot?.querySelector('lit-allocation-select'); - let hisyEventProcessInput = this.eventProcessInput?.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; - this.selectProcess = this.eventProcessInput!.shadowRoot?.querySelector('input') as HTMLInputElement; - hisyEventProcessInput!.addEventListener('mousedown', (ev) => { - if (SpRecordTrace.serialNumber === '') { - this.eventProcessInput!.processData = []; - this.eventProcessInput!.initData(); - } + this.updateDisable(false); + this.domainInputEl = this.domainInputEL?.shadowRoot?.querySelector('.multipleSelect') as HTMLInputElement; + this.nameInputEl = this.eventNameInputEL?.shadowRoot?.querySelector('.multipleSelect') as HTMLInputElement; + this.domainInputEl.addEventListener('valuable', () => { + this.eventNameInputEL!.value = ''; }); - hisyEventProcessInput!.addEventListener('mouseup', () => { - if (SpRecordTrace.serialNumber === '') { - this.eventProcessInput!.processData = []; - this.eventProcessInput!.initData(); - } else { - Cmd.getProcess().then((processList) => { - this.eventProcessInput!.processData = processList; - this.eventProcessInput!.initData(); - }); - } - }); - this.disable(); } - private unDisable(): void { - let hisysEventConfigVals = this.shadowRoot?.querySelectorAll('.config'); - hisysEventConfigVals!.forEach((hisysEventConfigVal) => { - hisysEventConfigVal.removeAttribute('disabled'); - }); + connectedCallback(): void { + super.connectedCallback(); + this.domainInputEl?.addEventListener('mousedown', this.domainInputEvent); + this.nameInputEl?.addEventListener('mousedown', this.nameInputEvent); } - private disable(): void { - let hisysEventConfigVals = this.shadowRoot?.querySelectorAll('.config'); - hisysEventConfigVals!.forEach((hisysEventConfigVal) => { - if (hisysEventConfigVal.title !== 'Start Hisystem Event Tracker Record') { - hisysEventConfigVal.setAttribute('disabled', ''); + disconnectedCallback(): void { + super.disconnectedCallback(); + this.domainInputEl?.removeEventListener('mousedown', this.domainInputEvent); + this.nameInputEl?.removeEventListener('mousedown', this.nameInputEvent); + } + + domainInputEvent = (): void => { + if (SpRecordTrace.serialNumber === '') { + this.domainInputEL!.processData = []; + this.domainInputEL!.initData(); + } else { + HdcDeviceManager.fileRecv(this.sysEventConfigPath, () => { + }).then((pullRes) => { + pullRes.arrayBuffer().then((buffer) => { + if (buffer.byteLength > 0) { + let dec = new TextDecoder(); + this.eventConfig = JSON.parse(dec.decode(buffer)); + let domainList = Object.keys(this.eventConfig!); + if (domainList.length > 0 && this.startSamp) { + this.domainInputEl!.setAttribute('readonly', 'readonly'); + domainList.unshift('ALL-Domain'); + } + this.domainInputEL!.processData = domainList; + this.domainInputEL!.initData(); + } + }); + }); + } + }; + + nameInputEvent = (): void => { + if (SpRecordTrace.serialNumber === '') { + this.eventNameInputEL!.processData = []; + this.eventNameInputEL!.initData(); + } else { + let domain = this.domainInputEL?.value; + // @ts-ignore + let eventConfigElement = this.eventConfig[domain]; + if (eventConfigElement) { + let eventNameList = Object.keys(eventConfigElement); + if (eventNameList?.length > 0 && this.startSamp) { + this.nameInputEl!.setAttribute('readonly', 'readonly'); + this.eventNameInputEL!.processData = eventNameList; + this.eventNameInputEL!.initData(); + } + } else { + this.eventNameInputEL!.value = ''; + this.eventNameInputEL!.processData = []; + this.eventNameInputEL!.initData(); + } + } + }; + + private updateDisable(isDisable: boolean): void { + this.sysEventConfigList!.forEach((configEL) => { + if (isDisable) { + configEL.removeAttribute('disabled'); + } else { + configEL.setAttribute('disabled', ''); } }); } - initHtml(): string { + private getCssStyle(): string { return ` `; + } - .event-input { - border: 1px solid var(--dark-background5,#ccc); - font-family: Helvetica; - font-size: 14px; - color: var(--dark-color1,#212121); - text-align: left; - line-height: 20px; - font-weight: 400; - } - + initHtml(): string { + return ` + ${this.getCssStyle()}
    -
    +
    Start Hisystem Event Tracker Record
    -
    +
    +
    + Domain + Record Domain Name +
    + + +
    +
    - AppName - Record AppName + EventName + Record Event Name
    - + +
    `; diff --git a/ide/src/trace/component/setting/SpProbesConfig.ts b/ide/src/trace/component/setting/SpProbesConfig.ts index 30daee587..83e799a54 100644 --- a/ide/src/trace/component/setting/SpProbesConfig.ts +++ b/ide/src/trace/component/setting/SpProbesConfig.ts @@ -35,6 +35,8 @@ export class SpProbesConfig extends BaseElement { private ftraceBufferSizeResult: HTMLDivElement | null | undefined; private ftraceSlider: LitSlider | null | undefined; + private ftraceBuffSizeResultInput: HTMLInputElement | null | undefined; + set startSamp(allocationStart: boolean) { if (allocationStart) { this.setAttribute('startSamp', ''); @@ -110,6 +112,12 @@ export class SpProbesConfig extends BaseElement { } initElements(): void { + this.ftraceBuffSizeResultInput = this.shadowRoot?.querySelector('.ftrace-buff-size-result') as HTMLInputElement; + this.ftraceBuffSizeResultInput!.addEventListener('keydown', (ev: any) => { + if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { + ev.preventDefault(); + } + }); this.traceConfigList = [ { value: 'Scheduling details', @@ -374,45 +382,50 @@ export class SpProbesConfig extends BaseElement { private unDisable() { this.startSamp = true; - let checkDesBoxDis=this.shadowRoot?.querySelectorAll('check-des-box') - let litCheckBoxDis=this.shadowRoot?.querySelectorAll('lit-check-box') - - let defaultSelected:any=[] - defaultSelected=defaultSelected.concat(this.traceConfigList,this.memoryConfigList,this.abilityConfigList,this.hitraceConfigList) - - this.shadowRoot?.querySelector("[value='Hitrace categories']")?.setAttribute('checked','true') - this.ftraceSlider!.removeAttribute('disabled') - - checkDesBoxDis?.forEach((item:any)=>{ - item.removeAttribute('disabled') - }) - - litCheckBoxDis?.forEach((item:any)=>{ - item.removeAttribute('disabled') - }) - - defaultSelected.filter((item:any)=>{ - if(item.isSelect) this.shadowRoot?.querySelector(`[value='${item.value}']`)?.setAttribute('checked','true') - }) + let checkDesBoxDis = this.shadowRoot?.querySelectorAll('check-des-box'); + let litCheckBoxDis = this.shadowRoot?.querySelectorAll('lit-check-box'); + + let defaultSelected: any = []; + defaultSelected = defaultSelected.concat( + this.traceConfigList, + this.memoryConfigList, + this.abilityConfigList, + this.hitraceConfigList + ); + + this.shadowRoot?.querySelector("[value='Hitrace categories']")?.setAttribute('checked', 'true'); + this.ftraceSlider!.removeAttribute('disabled'); + + checkDesBoxDis?.forEach((item: any) => { + item.removeAttribute('disabled'); + }); + + litCheckBoxDis?.forEach((item: any) => { + item.removeAttribute('disabled'); + }); + + defaultSelected.filter((item: any) => { + if (item.isSelect) + this.shadowRoot?.querySelector(`[value='${item.value}']`)?.setAttribute('checked', 'true'); + }); } private disable() { this.startSamp = false; - let checkDesBoxDis=this.shadowRoot?.querySelectorAll('check-des-box') - let litCheckBoxDis=this.shadowRoot?.querySelectorAll('lit-check-box') + let checkDesBoxDis = this.shadowRoot?.querySelectorAll('check-des-box'); + let litCheckBoxDis = this.shadowRoot?.querySelectorAll('lit-check-box'); - this.ftraceSlider!.setAttribute('disabled','') - - checkDesBoxDis?.forEach((item:any)=>{ - item.setAttribute('disabled','') - item.checked=false - }) + this.ftraceSlider!.setAttribute('disabled', ''); - litCheckBoxDis?.forEach((item:any)=>{ - item.setAttribute('disabled','') - item.checked=false - }) + checkDesBoxDis?.forEach((item: any) => { + item.setAttribute('disabled', ''); + item.checked = false; + }); + litCheckBoxDis?.forEach((item: any) => { + item.setAttribute('disabled', ''); + item.checked = false; + }); } initHtml(): string { @@ -573,8 +586,8 @@ export class SpProbesConfig extends BaseElement {
    -
    - +
    + KB
    diff --git a/ide/src/trace/component/setting/SpRecordSetting.ts b/ide/src/trace/component/setting/SpRecordSetting.ts index 757f4a3d4..0421f3630 100644 --- a/ide/src/trace/component/setting/SpRecordSetting.ts +++ b/ide/src/trace/component/setting/SpRecordSetting.ts @@ -132,7 +132,7 @@ export class SpRecordSetting extends BaseElement { this.bufferNumber = this.shadowRoot?.querySelector('.buffer-size') as HTMLElement; this.durationNumber = this.shadowRoot?.querySelector('.max-duration') as HTMLElement; let inputs = this.shadowRoot?.querySelectorAll('input'); - inputs!.forEach(item => { + inputs!.forEach((item) => { item.addEventListener('keydown', (ev) => { // @ts-ignore if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { @@ -168,7 +168,7 @@ export class SpRecordSetting extends BaseElement {
    - + MB
    `; @@ -555,7 +555,7 @@ export class SpRecordSetting extends BaseElement {
    - + MB
    diff --git a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts index fb9361959..e6f458fd2 100644 --- a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts +++ b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts @@ -836,6 +836,9 @@ export function levelFromJSON(object: any): Level { case 4: case 'Warn': return Level.LOG_WARN; + case 5: + case 'Fatal': + return Level.LOG_FATAL; case -1: case 'UNRECOGNIZED': default: @@ -849,6 +852,7 @@ export enum Level { LOG_INFO = 'INFO', LOG_DEBUG = 'DEBUG', LOG_WARN = 'WARN', + LOG_FATAL = 'FATAL', UNRECOGNIZED = -1, } @@ -907,7 +911,8 @@ export interface HiperfPluginConfig { export interface HiSystemEventConfig { msg: string; - processName: string; + subscribe_domain: string; + subscribe_event: string; } export interface ArkTSConfig { diff --git a/ide/src/trace/component/setting/utils/PluginConvertUtils.ts b/ide/src/trace/component/setting/utils/PluginConvertUtils.ts index 4d97e5d19..b3b9ff0fe 100644 --- a/ide/src/trace/component/setting/utils/PluginConvertUtils.ts +++ b/ide/src/trace/component/setting/utils/PluginConvertUtils.ts @@ -241,4 +241,4 @@ export class PluginConvertUtils { } } -const LevelConfigEnumList = ['LEVEL_UNSPECIFIED', 'DEBUG', 'INFO', 'WARN', 'ERROR'] +const LevelConfigEnumList = ['LEVEL_UNSPECIFIED', 'DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL'] diff --git a/ide/src/trace/component/trace/base/ColorUtils.ts b/ide/src/trace/component/trace/base/ColorUtils.ts index fe7cea2de..c3c75ef11 100644 --- a/ide/src/trace/component/trace/base/ColorUtils.ts +++ b/ide/src/trace/component/trace/base/ColorUtils.ts @@ -116,6 +116,21 @@ export class ColorUtils { return logColor; } + public static getHisysEventColor(level: string): string { + let eventColor: string = '#00000'; + switch (level) { + case 'MINOR': + eventColor = '#000000'; + break; + case 'CRITICAL': + eventColor = '#FF4040'; + break; + default: + break; + } + return eventColor; + } + public static hash(str: string, max: number): number { let colorA: number = 0x811c9dc5; let colorB: number = 0xfffffff; diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index 5852e6472..48fbca70e 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -56,6 +56,7 @@ export class TraceRow extends HTMLElement { static ROW_TYPE_HIPERF = 'hiperf'; static ROW_TYPE_DELIVER_INPUT_EVENT = 'DeliverInputEvent'; static ROW_TYPE_HIPERF_CPU = 'hiperf-cpu'; + static ROW_TYPE_PERF_CALLCHART = 'hiperf-callchart'; static ROW_TYPE_HIPERF_PROCESS = 'hiperf-process'; static ROW_TYPE_HIPERF_THREAD = 'hiperf-thread'; static ROW_TYPE_HIPERF_REPORT = 'hiperf-report'; @@ -119,6 +120,7 @@ export class TraceRow extends HTMLElement { static FRAME_WIDTH: number = 0; static range: TimeRange | undefined | null; static rangeSelectObject: RangeSelectStruct | undefined; + static ROW_TYPE_HI_SYSEVENT = 'hi-sysevent'; public obj: TraceRowObject | undefined | null; isHover: boolean = false; hoverX: number = 0; @@ -160,6 +162,7 @@ export class TraceRow extends HTMLElement { private _rangeSelect: boolean = false; private _drawType: number = 0; private folderIconEL: LitIcon | null | undefined; + private _enableCollapseChart: boolean = false; online: boolean = false; static isUserInteraction: boolean; asyncFuncName: string | undefined | null; @@ -171,8 +174,7 @@ export class TraceRow extends HTMLElement { focusHandler?: (ev: MouseEvent) => void | undefined; findHoverStruct?: () => void | undefined; - private _funcExpand: boolean = true; //default expand func chart - private funcMaxHeight: number = 0; + public funcMaxHeight: number = 0; currentContext: CanvasRenderingContext2D | undefined | null; constructor( @@ -232,15 +234,11 @@ export class TraceRow extends HTMLElement { } get funcExpand(): boolean { - return this.hasAttribute('func-expand'); + return this.getAttribute('func-expand') === 'true'; } set funcExpand(b: boolean) { - if (b) { - this.setAttribute('func-expand', ''); - } else { - this.removeAttribute('func-expand'); - } + this.setAttribute('func-expand', b ? 'true' : 'false'); } get hasParentRowEl(): boolean { @@ -291,6 +289,10 @@ export class TraceRow extends HTMLElement { this.rowSettingTree!.treeData = value || []; } + set rowSettingMultiple(value: boolean) { + this.rowSettingTree!.multiple = value; + } + get rowSettingList(): TreeItemData[] | null | undefined { return this._rowSettingList; } @@ -676,42 +678,64 @@ export class TraceRow extends HTMLElement { } }); this.funcExpand = true; - - this.nameEL!.onclick = () => { - if (this.rowType === TraceRow.ROW_TYPE_FUNC) { - if (this.funcExpand) { - this.funcMaxHeight = this.clientHeight; - this.style.height = '20px'; - this.funcExpand = false; - } else { - this.style.height = `${this.funcMaxHeight}px`; - this.funcExpand = true; - } - window.publish(window.SmartEvent.UI.RowHeightChange, { - expand: this.funcExpand, - value: this.funcMaxHeight - 20, - }); - } - }; this.rowSettingTree!.onChange = (e: any): void => { // @ts-ignore this.rowSettingPop!.visible = false; + if (this.rowSettingTree?.multiple) { + // @ts-ignore + this.rowSettingPop!.visible = true; + } else { + // @ts-ignore + this.rowSettingPop!.visible = false; + } this.onRowSettingChangeHandler?.(this.rowSettingTree!.getCheckdKeys(), this.rowSettingTree!.getCheckdNodes()); }; this.checkType = '-1'; } + getRowSettingKeys() : Array { + if (this.rowSetting === 'enable') { + return this.rowSettingTree!.getCheckdKeys(); + } + return []; + } expandFunc(): void { - if (this.rowType === TraceRow.ROW_TYPE_FUNC && !this.funcExpand) { + if (this._enableCollapseChart && !this.funcExpand) { this.style.height = `${this.funcMaxHeight}px`; this.funcExpand = true; - window.publish(window.SmartEvent.UI.RowHeightChange, { - expand: this.funcExpand, - value: this.funcMaxHeight - 20, - }); + if (this.collect) { + window.publish(window.SmartEvent.UI.RowHeightChange, { + expand: this.funcExpand, + value: this.funcMaxHeight - 20, + }); + } } } + enableCollapseChart() : void { + this._enableCollapseChart = true; + this.nameEL!.onclick = () => { + if (this.funcExpand) { + this.funcMaxHeight = this.clientHeight; + this.style.height = '20px'; + this.funcExpand = false; + } else { + this.style.height = `${this.funcMaxHeight}px`; + this.funcExpand = true; + } + setTimeout(() => { + TraceRow.range!.refresh = true; + this.draw(false); + }, 200); + if (this.collect) { + window.publish(window.SmartEvent.UI.RowHeightChange, { + expand: this.funcExpand, + value: this.funcMaxHeight - 20, + }); + } + }; + } + initCanvas(list: Array): void { let timerShaftEL = document! .querySelector('body > sp-application')! @@ -1283,7 +1307,12 @@ export class TraceRow extends HTMLElement { :host(:not([check-type])) .lit-check-box{ display: none; } - :host([collect-type]) .setting{ + :host([collect-type][row-setting='enable']:not([row-type='hiperf-callchart'])) .setting{ + position:fixed; + z-index:1003; + left: 473px; + } + :host([collect-type][row-setting='enable'][row-type='hiperf-callchart'][func-expand='false']) .setting{ position:fixed; z-index:1003; left: 473px; @@ -1348,7 +1377,7 @@ export class TraceRow extends HTMLElement { :host([row-type="func"]) .name{ cursor: pointer; } - :host([row-type="func"]:not([func-expand])) .name{ + :host(:not([func-expand])) .name{ color: #00a3f5; } .lit-check-box{ diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts index 9148d35d3..1fd399bd7 100644 --- a/ide/src/trace/component/trace/base/TraceSheet.ts +++ b/ide/src/trace/component/trace/base/TraceSheet.ts @@ -145,6 +145,9 @@ export class TraceSheet extends BaseElement { initElements(): void { this.litTabs = this.shadowRoot?.querySelector('#tabs'); + this.litTabs!.addEventListener('contextmenu', (e) => { + e.preventDefault(); + }); this.importDiv = this.shadowRoot?.querySelector('#import_div'); this.switchDiv = this.shadowRoot?.querySelector('#select-process'); this.processTree = this.shadowRoot?.querySelector('#processTree'); @@ -178,6 +181,48 @@ export class TraceSheet extends BaseElement { }); this.getComponentByID('box-spt')!.addEventListener('row-click', this.rowClickHandler.bind(this)); this.getComponentByID('box-pts')!.addEventListener('row-click', this.rowClickHandler.bind(this)); + this.getComponentByID('box-perf-analysis')!.addEventListener('row-click', (evt: MouseEvent) => { + // @ts-ignore + if (evt.detail.button === 2) { + let pane = this.getPaneByID('box-perf-profile'); + this.litTabs!.activeByKey(pane.key); + } + }); + this.getComponentByID('box-native-statistic-analysis')!.addEventListener('row-click', (e: MouseEvent) => { + //@ts-ignore + if (e.detail.button === 2) { + let pane = this.getPaneByID('box-native-calltree'); + pane.hidden = false; + this.litTabs!.activeByKey(pane.key); + } + }); + this.getComponentByID('box-io-tier-statistics-analysis')!.addEventListener('row-click', (evt: MouseEvent) => { + // @ts-ignore + if (evt.detail.button === 2) { + let pane = this.getPaneByID('box-io-calltree'); + this.litTabs!.activeByKey(pane.key); + } + }); + this.getComponentByID('box-virtual-memory-statistics-analysis')!.addEventListener( + 'row-click', + (evt: MouseEvent) => { + // @ts-ignore + if (evt.detail.button === 2) { + let pane = this.getPaneByID('box-vm-calltree'); + this.litTabs!.activeByKey(pane.key); + } + } + ); + this.getComponentByID('box-file-system-statistics-analysis')!.addEventListener( + 'row-click', + (evt: MouseEvent) => { + // @ts-ignore + if (evt.detail.button === 2) { + let pane = this.getPaneByID('box-file-system-calltree'); + this.litTabs!.activeByKey(pane.key); + } + } + ); this.getComponentByID('box-native-statstics')!.addEventListener('row-click', (e: any) => { this.selection!.statisticsSelectData = e.detail; let pane = this.getPaneByID('box-native-memory'); @@ -460,9 +505,10 @@ export class TraceSheet extends BaseElement { displayStaticInitData = (data: SoStruct, scrollCallback: Function): void => this.displayTab('current-selection').setStaticInitData(data, scrollCallback); - displayNativeHookData = (data: HeapStruct, rowType: string): void => { + displayNativeHookData = (data: HeapStruct, rowType: string, ipid: number): void => { let val = new SelectionParam(); val.nativeMemoryStatistic.push(rowType); + val.nativeMemoryCurrentIPid = ipid; val.nativeMemory = []; val.leftNs = data.startTime!; val.rightNs = data.dur === 0 ? data.startTime! : data.startTime! + data.dur! - 1; @@ -789,6 +835,7 @@ export class TraceSheet extends BaseElement { ?.querySelector(`#tabs lit-tabpane[key='${key}']`) ?.children.item(0); if (component) { + this.selection!.isRowClick = false; component.data = this.selection; } } diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts index 7b2f793a2..323b686c8 100644 --- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts +++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts @@ -120,6 +120,8 @@ import { TabPaneGpuResourceVmTracker } from '../sheet/vmtracker/TabPaneGpuResour import { TabPaneGpuGraph } from '../sheet/gpu/TabPaneGraph.js'; import { TabPaneFreqUsage } from '../sheet/frequsage/TabPaneFreqUsage.js'; import { TabPaneFreqDataCut } from '../sheet/frequsage/TabPaneFreqDataCut.js'; +import { TabPaneHisysEvents } from '../sheet/hisysevent/TabPaneHisysEvents.js'; +import { TabPaneHiSysEventSummary } from '../sheet/hisysevent/TabPaneHiSysEventSummary.js'; export let tabConfig: any = { 'current-selection': { @@ -638,4 +640,14 @@ export let tabConfig: any = { type: TabPaneFreqDataCut, require: (param: SelectionParam) => param.threadIds.length > 0 && param.threadIds.length < 2, }, + 'tab-hisysevents': { + title: 'HiSysevents', + type: TabPaneHisysEvents, + require: (param: SelectionParam) => param.hiSysEvents.length > 0, + }, + 'tab-hisysevents-summary': { + title: 'Statistics', + type: TabPaneHiSysEventSummary, + require: (param: SelectionParam) => param.hiSysEvents.length > 0, + }, }; diff --git a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts index f53778d42..10197b993 100644 --- a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts +++ b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts @@ -572,7 +572,7 @@ export class TabPaneFilter extends BaseElement { inputs[0].value = '0'; inputs[1].value = '∞'; } - this.filterInputEL!.value = '' + this.filterInputEL!.value = ''; this.transferChecked = radioList![idx].value; radioList![idx].checked = true; if (this.getCallTransfer) { diff --git a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts index cc47674bb..69c37acb3 100644 --- a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts +++ b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts @@ -33,8 +33,16 @@ export class TabPaneJsCpuStatistics extends BaseElement { private sortKey = 'timeStr'; private sortType = 2; private statisticsPie: LitChartPie | null | undefined; + private currentSelection: SelectionParam | undefined; set data(data: SelectionParam | Array) { + if (data instanceof SelectionParam) { + if (data === this.currentSelection) { + return; + } + this.currentSelection = data; + } + this.init(); this.clearData(); this.progress!.loading = true; diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts index a5a10c009..bbd9b1230 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts @@ -23,6 +23,9 @@ import { FilterData, TabPaneFilter } from '../TabPaneFilter.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { MerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; import { showButtonMenu } from '../SheetUtils.js'; +import { CallTreeLevel } from '../../../../bean/EbpfStruct.js'; +import '../../../../../base-ui/headline/lit-headline.js'; +import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline.js'; const InvertOptionIndex: number = 0; const hideEventOptionIndex: number = 2; @@ -52,14 +55,49 @@ export class TabPaneCallTree extends BaseElement { private currentSelection: SelectionParam | undefined; private flameChartMode: ChartMode = ChartMode.Duration; private currentCallTreeDataSource: Array = []; + private currentRowClickData: any; + private initWidth: number = 0; + private _pieTitle: string = ''; + private _cWidth: number = 0; + private _currentCallTreeLevel: number = 0; + private _rowClickData: any = undefined; + private callTreeLevel: CallTreeLevel | undefined | null; + private headLine: LitHeadLine | null | undefined; + + set pieTitle(value: string) { + this._pieTitle = value; + if (this._pieTitle.length > 0) { + this.headLine!.isShow = true; + this.headLine!.titleTxt = this._pieTitle; + this.headLine!.closeCallback = () => { + this.restore(); + }; + } + } + + set cWidth(value: number) { + this._cWidth = value; + } + + set currentCallTreeLevel(value: number) { + this._currentCallTreeLevel = value; + } + + set rowClickData(value: any) { + this._rowClickData = value; + } set data(callTreeSelection: SelectionParam | any) { - if (callTreeSelection === this.currentSelection) { + if (callTreeSelection !== this.currentSelection && this._rowClickData === this.currentRowClickData) { + this._rowClickData = undefined; + } + if (callTreeSelection === this.currentSelection && !this.currentSelection?.isRowClick) { return; } this.searchValue = ''; this.initModeAndAction(); this.currentSelection = callTreeSelection; + this.currentRowClickData = this._rowClickData; this.callTreeTbl!.style.visibility = 'visible'; if (this.parentElement!.clientHeight > this.callTreeFilter!.clientHeight) { this.callTreeFilter!.style.display = 'flex'; @@ -71,7 +109,24 @@ export class TabPaneCallTree extends BaseElement { this.callTreeFilter!.filterValue = ''; this.callTreeProgressEL!.loading = true; this.loadingPage.style.visibility = 'visible'; - const initWidth = this.clientWidth; + this.getDataByWorkAndUpDateCanvas(callTreeSelection); + } + + getDataByWorkAndUpDateCanvas(callTreeSelection: SelectionParam): void { + if (this.clientWidth === 0) { + this.initWidth = this._cWidth; + } else { + this.initWidth = this.clientWidth; + } + if (this._rowClickData && this.currentRowClickData !== undefined && this.currentSelection?.isRowClick) { + this.getCallTreeDataByPieLevel(); + } else { + this.headLine!.isShow = false; + this.getCallTreeData(callTreeSelection, this.initWidth); + } + } + + private getCallTreeData(callTreeSelection: SelectionParam | any, initWidth: number): void { this.getDataByWorker( [ { @@ -96,6 +151,58 @@ export class TabPaneCallTree extends BaseElement { ); } + /** + * 根据Analysis Tab饼图跳转过来的层级绘制对应的CallTree Tab火焰图和表格 + */ + private getCallTreeDataByPieLevel(): void { + this.callTreeLevel = new CallTreeLevel(); + this.callTreeLevel = { + processId: this._rowClickData.pid, + threadId: this._rowClickData.tid, + typeId: this._rowClickData.type, + libId: this._rowClickData.libId, + symbolId: this._rowClickData.symbolId, + }; + let args = []; + args.push({ + funcName: 'getCurrentDataFromDb', + funcArgs: [this.currentSelection, this.callTreeLevel], + }); + + if (this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) { + this.callTreeLevel.libName = this._rowClickData.tableName; + args.push({ + funcName: 'showLibLevelData', + funcArgs: [this.callTreeLevel.libId, this.callTreeLevel.libName], + }); + } else if (this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === 4) { + this.callTreeLevel.symbolName = this._rowClickData.tableName; + args.push({ + funcName: 'showFunLevelData', + funcArgs: [this.callTreeLevel.symbolId, this.callTreeLevel.symbolName], + }); + } + + this.getDataByWorker(args, (results: any[]) => { + this.callTreeProgressEL!.loading = false; + this.loadingPage.style.visibility = 'hidden'; + this.setLTableData(results); + this.callTreeTbr!.recycleDataSource = []; + this.frameChart!.mode = this.flameChartMode; + this.frameChart?.updateCanvas(true, this.initWidth); + this.frameChart!.data = this.callTreeDataSource; + this.currentCallTreeDataSource = this.callTreeDataSource; + this.switchFlameChart(); + this.callTreeFilter.icon = 'block'; + }); + } + + private restore(): void { + this.headLine!.isShow = false; + this._rowClickData = undefined; + this.getCallTreeData(this.currentSelection, this.initWidth); + } + initModeAndAction(): void { if (this.procedureAction === '' && this.hasAttribute('action')) { this.procedureAction = this.getAttribute('action') || ''; @@ -221,6 +328,7 @@ export class TabPaneCallTree extends BaseElement { } initElements(): void { + this.headLine = this.shadowRoot?.querySelector('.titleBox'); this.callTreeTbl = this.shadowRoot?.querySelector('#tb-calltree'); this.callTreeProgressEL = this.shadowRoot?.querySelector('.call-tree-progress') as LitProgressBar; this.frameChart = this.shadowRoot?.querySelector('#framechart'); @@ -228,6 +336,9 @@ export class TabPaneCallTree extends BaseElement { this.callTreeTbl!.rememberScrollTop = true; this.callTreeFilter = this.shadowRoot?.querySelector('#filter'); this.callTreeFilter!.disabledTransfer(true); + this.addEventListener('contextmenu', (event) => { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); this.callTreeTbl!.addEventListener('row-click', (evt: any) => { // @ts-ignore let data = evt.detail.data as MerageBean; @@ -370,7 +481,7 @@ export class TabPaneCallTree extends BaseElement { if (data.checks[1]) { callTreeArgs.push({ funcName: 'hideSystemLibrary', - funcArgs: [], + funcArgs: [true], }); callTreeArgs.push({ funcName: 'resetAllNode', @@ -503,7 +614,7 @@ export class TabPaneCallTree extends BaseElement { if (isHideSystemLibrary) { callTreeArgs.push({ funcName: 'hideSystemLibrary', - funcArgs: [], + funcArgs: [true], }); } if (filterData.callTreeConstraints.checked) { @@ -520,6 +631,17 @@ export class TabPaneCallTree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); + if (this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) { + callTreeArgs.push({ + funcName: 'showLibLevelData', + funcArgs: [this.callTreeLevel!.libId, this.callTreeLevel!.libName], + }); + } else if (this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === 4) { + callTreeArgs.push({ + funcName: 'showFunLevelData', + funcArgs: [this.callTreeLevel!.symbolId, this.callTreeLevel!.symbolName], + }); + } this.getDataByWorker(callTreeArgs, (result: any[]): void => { this.setLTableData(result); this.frameChart!.data = this.callTreeDataSource; @@ -617,8 +739,8 @@ export class TabPaneCallTree extends BaseElement { flex: 1; } -
    - +
    +
    @@ -628,7 +750,6 @@ export class TabPaneCallTree extends BaseElement { -
    diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts index e6cdea03f..dd0f5d190 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts @@ -18,8 +18,6 @@ import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar.js'; import { FrameChart } from '../../../chart/FrameChart.js'; import '../../../chart/FrameChart.js'; -import { DisassemblingWindow } from '../../../DisassemblingWindow.js'; -import '../../../DisassemblingWindow.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; import { ChartMode } from '../../../../bean/FrameChartStruct.js'; import { FilterData, TabPaneFilter } from '../TabPaneFilter.js'; @@ -27,6 +25,9 @@ import '../TabPaneFilter.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { FileMerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerFileSystem.js'; import { showButtonMenu } from '../SheetUtils.js'; +import { CallTreeLevel } from '../../../../bean/EbpfStruct.js'; +import '../../../../../base-ui/headline/lit-headline.js'; +import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline.js'; const InvertOptionIndex: number = 0; const hideEventOptionIndex: number = 2; @@ -47,7 +48,6 @@ export class TabpaneFilesystemCalltree extends BaseElement { private isChartShow: boolean = false; private systmeRuleName: string = '/system/'; private fsCallTreeNumRuleName: string = '/max/min/'; - private modal: DisassemblingWindow | null | undefined; private needShowMenu: boolean = true; private searchValue: string = ''; private loadingList: number[] = []; @@ -55,13 +55,48 @@ export class TabpaneFilesystemCalltree extends BaseElement { private currentSelection: SelectionParam | undefined; private currentFsCallTreeDataSource: Array = []; + private currentRowClickData: any; + private initWidth: number = 0; + private _pieTitle: string = ''; + private _cWidth: number = 0; + private _currentFsCallTreeLevel: number = 0; + private _fsRowClickData: any = undefined; + private FsCallTreeLevel: CallTreeLevel | undefined | null; + private headLine: LitHeadLine | null | undefined; + + set pieTitle(value: string) { + this._pieTitle = value; + if (this._pieTitle.length > 0) { + this.headLine!.isShow = true; + this.headLine!.titleTxt = this._pieTitle; + this.headLine!.closeCallback = () => { + this.restore(); + }; + } + } + + set cWidth(value: number) { + this._cWidth = value; + } + + set currentFsCallTreeLevel(value: number) { + this._currentFsCallTreeLevel = value; + } + + set fsRowClickData(value: any) { + this._fsRowClickData = value; + } + set data(fsCallTreeSelection: SelectionParam | any) { - if (fsCallTreeSelection == this.currentSelection) { + if (fsCallTreeSelection !== this.currentSelection && this._fsRowClickData === this.currentRowClickData) { + this._fsRowClickData = undefined; + } + if (fsCallTreeSelection === this.currentSelection && !this.currentSelection?.isRowClick) { return; } this.searchValue = ''; this.currentSelection = fsCallTreeSelection; - this.modal!.style.display = 'none'; + this.currentRowClickData = this._fsRowClickData; this.fsCallTreeTbl!.style.visibility = 'visible'; if (this.parentElement!.clientHeight > this.fsCallTreeFilter!.clientHeight) { this.fsCallTreeFilter!.style.display = 'flex'; @@ -73,7 +108,24 @@ export class TabpaneFilesystemCalltree extends BaseElement { this.fsCallTreeFilter!.filterValue = ''; this.fsCallTreeProgressEL!.loading = true; this.loadingPage.style.visibility = 'visible'; - const initWidth = this.clientWidth; + this.getDataByWorkAndUpDateCanvas(fsCallTreeSelection); + } + + getDataByWorkAndUpDateCanvas(fsCallTreeSelection: SelectionParam): void { + if (this.clientWidth === 0) { + this.initWidth = this._cWidth; + } else { + this.initWidth = this.clientWidth; + } + if (this._fsRowClickData && this.currentRowClickData !== undefined && this.currentSelection?.isRowClick) { + this.getFsCallTreeDataByPieLevel(); + } else { + this.headLine!.isShow = false; + this.getFsCallTreeData(fsCallTreeSelection, this.initWidth); + } + } + + private getFsCallTreeData(fsCallTreeSelection: SelectionParam | any, initWidth: number): void { this.getDataByWorker( [ { @@ -85,7 +137,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcArgs: [{ queryFuncName: 'fileSystem', ...fsCallTreeSelection }], }, ], - (fsCallTreeResults: any[]): void => { + (fsCallTreeResults: any[]) => { this.setLTableData(fsCallTreeResults); this.fsCallTreeTbr!.recycleDataSource = []; this.frameChart!.mode = ChartMode.Duration; @@ -98,6 +150,56 @@ export class TabpaneFilesystemCalltree extends BaseElement { ); } + /** + * 根据Analysis Tab饼图跳转过来的层级绘制对应的CallTree Tab火焰图和表格 + */ + private getFsCallTreeDataByPieLevel(): void { + this.FsCallTreeLevel = new CallTreeLevel(); + this.FsCallTreeLevel = { + processId: this._fsRowClickData.pid, + threadId: this._fsRowClickData.tid, + typeId: this._fsRowClickData.type, + libId: this._fsRowClickData.libId, + symbolId: this._fsRowClickData.symbolId, + }; + let args = []; + args.push({ + funcName: 'getCurrentDataFromDb', + funcArgs: [this.currentSelection, this.FsCallTreeLevel], + }); + + if (this._fsRowClickData.libId !== undefined && this._currentFsCallTreeLevel === 3) { + this.FsCallTreeLevel.libName = this._fsRowClickData.tableName; + args.push({ + funcName: 'showLibLevelData', + funcArgs: [this.FsCallTreeLevel.libId, this.FsCallTreeLevel.libName], + }); + } else if (this._fsRowClickData.symbolId !== undefined && this._currentFsCallTreeLevel === 4) { + this.FsCallTreeLevel.symbolName = this._fsRowClickData.tableName; + args.push({ + funcName: 'showFunLevelData', + funcArgs: [this.FsCallTreeLevel.symbolId, this.FsCallTreeLevel.symbolName], + }); + } + + this.getDataByWorker(args, (fsCallTreeResults: any[]) => { + this.setLTableData(fsCallTreeResults); + this.fsCallTreeTbr!.recycleDataSource = []; + this.frameChart!.mode = ChartMode.Duration; + this.frameChart?.updateCanvas(true, this.initWidth); + this.frameChart!.data = this.fsCallTreeDataSource; + this.currentFsCallTreeDataSource = this.fsCallTreeDataSource; + this.switchFlameChart(); + this.fsCallTreeFilter.icon = 'block'; + }); + } + + private restore(): void { + this.headLine!.isShow = false; + this._fsRowClickData = undefined; + this.getFsCallTreeData(this.currentSelection, this.initWidth); + } + getParentTree( fsCallTreeSrc: Array, fsCallTreeTarget: FileMerageBean, @@ -165,11 +267,14 @@ export class TabpaneFilesystemCalltree extends BaseElement { } initElements(): void { + this.headLine = this.shadowRoot?.querySelector('.titleBox'); this.fsCallTreeTbl = this.shadowRoot?.querySelector('#tb-filesystem-calltree'); this.fsCallTreeProgressEL = this.shadowRoot?.querySelector('.fs-call-tree-progress') as LitProgressBar; this.frameChart = this.shadowRoot?.querySelector('#framechart'); - this.modal = this.shadowRoot?.querySelector('tab-native-data-modal'); this.loadingPage = this.shadowRoot?.querySelector('.fs-call-tree-loading'); + this.addEventListener('contextmenu', (event) => { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); this.frameChart!.addChartClickListener((needShowMenu: boolean) => { this.parentElement!.scrollTo(0, 0); showButtonMenu(this.fsCallTreeFilter, needShowMenu); @@ -210,11 +315,6 @@ export class TabpaneFilesystemCalltree extends BaseElement { (evt.detail as any).callBack(true); } }); - this.modal!.setCloseListener((): void => { - this.modal!.style.display = 'none'; - this.fsCallTreeTbl!.style.visibility = 'visible'; - this.shadowRoot!.querySelector('#filter')!.style.display = 'flex'; - }); let filterFunc = (data: any): void => { let fsCallTreeFuncArgs: any[] = []; if (data.type === 'check') { @@ -425,7 +525,6 @@ export class TabpaneFilesystemCalltree extends BaseElement { } else { fsCallTreeTabFilter.style.display = 'none'; } - this.modal!.style.height = this.fsCallTreeTbl!.clientHeight - 2 + 'px'; //2 is borderWidth if (this.fsCallTreeTbl!.style.visibility === 'hidden') { fsCallTreeTabFilter.style.display = 'none'; } @@ -511,6 +610,21 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); + if (this._fsRowClickData && this._fsRowClickData.libId !== undefined && this._currentFsCallTreeLevel === 3) { + fileSysCallTreeArgs.push({ + funcName: 'showLibLevelData', + funcArgs: [this.FsCallTreeLevel!.libId, this.FsCallTreeLevel!.libName], + }); + } else if ( + this._fsRowClickData && + this._fsRowClickData.symbolId !== undefined && + this._currentFsCallTreeLevel === 4 + ) { + fileSysCallTreeArgs.push({ + funcName: 'showFunLevelData', + funcArgs: [this.FsCallTreeLevel!.symbolId, this.FsCallTreeLevel!.symbolName], + }); + } this.getDataByWorker(fileSysCallTreeArgs, (result: any[]): void => { this.setLTableData(result); this.frameChart!.data = this.fsCallTreeDataSource; @@ -607,13 +721,15 @@ export class TabpaneFilesystemCalltree extends BaseElement { display: flex; flex: 1; } + #level{ + display: none; + } -
    - +
    +
    - diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts index b15270b59..cab397864 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts @@ -24,11 +24,12 @@ import { procedurePool } from '../../../../database/Procedure.js'; import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; import { TabPaneFilter } from '../TabPaneFilter.js'; import { initSort } from '../SheetUtils.js'; +import { TabpaneFilesystemCalltree } from './TabPaneFileSystemCalltree.js'; @element('tabpane-file-statistics-analysis') export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { private fsPieChart: LitChartPie | null | undefined; - private fileStatisticsAnalysisCurrentSelection: SelectionParam | null | undefined; + private fsCurrentSelection: SelectionParam | null | undefined; private fileStatisticsAnalysisProcessData: any; private fileStatisticsAnalysisThreadData!: any[]; private fileStatisticsAnalysisSoData!: any[]; @@ -65,14 +66,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { private fsTableArray: NodeListOf | undefined | null; set data(val: SelectionParam) { - if (val === this.fileStatisticsAnalysisCurrentSelection) { + if (val === this.fsCurrentSelection) { this.fileStatisticsAnalysisPidData.unshift(this.processStatisticsData); this.fileStatisticsAnalysisTableProcess!.recycleDataSource = this.fileStatisticsAnalysisPidData; // @ts-ignore this.fileStatisticsAnalysisPidData.shift(this.processStatisticsData); return; } - this.fileStatisticsAnalysisCurrentSelection = val; + this.fsCurrentSelection = val; if (this.fsTableArray && this.fsTableArray.length > 0) { for (let fsTable of this.fsTableArray) { initSort(fsTable!, this.fsSortColumn, this.fsSortType); @@ -130,6 +131,9 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fsSortType = evt.detail.sort; this.sortByColumn(); }); + fsTable!.addEventListener('contextmenu', function (event) { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); fsTable!.addEventListener('row-hover', (evt) => { // @ts-ignore let detail = evt.detail; @@ -143,6 +147,34 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { this.fsPieChart?.showHover(); this.fsPieChart?.hideTip(); }); + fsTable!.addEventListener('row-click', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.button === 2) { + let fsTab = this.parentElement?.parentElement?.querySelector( + '#box-file-system-calltree > tabpane-filesystem-calltree' + ); + fsTab!.cWidth = this.clientWidth; + fsTab!.currentFsCallTreeLevel = this.currentLevel; + if (this.hideProcessCheckBox?.checked) { + detail.data.pid = undefined; + } + if (this.hideThreadCheckBox?.checked) { + detail.data.tid = undefined; + } + fsTab!.fsRowClickData = detail.data; + let title = ''; + if (this.titleEl?.textContent === '') { + title = detail.data.tableName; + } else { + title = this.titleEl?.textContent + ' / ' + detail.data.tableName; + } + fsTab!.pieTitle = title; + // 是否是在表格上右键点击跳转到火焰图的 + this.fsCurrentSelection!.isRowClick = true; + fsTab!.data = this.fsCurrentSelection; + } + }); } for (let box of this.checkBoxs) { box!.addEventListener('change', (event) => { @@ -157,34 +189,20 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { } }); } - this.fileStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileProcessLevelClickEvent(data); - } - }); - this.fileStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileTypeLevelClickEvent(data); - } - }); - this.fileStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileThreadLevelClickEvent(data); - } - }); - this.fileStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.fileSoLevelClickEvent(data); - } - }); + const addRowClickEventListener = (fsTable: LitTable, clickEvent: Function) => { + fsTable.addEventListener('row-click', (evt) => { + // @ts-ignore + const detail = evt.detail; + if (detail.button === 0 && detail.data.tableName !== '' && detail.data.duration !== 0) { + clickEvent(detail.data, this.fsCurrentSelection); + } + }); + }; + + addRowClickEventListener(this.fileStatisticsAnalysisTableProcess!, this.fileProcessLevelClickEvent.bind(this)); + addRowClickEventListener(this.fileStatisticsAnalysisTableType!, this.fileTypeLevelClickEvent.bind(this)); + addRowClickEventListener(this.fileStatisticsAnalysisTableThread!, this.fileThreadLevelClickEvent.bind(this)); + addRowClickEventListener(this.fileStatisticsAnalysisTableSo!, this.fileSoLevelClickEvent.bind(this)); } private reset(showTable: LitTable, isShowBack: boolean): void { @@ -921,7 +939,10 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { } const symbolData = { pid: item.pid, + type: item.type, tid: item.tid, + libId: item.libId, + symbolId: key, percent: ((dur / allDur) * 100).toFixed(2), tableName: fsSymbolName, durFormat: Utils.getProbablyTime(dur), diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts index 8ba832aa4..0fb0b6eba 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.ts @@ -24,6 +24,7 @@ import { procedurePool } from '../../../../database/Procedure.js'; import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; import { TabPaneFilter } from '../TabPaneFilter.js'; import { initSort } from '../SheetUtils.js'; +import { TabPaneIOCallTree } from './TabPaneIOCallTree.js'; @element('tabpane-tb-vm-statistics') export class TabPaneIOTierStatisticsAnalysis extends BaseElement { @@ -136,6 +137,9 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.ioSortType = evt.detail.sort; this.sortByColumn(); }); + ioTable!.addEventListener('contextmenu', function (event) { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); ioTable!.addEventListener('row-hover', (evt) => { // @ts-ignore let detail = evt.detail; @@ -149,6 +153,36 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { this.ioPieChart?.showHover(); this.ioPieChart?.hideTip(); }); + ioTable!.addEventListener('row-click', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.button === 2) { + let ioTab = this.parentElement?.parentElement?.querySelector( + '#box-io-calltree > tabpane-io-calltree' + ); + if (detail.button === 2) { + ioTab!.cWidth = this.clientWidth; + ioTab!.currentCallTreeLevel = this.currentLevel; + if (this.hideProcessCheckBox?.checked) { + detail.data.pid = undefined; + } + if (this.hideThreadCheckBox?.checked) { + detail.data.tid = undefined; + } + ioTab!.rowClickData = detail.data; + let title = ''; + if (this.titleEl?.textContent === '') { + title = detail.data.tableName; + } else { + title = this.titleEl?.textContent + ' / ' + detail.data.tableName; + } + ioTab!.pieTitle = title; + // 是否是在表格上右键点击跳转到火焰图的 + this.currentSelection!.isRowClick = true; + ioTab!.data = this.currentSelection; + } + } + }); } for (let box of this.checkBoxs) { box!.addEventListener('change', (event) => { @@ -163,34 +197,21 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { } }); } - this.ioTierTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierProcessLevelClickEvent(data); - } - }); - this.tableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierTypeLevelClickEvent(data); - } - }); - this.ioTierTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierThreadLevelClickEvent(data); - } - }); - this.ioTierTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.ioTierSoLevelClickEvent(data); - } - }); + + const addRowClickEventListener = (ioTable: LitTable, clickEvent: Function) => { + ioTable.addEventListener('row-click', (evt) => { + // @ts-ignore + const detail = evt.detail; + if (detail.button === 0 && detail.data.tableName !== '' && detail.data.duration !== 0) { + clickEvent(detail.data, this.currentSelection); + } + }); + }; + + addRowClickEventListener(this.ioTierTableProcess!, this.ioTierProcessLevelClickEvent.bind(this)); + addRowClickEventListener(this.tableType!, this.ioTierTypeLevelClickEvent.bind(this)); + addRowClickEventListener(this.ioTierTableThread!, this.ioTierThreadLevelClickEvent.bind(this)); + addRowClickEventListener(this.ioTierTableSo!, this.ioTierSoLevelClickEvent.bind(this)); } private reset(showTable: LitTable, isShowBack: boolean): void { @@ -719,6 +740,7 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { const ioTypeData = { tableName: this.typeIdToString(key), pid: item === null ? value[0].pid : item.pid, + tid: item === null ? value[0].tid : item.tid, type: key, percent: ((dur / allDur) * 100).toFixed(2), durFormat: Utils.getProbablyTime(dur), @@ -917,6 +939,9 @@ export class TabPaneIOTierStatisticsAnalysis extends BaseElement { const symbolData = { pid: item.pid, tid: item.tid, + type: item.type, + libId: item.libId, + symbolId: key, percent: ((dur / allDur) * 100).toFixed(2), tableName: funSymbolName, durFormat: Utils.getProbablyTime(dur), diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts index ac5bf9f1d..8c0d59234 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts @@ -24,11 +24,12 @@ import { procedurePool } from '../../../../database/Procedure.js'; import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; import { TabPaneFilter } from '../TabPaneFilter.js'; import { initSort } from '../SheetUtils.js'; +import { TabPaneVMCallTree } from './TabPaneIOCallTree.js'; @element('tabpane-virtual-memory-statistics-analysis') export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { private vmPieChart: LitChartPie | null | undefined; - private vmStatisticsAnalysisCurrentSelection: SelectionParam | null | undefined; + private vmCurrentSelection: SelectionParam | null | undefined; private vmStatisticsAnalysisProcessData: any; private vmStatisticsAnalysisPidData!: any[]; private vmStatisticsAnalysisThreadData!: any[]; @@ -65,7 +66,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { private vmTableArray: NodeListOf | undefined | null; set data(vmStatisticsAnalysisSelection: SelectionParam) { - if (vmStatisticsAnalysisSelection === this.vmStatisticsAnalysisCurrentSelection) { + if (vmStatisticsAnalysisSelection === this.vmCurrentSelection) { this.vmStatisticsAnalysisPidData.unshift(this.processStatisticsData); this.vmStatisticsAnalysisTableProcess!.recycleDataSource = this.vmStatisticsAnalysisPidData; // @ts-ignore @@ -80,7 +81,7 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.reset(this.vmStatisticsAnalysisTableProcess!, false); this.hideProcessCheckBox!.checked = false; this.hideThreadCheckBox!.checked = false; - this.vmStatisticsAnalysisCurrentSelection = vmStatisticsAnalysisSelection; + this.vmCurrentSelection = vmStatisticsAnalysisSelection; this.titleEl!.textContent = ''; this.tabName!.textContent = ''; this.vmStatisticsAnalysisRange!.textContent = @@ -135,6 +136,9 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmSortType = evt.detail.sort; this.sortByColumn(); }); + vmTable!.addEventListener('contextmenu', function (event) { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); vmTable!.addEventListener('row-hover', (evt) => { // @ts-ignore let detail = evt.detail; @@ -148,6 +152,34 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { this.vmPieChart?.showHover(); this.vmPieChart?.hideTip(); }); + vmTable!.addEventListener('row-click', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.button === 2) { + let vmTab = this.parentElement?.parentElement?.querySelector( + '#box-vm-calltree > tabpane-vm-calltree' + ); + vmTab!.cWidth = this.clientWidth; + vmTab!.currentCallTreeLevel = this.currentLevel; + if (this.hideProcessCheckBox?.checked) { + detail.data.pid = undefined; + } + if (this.hideThreadCheckBox?.checked) { + detail.data.tid = undefined; + } + vmTab!.rowClickData = detail.data; + let title = ''; + if (this.titleEl?.textContent === '') { + title = detail.data.tableName; + } else { + title = this.titleEl?.textContent + ' / ' + detail.data.tableName; + } + vmTab!.pieTitle = title; + // 是否是在表格上右键点击跳转到火焰图的 + this.vmCurrentSelection!.isRowClick = true; + vmTab!.data = this.vmCurrentSelection; + } + }); } for (let box of this.checkBoxs) { box!.addEventListener('change', (event) => { @@ -162,34 +194,20 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { } }); } - this.vmStatisticsAnalysisTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmProcessLevelClickEvent(data); - } - }); - this.vmStatisticsAnalysisTableType!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmTypeLevelClickEvent(data); - } - }); - this.vmStatisticsAnalysisTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmThreadLevelClickEvent(data); - } - }); - this.vmStatisticsAnalysisTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.duration !== 0) { - this.vmSoLevelClickEvent(data); - } - }); + const addRowClickEventListener = (vmTable: LitTable, clickEvent: Function) => { + vmTable.addEventListener('row-click', (evt) => { + // @ts-ignore + const detail = evt.detail; + if (detail.button === 0 && detail.data.tableName !== '' && detail.data.duration !== 0) { + clickEvent(detail.data, this.vmCurrentSelection); + } + }); + }; + + addRowClickEventListener(this.vmStatisticsAnalysisTableProcess!, this.vmProcessLevelClickEvent.bind(this)); + addRowClickEventListener(this.vmStatisticsAnalysisTableType!, this.vmTypeLevelClickEvent.bind(this)); + addRowClickEventListener(this.vmStatisticsAnalysisTableThread!, this.vmThreadLevelClickEvent.bind(this)); + addRowClickEventListener(this.vmStatisticsAnalysisTableSo!, this.vmSoLevelClickEvent.bind(this)); } private reset(showTable: LitTable, isShowBack: boolean): void { @@ -913,7 +931,10 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { } const symbolData = { pid: item.pid, + type: item.type, tid: item.tid, + libId: item.libId, + symbol: key, percent: ((dur / allDur) * 100).toFixed(2), tableName: symbolName, durFormat: Utils.getProbablyTime(dur), diff --git a/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogSummary.ts b/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogSummary.ts index be4531768..3da7ee659 100644 --- a/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogSummary.ts +++ b/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogSummary.ts @@ -100,6 +100,9 @@ export class TabPaneHiLogSummary extends BaseElement { .tree-row-tr:hover { background-color: #DEEDFF; } + .tree-row-tr:nth-last-child(1):hover { + background-color: white; + } .head-label, .head-count { white-space: nowrap; overflow: hidden; @@ -276,6 +279,12 @@ export class TabPaneHiLogSummary extends BaseElement { tableTreeEl.style.height = `${this.parentElement!.clientHeight - 40}px`; } this.createRowNodeTableEL(this.logTreeNodes, tableTreeEl, tableCountEl, ''); + let emptyTr = document.createElement('tr'); + emptyTr.className = 'tree-row-tr'; + tableTreeEl?.appendChild(emptyTr); + let emptyCountTr = document.createElement('tr'); + emptyCountTr.className = 'tree-row-tr'; + tableCountEl?.appendChild(emptyCountTr); tableFragmentEl.appendChild(tableTreeEl); tableFragmentEl.appendChild(tableCountEl); this.logSummaryTable!.appendChild(tableFragmentEl); diff --git a/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogs.ts b/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogs.ts index 9d235f3c9..a408a3955 100644 --- a/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogs.ts +++ b/ide/src/trace/component/trace/sheet/hilog/TabPaneHiLogs.ts @@ -112,7 +112,7 @@ export class TabPaneHiLogs extends BaseElement { connectedCallback(): void { super.connectedCallback(); - this.tagFilterInput?.addEventListener('keydown', this.tagFilterKeyEvent); + this.tagFilterInput?.addEventListener('keyup', this.tagFilterKeyEvent); new ResizeObserver((): void => { this.parentElement!.style.overflow = 'hidden'; // @ts-ignore @@ -124,7 +124,7 @@ export class TabPaneHiLogs extends BaseElement { disconnectedCallback(): void { super.disconnectedCallback(); - this.tagFilterInput?.removeEventListener('keydown', this.tagFilterKeyEvent); + this.tagFilterInput?.removeEventListener('keyup', this.tagFilterKeyEvent); } initHtml(): string { @@ -179,7 +179,6 @@ export class TabPaneHiLogs extends BaseElement { let rowCount = frontTotalRowSize.toString().split('.'); height += trEl.clientHeight - (Number(rowCount[1]) / 100 * trEl.clientHeight); } - firstRowHeight = trEl.clientHeight; } let allTdEl = trEl.querySelectorAll('.td'); allTdEl[0].style.color = '#3D88C7'; diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts index 13a38a781..a6e91ef7d 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts @@ -20,10 +20,10 @@ import { LitChartPie } from '../../../../../base-ui/chart/pie/LitChartPie.js'; import '../../../../../base-ui/chart/pie/LitChartPie.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar.js'; import { procedurePool } from '../../../../database/Procedure.js'; -import { SpHiPerf } from '../../../chart/SpHiPerf.js'; import { TabPaneFilter } from '../TabPaneFilter.js'; import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; import { initSort } from '../SheetUtils.js'; +import { TabpanePerfProfile } from './TabPerfProfile.js'; @element('tabpane-perf-analysis') export class TabPanePerfAnalysis extends BaseElement { @@ -79,6 +79,7 @@ export class TabPanePerfAnalysis extends BaseElement { this.hideProcessCheckBox!.checked = false; this.hideThreadCheckBox!.checked = false; this.reset(this.perfTableProcess!, false); + this.titleEl!.textContent = ''; this.perfAnalysisRange!.textContent = 'Selected range: ' + parseFloat(((val.rightNs - val.leftNs) / 1000000.0).toFixed(5)) + ' ms'; if (!this.callChainMap) { @@ -103,15 +104,57 @@ export class TabPanePerfAnalysis extends BaseElement { this.hideThreadCheckBox = popover!!.querySelector('div > #hideThread'); this.checkBoxs = popover!.querySelectorAll('.check-wrap > lit-check-box'); this.tableArray = this.shadowRoot!.querySelectorAll('lit-table') as NodeListOf; - for (let table of this.tableArray) { - table.shadowRoot!.querySelector('.table')!.style.height = 'calc(100% - 31px)'; - table!.addEventListener('column-click', (evt) => { + for (let perfTable of this.tableArray) { + perfTable.shadowRoot!.querySelector('.table')!.style.height = 'calc(100% - 31px)'; + perfTable!.addEventListener('column-click', (evt) => { // @ts-ignore this.sortColumn = evt.detail.key; // @ts-ignore this.sortType = evt.detail.sort; this.sortByColumn(); }); + perfTable!.addEventListener('contextmenu', function (event) { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); + perfTable!.addEventListener('row-hover', (evt) => { + // @ts-ignore + let detail = evt.detail; + if (detail.data) { + let data = detail.data; + data.isHover = true; + if (detail.callBack) { + detail.callBack(true); + } + } + this.perfAnalysisPie?.showHover(); + this.perfAnalysisPie?.hideTip(); + }); + perfTable!.addEventListener('row-click', (evt) => { + // @ts-ignore + let detail = evt.detail; + let perfProfileTab = this.parentElement?.parentElement?.querySelector( + '#box-perf-profile > tabpane-perf-profile' + ); + if (detail.button === 2) { + perfProfileTab!.cWidth = this.clientWidth; + perfProfileTab!.currentLevel = this.currentLevel; + if (this.hideProcessCheckBox?.checked && this.hideThreadCheckBox?.checked) { + detail.data.pid = undefined; + detail.data.tid = undefined; + } + perfProfileTab!.rowClickData = detail.data; + let title = ''; + if (this.titleEl?.textContent === '') { + title = detail.data.tableName; + } else { + title = this.titleEl?.textContent + ' / ' + detail.data.tableName; + } + perfProfileTab!.pieTitle = title; + // 是否是在表格上右键点击跳转到火焰图的 + this.currentSelection.isRowClick = true; + perfProfileTab!.data = this.currentSelection; + } + }); } for (let box of this.checkBoxs) { box!.addEventListener('change', (event) => { @@ -132,27 +175,22 @@ export class TabPanePerfAnalysis extends BaseElement { }); } this.getBack(); - this.perfTableProcess!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.count !== 0) { - this.perfProcessLevelClickEvent(data, this.currentSelection); - } - }); - this.perfTableThread!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.count !== 0) { - this.perfThreadLevelClickEvent(data, this.currentSelection); - } - }); - this.perfTableSo!.addEventListener('row-click', (evt) => { - // @ts-ignore - let data = evt.detail.data; - if (data.tableName !== '' && data.count !== 0) { - this.perfSoLevelClickEvent(data, this.currentSelection); - } - }); + + const addRowClickEventListener = (table: LitTable, clickEvent: Function) => { + table.addEventListener('row-click', (evt) => { + // @ts-ignore + const detail = evt.detail; + // @ts-ignore + const data = detail.data; + if (detail.button === 0 && data.tableName !== '' && data.count !== 0) { + clickEvent(data, this.currentSelection); + } + }); + }; + + addRowClickEventListener(this.perfTableProcess!, this.perfProcessLevelClickEvent.bind(this)); + addRowClickEventListener(this.perfTableThread!, this.perfThreadLevelClickEvent.bind(this)); + addRowClickEventListener(this.perfTableSo!, this.perfSoLevelClickEvent.bind(this)); } private reset(showTable: LitTable, isShowBack: boolean): void { @@ -200,7 +238,7 @@ export class TabPanePerfAnalysis extends BaseElement { } private getBack(): void { - this.back!.addEventListener('click', () => { + this.back!.addEventListener('click', (e) => { if (this.tabName!.textContent === 'Statistic By Thread Count') { this.showAssignLevel(this.perfTableProcess!, this.perfTableThread!, 0, this.pidData); this.back!.style.visibility = 'hidden'; @@ -263,11 +301,13 @@ export class TabPanePerfAnalysis extends BaseElement { }, tip: (perfObj): string => { return `
    -
    Process:${perfObj.obj.tableName}
    -
    Sample Count:${perfObj.obj.count}
    -
    Percent:${perfObj.obj.percent}%
    -
    - `; +
    Process:${perfObj.obj.tableName}
    +
    Sample Count:${perfObj.obj.count}
    +
    Percent:${perfObj.obj.percent}%
    +
    Event Count:${perfObj.obj.eventCount}
    +
    Percent:${perfObj.obj.eventPercent}%
    +
    + `; }, angleClick: (it): void => { // @ts-ignore @@ -288,19 +328,6 @@ export class TabPanePerfAnalysis extends BaseElement { }, ], }; - this.perfTableProcess!.addEventListener('row-hover', (tblProcessRowHover) => { - // @ts-ignore - let tblProcessData = tblProcessRowHover.detail; - if (tblProcessData.data) { - let data = tblProcessData.data; - data.isHover = true; - if (tblProcessData.callBack) { - tblProcessData.callBack(true); - } - } - this.perfAnalysisPie?.showHover(); - this.perfAnalysisPie?.hideTip(); - }); this.titleEl!.textContent = ''; this.tabName!.textContent = 'Statistic By Process Count'; this.pidData.unshift(this.allProcessCount); @@ -347,11 +374,13 @@ export class TabPanePerfAnalysis extends BaseElement { }, tip: (obj): string => { return `
    -
    Thread:${obj.obj.tableName}
    -
    Sample Count:${obj.obj.count}
    -
    Percent:${obj.obj.percent}%
    -
    - `; +
    Thread:${obj.obj.tableName}
    +
    Sample Count:${obj.obj.count}
    +
    Percent:${obj.obj.percent}%
    +
    Event Count:${obj.obj.eventCount}
    +
    Percent:${obj.obj.eventPercent}%
    +
    + `; }, angleClick: (it): void => { // @ts-ignore @@ -372,19 +401,6 @@ export class TabPanePerfAnalysis extends BaseElement { }, ], }; - this.perfTableThread!.addEventListener('row-hover', (perfTblThreadRowHover) => { - // @ts-ignore - let perfTblThreadData = perfTblThreadRowHover.detail; - if (perfTblThreadData.data) { - let data = perfTblThreadData.data; - data.isHover = true; - if (perfTblThreadData.callBack) { - perfTblThreadData.callBack(true); - } - } - this.perfAnalysisPie?.showHover(); - this.perfAnalysisPie?.hideTip(); - }); this.tabName!.textContent = 'Statistic By Thread Count'; this.threadData.unshift(this.allThreadCount); this.perfTableThread!.recycleDataSource = this.threadData; @@ -421,11 +437,13 @@ export class TabPanePerfAnalysis extends BaseElement { }, tip: (obj): string => { return `
    -
    Library:${obj.obj.tableName}
    -
    Sample Count:${obj.obj.count}
    -
    Percent:${obj.obj.percent}%
    -
    - `; +
    Library:${obj.obj.tableName}
    +
    Sample Count:${obj.obj.count}
    +
    Percent:${obj.obj.percent}%
    +
    Event Count:${obj.obj.eventCount}
    +
    Percent:${obj.obj.eventPercent}%
    +
    + `; }, angleClick: (it): void => { // @ts-ignore @@ -446,19 +464,6 @@ export class TabPanePerfAnalysis extends BaseElement { }, ], }; - this.perfTableSo!.addEventListener('row-hover', (tableSoRowHover) => { - // @ts-ignore - let perfTableSoData = tableSoRowHover.detail; - if (perfTableSoData.data) { - let data = perfTableSoData.data; - data.isHover = true; - if (perfTableSoData.callBack) { - perfTableSoData.callBack(true); - } - } - this.perfAnalysisPie?.showHover(); - this.perfAnalysisPie?.hideTip(); - }); let pName = this.processName; if (this.processName.length > 0 && this.threadName.length > 0) { pName = this.processName + ' / '; @@ -552,6 +557,10 @@ export class TabPanePerfAnalysis extends BaseElement { currentTable!.recycleDataSource = array.sort((a, b) => { return this.sortType === 1 ? a.count - b.count : b.count - a.count; }); + } else if (this.sortColumn === 'eventCount' || this.sortColumn === 'eventPercent') { + currentTable!.recycleDataSource = array.sort((a, b) => { + return this.sortType === 1 ? a.eventCount - b.eventCount : b.eventCount - a.eventCount; + }); } switch (this.currentLevel) { case 0: @@ -589,6 +598,7 @@ export class TabPanePerfAnalysis extends BaseElement { return; } let allCount = 0; + let allEventCount = 0; let pidMap = new Map>(); if (val.perfThread.length > 0 && val.perfProcess.length === 0) { this.perfTableProcess!.style.display = 'none'; @@ -596,6 +606,7 @@ export class TabPanePerfAnalysis extends BaseElement { } else { for (let itemData of this.processData) { allCount += itemData.count; + allEventCount += itemData.eventCount; if (pidMap.has(itemData.pid)) { pidMap.get(itemData.pid)?.push(itemData); } else { @@ -607,8 +618,10 @@ export class TabPanePerfAnalysis extends BaseElement { this.pidData = []; pidMap.forEach((arr: Array, pid: number) => { let count = 0; + let eventCount = 0; for (let item of arr) { count += item.count; + eventCount += item.eventCount; } const pName = arr[0].processName + '(' + pid + ')'; const pidData = { @@ -616,11 +629,13 @@ export class TabPanePerfAnalysis extends BaseElement { pid: pid, percent: ((count / allCount) * 100).toFixed(2), count: count, + eventCount: eventCount, + eventPercent: ((eventCount / allEventCount) * 100).toFixed(2), }; this.pidData.push(pidData); }); this.pidData.sort((a, b) => b.count - a.count); - this.allProcessCount = this.totalCountData(allCount); + this.allProcessCount = this.totalCountData(allCount, allEventCount); this.currentLevel = 0; this.progressEL!.loading = false; this.processPieChart(val); @@ -631,6 +646,7 @@ export class TabPanePerfAnalysis extends BaseElement { this.progressEL!.loading = true; let threadMap = new Map>(); let allCount = 0; + let allEventCount = 0; if (!this.processData || this.processData.length === 0) { return; } @@ -639,6 +655,7 @@ export class TabPanePerfAnalysis extends BaseElement { continue; } allCount += itemData.count; + allEventCount += itemData.eventCount; if (threadMap.has(itemData.tid)) { threadMap.get(itemData.tid)?.push(itemData); } else { @@ -650,9 +667,11 @@ export class TabPanePerfAnalysis extends BaseElement { this.threadData = []; threadMap.forEach((arr: Array, tid: number) => { let threadCount = 0; + let threadEventCount = 0; let tName = arr[0].threadName + '(' + tid + ')'; for (let item of arr) { threadCount += item.count; + threadEventCount += item.eventCount; } const threadData = { pid: item === null ? arr[0].pid : item.pid, @@ -660,10 +679,12 @@ export class TabPanePerfAnalysis extends BaseElement { tableName: tName, count: threadCount, percent: ((threadCount / allCount) * 100).toFixed(2), + eventCount: threadEventCount, + eventPercent: ((threadEventCount / allEventCount) * 100).toFixed(2), }; this.threadData.push(threadData); }); - this.allThreadCount = this.totalCountData(allCount); + this.allThreadCount = this.totalCountData(allCount, allEventCount); this.currentLevel = 1; this.threadData.sort((a, b) => b.count - a.count); this.progressEL!.loading = false; @@ -672,8 +693,10 @@ export class TabPanePerfAnalysis extends BaseElement { private getHiperfSo(item: any, val: SelectionParam): void { this.progressEL!.loading = true; + let parentEventCount = 0; let allCount = 0; - let libMap = new Map>(); + let allEventCount = 0; + let libMap = new Map>(); if (!this.processData || this.processData.length === 0) { return; } @@ -692,32 +715,41 @@ export class TabPanePerfAnalysis extends BaseElement { } } allCount += itemData.count; - if (libMap.has(itemData.libId)) { - libMap.get(itemData.libId)?.push(itemData); + allEventCount += itemData.eventCount; + if (libMap.has(itemData.libId + '-' + itemData.libName)) { + libMap.get(itemData.libId + '-' + itemData.libName)?.push(itemData); } else { let dataArray = new Array(); dataArray.push(itemData); - libMap.set(itemData.libId, dataArray); + libMap.set(itemData.libId + '-' + itemData.libName, dataArray); } } + if (!item) { + parentEventCount = allEventCount; + } this.soData = []; - libMap.forEach((arr: Array, libId: number) => { + libMap.forEach((arr: Array, libInfo: string) => { let libCount = 0; + let libEventCount = 0; let libName = arr[0].libName; + let libId = arr[0].libId; for (let item of arr) { libCount += item.count; + libEventCount += item.eventCount; } const libData = { pid: item === null ? arr[0].pid : item.pid, tid: item === null ? arr[0].tid : item.tid, percent: ((libCount / allCount) * 100).toFixed(2), count: libCount, + eventPercent: ((libEventCount / parentEventCount) * 100).toFixed(2), + eventCount: libEventCount, tableName: libName, libId: libId, }; this.soData.push(libData); }); - this.allLibCount = this.totalCountData(allCount); + this.allLibCount = this.totalCountData(allCount, allEventCount); this.soData.sort((a, b) => b.count - a.count); this.currentLevel = 2; this.progressEL!.loading = false; @@ -728,11 +760,13 @@ export class TabPanePerfAnalysis extends BaseElement { this.progressEL!.loading = true; this.shadowRoot!.querySelector('.perf-subheading')!.textContent = 'Statistic By Function Count'; let parentCount = item.count; + let parentEventCount = item.eventCount; let tid = item.tid; let pid = item.pid; let libId = item.libId; let allCount = 0; - let symbolMap = new Map>(); + let allEventCount = 0; + let symbolMap = new Map>(); if (!this.processData || this.processData.length === 0) { return; } @@ -755,32 +789,39 @@ export class TabPanePerfAnalysis extends BaseElement { } } allCount += itemData.count; - if (symbolMap.has(itemData.symbolId)) { - symbolMap.get(itemData.symbolId)?.push(itemData); + allEventCount += itemData.eventCount; + if (symbolMap.has(itemData.symbolId + '-' + itemData.symbolName)) { + symbolMap.get(itemData.symbolId + '-' + itemData.symbolName)?.push(itemData); } else { let dataArray = new Array(); dataArray.push(itemData); - symbolMap.set(itemData.symbolId, dataArray); + symbolMap.set(itemData.symbolId + '-' + itemData.symbolName, dataArray); } } this.functionData = []; - symbolMap.forEach((arr, symbolId) => { + symbolMap.forEach((arr, symbolInfo) => { let symbolCount = 0; + let symbolEventCount = 0; for (let item of arr) { symbolCount += item.count; + symbolEventCount += item.eventCount; } let symbolName = arr[0].symbolName; + let symbolId = arr[0].symbolId; const symbolData = { pid: item.pid, tid: item.tid, percent: ((symbolCount / parentCount) * 100).toFixed(2), count: symbolCount, + symbolId: symbolId, + eventPercent: ((symbolEventCount / parentEventCount) * 100).toFixed(2), + eventCount: symbolEventCount, tableName: symbolName, }; this.functionData.push(symbolData); }); this.functionData.sort((a, b) => b.count - a.count); - this.allSymbolCount = this.totalCountData(allCount); + this.allSymbolCount = this.totalCountData(allCount, allEventCount); this.currentLevel = 3; this.progressEL!.loading = false; // @ts-ignore @@ -808,19 +849,6 @@ export class TabPanePerfAnalysis extends BaseElement { }, ], }; - this.tableFunction!.addEventListener('row-hover', (evt) => { - // @ts-ignore - let functionData = evt.detail; - if (functionData.data) { - let data = functionData.data; - data.isHover = true; - if (functionData.callBack) { - functionData.callBack(true); - } - } - this.perfAnalysisPie?.showHover(); - this.perfAnalysisPie?.hideTip(); - }); this.functionData.unshift(this.allSymbolCount); this.tableFunction!.recycleDataSource = this.functionData; this.tableFunction?.reMeauseHeight(); @@ -830,26 +858,37 @@ export class TabPanePerfAnalysis extends BaseElement { } private getTip() { - return (obj: { obj: { tableName: any; count: any; percent: any } }): string => { + return (obj: { obj: { tableName: any; count: any; percent: any; eventCount: any; eventPercent: any } }): string => { return `
    -
    Function:${obj.obj.tableName}
    -
    Sample Count:${obj.obj.count}
    -
    Percent:${obj.obj.percent}%
    -
    `; +
    Function:${obj.obj.tableName}
    +
    Sample Count:${obj.obj.count}
    +
    Percent:${obj.obj.percent}%
    +
    Event Count:${obj.obj.eventCount}
    +
    Percent:${obj.obj.eventPercent}%
    +
    `; }; } - private totalCountData(count: number): { + totalCountData( + count: number, + eventCount: number + ): { percent: string; count: number; allCount: number; + eventCount: number; + eventPercent: string; + allEventCount: number; pid: string; } { let allCount; allCount = { percent: ((count / count) * 100).toFixed(2), - count: 0, + count: count, allCount: count, + eventCount: eventCount, + allEventCount: eventCount, + eventPercent: '100.00', pid: '', }; return allCount; @@ -993,21 +1032,29 @@ export class TabPanePerfAnalysis extends BaseElement { + +
    diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts index 317c43a4c..0528dedd3 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfBottomUp.ts @@ -19,7 +19,6 @@ import '../TabPaneFilter.js'; import { type FilterData, TabPaneFilter } from '../TabPaneFilter.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; import '../../../chart/FrameChart.js'; -import '../../../DisassemblingWindow.js'; import '../../../../../base-ui/slicer/lit-slicer.js'; import '../../../../../base-ui/progress-bar/LitProgressBar.js'; import { procedurePool } from '../../../../database/Procedure.js'; @@ -98,13 +97,20 @@ export class TabpanePerfBottomUp extends BaseElement { private setBottomUpTableData(results: Array): void { const percentageDenominator = 100; const percentFraction = 1; - const timeFractionDigits = 2; this.stackTable!.recycleDataSource = []; - let totalTime = results.reduce((sum, struct) => sum + struct.selfTime, 0); + let sum = results.reduce((sum, struct) => { + sum.totalCount += struct.selfTime; + sum.totalEvent += struct.eventCount; + return sum; + }, { + totalCount: 0, + totalEvent: 0 + }); const setTabData = (array: Array): void => { array.forEach((data) => { - data.totalTimePercent = `${((data.totalTime / totalTime) * percentageDenominator).toFixed(percentFraction)}%`; - data.selfTimePercent = `${((data.selfTime / totalTime) * percentageDenominator).toFixed(percentFraction)}%`; + data.totalTimePercent = `${((data.totalTime / sum.totalCount) * percentageDenominator).toFixed(percentFraction)}%`; + data.selfTimePercent = `${((data.selfTime / sum.totalCount) * percentageDenominator).toFixed(percentFraction)}%`; + data.eventPercent = `${((data.eventCount / sum.totalEvent) * percentageDenominator).toFixed(percentFraction)}%`; setTabData(data.children); }); }; @@ -264,7 +270,7 @@ export class TabpanePerfBottomUp extends BaseElement {
    - @@ -274,6 +280,8 @@ export class TabpanePerfBottomUp extends BaseElement { align="flex-start" order> + +
    diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts index fc3291d4e..2a6068632 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts @@ -18,19 +18,17 @@ import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import '../TabPaneFilter.js'; import { FilterData, TabPaneFilter } from '../TabPaneFilter.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; -import { PerfCallChainMerageData } from '../../../../bean/PerfProfile.js'; +import { PerfCallChainMerageData, PerfLevelStruct } from '../../../../bean/PerfProfile.js'; import '../../../chart/FrameChart.js'; import { FrameChart } from '../../../chart/FrameChart.js'; import { ChartMode } from '../../../../bean/FrameChartStruct.js'; -import '../../../DisassemblingWindow.js'; -import { DisassemblingWindow } from '../../../DisassemblingWindow.js'; -import { Cmd } from '../../../../../command/Cmd.js'; -import { SpApplication } from '../../../../SpApplication.js'; import '../../../../../base-ui/slicer/lit-slicer.js'; import '../../../../../base-ui/progress-bar/LitProgressBar.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { showButtonMenu } from '../SheetUtils.js'; +import '../../../../../base-ui/headline/lit-headline.js'; +import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline.js'; const InvertOptionIndex: number = 0; const hideThreadOptionIndex: number = 3; @@ -52,19 +50,52 @@ export class TabpanePerfProfile extends BaseElement { private isChartShow: boolean = false; private systemRuleName: string = '/system/'; private perfProfileNumRuleName: string = '/max/min/'; - private perfProfilerModal: DisassemblingWindow | null | undefined; private needShowMenu: boolean = true; private searchValue: string = ''; private perfProfileLoadingPage: any; private currentSelection: SelectionParam | undefined; + private currentRowClickData: any; + private initWidth: number = 0; + private _pieTitle: string = ''; + private _cWidth: number = 0; + private _currentLevel: number = 0; + private _rowClickData: any = undefined; + private perfLevel: PerfLevelStruct | undefined | null; + private headLine: LitHeadLine | null | undefined; + + set pieTitle(value: string) { + this._pieTitle = value; + if (this._pieTitle.length > 0) { + this.headLine!.isShow = true; + this.headLine!.titleTxt = this._pieTitle; + this.headLine!.closeCallback = (): void => { + this.restore(); + }; + } + } + + set cWidth(value: number) { + this._cWidth = value; + } + + set currentLevel(value: number) { + this._currentLevel = value; + } + + set rowClickData(value: any) { + this._rowClickData = value; + } set data(perfProfilerSelection: SelectionParam | any) { - if (perfProfilerSelection === this.currentSelection) { + if (perfProfilerSelection !== this.currentSelection && this._rowClickData === this.currentRowClickData) { + this._rowClickData = undefined; + } + if (perfProfilerSelection === this.currentSelection && !this.currentSelection?.isRowClick) { return; } this.searchValue = ''; this.currentSelection = perfProfilerSelection; - this.perfProfilerModal!.style.display = 'none'; + this.currentRowClickData = this._rowClickData; this.perfProfilerTbl!.style.visibility = 'visible'; if (this.parentElement!.clientHeight > this.perfProfilerFilter!.clientHeight) { this.perfProfilerFilter!.style.display = 'flex'; @@ -72,32 +103,31 @@ export class TabpanePerfProfile extends BaseElement { this.perfProfilerFilter!.style.display = 'none'; } procedurePool.submitWithName('logic0', 'perf-reset', [], undefined, () => {}); - this.perfProfilerFilter!.disabledTransfer(false, 'perf'); + this.perfProfilerFilter!.disabledTransfer(true); this.perfProfilerFilter!.initializeFilterTree(true, true, true); this.perfProfilerFilter!.filterValue = ''; - this.perfProfilerFilter!.refreshTreeTransfer(); this.perfProfileProgressEL!.loading = true; this.perfProfileLoadingPage.style.visibility = 'visible'; this.getDataByWorkAndUpDateCanvas(perfProfilerSelection); } - getDataByWorkAndUpDateCanvas(perfProfilerSelection: SelectionParam):void { - const initWidth = this.clientWidth; - this.initGetData(perfProfilerSelection, initWidth); - this.perfProfilerFilter!.getCallTransferData((data: any) => { - const eventTypeId = data.value !== 'count' ? data.value : undefined; - this.initGetData(perfProfilerSelection, initWidth, eventTypeId); - }); + getDataByWorkAndUpDateCanvas(perfProfilerSelection: SelectionParam): void { + if (this.clientWidth === 0) { + this.initWidth = this._cWidth; + } else { + this.initWidth = this.clientWidth; + } + if (this._rowClickData && this.currentRowClickData !== undefined && this.currentSelection?.isRowClick) { + // 点击表格的某一行跳转到火焰图 + this.getDataByPieLevel(perfProfilerSelection.perfEventTypeId); + } else { + this.headLine!.isShow = false; + this.initGetData(perfProfilerSelection, this.initWidth, perfProfilerSelection.perfEventTypeId); + } } - initGetData(perfProfilerSelection: SelectionParam | any, initWidth: number, eventTypeId?: string): void { + initGetData(perfProfilerSelection: SelectionParam | any, initWidth: number, eventTypeId: undefined | number): void { let perfProfileArgs: any[] = []; - if (eventTypeId) { - perfProfileArgs.push({ - funcName: 'setEventTypeId', - funcArgs: [eventTypeId !== 'count' ? eventTypeId : undefined], - }); - } perfProfileArgs.push( { funcName: 'setSearchValue', @@ -112,12 +142,11 @@ export class TabpanePerfProfile extends BaseElement { this.getDataByWorker(perfProfileArgs, (results: any[]) => { this.setPerfProfilerLeftTableData(results); this.perfProfilerList!.recycleDataSource = []; - if (eventTypeId && eventTypeId !== 'count') { - this.perfProfileFrameChart!.mode = ChartMode.EventCount; - } else { + if (eventTypeId === undefined) { this.perfProfileFrameChart!.mode = ChartMode.Count; + } else { + this.perfProfileFrameChart!.mode = ChartMode.EventCount; } - this.perfProfileFrameChart?.updateCanvas(true, initWidth); this.perfProfileFrameChart!.data = this.perfProfilerDataSource; this.switchFlameChart(); @@ -125,6 +154,61 @@ export class TabpanePerfProfile extends BaseElement { }); } + private restore(): void { + // 恢复全部的火焰图和表格，并隐藏title; + this.headLine!.isShow = false; + this._rowClickData = undefined; + this.initGetData(this.currentSelection, this.initWidth, this.currentSelection?.perfEventTypeId); + } + + /** + * 根据饼图跳转过来的层级绘制对应的火焰图和表格 + */ + private getDataByPieLevel(eventTypeId: number | undefined): void { + this.perfLevel = new PerfLevelStruct(); + this.perfLevel = { + process: this._rowClickData.pid, + thread: this._rowClickData.tid, + libId: this._rowClickData.libId, + }; + let args = []; + args.push({ + funcName: 'getCurrentDataFromDb', + funcArgs: [this.currentSelection, this.perfLevel], + }); + + if (this._rowClickData.libId !== undefined && this._currentLevel === 2) { + this.perfLevel.libName = this._rowClickData.tableName; + args.push({ + funcName: 'showLibLevelData', + funcArgs: [this.perfLevel.libId, this.perfLevel.libName], + }); + } else if (!this._rowClickData.libId && this._currentLevel === 3) { + this.perfLevel.symbolId = this._rowClickData.symbolId; + this.perfLevel.symbolName = this._rowClickData.tableName; + args.push({ + funcName: 'showFunLevelData', + funcArgs: [this.perfLevel.symbolId, this.perfLevel.symbolName], + }); + } + + this.getDataByWorker(args, (results: any[]) => { + this.perfProfileProgressEL!.loading = false; + this.perfProfileLoadingPage.style.visibility = 'hidden'; + this.setPerfProfilerLeftTableData(results); + this.perfProfilerList!.recycleDataSource = []; + if (eventTypeId === undefined) { + this.perfProfileFrameChart!.mode = ChartMode.Count; + } else { + this.perfProfileFrameChart!.mode = ChartMode.EventCount; + } + this.perfProfileFrameChart?.updateCanvas(true, this.initWidth); + this.perfProfileFrameChart!.data = this.perfProfilerDataSource; + this.switchFlameChart(); + this.perfProfilerFilter!.icon = 'block'; + }); + } + getParentTree( perfCallSrc: Array, target: PerfCallChainMerageData, @@ -202,11 +286,14 @@ export class TabpanePerfProfile extends BaseElement { } initElements(): void { + this.headLine = this.shadowRoot?.querySelector('.titleBox'); this.perfProfilerTbl = this.shadowRoot?.querySelector('#tb-perf-profile'); this.perfProfileProgressEL = this.shadowRoot?.querySelector('.perf-profile-progress') as LitProgressBar; this.perfProfileFrameChart = this.shadowRoot?.querySelector('#framechart'); - this.perfProfilerModal = this.shadowRoot?.querySelector('tab-native-data-modal'); this.perfProfileLoadingPage = this.shadowRoot?.querySelector('.perf-profile-loading'); + this.addEventListener('contextmenu', (event) => { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); this.perfProfileFrameChart!.addChartClickListener((needShowMenu: boolean): void => { this.parentElement!.scrollTo(0, 0); showButtonMenu(this.perfProfilerFilter, needShowMenu); @@ -234,7 +321,6 @@ export class TabpanePerfProfile extends BaseElement { } }); this.perfProfilerList = this.shadowRoot?.querySelector('#tb-perf-list'); - let lastClikTime = 0; this.perfProfilerList!.addEventListener('row-click', (evt: any): void => { // @ts-ignore let data = evt.detail.data as PerfCallChainMerageData; @@ -246,47 +332,6 @@ export class TabpanePerfProfile extends BaseElement { // @ts-ignore (evt.detail as any).callBack(true); } - let spApplication = document.getElementsByTagName('sp-application')[0]; - if (Date.now() - lastClikTime < 200 && spApplication.vs) { - this.perfProfilerTbl!.style.visibility = 'hidden'; - this.perfProfilerFilter!.style.display = 'none'; - new ResizeObserver((entries: ResizeObserverEntry[]): void => { - this.perfProfilerModal!.style.width = this.perfProfilerTbl!.clientWidth + 'px'; - this.perfProfilerModal!.style.height = this.perfProfilerTbl!.clientHeight + 'px'; - }).observe(this.perfProfilerTbl!); - this.perfProfilerModal!.showLoading(); - // @ts-ignore - let data = evt.detail.data as PerfCallChainMerageData; - let perfProfilerPath = data.path; - let perfProfilerAddr = data.vaddrInFile; - let perfProfilerAddrHex = perfProfilerAddr.toString(16); - if (perfProfilerPath.trim() === '[kernel.kallsyms]') { - this.perfProfilerModal?.showContent( - `error : Symbol ${data.symbol} lib is [kernel.kallsyms] ,not support `, - perfProfilerAddrHex - ); - } else if (perfProfilerPath.trim() === '') { - this.perfProfilerModal?.showContent(`error : Symbol ${data.symbol} lib is null `, perfProfilerAddrHex); - } else if (perfProfilerAddr < 0) { - this.perfProfilerModal?.showContent( - `error : Symbol ${data.symbol} current addr is error ` + perfProfilerAddrHex, - perfProfilerAddrHex - ); - } else { - const binDir = 'C:/binary_cache'; - let binPath = binDir + perfProfilerPath; - let cmd = 'C:/binary_cache/llvm-objdump.exe -S ' + binPath; - Cmd.execObjDump(cmd, perfProfilerAddrHex, (result: any): void => { - this.perfProfilerModal?.showContent(result, perfProfilerAddrHex); - }); - } - } - lastClikTime = Date.now(); - }); - this.perfProfilerModal!.setCloseListener((): void => { - this.perfProfilerModal!.style.display = 'none'; - this.perfProfilerTbl!.style.visibility = 'visible'; - this.shadowRoot!.querySelector('#filter')!.style.display = 'flex'; }); this.perfProfilerList = this.shadowRoot?.querySelector('#tb-perf-list'); let filterFunc = (data: any): void => { @@ -498,7 +543,6 @@ export class TabpanePerfProfile extends BaseElement { } else { perfProfileTabFilter.style.display = 'none'; } - this.perfProfilerModal!.style.height = this.perfProfilerTbl!.clientHeight - 2 + 'px'; //2 is borderWidth if (this.perfProfilerTbl!.style.visibility === 'hidden') { perfProfileTabFilter.style.display = 'none'; } @@ -585,6 +629,17 @@ export class TabpanePerfProfile extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); + if (this._rowClickData && this._rowClickData.libId !== undefined && this._currentLevel === 2) { + perfProfileArgs.push({ + funcName: 'showLibLevelData', + funcArgs: [this.perfLevel!.libId, this.perfLevel!.libName], + }); + } else if (this._rowClickData && !this._rowClickData.libId && this._currentLevel === 3) { + perfProfileArgs.push({ + funcName: 'showFunLevelData', + funcArgs: [this.perfLevel!.symbolId, this.perfLevel!.symbolName], + }); + } this.getDataByWorker(perfProfileArgs, (result: any[]): void => { this.setPerfProfilerLeftTableData(result); this.perfProfileFrameChart!.data = this.perfProfilerDataSource; @@ -647,6 +702,7 @@ export class TabpanePerfProfile extends BaseElement { display: flex; flex-direction: column; padding: 10px 10px 0 10px; + height: calc(100% - 20px); } .perf-profile-progress{ bottom: 33px; @@ -672,17 +728,19 @@ export class TabpanePerfProfile extends BaseElement { flex: 1; } -
    - +
    +
    - + + +
    diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts index 9e68b82c9..5cf7de7c8 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts @@ -24,8 +24,6 @@ import { } from '../../../../database/SqlLite.js'; import { PerfFile, PerfSample, PerfStack, PerfThread } from '../../../../bean/PerfProfile.js'; import { Utils } from '../../base/Utils.js'; -import '../../../DisassemblingWindow.js'; -import { DisassemblingWindow } from '../../../DisassemblingWindow.js'; import { SpApplication } from '../../../../SpApplication.js'; import { log } from '../../../../../log/Log.js'; import '../../../../../base-ui/slicer/lit-slicer.js'; @@ -37,12 +35,10 @@ export class TabPanePerfSample extends BaseElement { private tblData: LitTable | null | undefined; private perfSampleSource: Array = []; private processMap: Map = new Map(); - private perfSampleListModal: DisassemblingWindow | null | undefined; private sortKey: string = 'timeString'; private sortType: number = 0; set data(perfSampleSelection: SelectionParam | null | undefined) { - this.perfSampleListModal!.style.display = 'none'; this.perfSampleTbl!.style.visibility = 'visible'; // @ts-ignore this.perfSampleTbl?.shadowRoot?.querySelector('.table')?.style?.height = @@ -59,7 +55,8 @@ export class TabPanePerfSample extends BaseElement { perfSampleSelection.rightNs, perfSampleSelection.perfAll ? [] : perfSampleSelection.perfCpus, perfSampleSelection.perfAll ? [] : perfSampleSelection.perfProcess, - perfSampleSelection.perfAll ? [] : perfSampleSelection.perfThread + perfSampleSelection.perfAll ? [] : perfSampleSelection.perfThread, + perfSampleSelection.perfEventTypeId ), ]).then((results) => { let processes = results[0] as Array; @@ -113,7 +110,6 @@ export class TabPanePerfSample extends BaseElement { initElements(): void { this.perfSampleTbl = this.shadowRoot?.querySelector('#tb-perf-sample'); this.tblData = this.shadowRoot?.querySelector('#tb-stack-data'); - this.perfSampleListModal = this.shadowRoot?.querySelector('tab-native-data-modal'); this.perfSampleTbl!.addEventListener('row-click', (e) => { // @ts-ignore let data = e.detail.data as PerfSample; @@ -127,48 +123,6 @@ export class TabPanePerfSample extends BaseElement { // @ts-ignore this.sortPerfSampleTable(evt.detail.key, evt.detail.sort); }); - let lastClikTime = 0; - let spApplication = document.getElementsByTagName('sp-application')[0]; - this.tblData!.addEventListener('row-click', (e) => { - if (Date.now() - lastClikTime < 200 && spApplication.vs) { - this.perfSampleTbl!.style.visibility = 'hidden'; - new ResizeObserver((entries) => { - this.perfSampleListModal!.style.width = this.perfSampleTbl!.clientWidth + 'px'; - this.perfSampleListModal!.style.height = this.perfSampleTbl!.clientHeight + 'px'; - }).observe(this.perfSampleTbl!); - this.perfSampleListModal!.showLoading(); - // @ts-ignore - let data = e.detail.data as PerfStack; - let perfSampleListPath = data.path; - let perfSampleListAddr = data.vaddrInFile; - let perfSampleListAddrHex = perfSampleListAddr.toString(16); - if (perfSampleListPath.trim() === '[kernel.kallsyms]') { - this.perfSampleListModal?.showContent( - `error : Symbol ${data.symbol} lib is [kernel.kallsyms] ,not support `, - perfSampleListAddrHex - ); - } else if (perfSampleListPath.trim() === '') { - this.perfSampleListModal?.showContent(`error : Symbol ${data.symbol} lib is null `, perfSampleListAddrHex); - } else if (perfSampleListAddr < 0) { - this.perfSampleListModal?.showContent( - `error : Symbol ${data.symbol} current addr is error ` + perfSampleListAddrHex, - perfSampleListAddrHex - ); - } else { - const binDir = 'C:/binary_cache'; - let binPath = binDir + perfSampleListPath; - let cmd = 'C:/binary_cache/llvm-objdump.exe -S ' + binPath; - Cmd.execObjDump(cmd, perfSampleListAddrHex, (result: any) => { - this.perfSampleListModal?.showContent(result, perfSampleListAddrHex); - }); - } - } - lastClikTime = Date.now(); - }); - this.perfSampleListModal!.setCloseListener(() => { - this.perfSampleListModal!.style.display = 'none'; - this.perfSampleTbl!.style.visibility = 'visible'; - }); } connectedCallback() { @@ -183,7 +137,6 @@ export class TabPanePerfSample extends BaseElement { this.perfSampleTbl?.reMeauseHeight(); this.tblData?.reMeauseHeight(); } - this.perfSampleListModal!.style.height = this.perfSampleTbl!.clientHeight - 2 + 'px'; //2 is borderWidth }).observe(this.parentElement!); } diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts index 047579f10..d0de4f929 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts @@ -17,7 +17,6 @@ import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import { LitProgressBar } from '../../../../../base-ui/progress-bar/LitProgressBar.js'; import { FrameChart } from '../../../chart/FrameChart.js'; -import { DisassemblingWindow } from '../../../DisassemblingWindow.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; import { ChartMode } from '../../../../bean/FrameChartStruct.js'; import { FilterData, TabPaneFilter } from '../TabPaneFilter.js'; @@ -25,7 +24,10 @@ import { procedurePool } from '../../../../database/Procedure.js'; import { FileMerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerFileSystem.js'; import { queryNativeHookSubType, queryNativeHookStatisticSubType } from '../../../../database/SqlLite.js'; import { ParseExpression } from '../SheetUtils.js'; -import { NativeMemoryExpression } from '../../../../bean/NativeHook.js'; +import { FilterByAnalysis, NativeMemoryExpression } from '../../../../bean/NativeHook.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import '../../../../../base-ui/headline/lit-headline.js'; +import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline.js'; const InvertOpyionIndex: number = 0; const HideSystemSoOptionIndex: number = 1; @@ -46,7 +48,6 @@ export class TabpaneNMCalltree extends BaseElement { private isChartShow: boolean = false; private systmeRuleName: string = '/system/'; private numRuleName: string = '/max/min/'; - private modal: DisassemblingWindow | null | undefined; private needShowMenu: boolean = true; private searchValue: string = ''; private loadingList: number[] = []; @@ -63,16 +64,73 @@ export class TabpaneNMCalltree extends BaseElement { private expressionStruct: NativeMemoryExpression | null = null; private isHideThread: boolean = false; private currentSelectIPid = 1; + private headLine: LitHeadLine | null | undefined; + private _filterData: FilterByAnalysis | undefined; + private _analysisTabWidth: number = 0; + private _initFromAnalysis = false; - set data(nmCallTreeParam: SelectionParam | any) { - if (nmCallTreeParam == this.currentSelection) { + set analysisTabWidth(width: number) { + this._analysisTabWidth = width; + } + + set titleTxt(value: string) { + this.headLine!.titleTxt = value; + } + + get treeData(): Array { + return this.nmCallTreeSource; + } + + set filterData(data: FilterByAnalysis) { + // click from analysis + this._filterData = data; + } + + set titleBoxShow(value: Boolean) { + this.headLine!.isShow = value; + } + + set initFromAnalysis(flag: boolean) { + this._initFromAnalysis = flag; + } + + set data(nmCallTreeParam: SelectionParam) { + if (nmCallTreeParam === this.currentSelection) { return; } + this.currentSelection = nmCallTreeParam; this.currentSelectIPid = nmCallTreeParam.nativeMemoryCurrentIPid; + this.initUI(); + this.initFilterTypes(); + let types: Array = []; + this.initTypes(nmCallTreeParam, types); + const initWidth = this._analysisTabWidth > 0 ? this._analysisTabWidth : this.clientWidth; + this.getDataByWorkerQuery( + { + leftNs: nmCallTreeParam.leftNs, + rightNs: nmCallTreeParam.rightNs, + types, + }, + (results: any[]): void => { + this.setLTableData(results); + this.filesystemTbr!.recycleDataSource = []; + + this.nmCallTreeFrameChart?.updateCanvas(true, initWidth); + if (this._initFromAnalysis) { + this.filterByAnalysis(); + } else { + this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; + this.switchFlameChart(); + this.nmCallTreeFilter!.icon = 'block'; + } + } + ); + } + + initUI(): void { + this.headLine!.clear(); this.isHideThread = false; this.searchValue = ''; - this.currentSelection = nmCallTreeParam; - this.modal!.style.display = 'none'; this.nmCallTreeTbl!.style.visibility = 'visible'; if (this.parentElement!.clientHeight > this.nmCallTreeFilter!.clientHeight) { this.nmCallTreeFilter!.style.display = 'flex'; @@ -81,12 +139,14 @@ export class TabpaneNMCalltree extends BaseElement { } procedurePool.submitWithName('logic1', 'native-memory-reset', [], undefined, () => {}); this.nmCallTreeFilter!.disabledTransfer(true); - this.nmCallTreeFilter!.initializeFilterTree(true, true, nmCallTreeParam.nativeMemory.length > 0); + this.nmCallTreeFilter!.initializeFilterTree(true, true, this.currentSelection!.nativeMemory.length > 0); this.nmCallTreeFilter!.filterValue = ''; - this.initFilterTypes(); + this.nmCallTreeProgressEL!.loading = true; this.nmCallTreeLoadingPage.style.visibility = 'visible'; - let types: Array = []; + } + + initTypes(nmCallTreeParam: SelectionParam, types: Array): void { if (nmCallTreeParam.nativeMemory.length > 0) { this.nmCallTreeFilter!.isStatisticsMemory = false; if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[0]) !== -1) { @@ -114,23 +174,68 @@ export class TabpaneNMCalltree extends BaseElement { } } } - const initWidth = this.clientWidth; - this.getDataByWorkerQuery( + } + + setFilterType(selections: Array, data: FilterByAnalysis): void { + switch (data.type) { + case 'AllocEvent': + data.type = '1'; + break; + case 'MmapEvent': + data.type = '2'; + } + if (this.subTypeArr.length > 0) { + this.subTypeArr.map((memory): void => { + const typeName = SpSystemTrace.DATA_DICT.get(memory); + selections.push({ + memoryTap: memory, + }); + if (data.type === typeName) { + data.type = `${selections.length + 2}`; + } + }); + } + } + + filterByAnalysis(): void { + let filterContent: any[] = []; + let param = new Map(); + let selections: Array = []; + this.setFilterType(selections, this._filterData!); + param.set('filterByTitleArr', this._filterData); + param.set('filterAllocType', '0'); + param.set('statisticsSelection', selections); + param.set('leftNs', this.currentSelection?.leftNs); + param.set('rightNs', this.currentSelection?.rightNs); + filterContent.push( { - leftNs: nmCallTreeParam.leftNs, - rightNs: nmCallTreeParam.rightNs, - types, + funcName: 'groupCallchainSample', + funcArgs: [param], }, - (results: any[]): void => { - this.setLTableData(results); - this.filesystemTbr!.recycleDataSource = []; - this.nmCallTreeFrameChart!.mode = ChartMode.Byte; - this.nmCallTreeFrameChart?.updateCanvas(true, initWidth); - this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; - this.switchFlameChart(); - this.nmCallTreeFilter!.icon = 'block'; + { + funcName: 'getCallChainsBySampleIds', + funcArgs: [true], } ); + this.getDataByWorker(filterContent, (result: any[]) => { + this.setLTableData(result); + this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; + this.switchFlameChart(); + this.nmCallTreeFilter!.icon = 'block'; + this.initFromAnalysis = false; + }); + this.banTypeAndLidSelect(); + } + banTypeAndLidSelect(): void { + this.currentNMCallTreeFilter!.firstSelect = '0'; + let secondSelect = this.shadowRoot + ?.querySelector('#nm-call-tree-filter')! + .shadowRoot!.querySelector('#second-select'); + let thirdSelect = this.shadowRoot + ?.querySelector('#nm-call-tree-filter')! + .shadowRoot!.querySelector('#third-select'); + thirdSelect?.setAttribute('disabled', ''); + secondSelect?.setAttribute('disabled', ''); } getParentTree( @@ -197,7 +302,7 @@ export class TabpaneNMCalltree extends BaseElement { let resultLength = resultValue.length; this.filesystemTbr!.dataSource = resultLength == 0 ? [] : resultValue; } - + //底部的筛选菜单 showBottomMenu(isShow: boolean): void { if (isShow) { this.nmCallTreeFilter?.showThird(true); @@ -278,10 +383,11 @@ export class TabpaneNMCalltree extends BaseElement { } initElements(): void { + this.headLine = this.shadowRoot?.querySelector('.titleBox'); this.nmCallTreeTbl = this.shadowRoot?.querySelector('#tb-filesystem-calltree'); this.nmCallTreeProgressEL = this.shadowRoot?.querySelector('.nm-call-tree-progress') as LitProgressBar; this.nmCallTreeFrameChart = this.shadowRoot?.querySelector('#framechart'); - this.modal = this.shadowRoot?.querySelector('tab-native-data-modal'); + this.nmCallTreeFrameChart!.mode = ChartMode.Byte; this.nmCallTreeLoadingPage = this.shadowRoot?.querySelector('.nm-call-tree-loading'); this.nmCallTreeFrameChart!.addChartClickListener((needShowMenu: boolean): void => { this.parentElement!.scrollTo(0, 0); @@ -322,11 +428,6 @@ export class TabpaneNMCalltree extends BaseElement { (evt.detail as any).callBack(true); } }); - this.modal!.setCloseListener((): void => { - this.modal!.style.display = 'none'; - this.nmCallTreeTbl!.style.visibility = 'visible'; - this.shadowRoot!.querySelector('#nm-call-tree-filter')!.style.display = 'flex'; - }); let filterFunc = (nmCallTreeFuncData: any): void => { let nmCallTreeFuncArgs: any[] = []; if (nmCallTreeFuncData.type === 'check') { @@ -572,6 +673,18 @@ export class TabpaneNMCalltree extends BaseElement { this.setLTableData(this.nmCallTreeSource, true); this.nmCallTreeFrameChart!.data = this.nmCallTreeSource; }); + //点击之后删除掉筛选条件 将所有重置 将目前的title隐藏 高度恢复 + this.headLine!.closeCallback = () => { + this.headLine!.clear(); + this._filterData = undefined; + this.currentNMCallTreeFilter!.firstSelect = '0'; + this.currentNMCallTreeFilter!.secondSelect = '0'; + this.currentNMCallTreeFilter!.thirdSelect = '0'; + this.filterAllocationType = '0'; + this.refreshAllNode(this.nmCallTreeFilter!.getFilterTreeData()); + this.initFilterTypes(); + this.nmCallTreeFrameChart?.resizeChange(); + }; } connectedCallback(): void { @@ -587,7 +700,6 @@ export class TabpaneNMCalltree extends BaseElement { } else { nmCallTreeTabFilter.style.display = 'none'; } - this.modal!.style.height = `${this.nmCallTreeTbl!.clientHeight - 2}px`; //2 is borderWidth if (this.nmCallTreeTbl!.style.visibility === 'hidden') { nmCallTreeTabFilter.style.display = 'none'; } @@ -624,7 +736,7 @@ export class TabpaneNMCalltree extends BaseElement { this.nmCallTreeFilter!.disabledMining = true; this.showBottomMenu(this.needShowMenu); this.nmCallTreeFrameChart?.calculateChartData(); - } else if (flameChartData.icon == 'tree') { + } else if (flameChartData.icon === 'tree') { nmCallTreePageChart?.setAttribute('class', ''); nmCallTreePageTab?.setAttribute('class', 'show'); this.showBottomMenu(true); @@ -662,6 +774,9 @@ export class TabpaneNMCalltree extends BaseElement { }); } groupArgs.set('statisticsSelection', selections); + if (this._filterData) { + groupArgs.set('filterByTitleArr', this._filterData); + } groupArgs.set( 'nativeHookType', this.currentSelection!.nativeMemory.length > 0 ? 'native-hook' : 'native-hook-statistic' @@ -837,9 +952,8 @@ export class TabpaneNMCalltree extends BaseElement { z-index: 999999; } - +
    -
    diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts index 276cf23ef..c15fc6d69 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts @@ -24,6 +24,8 @@ import { procedurePool } from '../../../../database/Procedure.js'; import { TabPaneFilter } from '../TabPaneFilter.js'; import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; import { initSort } from '../SheetUtils.js'; +import { TabpaneNMCalltree } from './TabPaneNMCallTree.js'; +import { FilterByAnalysis } from '../../../../bean/NativeHook.js'; const TYPE_ALLOC_STRING = 'AllocEvent'; const TYPE_MAP_STRING = 'MmapEvent'; @@ -37,7 +39,7 @@ const PIE_CHART_LIMIT = 20; class AnalysisObj { tName?: string; - tid: number = 0; + tid?: number; typeName?: string; typeId?: number; libName?: string; @@ -125,6 +127,10 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { private filterEl: TabPaneFilter | undefined | null; private hideThreadCheckBox: LitCheckBox | undefined | null; + get titleTxt(): string | null { + return this.titleEl!.textContent; + } + set data(statisticAnalysisParam: SelectionParam) { if (statisticAnalysisParam === this.currentSelection) { // @ts-ignore @@ -190,6 +196,9 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.getNMTypeSize(this.currentSelection, this.processData); }); for (let nmTable of this.nmTableArray) { + nmTable!.addEventListener('contextmenu', function (event) { + event.preventDefault(); // 阻止默认的上下文菜单弹框 + }); nmTable!.addEventListener('column-click', (evt) => { // @ts-ignore this.nmSortColumn = evt.detail.key; @@ -212,27 +221,84 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { }); } this.tableType!.addEventListener('row-click', (evt) => { + // @ts-ignore + let button = evt.detail.button; // @ts-ignore let data = evt.detail.data; - if (data.tableName !== '' && data.existSize !== 0) { - this.nativeProcessLevelClickEvent(data); + if (button === 0) { + if (data.tableName !== '' && data.existSize !== 0) { + this.nativeProcessLevelClickEvent(data); + } + } else if (button === 2) { + const typeName = data.typeName === TYPE_MAP_STRING ? TYPE_OTHER_MMAP : data.typeName; + this.clickRight(evt, typeName); } }); this.threadUsageTbl!.addEventListener('row-click', (evt) => { + // @ts-ignore + let button = evt.detail.button; // @ts-ignore let data = evt.detail.data; - if (data.tableName !== '' && data.existSize !== 0) { - this.nativeThreadLevelClickEvent(data); + if (button === 0) { + if (data.tableName !== '' && data.existSize !== 0) { + this.nativeThreadLevelClickEvent(data); + } + } else if (button === 2) { + let title = `${this.titleEl!.textContent}/${data.tName}`; + this.clickRight(evt, title); } }); - this.soUsageTbl!.addEventListener('row-click', (evt) => { + // @ts-ignore + let button = evt.detail.button; // @ts-ignore let data = evt.detail.data; - if (data.tableName !== '' && data.existSize !== 0) { - this.nativeSoLevelClickEvent(data); + if (button === 0) { + if (data.tableName !== '' && data.existSize !== 0) { + this.nativeSoLevelClickEvent(data); + } + } else if (button === 2) { + let title = `${this.titleEl!.textContent}/${data.libName}`; + this.clickRight(evt, title); } }); + this.functionUsageTbl?.addEventListener('row-click', (evt) => { + // @ts-ignore + let title = `${this.titleEl!.textContent}/${evt.detail.data.symbolName}`; + this.clickRight(evt, title); + }); + } + + private clickRight(evt: any, title: string): void { + if (evt.detail.button === 2) { + let treeTab = this.parentElement?.parentElement?.querySelector( + '#box-native-calltree > tabpane-nm-calltree' + ); + treeTab!.analysisTabWidth = this.clientWidth; + const data = evt.detail.data as AnalysisObj; + treeTab!.filterData = new FilterByAnalysis( + data.typeId, + data.typeName, + data.tName, + data.tid, + data.libId, + data.libName, + data.symbolId, + data.symbolName + ); + // 首次打开初始化数据 非首次初始化UI + if (treeTab?.treeData && treeTab.treeData.length > 0) { + treeTab.initUI(); + treeTab.filterByAnalysis(); + } else { + treeTab!.initFromAnalysis = true; + treeTab!.data = this.currentSelection; + } + + treeTab!.banTypeAndLidSelect(); + treeTab!.titleBoxShow = true; + treeTab!.titleTxt = title; + } } private getDataFromWorker(val: SelectionParam, typeFilter: Array): void { @@ -549,8 +615,8 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { // @ts-ignore let title = typeName; if (!this.hideThreadCheckBox?.checked) { - this.threadName = `(Thread)${ it.tid}`; - title += ` / ${ this.threadName}`; + this.threadName = `(Thread)${it.tid}`; + title += ` / ${this.threadName}`; } this.titleEl!.textContent = title; this.nmPieChart?.hideTip(); @@ -563,10 +629,10 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { // @ts-ignore let title = typeName || ''; if (!this.hideThreadCheckBox?.checked && this.threadName.length > 0) { - title += ` / ${ this.threadName}`; + title += ` / ${this.threadName}`; } if (it.libName.length > 0) { - title += ` / ${ it.libName}`; + title += ` / ${it.libName}`; } this.titleEl!.textContent = title; this.nmPieChart?.hideTip(); @@ -679,7 +745,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { analysis.typeId = item.typeId; analysis.typeName = item.typeName; analysis.tid = tid; - analysis.tName = `Thread ${ tid}`; + analysis.tName = `Thread ${tid}`; analysis.tableName = analysis.tName; this.threadData.push(analysis); }); @@ -737,6 +803,9 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { continue; } } + if (tid !== undefined && tid !== itemData.tid) { + continue; + } let libId = itemData.libId; if (libMap.has(libId)) { @@ -747,6 +816,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { libMap.set(libId, dataArray); } } + this.soData = []; libMap.forEach((libItems, libId) => { let libPath = SpSystemTrace.DATA_DICT.get(libId)?.split('/'); let libName = ''; diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index bba6f151e..0d61c095c 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -89,6 +89,7 @@ import { type FrameAnimationStruct } from './ui-worker/ProcedureWorkerFrameAnima import { type SnapshotStruct } from './ui-worker/ProcedureWorkerSnapshot.js'; import { type MemoryConfig } from '../bean/MemoryConfig.js'; import { LogStruct } from './ui-worker/ProcedureWorkerLog.js'; +import { HiSysEventStruct } from './ui-worker/ProcedureWorkerHiSysEvent.js'; class DataWorkerThread extends Worker { taskMap: any = {}; @@ -642,7 +643,6 @@ export const getTabBoxChildData = ( and not ((B.ts - TR.start_ts + B.dur < ${leftNs}) or (B.ts - TR.start_ts > ${rightNs})) ${condition}; `; - console.log(sql); return query('getTabBoxChildData', sql, {}); }; @@ -864,7 +864,7 @@ export const getTabSlices = ( on T.id = C.callid where - C.ts not null + C.ts > 0 and c.dur >= 0 and @@ -908,7 +908,7 @@ export const getTabSlicesAsyncFunc = ( A.id = C.callid left join process P on P.id = A.ipid where - C.ts not null + C.ts > 0 and c.dur >= -1 and @@ -2671,7 +2671,8 @@ export const queryPerfSampleListByTimeRange = ( rightNs: number, cpus: Array, processes: Array, - threads: Array + threads: Array, + eventTypeId?: number ): Promise> => { let sql = ` select A.callchain_id as sampleId, @@ -2685,6 +2686,9 @@ from perf_sample A,trace_range R left join perf_thread C on A.thread_id = C.thread_id where time >= $leftNs and time <= $rightNs and A.thread_id != 0 `; + if (eventTypeId !== undefined) { + sql = `${sql} and event_type_id = ${eventTypeId}`; + } if (cpus.length != 0 || processes.length != 0 || threads.length != 0) { let arg1 = cpus.length > 0 ? `or core in (${cpus.join(',')}) ` : ''; let arg2 = processes.length > 0 ? `or pid in (${processes.join(',')}) ` : ''; @@ -2786,7 +2790,7 @@ export const querySceneSearchFunc = (search: string, processList: Array) select c.cookie,c.id,c.name as funName,c.ts - r.start_ts as startTime,c.dur,c.depth,t.tid,t.name as threadName ,p.pid ,'func' as type from callstack c left join thread t on c.callid = t.id left join process p on t.ipid = p.id left join trace_range r - where c.name like '%${search}%' and startTime > 0 and p.pid in (${processList.join(',')}); + where c.name like '%${search}%' ESCAPE '\\' and startTime > 0 and p.pid in (${processList.join(',')}); `, { $search: search } ); @@ -5625,3 +5629,44 @@ export const queryCpuFreqFilterId = (): Promise> => name='cpu_frequency' ` ); + +export const queryRealTime = (): Promise< + Array<{ + ts: number; + value: string; + }> + > => + query( + 'queryRealTime', + `select CS.ts -TR.start_ts as ts ,clock_name + from clock_snapshot as CS ,trace_range as TR + where clock_name = 'realtime';` + ); +export const queryHiSysEventData = (): Promise> => + query( + 'queryHiSysEventData', + `SELECT S.id, + D2.data AS domain, + D.data AS eventName, + type AS eventType, + time_zone AS tz, + pid, + tid, + uid, + info, + level, + seq, + contents, + S.ts - TR.start_ts AS ts, + 1 AS dur, + CASE + WHEN level = 'MINOR' THEN + 0 + WHEN level = 'CRITICAL' THEN + 1 + END AS depth + FROM hisys_all_event AS S ,trace_range AS TR + LEFT JOIN data_dict AS D on S.event_name_id = D.id + LEFT JOIN data_dict AS D2 on S.domain_id = D2.id + ORDER BY S.ts` + ); \ No newline at end of file diff --git a/ide/src/trace/database/TraceWorker.ts b/ide/src/trace/database/TraceWorker.ts index 7eea2a995..b58ca480e 100644 --- a/ide/src/trace/database/TraceWorker.ts +++ b/ide/src/trace/database/TraceWorker.ts @@ -283,7 +283,11 @@ self.onmessage = async (e: MessageEvent) => { const dataSlice = uint8Array.subarray(wrSize, wrSize + sliceLen); Module.HEAPU8.set(dataSlice, reqBufferAddr); wrSize += sliceLen; - r2 = Module._TraceStreamerParseDataEx(sliceLen); + if (wrSize >= uint8Array.length) { + r2 = Module._TraceStreamerParseDataEx(sliceLen, 1); + } else { + r2 = Module._TraceStreamerParseDataEx(sliceLen, 0); + } if (r2 == -1) { break; } diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts index 578e4fee2..4f12ca691 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts @@ -21,6 +21,7 @@ export class ChartStruct { size: number = 0; count: number = 0; eventCount: number = 0; + eventPercent: string = ''; dur: number = 0; parent: ChartStruct | undefined; children: Array = []; @@ -28,6 +29,8 @@ export class ChartStruct { tsArray: Array = []; // 每个绘制的函数由哪些时间点的样本组成 countArray: Array = []; // native hook统计模式下一个时间点有多次分配 durArray: Array = []; + isThread: boolean = false; + isProcess: boolean = false; } export class Msg { @@ -37,6 +40,29 @@ export class Msg { data: Array = []; } +export class HiPerfSymbol { + id: number = 0; + startTime: number = 0; + eventCount: number = 0; + endTime: number = 0; + totalTime: number = 0; + fileId: number = 0; + symbolId: number = 0; + cpu_id: number = 0; + depth: number = 0; + children?: Array; + callchain_id: number = 0; + thread_id: number = 0; + name: string = ''; + + public clone(): HiPerfSymbol { + const cloneSymbol = new HiPerfSymbol(); + cloneSymbol.children = new Array(); + cloneSymbol.depth = this.depth; + return cloneSymbol; + } +} + export class MerageBean extends ChartStruct { #parentNode: MerageBean | undefined = undefined; #total = 0; @@ -596,6 +622,9 @@ export class DataCache { public perfCallChainMap: Map = new Map(); public jsCallChain: Array | undefined; public jsSymbolMap = new Map(); + public perfCallFireMap = new Map(); + public perfCallChain: Array | undefined; + public perfSymbolMap = new Map(); public static getInstance(): DataCache { if (!this.instance) { @@ -632,5 +661,8 @@ export class DataCache { public clearPerf(): void { this.perfCallChainMap.clear(); + this.perfCallFireMap.clear(); + this.perfCallChain = []; + this.perfSymbolMap.clear(); } } diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts index 5be598c8b..da863bd56 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts @@ -63,6 +63,9 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { currentEventId: string = ''; tab: string = ''; isAnalysis: boolean = false; + private lib: object | undefined; + private symbol: object | undefined; + private isTopDown: boolean = true; handle(data: any): void { if (data.id) { @@ -90,6 +93,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { break; case 'fileSystem-queryFileSamples': this.handlerMap.get('fileSystem').samplesList = convertJSON(data.params.list) || []; + let fsResults; if (this.isAnalysis) { this.isAnalysis = false; self.postMessage({ @@ -98,21 +102,43 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { results: this.fileSystemAnalysis(FS_TYPE, this.handlerMap.get('fileSystem').samplesList), }); } else { - self.postMessage({ - id: this.currentEventId, - action: data.action, - results: this.handlerMap.get('fileSystem').resolvingAction([ + if (this.lib) { + let samplesList = this.fileSystemAnalysis( + FS_TYPE, + this.handlerMap.get('fileSystem').samplesList, + this.lib + ); + this.handlerMap.get('fileSystem').freshCurrentCallChains(samplesList, this.isTopDown); + fsResults = this.handlerMap.get('fileSystem').allProcess; + this.lib = undefined; + } else if (this.symbol) { + let samplesList = this.fileSystemAnalysis( + FS_TYPE, + this.handlerMap.get('fileSystem').samplesList, + this.symbol + ); + this.handlerMap.get('fileSystem').freshCurrentCallChains(samplesList, this.isTopDown); + fsResults = this.handlerMap.get('fileSystem').allProcess; + this.symbol = undefined; + } else { + fsResults = this.handlerMap.get('fileSystem').resolvingAction([ { funcName: 'getCallChainsBySampleIds', - funcArgs: [true], + funcArgs: [this.isTopDown], }, - ]), + ]); + } + self.postMessage({ + id: this.currentEventId, + action: data.action, + results: fsResults, }); } break; case 'fileSystem-queryIoSamples': this.handlerMap.get('io').samplesList = convertJSON(data.params.list) || []; + let ioResults; if (this.isAnalysis) { this.isAnalysis = false; self.postMessage({ @@ -121,21 +147,35 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { results: this.fileSystemAnalysis(BIO_TYPE, this.handlerMap.get('io').samplesList), }); } else { - self.postMessage({ - id: this.currentEventId, - action: data.action, - results: this.handlerMap.get('io').resolvingAction([ + if (this.lib) { + let samplesList = this.fileSystemAnalysis(BIO_TYPE, this.handlerMap.get('io').samplesList, this.lib); + this.handlerMap.get('io').freshCurrentCallChains(samplesList, this.isTopDown); + ioResults = this.handlerMap.get('io').allProcess; + this.lib = undefined; + } else if (this.symbol) { + let samplesList = this.fileSystemAnalysis(BIO_TYPE, this.handlerMap.get('io').samplesList, this.symbol); + this.handlerMap.get('io').freshCurrentCallChains(samplesList, this.isTopDown); + ioResults = this.handlerMap.get('io').allProcess; + this.symbol = undefined; + } else { + ioResults = this.handlerMap.get('io').resolvingAction([ { funcName: 'getCallChainsBySampleIds', - funcArgs: [true], + funcArgs: [this.isTopDown], }, - ]), + ]); + } + self.postMessage({ + id: this.currentEventId, + action: data.action, + results: ioResults, }); } break; case 'fileSystem-queryVirtualMemorySamples': this.handlerMap.get('virtualMemory').samplesList = convertJSON(data.params.list) || []; + let vmResults; if (this.isAnalysis) { this.isAnalysis = false; self.postMessage({ @@ -144,21 +184,64 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { results: this.fileSystemAnalysis(PF_TYPE, this.handlerMap.get('virtualMemory').samplesList), }); } else { - self.postMessage({ - id: this.currentEventId, - action: data.action, - results: this.handlerMap.get('virtualMemory').resolvingAction([ + if (this.lib) { + let samplesList = this.fileSystemAnalysis( + PF_TYPE, + this.handlerMap.get('virtualMemory').samplesList, + this.lib + ); + this.handlerMap.get('virtualMemory').freshCurrentCallChains(samplesList, this.isTopDown); + vmResults = this.handlerMap.get('virtualMemory').allProcess; + this.lib = undefined; + } else if (this.symbol) { + let samplesList = this.fileSystemAnalysis( + PF_TYPE, + this.handlerMap.get('virtualMemory').samplesList, + this.symbol + ); + this.handlerMap.get('virtualMemory').freshCurrentCallChains(samplesList, this.isTopDown); + vmResults = this.handlerMap.get('virtualMemory').allProcess; + this.symbol = undefined; + } else { + vmResults = this.handlerMap.get('virtualMemory').resolvingAction([ { funcName: 'getCallChainsBySampleIds', - funcArgs: [true], + funcArgs: [this.isTopDown], }, - ]), + ]); + } + self.postMessage({ + id: this.currentEventId, + action: data.action, + results: vmResults, }); } break; case 'fileSystem-action': if (data.params) { + this.isTopDown = false; + this.handlerMap.get(data.params.callType).isHideEvent = false; + this.handlerMap.get(data.params.callType).isHideThread = false; let filter = data.params.args.filter((item: any) => item.funcName == 'getCurrentDataFromDb'); + // 从lib层跳转 + let libFilter = data.params.args.filter((item: any): boolean => item.funcName === 'showLibLevelData'); + // 从fun层跳转 + let funFilter = data.params.args.filter((item: any): boolean => item.funcName === 'showFunLevelData'); + let callChainsFilter = data.params.args.filter( + (item: any): boolean => item.funcName === 'getCallChainsBySampleIds' + ); + callChainsFilter.length > 0 ? (this.isTopDown = callChainsFilter[0].funcArgs[0]) : (this.isTopDown = true); + if (libFilter.length !== 0) { + this.lib = { + libId: libFilter[0].funcArgs[0], + libName: libFilter[0].funcArgs[1], + }; + } else if (funFilter.length !== 0) { + this.symbol = { + symbolId: funFilter[0].funcArgs[0], + symbolName: funFilter[0].funcArgs[1], + }; + } if (filter.length == 0) { // @ts-ignore self.postMessage({ @@ -447,9 +530,9 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); this.handlerMap.clear(); } - this.handlerMap.set('fileSystem', new FileSystemCallTreeHandler('fileSystem', this.queryData)); - this.handlerMap.set('io', new FileSystemCallTreeHandler('io', this.queryData)); - this.handlerMap.set('virtualMemory', new FileSystemCallTreeHandler('virtualMemory', this.queryData)); + this.handlerMap.set('fileSystem', new FileSystemCallTreeHandler('fileSystem', this.queryData.bind(this))); + this.handlerMap.set('io', new FileSystemCallTreeHandler('io', this.queryData.bind(this))); + this.handlerMap.set('virtualMemory', new FileSystemCallTreeHandler('virtualMemory', this.queryData.bind(this))); this.queryData( this.currentEventId, 'fileSystem-queryCallchains', @@ -469,7 +552,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { }); } - fileSystemAnalysis(type: number, samplesList: Array): Array { + fileSystemAnalysis(type: number, samplesList: Array, obj?: any): Array { let analysisSampleList = new Array(); for (let sample of samplesList) { let analysisSample = new FileAnalysisSample(sample); @@ -503,7 +586,7 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { } } if (!lastCallChain) { - continue; + lastCallChain = callChainList[callChainList.length - 1]; } analysisSample.libId = lastCallChain.pathId; analysisSample.symbolId = lastCallChain.symbolsId; @@ -515,7 +598,9 @@ export class ProcedureLogicWorkerFileSystem extends LogicHandler { symbolName = lastCallChain.ip + ' (' + analysisSample.libName + ')'; } analysisSample.symbolName = symbolName; - analysisSampleList.push(analysisSample); + if ((obj && obj.libId === analysisSample.libId) || (obj && obj.symbolId === analysisSample.symbolId) || !obj) { + analysisSampleList.push(analysisSample); + } } return analysisSampleList; } @@ -551,33 +636,37 @@ class FileSystemCallTreeHandler { setEventId(eventId: string): void { this.currentEventId = eventId; } - queryCallChainsSamples(selectionParam: any): void { + queryCallChainsSamples(selectionParam: any, sql?: string): void { switch (this.currentDataType) { case 'fileSystem': - this.queryFileSamples(selectionParam); + this.queryFileSamples(selectionParam, sql); break; case 'io': - this.queryIOSamples(selectionParam); + this.queryIOSamples(selectionParam, sql); break; case 'virtualMemory': - this.queryPageFaultSamples(selectionParam); + this.queryPageFaultSamples(selectionParam, sql); break; } } - queryFileSamples(selectionParam: any): void { - let sql = ''; - if (selectionParam.fileSystemType !== undefined && selectionParam.fileSystemType.length > 0) { - sql += ' and s.type in ('; - sql += selectionParam.fileSystemType.join(','); - sql += ')'; - } - if ( - selectionParam.diskIOipids.length > 0 && - !selectionParam.diskIOLatency && - selectionParam.fileSystemType.length === 0 - ) { - sql += ` and s.ipid in (${selectionParam.diskIOipids.join(',')})`; + queryFileSamples(selectionParam: any, sql?: string): void { + let sqlFilter = ''; + if (sql) { + sqlFilter = sql; + } else { + if (selectionParam.fileSystemType !== undefined && selectionParam.fileSystemType.length > 0) { + sqlFilter += ' and s.type in ('; + sqlFilter += selectionParam.fileSystemType.join(','); + sqlFilter += ')'; + } + if ( + selectionParam.diskIOipids.length > 0 && + !selectionParam.diskIOLatency && + selectionParam.fileSystemType.length === 0 + ) { + sqlFilter += ` and s.ipid in (${selectionParam.diskIOipids.join(',')})`; + } } this.queryData( this.currentEventId, @@ -585,7 +674,7 @@ class FileSystemCallTreeHandler { `select s.start_ts - t.start_ts as ts, s.callchain_id as callChainId,h.tid,h.name as threadName,s.dur,s.type,p.pid,p.name as processName from file_system_sample s,trace_range t left join process p on p.id = s.ipid left join thread h on h.id = s.itid -where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} and callchain_id != -1;`, +where s.end_ts between ${selectionParam.leftNs} + t.start_ts and ${selectionParam.rightNs} + t.start_ts ${sqlFilter} and callchain_id != -1;`, { $startTime: selectionParam.leftNs, $endTime: selectionParam.rightNs, @@ -593,8 +682,8 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} ); } - queryIOSamples(selectionParam: any): void { - let sql = ''; + queryIOSamples(selectionParam: any, sql?: string): void { + let sqlFilter = ''; const types: number[] = []; if (selectionParam.diskIOReadIds.length > 0) { types.push(...[1, 3]); @@ -604,7 +693,13 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} } if (selectionParam.diskIOipids.length > 0) { types.push(...[5, 6]); - sql += `and (s.ipid in (${selectionParam.diskIOipids.join(',')}) and s.type in (${types.join(',')})) `; + } + if (sql) { + sqlFilter = sql; + } else { + if (selectionParam.diskIOipids.length > 0) { + sqlFilter += `and (s.ipid in (${selectionParam.diskIOipids.join(',')}) and s.type in (${types.join(',')})) `; + } } this.queryData( @@ -613,7 +708,7 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} `select s.start_ts - t.start_ts as ts, s.callchain_id as callChainId,h.tid,h.name as threadName,s.latency_dur as dur,s.type,p.pid,p.name as processName from bio_latency_sample s,trace_range t left join process p on p.id = s.ipid left join thread h on h.id = s.itid -where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} and callchain_id != -1;`, +where s.end_ts between ${selectionParam.leftNs} + t.start_ts and ${selectionParam.rightNs} + t.start_ts ${sqlFilter} and callchain_id != -1;`, { $startTime: selectionParam.leftNs, $endTime: selectionParam.rightNs, @@ -621,14 +716,18 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} ); } - queryPageFaultSamples(selectionParam: any): void { - let sql = ''; - if ( - selectionParam.diskIOipids.length > 0 && - !selectionParam.diskIOLatency && - !selectionParam.fileSysVirtualMemory - ) { - sql += ` and s.ipid in (${selectionParam.diskIOipids.join(',')})`; + queryPageFaultSamples(selectionParam: any, sql?: string): void { + let sqlFilter = ''; + if (sql) { + sqlFilter = sql; + } else { + if ( + selectionParam.diskIOipids.length > 0 && + !selectionParam.diskIOLatency && + !selectionParam.fileSysVirtualMemory + ) { + sqlFilter += ` and s.ipid in (${selectionParam.diskIOipids.join(',')})`; + } } this.queryData( this.currentEventId, @@ -636,7 +735,7 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} `select s.start_ts - t.start_ts as ts, s.callchain_id as callChainId,h.tid,h.name as threadName,s.dur,s.type,p.pid,p.name as processName from paged_memory_sample s,trace_range t left join process p on p.id = s.ipid left join thread h on h.id = s.itid -where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} and callchain_id != -1;`, +where s.end_ts between ${selectionParam.leftNs} + t.start_ts and ${selectionParam.rightNs} + t.start_ts ${sqlFilter} and callchain_id != -1;`, { $startTime: selectionParam.leftNs, $endTime: selectionParam.rightNs, @@ -815,7 +914,22 @@ where s.end_ts between $startTime + t.start_ts and $endTime + t.start_ts ${sql} this.freshCurrentCallChains(this.samplesList, paramItem.funcArgs[0]); break; case 'getCurrentDataFromDb': - this.queryCallChainsSamples(paramItem.funcArgs[0]); + if (paramItem.funcArgs[1]) { + let funcArgs = paramItem.funcArgs[1]; + let sql = ''; + if (funcArgs.processId !== undefined) { + sql += `and p.pid = ${funcArgs.processId}`; + } + if (funcArgs.typeId !== undefined) { + sql += ` and s.type = ${funcArgs.typeId}`; + } + if (funcArgs.threadId !== undefined) { + sql += ` and h.tid = ${funcArgs.threadId}`; + } + this.queryCallChainsSamples(paramItem.funcArgs[0], sql); + } else { + this.queryCallChainsSamples(paramItem.funcArgs[0]); + } break; case 'hideSystemLibrary': merageBeanDataSplit.hideSystemLibrary(this.allProcess, this.splitMapData); diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts index 2475f2fea..8432fa892 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { NativeMemoryExpression } from '../../bean/NativeHook.js'; +import { FilterByAnalysis, NativeMemoryExpression } from '../../bean/NativeHook.js'; import { convertJSON, DataCache, @@ -49,7 +49,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { nativeMemoryArgs?: Map; private dataCache = DataCache.getInstance(); isHideThread: boolean = false; - private currentSelectIPid : number = 1; + private currentSelectIPid: number = 1; handle(data: any): void { this.currentEventId = data.id; @@ -220,7 +220,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { postMessage(data.id, data.action, this.handleNativeHookStatisticData(arr)); } else { this.totalNS = data.params.totalNS; - this.queryNativeHookStatistic(data.params.type); + this.queryNativeHookStatistic(data.params.type, data.params.ipid); } break; case 'native-memory-reset': @@ -264,7 +264,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { ); } - queryNativeHookStatistic(type: number): void { + queryNativeHookStatistic(type: number, ipid: number): void { let condition: string; if (type === 0) { condition = 'and type = 0'; @@ -281,7 +281,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { release_size releaseSize from native_hook_statistic,trace_range where ts between start_ts and end_ts ${condition} - and ipid = ${this.currentSelectIPid}; + and ipid = ${ipid} `; this.queryData(this.currentEventId, 'native-memory-queryNativeHookStatistic', sql, {}); } @@ -484,8 +484,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { this.queryData( this.currentEventId, 'native-memory-queryNMFrameData', - ` - select h.symbol_id as symbolId, h.file_id as fileId, h.depth, h.callchain_id as eventId, h.vaddr as addr + `select h.symbol_id as symbolId, h.file_id as fileId, h.depth, h.callchain_id as eventId, h.vaddr as addr from native_hook_frame h `, {} @@ -1020,8 +1019,6 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { let rootMerageMap: any = {}; // @ts-ignore let threads = Object.values(this.currentTreeMapData); - - // 不隐藏时走这里 threads.forEach((merageData: any): void => { if (this.isHideThread) { merageData.tid = 0; @@ -1031,6 +1028,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { let threadMerageData = new NativeHookCallInfo(); //新增进程的节点数据 threadMerageData.canCharge = false; threadMerageData.type = -1; + threadMerageData.isThread = true; threadMerageData.symbolName = `${merageData.threadName || 'Thread'} [${merageData.tid}]`; threadMerageData.symbol = threadMerageData.symbolName; threadMerageData.children.push(merageData); @@ -1058,7 +1056,6 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { } merageData.parentNode = rootMerageMap[merageData.tid]; //子节点添加父节点的引用 }); - let id = 0; this.currentTreeList.forEach((nmTreeNode: any): void => { nmTreeNode.totalCount = totalCount; @@ -1078,11 +1075,21 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { }); this.allThreads = Object.values(rootMerageMap) as NativeHookCallInfo[]; } + groupCallchainSample(paramMap: Map): void { let groupMap: any = {}; let filterAllocType = paramMap.get('filterAllocType'); let filterEventType = paramMap.get('filterEventType'); let filterResponseType = paramMap.get('filterResponseType'); + let filterAnalysis = paramMap.get('filterByTitleArr') as FilterByAnalysis; + if (filterAnalysis) { + if (filterAnalysis.type) { + filterEventType = filterAnalysis.type; + } + if (filterAnalysis.libId) { + filterResponseType = filterAnalysis.libId; + } + } let libTree = paramMap?.get('filterExpression'); let leftNs = paramMap.get('leftNs'); let rightNs = paramMap.get('rightNs'); @@ -1115,7 +1122,13 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { filterAllocation = item.heapSize === item.freeSize; } } - let filterLastLib = false; + + let filterThread = true; + if (filterAnalysis && filterAnalysis.tid) { + filterThread = item.tid === filterAnalysis.tid; + } + + let filterLastLib = true; if (libTree) { filterLastLib = this.filterExpressionSample(item, libTree); this.searchValue = ''; @@ -1123,8 +1136,14 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { filterLastLib = filterResponseType === -1 ? true : filterResponseType === item.lastLibId; } + let filterFunction = true; + if (filterAnalysis && filterAnalysis.symbolId) { + filterFunction = filterAnalysis.symbolId === item.lastSymbolId; + } + let filterNative = this.getTypeFromIndex(parseInt(filterEventType), item, statisticsSelection); - return filterAllocation && filterNative && filterLastLib; + + return filterAllocation && filterNative && filterLastLib && filterThread && filterFunction; }); filter.forEach((sample: NativeHookStatistics): void => { let currentNode = groupMap[sample.tid + '-' + sample.eventId] || new NativeHookStatistics(); diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts index 74d6614bb..7b5b3d0e7 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts @@ -13,8 +13,15 @@ * limitations under the License. */ -import { LogicHandler, ChartStruct, convertJSON, DataCache, PerfCall } from './ProcedureLogicWorkerCommon.js'; +import { + LogicHandler, + ChartStruct, + convertJSON, + DataCache, + HiPerfSymbol, +} from './ProcedureLogicWorkerCommon.js'; import { PerfBottomUpStruct } from '../../bean/PerfBottomUpStruct.js'; +import { HiPerfChartFrame } from '../../bean/PerfStruct.js'; const systemRuleName: string = '/system/'; const numRuleName: string = '/max/min/'; @@ -40,9 +47,12 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { isHideThreadState: boolean = false; processMap = new Map(); threadMap = new Map(); - eventTypeId?: string = ''; - + private lib: object | undefined; + private symbol: object | undefined; + perfCallData: any[] = []; private dataCache = DataCache.getInstance(); + private isTopDown: boolean = true; + private samplesCpu = Array(); handle(data: any): void { this.currentEventId = data.id; @@ -79,6 +89,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { break; case 'perf-queryPerfCallchains': let arr = convertJSON(data.params.list) || []; + this.initPerfFire(arr); this.initPerfCallChainTopDown(arr); // @ts-ignore self.postMessage({ @@ -87,6 +98,21 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { results: this.dataCache.perfCallChainMap, }); break; + case 'perf-callstack-chart': + if (data.params?.list) { + // 拿到的sample的数据 + this.samplesCpu = convertJSON(data.params.list) || []; + // 处理sample数据 + self.postMessage({ + id: data.id, + action: data.action, + results: this.combinePerfSampleBycallChainId(this.samplesCpu) + }); + } else { + this.perfCallData = data.params; + this.queryCallData(data.params); + } + break; case 'perf-queryCallchainsGroupSample': this.samplesData = convertJSON(data.params.list) || []; let result; @@ -105,12 +131,24 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { }, ]); } else { - result = this.resolvingAction([ - { - funcName: 'getCallChainsBySampleIds', - funcArgs: [true], - }, - ]); + if (this.lib) { + let libData = this.combineCallChainForAnalysis(this.lib); + this.freshPerfCallchains(libData, this.isTopDown); + result = this.allProcess; + this.lib = undefined; + } else if (this.symbol) { + let funData = this.combineCallChainForAnalysis(this.symbol); + this.freshPerfCallchains(funData, this.isTopDown); + result = this.allProcess; + this.symbol = undefined; + } else { + result = this.resolvingAction([ + { + funcName: 'getCallChainsBySampleIds', + funcArgs: [this.isTopDown], + }, + ]); + } } self.postMessage({ id: data.id, @@ -121,12 +159,71 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { case 'perf-action': if (data.params) { let filter = data.params.filter((item: any): boolean => item.funcName === 'getCurrentDataFromDb'); + // 从lib层跳转 + let libFilter = data.params.filter((item: any): boolean => item.funcName === 'showLibLevelData'); + // 从fun层跳转 + let funFilter = data.params.filter((item: any): boolean => item.funcName === 'showFunLevelData'); + // lib或者fun层Invert + let callChainsFilter = data.params.filter( + (item: any): boolean => item.funcName === 'getCallChainsBySampleIds' + ); + let isHideSystemSoFilter = data.params.filter( + (item: any): boolean => item.funcName === 'hideSystemLibrary' + ); + let hideThreadFilter = data.params.filter((item: any): boolean => item.funcName === 'hideThread'); + let hideThreadStateFilter = data.params.filter((item: any): boolean => item.funcName === 'hideThreadState'); + let result; + callChainsFilter.length > 0 ? (this.isTopDown = callChainsFilter[0].funcArgs[0]) : (this.isTopDown = true); + if (libFilter.length !== 0) { + this.lib = { + libId: libFilter[0].funcArgs[0], + libName: libFilter[0].funcArgs[1], + }; + } else if (funFilter.length !== 0) { + this.symbol = { + symbolId: funFilter[0].funcArgs[0], + symbolName: funFilter[0].funcArgs[1], + }; + } + if (filter.length === 0) { - // @ts-ignore + if (this.lib) { + if ( + callChainsFilter.length > 0 || + isHideSystemSoFilter.length > 0 || + hideThreadFilter.length > 0 || + hideThreadStateFilter.length > 0 + ) { + this.samplesData = this.combineCallChainForAnalysis(this.lib); + result = this.resolvingAction(data.params); + } else { + let libData = this.combineCallChainForAnalysis(this.lib); + this.freshPerfCallchains(libData, this.isTopDown); + result = this.allProcess; + this.lib = undefined; + } + } else if (this.symbol) { + if ( + callChainsFilter.length > 0 || + isHideSystemSoFilter.length > 0 || + hideThreadFilter.length > 0 || + hideThreadStateFilter.length > 0 + ) { + this.samplesData = this.combineCallChainForAnalysis(this.symbol); + result = this.resolvingAction(data.params); + } else { + let funData = this.combineCallChainForAnalysis(this.symbol); + this.freshPerfCallchains(funData, this.isTopDown); + result = this.allProcess; + this.symbol = undefined; + } + } else { + result = this.resolvingAction(data.params); + } self.postMessage({ id: data.id, action: data.action, - results: this.resolvingAction(data.params), + results: result, }); } else { this.resolvingAction(data.params); @@ -140,6 +237,32 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } + initPerfFire(arr: Array) { + this.dataCache.perfCallChain = []; + arr.forEach(item => { + this.dataCache.perfCallChain!.push({ + callchain_id: item.sampleId, + depth: item.depth, + name: item.name, + fileId: item.fileId, + symbolId: item.symbolId, + } as HiPerfSymbol); + }); + this.createCallChain(); + } + + queryCallData(data: Array) { + let condition = `${data[0] == 0 ? 'cpu_id=' : 'thread_id='}${data[1]} ${data[2] === -2 ? '' : `and event_type_id=${data[2]}`}`; + const sql = `SELECT id, + callchain_id, + timestamp_trace - start_ts AS timeTip, + event_count as eventCount, + thread_id, + cpu_id + FROM + perf_sample,trace_range where callchain_id != -1 and thread_id != 0 and ${condition}`; + this.queryData(this.currentEventId!, 'perf-callstack-chart', sql, {}); + } initPerfFiles(): void { this.clearAll(); this.queryData( @@ -182,6 +305,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { c.callchain_id as sampleId, c.vaddr_in_file as vaddrInFile, c.file_id as fileId, + c.depth, c.symbol_id as symbolId from perf_callchain c where callchain_id != -1;`, @@ -189,19 +313,33 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { ); } - getCurrentDataFromDb(selectionParam: any): void { - const cpus = selectionParam.perfAll ? [] : selectionParam.perfCpus; - const processes = selectionParam.perfAll ? [] : selectionParam.perfProcess; - const threads = selectionParam.perfAll ? [] : selectionParam.perfThread; + /** + * + * @param selectionParam + * @param sql 从饼图进程或者线程层点击进入Perf Profile时传入 + */ + private getCurrentDataFromDb(selectionParam: any, sql?: string): void { let filterSql = ''; - if (cpus.length != 0 || processes.length != 0 || threads.length != 0) { - const cpuFilter = cpus.length > 0 ? `or s.cpu_id in (${cpus.join(',')}) ` : ''; - const processFilter = processes.length > 0 ? `or thread.process_id in (${processes.join(',')}) ` : ''; - const threadFilter = threads.length > 0 ? `or s.thread_id in (${threads.join(',')})` : ''; - let arg = `${cpuFilter}${processFilter}${threadFilter}`.substring(3); - filterSql = ` and (${arg})`; + if (sql) { + const cpus = selectionParam.perfAll ? [] : selectionParam.perfCpus; + const cpuFilter = cpus.length > 0 ? ` and s.cpu_id in (${cpus.join(',')}) ` : ''; + let arg = `${sql}${cpuFilter}`.substring(3); + filterSql = `and ${arg}`; + } else { + const cpus = selectionParam.perfAll ? [] : selectionParam.perfCpus; + const processes = selectionParam.perfAll ? [] : selectionParam.perfProcess; + const threads = selectionParam.perfAll ? [] : selectionParam.perfThread; + + if (cpus.length !== 0 || processes.length !== 0 || threads.length !== 0) { + const cpuFilter = cpus.length > 0 ? `or s.cpu_id in (${cpus.join(',')}) ` : ''; + const processFilter = processes.length > 0 ? `or thread.process_id in (${processes.join(',')}) ` : ''; + const threadFilter = threads.length > 0 ? `or s.thread_id in (${threads.join(',')})` : ''; + let arg = `${cpuFilter}${processFilter}${threadFilter}`.substring(3); + filterSql = ` and (${arg})`; + } } - const eventTypeFilter = this.eventTypeId ? ` and s.event_type_id = ${this.eventTypeId}` : ''; + let eventTypeId = selectionParam.perfEventTypeId; + const eventTypeFilter = eventTypeId !== undefined ? ` and s.event_type_id = ${eventTypeId}` : ''; filterSql += eventTypeFilter; this.queryData( this.currentEventId, @@ -209,7 +347,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { `select p.callchain_id as sampleId, p.thread_state as threadState, p.thread_id as tid, - p.count, + p.count as count, p.process_id as pid, p.event_count as eventCount, p.ts as ts, @@ -220,8 +358,8 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { group_concat(s.timestamp_trace - t.start_ts,',') as ts from perf_sample s, trace_range t left join perf_thread thread on s.thread_id = thread.thread_id - where timestamp_trace between $startTime + t.start_ts - and $endTime + t.start_ts + where timestamp_trace between ${selectionParam.leftNs} + t.start_ts + and ${selectionParam.rightNs} + t.start_ts and callchain_id != -1 and s.thread_id != 0 ${filterSql} group by callchain_id, s.thread_id, thread_state, process_id) p`, @@ -233,10 +371,138 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { ); } + // 将perf_sample表的数据根据callchain_id分组并赋值startTime,endTime等等 + combinePerfSampleBycallChainId(sampleList: Array) { + let arr: any = new Array(); + let num = undefined; + for (let i = 0; i < sampleList.length; i++) { + // 若不是相同的callchain_id,赋值 + if (sampleList[i].callchain_id != num) { + let perfSample = new HiPerfSymbol(); + perfSample.children = new Array(); + perfSample.children[0] = new HiPerfSymbol(); + perfSample.depth = -1; + perfSample.name = 'name'; + perfSample.callchain_id = sampleList[i].callchain_id; + perfSample.thread_id = sampleList[i].thread_id; + perfSample.id = sampleList[i].id; + if (i !== 0 + && i !== sampleList.length - 1 + && sampleList[i].callchain_id !== sampleList[i - 1].callchain_id + && sampleList[i].callchain_id !== sampleList[i + 1].callchain_id + ) { + perfSample.startTime = sampleList[i - 1].timeTip; + } else { + perfSample.startTime = sampleList[i].timeTip; + } + arr.push(perfSample); + } + arr[arr.length - 1].eventCount += sampleList[i].eventCount; + arr[arr.length - 1].endTime = sampleList[i].timeTip; + arr[arr.length - 1].totalTime = arr[arr.length - 1].endTime - arr[arr.length - 1].startTime; + num = sampleList[i].callchain_id; + } + return this.combineChartData(arr); + } + + /** + * 建立callChain每个函数的联系，设置depth跟children + */ + private createCallChain(): void { + this.dataCache.perfCallFireMap.clear(); + for (const item of this.dataCache.perfCallChain!) { + this.dataCache.perfCallFireMap.set(`${item.callchain_id}-${item.depth}`, item); + let parentSymbol = this.dataCache.perfCallFireMap.get(`${item.callchain_id}-${item.depth - 1}`); + if (parentSymbol && parentSymbol.callchain_id === item.callchain_id && parentSymbol.depth === item.depth - 1) { + parentSymbol.children = new Array(); + parentSymbol.children.push(item); + } + } + } + + combineChartData(samples: any): Array { + let combineSample: any = []; + // 遍历sample表查到的数据，并且为其匹配相应的callchain数据 + for (let sample of samples) { + let stackTop = this.dataCache.perfCallFireMap.get(`${sample.callchain_id}-0`); + if (stackTop) { + let stackTopSymbol = JSON.parse(JSON.stringify(stackTop)); + stackTopSymbol.startTime = sample.startTime; + stackTopSymbol.endTime = sample.endTime; + stackTopSymbol.totalTime = sample.endTime - sample.startTime; + stackTopSymbol.thread_id = sample.thread_id; + stackTopSymbol.cpu_id = sample.thread_id; + stackTopSymbol.eventCount = sample.eventCount; + this.setDur(stackTopSymbol) + sample.children = new Array(); + sample.children.push(stackTopSymbol) + // 每一项都和combineSample对比 + if (combineSample.length === 0) { + combineSample.push(sample) + } else { + if (this.perfCallData[0] === 0) { + if (combineSample[combineSample.length - 1].thread_id === sample.thread_id) { + this.combinePerfCallData(combineSample[combineSample.length - 1], sample) + } else { + combineSample.push(sample) + } + } else { + if (combineSample[combineSample.length - 1].cpu_id === sample.cpu_id) { + this.combinePerfCallData(combineSample[combineSample.length - 1], sample) + } else { + combineSample.push(sample) + } + } + } + } + } + return combineSample; + } + + // 递归设置dur,startTime,endTime + setDur(data: any) { + if (data.children && data.children.length > 0) { + data.children[0].totalTime = data.totalTime; + data.children[0].startTime = data.startTime; + data.children[0].endTime = data.endTime; + data.children[0].thread_id = data.thread_id; + data.children[0].cpu_id = data.cpu_id; + data.children[0].eventCount = data.eventCount; + this.setDur(data.children[0]) + } else { + return + } + } + + // hiperf火焰图合并逻辑 + combinePerfCallData(data1: any, data2: any) { + if (data1.depth === data2.depth && data1.name === data2.name) { + data1.endTime = data2.endTime; + data1.eventCount += data2.eventCount; + if (data1.children && data1.children.length > 0 && data2.children && data2.children.length > 0) { + if (data1.children[data1.children.length - 1].depth === data2.children[0].depth + && data1.children[data1.children.length - 1].name !== data2.children[0].name) { + data1.children.push(data2.children[0]) + } else { + this.combinePerfCallData(data1.children[data1.children.length - 1], data2.children[0]); + } + } else if (data2.children && data2.children.length > 0 && (!data1.children || data1.children.length === 0)) { + data1.endTime = data2.endTime; + data1.totalTime = data1.endTime - data1.endTime; + data1.children = new Array(); + data1.children.push(data2.children[0]); + } else { + } + } + data1.totalTime = data1.endTime - data1.startTime; + return; + } clearAll(): void { this.filesData = {}; this.samplesData = {}; this.threadData = {}; + this.perfCallData = []; + this.samplesCpu = []; this.callChainData = {}; this.splitMapData = {}; this.currentTreeMapData = {}; @@ -245,23 +511,6 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.dataSource = []; this.allProcess = []; this.dataCache.clearPerf(); - this.eventTypeId = undefined; - } - - initPerfCallChainBottomUp(callChains: PerfCallChain[]): void { - callChains.forEach((callChain: PerfCallChain, index: number): void => { - if (this.threadData[callChain.tid] === undefined) { - return; - } - this.setPerfCallChainFrameName(callChain); - this.addPerfGroupData(callChain); - if (index + 1 < callChains.length && callChains[index + 1].sampleId === callChain.sampleId) { - PerfCallChain.setPreviousNode(callChain, callChains[index + 1]); - } - if (callChains.length === index + 1 || callChains[index + 1].sampleId !== callChain.sampleId) { - this.addProcessThreadStateData(callChain); - } - }); } initPerfCallChainTopDown(callChains: PerfCallChain[]): void { @@ -296,33 +545,6 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } } - addProcessThreadStateData(callChain: PerfCallChain): void { - //当调用栈为调用的根节点时 - this.addPerfCallData(callChain); - let threadCallChain = new PerfCallChain(); //新增的线程数据 - threadCallChain.depth = 0; - PerfCallChain.merageCallChain(threadCallChain, callChain); - threadCallChain.canCharge = false; - threadCallChain.name = `${this.threadData[callChain.tid].threadName || 'Thread'}(${callChain.tid})`; - let threadStateCallChain = new PerfCallChain(); //新增的线程状态数据 - PerfCallChain.merageCallChain(threadStateCallChain, callChain); - threadStateCallChain.name = callChain.threadState || 'Unknown State'; - threadStateCallChain.fileName = threadStateCallChain.name === '-' ? 'Unknown Thread State' : ''; - threadStateCallChain.canCharge = false; - this.addPerfGroupData(threadCallChain); - this.addPerfGroupData(threadStateCallChain); - PerfCallChain.setNextNode(threadCallChain, threadStateCallChain); - PerfCallChain.setNextNode(threadStateCallChain, callChain); - } - - addPerfCallData(callChain: PerfCallChain): void { - let perfCall = new PerfCall(); - perfCall.depth = this.callChainData[callChain.sampleId]?.length || 0; - perfCall.sampleId = callChain.sampleId; - perfCall.name = callChain.name; - this.dataCache.perfCallChainMap.set(callChain.sampleId, perfCall); - } - addPerfGroupData(callChain: PerfCallChain): void { const currentCallChain = this.callChainData[callChain.sampleId] || []; this.callChainData[callChain.sampleId] = currentCallChain; @@ -332,15 +554,11 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { currentCallChain.push(callChain); } - getPerfCallChainsBySampleIds(sampleIds: string[], isTopDown: boolean): PerfCallChainMerageData[] { - this.allProcess = this.groupNewTreeNoId(sampleIds, isTopDown); - return this.allProcess; - } - addOtherCallchainsData(countSample: PerfCountSample, list: any[]): void { let threadCallChain = new PerfCallChain(); //新增的线程数据 threadCallChain.tid = countSample.tid; threadCallChain.canCharge = false; + threadCallChain.isThread = true; threadCallChain.name = `${this.threadData[countSample.tid].threadName || 'Thread'}(${countSample.tid})`; let threadStateCallChain = new PerfCallChain(); //新增的线程状态数据 threadStateCallChain.tid = countSample.tid; @@ -359,25 +577,11 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.currentTreeMapData = {}; this.currentTreeList = []; let totalSamplesCount = 0; - this.processMap = new Map(); - this.threadMap = new Map(); - perfCountSamples.forEach((perfSample) => { - if (this.processMap.has(perfSample.pid)) { - this.processMap.get(perfSample.pid)!.count += perfSample.count; - this.processMap.get(perfSample.pid)!.eventCount += perfSample.eventCount; - } else { - this.processMap.set(perfSample.pid, { count: perfSample.count, eventCount: perfSample.eventCount }); - } - if (this.threadMap.has(perfSample.tid)) { - this.threadMap.get(perfSample.tid)!.count += perfSample.count; - this.threadMap.get(perfSample.tid)!.eventCount += perfSample.eventCount; - } else { - this.threadMap.set(perfSample.tid, { count: perfSample.count, eventCount: perfSample.eventCount }); - } - }); + let totalEventCount = 0; perfCountSamples.forEach((perfSample): void => { totalSamplesCount += perfSample.count; + totalEventCount += perfSample.eventCount; if (this.callChainData[perfSample.sampleId] && this.callChainData[perfSample.sampleId].length > 0) { let perfCallChains = [...this.callChainData[perfSample.sampleId]]; this.addOtherCallchainsData(perfSample, perfCallChains); @@ -395,8 +599,6 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { perfCallChains[topIndex], perfSample, false, - this.processMap, - this.threadMap ); this.mergeChildrenByIndex(perfRootNode, perfCallChains, topIndex, perfSample, isTopDown); } @@ -410,6 +612,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { perfProcessMerageData.canCharge = false; perfProcessMerageData.symbolName = (this.threadData[merageData.tid].processName || 'Process') + `(${merageData.pid})`; + perfProcessMerageData.isProcess = true; perfProcessMerageData.symbol = perfProcessMerageData.symbolName; perfProcessMerageData.tid = merageData.tid; perfProcessMerageData.children.push(merageData); @@ -418,6 +621,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { perfProcessMerageData.count = merageData.dur; perfProcessMerageData.eventCount = merageData.eventCount; perfProcessMerageData.total = totalSamplesCount; + perfProcessMerageData.totalEvent = totalEventCount; perfProcessMerageData.tsArray = [...merageData.tsArray]; rootMerageMap[merageData.pid] = perfProcessMerageData; } else { @@ -427,6 +631,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { rootMerageMap[merageData.pid].count += merageData.dur; rootMerageMap[merageData.pid].eventCount += merageData.eventCount; rootMerageMap[merageData.pid].total = totalSamplesCount; + rootMerageMap[merageData.pid].totalEvent = totalEventCount; for (const ts of merageData.tsArray) { rootMerageMap[merageData.pid].tsArray.push(ts); } @@ -436,6 +641,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { let id = 0; this.currentTreeList.forEach((perfTreeNode: any): void => { perfTreeNode.total = totalSamplesCount; + perfTreeNode.totalEvent = totalEventCount; if (perfTreeNode.id === '') { perfTreeNode.id = id + ''; id++; @@ -474,8 +680,6 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { callChainDataList[index], sample, isEnd, - this.processMap, - this.threadMap ); return true; } @@ -488,13 +692,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { callChainDataList[index], sample, isEnd, - this.processMap, - this.threadMap ); - node.processPercent = node.count / this.processMap.get(node.pid)!.count; - node.processEventPercent = node.eventCount / this.processMap.get(node.pid)!.eventCount; - node.threadPercent = node.count / this.threadMap.get(node.tid)!.count; - node.threadEventPercent = node.eventCount / this.threadMap.get(node.tid)!.eventCount; currentNode.children.push(node); currentNode.initChildren.push(node); this.currentTreeList.push(node); @@ -503,97 +701,6 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { if (node! && !isEnd) this.mergeChildrenByIndex(node, callChainDataList, index, sample, isTopDown); } - groupNewTreeNoId(sampleIds: string[], isTopDown: boolean): any[] { - this.currentTreeMapData = {}; - this.currentTreeList = []; - for (let i = 0; i < sampleIds.length; i++) { - let callChains = this.callChainData[sampleIds[i]]; - if (callChains === undefined) continue; - let topIndex = isTopDown ? 0 : callChains.length - 1; - if (callChains.length > 0) { - let root = this.currentTreeMapData[callChains[topIndex].name + callChains[topIndex].pid]; - if (root === undefined) { - root = new PerfCallChainMerageData(); - this.currentTreeMapData[callChains[topIndex].name + callChains[topIndex].pid] = root; - this.currentTreeList.push(root); - } - PerfCallChainMerageData.merageCallChain(root, callChains[topIndex], isTopDown); - this.merageChildren(root, callChains[topIndex], isTopDown); - } - } - let rootMerageMap: any = {}; - // @ts-ignore - Object.values(this.currentTreeMapData).forEach((merageData: any): void => { - if (rootMerageMap[merageData.pid] === undefined) { - let processMerageData = new PerfCallChainMerageData(); //新增进程的节点数据 - processMerageData.canCharge = false; - processMerageData.symbolName = this.threadData[merageData.tid].processName || `Process(${merageData.pid})`; - processMerageData.symbol = processMerageData.symbolName; - processMerageData.tid = merageData.tid; - processMerageData.children.push(merageData); - processMerageData.initChildren.push(merageData); - processMerageData.dur = merageData.dur; - processMerageData.count = merageData.dur; - processMerageData.eventCount = merageData.dur; - processMerageData.total = sampleIds.length; - rootMerageMap[merageData.pid] = processMerageData; - } else { - rootMerageMap[merageData.pid].children.push(merageData); - rootMerageMap[merageData.pid].initChildren.push(merageData); - rootMerageMap[merageData.pid].dur += merageData.dur; - rootMerageMap[merageData.pid].count += merageData.dur; - rootMerageMap[merageData.pid].eventCount += merageData.dur; - rootMerageMap[merageData.pid].total = sampleIds.length; - } - merageData.parentNode = rootMerageMap[merageData.pid]; //子节点添加父节点的引用 - }); - let id = 0; - this.currentTreeList.forEach((node: any): void => { - node.total = sampleIds.length; - if (node.id === '') { - node.id = id + ''; - id++; - } - if (node.parentNode) { - if (node.parentNode.id === '') { - node.parentNode.id = id + ''; - id++; - } - node.parentId = node.parentNode.id; - } - }); - // @ts-ignore - return Object.values(rootMerageMap); - } - - merageChildren(currentNode: PerfCallChainMerageData, callChain: any, isTopDown: boolean): void { - let nextNodeKey = isTopDown ? 'nextNode' : 'previousNode'; - if (callChain[nextNodeKey] === undefined) { - return; - } - let node; - if ( - currentNode.initChildren.filter((child: PerfCallChainMerageData): boolean => { - if (child.symbolName === callChain[nextNodeKey]?.name) { - node = child; - PerfCallChainMerageData.merageCallChain(child, callChain[nextNodeKey], isTopDown); - return true; - } - return false; - }).length === 0 - ) { - node = new PerfCallChainMerageData(); - PerfCallChainMerageData.merageCallChain(node, callChain[nextNodeKey], isTopDown); - currentNode.children.push(node); - currentNode.initChildren.push(node); - this.currentTreeList.push(node); - node.parentNode = currentNode; - } - if (node) { - this.merageChildren(node, callChain[nextNodeKey], isTopDown); - } - } - //所有的操作都是针对整个树结构的 不区分特定的数据 splitPerfTree(samples: PerfCallChainMerageData[], name: string, isCharge: boolean, isSymbol: boolean): void { samples.forEach((process: PerfCallChainMerageData): void => { @@ -791,7 +898,19 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.freshPerfCallchains(this.samplesData, item.funcArgs[0]); break; case 'getCurrentDataFromDb': - this.getCurrentDataFromDb(item.funcArgs[0]); + if (item.funcArgs[1]) { + let funcArgs = item.funcArgs[1]; + let sql = ''; + if (funcArgs.process !== undefined) { + sql += `and thread.process_id = ${funcArgs.process}`; + } + if (funcArgs.thread !== undefined) { + sql += ` and s.thread_id = ${funcArgs.thread}`; + } + this.getCurrentDataFromDb(item.funcArgs[0], sql); + } else { + this.getCurrentDataFromDb(item.funcArgs[0]); + } break; case 'hideSystemLibrary': this.hideSystemLibrary(); @@ -823,9 +942,6 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { case 'setSearchValue': this.searchValue = item.funcArgs[0]; break; - case 'setEventTypeId': - this.eventTypeId = item.funcArgs[0]; - break; case 'setCombineCallChain': this.isAnalysis = true; break; @@ -846,27 +962,34 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { return this.dataSource; } - combineCallChainForAnalysis(): PerfAnalysisSample[] { + combineCallChainForAnalysis(obj?: any): PerfAnalysisSample[] { let sampleCallChainList: Array = []; for (let sample of this.samplesData) { let callChains = [...this.callChainData[sample.sampleId]]; const lastCallChain = callChains[callChains.length - 1]; const threadName = this.threadData[sample.tid].threadName || 'Thread'; const processName = this.threadData[sample.pid].threadName || 'Process'; - let analysisSample = new PerfAnalysisSample( - threadName, - processName, - lastCallChain.fileId, - lastCallChain.fileName, - lastCallChain.symbolId, - lastCallChain.name - ); - analysisSample.tid = sample.tid; - analysisSample.pid = sample.pid; - analysisSample.count = sample.count; - analysisSample.threadState = sample.threadState; - analysisSample.eventCount = sample.eventCount; - sampleCallChainList.push(analysisSample); + if ( + (obj && obj.libId === lastCallChain.fileId && obj.libName === lastCallChain.fileName) || + (obj && obj.symbolId === lastCallChain.symbolId && obj.symbolName === lastCallChain.name) || + (!obj) + ) { + let analysisSample = new PerfAnalysisSample( + threadName, + processName, + lastCallChain.fileId, + lastCallChain.fileName, + lastCallChain.symbolId, + lastCallChain.name + ); + analysisSample.tid = sample.tid; + analysisSample.pid = sample.pid; + analysisSample.count = sample.count; + analysisSample.threadState = sample.threadState; + analysisSample.eventCount = sample.eventCount; + analysisSample.sampleId = sample.sampleId; + sampleCallChainList.push(analysisSample); + } } if (this.isAnalysis) { this.isAnalysis = false; @@ -892,11 +1015,13 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { existingNode.tsArray.push(...sample.ts.split(',').map(Number)); currentNode = existingNode; existingNode.totalTime += perfTime * sample.count; + existingNode.eventCount += sample.eventCount; existingNode.calculateSelfTime(); existingNode.notifyParentUpdateSelfTime(); } else { let newNode = new PerfBottomUpStruct(`${item.name}(${item.fileName})`); newNode.totalTime = perfTime * sample.count; + newNode.eventCount = sample.eventCount; newNode.tsArray = sample.ts.split(',').map(Number); currentNode.addChildren(newNode); newNode.calculateSelfTime(); @@ -923,6 +1048,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { const clonePerfBottomUpStruct = new PerfBottomUpStruct(perfBottomUpStruct.symbolName); clonePerfBottomUpStruct.selfTime = perfBottomUpStruct.selfTime; clonePerfBottomUpStruct.totalTime = perfBottomUpStruct.totalTime; + clonePerfBottomUpStruct.eventCount = perfBottomUpStruct.eventCount; clonePerfBottomUpStruct.tsArray = [...perfBottomUpStruct.tsArray]; reverseTreeArray.push(clonePerfBottomUpStruct); this.copyParentNode(clonePerfBottomUpStruct, perfBottomUpStruct); @@ -991,6 +1117,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { const copyParent = new PerfBottomUpStruct(bottomUpStruct.parentNode.symbolName); copyParent.selfTime = perfBottomUpStruct.selfTime; copyParent.totalTime = perfBottomUpStruct.totalTime; + copyParent.eventCount = perfBottomUpStruct.eventCount; copyParent.tsArray = [...perfBottomUpStruct.tsArray]; perfBottomUpStruct.addChildren(copyParent); this.copyParentNode(copyParent, bottomUpStruct.parentNode); @@ -1060,6 +1187,8 @@ export class PerfCallChain { canCharge: boolean = true; previousNode: PerfCallChain | undefined = undefined; //将list转换为一个链表结构 nextNode: PerfCallChain | undefined = undefined; + isThread: boolean = false; + isProcess: boolean = false; static setNextNode(currentNode: PerfCallChain, nextNode: PerfCallChain): void { currentNode.nextNode = nextNode; @@ -1085,6 +1214,7 @@ export class PerfCallChain { export class PerfCallChainMerageData extends ChartStruct { #parentNode: PerfCallChainMerageData | undefined = undefined; #total = 0; + #totalEvent = 0; id: string = ''; parentId: string = ''; parent: PerfCallChainMerageData | undefined = undefined; @@ -1107,10 +1237,6 @@ export class PerfCallChainMerageData extends ChartStruct { isSelected: boolean = false; searchShow: boolean = true; isSearch: boolean = false; - processPercent: number = 0; - threadEventPercent: number = 0; - threadPercent: number = 0; - processEventPercent: number = 0; set parentNode(data: PerfCallChainMerageData | undefined) { this.parent = data; this.#parentNode = data; @@ -1130,6 +1256,15 @@ export class PerfCallChainMerageData extends ChartStruct { return this.#total; } + set totalEvent(data: number) { + this.#totalEvent = data; + this.eventPercent = `${((this.eventCount / data) * 100).toFixed(1)}%`; + } + + get totalEvent(): number { + return this.#totalEvent; + } + static merageCallChain(currentNode: PerfCallChainMerageData, callChain: PerfCallChain, isTopDown: boolean): void { if (currentNode.symbolName === '') { currentNode.symbol = `${callChain.name} ${callChain.fileName ? `(${callChain.fileName})` : ''}`; @@ -1152,14 +1287,12 @@ export class PerfCallChainMerageData extends ChartStruct { currentNode.count += callChain.count; currentNode.eventCount += callChain.eventCount; } - static merageCallChainSample( + currentNode: PerfCallChainMerageData, callChain: PerfCallChain, sample: PerfCountSample, isEnd: boolean, - processMap: Map, - threadMap: Map ): void { if (currentNode.symbolName === '') { currentNode.symbol = `${callChain.name} ${callChain.fileName ? `(${callChain.fileName})` : ''}`; @@ -1178,13 +1311,12 @@ export class PerfCallChainMerageData extends ChartStruct { if (isEnd) { currentNode.selfDur += sample.count; } + if (callChain.isThread && !currentNode.isThread){ + currentNode.isThread = callChain.isThread; + } currentNode.dur += sample.count; currentNode.count += sample.count; currentNode.eventCount += sample.eventCount; - currentNode.processPercent = currentNode.count / processMap.get(currentNode.pid)!.count; - currentNode.processEventPercent = currentNode.eventCount / processMap.get(currentNode.pid)!.eventCount; - currentNode.threadPercent = currentNode.count / threadMap.get(currentNode.tid)!.count; - currentNode.threadEventPercent = currentNode.eventCount / threadMap.get(currentNode.tid)!.eventCount; currentNode.tsArray.push(...sample.ts.split(',').map(Number)); } } @@ -1264,3 +1396,19 @@ export function timeMsFormat2p(ns: number): string { } return perfResult; } + + +class HiPrefSample { + name: string = ""; + depth: number = 0; + callchain_id: number = 0; + totalTime: number = 0; + thread_id: number = 0; + id: number = 0; + eventCount: number = 0; + startTime: number = 0; + endTime: number = 0; + timeTip: number = 0; + cpu_id: number = 0; + stack?: Array; +} \ No newline at end of file diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts index bfeef7d29..0fd1daf60 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts @@ -56,6 +56,8 @@ import { FrameSpacingRender } from './ProcedureWorkerFrameSpacing.js'; import { JsCpuProfilerRender } from './ProcedureWorkerCpuProfiler.js'; import { SnapshotRender } from './ProcedureWorkerSnapshot.js'; import { LogRender } from './ProcedureWorkerLog.js'; +import { HiPerfCallChartRender } from './ProcedureWorkerHiPerfCallChart.js'; +import { HiSysEventRender } from './ProcedureWorkerHiSysEvent.js'; let dataList: any = {}; let dataList2: any = {}; @@ -86,6 +88,7 @@ export let renders: any = { 'HiPerf-Group': new EmptyRender(), monitorGroup: new EmptyRender(), 'HiPerf-Cpu': new HiperfCpuRender(), + 'HiPerf-callchart': new HiPerfCallChartRender(), 'HiPerf-Process': new HiperfProcessRender(), 'HiPerf-Thread': new HiperfThreadRender(), 'HiPerf-Report-Event': new HiperfEventRender(), @@ -109,6 +112,7 @@ export let renders: any = { 'js-cpu-profiler': new JsCpuProfilerRender(), snapshot: new SnapshotRender(), logs: new LogRender(), + hiSysEvent: new HiSysEventRender(), }; function match(type: string, req: RequestMessage): void { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts index 363d3c87f..5c7dc8687 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts @@ -44,7 +44,8 @@ export class FuncRender extends Render { TraceRow.range!.endNS, TraceRow.range!.totalNS, row.frame, - req.useCache || !TraceRow.range!.refresh + req.useCache || !TraceRow.range!.refresh, + row.funcExpand ); req.context.beginPath(); let funcFind = false; @@ -84,7 +85,8 @@ export function func( endNS: number, totalNS: number, frame: any, - use: boolean + use: boolean, + expand: boolean, ) { if (use && funcFilter.length > 0) { for (let i = 0, len = funcFilter.length; i < len; i++) { @@ -99,7 +101,7 @@ export function func( funcFilter.length = 0; if (funcList) { let groups = funcList - .filter((it) => (it.startTs ?? 0) + (it.dur ?? 0) >= startNS && (it.startTs ?? 0) <= endNS) + .filter((it) => (it.startTs ?? 0) + (it.dur ?? 0) >= startNS && (it.startTs ?? 0) <= endNS && ((!expand && it.depth === 0) || expand)) .map((it) => { FuncStruct.setFuncFrame(it, 0, startNS, endNS, totalNS, frame); return it; diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHeap.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHeap.ts index 495377aaf..f209e2921 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerHeap.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHeap.ts @@ -52,6 +52,7 @@ export class HeapRender { row.frame, req.useCache || (TraceRow.range?.refresh ?? false) ); + // 多条数据,最后一条数据在结束点也需要绘制 if (heapFilter.length >= 2 && heapFilter[heapFilter.length - 1].dur === 0) { if (heapFilter[heapFilter.length - 2].frame && heapFilter[heapFilter.length - 1].frame) { heapFilter[heapFilter.length - 2].frame!.width = heapFilter[heapFilter.length - 2].frame!.width - 1; @@ -59,6 +60,10 @@ export class HeapRender { heapFilter[heapFilter.length - 1].frame!.x -= 1; } } + // 只有一条数据并且数据在结束点 + if (heapFilter.length === 1 && row.frame.width === heapFilter[0].frame?.x){ + heapFilter[0].frame!.x -= 1; + } req.context.beginPath(); let find = false; for (let re of heapFilter) { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCallChart.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCallChart.ts new file mode 100644 index 000000000..8cb120c00 --- /dev/null +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHiPerfCallChart.ts @@ -0,0 +1,211 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { ColorUtils } from '../../component/trace/base/ColorUtils.js'; +import { + BaseStruct, + type Rect, + ns2x, + drawString, + Render, + isFrameContainPoint +} from './ProcedureWorkerCommon.js'; +import { TraceRow } from '../../component/trace/base/TraceRow.js'; +import { HiPerfChartFrame } from '../../bean/PerfStruct.js'; + +export class HiPerfCallChartRender extends Render { + renderMainThread(req: any, row: TraceRow): void { + let list = row.dataList; + let filter = row.dataListCache; + hiperf( + list, + filter, + TraceRow.range!.startNS, + TraceRow.range!.endNS, + TraceRow.range!.totalNS, + row.frame, + req.useCache || !TraceRow.range!.refresh, + row.funcExpand + ); + req.context.beginPath();; + let find = false; + let offset = 5; + for (let re of filter) { + HiPerfCallChartStruct.draw(req.context, re); + if (row.isHover) { + if (re.endTime - re.startTime === 0 || + re.endTime - re.startTime == null || + re.endTime - re.startTime === undefined) { + if (re.frame && + row.hoverX >= re.frame.x - offset && + row.hoverX <= re.frame.x + re.frame.width + offset && + row.hoverY >= re.frame.y && + row.hoverY <= re.frame.y + re.frame.height) { + HiPerfCallChartStruct.hoverPerfCallCutStruct = re; + find = true; + } + } else { + if (re.frame && isFrameContainPoint(re.frame, row.hoverX, row.hoverY)) { + HiPerfCallChartStruct.hoverPerfCallCutStruct = re; + find = true + } + } + } + if (!find && row.isHover) { + HiPerfCallChartStruct.hoverPerfCallCutStruct = undefined + } + } + req.context.closePath(); + } +} + +// 火焰图数据模板 +let padding = 1; +export class HiPerfCallChartStruct extends BaseStruct { + static selectStruct: HiPerfCallChartStruct | undefined; + static hoverPerfCallCutStruct: HiPerfCallChartStruct | undefined; + id: number = 0; + name: string = ''; + startTime: number = 0; + endTime: number = 0; + eventCount: number = 0; + depth: number = 0; + fileId: number = 0; + symbolId: number = 0; + children!: Array; + isSelect: boolean = false; + totalTime: number = 0; + callchain_id:number = 0; + + static setPerfFrame( + hiPerfNode: any, + startNS: number, + endNS: number, + totalNS: number, + frame: Rect + ): void { + let x1: number, x2: number; + if ((hiPerfNode.startTime || 0) > startNS && (hiPerfNode.startTime || 0) < endNS) { + x1 = ns2x(hiPerfNode.startTime || 0, startNS, endNS, totalNS, frame); + } else { + x1 = 0; + } + if ( + (hiPerfNode.startTime || 0) + (hiPerfNode.totalTime || 0) > startNS && + (hiPerfNode.startTime || 0) + (hiPerfNode.totalTime || 0) < endNS + ) { + x2 = ns2x( + (hiPerfNode.startTime || 0) + (hiPerfNode.totalTime || 0), + startNS, + endNS, + totalNS, + frame + ); + } else { + x2 = frame.width; + } + if (!hiPerfNode.frame) { + hiPerfNode.frame = {}; + } + let getV: number = x2 - x1 < 1 ? 1 : x2 - x1; + hiPerfNode.frame.x = Math.floor(x1); + hiPerfNode.frame.y = hiPerfNode.depth * 20; + hiPerfNode.frame.width = Math.ceil(getV); + hiPerfNode.frame.height = 20; + } + + static draw(ctx: CanvasRenderingContext2D, data: HiPerfCallChartStruct): void { + if (data.frame) { + if (data.endTime - data.startTime === undefined || data.endTime - data.startTime === null) { + } else { + ctx.globalAlpha = 1; + if (data.name === '(program)') { + ctx.fillStyle = '#ccc'; + } else if (data.name === '(idle)') { + ctx.fillStyle = '#f0f0f0'; + } else { + ctx.fillStyle = + ColorUtils.FUNC_COLOR[ColorUtils.hashFunc(data.name || '', 0, ColorUtils.FUNC_COLOR.length)]; + } + let miniHeight = 20; + if (HiPerfCallChartStruct.hoverPerfCallCutStruct && data === HiPerfCallChartStruct.hoverPerfCallCutStruct) { + ctx.globalAlpha = 0.7; + } + ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2); + if (data.frame.width > 8) { + ctx.lineWidth = 1; + ctx.fillStyle = '#fff'; + ctx.textBaseline = 'middle'; + drawString(ctx, `${data.name || ''}`, 4, data.frame, data); + } + if (data === HiPerfCallChartStruct.selectStruct) { + ctx.strokeStyle = '#000'; + ctx.lineWidth = 2; + ctx.strokeRect( + data.frame.x + 1, + data.frame.y + 1, + data.frame.width - 2, + miniHeight - padding * 2 - 2 + ); + } + } + } + } +} + +export function hiperf( + list: Array, + filter: Array, + startNS: number, + endNS: number, + totalNS: number, + frame: Rect, + use: boolean, + expand: boolean +): void { + if (use && filter.length > 0) { + for (let i = 0, len = filter.length; i < len; i++) { + if (filter[i].totalTime > 0 + && (filter[i].startTime || 0) + (filter[i].totalTime || 0) >= startNS + && (filter[i].startTime || 0) <= endNS) { + HiPerfCallChartStruct.setPerfFrame(filter[i], startNS, endNS, totalNS, frame); + } else { + filter[i].frame = null; + } + } + return; + } + filter.length = 0; + if (list) { + let groups = list + .filter((it) => it.totalTime > 0 + && (it.startTime ?? 0) + (it.totalTime ?? 0) >= startNS + && (it.startTime ?? 0) <= endNS + && ((!expand && it.depth === 0) || expand)) + .map((it) => { + HiPerfCallChartStruct.setPerfFrame(it, startNS, endNS, totalNS, frame); + return it; + }) + .reduce((pre, current) => { + (pre[`${current.frame.x}-${current.depth}`] = pre[`${current.frame.x}-${current.depth}`] || []).push(current); + return pre; + }, {}); + Reflect.ownKeys(groups).map((kv) => { + // 从小到大排序 + let arr = groups[kv].sort((a: HiPerfChartFrame, b: HiPerfChartFrame) => b.totalTime - a.totalTime); + filter.push(arr[0]); + }); + } +} \ No newline at end of file -- Gitee From cc103ba9c060cce55a8cda8d841d6c749a870f02 Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 10:03:53 +0800 Subject: [PATCH 04/15] =?UTF-8?q?1.fix:=E7=BA=BF=E7=A8=8B=E6=B3=B3?= =?UTF-8?q?=E9=81=93=E5=9B=BE=E6=94=B6=E8=97=8F=E4=B8=8A=E5=8E=BB=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=982.feat:=E6=A1=86?= =?UTF-8?q?=E9=80=89cpu=E6=B3=B3=E9=81=93=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=98=BE=E7=A4=BA=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E7=BA=A7cpu=E9=A2=91=E7=82=B9=E6=95=B0=E6=8D=AE3.fix-help-docu?= =?UTF-8?q?ment=E6=94=B9=E4=B8=BA=E4=B8=89=E7=BA=A7=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E6=97=97=E5=AD=90=E9=A2=9C=E8=89=B2=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?shift+m=E7=BB=84=E5=90=88=E9=94=AE=E5=8E=BB=E9=99=A4=E6=B5=85?= =?UTF-8?q?=E8=89=B2=E6=A8=A1=E5=BC=8F4.=E4=BF=AE=E6=94=B9=E4=B8=8B?= =?UTF-8?q?=E8=BD=BDcpu-Frequency-Tab=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=97=B6G?= =?UTF-8?q?etBusyTime=E5=88=97Title=E4=B8=BAnull=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B55.fix:hisysEvent&Hiperf=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/base-ui/menu/LitMainMenu.ts | 113 +- ide/src/base-ui/menu/LitMainMenuGroup.ts | 25 +- ide/src/base-ui/table/LitPageTable.ts | 4 +- ide/src/base-ui/utils/CSVFormater.ts | 2 +- ide/src/trace/SpApplication.ts | 7 + ide/src/trace/bean/EbpfStruct.ts | 10 +- ide/src/trace/bean/FrameChartStruct.ts | 5 - ide/src/trace/bean/PerfProfile.ts | 4 +- ide/src/trace/component/SpHelp.ts | 3 + ide/src/trace/component/SpRecordTrace.ts | 19 +- ide/src/trace/component/SpSystemTrace.ts | 5 +- ide/src/trace/component/chart/FrameChart.ts | 73 +- ide/src/trace/component/chart/SpHiPerf.ts | 27 +- .../trace/component/setting/SpAllocations.ts | 68 +- .../trace/component/setting/SpHisysEvent.ts | 2 +- .../setting/bean/ProfilerServiceTypes.ts | 3 +- .../component/trace/TimerShaftElement.ts | 18 +- .../trace/component/trace/base/Extension.ts | 6 +- .../trace/component/trace/base/TraceRow.ts | 3 + .../component/trace/base/TraceSheetConfig.ts | 4 +- .../trace/sheet/cpu/TabPaneFrequencySample.ts | 2 +- .../sheet/file-system/TabPaneCallTree.ts | 14 +- .../file-system/TabPaneFileSystemCalltree.ts | 10 +- .../TabPaneFilesystemStatisticsAnalysis.ts | 17 +- .../TabPaneVirtualMemoryStatisticsAnalysis.ts | 16 +- .../sheet/frequsage/TabPaneFreqDataCut.ts | 1083 +++++++++-------- .../trace/sheet/frequsage/TabPaneFreqUsage.ts | 447 ++++--- .../trace/sheet/hiperf/TabPanePerfAnalysis.ts | 1 + .../trace/sheet/hiperf/TabPerfProfile.ts | 20 +- .../sheet/hisysevent/TabPaneHisysEvents.ts | 40 +- .../sheet/native-memory/TabPaneNMCallTree.ts | 25 +- .../component/trace/timer-shaft/SportRuler.ts | 3 +- ide/src/trace/database/SqlLite.ts | 19 +- .../ProcedureLogicWorkerCommon.ts | 1 + .../ProcedureLogicWorkerFileSystem.ts | 5 + .../logic-worker/ProcedureLogicWorkerPerf.ts | 92 +- 36 files changed, 1176 insertions(+), 1020 deletions(-) diff --git a/ide/src/base-ui/menu/LitMainMenu.ts b/ide/src/base-ui/menu/LitMainMenu.ts index 19d7aa5e1..1b6a0ce68 100644 --- a/ide/src/base-ui/menu/LitMainMenu.ts +++ b/ide/src/base-ui/menu/LitMainMenu.ts @@ -54,37 +54,87 @@ export class LitMainMenu extends BaseElement { let groupDescribe = group!.shadowRoot!.querySelector('.group-describe') as LitMainMenuGroup; menuBody?.appendChild(group); it.children?.forEach((item: any) => { - let th = new LitMainMenuItem(); - th.setAttribute('icon', item.icon || ''); - th.setAttribute('title', item.title || ''); - if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') { - groupName.style.color = 'white'; - groupDescribe.style.color = 'white'; - th!.style.color = 'white'; - } else { - groupName.style.color = 'black'; - groupDescribe.style.color = 'black'; - th!.style.color = 'black'; - } - if (item.fileChoose) { - th.setAttribute('file', ''); - th.addEventListener('file-change', (e) => { - if (item.fileHandler && !th.disabled) { - item.fileHandler(e); + if (item.children && item.children.length > 0) { + let secondGroup = new LitMainMenuGroup(); + secondGroup.setAttribute('title', item.title || ''); + secondGroup.setAttribute('describe', item.describe || ''); + if (item.second) { + secondGroup.setAttribute('second', ''); + } else { + secondGroup.removeAttribute('second') + } + if (item.collapsed) { + secondGroup.setAttribute('collapsed', '') + } else { + secondGroup.removeAttribute('collapsed') + } + group?.appendChild(secondGroup) + item.children?.forEach((v: any) => { + let th = new LitMainMenuItem(); + th.setAttribute('icon', v.icon || ''); + th.setAttribute('title', v.title || '');if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') { + groupName.style.color = 'white'; + groupDescribe.style.color = 'white'; + th!.style.color = 'white'; + } else { + groupName.style.color = 'black'; + groupDescribe.style.color = 'black'; + th!.style.color = 'black'; } - }); - } else { - th.removeAttribute('file'); - th.addEventListener('click', (e) => { - if (item.clickHandler && !th.disabled) { - item.clickHandler(item); + if (v.fileChoose) { + th.setAttribute('file', ''); + th.addEventListener('file-change', (e) => { + if (v.fileHandler && !th.disabled) { + v.fileHandler(e); + } + }); + } else { + th.removeAttribute('file'); + th.addEventListener('click', (e) => { + if (v.clickHandler && !th.disabled) { + v.clickHandler(v); + } + }); } - }); - } - if (item.disabled != undefined) { - th.disabled = item.disabled; + if (v.disabled != undefined) { + th.disabled = v.disabled; + } + secondGroup.appendChild(th) + }) + } else { + let th = new LitMainMenuItem(); + th.setAttribute('icon', item.icon || ''); + th.setAttribute('title', item.title || ''); + if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') { + groupName.style.color = 'white'; + groupDescribe.style.color = 'white'; + th!.style.color = 'white'; + } else { + groupName.style.color = 'black'; + groupDescribe.style.color = 'black'; + th!.style.color = 'black'; + } + if (item.fileChoose) { + th.setAttribute('file', ''); + th.addEventListener('file-change', (e) => { + if (item.fileHandler && !th.disabled) { + item.fileHandler(e); + } + }); + } else { + th.removeAttribute('file'); + th.addEventListener('click', (e) => { + if (item.clickHandler && !th.disabled) { + item.clickHandler(item); + } + }); + } + if (item.disabled != undefined) { + th.disabled = item.disabled; + } + group?.appendChild(th); } - group?.appendChild(th); + }); }); } @@ -94,7 +144,7 @@ export class LitMainMenu extends BaseElement { st?.addEventListener('slotchange', (e) => { this.slotElements = st?.assignedElements(); this.slotElements?.forEach((it) => { - it.querySelectorAll('lit-main-menu-item').forEach((cell) => {}); + it.querySelectorAll('lit-main-menu-item').forEach((cell) => { }); }); }); let versionDiv: HTMLElement | null | undefined = this.shadowRoot?.querySelector('.version'); @@ -192,8 +242,9 @@ export class LitMainMenu extends BaseElement { export interface MenuGroup { title: string; describe: string; + second: boolean; collapsed: boolean; - children: Array; + children: any; } export interface MenuItem { @@ -202,4 +253,4 @@ export interface MenuItem { fileChoose?: boolean; clickHandler?: Function; fileHandler?: Function; -} +} \ No newline at end of file diff --git a/ide/src/base-ui/menu/LitMainMenuGroup.ts b/ide/src/base-ui/menu/LitMainMenuGroup.ts index 884fad542..6dcacf8be 100644 --- a/ide/src/base-ui/menu/LitMainMenuGroup.ts +++ b/ide/src/base-ui/menu/LitMainMenuGroup.ts @@ -23,7 +23,19 @@ export class LitMainMenuGroup extends BaseElement { private group: HTMLElement | null | undefined; static get observedAttributes() { - return ['title', 'describe', 'collapsed', 'nocollapse', 'radius']; + return ['title', 'describe', 'collapsed', 'nocollapse', 'radius', 'second']; + } + + get second() { + return this.hasAttribute('second'); + } + + set second(value: boolean) { + if (value) { + this.setAttribute('second', ''); + } else { + this.removeAttribute('second'); + } } get collapsed(): boolean { @@ -80,9 +92,15 @@ export class LitMainMenuGroup extends BaseElement { user-select: none; transition: background-color .3s; } - :host(:not([collapsed])) ::slotted(lit-main-menu-item){ + :host(:not([collapsed])),:host(:not([second])) ::slotted(lit-main-menu-item){ display: flex; } + host(:not([collapsed])) :host([second]) ::slotted(lit-main-menu-group){ + display:flex; + } + :host([second]) .group-name{ + padding-left:40px; + } :host(:not([collapsed])) .group-describe{ height: 0; visibility: hidden; @@ -107,6 +125,9 @@ export class LitMainMenuGroup extends BaseElement { :host([collapsed]) ::slotted(lit-main-menu-item){ display: none; } + :host([collapsed]) ::slotted(lit-main-menu-group){ + display:none; + } .group-name{ font-size: 14px; font-family: Helvetica; diff --git a/ide/src/base-ui/table/LitPageTable.ts b/ide/src/base-ui/table/LitPageTable.ts index 93876573c..31a463519 100644 --- a/ide/src/base-ui/table/LitPageTable.ts +++ b/ide/src/base-ui/table/LitPageTable.ts @@ -1461,9 +1461,9 @@ export class LitPageTable extends BaseElement { this.reMeauseHeight(); } - clearAllSelection(rowObjectData: any) { + clearAllSelection(rowObjectData: any = undefined) { this.recycleDs.forEach((item) => { - if (item.data != rowObjectData && item.data.isSelected) { + if (rowObjectData || (item.data != rowObjectData && item.data.isSelected)) { item.data.isSelected = false; } }); diff --git a/ide/src/base-ui/utils/CSVFormater.ts b/ide/src/base-ui/utils/CSVFormater.ts index 816351c26..349b23038 100644 --- a/ide/src/base-ui/utils/CSVFormater.ts +++ b/ide/src/base-ui/utils/CSVFormater.ts @@ -178,7 +178,7 @@ export class JSONToCSV { let dataIndex = column.getAttribute('data-index'); let columnName = column.getAttribute('title'); if (columnName == '') { - columnName = dataIndex; + columnName = dataIndex == 'busyTimeStr' ? 'GetBusyTime(ms)' : dataIndex; } if (columnName !== ' ') { titleList.push(columnName); diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts index e268dadef..3a55237d3 100644 --- a/ide/src/trace/SpApplication.ts +++ b/ide/src/trace/SpApplication.ts @@ -1061,6 +1061,7 @@ export class SpApplication extends BaseElement { mainMenu.menus!.splice(1, mainMenu.menus!.length > 2 ? 1 : 0, { collapsed: false, title: 'Current Trace', + second:false, describe: 'Actions on the current trace', children: getTraceOptionMenus(showFileName, fileSize, fileName, true, dbName), }); @@ -1407,6 +1408,7 @@ export class SpApplication extends BaseElement { mainMenu.menus!.splice(2, 1, { collapsed: false, title: 'Convert trace', + second: false, describe: 'Convert to other formats', children: pushConvertTrace(fileName), }); @@ -1415,6 +1417,7 @@ export class SpApplication extends BaseElement { mainMenu.menus!.splice(index, 1, { collapsed: false, title: 'Support', + second: false, describe: 'Support', children: [ { @@ -1449,6 +1452,7 @@ export class SpApplication extends BaseElement { mainMenu.menus!.splice(1, mainMenu.menus!.length > 2 ? 1 : 0, { collapsed: false, title: 'Current Trace', + second: false, describe: 'Actions on the current trace', children: getTraceOptionMenus(showFileName, fileSize, fileName, false), }); @@ -1743,6 +1747,7 @@ export class SpApplication extends BaseElement { mainMenu.menus!.splice(1, mainMenu.menus!.length > 2 ? 1 : 0, { collapsed: false, title: 'Current Trace', + second: false, describe: 'Actions on the current trace', children: getTraceOptionMenus(showFileName, fileSize, fileName, false), }); @@ -1768,6 +1773,7 @@ export class SpApplication extends BaseElement { { collapsed: false, title: 'Navigation', + second: false, describe: 'Open or record a new trace', children: [ { @@ -1826,6 +1832,7 @@ export class SpApplication extends BaseElement { { collapsed: false, title: 'Support', + second: false, describe: 'Support', children: [ { diff --git a/ide/src/trace/bean/EbpfStruct.ts b/ide/src/trace/bean/EbpfStruct.ts index 45c37c288..3bd187e9e 100644 --- a/ide/src/trace/bean/EbpfStruct.ts +++ b/ide/src/trace/bean/EbpfStruct.ts @@ -13,12 +13,8 @@ * limitations under the License. */ -export class CallTreeLevel { - processId?: number; - threadId?: number; +import { PerfLevelStruct } from './PerfProfile.js'; + +export class CallTreeLevelStruct extends PerfLevelStruct { typeId?: number; - libId?: number; - libName?: string; - symbolId?: number; - symbolName?: string; } diff --git a/ide/src/trace/bean/FrameChartStruct.ts b/ide/src/trace/bean/FrameChartStruct.ts index f44e5477c..3841acb38 100644 --- a/ide/src/trace/bean/FrameChartStruct.ts +++ b/ide/src/trace/bean/FrameChartStruct.ts @@ -51,11 +51,6 @@ export class ChartStruct extends BaseStruct { drawDur: number = 0; drawEventCount: number = 0; - threadPercent: number = 0; - threadEventPercent: number = 0; - processPercent: number = 0; - processEventPercent: number = 0; - parent: ChartStruct | undefined; children: Array = []; percent: number = 0; // 0 - 1 该node所占整体的百分比 diff --git a/ide/src/trace/bean/PerfProfile.ts b/ide/src/trace/bean/PerfProfile.ts index 38eb16455..d8293e94d 100644 --- a/ide/src/trace/bean/PerfProfile.ts +++ b/ide/src/trace/bean/PerfProfile.ts @@ -128,8 +128,8 @@ export class PerfCmdLine { } export class PerfLevelStruct { - process?: number; - thread?: number; + processId?: number; + threadId?: number; libId?: number; libName?: number; symbolId?: number; diff --git a/ide/src/trace/component/SpHelp.ts b/ide/src/trace/component/SpHelp.ts index c87c806a5..6dbfb2055 100644 --- a/ide/src/trace/component/SpHelp.ts +++ b/ide/src/trace/component/SpHelp.ts @@ -54,6 +54,7 @@ export class SpHelp extends BaseElement { { collapsed: false, title: 'QuickStart', + second: false, describe: '', children: [ { @@ -386,6 +387,7 @@ export class SpHelp extends BaseElement { { collapsed: false, title: 'TraceStreamer', + second: false, describe: '', children: [ { @@ -460,6 +462,7 @@ export class SpHelp extends BaseElement { { collapsed: false, title: 'SmartPerf', + second: false, describe: '', children: [ { diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index d60747b1d..6146e7bcc 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -528,7 +528,7 @@ export class SpRecordTrace extends BaseElement { freshMenuDisable(disable: boolean): void { let mainMenu = this.sp!.shadowRoot?.querySelector('#main-menu') as LitMainMenu; mainMenu.menus?.forEach((men) => { - men.children.forEach((child) => { + men.children.forEach((child: any) => { // @ts-ignore child.disabled = disable; }); @@ -1682,7 +1682,9 @@ export class SpRecordTrace extends BaseElement { request.pluginConfigs.push(this.createSdkConfig()); } if (this.spHisysEvent?.startSamp) { - request.pluginConfigs.push(this.createHiSystemEventPluginConfig(this.spHisysEvent.domain, this.spHisysEvent.eventName)); + request.pluginConfigs.push( + this.createHiSystemEventPluginConfig(this.spHisysEvent.domain, this.spHisysEvent.eventName) + ); } if (this.spArkTs!.process != '' && this.spArkTs!.startSamp) { request.pluginConfigs.push(this.createArkTsConfig()); @@ -2168,7 +2170,6 @@ export class SpRecordTrace extends BaseElement { } } let nativeConfig: NativeHookConfig = { - pid: pid, saveFile: false, fileName: '', filterSize: this.spAllocations!.filter, @@ -2188,6 +2189,9 @@ export class SpRecordTrace extends BaseElement { } nativeConfig.startupMode = this.spAllocations!.startup_mode; } + if (this.spAllocations!.expandPids.length > 0) { + nativeConfig.expandPids = this.spAllocations!.expandPids; + } let nativePluginConfig: ProfilerPluginConfig = { pluginName: 'nativehook', sampleInterval: reportingFrequency * 1000, @@ -2310,11 +2314,14 @@ export class SpRecordTrace extends BaseElement { return fpsPlugin; } - private createHiSystemEventPluginConfig(domainName: string, eventName: string): ProfilerPluginConfig { + private createHiSystemEventPluginConfig( + domainName: string, + eventName: string + ): ProfilerPluginConfig { let hiSystemEventConfig: HiSystemEventConfig = { msg: 'hisysevent-plugin', - subscribe_domain : domainName, - subscribe_event : eventName, + subscribe_domain: domainName, + subscribe_event: eventName, }; let hiSystemEventPlugin: ProfilerPluginConfig = { pluginName: 'hisysevent-plugin', diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 1ab5d8b8e..872a2644a 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -2627,7 +2627,7 @@ export class SpSystemTrace extends BaseElement { this.scrollToProcess(`${d.cpu}`, '', 'cpu-data', true); let cpuRow = this.queryAllTraceRow>( `trace-row[row-id='${d.cpu}'][row-type='cpu-data']`, - (row) => row.rowId === d.cpu && row.rowType === 'cpu-data' + (row) => row.rowId === `${d.cpu}` && row.rowType === 'cpu-data' )[0]; let findEntry = cpuRow!.dataList!.find((dat: any) => dat.startTime === d.startTime); if ( @@ -2709,7 +2709,7 @@ export class SpSystemTrace extends BaseElement { this.observerScrollHeightEnable = true; let threadRow = this.queryAllTraceRow>( `trace-row[row-id='${d.tid}'][row-type='thread']`, - (row) => row.rowId === d.tid && row.rowType === 'thread' + (row) => row.rowId === `${d.tid}` && row.rowType === 'thread' )[0]; let task = () => { if (threadRow) { @@ -3685,6 +3685,7 @@ export class SpSystemTrace extends BaseElement { window.subscribe(window.SmartEvent.UI.ProcessSwitch, (data) => { this.traceSheetEL?.updateRangeSelect(data); }); + window.subscribe(window.SmartEvent.UI.HoverNull, () => this.hoverStructNull()); } favoriteAreaSearchHandler(row: TraceRow): void { diff --git a/ide/src/trace/component/chart/FrameChart.ts b/ide/src/trace/component/chart/FrameChart.ts index 1b4779108..846be28d9 100644 --- a/ide/src/trace/component/chart/FrameChart.ts +++ b/ide/src/trace/component/chart/FrameChart.ts @@ -799,19 +799,8 @@ export class FrameChart extends BaseElement { Lib: ${hoverNode?.lib}
    Addr: ${hoverNode?.addr}
    - Duration: ${duration} (${percent}%)`; - if (threadPercent) { - this.hintContent += ` -
    - % in current Thread: ${threadPercent}%`; - } - if (processPercent) { - this.hintContent += ` -
    - % in current Process: ${processPercent}%`; - } - this.hintContent += `
    - % in all Process: ${percent}%`; + Duration: ${duration}`; + break; case ChartMode.EventCount: case ChartMode.Count: @@ -824,41 +813,35 @@ export class FrameChart extends BaseElement { Addr: ${hoverNode?.addr}
    ${label}: ${count}`; - if (threadPercent) { - this.hintContent += ` -
    - % in current Thread: ${threadPercent}%`; - } - if (processPercent) { - this.hintContent += ` -
    - % in current Process: ${processPercent}%`; - } - this.hintContent += `
    - % in all Process: ${percent}%`; break; } - } - - private getCurrentPercentOfThread(node: ChartStruct): string { - const threadNode = this.findCurrentNodeThread(node); - if (threadNode) { - return ((this.getNodeValue(node) / this.getNodeValue(threadNode)) * 100).toFixed(2); + if (this.mode != ChartMode.Byte) { + if (threadPercent) { + this.hintContent += ` +
    + % in current Thread: ${threadPercent}%`; + } + if (processPercent) { + this.hintContent += ` +
    + % in current Process: ${processPercent}%`; + } + this.hintContent += `
    + % in all Process: ${percent}%`; } - return ''; } - private getCurrentPercentOfProcess(node: ChartStruct): string { - const processNode = this.findCurrentNodeProcess(node); - if (processNode) { - return ((this.getNodeValue(node) / this.getNodeValue(processNode)) * 100).toFixed(2); + private getCurrentPercent(node: ChartStruct, isThread: boolean): string { + const parentNode = this.findCurrentNode(node, isThread); + if (parentNode) { + return ((this.getNodeValue(node) / this.getNodeValue(parentNode)) * 100).toFixed(2); } return ''; } - private findCurrentNodeThread(node: ChartStruct): ChartStruct | null { + private findCurrentNode(node: ChartStruct, isThread: boolean): ChartStruct | null { while (node.parent) { - if (node.parent.isThread) { + if ((isThread && node.parent.isThread) || (!isThread && node.parent.isProcess)) { return node.parent; } node = node.parent; @@ -866,14 +849,12 @@ export class FrameChart extends BaseElement { return null; } - private findCurrentNodeProcess(node: ChartStruct): ChartStruct | null { - while (node.parent) { - if (node.parent.isProcess) { - return node.parent; - } - node = node.parent; - } - return null; + private getCurrentPercentOfThread(node: ChartStruct): string { + return this.getCurrentPercent(node, true); + } + + private getCurrentPercentOfProcess(node: ChartStruct): string { + return this.getCurrentPercent(node, false); } /** diff --git a/ide/src/trace/component/chart/SpHiPerf.ts b/ide/src/trace/component/chart/SpHiPerf.ts index e5f4562f2..f8ca15bf9 100644 --- a/ide/src/trace/component/chart/SpHiPerf.ts +++ b/ide/src/trace/component/chart/SpHiPerf.ts @@ -61,12 +61,10 @@ export class SpHiPerf { private group: any; private rowList: TraceRow[] | undefined; private eventTypeList: Array<{ id: number; report: string }> = []; - private allCombineDataMap = new Map(); private callChartType: number = 0; private callChartId: number = 0; private eventTypeId: number = -2; - - public threadDataList: any = []; + private stackChartMaxDepth: number = 1; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -79,9 +77,6 @@ export class SpHiPerf { this.perfThreads = await queryPerfThread(); info('PerfThread Data size is: ', this.perfThreads!.length); this.group = Utils.groupBy(this.perfThreads || [], 'pid'); - Reflect.ownKeys(this.group).forEach((v, i) => { - this.threadDataList.push((this.group[v] as Array).filter((item: any) => { return item.pid === item.tid })[0]) - }) this.cpuData = await queryHiPerfCpuMergeData2(); this.callChartType = 0; this.callChartId = 0; @@ -202,7 +197,6 @@ export class SpHiPerf { this.trace.rowsEL?.appendChild(row); } - // callchartӾ async initCallChart() { let perfCallCutRow = TraceRow.skeleton(); perfCallCutRow.rowId = `HiPerf-callchart`; @@ -244,10 +238,9 @@ export class SpHiPerf { perfCallCutRow.findHoverStruct = () => { HiPerfCallChartStruct.hoverPerfCallCutStruct = perfCallCutRow.getHoverStruct(); }; - await this.setCallTotalRow(perfCallCutRow, this.cpuData, this.threadDataList); + await this.setCallTotalRow(perfCallCutRow, this.cpuData, this.perfThreads); } - // callchartѡť async setCallTotalRow(row: TraceRow, cpuData: any = Array, threadData: any = Array) { row.addTemplateTypes('hiperf-callchart'); row.rowSetting = 'enable'; @@ -521,21 +514,12 @@ export class SpHiPerf { async getHiPerfChartData(type: number, id: number, eventTypeId: number, row: TraceRow) { let source: Array = []; + this.stackChartMaxDepth = 1; await new Promise((resolve) => { procedurePool.submitWithName('logic0', 'perf-callstack-chart', [type, id, eventTypeId], undefined, (res: any) => { this.onlyOneSampleHandler(res); this.getAllCombineData(res, source); - this.allCombineDataMap = new Map(); - for (let data of source) { - this.allCombineDataMap.set(data.id, data); - } - let max = 1; - for (let i = 0; i < source.length; i++) { - if (source[i].depth > max) { - max = source[i].depth - } - } - let maxHeight = max * 20; + let maxHeight = this.stackChartMaxDepth * 20; row.funcMaxHeight = maxHeight; if (row.funcExpand) { row!.style.height = `${maxHeight}px`; @@ -560,6 +544,9 @@ export class SpHiPerf { if (data.name != 'name') { allCombineData.push(data); } + if (data.depth + 1 > this.stackChartMaxDepth) { + this.stackChartMaxDepth = data.depth + 1; + } if (data.children && data.children.length > 0) { this.getAllCombineData(data.children, allCombineData); } diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts index a3d187303..a1728abcf 100644 --- a/ide/src/trace/component/setting/SpAllocations.ts +++ b/ide/src/trace/component/setting/SpAllocations.ts @@ -15,20 +15,17 @@ import { BaseElement, element } from '../../../base-ui/BaseElement.js'; import { log } from '../../../log/Log.js'; -import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js'; -import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; -import '../../../base-ui/select/LitAllocationSelect.js'; import { SpApplication } from '../../SpApplication.js'; import { LitSearch } from '../trace/search/Search.js'; import { SpRecordTrace } from '../SpRecordTrace.js'; import { Cmd } from '../../../command/Cmd.js'; -import { CmdConstant } from '../../../command/CmdConstant.js'; import LitSwitch from '../../../base-ui/switch/lit-switch.js'; -import { LitSlider } from '../../../base-ui/slider/LitSlider'; +import { LitSlider } from '../../../base-ui/slider/LitSlider.js'; +import { LitSelectV } from '../../../base-ui/select/LitSelectV.js'; @element('sp-allocations') export class SpAllocations extends BaseElement { - private processId: LitAllocationSelect | null | undefined; + private processId: LitSelectV | null | undefined; private unwindEL: HTMLInputElement | null | undefined; private shareMemory: HTMLInputElement | null | undefined; private shareMemoryUnit: HTMLSelectElement | null | undefined; @@ -121,7 +118,7 @@ export class SpAllocations extends BaseElement { if (this.recordStatisticsResult?.hasAttribute('percentValue')) { return Number(this.recordStatisticsResult?.getAttribute('percentValue')); } - return 3600; + return 10; } get startup_mode(): boolean { @@ -132,6 +129,18 @@ export class SpAllocations extends BaseElement { return false; } + get expandPids(): number[] { + let allPidList: number[] = []; + if (this.processId?.value.length > 0) { + let result = this.processId?.value.match(/\((.+?)\)/g); + result?.forEach((pid: string) => { + let currentPid = pid!.replace('(', '').replace(')', ''); + allPidList.push(Number(currentPid)); + }); + } + return allPidList; + } + connectedCallback() { this.unwindEL?.addEventListener('keydown', this.handleInputChange); this.shareMemory?.addEventListener('keydown', this.handleInputChange); @@ -160,29 +169,19 @@ export class SpAllocations extends BaseElement { ev.preventDefault(); } }); - this.processId = this.shadowRoot?.getElementById('pid') as LitAllocationSelect; - let process = this.processId.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; - let sp = document.querySelector('sp-application') as SpApplication; - let litSearch = sp?.shadowRoot?.querySelector('#lit-record-search') as LitSearch; - let allocationProcessData: Array = []; - process.addEventListener('mousedown', (ev) => { - if (SpRecordTrace.serialNumber === '') { - this.processId!.processData = []; - } - }); - process.addEventListener('valuable', (ev) => { - this.dispatchEvent(new CustomEvent('addProbe', {})); - }); - process.addEventListener('inputClick', () => { - allocationProcessData = []; - if (this.startup_mode) { - this.processId!.processData = []; - return; - } - if (SpRecordTrace.serialNumber != '') { + this.processId = this.shadowRoot?.getElementById('pid') as LitSelectV; + let process = this.processId.shadowRoot?.querySelector('input') as HTMLInputElement; + process!.addEventListener('mousedown', (ev) => { + process.readOnly = true; + if (this.startSamp && (SpRecordTrace.serialNumber === '' || this.startup_mode)) { + process.readOnly = false; + this.processId?.dataSource([], ''); + } else { Cmd.getProcess().then((processList) => { - this.processId!.processData = processList; - this.processId!.initData(); + this.processId?.dataSource(processList, ''); + if (processList.length > 0) { + this.processId?.dataSource(processList, 'ALL-Process'); + } }); } }); @@ -321,12 +320,11 @@ export class SpAllocations extends BaseElement { }); }); this.startupMode.addEventListener('change', (evt) => { + process.value = ''; if (this.startup_mode) { - this.processId!.value = ''; - this.processId!.placeholder = 'please input process'; + process!.placeholder = 'please input process'; } else { - this.processId!.value = ''; - this.processId!.placeholder = 'please select process'; + process!.placeholder = 'please select process'; } }); @@ -589,8 +587,8 @@ export class SpAllocations extends BaseElement {
    ProcessId or ProcessName Record process - - + +
    Max unwind level diff --git a/ide/src/trace/component/setting/SpHisysEvent.ts b/ide/src/trace/component/setting/SpHisysEvent.ts index 0bd437b5b..ec1a397ae 100644 --- a/ide/src/trace/component/setting/SpHisysEvent.ts +++ b/ide/src/trace/component/setting/SpHisysEvent.ts @@ -29,7 +29,7 @@ export class SpHisysEvent extends BaseElement { private sysEventSwitch: LitSwitch | undefined | null; private domainInputEl: HTMLInputElement | undefined | null; private nameInputEl: HTMLInputElement | undefined | null; - private eventConfig: unknown = {}; + private eventConfig: any = {}; set startSamp(start: boolean) { if (start) { diff --git a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts index e6f458fd2..cc1a5eb42 100644 --- a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts +++ b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts @@ -857,7 +857,7 @@ export enum Level { } export interface NativeHookConfig { - pid: number; + pid?: number; saveFile: boolean; fileName: string; filterSize: number; @@ -872,6 +872,7 @@ export interface NativeHookConfig { callframeCompress?: boolean; startupMode?: boolean; statisticsInterval?: number; + expandPids?: number[]; } export interface FpsConfig { diff --git a/ide/src/trace/component/trace/TimerShaftElement.ts b/ide/src/trace/component/trace/TimerShaftElement.ts index cc618b7c1..04d232573 100644 --- a/ide/src/trace/component/trace/TimerShaftElement.ts +++ b/ide/src/trace/component/trace/TimerShaftElement.ts @@ -27,12 +27,18 @@ import { type SpSystemTrace, CurrentSlicesTime } from '../SpSystemTrace.js'; import './timer-shaft/CollapseButton.js'; //随机生成十六位进制颜色 export function randomRgbColor() { - const letters = '0123456789ABCDEF'; - let color = '#'; - for (let index = 0; index < 6; index++) { - color += letters[Math.floor(Math.random() * 16)]; + let r = Math.floor(Math.random() * 255); + let g = Math.floor(Math.random() * 255); + let b = Math.floor(Math.random() * 255); + if (r * 0.299 + g * 0.587 + b * 0.114 < 192) { + let r16 = r.toString(16).length === 1 && r.toString(16) <= 'f' ? 0 + r.toString(16) : r.toString(16); + let g16 = g.toString(16).length === 1 && g.toString(16) <= 'f' ? 0 + g.toString(16) : g.toString(16); + let b16 = b.toString(16).length === 1 && b.toString(16) <= 'f' ? 0 + b.toString(16) : b.toString(16); + let color = '#' + r16 + g16 + b16; + return color; + } else { + randomRgbColor(); } - return color; } export function ns2s(ns: number): string { @@ -376,7 +382,7 @@ export class TimerShaftElement extends BaseElement { this._rangeRuler?.keyUp(ev); }; - disconnectedCallback(): void { } + disconnectedCallback(): void {} firstRender = true; diff --git a/ide/src/trace/component/trace/base/Extension.ts b/ide/src/trace/component/trace/base/Extension.ts index ac74308db..2dabde13d 100644 --- a/ide/src/trace/component/trace/base/Extension.ts +++ b/ide/src/trace/component/trace/base/Extension.ts @@ -58,7 +58,8 @@ declare global { WakeupList: string; //show wakeup list table DeviceConnect: string; DeviceDisConnect: string; - ProcessSwitch: string + ProcessSwitch: string; + HoverNull: string; }; }; @@ -114,7 +115,8 @@ window.SmartEvent = { WakeupList: 'SmartEvent-UI-WakeupList', DeviceConnect: 'SmartEvent-DEVICE_CONNECT', DeviceDisConnect: 'SmartEvent-DEVICE_DISCONNECT', - ProcessSwitch: 'SmartEvent-Process_Switch' + ProcessSwitch: 'SmartEvent-Process_Switch', + HoverNull: 'SmartEvent-Hover-NULL', }, }; Window.prototype.subscribe = (ev, fn) => EventCenter.subscribe(ev, fn); diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index 48fbca70e..175356107 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -691,6 +691,9 @@ export class TraceRow extends HTMLElement { this.onRowSettingChangeHandler?.(this.rowSettingTree!.getCheckdKeys(), this.rowSettingTree!.getCheckdNodes()); }; this.checkType = '-1'; + this.rowSettingPop?.addEventListener('mouseenter', (e) => { + window.publish(window.SmartEvent.UI.HoverNull, undefined); + }); } getRowSettingKeys() : Array { diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts index 323b686c8..ff0f3522d 100644 --- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts +++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts @@ -633,12 +633,12 @@ export let tabConfig: any = { 'tabpane-frequsage': { title: 'Freq Usage', type: TabPaneFreqUsage, - require: (param: SelectionParam) => param.threadIds.length > 0 && param.threadIds.length < 2, + require: (param: SelectionParam) => param.threadIds.length > 0, }, 'tabpane-freqdatacut': { title: 'Freq DataCut', type: TabPaneFreqDataCut, - require: (param: SelectionParam) => param.threadIds.length > 0 && param.threadIds.length < 2, + require: (param: SelectionParam) => param.threadIds.length > 0, }, 'tab-hisysevents': { title: 'HiSysevents', diff --git a/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts b/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts index 2306d1da1..44069d6cf 100644 --- a/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts +++ b/ide/src/trace/component/trace/sheet/cpu/TabPaneFrequencySample.ts @@ -322,7 +322,7 @@ export class TabPaneFrequencySample extends BaseElement { - + `; diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts index bbd9b1230..d6aed17fe 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts @@ -23,7 +23,7 @@ import { FilterData, TabPaneFilter } from '../TabPaneFilter.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { MerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; import { showButtonMenu } from '../SheetUtils.js'; -import { CallTreeLevel } from '../../../../bean/EbpfStruct.js'; +import { CallTreeLevelStruct } from '../../../../bean/EbpfStruct.js'; import '../../../../../base-ui/headline/lit-headline.js'; import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline.js'; @@ -61,7 +61,7 @@ export class TabPaneCallTree extends BaseElement { private _cWidth: number = 0; private _currentCallTreeLevel: number = 0; private _rowClickData: any = undefined; - private callTreeLevel: CallTreeLevel | undefined | null; + private callTreeLevel: CallTreeLevelStruct | undefined | null; private headLine: LitHeadLine | null | undefined; set pieTitle(value: string) { @@ -155,7 +155,7 @@ export class TabPaneCallTree extends BaseElement { * 根据Analysis Tab饼图跳转过来的层级绘制对应的CallTree Tab火焰图和表格 */ private getCallTreeDataByPieLevel(): void { - this.callTreeLevel = new CallTreeLevel(); + this.callTreeLevel = new CallTreeLevelStruct(); this.callTreeLevel = { processId: this._rowClickData.pid, threadId: this._rowClickData.tid, @@ -169,13 +169,13 @@ export class TabPaneCallTree extends BaseElement { funcArgs: [this.currentSelection, this.callTreeLevel], }); - if (this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) { + if (this._rowClickData && this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) { this.callTreeLevel.libName = this._rowClickData.tableName; args.push({ funcName: 'showLibLevelData', funcArgs: [this.callTreeLevel.libId, this.callTreeLevel.libName], }); - } else if (this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === 4) { + } else if (this._rowClickData && this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === 4) { this.callTreeLevel.symbolName = this._rowClickData.tableName; args.push({ funcName: 'showFunLevelData', @@ -631,12 +631,12 @@ export class TabPaneCallTree extends BaseElement { funcName: 'resetAllNode', funcArgs: [], }); - if (this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) { + if (this._rowClickData && this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) { callTreeArgs.push({ funcName: 'showLibLevelData', funcArgs: [this.callTreeLevel!.libId, this.callTreeLevel!.libName], }); - } else if (this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === 4) { + } else if (this._rowClickData && this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === 4) { callTreeArgs.push({ funcName: 'showFunLevelData', funcArgs: [this.callTreeLevel!.symbolId, this.callTreeLevel!.symbolName], diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts index dd0f5d190..88214d753 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts @@ -25,7 +25,7 @@ import '../TabPaneFilter.js'; import { procedurePool } from '../../../../database/Procedure.js'; import { FileMerageBean } from '../../../../database/logic-worker/ProcedureLogicWorkerFileSystem.js'; import { showButtonMenu } from '../SheetUtils.js'; -import { CallTreeLevel } from '../../../../bean/EbpfStruct.js'; +import { CallTreeLevelStruct } from '../../../../bean/EbpfStruct.js'; import '../../../../../base-ui/headline/lit-headline.js'; import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline.js'; @@ -61,7 +61,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { private _cWidth: number = 0; private _currentFsCallTreeLevel: number = 0; private _fsRowClickData: any = undefined; - private FsCallTreeLevel: CallTreeLevel | undefined | null; + private FsCallTreeLevel: CallTreeLevelStruct | undefined | null; private headLine: LitHeadLine | null | undefined; set pieTitle(value: string) { @@ -154,7 +154,7 @@ export class TabpaneFilesystemCalltree extends BaseElement { * 根据Analysis Tab饼图跳转过来的层级绘制对应的CallTree Tab火焰图和表格 */ private getFsCallTreeDataByPieLevel(): void { - this.FsCallTreeLevel = new CallTreeLevel(); + this.FsCallTreeLevel = new CallTreeLevelStruct(); this.FsCallTreeLevel = { processId: this._fsRowClickData.pid, threadId: this._fsRowClickData.tid, @@ -168,13 +168,13 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcArgs: [this.currentSelection, this.FsCallTreeLevel], }); - if (this._fsRowClickData.libId !== undefined && this._currentFsCallTreeLevel === 3) { + if (this._fsRowClickData && this._fsRowClickData.libId !== undefined && this._currentFsCallTreeLevel === 3) { this.FsCallTreeLevel.libName = this._fsRowClickData.tableName; args.push({ funcName: 'showLibLevelData', funcArgs: [this.FsCallTreeLevel.libId, this.FsCallTreeLevel.libName], }); - } else if (this._fsRowClickData.symbolId !== undefined && this._currentFsCallTreeLevel === 4) { + } else if (this._fsRowClickData && this._fsRowClickData.symbolId !== undefined && this._currentFsCallTreeLevel === 4) { this.FsCallTreeLevel.symbolName = this._fsRowClickData.tableName; args.push({ funcName: 'showFunLevelData', diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts index cab397864..677b27a3f 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.ts @@ -689,14 +689,14 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { let analysisPidDataDur = 0; let pName = ''; for (let fileSysStatPidItem of value) { - if (fileSysStatPidItem.fsProcessName && fileSysStatPidItem.fsProcessName.length > 0) { - if (!fileSysStatPidItem.fsProcessName.endsWith(`(${fileSysStatPidItem.pid})`)) { - fileSysStatPidItem.fsProcessName = `${fileSysStatPidItem.fsProcessName}(${fileSysStatPidItem.pid})`; + if (fileSysStatPidItem.processName && fileSysStatPidItem.processName.length > 0) { + if (!fileSysStatPidItem.processName.endsWith(`(${fileSysStatPidItem.pid})`)) { + fileSysStatPidItem.processName = `${fileSysStatPidItem.processName}(${fileSysStatPidItem.pid})`; } } else { - fileSysStatPidItem.fsProcessName = `Process(${fileSysStatPidItem.pid})`; + fileSysStatPidItem.processName = `Process(${fileSysStatPidItem.pid})`; } - pName = fileSysStatPidItem.fsProcessName; + pName = fileSysStatPidItem.processName; analysisPidDataDur += fileSysStatPidItem.dur; } this.fileStatisticsAnalysisPidData.push({ @@ -789,11 +789,10 @@ export class TabPaneFilesystemStatisticsAnalysis extends BaseElement { let tName = ''; for (let fileSysStatThreadItem of value) { dur += fileSysStatThreadItem.dur; - tName = fileSysStatThreadItem.fileStatisticsAnalysisThreadName = - fileSysStatThreadItem.fileStatisticsAnalysisThreadName === null || - fileSysStatThreadItem.fileStatisticsAnalysisThreadName === undefined + tName = fileSysStatThreadItem.threadName = + fileSysStatThreadItem.threadName === null || fileSysStatThreadItem.threadName === undefined ? `Thread(${fileSysStatThreadItem.tid})` - : `${fileSysStatThreadItem.fileStatisticsAnalysisThreadName}`; + : `${fileSysStatThreadItem.threadName}`; } const threadData = { tableName: tName, diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts index 8c0d59234..db1c38819 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.ts @@ -682,14 +682,14 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { let vmPidDataDur = 0; let pName = ''; for (let item of value) { - if (item.vmProcessName && item.vmProcessName.length > 0) { - if (!item.vmProcessName.endsWith(`(${item.pid})`)) { - item.vmProcessName = `${item.vmProcessName}(${item.pid})`; + if (item.processName && item.processName.length > 0) { + if (!item.processName.endsWith(`(${item.pid})`)) { + item.processName = `${item.processName}(${item.pid})`; } } else { - item.vmProcessName = `Process(${item.pid})`; + item.processName = `Process(${item.pid})`; } - pName = item.vmProcessName; + pName = item.processName; vmPidDataDur += item.dur; } this.vmStatisticsAnalysisPidData.push({ @@ -782,10 +782,10 @@ export class TabPaneVirtualMemoryStatisticsAnalysis extends BaseElement { let tName = ''; for (let item of value) { vmThreadDur += item.dur; - tName = item.vmThreadName = - item.vmThreadName === null || item.vmThreadName === undefined + tName = item.threadName = + item.threadName === null || item.threadName === undefined ? `Thread(${item.tid})` - : `${item.vmThreadName}`; + : `${item.threadName}`; } const threadData = { tableName: tName, diff --git a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts index 0f3c712f8..fef2afeeb 100644 --- a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts +++ b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.ts @@ -14,209 +14,167 @@ */ import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; -import { LitTable } from '../../../../../base-ui/table/lit-table'; +import { LitTable, RedrawTreeForm } from '../../../../../base-ui/table/lit-table.js'; import { SelectionData, SelectionParam } from '../../../../bean/BoxSelection'; -import '../../../StackBar.js'; -import { - getTabRunningPercent, - querySearchFuncData, - queryCpuFreqUsageData, - queryCpuFreqFilterId, -} from '../../../../database/SqlLite.js'; +import '../../../StackBar.js' +import { getTabRunningPercent, querySearchFuncData, queryCpuFreqUsageData, queryCpuFreqFilterId } from '../../../../database/SqlLite.js'; import { Utils } from '../../base/Utils.js'; -import { log } from '../../../../../log/Log.js'; import { resizeObserver } from '../SheetUtils.js'; +import { SliceGroup } from '../../../../bean/StateProcessThread.js'; @element('tabpane-freqdatacut') export class TabPaneFreqDataCut extends BaseElement { - private threadStatesTbl: LitTable | null | undefined; - private threadStatesTblSource: Array = []; - private currentSelectionParam: SelectionParam | any; - private threadStatesDIV: Element | null | undefined; - private initData: Array = []; + private threadStatesTbl: LitTable | null | undefined; + private threadStatesTblSource: Array = []; + private currentSelectionParam: SelectionParam | any; + private threadStatesDIV: Element | null | undefined; + private initData: any = new Map(); + private processArr: any = new Array(); + private threadArr: any = new Array(); + private originData: any = new Array(); - set data(threadStatesParam: SelectionParam | any) { - if (this.currentSelectionParam === threadStatesParam) { - return; - } - this.currentSelectionParam = threadStatesParam; - this.threadStatesTblSource = []; - this.threadStatesTbl!.recycleDataSource = []; - let tableValue: any = this.threadStatesTbl; - tableValue.value = []; - let divRoot1: any = this.shadowRoot?.querySelector('#dataCutThreadId'); - divRoot1.value = ''; - let divRoot2: any = this.shadowRoot?.querySelector('#dataCutThreadFunc'); - divRoot2.value = ''; - getTabRunningPercent(threadStatesParam.threadIds, threadStatesParam.leftNs, threadStatesParam.rightNs).then( - (result) => { - queryCpuFreqFilterId().then((r) => { - let IdMap = new Map(); - let queryId = new Array(); - for (let i = 0; i < r.length; i++) { - queryId.push(r[i].id); - IdMap.set(r[i].id, r[i].cpu); - } - queryCpuFreqUsageData(queryId).then((res) => { - if (result != null && result.length > 0) { - log('getTabRunningPercent result size : ' + result.length); - let sum = 0; - let dealArr = new Array(); - for (let i of res) { - dealArr.push({ - startNS: i.startNS + threadStatesParam.recordStartNs, - dur: i.dur, - value: i.value, - cpu: IdMap.get(i.filter_id), - }); - } - let targetList = new Array(); - let cpuArr = new Array(); - let finalResultArr = new Array(); - finalResultArr.push({ - thread: '', - count: 0, - cpu: '', - freq: '', - dur: 0, - percent: '100.00', - state: 'Running', - children: new Array(), - }); - for (let e of result) { - if (threadStatesParam.processIds.includes(e.pid) && e.state == 'Running') { - let process = Utils.PROCESS_MAP.get(e.pid); - let thread = Utils.THREAD_MAP.get(e.tid); - e.process = process == null || process.length == 0 ? '[NULL]' : process; - e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread; - e.stateJX = e.state; - e.state = Utils.getEndState(e.stateJX); - sum += e.dur; - targetList.push(e); - if (!cpuArr.includes(e.cpu)) { - cpuArr.push(e.cpu); - finalResultArr[0].thread = - finalResultArr[0].thread == '' ? e.tid + '_' + e.thread : finalResultArr[0].thread; - finalResultArr[0].children.push({ - thread: e.tid + '_' + e.thread, - count: 0, - cpu: e.cpu, - freq: '', - dur: 0, - percent: 0, - state: 'Running', - children: new Array(), - }); - } + set data(threadStatesParam: SelectionParam | any) { + if (this.currentSelectionParam === threadStatesParam) { + return; + } + this.currentSelectionParam = threadStatesParam; + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + this.threadStatesTbl!.loading = true; + this.initData = new Map(); + this.originData = new Array(); + let tableValue: any = this.threadStatesTbl; + tableValue.value = []; + let divRoot1: any = this.shadowRoot?.querySelector('#dataCutThreadId'); + divRoot1.value = ''; + let divRoot2: any = this.shadowRoot?.querySelector('#dataCutThreadFunc'); + divRoot2.value = ''; + // 查询running状态线程数据 + getTabRunningPercent(threadStatesParam.threadIds, threadStatesParam.leftNs, threadStatesParam.rightNs).then((result) => { + // 查询cpu及id信息 + queryCpuFreqFilterId().then(r => { + // 以键值对形式将cpu及id进行对应，后续会将频点数据与其对应cpu进行整合 + let IdMap = new Map(); + let queryId = new Array(); + for (let i = 0; i < r.length; i++) { + queryId.push(r[i].id); + IdMap.set(r[i].id, r[i].cpu); } - } - // 用来存放数据切割之前的汇总数据 - let resultList = new Array(); - // 通过循环获取每个running状态线程的相关信息，此处或许可以进行算法优化 - const tsMutiple = 1000000000; - for (let i = 0; i < targetList.length; i++) { - for (let j = 0; j < dealArr.length; j++) { - if (targetList[i].cpu == dealArr[j].cpu) { - if (targetList[i].ts > dealArr[j].startNS) { - if (targetList[i].ts < dealArr[j].startNS + dealArr[j].dur) { - if (targetList[i].dur < dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: (dealArr[j].value * targetList[i].dur) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: targetList[i].dur, - percent: (targetList[i].dur / sum) * 100, - state: 'Running', - ts: targetList[i].ts / tsMutiple, - }); - break; - } else { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: (dealArr[j].value * (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts)) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: dealArr[j].startNS + dealArr[j].dur - targetList[i].ts, - percent: ((dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) / sum) * 100, - state: 'Running', - ts: targetList[i].ts / tsMutiple, - }); + // 通过id去查询频点数据 + queryCpuFreqUsageData(queryId).then((res) => { + if (result != null && result.length > 0) { + let sum = 0; + let dealArr = new Array(); + for (let i of res) { + dealArr.push({ 'startNS': i.startNS + threadStatesParam.recordStartNs, 'dur': i.dur, 'value': i.value, 'cpu': IdMap.get(i.filter_id) }); } - } + let needDeal = new Map(); + let cpuMap = new Map(); + let pidArr = new Array(); + let threadArr = new Array(); + // 整理进程级的数组信息 + let processArr:any = threadStatesParam.processIds.length > 1 ? [...new Set(threadStatesParam.processIds)] : threadStatesParam.processIds; + for (let i of processArr) { + pidArr.push({ 'process': Utils.PROCESS_MAP.get(i) == null ? 'Process ' + i : Utils.PROCESS_MAP.get(i) + ' ' + i, 'thread': Utils.PROCESS_MAP.get(i) == null ? 'Process ' + i : Utils.PROCESS_MAP.get(i) + ' ' + i, 'pid': i, 'tid': '', 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + } + // 拷贝给私有属性，以便后续进行数据切割时免除整理进程层级数据 + this.processArr = JSON.parse(JSON.stringify(pidArr)); + for (let e of result) { + if (processArr.includes(e.pid) && e.state == 'Running') { + if (needDeal.get(e.pid + '_' + e.tid) == undefined) { + threadArr.push({ 'process': Utils.PROCESS_MAP.get(e.pid) == null ? 'Process ' + e.pid : Utils.PROCESS_MAP.get(e.pid) + ' ' + e.pid, 'thread': Utils.THREAD_MAP.get(e.tid) + ' ' + e.tid, 'pid': e.pid, 'tid': e.tid, 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + needDeal.set(e.pid + '_' + e.tid, new Array()); + } + let arr = needDeal.get(e.pid + '_' + e.tid); + let process = Utils.PROCESS_MAP.get(e.pid); + let thread = Utils.THREAD_MAP.get(e.tid); + e.process = process == null || process.length == 0 ? '[NULL]' : process; + e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread; + e.stateJX = e.state; + e.state = Utils.getEndState(e.stateJX); + sum += e.dur; + arr.push(e); + } + } + // 拷贝给私有属性，以便后续进行数据切割时免除整理线程层级数据 + this.threadArr = JSON.parse(JSON.stringify(threadArr)); + // 整理running线程数据、cpu层级信息 + this.mergeFreqData(needDeal, cpuMap, dealArr, sum, threadStatesParam); + // 将频点数据放置到对应cpu层级下 + this.mergeCpuData(cpuMap, needDeal); + // 将cpu层级数据放置到线程分组下 + this.mergeThreadData(threadArr, cpuMap); + // 原始数据拷贝一份，后续切割后可以放置在对应的周期前以供查看 + this.originData = JSON.parse(JSON.stringify(threadArr)); + // 将线程层级数据放置到进程级分组下 + this.mergePidData(pidArr, threadArr); + this.threadClick(pidArr); + this.threadStatesTbl!.loading = false; } else { - if (targetList[i].ts + targetList[i].dur > dealArr[j].startNS) { - if (targetList[i].dur + targetList[i].ts - dealArr[j].startNS < dealArr[j].dur) { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: - (dealArr[j].value * (targetList[i].dur + targetList[i].ts - dealArr[j].startNS)) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: targetList[i].dur + targetList[i].ts - dealArr[j].startNS, - percent: ((targetList[i].dur + targetList[i].ts - dealArr[j].startNS) / sum) * 100, - state: 'Running', - ts: dealArr[j].startNS / tsMutiple, - }); - break; - } else { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: (dealArr[j].value * dealArr[j].dur) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: dealArr[j].dur, - percent: (dealArr[j].dur / sum) * 100, - state: 'Running', - ts: dealArr[j].startNS / tsMutiple, - }); + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + this.threadStatesTbl!.loading = false; + } + }) + }); + }) + } + private threadClick(data: Array) { + let labels = this.threadStatesTbl?.shadowRoot?.querySelector('.th > .td')!.querySelectorAll('label'); + if (labels) { + for (let i = 0; i < labels.length; i++) { + let label = labels[i].innerHTML; + labels[i].addEventListener('click', (e) => { + if (label.includes('Process') && i === 0) { + this.threadStatesTbl!.setStatus(data, false); + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Retract); + } else if (label.includes('Thread') && i === 1) { + for (let item of data) { + item.status = true; + if (item.children != undefined && item.children.length > 0) { + this.threadStatesTbl!.setStatus(item.children, false); + } } - } else { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: 0, - cpu: targetList[i].cpu, - freq: 'unknown', - dur: targetList[i].dur, - percent: (targetList[i].dur / sum) * 100, - state: 'Running', - ts: targetList[i].ts / tsMutiple, - }); - break; - } + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Retract); + } else if (label.includes('Cycle') && i === 2) { + for (let item of data) { + item.status = true; + for (let value of item.children ? item.children : []) { + value.status = true; + if (value.children != undefined && value.children.length > 0) { + this.threadStatesTbl!.setStatus(value.children, false); + } + } + } + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Retract); + } else if (label.includes('CPU') && i === 3) { + this.threadStatesTbl!.setStatus(data, true); + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Expand); } - } - } - } - // 深拷贝，用来进行数据切割操作，避免数据污染 - this.initData = JSON.parse(JSON.stringify(resultList)); - } else { - this.threadStatesTblSource = []; - this.threadStatesTbl!.recycleDataSource = []; - this.initData = []; + }); } - }); - }); - } - ); - } - initElements(): void { - this.threadStatesTbl = this.shadowRoot?.querySelector('#tb-running-percent'); - // 暂时屏蔽列排序功能，后续增加则重写排序方法 - this.threadStatesDIV = this.shadowRoot?.querySelector('#dataCut'); - this.threadStatesDIV?.children[2].children[0].addEventListener('click', (e) => { - this.dataSingleCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); - }); - this.threadStatesDIV?.children[2].children[1].addEventListener('click', (e) => { - this.dataLoopCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); - }); - } - connectedCallback() { - super.connectedCallback(); - resizeObserver(this.parentElement!, this.threadStatesTbl!); - } - initHtml(): string { - return ` + } + } + + initElements(): void { + this.threadStatesTbl = this.shadowRoot?.querySelector('#tb-running-percent'); + // 暂时屏蔽列排序功能，后续增加则重写排序方法 + this.threadStatesDIV = this.shadowRoot?.querySelector('#dataCut'); + this.threadStatesDIV?.children[2].children[0].addEventListener('click', (e) => { + this.threadStatesTbl!.loading = true; + this.dataSingleCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); + }) + this.threadStatesDIV?.children[2].children[1].addEventListener('click', (e) => { + this.threadStatesTbl!.loading = true; + this.dataLoopCut(this.threadStatesDIV?.children[0], this.threadStatesDIV?.children[1], this.initData); + }) + } + connectedCallback() { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.threadStatesTbl!); + } + initHtml(): string { + return `
    - - + +
    - - + + - - + + @@ -269,354 +227,425 @@ export class TabPaneFreqDataCut extends BaseElement { - `; - } - dataLoopCut(threadId: any, threadFunc: any, resultList: any) { - let threadIdValue = threadId.value.trim(); - let threadFuncName = threadFunc.value.trim(); - let leftNS = this.currentSelectionParam.leftNs; - let rightNS = this.currentSelectionParam.rightNs; - let tableValue: any = this.threadStatesTbl; - tableValue.value = []; - if (/^[0-9]*$/.test(threadIdValue)) { - querySearchFuncData(threadFuncName, threadIdValue, leftNS, rightNS).then((res) => { - let displayArr = JSON.parse(JSON.stringify(resultList)); - let timeDur = this.currentSelectionParam.recordStartNs; - let cutArr = new Array(); - // 根据线程id及方法名获取的数据，处理后用作切割时间依据，时间跨度为整个方法开始时间到末个方法开始时间 - for (let i of res) { - cutArr.push({ ts: i.startTime + timeDur }); - } - // 将数据进行切割处理 - let finalArr = new Array(); - let finalResultArr = new Array(); - const tsMutiple = 1000000000; - finalResultArr.push({ - thread: displayArr[0].thread, - ts: '', - count: 0, - cpu: '', - freq: '', - dur: 0, - percent: 0, - state: 'Running', - children: new Array(), - }); - for (let i = 0; i < cutArr.length - 1; i++) { - for (let j = 0; j < displayArr.length; j++) { - displayArr[j].ts = displayArr[j].ts * tsMutiple; - if (displayArr[j].ts >= cutArr[i].ts) { - if (displayArr[j].ts + displayArr[j].dur <= cutArr[i + 1].ts) { - finalArr.push({ - thread: displayArr[j].thread, - count: (displayArr[j].freq * displayArr[j].dur) / 1000, - cpu: displayArr[j].cpu, - freq: displayArr[j].freq, - dur: displayArr[j].dur, - percent: displayArr[j].percent, - state: 'Running', - ts: (displayArr[j].ts - timeDur) / tsMutiple, - id: i, - }); - } else { - if (cutArr[i + 1].ts - displayArr[j].ts > 0) { - finalArr.push({ - thread: displayArr[j].thread, - count: (displayArr[j].freq * (cutArr[i + 1].ts - displayArr[j].ts)) / 1000, - cpu: displayArr[j].cpu, - freq: displayArr[j].freq, - dur: cutArr[i + 1].ts - displayArr[j].ts, - percent: displayArr[j].percent * ((cutArr[i + 1].ts - displayArr[j].ts) / displayArr[j].dur), - state: 'Running', - ts: (displayArr[j].ts - timeDur) / tsMutiple, - id: i, - }); - break; + ` + } + sortByColumn(treadStateDetail: any) { + function compare(property: any, treadStatesSort: any, type: any) { + return function (threadStatesLeftData: SelectionData | any, threadStatesRightData: SelectionData | any) { + if (threadStatesLeftData.process == ' ' || threadStatesRightData.process == ' ') { + return 0; } - } - } else { - if (displayArr[j].ts + displayArr[j].dur > cutArr[i + 1].ts) { - finalArr.push({ - thread: displayArr[j].thread, - count: (displayArr[j].freq * (cutArr[i + 1].ts - cutArr[i].ts)) / 1000, - cpu: displayArr[j].cpu, - freq: displayArr[j].freq, - dur: cutArr[i + 1].ts - cutArr[i].ts, - percent: displayArr[j].percent * ((cutArr[i + 1].ts - cutArr[i].ts) / displayArr[j].dur), - state: 'Running', - ts: (cutArr[i].ts - timeDur) / tsMutiple, - id: i, - }); - } - if ( - displayArr[j].ts + displayArr[j].dur > cutArr[i].ts && - displayArr[j].ts + displayArr[j].dur < cutArr[i + 1].ts - ) { - finalArr.push({ - thread: displayArr[j].thread, - count: (displayArr[j].freq * (displayArr[j].dur + displayArr[j].ts - cutArr[i].ts)) / 1000, - cpu: displayArr[j].cpu, - freq: displayArr[j].freq, - dur: displayArr[j].dur + displayArr[j].ts - cutArr[i].ts, - percent: - displayArr[j].percent * ((displayArr[j].dur + displayArr[j].ts - cutArr[i].ts) / displayArr[j].dur), - state: 'Running', - ts: (cutArr[i].ts - timeDur) / tsMutiple, - id: i, - }); - } - } - } - finalResultArr[0].children.push({ - thread: displayArr[0].thread, - ts: (cutArr[i].ts - timeDur) / tsMutiple, - count: 0, - cpu: '', - freq: '', - dur: 0, - percent: 0, - state: 'Running', - children: new Array(), - id: i, - }); + if (type === 'number') { + return treadStatesSort === 2 + ? parseFloat(threadStatesRightData[property]) - parseFloat(threadStatesLeftData[property]) + : parseFloat(threadStatesLeftData[property]) - parseFloat(threadStatesRightData[property]); + } else { + if (threadStatesRightData[property] > threadStatesLeftData[property]) { + return treadStatesSort === 2 ? 1 : -1; + } else if (threadStatesRightData[property] == threadStatesLeftData[property]) { + return 0; + } else { + return treadStatesSort === 2 ? -1 : 1; + } + } + }; } - for (let i = 0; i < finalArr.length; i++) { - for (let j = i + 1; j < finalArr.length; j++) { - if ( - finalArr[i].cpu === finalArr[j].cpu && - finalArr[i].freq === finalArr[j].freq && - finalArr[i].id === finalArr[j].id - ) { - finalArr[i].dur += finalArr[j].dur; - finalArr[i].percent += finalArr[j].percent; - finalArr[i].count += finalArr[j].count; - finalArr.splice(j, 1); - j--; - } - } - finalArr[i].percent = Number(finalArr[i].percent.toFixed(2)); + if (treadStateDetail.key === 'name' || treadStateDetail.key === 'thread' || treadStateDetail.key === 'state') { + this.threadStatesTblSource.sort(compare(treadStateDetail.key, treadStateDetail.sort, 'string')); + } else { + this.threadStatesTblSource.sort(compare(treadStateDetail.key, treadStateDetail.sort, 'number')); } - - let newArr1 = JSON.parse(JSON.stringify(finalResultArr[0])); - let newArr2 = JSON.parse(JSON.stringify(finalArr)); - let finalResult = new Array(this.mergeTree(newArr1, newArr2)); - this.threadStatesTblSource = finalResult[0].children.length > 0 ? finalResult : []; - this.threadStatesTbl!.recycleDataSource = finalResult[0].children.length > 0 ? finalResult : []; - }); - } else { - alert('请输入正确的线程ID'); + this.threadStatesTbl!.recycleDataSource = this.threadStatesTblSource; } - } - dataSingleCut(threadId: any, threadFunc: any, resultList: any) { - let threadIdValue = threadId.value.trim(); - let threadFuncName = threadFunc.value.trim(); - let leftNS = this.currentSelectionParam.leftNs; - let rightNS = this.currentSelectionParam.rightNs; - let tableValue: any = this.threadStatesTbl; - tableValue.value = []; - if (/^[0-9]*$/.test(threadIdValue)) { - querySearchFuncData(threadFuncName, threadIdValue, leftNS, rightNS).then((result) => { - let [...targetList] = JSON.parse(JSON.stringify(resultList)); - let timeDur = this.currentSelectionParam.recordStartNs; - let dealArr = new Array(); - for (let i of result) { - if (i.startTime + timeDur + i.dur < this.currentSelectionParam.rightNs + timeDur) { - dealArr.push({ ts: i.startTime + timeDur, dur: i.dur }); - } - } - let finalResultArr = new Array(); - finalResultArr.push({ - thread: targetList[0].thread, - ts: '', - count: 0, - cpu: '', - freq: '', - dur: 0, - percent: 0, - state: 'Running', - children: new Array(), - }); - let resList = new Array(); - const tsMutiple = 1000000000; - for (let i = 0; i < dealArr.length; i++) { - for (let j = 0; j < targetList.length; j++) { - targetList[j].ts = targetList[j].ts * tsMutiple; - if (dealArr[i].ts < targetList[j].ts) { - if (dealArr[i].ts + dealArr[i].dur > targetList[j].ts) { - if (dealArr[i].ts + dealArr[i].dur > targetList[j].ts + targetList[j].dur) { - resList.push({ - thread: targetList[i].thread, - ts: (targetList[j].ts - timeDur) / tsMutiple, - count: (targetList[j].freq * targetList[j].dur) / 1000, - cpu: targetList[j].cpu, - freq: targetList[j].freq, - dur: targetList[j].dur, - percent: targetList[j].percent, - state: 'Running', - id: i, - }); + // single方式切割数据功能 + dataSingleCut(threadId: any, threadFunc: any, resultList: any) { + let threadIdValue = threadId.value.trim(); + let threadFuncName = threadFunc.value.trim(); + let leftNS = this.currentSelectionParam.leftNs; + let rightNS = this.currentSelectionParam.rightNs; + let tableValue: any = this.threadStatesTbl; + tableValue.value = []; + if (/^[0-9]*$/.test(threadIdValue) && threadIdValue != '' && threadFuncName != '') { + threadId.style.border = '1px solid rgb(151,151,151)'; + threadFunc.style.border = '1px solid rgb(151,151,151)'; + // 根据用户输入的线程ID，方法名去查询数据库，得到对应的方法起始时间，持续时间等数据，以便作为依据进行后续数据切割 + querySearchFuncData(threadFuncName, Number(threadIdValue), leftNS, rightNS).then(result => { + if (result != null && result.length > 0) { + let targetMap = new Map(); + // 新创建map对象接收传过来的实参map + resultList.forEach((item: any, key: any) => { + targetMap.set(key, JSON.parse(JSON.stringify(item))); + }) + let timeDur = this.currentSelectionParam.recordStartNs; + // 周期切割依据数据整理 + let dealArr = new Array(); + for (let i of result) { + if (i.startTime + timeDur + i.dur < this.currentSelectionParam.rightNs + timeDur) { + dealArr.push({ 'ts': i.startTime + timeDur, 'dur': i.dur }); + } + } + let cycleMap = new Map(); + targetMap.forEach((item, key) => { + cycleMap.set(key, new Array()); + for (let i = 0; i < dealArr.length; i++) { + let cpuArr = new Array(); + let cpuMap = new Map(); + let resList = new Array(); + // 时间由纳秒转换为秒的倍数 + const multiple = 1000000000; + // 算力倍数值 + const countMutiple = 1000; + cpuMap.set(key, new Array()); + cycleMap.get(key).push({ 'thread': item[0].thread, 'ts': (dealArr[i].ts - timeDur) / multiple, 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + let value = JSON.parse(JSON.stringify(item)); + for (let j = 0; j < value.length; j++) { + value[j].ts = value[j].ts * multiple; + value[j].freq = value[j].freq == 'unknown'? 0 : value[j].freq; + if (!cpuArr.includes(value[j].cpu)) { + cpuArr.push(value[j].cpu); + cpuMap.get(key).push({ 'thread': value[j].thread, 'count': 0, 'cpu': value[j].cpu, 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + } + if (dealArr[i].ts < value[j].ts) { + if (dealArr[i].ts + dealArr[i].dur > value[j].ts) { + if (dealArr[i].ts + dealArr[i].dur > value[j].ts + value[j].dur) { + resList.push({ 'thread': value[j].thread, 'ts': (value[j].ts - timeDur) / multiple, 'count': (value[j].freq * value[j].dur) / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': value[j].dur, 'percent': value[j].percent, 'state': 'Running', 'id': i }); + } else { + resList.push({ 'thread': value[j].thread, 'ts': (value[j].ts - timeDur) / multiple, 'count': (dealArr[i].ts + dealArr[i].dur - value[j].ts) * value[j].freq / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': dealArr[i].ts + dealArr[i].dur - value[j].ts, 'percent': (dealArr[i].ts + dealArr[i].dur - value[j].ts) / value[j].dur * value[j].percent, 'state': 'Running', 'id': i }); + break; + } + } + } else { + if (value[j].ts + value[j].dur > dealArr[i].ts) { + if (value[j].ts + value[j].dur > dealArr[i].ts + dealArr[i].dur) { + resList.push({ 'thread': value[j].thread, 'ts': (dealArr[i].ts - timeDur) / multiple, 'count': dealArr[i].dur * value[j].freq / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': dealArr[i].dur, 'percent': dealArr[i].dur / value[j].dur * value[j].percent, 'state': 'Running', 'id': i }); + break; + } else { + resList.push({ 'thread': value[j].thread, 'ts': (dealArr[i].ts - timeDur) / multiple, 'count': (value[j].ts + value[j].dur - dealArr[i].ts) * value[j].freq / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': value[j].ts + value[j].dur - dealArr[i].ts, 'percent': (value[j].ts + value[j].dur - dealArr[i].ts) / value[j].dur * value[j].percent, 'state': 'Running', 'id': i }); + } + } + } + } + this.mergeData(resList); + resList.sort((a, b) => b.count - a.count); + cpuMap.get(key).sort((a: any, b: any) => a.cpu - b.cpu); + cpuMap.get(key).forEach((item: any) => { + for (let s = 0; s < resList.length; s++) { + if (item.cpu == resList[s].cpu) { + item.children.push(resList[s]); + item.count += resList[s].count; + item.dur += resList[s].dur; + item.percent += resList[s].percent; + } + } + item.percent = Number(item.percent.toFixed(2)); + }); + // 将cpu数据放置到对应周期层级下 + this.mergeCycleData(cycleMap.get(key)[i], cpuMap.get(key)); + } + }); + // 拷贝线程数组，防止数据污染 + let threadArr = JSON.parse(JSON.stringify(this.threadArr)); + // 拷贝进程数组，防止数据污染 + let processArr = JSON.parse(JSON.stringify(this.processArr)); + // 将周期层级防止到线程层级下 + this.mergeThreadData(threadArr, cycleMap); + let totalData = JSON.parse(JSON.stringify(this.originData)); + // 将原始数据放置到对应的线程层级下，周期数据前 + this.mergeTotalData(threadArr, totalData); + // 合并数据到进程层级下 + this.mergePidData(processArr, threadArr); + this.fixedDeal(processArr); + this.threadStatesTblSource = processArr; + this.threadStatesTbl!.recycleDataSource = processArr; + this.threadStatesTbl!.loading = false; + this.threadClick(processArr); } else { - resList.push({ - thread: targetList[j].thread, - ts: (targetList[j].ts - timeDur) / tsMutiple, - count: ((dealArr[i].ts + dealArr[i].dur - targetList[j].ts) * targetList[j].freq) / 1000, - cpu: targetList[j].cpu, - freq: targetList[j].freq, - dur: dealArr[i].ts + dealArr[i].dur - targetList[j].ts, - percent: - ((dealArr[i].ts + dealArr[i].dur - targetList[j].ts) / targetList[j].dur) * targetList[j].percent, - state: 'Running', - id: i, - }); - break; + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + this.threadStatesTbl!.loading = false; } - } - } else { - if (targetList[j].ts + targetList[j].dur > dealArr[i].ts) { - if (targetList[j].ts + targetList[j].dur > dealArr[i].ts + dealArr[i].dur) { - resList.push({ - thread: targetList[j].thread, - ts: (dealArr[i].ts - timeDur) / tsMutiple, - count: (dealArr[i].dur * targetList[j].freq) / 1000, - cpu: targetList[j].cpu, - freq: targetList[j].freq, - dur: dealArr[i].dur, - percent: (dealArr[i].dur / targetList[j].dur) * targetList[j].percent, - state: 'Running', - id: i, - }); - break; + }) + } else { + this.threadStatesTbl!.loading = false; + if(threadIdValue == ''){ + threadId.style.border = '1px solid rgb(255,0,0)'; + threadId.setAttribute('placeholder', 'Please input threadId!'); + } + if(threadFuncName == ''){ + threadFunc.style.border = '1px solid rgb(255,0,0)'; + threadFunc.setAttribute('placeholder', 'Please input funcName!'); + } + if(/^[0-9]*$/.test(threadIdValue) == false){ + threadId.style.border = '1px solid rgb(255,0,0)'; + threadId.setAttribute('placeholder', 'Please check the input!'); + } + } + } + // Loop方式切割数据功能 + dataLoopCut(threadId: any, threadFunc: any, resultList: any) { + let threadIdValue = threadId.value.trim(); + let threadFuncName = threadFunc.value.trim(); + let leftNS = this.currentSelectionParam.leftNs; + let rightNS = this.currentSelectionParam.rightNs; + let tableValue: any = this.threadStatesTbl; + tableValue.value = []; + if (/^[0-9]*$/.test(threadIdValue) && threadIdValue != '' && threadFuncName != '') { + threadId.style.border = '1px solid rgb(151,151,151)'; + threadFunc.style.border = '1px solid rgb(151,151,151)'; + querySearchFuncData(threadFuncName, Number(threadIdValue), leftNS, rightNS).then(res => { + if (res != null && res.length > 0) { + let targetMap = new Map(); + // 新创建map对象接收传过来的实参map + resultList.forEach((item: any, key: any) => { + targetMap.set(key, JSON.parse(JSON.stringify(item))); + }) + let timeDur = this.currentSelectionParam.recordStartNs; + let cutArr = new Array(); + // 根据线程id及方法名获取的数据，处理后用作切割时间依据，时间跨度为整个方法开始时间到末个方法开始时间 + for (let i of res) { + cutArr.push({ 'ts': i.startTime + timeDur }); + } + let cycleMap = new Map(); + targetMap.forEach((item, key) => { + cycleMap.set(key, new Array()); + for (let i = 0; i < cutArr.length - 1; i++) { + let cpuArr = new Array(); + let cpuMap = new Map(); + let resList = new Array(); + // 时间由纳秒转换为秒的倍数 + const multiple = 1000000000; + // 算力倍数值 + const countMutiple = 1000; + cpuMap.set(key, new Array()); + cycleMap.get(key).push({ 'thread': item[0].thread, 'ts': (cutArr[i].ts - timeDur) / multiple, 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + let value = JSON.parse(JSON.stringify(item)); + for (let j = 0; j < value.length; j++) { + value[j].ts = value[j].ts * multiple; + value[j].freq = value[j].freq == 'unknown'? 0 : value[j].freq; + if (!cpuArr.includes(value[j].cpu)) { + cpuArr.push(value[j].cpu); + cpuMap.get(key).push({ 'thread': value[j].thread, 'count': 0, 'cpu': value[j].cpu, 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + } + if (value[j].ts >= cutArr[i].ts) { + if ((value[j].ts + value[j].dur) <= cutArr[i + 1].ts) { + resList.push({ 'thread': value[j].thread, 'count': (value[j].freq * value[j].dur) / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': value[j].dur, 'percent': value[j].percent, 'state': 'Running', 'ts': (value[j].ts - timeDur) / multiple, 'id': i }); + } else { + if (cutArr[i + 1].ts - value[j].ts > 0) { + resList.push({ 'thread': value[j].thread, 'count': (value[j].freq * (cutArr[i + 1].ts - value[j].ts)) / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': cutArr[i + 1].ts - value[j].ts, 'percent': value[j].percent * ((cutArr[i + 1].ts - value[j].ts) / value[j].dur), 'state': 'Running', 'ts': (value[j].ts - timeDur) / multiple, 'id': i }); + break; + } + } + } else { + if ((value[j].ts + value[j].dur) > cutArr[i + 1].ts) { + resList.push({ 'thread': value[j].thread, 'count': (value[j].freq * (cutArr[i + 1].ts - cutArr[i].ts)) / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': cutArr[i + 1].ts - cutArr[i].ts, 'percent': value[j].percent * ((cutArr[i + 1].ts - cutArr[i].ts) / value[j].dur), 'state': 'Running', 'ts': (cutArr[i].ts - timeDur) / multiple, 'id': i }); + } + if ((value[j].ts + value[j].dur) > cutArr[i].ts && (value[j].ts + value[j].dur) < cutArr[i + 1].ts) { + resList.push({ 'thread': value[j].thread, 'count': (value[j].freq * (value[j].dur + value[j].ts - cutArr[i].ts)) / countMutiple, 'cpu': value[j].cpu, 'freq': value[j].freq, 'dur': value[j].dur + value[j].ts - cutArr[i].ts, 'percent': value[j].percent * ((value[j].dur + value[j].ts - cutArr[i].ts) / value[j].dur), 'state': 'Running', 'ts': (cutArr[i].ts - timeDur) / multiple, 'id': i }); + } + } + } + // 合并相同周期内的数据 + this.mergeData(resList); + // 以算力消耗降序排列 + resList.sort((a, b) => b.count - a.count); + // 以cpu升序排列 + cpuMap.get(key).sort((a: any, b: any) => a.cpu - b.cpu); + cpuMap.get(key).forEach((item: any) => { + for (let s = 0; s < resList.length; s++) { + if (item.cpu == resList[s].cpu) { + item.children.push(resList[s]); + item.count += resList[s].count; + item.dur += resList[s].dur; + item.percent += resList[s].percent; + } + } + item.percent = Number(item.percent.toFixed(2)); + }); + // 将cpu数据放置到对应周期层级下 + this.mergeCycleData(cycleMap.get(key)[i], cpuMap.get(key)); + } + }); + let threadArr = JSON.parse(JSON.stringify(this.threadArr)); + let processArr = JSON.parse(JSON.stringify(this.processArr)); + this.mergeThreadData(threadArr, cycleMap); + let totalData = JSON.parse(JSON.stringify(this.originData)); + this.mergeTotalData(threadArr, totalData); + this.mergePidData(processArr, threadArr); + this.fixedDeal(processArr); + this.threadStatesTblSource = processArr; + this.threadStatesTbl!.recycleDataSource = processArr; + this.threadStatesTbl!.loading = false; + this.threadClick(processArr); } else { - resList.push({ - thread: targetList[j].thread, - ts: (dealArr[i].ts - timeDur) / tsMutiple, - count: ((targetList[j].ts + targetList[j].dur - dealArr[i].ts) * targetList[j].freq) / 1000, - cpu: targetList[j].cpu, - freq: targetList[j].freq, - dur: targetList[j].ts + targetList[j].dur - dealArr[i].ts, - percent: - ((targetList[j].ts + targetList[j].dur - dealArr[i].ts) / targetList[j].dur) * - targetList[j].percent, - state: 'Running', - id: i, - }); + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + this.threadStatesTbl!.loading = false; + } + }) + } else { + this.threadStatesTbl!.loading = false; + if(threadIdValue == ''){ + threadId.style.border = '1px solid rgb(255,0,0)'; + threadId.setAttribute('placeholder', 'Please input threadId!'); + } + if(threadFuncName == ''){ + threadFunc.style.border = '1px solid rgb(255,0,0)'; + threadFunc.setAttribute('placeholder', 'Please input funcName!'); + } + if(/^[0-9]*$/.test(threadIdValue) == false){ + threadId.style.border = '1px solid rgb(255,0,0)'; + threadId.setAttribute('placeholder', 'Please check the input!'); + } + } + } + mergeFreqData(needDeal: any, cpuMap: any, dealArr: any, sum: number, threadStatesParam: SelectionParam | any) { + needDeal.forEach((value: any, key: any) => { + let resultList = new Array(); + cpuMap.set(key, new Array()); + let cpuArr = new Array(); + // 时间由纳秒转换为秒的倍数 + const multiple = 1000000000; + // 算力倍数值 + const countMutiple = 1000; + for (let i = 0; i < value.length; i++) { + if (!cpuArr.includes(value[i].cpu)) { + cpuArr.push(value[i].cpu); + cpuMap.get(key).push({ 'process': Utils.PROCESS_MAP.get(value[i].pid) == null ? 'Process ' + value[i].pid : Utils.PROCESS_MAP.get(value[i].pid) + ' ' + value[i].pid, 'thread': value[i].tid + '_' + Utils.THREAD_MAP.get(value[i].tid), 'pid': value[i].pid, 'tid': value[i].tid, 'count': 0, 'cpu': value[i].cpu, 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + } + for (let j = 0; j < dealArr.length; j++) { + if (value[i].cpu == dealArr[j].cpu) { + if (value[i].ts > dealArr[j].startNS) { + if (value[i].ts < (dealArr[j].startNS + dealArr[j].dur)) { + if (value[i].dur < (dealArr[j].startNS + dealArr[j].dur - value[i].ts)) { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * value[i].dur) / countMutiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': value[i].dur, 'percent': value[i].dur / sum * 100, 'state': 'Running', 'ts': value[i].ts / multiple }); + break; + } else { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * (dealArr[j].startNS + dealArr[j].dur - value[i].ts)) / countMutiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': (dealArr[j].startNS + dealArr[j].dur - value[i].ts), 'percent': (dealArr[j].startNS + dealArr[j].dur - value[i].ts) / sum * 100, 'state': 'Running', 'ts': value[i].ts / multiple }); + } + } + } else { + if ((value[i].ts + value[i].dur) > dealArr[j].startNS) { + if ((value[i].dur + value[i].ts - dealArr[j].startNS) < dealArr[j].dur) { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * (value[i].dur + value[i].ts - dealArr[j].startNS)) / countMutiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': (value[i].dur + value[i].ts - dealArr[j].startNS), 'percent': (value[i].dur + value[i].ts - dealArr[j].startNS) / sum * 100, 'state': 'Running', 'ts': dealArr[j].startNS / multiple }); + break; + } else { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * dealArr[j].dur) / countMutiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': dealArr[j].dur, 'percent': dealArr[j].dur / sum * 100, 'state': 'Running', 'ts': dealArr[j].startNS / multiple }); + } + } else { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': 0, 'cpu': value[i].cpu, 'freq': 'unknown', 'dur': value[i].dur, 'percent': value[i].dur / sum * 100, 'state': 'Running', 'ts': value[i].ts / multiple }); + break; + } + } + } + } + } + this.initData.set(key, JSON.parse(JSON.stringify(resultList))); + //合并同一线程内，当运行所在cpu和频点相同时，dur及percent进行累加求和，或许可以进行算法优化 + for (let i = 0; i < resultList.length; i++) { + for (let j = i + 1; j < resultList.length; j++) { + if (resultList[i].cpu == resultList[j].cpu && resultList[i].freq == resultList[j].freq) { + resultList[i].dur += resultList[j].dur; + resultList[i].percent += resultList[j].percent; + resultList[i].count += resultList[j].count; + resultList.splice(j, 1); + j--; + } + } + resultList[i].percent = Number((resultList[i].percent).toFixed(2)); + resultList[i].ts = (resultList[i].ts * 1000000000 - threadStatesParam.recordStartNs) / 1000000000; + } + resultList.sort((a, b) => b.count - a.count); + cpuMap.get(key).sort((a: any, b: any) => a.cpu - b.cpu); + needDeal.set(key, resultList); + }) + } + mergeCpuData(cpuMap: any, needDeal: any) { + cpuMap.forEach((value: any, key: any) => { + let arr = needDeal.get(key); + for (let i = 0; i < value.length; i++) { + for (let j = 0; j < arr.length; j++) { + if (arr[j].cpu == value[i].cpu) { + value[i].children.push(arr[j]); + value[i].count += arr[j].count; + value[i].dur += arr[j].dur; + value[i].percent += arr[j].percent; + } + } + value[i].percent = Number(value[i].percent.toFixed(2)); + } + }); + } + mergeThreadData(threadArr: any, cpuMap: any) { + for (let i = 0; i < threadArr.length; i++) { + let cpuMapData = cpuMap.get(threadArr[i].pid + '_' + threadArr[i].tid); + for (let j = 0; j < cpuMapData.length; j++) { + threadArr[i].children.push(cpuMapData[j]); + threadArr[i].count += cpuMapData[j].count; + threadArr[i].dur += cpuMapData[j].dur; + threadArr[i].percent += cpuMapData[j].percent; + } + threadArr[i].percent = Number(threadArr[i].percent.toFixed(2)); + } + } + mergePidData(pidArr: any, threadArr: any) { + for (let i = 0; i < pidArr.length; i++) { + for (let j = 0; j < threadArr.length; j++) { + if (pidArr[i].pid == threadArr[j].pid) { + pidArr[i].children.push(threadArr[j]); + pidArr[i].count += threadArr[j].count; + pidArr[i].dur += threadArr[j].dur; + pidArr[i].percent += threadArr[j].percent; } - } } - } - finalResultArr[0].children.push({ - thread: targetList[0].thread, - ts: (dealArr[i].ts - timeDur) / tsMutiple, - count: 0, - cpu: '', - freq: '', - dur: 0, - percent: 0, - state: 'Running', - children: new Array(), - id: i, - }); + pidArr[i].percent = Number(pidArr[i].percent.toFixed(2)); } + } + mergeData(resList: any) { // 合并相同周期内的数据 for (let i = 0; i < resList.length; i++) { - for (let j = i + 1; j < resList.length; j++) { - if ( - resList[i].cpu === resList[j].cpu && - resList[i].freq === resList[j].freq && - resList[i].id === resList[j].id - ) { - resList[i].dur += resList[j].dur; - resList[i].percent += resList[j].percent; - resList[i].count += resList[j].count; - resList.splice(j, 1); - j--; + for (let j = i + 1; j < resList.length; j++) { + if (resList[i].cpu === resList[j].cpu && resList[i].freq === resList[j].freq && resList[i].id === resList[j].id) { + resList[i].dur += resList[j].dur; + resList[i].percent += resList[j].percent; + resList[i].count += resList[j].count; + resList.splice(j, 1); + j--; + } } - } - resList[i].percent = Number(resList[i].percent.toFixed(2)); + resList[i].percent = Number((resList[i].percent).toFixed(2)); } - - let newArr1 = JSON.parse(JSON.stringify(finalResultArr[0])); - let newArr2 = JSON.parse(JSON.stringify(resList)); - let finalResult = new Array(this.mergeTree(newArr1, newArr2)); - - this.threadStatesTblSource = finalResult[0].children.length > 0 ? finalResult : []; - this.threadStatesTbl!.recycleDataSource = finalResult[0].children.length > 0 ? finalResult : []; - }); - } else { - alert('请输入正确的线程ID'); } - } - - mergeTree(arr1: any, arr2: any) { - for (let i = 0; i < arr1.children.length; i++) { - // 改成map对象做标记 - let cpuArr = new Array(); - let flagMap = new Map(); - let flag = 0; - for (let j = 0; j < arr2.length; j++) { - if (arr1.children[i].id == arr2[j].id) { - if (!cpuArr.includes(arr2[j].cpu)) { - flagMap.set(arr2[j].cpu, flag); - cpuArr.push(arr2[j].cpu); - arr1.children[i].children.push({ - thread: arr2[j].thread, - count: 0, - cpu: arr2[j].cpu, - freq: '', - dur: 0, - percent: 0, - state: 'Running', - ts: '', - children: new Array(), - id: arr2[j].id, - }); - if ( - arr1.children[i].children[flag].cpu == arr2[j].cpu && - arr1.children[i].children[flag].id == arr2[j].id - ) { - arr1.children[i].children[flag].children.push(arr2[j]); - arr1.children[i].children[flag].dur += arr2[j].dur; - arr1.children[i].children[flag].percent += arr2[j].percent; - arr1.children[i].children[flag].count += arr2[j].count; - arr1.children[i].percent += arr1.children[i].children[flag].percent; - arr1.children[i].children[flag].percent = Number(arr1.children[i].children[flag].percent.toFixed(2)); - arr1.children[i].dur += arr1.children[i].children[flag].dur; - arr1.children[i].count += arr1.children[i].children[flag].count; - flag++; - arr2.splice(j, 1); - j--; + mergeCycleData(obj: any, arr: any) { + for (let i = 0; i < arr.length; i++) { + if (arr[i].count === 0 && arr[i].dur === 0) { + continue; } - } else { - // 利用map做数据处理 - let count = flagMap.get(arr2[j].cpu); - if ( - arr1.children[i].children[count].cpu == arr2[j].cpu && - arr1.children[i].children[count].id == arr2[j].id - ) { - arr1.children[i].children[count].children.push(arr2[j]); - arr1.children[i].children[count].dur += arr2[j].dur; - arr1.children[i].children[count].percent += arr2[j].percent; - arr1.children[i].children[count].count += arr2[j].count; - arr1.children[i].percent += arr2[j].percent; - arr1.children[i].children[count].percent = Number(arr2[j].percent.toFixed(2)); - arr1.children[i].dur += arr2[j].dur; - arr1.children[i].count += arr2[j].count; - arr2.splice(j, 1); - j--; + obj.children.push(arr[i]); + obj.count += arr[i].count; + obj.dur += arr[i].dur; + obj.percent += arr[i].percent; + } + obj.percent = Number(obj.percent.toFixed(2)); + } + mergeTotalData(threadArr: any, totalData: any) { + for (let i = 0; i < threadArr.length; i++) { + for (let j = 0; j < totalData.length; j++) { + if (threadArr[i].pid == totalData[j].pid && threadArr[i].tid == totalData[j].tid) { + totalData[j].thread = 'TotalData'; + threadArr[i].children.unshift(totalData[j]); + } } - } - } else { - break; } - } - arr1.children[i].children.sort((a: any, b: any) => a.cpu - b.cpu); - arr1.percent += arr1.children[i].percent; - arr1.children[i].percent = Number(arr1.children[i].percent.toFixed(2)); - arr1.dur += arr1.children[i].dur; - arr1.count += arr1.children[i].count; } - arr1.percent = Number(arr1.percent.toFixed(2)); - return arr1; - } -} + fixedDeal(arr: any){ + if(arr == undefined){ + return ; + } + for(let i = 0; i < arr.length; i++){ + arr[i].percent = arr[i].percent.toFixed(2); + arr[i].percent = arr[i].percent > 100 ? 100 : arr[i].percent; + this.fixedDeal(arr[i].children); + } + } +} \ No newline at end of file diff --git a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts index d0301e1c7..288916582 100644 --- a/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts +++ b/ide/src/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.ts @@ -14,215 +14,244 @@ */ import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; -import { LitTable } from '../../../../../base-ui/table/lit-table'; -import { SelectionData, SelectionParam } from '../../../../bean/BoxSelection'; -import '../../../StackBar.js'; +import { LitTable, RedrawTreeForm } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionData, SelectionParam } from '../../../../bean/BoxSelection.js'; +import '../../../StackBar.js' import { getTabRunningPercent, queryCpuFreqUsageData, queryCpuFreqFilterId } from '../../../../database/SqlLite.js'; import { Utils } from '../../base/Utils.js'; import { resizeObserver } from '../SheetUtils.js'; +import { SliceGroup } from '../../../../bean/StateProcessThread.js'; @element('tabpane-frequsage') export class TabPaneFreqUsage extends BaseElement { - private threadStatesTbl: LitTable | null | undefined; - private threadStatesTblSource: Array = []; - private currentSelectionParam: Selection | undefined; + private threadStatesTbl: LitTable | null | undefined; + private threadStatesTblSource: Array = []; + private currentSelectionParam: Selection | undefined; - set data(threadStatesParam: SelectionParam | any) { - if (this.currentSelectionParam === threadStatesParam) { - return; + set data(threadStatesParam: SelectionParam | any) { + if (this.currentSelectionParam === threadStatesParam) { + return; + } + this.threadStatesTbl!.loading = true; + this.currentSelectionParam = threadStatesParam; + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + let tableValue: any = this.threadStatesTbl; + tableValue.value = []; + // 查询框选区域内的状态为running的数据 + getTabRunningPercent(threadStatesParam.threadIds, threadStatesParam.leftNs, threadStatesParam.rightNs).then((result) => { + // 查询该trace文件中的cpu核数及id + queryCpuFreqFilterId().then(r => { + // 将查询结果以键值对形式存入Map对象，仪表后续将频点数据与Cpu进行关联 + let IdMap = new Map(); + let queryId = new Array(); + for (let i = 0; i < r.length; i++) { + queryId.push(r[i].id); + IdMap.set(r[i].id, r[i].cpu); + } + // 通过cpu的id去查询总的cpu频点数据 + queryCpuFreqUsageData(queryId).then((res) => { + if (result != null && result.length > 0) { + let sum = 0; + let dealArr = new Array(); + // 将cpu频点数据进行整合 + for (let i of res) { + dealArr.push({ 'startNS': i.startNS + threadStatesParam.recordStartNs, 'dur': i.dur, 'value': i.value, 'cpu': IdMap.get(i.filter_id) }); + } + let needDeal = new Map(); + let cpuMap = new Map(); + let pidArr = new Array(); + let threadArr = new Array(); + // 创建进程级的数组 + let processArr: any = threadStatesParam.processIds.length > 1 ? [...new Set(threadStatesParam.processIds)] : threadStatesParam.processIds; + for (let i of processArr) { + pidArr.push({ 'process': Utils.PROCESS_MAP.get(i) == null ? 'Process ' + i : Utils.PROCESS_MAP.get(i) + ' ' + i, 'thread': Utils.PROCESS_MAP.get(i) == null ? 'Process ' + i : Utils.PROCESS_MAP.get(i) + ' ' + i, 'pid': i, 'tid': '', 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + } + // 将running线程数据存到map中 + for (let e of result) { + if (processArr.includes(e.pid) && e.state == 'Running') { + if (needDeal.get(e.pid + '_' + e.tid) == undefined) { + threadArr.push({ 'process': Utils.PROCESS_MAP.get(e.pid) == null ? 'Process ' + e.pid : Utils.PROCESS_MAP.get(e.pid) + ' ' + e.pid, 'thread': Utils.THREAD_MAP.get(e.tid) + ' ' + e.tid, 'pid': e.pid, 'tid': e.tid, 'count': 0, 'cpu': '', 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); + needDeal.set(e.pid + '_' + e.tid, new Array()); + } + let arr = needDeal.get(e.pid + '_' + e.tid); + let process = Utils.PROCESS_MAP.get(e.pid); + let thread = Utils.THREAD_MAP.get(e.tid); + e.process = process == null || process.length == 0 ? '[NULL]' : process; + e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread; + e.stateJX = e.state; + e.state = Utils.getEndState(e.stateJX); + sum += e.dur; + arr.push(e); + } + } + // 整理running线程数据、cpu层级信息 + this.mergeFreqData(needDeal, cpuMap, dealArr, sum, threadStatesParam); + // 将频点数据放置到对应cpu层级下 + this.mergeCpuData(cpuMap, needDeal); + // 将cpu层级数据放置到线程分组下 + this.mergeThreadData(threadArr, cpuMap); + // 将线程层级数据放置到进程级分组下 + this.mergePidData(pidArr, threadArr); + // 百分比保留两位小数 + this.fixedDeal(pidArr) + this.threadStatesTblSource = pidArr; + this.threadStatesTbl!.recycleDataSource = pidArr; + this.threadStatesTbl!.loading = false; + this.theadClick(pidArr); + } else { + this.threadStatesTblSource = []; + this.threadStatesTbl!.recycleDataSource = []; + this.threadStatesTbl!.loading = false; + } + }) + }) + + }) } - this.currentSelectionParam = threadStatesParam; - this.threadStatesTblSource = []; - this.threadStatesTbl!.recycleDataSource = []; - let tableValue: any = this.threadStatesTbl; - tableValue.value = []; - getTabRunningPercent(threadStatesParam.threadIds, threadStatesParam.leftNs, threadStatesParam.rightNs).then( - (result) => { - queryCpuFreqFilterId().then((r) => { - let IdMap = new Map(); - let queryId = new Array(); - for (let i = 0; i < r.length; i++) { - queryId.push(r[i].id); - IdMap.set(r[i].id, r[i].cpu); - } - queryCpuFreqUsageData(queryId).then((res) => { - if (result != null && result.length > 0) { - let sum = 0; - let dealArr = new Array(); - for (let i of res) { - dealArr.push({ - startNS: i.startNS + threadStatesParam.recordStartNs, - dur: i.dur, - value: i.value, - cpu: IdMap.get(i.filter_id), + + private theadClick(data: Array) { + let labels = this.threadStatesTbl?.shadowRoot?.querySelector('.th > .td')!.querySelectorAll('label'); + if (labels) { + for (let i = 0; i < labels.length; i++) { + let label = labels[i].innerHTML; + labels[i].addEventListener('click', (e) => { + if (label.includes('Process') && i === 0) { + this.threadStatesTbl!.setStatus(data, false); + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Retract); + } else if (label.includes('Thread') && i === 1) { + for (let item of data) { + item.status = true; + if (item.children != undefined && item.children.length > 0) { + this.threadStatesTbl!.setStatus(item.children, false); + } + } + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Retract); + } else if (label.includes('CPU') && i === 2) { + this.threadStatesTbl!.setStatus(data, true); + this.threadStatesTbl!.recycleDs = this.threadStatesTbl!.meauseTreeRowElement(data, RedrawTreeForm.Expand); + } }); - } - let targetList = new Array(); - let cpuArr = new Array(); - let finalResultArr = new Array(); - finalResultArr.push({ - thread: '', - count: 0, - cpu: '', - freq: '', - dur: 0, - percent: '100.00', - state: 'Running', - children: new Array(), - }); - for (let e of result) { - if (threadStatesParam.processIds.includes(e.pid) && e.state == 'Running') { - let process = Utils.PROCESS_MAP.get(e.pid); - let thread = Utils.THREAD_MAP.get(e.tid); - e.process = process == null || process.length == 0 ? '[NULL]' : process; - e.thread = thread == null || thread.length == 0 ? '[NULL]' : thread; - e.stateJX = e.state; - e.state = Utils.getEndState(e.stateJX); - sum += e.dur; - targetList.push(e); - if (!cpuArr.includes(e.cpu)) { - cpuArr.push(e.cpu); - finalResultArr[0].thread = - finalResultArr[0].thread == '' ? e.tid + '_' + e.thread : finalResultArr[0].thread; - finalResultArr[0].children.push({ - thread: e.tid + '_' + e.thread, - count: 0, - cpu: e.cpu, - freq: '', - dur: 0, - percent: 0, - state: 'Running', - children: new Array(), - }); - } + } + } + } + mergeFreqData(needDeal: any, cpuMap: any, dealArr: any, sum: number, threadStatesParam: SelectionParam | any) { + needDeal.forEach((value: any, key: any) => { + let resultList = new Array(); + cpuMap.set(key, new Array()); + let cpuArr = new Array(); + const multiple = 1000; + for (let i = 0; i < value.length; i++) { + if (!cpuArr.includes(value[i].cpu)) { + cpuArr.push(value[i].cpu); + cpuMap.get(key).push({ 'process': Utils.PROCESS_MAP.get(value[i].pid) == null ? 'Process ' + value[i].pid : Utils.PROCESS_MAP.get(value[i].pid) + ' ' + value[i].pid, 'thread': value[i].tid + '_' + Utils.THREAD_MAP.get(value[i].tid), 'pid': value[i].pid, 'tid': value[i].tid, 'count': 0, 'cpu': value[i].cpu, 'freq': '', 'dur': 0, 'percent': 0, 'state': 'Running', children: new Array() }); } - } - let resultList = new Array(); - for (let i = 0; i < targetList.length; i++) { for (let j = 0; j < dealArr.length; j++) { - if (targetList[i].cpu == dealArr[j].cpu) { - if (targetList[i].ts > dealArr[j].startNS) { - if (targetList[i].ts < dealArr[j].startNS + dealArr[j].dur) { - if (targetList[i].dur < dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: (dealArr[j].value * targetList[i].dur) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: targetList[i].dur, - percent: (targetList[i].dur / sum) * 100, - state: 'Running', - ts: targetList[i].ts, - }); - break; - } else { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: (dealArr[j].value * (dealArr[j].startNS + dealArr[j].dur - targetList[i].ts)) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: dealArr[j].startNS + dealArr[j].dur - targetList[i].ts, - percent: ((dealArr[j].startNS + dealArr[j].dur - targetList[i].ts) / sum) * 100, - state: 'Running', - ts: targetList[i].ts, - }); - } - } - } else { - if (targetList[i].ts + targetList[i].dur > dealArr[j].startNS) { - if (targetList[i].dur + targetList[i].ts - dealArr[j].startNS < dealArr[j].dur) { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: - (dealArr[j].value * (targetList[i].dur + targetList[i].ts - dealArr[j].startNS)) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: targetList[i].dur + targetList[i].ts - dealArr[j].startNS, - percent: ((targetList[i].dur + targetList[i].ts - dealArr[j].startNS) / sum) * 100, - state: 'Running', - ts: dealArr[j].startNS, - }); - break; + if (value[i].cpu == dealArr[j].cpu) { + if (value[i].ts > dealArr[j].startNS) { + if (value[i].ts < (dealArr[j].startNS + dealArr[j].dur)) { + if (value[i].dur < (dealArr[j].startNS + dealArr[j].dur - value[i].ts)) { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * value[i].dur) / multiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': value[i].dur, 'percent': value[i].dur / sum * 100, 'state': 'Running', 'ts': value[i].ts }); + break; + } else { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * (dealArr[j].startNS + dealArr[j].dur - value[i].ts)) / multiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': (dealArr[j].startNS + dealArr[j].dur - value[i].ts), 'percent': (dealArr[j].startNS + dealArr[j].dur - value[i].ts) / sum * 100, 'state': 'Running', 'ts': value[i].ts }); + } + } } else { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: (dealArr[j].value * dealArr[j].dur) / 1000, - cpu: targetList[i].cpu, - freq: dealArr[j].value, - dur: dealArr[j].dur, - percent: (dealArr[j].dur / sum) * 100, - state: 'Running', - ts: dealArr[j].startNS, - }); + if ((value[i].ts + value[i].dur) > dealArr[j].startNS) { + if ((value[i].dur + value[i].ts - dealArr[j].startNS) < dealArr[j].dur) { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * (value[i].dur + value[i].ts - dealArr[j].startNS)) / multiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': (value[i].dur + value[i].ts - dealArr[j].startNS), 'percent': (value[i].dur + value[i].ts - dealArr[j].startNS) / sum * 100, 'state': 'Running', 'ts': dealArr[j].startNS }); + break; + } else { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': (dealArr[j].value * dealArr[j].dur) / multiple, 'cpu': value[i].cpu, 'freq': dealArr[j].value, 'dur': dealArr[j].dur, 'percent': dealArr[j].dur / sum * 100, 'state': 'Running', 'ts': dealArr[j].startNS }); + } + } else { + resultList.push({ 'thread': value[i].tid + '_' + value[i].thread, 'count': 0, 'cpu': value[i].cpu, 'freq': 'unknown', 'dur': value[i].dur, 'percent': value[i].dur / sum * 100, 'state': 'Running', 'ts': value[i].ts }); + break; + } } - } else { - resultList.push({ - thread: targetList[i].tid + '_' + targetList[i].thread, - count: 0, - cpu: targetList[i].cpu, - freq: 'unknown', - dur: targetList[i].dur, - percent: (targetList[i].dur / sum) * 100, - state: 'Running', - ts: targetList[i].ts, - }); - break; - } } - } } - } - //合并同一线程内，当运行所在cpu和频点相同时，dur及percent进行累加求和，或许可以进行算法优化 - for (let i = 0; i < resultList.length; i++) { + } + //合并同一线程内，当运行所在cpu和频点相同时，dur及percent进行累加求和，或许可以进行算法优化 + for (let i = 0; i < resultList.length; i++) { for (let j = i + 1; j < resultList.length; j++) { - if (resultList[i].cpu == resultList[j].cpu && resultList[i].freq == resultList[j].freq) { - resultList[i].dur += resultList[j].dur; - resultList[i].percent += resultList[j].percent; - resultList[i].count += resultList[j].count; - resultList.splice(j, 1); - j--; - } + if (resultList[i].cpu == resultList[j].cpu && resultList[i].freq == resultList[j].freq) { + resultList[i].dur += resultList[j].dur; + resultList[i].percent += resultList[j].percent; + resultList[i].count += resultList[j].count; + resultList.splice(j, 1); + j--; + } } - resultList[i].percent = Number(resultList[i].percent.toFixed(2)); + resultList[i].percent = Number((resultList[i].percent).toFixed(2)); resultList[i].ts = resultList[i].ts - threadStatesParam.recordStartNs; - } - finalResultArr[0].children.sort((a: any, b: any) => a.cpu - b.cpu); - // 转成树结构数据进行展示 - for (let i = 0; i < finalResultArr[0].children.length; i++) { - for (let j = 0; j < resultList.length; j++) { - if (finalResultArr[0].children[i].cpu == resultList[j].cpu) { - finalResultArr[0].children[i].children.push(resultList[j]); - finalResultArr[0].children[i].dur += resultList[j].dur; - finalResultArr[0].children[i].percent += resultList[j].percent; - finalResultArr[0].children[i].count += resultList[j].count; - resultList.splice(j, 1); - j--; - } + } + resultList.sort((a, b) => b.count - a.count); + cpuMap.get(key).sort((a: any, b: any) => a.cpu - b.cpu); + needDeal.set(key, resultList); + }) + } + mergeCpuData(cpuMap: any, needDeal: any) { + cpuMap.forEach((value: any, key: any) => { + let arr = needDeal.get(key); + for (let i = 0; i < value.length; i++) { + for (let j = 0; j < arr.length; j++) { + if (arr[j].cpu == value[i].cpu) { + value[i].children.push(arr[j]); + value[i].count += arr[j].count; + value[i].dur += arr[j].dur; + value[i].percent += arr[j].percent; + } } - finalResultArr[0].children[i].percent = finalResultArr[0].children[i].percent.toFixed(2); - finalResultArr[0].dur += finalResultArr[0].children[i].dur; - finalResultArr[0].count += finalResultArr[0].children[i].count; - } - this.threadStatesTblSource = finalResultArr; - this.threadStatesTbl!.recycleDataSource = finalResultArr; - } else { - this.threadStatesTblSource = []; - this.threadStatesTbl!.recycleDataSource = []; + value[i].percent = Number(value[i].percent.toFixed(2)); } - }); }); - } - ); - } - initElements(): void { - this.threadStatesTbl = this.shadowRoot?.querySelector('#tb-running-percent'); - } - connectedCallback() { - super.connectedCallback(); - resizeObserver(this.parentElement!, this.threadStatesTbl!); - } - initHtml(): string { - return ` + } + mergeThreadData(threadArr: any, cpuMap: any) { + for (let i = 0; i < threadArr.length; i++) { + let cpuMapData = cpuMap.get(threadArr[i].pid + '_' + threadArr[i].tid); + for (let j = 0; j < cpuMapData.length; j++) { + threadArr[i].children.push(cpuMapData[j]); + threadArr[i].count += cpuMapData[j].count; + threadArr[i].dur += cpuMapData[j].dur; + threadArr[i].percent += cpuMapData[j].percent; + } + threadArr[i].percent = Number(threadArr[i].percent.toFixed(2)); + } + } + mergePidData(pidArr: any, threadArr: any) { + for (let i = 0; i < pidArr.length; i++) { + for (let j = 0; j < threadArr.length; j++) { + if (pidArr[i].pid == threadArr[j].pid) { + pidArr[i].children.push(threadArr[j]); + pidArr[i].count += threadArr[j].count; + pidArr[i].dur += threadArr[j].dur; + pidArr[i].percent += threadArr[j].percent; + } + } + pidArr[i].percent = Number(pidArr[i].percent.toFixed(2)); + } + } + fixedDeal(arr: any) { + if (arr == undefined) { + return; + } + for (let i = 0; i < arr.length; i++) { + arr[i].percent = arr[i].percent > 100 ? 100 : arr[i].percent; + arr[i].percent = arr[i].percent.toFixed(2); + this.fixedDeal(arr[i].children); + } + } + initElements(): void { + this.threadStatesTbl = this.shadowRoot?.querySelector('#tb-running-percent'); + } + connectedCallback() { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.threadStatesTbl!); + } + initHtml(): string { + return ` - - - + + + @@ -246,6 +275,36 @@ export class TabPaneFreqUsage extends BaseElement { - `; - } -} + ` + } + sortByColumn(treadStateDetail: any) { + function compare(property: any, treadStatesSort: any, type: any) { + return function (threadStatesLeftData: SelectionData | any, threadStatesRightData: SelectionData | any) { + if (threadStatesLeftData.process == ' ' || threadStatesRightData.process == ' ') { + return 0; + } + if (type === 'number') { + return treadStatesSort === 2 + ? parseFloat(threadStatesRightData[property]) - parseFloat(threadStatesLeftData[property]) + : parseFloat(threadStatesLeftData[property]) - parseFloat(threadStatesRightData[property]); + } else { + if (threadStatesRightData[property] > threadStatesLeftData[property]) { + return treadStatesSort === 2 ? 1 : -1; + } else if (threadStatesRightData[property] == threadStatesLeftData[property]) { + return 0; + } else { + return treadStatesSort === 2 ? -1 : 1; + } + } + }; + } + + if (treadStateDetail.key === 'name' || treadStateDetail.key === 'thread' || treadStateDetail.key === 'state') { + this.threadStatesTblSource.sort(compare(treadStateDetail.key, treadStateDetail.sort, 'string')); + } else { + this.threadStatesTblSource.sort(compare(treadStateDetail.key, treadStateDetail.sort, 'number')); + } + this.threadStatesTbl!.recycleDataSource = this.threadStatesTblSource; + } + +} \ No newline at end of file diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts index a6e91ef7d..86da26641 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts @@ -811,6 +811,7 @@ export class TabPanePerfAnalysis extends BaseElement { const symbolData = { pid: item.pid, tid: item.tid, + libId: item.libId, percent: ((symbolCount / parentCount) * 100).toFixed(2), count: symbolCount, symbolId: symbolId, diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts index 2a6068632..6ed79e9a7 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts @@ -167,8 +167,8 @@ export class TabpanePerfProfile extends BaseElement { private getDataByPieLevel(eventTypeId: number | undefined): void { this.perfLevel = new PerfLevelStruct(); this.perfLevel = { - process: this._rowClickData.pid, - thread: this._rowClickData.tid, + processId: this._rowClickData.pid, + threadId: this._rowClickData.tid, libId: this._rowClickData.libId, }; let args = []; @@ -177,18 +177,18 @@ export class TabpanePerfProfile extends BaseElement { funcArgs: [this.currentSelection, this.perfLevel], }); - if (this._rowClickData.libId !== undefined && this._currentLevel === 2) { - this.perfLevel.libName = this._rowClickData.tableName; + if (this._rowClickData && this._rowClickData.libId !== undefined && this._currentLevel === 2) { + this.perfLevel!.libName = this._rowClickData.tableName; args.push({ funcName: 'showLibLevelData', - funcArgs: [this.perfLevel.libId, this.perfLevel.libName], + funcArgs: [this.perfLevel!.libId, this.perfLevel!.libName], }); - } else if (!this._rowClickData.libId && this._currentLevel === 3) { - this.perfLevel.symbolId = this._rowClickData.symbolId; - this.perfLevel.symbolName = this._rowClickData.tableName; + } else if (this._rowClickData && this._rowClickData.symbolId !== undefined && this._currentLevel === 3) { + this.perfLevel!.symbolId = this._rowClickData.symbolId; + this.perfLevel!.symbolName = this._rowClickData.tableName; args.push({ funcName: 'showFunLevelData', - funcArgs: [this.perfLevel.symbolId, this.perfLevel.symbolName], + funcArgs: [this.perfLevel!.symbolId, this.perfLevel!.symbolName], }); } @@ -634,7 +634,7 @@ export class TabpanePerfProfile extends BaseElement { funcName: 'showLibLevelData', funcArgs: [this.perfLevel!.libId, this.perfLevel!.libName], }); - } else if (this._rowClickData && !this._rowClickData.libId && this._currentLevel === 3) { + } else if (this._rowClickData && this._rowClickData.symbolId && this._currentLevel === 3) { perfProfileArgs.push({ funcName: 'showFunLevelData', funcArgs: [this.perfLevel!.symbolId, this.perfLevel!.symbolName], diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts index d98870349..b5c95ca3e 100644 --- a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts @@ -85,19 +85,33 @@ export class TabPaneHisysEvents extends BaseElement { this.levelFilter = this.shadowRoot?.querySelector('#level-filter'); this.spSystemTrace = document.querySelector('body > sp-application') ?.shadowRoot?.querySelector('#sp-system-trace'); - this.traceSheetEl = this.spSystemTrace!.shadowRoot?.querySelector('.trace-sheet'); + this.traceSheetEl = this.spSystemTrace?.shadowRoot?.querySelector('.trace-sheet'); this.contentFilterInput = this.shadowRoot?.querySelector('#contents-filter'); this.changeInput = this.shadowRoot?.querySelector('#contents-change'); this.detailsTbl = this.shadowRoot?.querySelector('#tb-hisysevent-data'); this.slicerTrack = this.shadowRoot?.querySelector('lit-slicer-track'); this.detailbox = this.shadowRoot?.querySelector('.detail-content'); this.tableElement = this.hiSysEventTable?.shadowRoot?.querySelector('.table') as HTMLDivElement; - this.hiSysEventTable!.addEventListener('row-click', (e) => { + this.hiSysEventTable!.addEventListener('row-click', (event) => { this.changeInput!.value = ''; // @ts-ignore - this.convertData(e.detail.data); + const data = event.detail.data; + this.convertData(data); + this.hiSysEventTable?.clearAllSelection(); + data.isSelected = true; + this.hiSysEventTable?.setCurrentSelection(data); this.updateDetail(this.baseTime); }); + this.boxDetails!.addEventListener('click', ev => { + if (ev.target !== this.hiSysEventTable) { + this.hiSysEventTable?.clearAllSelection(); + this.detailsTbl!.dataSource = []; + this.boxDetails!.style.width = '100%'; + this.detailbox!.style.display = 'none'; + this.slicerTrack!.style.visibility = 'hidden'; + this.detailsTbl!.style.paddingLeft = '0px'; + } + }); this.hiSysEventTable!.addEventListener('row-hover', (e) => { // @ts-ignore let data = e.detail.data; @@ -109,7 +123,7 @@ export class TabPaneHisysEvents extends BaseElement { // @ts-ignore this.sortByColumn(evt.detail); }); - this.tableElement.addEventListener('mouseout', () => { + this.tableElement?.addEventListener('mouseout', () => { this.traceSheetEl!.systemLogFlag = undefined; this.spSystemTrace?.refreshCanvas(false); }); @@ -237,6 +251,7 @@ export class TabPaneHisysEvents extends BaseElement { } #tb-hisysevent-data { height: auto; + width: auto; border-left: 1px solid var(--dark-border1,#e2e2e2); display:flex; } @@ -320,11 +335,7 @@ export class TabPaneHisysEvents extends BaseElement { new ResizeObserver(() => { this.tableElement!.style.height = `${this.parentElement!.clientHeight - 20 - 35}px`; this.hiSysEventTable?.reMeauseHeight(); - // @ts-ignore - this.detailsTbl?.shadowRoot?.querySelector('.table').style.height = - `${this.parentElement!.clientHeight - 20 - 35}px`; - // @ts-ignore - this.detailsTbl?.shadowRoot?.querySelector('.table').style = 'hidden'; + this.detailsTbl!.style.height = `${this.parentElement!.clientHeight - 30}px`; this.parentElement!.style.overflow = 'hidden'; this.detailsTbl?.reMeauseHeight(); this.updateData(); @@ -466,18 +477,14 @@ export class TabPaneHisysEvents extends BaseElement { }); }); this.detailsTbl!.recycleDataSource = detailList; - console.log(this.detailsTbl!.recycleDataSource) - const tr = this.detailsTbl!.shadowRoot?.querySelector('.tr:nth-of-type(1)'); - if (tr) { - tr.style.fontWeight = 'bolder'; - } } convertData = (data: HiSysEventStruct): void => { this.baseTime = ''; this.currentDetailList = [{ key: 'key', - value: 'value'}]; + value: 'value' + }]; const content = JSON.parse(data.contents ?? '{}'); if (content && typeof content === 'object') { let isFirstTime = false; @@ -566,4 +573,5 @@ export class TabPaneHisysEvents extends BaseElement { this.spSystemTrace?.refreshCanvas(false); } } -const millisecond = 1000_000; \ No newline at end of file + +const millisecond = 1000_000; \ No newline at end of file diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts index d0de4f929..a1238f6e5 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts @@ -177,21 +177,28 @@ export class TabpaneNMCalltree extends BaseElement { } setFilterType(selections: Array, data: FilterByAnalysis): void { - switch (data.type) { - case 'AllocEvent': - data.type = '1'; - break; - case 'MmapEvent': - data.type = '2'; + if (data.type === 'AllocEvent') { + data.type = '1'; } + const that = this; if (this.subTypeArr.length > 0) { this.subTypeArr.map((memory): void => { - const typeName = SpSystemTrace.DATA_DICT.get(memory); selections.push({ memoryTap: memory, }); - if (data.type === typeName) { - data.type = `${selections.length + 2}`; + if (that.currentSelection?.nativeMemory && that.currentSelection.nativeMemory.length > 0) { + const typeName = SpSystemTrace.DATA_DICT.get(memory); + if (data.type === 'MmapEvent' && memory== -1 || data.type === typeName) { + data.type = `${selections.length + 2}`; + } + } else { + if ( + (data.type === 'MmapEvent' && memory === 1) || + (data.type === 'FILE_PAGE_MSG' && memory === 2) || + (data.type === 'MEMORY_USING_MSG' && memory === 3) + ) { + data.type = `${selections.length + 2}`; + } } }); } diff --git a/ide/src/trace/component/trace/timer-shaft/SportRuler.ts b/ide/src/trace/component/trace/timer-shaft/SportRuler.ts index ea1c9e339..ad95d60e2 100644 --- a/ide/src/trace/component/trace/timer-shaft/SportRuler.ts +++ b/ide/src/trace/component/trace/timer-shaft/SportRuler.ts @@ -21,7 +21,6 @@ import { ns2s, ns2x, randomRgbColor, TimerShaftElement } from '../TimerShaftElem import { TraceRow } from '../base/TraceRow.js'; import { SpApplication } from '../../../SpApplication.js'; import { Utils } from '../base/Utils.js'; -import { SpSystemTrace } from '../../SpSystemTrace.js'; export enum StType { TEMP, //临时的 @@ -443,7 +442,7 @@ export class SportRuler extends Graph { (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS) ); let endX = Math.round((this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)); - let color = randomRgbColor(); + let color = randomRgbColor() || '#ff0000'; this.slicesTime.color = color; newSlicestime = new SlicesTime( this.slicesTime.startTime || 0, diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index 0d61c095c..8d4c9e0df 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -1536,7 +1536,7 @@ export const queryNativeHookStatistics = ( where (A.start_ts - B.start_ts) between ${leftNs} and ${rightNs} and (event_type = 'AllocEvent' or event_type = 'MmapEvent') - and + and ipid = ${ipid} group by event_type;`, { $leftNs: leftNs, $rightNs: rightNs } ); @@ -1634,14 +1634,14 @@ export const queryNativeHookStatisticSubType = (leftNs: number, rightNs: number, WHEN type = 2 THEN 'FILE_PAGE_MSG' WHEN type = 3 AND sub_type_id NOT NULL THEN D.data WHEN type = 3 THEN 'MEMORY_USING_MSG' - ELSE 'MmapEvent' + ELSE 'Other MmapEvent' END AS subType FROM native_hook_statistic NHS LEFT JOIN data_dict D ON NHS.sub_type_id = D.id, trace_range TR WHERE - NHS.type > 1 AND + NHS.type >= 1 AND (NHS.ts - TR.start_ts) between ${leftNs} and ${rightNs} AND ipid = ${ipid} `, @@ -2662,7 +2662,14 @@ export const queryPerfProcess = (): Promise> => export const queryPerfThread = (): Promise> => query( 'queryPerfThread', - `select a.thread_id as tid,a.thread_name as threadName,a.process_id as pid,b.thread_name as processName from perf_thread a left join (select * from perf_thread where thread_id = process_id) b on a.process_id = b.thread_id`, + `select a.thread_id as tid, + a.thread_name as threadName, + a.process_id as pid, + b.thread_name as processName +from perf_thread a + left join (select distinct process_id, thread_name from perf_thread) b + on a.process_id = b.process_id +order by pid;`, {} ); @@ -5558,7 +5565,7 @@ export const getTabRunningPercent = (tIds: Array, leftNS: number, rightN export const querySearchFuncData = ( funcName: string, - tIds: Array, + tIds: number, leftNS: number, rightNS: number ): Promise> => @@ -5589,7 +5596,7 @@ export const querySearchFuncData = ( left join trace_range r where - c.name = '${funcName}' + c.name like '${funcName}' and t.tid = ${tIds} and diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts index 4f12ca691..4018c0450 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts @@ -610,6 +610,7 @@ export class FileCallChain { symbolsId: number = 0; pathId: number = 0; ip: string = ''; + isThread: boolean = false; } export class DataCache { diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts index da863bd56..16ea6aec3 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerFileSystem.ts @@ -776,6 +776,7 @@ where s.end_ts between ${selectionParam.leftNs} + t.start_ts and ${selectionPara if (rootMerageMap[merageData.pid] === undefined) { let fileMerageBean = new FileMerageBean(); //新增进程的节点数据 fileMerageBean.canCharge = false; + fileMerageBean.isProcess = true; fileMerageBean.symbolName = merageData.processName; fileMerageBean.symbol = fileMerageBean.symbolName; fileMerageBean.children.push(merageData); @@ -840,6 +841,7 @@ where s.end_ts between ${selectionParam.leftNs} + t.start_ts and ${selectionPara threadCallChain.callChainId = sample.callChainId; threadCallChain.ip = (sample.threadName || 'Thread') + `-${sample.tid}`; threadCallChain.symbolsId = sample.tid; + threadCallChain.isThread = true; threadCallChain.pathId = -1; let list: FileCallChain[] = []; const eBpfCallChainsMap = DataCache.getInstance().eBpfCallChainsMap; @@ -1054,6 +1056,9 @@ export class FileMerageBean extends MerageBean { currentNode.selfDur += sample.dur; currentNode.self = getProbablyTime(currentNode.selfDur); } + if (callChain.isThread && !currentNode.isThread){ + currentNode.isThread = callChain.isThread; + } currentNode.dur += sample.dur; currentNode.count++; currentNode.tsArray.push(sample.ts); diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts index 7b5b3d0e7..0498b6e08 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts @@ -13,13 +13,7 @@ * limitations under the License. */ -import { - LogicHandler, - ChartStruct, - convertJSON, - DataCache, - HiPerfSymbol, -} from './ProcedureLogicWorkerCommon.js'; +import { LogicHandler, ChartStruct, convertJSON, DataCache, HiPerfSymbol } from './ProcedureLogicWorkerCommon.js'; import { PerfBottomUpStruct } from '../../bean/PerfBottomUpStruct.js'; import { HiPerfChartFrame } from '../../bean/PerfStruct.js'; @@ -106,7 +100,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { self.postMessage({ id: data.id, action: data.action, - results: this.combinePerfSampleBycallChainId(this.samplesCpu) + results: this.combinePerfSampleBycallChainId(this.samplesCpu), }); } else { this.perfCallData = data.params; @@ -239,7 +233,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { initPerfFire(arr: Array) { this.dataCache.perfCallChain = []; - arr.forEach(item => { + arr.forEach((item) => { this.dataCache.perfCallChain!.push({ callchain_id: item.sampleId, depth: item.depth, @@ -252,7 +246,9 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { } queryCallData(data: Array) { - let condition = `${data[0] == 0 ? 'cpu_id=' : 'thread_id='}${data[1]} ${data[2] === -2 ? '' : `and event_type_id=${data[2]}`}`; + let condition = `${data[0] == 0 ? 'cpu_id=' : 'thread_id='}${data[1]} ${ + data[2] === -2 ? '' : `and event_type_id=${data[2]}` + }`; const sql = `SELECT id, callchain_id, timestamp_trace - start_ts AS timeTip, @@ -386,10 +382,11 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { perfSample.callchain_id = sampleList[i].callchain_id; perfSample.thread_id = sampleList[i].thread_id; perfSample.id = sampleList[i].id; - if (i !== 0 - && i !== sampleList.length - 1 - && sampleList[i].callchain_id !== sampleList[i - 1].callchain_id - && sampleList[i].callchain_id !== sampleList[i + 1].callchain_id + if ( + i !== 0 && + i !== sampleList.length - 1 && + sampleList[i].callchain_id !== sampleList[i - 1].callchain_id && + sampleList[i].callchain_id !== sampleList[i + 1].callchain_id ) { perfSample.startTime = sampleList[i - 1].timeTip; } else { @@ -433,24 +430,24 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { stackTopSymbol.thread_id = sample.thread_id; stackTopSymbol.cpu_id = sample.thread_id; stackTopSymbol.eventCount = sample.eventCount; - this.setDur(stackTopSymbol) + this.setDur(stackTopSymbol); sample.children = new Array(); - sample.children.push(stackTopSymbol) + sample.children.push(stackTopSymbol); // 每一项都和combineSample对比 if (combineSample.length === 0) { - combineSample.push(sample) + combineSample.push(sample); } else { if (this.perfCallData[0] === 0) { if (combineSample[combineSample.length - 1].thread_id === sample.thread_id) { - this.combinePerfCallData(combineSample[combineSample.length - 1], sample) + this.combinePerfCallData(combineSample[combineSample.length - 1], sample); } else { - combineSample.push(sample) + combineSample.push(sample); } } else { if (combineSample[combineSample.length - 1].cpu_id === sample.cpu_id) { - this.combinePerfCallData(combineSample[combineSample.length - 1], sample) + this.combinePerfCallData(combineSample[combineSample.length - 1], sample); } else { - combineSample.push(sample) + combineSample.push(sample); } } } @@ -468,9 +465,9 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { data.children[0].thread_id = data.thread_id; data.children[0].cpu_id = data.cpu_id; data.children[0].eventCount = data.eventCount; - this.setDur(data.children[0]) + this.setDur(data.children[0]); } else { - return + return; } } @@ -480,9 +477,11 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { data1.endTime = data2.endTime; data1.eventCount += data2.eventCount; if (data1.children && data1.children.length > 0 && data2.children && data2.children.length > 0) { - if (data1.children[data1.children.length - 1].depth === data2.children[0].depth - && data1.children[data1.children.length - 1].name !== data2.children[0].name) { - data1.children.push(data2.children[0]) + if ( + data1.children[data1.children.length - 1].depth === data2.children[0].depth && + data1.children[data1.children.length - 1].name !== data2.children[0].name + ) { + data1.children.push(data2.children[0]); } else { this.combinePerfCallData(data1.children[data1.children.length - 1], data2.children[0]); } @@ -594,12 +593,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { this.currentTreeList.push(perfRootNode); } - PerfCallChainMerageData.merageCallChainSample( - perfRootNode, - perfCallChains[topIndex], - perfSample, - false, - ); + PerfCallChainMerageData.merageCallChainSample(perfRootNode, perfCallChains[topIndex], perfSample, false); this.mergeChildrenByIndex(perfRootNode, perfCallChains, topIndex, perfSample, isTopDown); } } @@ -675,24 +669,14 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { currentNode.initChildren.filter((child: PerfCallChainMerageData): boolean => { if (child.symbolName === callChainDataList[index]?.name) { node = child; - PerfCallChainMerageData.merageCallChainSample( - child, - callChainDataList[index], - sample, - isEnd, - ); + PerfCallChainMerageData.merageCallChainSample(child, callChainDataList[index], sample, isEnd); return true; } return false; }).length === 0 ) { node = new PerfCallChainMerageData(); - PerfCallChainMerageData.merageCallChainSample( - node, - callChainDataList[index], - sample, - isEnd, - ); + PerfCallChainMerageData.merageCallChainSample(node, callChainDataList[index], sample, isEnd); currentNode.children.push(node); currentNode.initChildren.push(node); this.currentTreeList.push(node); @@ -901,11 +885,11 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { if (item.funcArgs[1]) { let funcArgs = item.funcArgs[1]; let sql = ''; - if (funcArgs.process !== undefined) { - sql += `and thread.process_id = ${funcArgs.process}`; + if (funcArgs.processId !== undefined) { + sql += `and thread.process_id = ${funcArgs.processId}`; } - if (funcArgs.thread !== undefined) { - sql += ` and s.thread_id = ${funcArgs.thread}`; + if (funcArgs.threadId !== undefined) { + sql += ` and s.thread_id = ${funcArgs.threadId}`; } this.getCurrentDataFromDb(item.funcArgs[0], sql); } else { @@ -972,7 +956,7 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { if ( (obj && obj.libId === lastCallChain.fileId && obj.libName === lastCallChain.fileName) || (obj && obj.symbolId === lastCallChain.symbolId && obj.symbolName === lastCallChain.name) || - (!obj) + !obj ) { let analysisSample = new PerfAnalysisSample( threadName, @@ -1288,11 +1272,10 @@ export class PerfCallChainMerageData extends ChartStruct { currentNode.eventCount += callChain.eventCount; } static merageCallChainSample( - currentNode: PerfCallChainMerageData, callChain: PerfCallChain, sample: PerfCountSample, - isEnd: boolean, + isEnd: boolean ): void { if (currentNode.symbolName === '') { currentNode.symbol = `${callChain.name} ${callChain.fileName ? `(${callChain.fileName})` : ''}`; @@ -1311,7 +1294,7 @@ export class PerfCallChainMerageData extends ChartStruct { if (isEnd) { currentNode.selfDur += sample.count; } - if (callChain.isThread && !currentNode.isThread){ + if (callChain.isThread && !currentNode.isThread) { currentNode.isThread = callChain.isThread; } currentNode.dur += sample.count; @@ -1397,9 +1380,8 @@ export function timeMsFormat2p(ns: number): string { return perfResult; } - class HiPrefSample { - name: string = ""; + name: string = ''; depth: number = 0; callchain_id: number = 0; totalTime: number = 0; @@ -1411,4 +1393,4 @@ class HiPrefSample { timeTip: number = 0; cpu_id: number = 0; stack?: Array; -} \ No newline at end of file +} -- Gitee From 436994f2c6b426e4405f3226640d01ec64385b3a Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 10:23:03 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix1.native=20memory=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=8A=93=E5=8F=96bug2.perf=E8=B0=83=E7=94=A8=E6=A0=88?= =?UTF-8?q?=E6=B3=B3=E9=81=93=E5=9B=BE=E6=82=AC=E6=B5=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?duration=20=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/trace/component/SpRecordTrace.ts | 1 + ide/src/trace/component/SpSystemTrace.ts | 10 +--- ide/src/trace/component/chart/SpHiPerf.ts | 22 ++------ .../trace/component/setting/SpAllocations.ts | 38 ++++++++++---- .../trace/component/trace/base/TraceRow.ts | 1 + .../sheet/file-system/TabPaneCallTree.ts | 2 + .../file-system/TabPaneFileSystemCalltree.ts | 8 ++- .../trace/sheet/hiperf/TabPerfProfile.ts | 3 +- .../sheet/native-memory/TabPaneNMCallTree.ts | 12 +++-- .../logic-worker/ProcedureLogicWorkerPerf.ts | 51 ++++++++++--------- 10 files changed, 81 insertions(+), 67 deletions(-) diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index 6146e7bcc..f7d154f4e 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -688,6 +688,7 @@ export class SpRecordTrace extends BaseElement { this.deviceVersion.onchange = (): void => { let versionItem = this.deviceVersion!.options[this.deviceVersion!.selectedIndex]; SpRecordTrace.selectVersion = versionItem.getAttribute('device-version'); + this.spAllocations!.startup_mode = false; this.nativeMemoryHideBySelectVersion(); this.traceCommand!.hdcCommon = PluginConvertUtils.createHdcCmd( PluginConvertUtils.BeanToCmdTxt(this.makeRequest(), false), diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 872a2644a..a0cf012b5 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -456,6 +456,7 @@ export class SpSystemTrace extends BaseElement { } // 添加收藏时，在线程名前面追加父亲ID let rowParentId = currentRow.rowParentId; + currentRow.tampName = currentRow.name; if (rowParentId) { let parentRows = this.shadowRoot?.querySelectorAll>(`trace-row[row-id='${rowParentId}']`); parentRows?.forEach((parentRow) => { @@ -504,14 +505,7 @@ export class SpSystemTrace extends BaseElement { `div[row-id='${currentRow.rowId}-${currentRow.rowType}']` ); // 取消收藏时，删除父亲ID - let rowNameArr = currentRow.name.split('('); - if (rowNameArr.length > 1) { - let tempName = ''; - tempName += rowNameArr[0]; - currentRow.name = tempName; - } else { - currentRow.name = rowNameArr[0]; - } + currentRow.name = currentRow.tampName; if (replaceRow != null) { this.rowsEL!.replaceChild(currentRow, replaceRow); currentRow.style.boxShadow = `0 10px 10px #00000000`; diff --git a/ide/src/trace/component/chart/SpHiPerf.ts b/ide/src/trace/component/chart/SpHiPerf.ts index f8ca15bf9..5b7407d81 100644 --- a/ide/src/trace/component/chart/SpHiPerf.ts +++ b/ide/src/trace/component/chart/SpHiPerf.ts @@ -228,6 +228,8 @@ export class SpHiPerf { ${perfDataQuery.getLibName(hoverStruct!.fileId,hoverStruct!.symbolId)}
    Self Time: ${Utils.getProbablyTime(selfDur || 0)}
    + Duration: + ${Utils.getProbablyTime(hoverStruct.totalTime)}
    Event Count: ${HiPerfCallChartStruct.hoverPerfCallCutStruct?.eventCount || ''}
    ` ); @@ -516,8 +518,7 @@ export class SpHiPerf { let source: Array = []; this.stackChartMaxDepth = 1; await new Promise((resolve) => { - procedurePool.submitWithName('logic0', 'perf-callstack-chart', [type, id, eventTypeId], undefined, (res: any) => { - this.onlyOneSampleHandler(res); + procedurePool.submitWithName('logic0', 'perf-callstack-chart', [type, id, eventTypeId, (window as any).totalNS], undefined, (res: any) => { this.getAllCombineData(res, source); let maxHeight = this.stackChartMaxDepth * 20; row.funcMaxHeight = maxHeight; @@ -553,23 +554,6 @@ export class SpHiPerf { } } - onlyOneSampleHandler(res: Array) : void{ - if (res.length === 1 && res[0].totalTime === 0) { - let deepFunc = (data: HiPerfChartFrame) => { - if (data.totalTime === 0) { - data.endTime = (window as any).totalNS; - data.totalTime = data.endTime - data.startTime; - if (data.children && data.children.length > 0) { - for (const child of data.children) { - deepFunc(child); - } - } - } - }; - deepFunc(res[0]); - } - } - resetChartData(row: TraceRow) { row.dataList = []; row.dataList2 = []; diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts index a1728abcf..9d9303354 100644 --- a/ide/src/trace/component/setting/SpAllocations.ts +++ b/ide/src/trace/component/setting/SpAllocations.ts @@ -41,6 +41,7 @@ export class SpAllocations extends BaseElement { private recordStatisticsResult: HTMLDivElement | null | undefined; private filterSize: HTMLInputElement | null | undefined; + private maxProcessSize: number = 4; set startSamp(allocationStart: boolean) { if (allocationStart) { @@ -129,14 +130,26 @@ export class SpAllocations extends BaseElement { return false; } + set startup_mode(value: boolean) { + if (this.startupMode) { + this.startupMode.checked = value; + } + } + get expandPids(): number[] { let allPidList: number[] = []; if (this.processId?.value.length > 0) { let result = this.processId?.value.match(/\((.+?)\)/g); - result?.forEach((pid: string) => { - let currentPid = pid!.replace('(', '').replace(')', ''); - allPidList.push(Number(currentPid)); - }); + if (result) { + for (let index = 0; index < result.length; index++) { + let item = result[index]; + let currentPid = item!.replace('(', '').replace(')', ''); + allPidList.push(Number(currentPid)); + if (index === this.maxProcessSize - 1) { + break; + } + } + } } return allPidList; } @@ -172,17 +185,24 @@ export class SpAllocations extends BaseElement { this.processId = this.shadowRoot?.getElementById('pid') as LitSelectV; let process = this.processId.shadowRoot?.querySelector('input') as HTMLInputElement; process!.addEventListener('mousedown', (ev) => { - process.readOnly = true; - if (this.startSamp && (SpRecordTrace.serialNumber === '' || this.startup_mode)) { + if (this.startSamp) { process.readOnly = false; - this.processId?.dataSource([], ''); - } else { Cmd.getProcess().then((processList) => { this.processId?.dataSource(processList, ''); - if (processList.length > 0) { + if (processList.length > 0 && !this.startup_mode) { this.processId?.dataSource(processList, 'ALL-Process'); + } else { + this.processId?.dataSource([], ''); } }); + } else { + process.readOnly = true; + return; + } + if (this.startSamp && (SpRecordTrace.serialNumber === '' || this.startup_mode)) { + this.processId?.dataSource([], ''); + } else { + } }); this.unwindEL = this.shadowRoot?.getElementById('unwind') as HTMLInputElement; diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index 175356107..17e220666 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -153,6 +153,7 @@ export class TraceRow extends HTMLElement { private _collectGroup: string | undefined; public _frame: Rect | undefined; public isLoading: boolean = false; + public tampName: string = ''; public readonly args: any; public templateType: Array = []; private rootEL: HTMLDivElement | null | undefined; diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts index d6aed17fe..58dfb2521 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts @@ -198,6 +198,8 @@ export class TabPaneCallTree extends BaseElement { } private restore(): void { + this.searchValue = ''; + this.callTreeFilter!.filterValue = ''; this.headLine!.isShow = false; this._rowClickData = undefined; this.getCallTreeData(this.currentSelection, this.initWidth); diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts index 88214d753..b47dcc8c2 100644 --- a/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts +++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.ts @@ -174,7 +174,11 @@ export class TabpaneFilesystemCalltree extends BaseElement { funcName: 'showLibLevelData', funcArgs: [this.FsCallTreeLevel.libId, this.FsCallTreeLevel.libName], }); - } else if (this._fsRowClickData && this._fsRowClickData.symbolId !== undefined && this._currentFsCallTreeLevel === 4) { + } else if ( + this._fsRowClickData && + this._fsRowClickData.symbolId !== undefined && + this._currentFsCallTreeLevel === 4 + ) { this.FsCallTreeLevel.symbolName = this._fsRowClickData.tableName; args.push({ funcName: 'showFunLevelData', @@ -195,6 +199,8 @@ export class TabpaneFilesystemCalltree extends BaseElement { } private restore(): void { + this.searchValue = ''; + this.fsCallTreeFilter.filterValue = ''; this.headLine!.isShow = false; this._fsRowClickData = undefined; this.getFsCallTreeData(this.currentSelection, this.initWidth); diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts index 6ed79e9a7..dc4aff849 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts @@ -155,7 +155,8 @@ export class TabpanePerfProfile extends BaseElement { } private restore(): void { - // 恢复全部的火焰图和表格，并隐藏title; + this.searchValue = ''; + this.perfProfilerFilter!.filterValue = ''; this.headLine!.isShow = false; this._rowClickData = undefined; this.initGetData(this.currentSelection, this.initWidth, this.currentSelection?.perfEventTypeId); diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts index a1238f6e5..b17ca50bd 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts @@ -188,7 +188,7 @@ export class TabpaneNMCalltree extends BaseElement { }); if (that.currentSelection?.nativeMemory && that.currentSelection.nativeMemory.length > 0) { const typeName = SpSystemTrace.DATA_DICT.get(memory); - if (data.type === 'MmapEvent' && memory== -1 || data.type === typeName) { + if ((data.type === 'MmapEvent' && memory == -1) || data.type === typeName) { data.type = `${selections.length + 2}`; } } else { @@ -612,7 +612,7 @@ export class TabpaneNMCalltree extends BaseElement { }); this.nmCallTreeFilter!.getFilterData((nmCallTreeData: FilterData): void => { if (this.currentSelection!.nativeMemoryStatistic.length > 0) { - this.filterResponseSelect = ''; + this.filterResponseSelect = '0'; } if ( (this.isChartShow && nmCallTreeData.icon === 'tree') || @@ -683,12 +683,14 @@ export class TabpaneNMCalltree extends BaseElement { //点击之后删除掉筛选条件 将所有重置 将目前的title隐藏 高度恢复 this.headLine!.closeCallback = () => { this.headLine!.clear(); + this.searchValue = ''; + this.currentNMCallTreeFilter!.filterValue = ''; this._filterData = undefined; this.currentNMCallTreeFilter!.firstSelect = '0'; this.currentNMCallTreeFilter!.secondSelect = '0'; this.currentNMCallTreeFilter!.thirdSelect = '0'; this.filterAllocationType = '0'; - this.refreshAllNode(this.nmCallTreeFilter!.getFilterTreeData()); + this.refreshAllNode(this.nmCallTreeFilter!.getFilterTreeData(), true); this.initFilterTypes(); this.nmCallTreeFrameChart?.resizeChange(); }; @@ -754,7 +756,7 @@ export class TabpaneNMCalltree extends BaseElement { } } - refreshAllNode(filterData: any): void { + refreshAllNode(filterData: any, isAnalysisReset?: boolean): void { let nmCallTreeArgs: any[] = []; let isTopDown: boolean = !filterData.callTree[0]; let isHideSystemLibrary = filterData.callTree[1]; @@ -788,7 +790,7 @@ export class TabpaneNMCalltree extends BaseElement { 'nativeHookType', this.currentSelection!.nativeMemory.length > 0 ? 'native-hook' : 'native-hook-statistic' ); - if (this.lastIsExpression && !this.expressionStruct) { + if ((this.lastIsExpression && !this.expressionStruct) || isAnalysisReset) { nmCallTreeArgs.push({ funcName: 'setSearchValue', funcArgs: [this.searchValue], diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts index 0498b6e08..0f14a1a3d 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts @@ -370,34 +370,37 @@ export class ProcedureLogicWorkerPerf extends LogicHandler { // 将perf_sample表的数据根据callchain_id分组并赋值startTime,endTime等等 combinePerfSampleBycallChainId(sampleList: Array) { let arr: any = new Array(); - let num = undefined; + let newPerfData = (sample: any) : HiPerfSymbol => { + let perfSample = new HiPerfSymbol(); + perfSample.children = new Array(); + perfSample.children[0] = new HiPerfSymbol(); + perfSample.depth = -1; + perfSample.name = 'name'; + perfSample.callchain_id = sample.callchain_id; + perfSample.thread_id = sample.thread_id; + perfSample.id = sample.id; + perfSample.startTime = sample.timeTip; + perfSample.eventCount = sample.eventCount; + return perfSample; + }; for (let i = 0; i < sampleList.length; i++) { - // 若不是相同的callchain_id,赋值 - if (sampleList[i].callchain_id != num) { - let perfSample = new HiPerfSymbol(); - perfSample.children = new Array(); - perfSample.children[0] = new HiPerfSymbol(); - perfSample.depth = -1; - perfSample.name = 'name'; - perfSample.callchain_id = sampleList[i].callchain_id; - perfSample.thread_id = sampleList[i].thread_id; - perfSample.id = sampleList[i].id; - if ( - i !== 0 && - i !== sampleList.length - 1 && - sampleList[i].callchain_id !== sampleList[i - 1].callchain_id && - sampleList[i].callchain_id !== sampleList[i + 1].callchain_id - ) { - perfSample.startTime = sampleList[i - 1].timeTip; + if (arr.length > 0) { + let last = arr[arr.length -1]; + last.endTime = sampleList[i].timeTip; + last.totalTime = last.endTime - last.startTime; + if (last.callchain_id === sampleList[i].callchain_id) { + last.eventCount += sampleList[i].eventCount; } else { - perfSample.startTime = sampleList[i].timeTip; + arr.push(newPerfData(sampleList[i])); } - arr.push(perfSample); + } else { + arr.push(newPerfData(sampleList[i])); } - arr[arr.length - 1].eventCount += sampleList[i].eventCount; - arr[arr.length - 1].endTime = sampleList[i].timeTip; - arr[arr.length - 1].totalTime = arr[arr.length - 1].endTime - arr[arr.length - 1].startTime; - num = sampleList[i].callchain_id; + } + let last = arr[arr.length -1]; + if (last && last.endTime === 0) { + last.endTime = this.perfCallData[3]; + last.totalTime = last.endTime - last.startTime; } return this.combineChartData(arr); } -- Gitee From d8148ef430a49831da325ed21c5fc84921de851f Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 10:30:38 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix1.=E6=97=B6=E9=97=B4=E5=88=BB=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E9=97=AE=E9=A2=982.rowtrace?= =?UTF-8?q?=E9=80=82=E9=85=8D3.recordtemplate=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=E7=9A=84cmd=E4=BF=A1=E6=81=AF=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B94.=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/base-ui/tree/LitTreeNode.ts | 24 +- ide/src/trace/component/SpSystemTrace.ts | 18 +- .../trace/component/chart/PerfDataQuery.ts | 7 +- .../trace/component/chart/SpChartManager.ts | 12 +- ide/src/trace/component/chart/SpHiPerf.ts | 92 +-- .../component/chart/SpHiSysEnergyChart.ts | 680 ++++++++++++++++++ ide/src/trace/component/chart/SpHiSysEvent.ts | 79 -- .../component/chart/SpHiSysEventChart.ts | 678 +---------------- .../component/setting/SpRecordTemplate.ts | 2 +- .../trace/component/trace/base/Extension.ts | 2 - .../component/trace/base/TraceRowConfig.ts | 1 + .../trace/component/trace/base/TraceSheet.ts | 23 +- .../component/trace/sheet/TabPaneFilter.ts | 6 +- .../sheet/energy/TabPaneEnergyAnomaly.ts | 6 +- .../trace/sheet/energy/TabPanePowerBattery.ts | 6 +- .../trace/sheet/energy/TabPanePowerDetails.ts | 6 +- .../sheet/energy/TabPaneSystemDetails.ts | 4 +- .../trace/sheet/hiperf/TabPanePerfAnalysis.ts | 5 +- .../sheet/hisysevent/TabPaneHisysEvents.ts | 4 +- .../sheet/native-memory/TabPaneNMCallTree.ts | 5 +- .../component/trace/timer-shaft/RangeRuler.ts | 2 +- ide/src/trace/database/ConvertTraceWorker.ts | 43 +- ide/src/trace/database/SqlLite.ts | 14 +- ide/src/trace/database/TraceWorker.ts | 76 +- .../logic-worker/ProcedureLogicWorkerPerf.ts | 22 +- 25 files changed, 962 insertions(+), 855 deletions(-) create mode 100644 ide/src/trace/component/chart/SpHiSysEnergyChart.ts delete mode 100644 ide/src/trace/component/chart/SpHiSysEvent.ts diff --git a/ide/src/base-ui/tree/LitTreeNode.ts b/ide/src/base-ui/tree/LitTreeNode.ts index 3bae8087c..5b8e18f20 100644 --- a/ide/src/base-ui/tree/LitTreeNode.ts +++ b/ide/src/base-ui/tree/LitTreeNode.ts @@ -14,9 +14,7 @@ */ import '../icon/LitIcon.js'; -import '../checkbox/LitCheckBox.js'; import { BaseElement, element } from '../BaseElement.js'; -import { type LitCheckBox } from '../checkbox/LitCheckBox.js'; import { type LitIcon } from '../icon/LitIcon.js'; import { type TreeItemData } from './LitTree.js'; @@ -24,7 +22,7 @@ import { type TreeItemData } from './LitTree.js'; export class LitTreeNode extends BaseElement { private arrowElement: HTMLSpanElement | null | undefined; private itemElement: HTMLDivElement | null | undefined; - private checkboxElement: LitCheckBox | null | undefined; + private checkboxElement: HTMLInputElement | null | undefined; private iconElement: LitIcon | null | undefined; private _data: TreeItemData | null | undefined; @@ -145,23 +143,7 @@ export class LitTreeNode extends BaseElement { this.arrowElement = this.shadowRoot!.querySelector('#arrow'); this.iconElement = this.shadowRoot!.querySelector('#icon'); this.itemElement = this.shadowRoot!.querySelector('#item'); - this.checkboxElement = this.shadowRoot!.querySelector('#checkbox'); - this.arrowElement!.onclick = (e): void => { - e.stopPropagation(); - this.autoExpand(); - }; - this.checkboxElement!.onchange = (e: any): boolean => { - e.stopPropagation(); - if (this._data && this._data.disable === true) { - return false; - } - this.onChange(e.detail.checked); - return false; - }; - //这里需要给checkbox 添加onclick时间 并停止冒泡，不然onchange事件会触发父节点中的 onclick事件 - this.checkboxElement!.onclick = (e): void => { - e.stopPropagation(); - }; + this.checkboxElement = this.shadowRoot!.querySelector('#checkbox'); this.itemElement!.onclick = (e): void => { e.stopPropagation(); if (this._data && this._data.disable === true) { @@ -333,7 +315,7 @@ export class LitTreeNode extends BaseElement {
    - + ${this.title}
    diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index a0cf012b5..937456b8b 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -852,14 +852,15 @@ export class SpSystemTrace extends BaseElement { if (it.rowType === TraceRow.ROW_TYPE_PERF_CALLCHART) { let setting = it.getRowSettingKeys(); if (setting && setting.length > 0) { - // 0:cpu,1:thread - let type = setting[0].indexOf('c') > -1 ? 0 : 1; - let id = Number(setting[0].indexOf('c') > -1 ? - setting[0].substring(0, setting[0].indexOf('c')) : setting[0].substring(0, setting[0].indexOf('t'))); - if (type === 0) { - selection.perfCpus.push(id); - } else { + //type 0:cpu,1:process,2:thread + let key: string = setting[0]; + let id = Number(key.split('-')[0]); + if (key.includes('p')) { + selection.perfProcess.push(id); + } else if (key.includes('t')) { selection.perfThread.push(id); + } else { + selection.perfCpus.push(id); } } } @@ -3676,9 +3677,6 @@ export class SpSystemTrace extends BaseElement { it.checkType = data.isCheck ? '2' : '0'; }); }); - window.subscribe(window.SmartEvent.UI.ProcessSwitch, (data) => { - this.traceSheetEL?.updateRangeSelect(data); - }); window.subscribe(window.SmartEvent.UI.HoverNull, () => this.hoverStructNull()); } diff --git a/ide/src/trace/component/chart/PerfDataQuery.ts b/ide/src/trace/component/chart/PerfDataQuery.ts index bd78066c5..9de3f4ff3 100644 --- a/ide/src/trace/component/chart/PerfDataQuery.ts +++ b/ide/src/trace/component/chart/PerfDataQuery.ts @@ -51,16 +51,17 @@ export class PerfDataQuery { } getLibName(fileId: number, symbolId: number) { + let name = 'unknown'; if (symbolId == -1) { if (this.filesData[fileId] && this.filesData[fileId].length > 0) { - return this.filesData[fileId][0].fileName; + name = this.filesData[fileId][0].fileName; } } else { if (this.filesData[fileId] && this.filesData[fileId].length > symbolId) { - return this.filesData[fileId][symbolId].fileName; + name = this.filesData[fileId][symbolId].fileName; } } - return 'unknown'; + return name.replace(//g, '>'); } } diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index d9e4157b5..ab9f3a907 100644 --- a/ide/src/trace/component/chart/SpChartManager.ts +++ b/ide/src/trace/component/chart/SpChartManager.ts @@ -35,7 +35,7 @@ import { perfDataQuery } from './PerfDataQuery.js'; import { SpVirtualMemChart } from './SpVirtualMemChart.js'; import { SpFileSystemChart } from './SpFileSystemChart.js'; import { SpSdkChart } from './SpSdkChart.js'; -import { SpHiSysEventChart } from './SpHiSysEventChart.js'; +import { SpHiSysEnergyChart } from './SpHiSysEnergyChart.js'; import { VmTrackerChart } from './SpVmTrackerChart.js'; import { SpClockChart } from './SpClockChart.js'; import { SpIrqChart } from './SpIrqChart.js'; @@ -48,7 +48,7 @@ import { SpArkTsChart } from './SpArkTsChart.js'; import { MemoryConfig } from '../../bean/MemoryConfig.js'; import { FlagsConfig } from '../SpFlags.js'; import { SpLogChart } from './SpLogChart.js'; -import { SpHiSysEvent } from './SpHiSysEvent.js'; +import { SpHiSysEventChart } from './SpHiSysEventChart.js'; export class SpChartManager { static APP_STARTUP_PID_ARR: Array = []; @@ -64,14 +64,14 @@ export class SpChartManager { private process: SpProcessChart; private fileSystem: SpFileSystemChart; private sdkChart: SpSdkChart; - private hiSyseventChart: SpHiSysEventChart; + private hiSyseventChart: SpHiSysEnergyChart; private smapsChart: VmTrackerChart; private clockChart: SpClockChart; private irqChart: SpIrqChart; frameTimeChart: SpFrameTimeChart; public arkTsChart: SpArkTsChart; private logChart: SpLogChart; - private spHiSysEvent: SpHiSysEvent; + private spHiSysEvent: SpHiSysEventChart; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -85,14 +85,14 @@ export class SpChartManager { this.abilityMonitor = new SpAbilityMonitorChart(trace); this.process = new SpProcessChart(trace); this.sdkChart = new SpSdkChart(trace); - this.hiSyseventChart = new SpHiSysEventChart(trace); + this.hiSyseventChart = new SpHiSysEnergyChart(trace); this.smapsChart = new VmTrackerChart(trace); this.clockChart = new SpClockChart(trace); this.irqChart = new SpIrqChart(trace); this.frameTimeChart = new SpFrameTimeChart(trace); this.arkTsChart = new SpArkTsChart(trace); this.logChart = new SpLogChart(trace); - this.spHiSysEvent = new SpHiSysEvent(trace); + this.spHiSysEvent = new SpHiSysEventChart(trace); } async init(progress: Function) { diff --git a/ide/src/trace/component/chart/SpHiPerf.ts b/ide/src/trace/component/chart/SpHiPerf.ts index 5b7407d81..2068e512f 100644 --- a/ide/src/trace/component/chart/SpHiPerf.ts +++ b/ide/src/trace/component/chart/SpHiPerf.ts @@ -219,11 +219,13 @@ export class SpHiPerf { hoverStruct?.children?.forEach(child => { selfDur -= child.totalTime; }); + let callName = HiPerfCallChartStruct.hoverPerfCallCutStruct?.name || ''; + callName = callName.replace(//g, '>'); this.trace?.displayTip( perfCallCutRow!, HiPerfCallChartStruct.hoverPerfCallCutStruct, `Name: - ${HiPerfCallChartStruct.hoverPerfCallCutStruct?.name || ''}
    + ${callName}
    Lib: ${perfDataQuery.getLibName(hoverStruct!.fileId,hoverStruct!.symbolId)}
    Self Time: @@ -244,54 +246,58 @@ export class SpHiPerf { } async setCallTotalRow(row: TraceRow, cpuData: any = Array, threadData: any = Array) { + let pt: Map = threadData.reduce((map: Map, current: any) => { + const key = `${current.processName || 'Process'}(${current.pid})`; + const thread = { + key: `${current.tid}-t`, + title: `${current.threadName || 'Thread'}(${current.tid})` + } + if (map.has(key)) { + if (map.get(key).children) { + map.get(key).children.push(thread); + } else { + map.get(key).children = [thread]; + } + } else { + map.set(key, { + key: `${current.pid}-p`, + title: key, + children: [thread], + disable: true + }); + } + return map; + }, new Map()); row.addTemplateTypes('hiperf-callchart'); row.rowSetting = 'enable'; row.rowSettingList = [ - { - key: "cpu", - title: 'Cpu', - disable: true, - children: [ - ...cpuData.reverse().map((it: any): { - key: string; - title: string; - checked?: boolean - } => { - return { - key: `${it.cpu_id}c`, - checked: it.cpu_id === 0, - title: `cpu${it.cpu_id}`, - }; - } - ), - ] - }, - { - key: "thread", - title: 'Thread', - disable: true, - children: [ - ...threadData.map( - (it: any): { - key: string; - title: string; - } => { - return { - key: `${it.tid}t`, - title: `${it.threadName || 'Thread'}(${it.tid})` - } - } - ) - ] - } + ...cpuData.reverse().map((it: any): { + key: string; + title: string; + checked?: boolean + } => { + return { + key: `${it.cpu_id}-c`, + checked: it.cpu_id === 0, + title: `cpu${it.cpu_id}`, + }; + } + ), + ...Array.from(pt.values()) ]; row.onRowSettingChangeHandler = (setting: any, nodes): void => { if (setting && setting.length > 0) { - // 0:cpu,1:thread - let key = setting[0]; - let type = key.indexOf('c') > -1 ? 0 : 1; - let id = Number(key.indexOf('c') > -1 ? - key.substring(0, key.indexOf('c')) : key.substring(0, key.indexOf('t'))); + //type 0:cpu,1:process,2:thread + let key: string = setting[0]; + let type = this.callChartType; + if (key.includes('p')) { + type = 1; + } else if (key.includes('t')) { + type = 2; + } else { + type = 0; + } + let id = Number(key.split('-')[0]); if (this.callChartType === type && this.callChartId === id) { return; } diff --git a/ide/src/trace/component/chart/SpHiSysEnergyChart.ts b/ide/src/trace/component/chart/SpHiSysEnergyChart.ts new file mode 100644 index 000000000..077abaa88 --- /dev/null +++ b/ide/src/trace/component/chart/SpHiSysEnergyChart.ts @@ -0,0 +1,680 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { SpSystemTrace } from '../SpSystemTrace.js'; +import { + queryAnomalyData, + queryConfigEnergyAppName, + queryEnergyEventExits, + queryMaxStateValue, + queryPowerData, + queryStateData, + queryStateInitValue, + queryEnergyAppName, + querySystemLocationData, + querySystemLockData, + querySystemSchedulerData, +} from '../../database/SqlLite.js'; +import { info } from '../../../log/Log.js'; +import { TraceRow } from '../trace/base/TraceRow.js'; +import { BaseStruct } from '../../bean/BaseStruct.js'; +import { LitPopover } from '../../../base-ui/popover/LitPopoverV.js'; +import { EnergyAnomalyRender, EnergyAnomalyStruct } from '../../database/ui-worker/ProcedureWorkerEnergyAnomaly.js'; +import { EnergySystemStruct, EnergySystemRender } from '../../database/ui-worker/ProcedureWorkerEnergySystem.js'; +import { EnergyPowerStruct, EnergyPowerRender } from '../../database/ui-worker/ProcedureWorkerEnergyPower.js'; +import { EnergyStateStruct, EnergyStateRender } from '../../database/ui-worker/ProcedureWorkerEnergyState.js'; +import { renders } from '../../database/ui-worker/ProcedureWorker.js'; +import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; + +export class SpHiSysEnergyChart { + static app_name: string | null; + private trace: SpSystemTrace; + private energyTraceRow: TraceRow | undefined; + private timer: any; + + constructor(trace: SpSystemTrace) { + this.trace = trace; + } + + async init() { + let result = await queryEnergyEventExits(); + if (result.length <= 0) return; + await this.initEnergyRow(); + await this.initAnomaly(); + await this.initSystem(); + await this.initPower(); + await this.initState(); + } + + private initEnergyRow = async () => { + SpHiSysEnergyChart.app_name = ''; + let appNameFromTable = await queryEnergyAppName(); + let configAppName = await queryConfigEnergyAppName(); + if (configAppName.length > 0 && appNameFromTable.length > 0) { + let name = configAppName[0].process_name; + if (name != null) { + let filterList = appNameFromTable.filter((appNameFromTableElement) => { + return appNameFromTableElement.string_value?.trim() == name; + }); + if (filterList.length > 0) { + SpHiSysEnergyChart.app_name = name; + } + } + } + if (appNameFromTable.length > 0 && SpHiSysEnergyChart.app_name == '') { + SpHiSysEnergyChart.app_name = appNameFromTable[0].string_value; + } + this.energyTraceRow = TraceRow.skeleton(); + let appNameList = this.energyTraceRow?.shadowRoot!.querySelector('#appNameList'); + let addFlag = false; + appNameList?.addEventListener('click', () => { + let itemDiv = appNameList!.querySelector('div'); + if (!addFlag) { + for (let index = 0; index < appNameFromTable.length; index++) { + let div = document.createElement('div'); + div.setAttribute('style', 'margin-bottom: 5px'); + let appName = appNameFromTable[index].string_value; + // @ts-ignore + let formatAppName = 'appName' + index; + div.setAttribute('id', formatAppName); + let inputId = 'appName' + index + 1; + div.innerHTML = + " '; + itemDiv!.append(div); + let appList = this.energyTraceRow?.shadowRoot!.querySelectorAll( + 'input[type=radio][name=processoption]' + ); + appList!.forEach((appName) => [ + (appName.onclick = (e: MouseEvent) => { + if (appName.checked) { + SpHiSysEnergyChart.app_name = appName.getAttribute('value'); + TraceRow.range!.refresh = true; + // @ts-ignore + appNameList!.visible = false; + this.trace.refreshCanvas(false); + } + }), + ]); + } + addFlag = true; + } + }); + + this.energyTraceRow.rowId = `energy`; + this.energyTraceRow.rowType = TraceRow.ROW_TYPE_ENERGY; + this.energyTraceRow.rowParentId = ''; + this.energyTraceRow.folder = true; + this.energyTraceRow.addTemplateTypes('EnergyEvent'); + this.energyTraceRow.name = 'Energy'; + this.energyTraceRow.style.height = '40px'; + this.energyTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + this.energyTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + this.energyTraceRow.supplier = () => new Promise>((resolve) => resolve([])); + this.energyTraceRow.onThreadHandler = (useCache) => { + this.energyTraceRow?.canvasSave(this.trace.canvasPanelCtx!); + if (this.energyTraceRow!.expansion) { + this.trace.canvasPanelCtx?.clearRect(0, 0, this.energyTraceRow!.frame.width, this.energyTraceRow!.frame.height); + } else { + (renders['empty'] as EmptyRender).renderMainThread( + { + context: this.trace.canvasPanelCtx, + useCache: useCache, + type: ``, + }, + this.energyTraceRow! + ); + } + this.energyTraceRow?.canvasRestore(this.trace.canvasPanelCtx!); + }; + this.energyTraceRow.addEventListener('expansion-change', () => { + TraceRow.range!.refresh = true; + this.trace.refreshCanvas(false); + if (this.timer) { + clearTimeout(this.timer); + } + this.timer = setTimeout(() => { + TraceRow.range!.refresh = false; + }, 200); + }); + this.trace.rowsEL?.appendChild(this.energyTraceRow!); + }; + + private initAnomaly = async () => { + let time = new Date().getTime(); + let anomalyTraceRow = TraceRow.skeleton(); + anomalyTraceRow.rowParentId = `energy`; + anomalyTraceRow.rowHidden = true; + anomalyTraceRow.rowId = 'energy-anomaly'; + anomalyTraceRow.rowType = TraceRow.ROW_TYPE_ANOMALY_ENERGY; + anomalyTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + anomalyTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + anomalyTraceRow.setAttribute('height', `55px`); + let element = anomalyTraceRow.shadowRoot?.querySelector('.root') as HTMLDivElement; + element!.style.height = `55px`; + anomalyTraceRow.style.width = `100%`; + anomalyTraceRow.setAttribute('children', ''); + anomalyTraceRow.name = 'Anomaly Event'; + anomalyTraceRow.supplier = () => queryAnomalyData(); + anomalyTraceRow.focusHandler = () => { + this.trace?.displayTip( + anomalyTraceRow, + EnergyAnomalyStruct.hoverEnergyAnomalyStruct, + `AnomalyName:${EnergyAnomalyStruct.hoverEnergyAnomalyStruct?.eventName || ''}` + ); + }; + anomalyTraceRow.findHoverStruct = () => { + EnergyAnomalyStruct.hoverEnergyAnomalyStruct = anomalyTraceRow.getHoverStruct(); + }; + anomalyTraceRow.onThreadHandler = (useCache) => { + let context: CanvasRenderingContext2D; + if (anomalyTraceRow.currentContext) { + context = anomalyTraceRow.currentContext; + } else { + context = anomalyTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + anomalyTraceRow.canvasSave(context); + (renders['energyAnomaly'] as EnergyAnomalyRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `energyAnomaly`, + appName: SpHiSysEnergyChart.app_name || '', + canvasWidth: this.trace.canvasPanel?.width || 0, + }, + anomalyTraceRow + ); + anomalyTraceRow.canvasRestore(context); + }; + this.energyTraceRow?.addChildTraceRow(anomalyTraceRow); + let durTime = new Date().getTime() - time; + info('The time to load the anomaly is: ', durTime); + }; + + private initSystem = async () => { + let time = new Date().getTime(); + let systemTraceRow = TraceRow.skeleton(); + systemTraceRow.rowParentId = `energy`; + systemTraceRow.rowHidden = true; + systemTraceRow.rowId = 'energy-system'; + systemTraceRow.rowType = TraceRow.ROW_TYPE_SYSTEM_ENERGY; + systemTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + systemTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + systemTraceRow.setAttribute('height', `80px`); + let element = systemTraceRow.shadowRoot?.querySelector('.root') as HTMLDivElement; + element!.style.height = `90px`; + systemTraceRow.style.width = `100%`; + systemTraceRow.setAttribute('children', ''); + systemTraceRow.name = 'System Event'; + systemTraceRow.supplier = () => + Promise.all([querySystemLocationData(), querySystemLockData(), querySystemSchedulerData()]).then((result) => { + return this.getSystemData(result); + }); + systemTraceRow.focusHandler = () => { + this.trace?.displayTip( + systemTraceRow, + EnergySystemStruct.hoverEnergySystemStruct, + `
    +
    WORKSCHEDULER:
    ${ + EnergySystemStruct.hoverEnergySystemStruct?.workScheduler! || 0 + }
    +
    POWER_RUNNINGLOCK:
    ${ + EnergySystemStruct.hoverEnergySystemStruct?.power! || 0 + }
    +
    LOCATION:
    ${ + EnergySystemStruct.hoverEnergySystemStruct?.location! || 0 + }
    +
    ` + ); + }; + systemTraceRow.findHoverStruct = () => { + EnergySystemStruct.hoverEnergySystemStruct = systemTraceRow.getHoverStruct(); + }; + systemTraceRow.onThreadHandler = (useCache) => { + let context: CanvasRenderingContext2D; + if (systemTraceRow.currentContext) { + context = systemTraceRow.currentContext; + } else { + context = systemTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + systemTraceRow.canvasSave(context); + (renders['energySystem'] as EnergySystemRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `energySystem`, + }, + systemTraceRow + ); + systemTraceRow.canvasRestore(context); + }; + this.energyTraceRow?.addChildTraceRow(systemTraceRow); + let durTime = new Date().getTime() - time; + info('The time to load the Ability Memory is: ', durTime); + }; + + getSystemData(result: any): Promise { + let systemDataList: any = {}; + if (result.length == 0) { + return Promise.resolve([]); + } + systemDataList[0] = this.handleLockData(result); + systemDataList[1] = this.handleLocationData(result); + systemDataList[2] = this.handleWorkData(result); + return systemDataList; + } + + private handleLocationData(result: Array>) { + let locationIndex = -1; + let locationCount = 0; + let locationData: any[] = []; + result[0].forEach((item: any) => { + let da: any = {}; + if (item.Value == 'stop') { + if (locationIndex == -1) { + da.startNs = 0; + da.count = 1; + } else { + da.startNs = item.ts; + locationCount--; + da.count = locationCount; + } + da.state = 'stop'; + } else { + da.startNs = item.ts; + locationCount++; + da.count = locationCount; + da.state = 'start'; + } + locationIndex = 0; + da.type = 2; + locationData.push(da); + }); + return locationData; + } + + private handleLockData(result: Array>) { + let lockCount = 0; + let tokedIds: Array = []; + let lockData: any[] = []; + result[1].forEach((item: any) => { + let running: any = {}; + let split = item.Value.split(','); + if (item.Value.indexOf('ADD') > -1) { + running.startNs = item.ts; + lockCount++; + running.count = lockCount; + running.token = split[0].split('=')[1]; + running.type = 1; + tokedIds.push(running.token); + lockData.push(running); + } else { + running.startNs = item.ts; + let toked = split[0].split('=')[1]; + let number = tokedIds.indexOf(toked); + if (number > -1) { + lockCount--; + running.count = lockCount; + running.token = split[0].split('=')[1]; + running.type = 1; + lockData.push(running); + delete tokedIds[number]; + } + } + }); + + return lockData; + } + + private handleWorkData(result: Array>) { + let workDataArray = result[2]; + let workCountMap: Map = new Map(); + let nameIdMap: Map> = new Map(); + let workData: any[] = []; + for (let i = 0; i < workDataArray.length; i++) { + let dd: any = {}; + let item = workDataArray[i]; + let keys = item.appKey.split(','); + let values = item.Value.split(','); + for (let j = 0; j < keys.length; j++) { + let key = keys[j]; + switch (key) { + case 'NAME': + dd.appName = values[j]; + break; + case 'WORKID': + dd.workId = values[j]; + break; + } + } + if (item.eventName == 'WORK_START') { + let nameIdList = nameIdMap.get(dd.appName); + let workCount = 0; + if (nameIdList == undefined) { + workCount = 1; + nameIdMap.set(dd.appName, [dd.workId]); + } else { + nameIdList.push(dd.workId); + workCount = nameIdList.length; + } + let count = workCountMap.get(dd.appName); + if (count == undefined) { + workCountMap.set(dd.appName, 1); + } else { + workCountMap.set(dd.appName, count + 1); + } + dd.startNs = item.ts; + dd.count = workCount; + dd.type = 0; + workData.push(dd); + } else if (item.eventName == 'WORK_STOP') { + let nameIdList: any = nameIdMap.get(dd.appName); + let index = nameIdList.indexOf(dd.workId); + if (nameIdList != undefined && index > -1) { + delete nameIdList[index]; + let workCount = workCountMap.get(dd.appName); + if (workCount != undefined) { + workCount = workCount - 1; + workCountMap.set(dd.appName, workCount); + dd.startNs = item.startNS; + dd.count = workCount; + dd.type = 0; + workData.push(dd); + } + } + } + } + return workData; + } + + private initPower = async () => { + let time = new Date().getTime(); + let powerTraceRow = TraceRow.skeleton(); + powerTraceRow.rowParentId = `energy`; + powerTraceRow.rowHidden = true; + powerTraceRow.rowId = 'energy-power'; + powerTraceRow.rowType = TraceRow.ROW_TYPE_POWER_ENERGY; + powerTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + powerTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + powerTraceRow.setAttribute('height', `200px`); + let element = powerTraceRow.shadowRoot?.querySelector('.root') as HTMLDivElement; + element!.style.height = `200px`; + powerTraceRow.style.width = `100%`; + powerTraceRow.setAttribute('children', ''); + powerTraceRow.name = 'Power'; + powerTraceRow.supplier = () => + queryPowerData().then((items) => { + return this.getPowerData(items); + }); + powerTraceRow.findHoverStruct = () => { + EnergyPowerStruct.hoverEnergyPowerStruct = powerTraceRow.getHoverStruct(); + }; + powerTraceRow.focusHandler = () => { + this.trace?.displayTip( + powerTraceRow, + EnergyPowerStruct.hoverEnergyPowerStruct, + `
    +
    CPU:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.cpu! || 0 + }
    +
    location:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.location! || 0 + }
    +
    GPU:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.gpu! || 0 + }
    +
    display:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.display! || 0 + }
    +
    camera:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.camera! || 0 + }
    +
    bluetooth:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.bluetooth! || 0 + }
    +
    flashlight:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.flashlight! || 0 + }
    +
    audio:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.audio! || 0 + }
    +
    wifiScan:
    ${ + EnergyPowerStruct.hoverEnergyPowerStruct?.wifiscan! || 0 + }
    +
    ` + ); + }; + powerTraceRow.onThreadHandler = (useCache) => { + let context: CanvasRenderingContext2D; + if (powerTraceRow.currentContext) { + context = powerTraceRow.currentContext; + } else { + context = powerTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + powerTraceRow.canvasSave(context); + (renders['energyPower'] as EnergyPowerRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `energyPower`, + appName: SpHiSysEnergyChart.app_name || '', + }, + powerTraceRow! + ); + powerTraceRow!.canvasRestore(context); + }; + this.energyTraceRow?.addChildTraceRow(powerTraceRow); + let durTime = new Date().getTime() - time; + info('The time to load the energy power is: ', durTime); + }; + + async getPowerData(items: any): Promise { + let powerDataMap: any = {}; + let appNameList: any = []; + items.forEach((item: any) => { + let dataItem = powerDataMap[item.startNS]; + if (dataItem == undefined) { + if (item.appKey == 'APPNAME') { + let appMap: any = {}; + let appNames = item.eventValue.split(','); + appNameList = appNames; + if (appNames.length > 0) { + for (let appNamesKey of appNames) { + appMap[appNamesKey] = new EnergyPowerStruct(); + appMap[appNamesKey].name = appNamesKey; + appMap[appNamesKey].ts = item.startNS; + } + powerDataMap[item.startNS] = appMap; + } + } + } else { + if (item.appKey != 'APPNAME') { + let values = item.eventValue.split(','); + for (let i = 0; i < values.length; i++) { + let appName = appNameList[i]; + let obj = dataItem[appName]; + if (obj != undefined) { + let eventName = item.eventName.split('_'); + let s = eventName[eventName.length - 1].toLocaleLowerCase(); + if (obj[s] == undefined) { + obj[s] = parseInt(values[i]); + } else { + obj[s] += parseInt(values[i]); + } + } + } + } else { + let dataMap = powerDataMap[item.startNS]; + let appNames = item.eventValue.split(','); + appNameList = appNames; + if (appNames.length > 0) { + for (let appNamesKey of appNames) { + dataMap[appNamesKey] = new EnergyPowerStruct(); + dataMap[appNamesKey].name = appNamesKey; + dataMap[appNamesKey].ts = item.startNS; + } + } + } + } + }); + // @ts-ignore + return Object.values(powerDataMap); + } + + private initState = async () => { + let time = new Date().getTime(); + let stateList = [ + 'Brightness Nit', + 'Signal Level', + 'Wifi Event Received', + 'Audio Stream Change', + 'Audio Volume Change', + 'Wifi State', + 'Bluetooth Br Switch State', + 'Br Switch State', + 'Location Switch State', + 'Sensor State', + ]; + let stateName = [ + 'BRIGHTNESS_NIT', + 'SIGNAL_LEVEL', + 'WIFI_EVENT_RECEIVED', + 'AUDIO_STREAM_CHANGE', + 'AUDIO_VOLUME_CHANGE', + 'WIFI_STATE', + 'BLUETOOTH_BR_SWITCH_STATE', + 'BR_SWITCH_STATE', + 'LOCATION_SWITCH_STATE', + 'SENSOR_STATE', + ]; + let initValueList = [ + 'brightness', + 'nocolumn', + 'nocolumn', + 'nocolumn', + 'nocolumn', + 'wifi', + 'bt_state', + 'bt_state', + 'location', + 'nocolumn', + ]; + + for (let index = 0; index < stateList.length; index++) { + let maxStateData = await queryMaxStateValue(stateName[index]); + if (!maxStateData[0]) { + continue; + } + let maxStateTotal = maxStateData[0].maxValue.toString(); + let statType = maxStateData[0].type.toLocaleLowerCase(); + if (statType.includes('state') && !statType.endsWith('br_switch_state')) { + if (maxStateData[0].maxValue == 0) { + maxStateTotal = 'enable'; + } else { + maxStateTotal = 'disable'; + } + } + let stateTraceRow = TraceRow.skeleton(); + stateTraceRow.rowParentId = `energy`; + stateTraceRow.rowHidden = true; + stateTraceRow.rowId = `energy-state-${stateList[index]}`; + stateTraceRow.rowType = TraceRow.ROW_TYPE_STATE_ENERGY; + stateTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + stateTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + stateTraceRow.style.height = '40px'; + stateTraceRow.style.width = `100%`; + stateTraceRow.setAttribute('children', ''); + stateTraceRow.name = `${stateList[index]}`; + stateTraceRow.supplier = () => + Promise.all([ + queryStateInitValue(stateName[index], initValueList[index]), + queryStateData(stateName[index]), + ]).then((result) => { + let stateInitValue = initValueList[index] == 'nocolumn' ? [] : result[0]; + return stateInitValue.concat(result[1]); + }); + stateTraceRow.findHoverStruct = () => { + EnergyStateStruct.hoverEnergyStateStruct = stateTraceRow.getHoverStruct(); + }; + stateTraceRow.focusHandler = () => { + let tip = ''; + if (EnergyStateStruct.hoverEnergyStateStruct?.type!.toLocaleLowerCase().includes('state')) { + tip = `Switch Status: ${ + EnergyStateStruct.hoverEnergyStateStruct?.value == 1 ? 'disable' : 'enable' + }`; + if (EnergyStateStruct.hoverEnergyStateStruct?.type!.toLocaleLowerCase().endsWith('br_switch_state')) { + tip = `${SpHiSysEnergyChart.getBlueToothState( + EnergyStateStruct.hoverEnergyStateStruct?.value + )}`; + } + } else { + tip = `value: ${EnergyStateStruct.hoverEnergyStateStruct?.value || 0}`; + } + this.trace?.displayTip(stateTraceRow, EnergyStateStruct.hoverEnergyStateStruct, tip); + }; + stateTraceRow.onThreadHandler = (useCache) => { + let context: CanvasRenderingContext2D; + if (stateTraceRow.currentContext) { + context = stateTraceRow.currentContext; + } else { + context = stateTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + } + stateTraceRow.canvasSave(context); + (renders['energyState'] as EnergyStateRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `energyState${index}`, + maxState: maxStateData[0].maxValue, + maxStateName: + maxStateData[0].type.toLocaleLowerCase().endsWith('br_switch_state') ? '-1' : maxStateTotal.toString(), + }, + stateTraceRow + ); + stateTraceRow.canvasRestore(context); + }; + this.energyTraceRow?.addChildTraceRow(stateTraceRow); + let durTime = new Date().getTime() - time; + info('The time to load the Ability Memory is: ', durTime); + } + }; + + public static getBlueToothState(num: number | undefined): string { + switch (num) { + case 0: + return 'STATE_TURNING_ON'; + case 1: + return 'STATE_TURN_ON'; + case 2: + return 'STATE_TURNING_OFF'; + case 3: + return 'STATE_TURN_OFF'; + default: + return 'UNKNOWN_STATE'; + } + } +} diff --git a/ide/src/trace/component/chart/SpHiSysEvent.ts b/ide/src/trace/component/chart/SpHiSysEvent.ts deleted file mode 100644 index 1c735f7b7..000000000 --- a/ide/src/trace/component/chart/SpHiSysEvent.ts +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -import { SpSystemTrace } from '../SpSystemTrace.js'; -import { TraceRow } from '../trace/base/TraceRow.js'; -import { renders } from '../../database/ui-worker/ProcedureWorker.js'; -import { HiSysEventRender, HiSysEventStruct } from '../../database/ui-worker/ProcedureWorkerHiSysEvent.js'; -import { queryHiSysEventData } from '../../database/SqlLite.js'; - -export class SpHiSysEvent { - private trace: SpSystemTrace; - - constructor(trace: SpSystemTrace) { - this.trace = trace; - } - - async init(): Promise { - let hiSysEventData = await queryHiSysEventData(); - if (hiSysEventData.length === 0) { - return; - } - let eventRow = await this.initRow(hiSysEventData); - this.trace.rowsEL?.appendChild(eventRow); - } - async initRow(hiSysEventData: HiSysEventStruct[]): Promise> { - let unitIndex: number = 1; - let unitHeight: number = 20; - let maxHeight: number = (Math.max(...hiSysEventData.map((it) => it.depth || 0)) + unitIndex) * unitHeight; - let hiSysEventRow = TraceRow.skeleton(); - hiSysEventRow.rowParentId = ''; - hiSysEventRow.rowId = 'Hisysevent'; - hiSysEventRow.rowType = TraceRow.ROW_TYPE_HI_SYSEVENT; - hiSysEventRow.name = 'Hisysevent'; - hiSysEventRow.style.width = '100%'; - hiSysEventRow.style.height = `${maxHeight}px`; - hiSysEventRow.setAttribute('height', `${maxHeight}`); - hiSysEventRow.setAttribute('children', ''); - hiSysEventRow.dataList = hiSysEventData; - hiSysEventRow.supplier = (): Promise => - new Promise((resolve): void => { - resolve(hiSysEventData); - }); - hiSysEventRow.addTemplateTypes('Hisysevent'); - hiSysEventRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - hiSysEventRow.selectChangeHandler = this.trace.selectChangeHandler; - hiSysEventRow.onThreadHandler = (useCache: boolean): void => { - let context: CanvasRenderingContext2D; - if (hiSysEventRow.currentContext) { - context = hiSysEventRow.currentContext; - } else { - context = hiSysEventRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; - } - hiSysEventRow!.canvasSave(context); - (renders.hiSysEvent as HiSysEventRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'hisys_event', - }, - hiSysEventRow! - ); - hiSysEventRow!.canvasRestore(context); - }; - return hiSysEventRow; - } -} \ No newline at end of file diff --git a/ide/src/trace/component/chart/SpHiSysEventChart.ts b/ide/src/trace/component/chart/SpHiSysEventChart.ts index 06f8adab1..024259087 100644 --- a/ide/src/trace/component/chart/SpHiSysEventChart.ts +++ b/ide/src/trace/component/chart/SpHiSysEventChart.ts @@ -14,667 +14,65 @@ */ import { SpSystemTrace } from '../SpSystemTrace.js'; -import { - queryAnomalyData, - queryConfigSysEventAppName, - queryHisystemEventExits, - queryMaxStateValue, - queryPowerData, - queryStateData, - queryStateInitValue, - querySyseventAppName, - querySystemLocationData, - querySystemLockData, - querySystemSchedulerData, -} from '../../database/SqlLite.js'; -import { info } from '../../../log/Log.js'; import { TraceRow } from '../trace/base/TraceRow.js'; -import { BaseStruct } from '../../bean/BaseStruct.js'; -import { LitPopover } from '../../../base-ui/popover/LitPopoverV.js'; -import { EnergyAnomalyRender, EnergyAnomalyStruct } from '../../database/ui-worker/ProcedureWorkerEnergyAnomaly.js'; -import { EnergySystemStruct, EnergySystemRender } from '../../database/ui-worker/ProcedureWorkerEnergySystem.js'; -import { EnergyPowerStruct, EnergyPowerRender } from '../../database/ui-worker/ProcedureWorkerEnergyPower.js'; -import { EnergyStateStruct, EnergyStateRender } from '../../database/ui-worker/ProcedureWorkerEnergyState.js'; import { renders } from '../../database/ui-worker/ProcedureWorker.js'; -import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; +import { HiSysEventRender, HiSysEventStruct } from '../../database/ui-worker/ProcedureWorkerHiSysEvent.js'; +import { queryHiSysEventData } from '../../database/SqlLite.js'; export class SpHiSysEventChart { - static app_name: string | null; private trace: SpSystemTrace; - private energyTraceRow: TraceRow | undefined; - private timer: any; constructor(trace: SpSystemTrace) { this.trace = trace; } - async init() { - let result = await queryHisystemEventExits(); - if (result.length <= 0) return; - await this.initEnergyRow(); - await this.initAnomaly(); - await this.initSystem(); - await this.initPower(); - await this.initState(); - } - - private initEnergyRow = async () => { - SpHiSysEventChart.app_name = ''; - let appNameFromTable = await querySyseventAppName(); - let configAppName = await queryConfigSysEventAppName(); - if (configAppName.length > 0 && appNameFromTable.length > 0) { - let name = configAppName[0].process_name; - if (name != null) { - let filterList = appNameFromTable.filter((appNameFromTableElement) => { - return appNameFromTableElement.string_value?.trim() == name; - }); - if (filterList.length > 0) { - SpHiSysEventChart.app_name = name; - } - } - } - if (appNameFromTable.length > 0 && SpHiSysEventChart.app_name == '') { - SpHiSysEventChart.app_name = appNameFromTable[0].string_value; - } - this.energyTraceRow = TraceRow.skeleton(); - let appNameList = this.energyTraceRow?.shadowRoot!.querySelector('#appNameList'); - let addFlag = false; - appNameList?.addEventListener('click', () => { - let itemDiv = appNameList!.querySelector('div'); - if (!addFlag) { - for (let index = 0; index < appNameFromTable.length; index++) { - let div = document.createElement('div'); - div.setAttribute('style', 'margin-bottom: 5px'); - let appName = appNameFromTable[index].string_value; - // @ts-ignore - let formatAppName = 'appName' + index; - div.setAttribute('id', formatAppName); - let inputId = 'appName' + index + 1; - div.innerHTML = - " '; - itemDiv!.append(div); - let appList = this.energyTraceRow?.shadowRoot!.querySelectorAll( - 'input[type=radio][name=processoption]' - ); - appList!.forEach((appName) => [ - (appName.onclick = (e: MouseEvent) => { - if (appName.checked) { - SpHiSysEventChart.app_name = appName.getAttribute('value'); - TraceRow.range!.refresh = true; - // @ts-ignore - appNameList!.visible = false; - this.trace.refreshCanvas(false); - } - }), - ]); - } - addFlag = true; - } - }); - - this.energyTraceRow.rowId = `energy`; - this.energyTraceRow.rowType = TraceRow.ROW_TYPE_ENERGY; - this.energyTraceRow.rowParentId = ''; - this.energyTraceRow.folder = true; - this.energyTraceRow.addTemplateTypes('HiSysEvent'); - this.energyTraceRow.name = 'Energy'; - this.energyTraceRow.style.height = '40px'; - this.energyTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - this.energyTraceRow.selectChangeHandler = this.trace.selectChangeHandler; - this.energyTraceRow.supplier = () => new Promise>((resolve) => resolve([])); - this.energyTraceRow.onThreadHandler = (useCache) => { - this.energyTraceRow?.canvasSave(this.trace.canvasPanelCtx!); - if (this.energyTraceRow!.expansion) { - this.trace.canvasPanelCtx?.clearRect(0, 0, this.energyTraceRow!.frame.width, this.energyTraceRow!.frame.height); - } else { - (renders['empty'] as EmptyRender).renderMainThread( - { - context: this.trace.canvasPanelCtx, - useCache: useCache, - type: ``, - }, - this.energyTraceRow! - ); - } - this.energyTraceRow?.canvasRestore(this.trace.canvasPanelCtx!); - }; - this.energyTraceRow.addEventListener('expansion-change', () => { - TraceRow.range!.refresh = true; - this.trace.refreshCanvas(false); - if (this.timer) { - clearTimeout(this.timer); - } - this.timer = setTimeout(() => { - TraceRow.range!.refresh = false; - }, 200); - }); - this.trace.rowsEL?.appendChild(this.energyTraceRow!); - }; - - private initAnomaly = async () => { - let time = new Date().getTime(); - let anomalyTraceRow = TraceRow.skeleton(); - anomalyTraceRow.rowParentId = `energy`; - anomalyTraceRow.rowHidden = true; - anomalyTraceRow.rowId = 'energy-anomaly'; - anomalyTraceRow.rowType = TraceRow.ROW_TYPE_ANOMALY_ENERGY; - anomalyTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - anomalyTraceRow.selectChangeHandler = this.trace.selectChangeHandler; - anomalyTraceRow.setAttribute('height', `55px`); - let element = anomalyTraceRow.shadowRoot?.querySelector('.root') as HTMLDivElement; - element!.style.height = `55px`; - anomalyTraceRow.style.width = `100%`; - anomalyTraceRow.setAttribute('children', ''); - anomalyTraceRow.name = 'Anomaly Event'; - anomalyTraceRow.supplier = () => queryAnomalyData(); - anomalyTraceRow.focusHandler = () => { - this.trace?.displayTip( - anomalyTraceRow, - EnergyAnomalyStruct.hoverEnergyAnomalyStruct, - `AnomalyName:${EnergyAnomalyStruct.hoverEnergyAnomalyStruct?.eventName || ''}` - ); - }; - anomalyTraceRow.findHoverStruct = () => { - EnergyAnomalyStruct.hoverEnergyAnomalyStruct = anomalyTraceRow.getHoverStruct(); - }; - anomalyTraceRow.onThreadHandler = (useCache) => { - let context: CanvasRenderingContext2D; - if (anomalyTraceRow.currentContext) { - context = anomalyTraceRow.currentContext; - } else { - context = anomalyTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; - } - anomalyTraceRow.canvasSave(context); - (renders['energyAnomaly'] as EnergyAnomalyRender).renderMainThread( - { - context: context, - useCache: useCache, - type: `energyAnomaly`, - appName: SpHiSysEventChart.app_name || '', - canvasWidth: this.trace.canvasPanel?.width || 0, - }, - anomalyTraceRow - ); - anomalyTraceRow.canvasRestore(context); - }; - this.energyTraceRow?.addChildTraceRow(anomalyTraceRow); - let durTime = new Date().getTime() - time; - info('The time to load the anomaly is: ', durTime); - }; - - private initSystem = async () => { - let time = new Date().getTime(); - let systemTraceRow = TraceRow.skeleton(); - systemTraceRow.rowParentId = `energy`; - systemTraceRow.rowHidden = true; - systemTraceRow.rowId = 'energy-system'; - systemTraceRow.rowType = TraceRow.ROW_TYPE_SYSTEM_ENERGY; - systemTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - systemTraceRow.selectChangeHandler = this.trace.selectChangeHandler; - systemTraceRow.setAttribute('height', `80px`); - let element = systemTraceRow.shadowRoot?.querySelector('.root') as HTMLDivElement; - element!.style.height = `90px`; - systemTraceRow.style.width = `100%`; - systemTraceRow.setAttribute('children', ''); - systemTraceRow.name = 'System Event'; - systemTraceRow.supplier = () => - Promise.all([querySystemLocationData(), querySystemLockData(), querySystemSchedulerData()]).then((result) => { - return this.getSystemData(result); - }); - systemTraceRow.focusHandler = () => { - this.trace?.displayTip( - systemTraceRow, - EnergySystemStruct.hoverEnergySystemStruct, - `
    -
    WORKSCHEDULER:
    ${ - EnergySystemStruct.hoverEnergySystemStruct?.workScheduler! || 0 - }
    -
    POWER_RUNNINGLOCK:
    ${ - EnergySystemStruct.hoverEnergySystemStruct?.power! || 0 - }
    -
    LOCATION:
    ${ - EnergySystemStruct.hoverEnergySystemStruct?.location! || 0 - }
    -
    ` - ); - }; - systemTraceRow.findHoverStruct = () => { - EnergySystemStruct.hoverEnergySystemStruct = systemTraceRow.getHoverStruct(); - }; - systemTraceRow.onThreadHandler = (useCache) => { - let context: CanvasRenderingContext2D; - if (systemTraceRow.currentContext) { - context = systemTraceRow.currentContext; - } else { - context = systemTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; - } - systemTraceRow.canvasSave(context); - (renders['energySystem'] as EnergySystemRender).renderMainThread( - { - context: context, - useCache: useCache, - type: `energySystem`, - }, - systemTraceRow - ); - systemTraceRow.canvasRestore(context); - }; - this.energyTraceRow?.addChildTraceRow(systemTraceRow); - let durTime = new Date().getTime() - time; - info('The time to load the Ability Memory is: ', durTime); - }; - - getSystemData(result: any): Promise { - let systemDataList: any = {}; - if (result.length == 0) { - return Promise.resolve([]); - } - systemDataList[0] = this.handleLockData(result); - systemDataList[1] = this.handleLocationData(result); - systemDataList[2] = this.handleWorkData(result); - return systemDataList; - } - - private handleLocationData(result: Array>) { - let locationIndex = -1; - let locationCount = 0; - let locationData: any[] = []; - result[0].forEach((item: any) => { - let da: any = {}; - if (item.Value == 'stop') { - if (locationIndex == -1) { - da.startNs = 0; - da.count = 1; - } else { - da.startNs = item.ts; - locationCount--; - da.count = locationCount; - } - da.state = 'stop'; - } else { - da.startNs = item.ts; - locationCount++; - da.count = locationCount; - da.state = 'start'; - } - locationIndex = 0; - da.type = 2; - locationData.push(da); - }); - return locationData; - } - - private handleLockData(result: Array>) { - let lockCount = 0; - let tokedIds: Array = []; - let lockData: any[] = []; - result[1].forEach((item: any) => { - let running: any = {}; - let split = item.Value.split(','); - if (item.Value.indexOf('ADD') > -1) { - running.startNs = item.ts; - lockCount++; - running.count = lockCount; - running.token = split[0].split('=')[1]; - running.type = 1; - tokedIds.push(running.token); - lockData.push(running); - } else { - running.startNs = item.ts; - let toked = split[0].split('=')[1]; - let number = tokedIds.indexOf(toked); - if (number > -1) { - lockCount--; - running.count = lockCount; - running.token = split[0].split('=')[1]; - running.type = 1; - lockData.push(running); - delete tokedIds[number]; - } - } - }); - - return lockData; - } - - private handleWorkData(result: Array>) { - let workDataArray = result[2]; - let workCountMap: Map = new Map(); - let nameIdMap: Map> = new Map(); - let workData: any[] = []; - for (let i = 0; i < workDataArray.length; i++) { - let dd: any = {}; - let item = workDataArray[i]; - let keys = item.appKey.split(','); - let values = item.Value.split(','); - for (let j = 0; j < keys.length; j++) { - let key = keys[j]; - switch (key) { - case 'NAME': - dd.appName = values[j]; - break; - case 'WORKID': - dd.workId = values[j]; - break; - } - } - if (item.eventName == 'WORK_START') { - let nameIdList = nameIdMap.get(dd.appName); - let workCount = 0; - if (nameIdList == undefined) { - workCount = 1; - nameIdMap.set(dd.appName, [dd.workId]); - } else { - nameIdList.push(dd.workId); - workCount = nameIdList.length; - } - let count = workCountMap.get(dd.appName); - if (count == undefined) { - workCountMap.set(dd.appName, 1); - } else { - workCountMap.set(dd.appName, count + 1); - } - dd.startNs = item.ts; - dd.count = workCount; - dd.type = 0; - workData.push(dd); - } else if (item.eventName == 'WORK_STOP') { - let nameIdList: any = nameIdMap.get(dd.appName); - let index = nameIdList.indexOf(dd.workId); - if (nameIdList != undefined && index > -1) { - delete nameIdList[index]; - let workCount = workCountMap.get(dd.appName); - if (workCount != undefined) { - workCount = workCount - 1; - workCountMap.set(dd.appName, workCount); - dd.startNs = item.startNS; - dd.count = workCount; - dd.type = 0; - workData.push(dd); - } - } - } + async init(): Promise { + let hiSysEventData = await queryHiSysEventData(); + if (hiSysEventData.length === 0) { + return; } - return workData; + let eventRow = await this.initRow(hiSysEventData); + this.trace.rowsEL?.appendChild(eventRow); } - - private initPower = async () => { - let time = new Date().getTime(); - let powerTraceRow = TraceRow.skeleton(); - powerTraceRow.rowParentId = `energy`; - powerTraceRow.rowHidden = true; - powerTraceRow.rowId = 'energy-power'; - powerTraceRow.rowType = TraceRow.ROW_TYPE_POWER_ENERGY; - powerTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - powerTraceRow.selectChangeHandler = this.trace.selectChangeHandler; - powerTraceRow.setAttribute('height', `200px`); - let element = powerTraceRow.shadowRoot?.querySelector('.root') as HTMLDivElement; - element!.style.height = `200px`; - powerTraceRow.style.width = `100%`; - powerTraceRow.setAttribute('children', ''); - powerTraceRow.name = 'Power'; - powerTraceRow.supplier = () => - queryPowerData().then((items) => { - return this.getPowerData(items); + async initRow(hiSysEventData: HiSysEventStruct[]): Promise> { + let unitIndex: number = 1; + let unitHeight: number = 20; + let maxHeight: number = (Math.max(...hiSysEventData.map((it) => it.depth || 0)) + unitIndex) * unitHeight; + let hiSysEventRow = TraceRow.skeleton(); + hiSysEventRow.rowParentId = ''; + hiSysEventRow.rowId = 'Hisysevent'; + hiSysEventRow.rowType = TraceRow.ROW_TYPE_HI_SYSEVENT; + hiSysEventRow.name = 'Hisysevent'; + hiSysEventRow.style.width = '100%'; + hiSysEventRow.style.height = `${maxHeight}px`; + hiSysEventRow.setAttribute('height', `${maxHeight}`); + hiSysEventRow.setAttribute('children', ''); + hiSysEventRow.dataList = hiSysEventData; + hiSysEventRow.supplier = (): Promise => + new Promise((resolve): void => { + resolve(hiSysEventData); }); - powerTraceRow.findHoverStruct = () => { - EnergyPowerStruct.hoverEnergyPowerStruct = powerTraceRow.getHoverStruct(); - }; - powerTraceRow.focusHandler = () => { - this.trace?.displayTip( - powerTraceRow, - EnergyPowerStruct.hoverEnergyPowerStruct, - `
    -
    CPU:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.cpu! || 0 - }
    -
    location:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.location! || 0 - }
    -
    GPU:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.gpu! || 0 - }
    -
    display:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.display! || 0 - }
    -
    camera:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.camera! || 0 - }
    -
    bluetooth:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.bluetooth! || 0 - }
    -
    flashlight:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.flashlight! || 0 - }
    -
    audio:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.audio! || 0 - }
    -
    wifiScan:
    ${ - EnergyPowerStruct.hoverEnergyPowerStruct?.wifiscan! || 0 - }
    -
    ` - ); - }; - powerTraceRow.onThreadHandler = (useCache) => { + hiSysEventRow.addTemplateTypes('HiSysEvent'); + hiSysEventRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + hiSysEventRow.selectChangeHandler = this.trace.selectChangeHandler; + hiSysEventRow.onThreadHandler = (useCache: boolean): void => { let context: CanvasRenderingContext2D; - if (powerTraceRow.currentContext) { - context = powerTraceRow.currentContext; + if (hiSysEventRow.currentContext) { + context = hiSysEventRow.currentContext; } else { - context = powerTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + context = hiSysEventRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; } - powerTraceRow.canvasSave(context); - (renders['energyPower'] as EnergyPowerRender).renderMainThread( + hiSysEventRow!.canvasSave(context); + (renders.hiSysEvent as HiSysEventRender).renderMainThread( { context: context, useCache: useCache, - type: `energyPower`, - appName: SpHiSysEventChart.app_name || '', + type: 'hisys_event', }, - powerTraceRow! + hiSysEventRow! ); - powerTraceRow!.canvasRestore(context); + hiSysEventRow!.canvasRestore(context); }; - this.energyTraceRow?.addChildTraceRow(powerTraceRow); - let durTime = new Date().getTime() - time; - info('The time to load the energy power is: ', durTime); - }; - - async getPowerData(items: any): Promise { - let powerDataMap: any = {}; - let appNameList: any = []; - items.forEach((item: any) => { - let dataItem = powerDataMap[item.startNS]; - if (dataItem == undefined) { - if (item.appKey == 'APPNAME') { - let appMap: any = {}; - let appNames = item.eventValue.split(','); - appNameList = appNames; - if (appNames.length > 0) { - for (let appNamesKey of appNames) { - appMap[appNamesKey] = new EnergyPowerStruct(); - appMap[appNamesKey].name = appNamesKey; - appMap[appNamesKey].ts = item.startNS; - } - powerDataMap[item.startNS] = appMap; - } - } - } else { - if (item.appKey != 'APPNAME') { - let values = item.eventValue.split(','); - for (let i = 0; i < values.length; i++) { - let appName = appNameList[i]; - let obj = dataItem[appName]; - if (obj != undefined) { - let eventName = item.eventName.split('_'); - let s = eventName[eventName.length - 1].toLocaleLowerCase(); - if (obj[s] == undefined) { - obj[s] = parseInt(values[i]); - } else { - obj[s] += parseInt(values[i]); - } - } - } - } else { - let dataMap = powerDataMap[item.startNS]; - let appNames = item.eventValue.split(','); - appNameList = appNames; - if (appNames.length > 0) { - for (let appNamesKey of appNames) { - dataMap[appNamesKey] = new EnergyPowerStruct(); - dataMap[appNamesKey].name = appNamesKey; - dataMap[appNamesKey].ts = item.startNS; - } - } - } - } - }); - // @ts-ignore - return Object.values(powerDataMap); - } - - private initState = async () => { - let time = new Date().getTime(); - let stateList = [ - 'Brightness Nit', - 'Signal Level', - 'Wifi Event Received', - 'Audio Stream Change', - 'Audio Volume Change', - 'Wifi State', - 'Bluetooth Br Switch State', - 'Br Switch State', - 'Location Switch State', - 'Sensor State', - ]; - let stateName = [ - 'BRIGHTNESS_NIT', - 'SIGNAL_LEVEL', - 'WIFI_EVENT_RECEIVED', - 'AUDIO_STREAM_CHANGE', - 'AUDIO_VOLUME_CHANGE', - 'WIFI_STATE', - 'BLUETOOTH_BR_SWITCH_STATE', - 'BR_SWITCH_STATE', - 'LOCATION_SWITCH_STATE', - 'SENSOR_STATE', - ]; - let initValueList = [ - 'brightness', - 'nocolumn', - 'nocolumn', - 'nocolumn', - 'nocolumn', - 'wifi', - 'bt_state', - 'bt_state', - 'location', - 'nocolumn', - ]; - - for (let index = 0; index < stateList.length; index++) { - let maxStateData = await queryMaxStateValue(stateName[index]); - if (!maxStateData[0]) { - continue; - } - let maxStateTotal = maxStateData[0].maxValue.toString(); - let statType = maxStateData[0].type.toLocaleLowerCase(); - if (statType.includes('state') && !statType.endsWith('br_switch_state')) { - if (maxStateData[0].maxValue == 0) { - maxStateTotal = 'enable'; - } else { - maxStateTotal = 'disable'; - } - } - let stateTraceRow = TraceRow.skeleton(); - stateTraceRow.rowParentId = `energy`; - stateTraceRow.rowHidden = true; - stateTraceRow.rowId = `energy-state-${stateList[index]}`; - stateTraceRow.rowType = TraceRow.ROW_TYPE_STATE_ENERGY; - stateTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - stateTraceRow.selectChangeHandler = this.trace.selectChangeHandler; - stateTraceRow.style.height = '40px'; - stateTraceRow.style.width = `100%`; - stateTraceRow.setAttribute('children', ''); - stateTraceRow.name = `${stateList[index]}`; - stateTraceRow.supplier = () => - Promise.all([ - queryStateInitValue(stateName[index], initValueList[index]), - queryStateData(stateName[index]), - ]).then((result) => { - let stateInitValue = initValueList[index] == 'nocolumn' ? [] : result[0]; - return stateInitValue.concat(result[1]); - }); - stateTraceRow.findHoverStruct = () => { - EnergyStateStruct.hoverEnergyStateStruct = stateTraceRow.getHoverStruct(); - }; - stateTraceRow.focusHandler = () => { - let tip = ''; - if (EnergyStateStruct.hoverEnergyStateStruct?.type!.toLocaleLowerCase().includes('state')) { - tip = `Switch Status: ${ - EnergyStateStruct.hoverEnergyStateStruct?.value == 1 ? 'disable' : 'enable' - }`; - if (EnergyStateStruct.hoverEnergyStateStruct?.type!.toLocaleLowerCase().endsWith('br_switch_state')) { - tip = `${SpHiSysEventChart.getBlueToothState( - EnergyStateStruct.hoverEnergyStateStruct?.value - )}`; - } - } else { - tip = `value: ${EnergyStateStruct.hoverEnergyStateStruct?.value || 0}`; - } - this.trace?.displayTip(stateTraceRow, EnergyStateStruct.hoverEnergyStateStruct, tip); - }; - stateTraceRow.onThreadHandler = (useCache) => { - let context: CanvasRenderingContext2D; - if (stateTraceRow.currentContext) { - context = stateTraceRow.currentContext; - } else { - context = stateTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; - } - stateTraceRow.canvasSave(context); - (renders['energyState'] as EnergyStateRender).renderMainThread( - { - context: context, - useCache: useCache, - type: `energyState${index}`, - maxState: maxStateData[0].maxValue, - maxStateName: - maxStateData[0].type.toLocaleLowerCase().endsWith('br_switch_state') ? '-1' : maxStateTotal.toString(), - }, - stateTraceRow - ); - stateTraceRow.canvasRestore(context); - }; - this.energyTraceRow?.addChildTraceRow(stateTraceRow); - let durTime = new Date().getTime() - time; - info('The time to load the Ability Memory is: ', durTime); - } - }; - - public static getBlueToothState(num: number | undefined): string { - switch (num) { - case 0: - return 'STATE_TURNING_ON'; - case 1: - return 'STATE_TURN_ON'; - case 2: - return 'STATE_TURNING_OFF'; - case 3: - return 'STATE_TURN_OFF'; - default: - return 'UNKNOWN_STATE'; - } + return hiSysEventRow; } } diff --git a/ide/src/trace/component/setting/SpRecordTemplate.ts b/ide/src/trace/component/setting/SpRecordTemplate.ts index f90a38958..f30c3e8fe 100644 --- a/ide/src/trace/component/setting/SpRecordTemplate.ts +++ b/ide/src/trace/component/setting/SpRecordTemplate.ts @@ -144,7 +144,7 @@ export class SpRecordTemplate extends BaseElement { } if (this.taskPoolEl!.checked) { useFtracePlugin = true; - traceEventSet.push('commonlibrary'); + hitraceCategories.push('commonlibrary'); } if (useFtracePlugin) { let tracePluginConfig: TracePluginConfig = { diff --git a/ide/src/trace/component/trace/base/Extension.ts b/ide/src/trace/component/trace/base/Extension.ts index 2dabde13d..6373d2c30 100644 --- a/ide/src/trace/component/trace/base/Extension.ts +++ b/ide/src/trace/component/trace/base/Extension.ts @@ -58,7 +58,6 @@ declare global { WakeupList: string; //show wakeup list table DeviceConnect: string; DeviceDisConnect: string; - ProcessSwitch: string; HoverNull: string; }; }; @@ -115,7 +114,6 @@ window.SmartEvent = { WakeupList: 'SmartEvent-UI-WakeupList', DeviceConnect: 'SmartEvent-DEVICE_CONNECT', DeviceDisConnect: 'SmartEvent-DEVICE_DISCONNECT', - ProcessSwitch: 'SmartEvent-Process_Switch', HoverNull: 'SmartEvent-Hover-NULL', }, }; diff --git a/ide/src/trace/component/trace/base/TraceRowConfig.ts b/ide/src/trace/component/trace/base/TraceRowConfig.ts index c56d3962a..60e6c73da 100644 --- a/ide/src/trace/component/trace/base/TraceRowConfig.ts +++ b/ide/src/trace/component/trace/base/TraceRowConfig.ts @@ -52,6 +52,7 @@ export class TraceRowConfig extends BaseElement { 'AnimationEffect', 'AppStartup', 'HiSysEvent', + 'EnergyEvent', 'Memory', 'ProcessMemory', 'ArkTs', diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts index 1fd399bd7..8f6158938 100644 --- a/ide/src/trace/component/trace/base/TraceSheet.ts +++ b/ide/src/trace/component/trace/base/TraceSheet.ts @@ -158,7 +158,7 @@ export class TraceSheet extends BaseElement { return; } this.switchDiv!.visible = 'false'; - window.publish(window.SmartEvent.UI.ProcessSwitch, { ipid: selectIPid }); + this.updateRangeSelect(selectIPid) this.lastSelectIPid = selectIPid; }; @@ -742,7 +742,7 @@ export class TraceSheet extends BaseElement { } } - updateRangeSelect(data?: any): boolean { + updateRangeSelect(ipid?: number): boolean { if ( this.selection && (this.selection.nativeMemory.length > 0 || @@ -759,9 +759,9 @@ export class TraceSheet extends BaseElement { Object.assign(param, this.selection); if (param.nativeMemory.length > 0 || param.nativeMemoryStatistic.length > 0) { Utils.getInstance().initResponseTypeList(param); - if (data) { - Utils.getInstance().setCurrentSelectIPid(Number(data.ipid)); - param.nativeMemoryCurrentIPid = Number(data.ipid); + if (ipid) { + Utils.getInstance().setCurrentSelectIPid(ipid); + param.nativeMemoryCurrentIPid = ipid; } } this.rangeSelect(param, true); @@ -806,6 +806,17 @@ export class TraceSheet extends BaseElement { if (selection && selection.nativeMemoryAllProcess.length > 1) { this.switchDiv!.style.display = 'flex'; if (this.isProcessEqual(selection.nativeMemoryAllProcess)) { + if (this.processTree){ + for (const data of this.processTree.treeData){ + if (data.key === `${selection.nativeMemoryCurrentIPid}`){ + data.checked = true; + } else { + data.checked = false; + } + } + //调用set重新更新界面 + this.processTree.treeData = this.processTree.treeData; + } return; } this.lastProcessSet = new Set(); @@ -834,7 +845,7 @@ export class TraceSheet extends BaseElement { let component: any = this.shadowRoot ?.querySelector(`#tabs lit-tabpane[key='${key}']`) ?.children.item(0); - if (component) { + if (component) { this.selection!.isRowClick = false; component.data = this.selection; } diff --git a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts index 10197b993..12a79097c 100644 --- a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts +++ b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts @@ -65,9 +65,13 @@ export class TabPaneFilter extends BaseElement { return this.isStatisticsMem; } set isStatisticsMemory(value) { + let hideThreadEL = this.shadowRoot?.querySelector('.popover .tree-check:nth-child(4)'); if (value) { - let hideThreadEL = this.shadowRoot?.querySelector('.popover .tree-check:nth-child(4)'); hideThreadEL?.classList.add('hide'); + } else { + if (hideThreadEL!.classList.contains('hide')) { + hideThreadEL!.classList.remove('hide'); + } } } diff --git a/ide/src/trace/component/trace/sheet/energy/TabPaneEnergyAnomaly.ts b/ide/src/trace/component/trace/sheet/energy/TabPaneEnergyAnomaly.ts index ef5d0c2b4..a486f5608 100644 --- a/ide/src/trace/component/trace/sheet/energy/TabPaneEnergyAnomaly.ts +++ b/ide/src/trace/component/trace/sheet/energy/TabPaneEnergyAnomaly.ts @@ -14,7 +14,7 @@ */ import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; -import { SpHiSysEventChart } from '../../../chart/SpHiSysEventChart.js'; +import { SpHiSysEnergyChart } from '../../../chart/SpHiSysEnergyChart.js'; import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import { queryAnomalyDetailedData } from '../../../../database/SqlLite.js'; @@ -40,8 +40,8 @@ export class TabPaneEnergyAnomaly extends BaseElement { if (values[TabPaneEnergyAnomaly.VALUE_INDEX]) { let apps = values[TabPaneEnergyAnomaly.VALUE_INDEX].split(','); for (let appIndex = 0; appIndex < apps.length; appIndex++) { - if (apps.indexOf(SpHiSysEventChart.app_name) !== -1) { - findAppNameIndex = apps.indexOf(SpHiSysEventChart.app_name); + if (apps.indexOf(SpHiSysEnergyChart.app_name) !== -1) { + findAppNameIndex = apps.indexOf(SpHiSysEnergyChart.app_name); filterAppMap.set(values[0] + values[1], findAppNameIndex); break; } diff --git a/ide/src/trace/component/trace/sheet/energy/TabPanePowerBattery.ts b/ide/src/trace/component/trace/sheet/energy/TabPanePowerBattery.ts index 63f0f507e..b4e409731 100644 --- a/ide/src/trace/component/trace/sheet/energy/TabPanePowerBattery.ts +++ b/ide/src/trace/component/trace/sheet/energy/TabPanePowerBattery.ts @@ -17,7 +17,7 @@ import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; import { getTabPowerBatteryData } from '../../../../database/SqlLite.js'; -import { SpHiSysEventChart } from '../../../chart/SpHiSysEventChart.js'; +import { SpHiSysEnergyChart } from '../../../chart/SpHiSysEnergyChart.js'; import '../../../../../base-ui/table/lit-table.js'; import { resizeObserver } from '../SheetUtils.js'; @@ -56,7 +56,7 @@ export class TabPanePowerBattery extends BaseElement { result.forEach((item) => { let powerDatum: any = powerData[item.eventName]; if (item.appKey.toLocaleLowerCase() === 'appname') { - powerDatum['appName'] = SpHiSysEventChart.app_name; + powerDatum['appName'] = SpHiSysEnergyChart.app_name; } else { let eventData: Array = item.eventValue.split(','); if (eventData.length > 0) { @@ -91,7 +91,7 @@ export class TabPanePowerBattery extends BaseElement { name: 'Capacity', value: powerData['POWER_IDE_BATTERY'].capacity + ' mAh', }); - list.push({ name: 'APP Name', value: SpHiSysEventChart.app_name! }); + list.push({ name: 'APP Name', value: SpHiSysEnergyChart.app_name! }); if (list.length > 0) { this.tblPower!.recycleDataSource = list; } else { diff --git a/ide/src/trace/component/trace/sheet/energy/TabPanePowerDetails.ts b/ide/src/trace/component/trace/sheet/energy/TabPanePowerDetails.ts index 794886457..b53a22701 100644 --- a/ide/src/trace/component/trace/sheet/energy/TabPanePowerDetails.ts +++ b/ide/src/trace/component/trace/sheet/energy/TabPanePowerDetails.ts @@ -19,7 +19,7 @@ import { SelectionParam } from '../../../../bean/BoxSelection.js'; import { getTabPowerDetailsData } from '../../../../database/SqlLite.js'; import { log } from '../../../../../log/Log.js'; import { PowerDetailsEnergy } from '../../../../bean/EnergyStruct.js'; -import { SpHiSysEventChart } from '../../../chart/SpHiSysEventChart.js'; +import { SpHiSysEnergyChart } from '../../../chart/SpHiSysEnergyChart.js'; import { resizeObserver } from '../SheetUtils.js'; @element('tabpane-power-details') @@ -140,8 +140,8 @@ export class TabPanePowerDetails extends BaseElement { items.forEach((item) => { let powerDatum: any = powerData[item.eventName]; if (item.appKey.toLocaleLowerCase() === 'appname') { - powerDatum['appName'] = SpHiSysEventChart.app_name; - currentAppIndex = item.eventValue.split(',').indexOf(SpHiSysEventChart.app_name!); + powerDatum['appName'] = SpHiSysEnergyChart.app_name; + currentAppIndex = item.eventValue.split(',').indexOf(SpHiSysEnergyChart.app_name!); tsMax = 0; } else if (currentAppIndex > -1) { if (set.has(item.appKey)) { diff --git a/ide/src/trace/component/trace/sheet/energy/TabPaneSystemDetails.ts b/ide/src/trace/component/trace/sheet/energy/TabPaneSystemDetails.ts index abe0ba1dc..5f971e570 100644 --- a/ide/src/trace/component/trace/sheet/energy/TabPaneSystemDetails.ts +++ b/ide/src/trace/component/trace/sheet/energy/TabPaneSystemDetails.ts @@ -22,7 +22,7 @@ import { querySysLockDetailsData, querySystemWorkData, } from '../../../../database/SqlLite.js'; -import { SpHiSysEventChart } from '../../../chart/SpHiSysEventChart.js'; +import { SpHiSysEnergyChart } from '../../../chart/SpHiSysEnergyChart.js'; import { resizeObserver } from '../SheetUtils.js'; import { type LitSlicerTrack } from '../../../../../base-ui/slicer/lit-slicer.js'; @@ -185,7 +185,7 @@ export class TabPaneSystemDetails extends BaseElement { let watchIndex: Array = []; for (let index = 0; index < values.length; index++) { let filterData: any = values[index]; - if (filterData.name == SpHiSysEventChart.app_name) { + if (filterData.name == SpHiSysEnergyChart.app_name) { if (filterData.eventName.indexOf('WORK_ADD') > -1) { watchIndex.push(filterData.workId); let number = watchIndex.indexOf(filterData.workId); diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts index 86da26641..869e25778 100644 --- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts @@ -105,7 +105,10 @@ export class TabPanePerfAnalysis extends BaseElement { this.checkBoxs = popover!.querySelectorAll('.check-wrap > lit-check-box'); this.tableArray = this.shadowRoot!.querySelectorAll('lit-table') as NodeListOf; for (let perfTable of this.tableArray) { - perfTable.shadowRoot!.querySelector('.table')!.style.height = 'calc(100% - 31px)'; + let querySelector = perfTable.shadowRoot?.querySelector('.table'); + if (querySelector) { + querySelector.style.height = 'calc(100% - 31px)'; + } perfTable!.addEventListener('column-click', (evt) => { // @ts-ignore this.sortColumn = evt.detail.key; diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts index b5c95ca3e..be7ba8cc2 100644 --- a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts @@ -268,7 +268,7 @@ export class TabPaneHisysEvents extends BaseElement {
    - +
    ${this.title} diff --git a/ide/src/base-ui/utils/CSVFormater.ts b/ide/src/base-ui/utils/CSVFormater.ts index 349b23038..dd8d96653 100644 --- a/ide/src/base-ui/utils/CSVFormater.ts +++ b/ide/src/base-ui/utils/CSVFormater.ts @@ -52,7 +52,14 @@ export class JSONToCSV { // 如果存在自定义key值 if (columns.key.length) { columns.key.map(function (m: any, idx: number) { - let strItem = obj.formatter && obj.formatter.has(m) ? (obj.formatter.get(m)?.(n[m]) || n[m]) : n[m]; + let strItem : any = ''; + if (obj.exportFormatter && obj.exportFormatter.has(m)) { + strItem = (obj.exportFormatter.get(m)?.(n) || n[m]) + } else if (obj.formatter && obj.formatter.has(m)) { + strItem = (obj.formatter.get(m)?.(n[m]) || n[m]) + } else { + strItem = n[m]; + } if (typeof strItem == 'undefined') { strItem = ''; } else if (typeof strItem == 'object') { @@ -195,8 +202,9 @@ export class JSONToCSV { columns: any[]; tables: any[]; fileName: string; - columnFormatter: Map string> } - ): Promise { + columnFormatter: Map string>; + exportFormatter: Map string>; + }): Promise { return new Promise((resolve) => { let data: any = this.columnsData(dataSource.columns); let columns = { @@ -220,7 +228,8 @@ export class JSONToCSV { data: resultArr, fileName: dataSource.fileName, columns: columns, - formatter: dataSource.columnFormatter + formatter: dataSource.columnFormatter, + exportFormatter: dataSource.exportFormatter }); } } diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 937456b8b..ef60e9245 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -329,6 +329,7 @@ export class SpSystemTrace extends BaseElement { if (this.rowsEL!.contains(cpuFavoriteRow)) { this.rowsEL!.replaceChild(replaceRow, cpuFavoriteRow); } + cpuFavoriteRow.tampName = cpuFavoriteRow.name; this.favoriteChartListEL!.insertRow(cpuFavoriteRow, this.currentCollectGroup, true); this.collectRows.push(cpuFavoriteRow); this.timerShaftEL?.displayCollect(this.collectRows.length !== 0); @@ -411,7 +412,7 @@ export class SpSystemTrace extends BaseElement { this.timerShaftEL?.modifySlicesList(event.detail); if (event.detail.hidden) { this.slicestime = null; - if (this._slicesList.length <= 1) { + if (this._slicesList.length <= 0) { if (TraceRow.rangeSelectObject) { let showTab = this.getShowTab(); showTab = showTab.filter((it) => it !== 'tabpane-current'); diff --git a/ide/src/trace/component/chart/SpHiSysEventChart.ts b/ide/src/trace/component/chart/SpHiSysEventChart.ts index 024259087..bfb2dccbd 100644 --- a/ide/src/trace/component/chart/SpHiSysEventChart.ts +++ b/ide/src/trace/component/chart/SpHiSysEventChart.ts @@ -35,17 +35,14 @@ export class SpHiSysEventChart { this.trace.rowsEL?.appendChild(eventRow); } async initRow(hiSysEventData: HiSysEventStruct[]): Promise> { - let unitIndex: number = 1; - let unitHeight: number = 20; - let maxHeight: number = (Math.max(...hiSysEventData.map((it) => it.depth || 0)) + unitIndex) * unitHeight; let hiSysEventRow = TraceRow.skeleton(); hiSysEventRow.rowParentId = ''; hiSysEventRow.rowId = 'Hisysevent'; hiSysEventRow.rowType = TraceRow.ROW_TYPE_HI_SYSEVENT; hiSysEventRow.name = 'Hisysevent'; hiSysEventRow.style.width = '100%'; - hiSysEventRow.style.height = `${maxHeight}px`; - hiSysEventRow.setAttribute('height', `${maxHeight}`); + hiSysEventRow.style.height = '40px'; + hiSysEventRow.setAttribute('height', '40'); hiSysEventRow.setAttribute('children', ''); hiSysEventRow.dataList = hiSysEventData; hiSysEventRow.supplier = (): Promise => diff --git a/ide/src/trace/component/trace/sheet/TabPaneCurrent.ts b/ide/src/trace/component/trace/sheet/TabPaneCurrent.ts index 5bd9a51ba..24037dfcf 100644 --- a/ide/src/trace/component/trace/sheet/TabPaneCurrent.ts +++ b/ide/src/trace/component/trace/sheet/TabPaneCurrent.ts @@ -22,24 +22,24 @@ import { SlicesTime, StType } from '../timer-shaft/SportRuler.js'; @element('tabpane-current') export class TabPaneCurrent extends BaseElement { - private slicestimeList: Array = []; - private slicestime: SlicesTime | null = null; + private slicesTimeList: Array = []; + private slicesTime: SlicesTime | null = null; private systemTrace: SpSystemTrace | undefined | null; private tableDataSource: Array = []; private panelTable: LitTable | undefined | null; initElements(): void { this.systemTrace = document - .querySelector('body > sp-application')?. - shadowRoot!.querySelector('#sp-system-trace'); + .querySelector('body > sp-application') + ?.shadowRoot!.querySelector('#sp-system-trace'); this.panelTable = this.shadowRoot!.querySelector('.notes-editor-panel'); this.panelTable!.addEventListener('row-click', (evt: any) => { // 点击表格某一行后，背景变色 // @ts-ignore let data = evt.detail.data; - this.systemTrace!.slicesList = this.slicestimeList || []; + this.systemTrace!.slicesList = this.slicesTimeList || []; // 页面上对应的slice变为实心 - this.slicestimeList.forEach((slicesTime, index) => { + this.slicesTimeList.forEach((slicesTime, index) => { if (data.startTime === slicesTime.startTime && data.endTime === slicesTime.endTime) { slicesTime.selected = true; this.setTableSelection(index + 1); @@ -51,48 +51,50 @@ export class TabPaneCurrent extends BaseElement { // 如果点击RemoveAll，隐藏所有卡尺，清空数组，隐藏tab页 if (data.operate.innerHTML === 'RemoveAll') { this.systemTrace!.slicesList = []; - for (let slice of this.slicestimeList) { - slice.hidden = true; - document.dispatchEvent(new CustomEvent('slices-change', { detail: slice })); + let slicesTimeList = [...this.slicesTimeList]; + for (let i = 0; i < slicesTimeList.length; i++) { + slicesTimeList[i].hidden = true; + document.dispatchEvent(new CustomEvent('slices-change', { detail: slicesTimeList[i] })); } - this.slicestimeList = []; + this.slicesTimeList = []; } }); } - public setCurrentSlicesTime(slicestime: SlicesTime): void { - this.slicestime = slicestime; + public setCurrentSlicesTime(slicesTime: SlicesTime): void { + this.slicesTimeList = this.systemTrace?.timerShaftEL!.sportRuler?.slicesTimeList || []; + this.slicesTime = slicesTime; // 判断当前传入的卡尺是否已经存在 - let findSlicesTime = this.slicestimeList.find( - (it) => it.startTime === slicestime.startTime && it.endTime === slicestime.endTime + let findSlicesTime = this.slicesTimeList.find( + (it) => it.startTime === slicesTime.startTime && it.endTime === slicesTime.endTime ); // m键生成的临时卡尺只能同时出现最后一个，所以将永久卡尺过滤出来，并加上最后一个临时卡尺 - if (this.slicestime.type === StType.TEMP) { - this.slicestimeList = this.slicestimeList.filter( + if (this.slicesTime.type === StType.TEMP) { + this.slicesTimeList = this.slicesTimeList.filter( (item: SlicesTime) => item.type === StType.PERM || (item.type === StType.TEMP && - item.startTime === this.slicestime!.startTime && - item.endTime === this.slicestime!.endTime) + item.startTime === this.slicesTime!.startTime && + item.endTime === this.slicesTime!.endTime) ); } - // 如果this.slicestimeList为空，或者没有在同一位置绘制过，就将当前的框选的范围画上线 - if (!findSlicesTime || this.slicestimeList.length === 0) { - this.slicestimeList!.push(this.slicestime); + // 如果this.slicesTimeList为空，或者没有在同一位置绘制过，就将当前的框选的范围画上线 + if (!findSlicesTime || this.slicesTimeList.length === 0) { + this.slicesTimeList!.push(this.slicesTime); } this.setTableData(); } /** - * 根据this.slicestimeList设置表格数据 + * 根据this.slicesTimeList设置表格数据 */ private setTableData(): void { this.tableDataSource = []; // 按照开始时间进行排序，保证泳道图上的卡尺（shift+m键）和表格的顺序一致 - this.slicestimeList.sort(function (a, b) { + this.slicesTimeList.sort(function (a, b) { return a.startTime - b.startTime; }); - for (let slice of this.slicestimeList) { + for (let slice of this.slicesTimeList) { let btn = document.createElement('button'); btn.className = 'remove'; let color = document.createElement('input'); @@ -118,13 +120,13 @@ export class TabPaneCurrent extends BaseElement { // 当前点击了哪个卡尺，就将对应的表格中的那行的背景变色 this.tableDataSource.forEach((data, index) => { - if (data.startTime === this.slicestime?.startTime && data.endTime === this.slicestime?.endTime) { + if (data.startTime === this.slicesTime?.startTime && data.endTime === this.slicesTime?.endTime) { this.setTableSelection(index); } }); this.panelTable!.recycleDataSource = this.tableDataSource; this.eventHandler(); - this.systemTrace!.slicesList = this.slicestimeList || []; + this.systemTrace!.slicesList = this.slicesTimeList || []; } /** @@ -132,18 +134,18 @@ export class TabPaneCurrent extends BaseElement { */ private eventHandler(): void { let tr = this.panelTable!.shadowRoot!.querySelectorAll('.tr') as NodeListOf; - // 第一个tr是移除全部，所以跳过，从第二个tr开始，和this.slicestimeList数组的第一个对应……，所以i从1开始，在this.slicestimeList数组中取值时用i-1 + // 第一个tr是移除全部，所以跳过，从第二个tr开始，和this.slicesTimeList数组的第一个对应……，所以i从1开始，在this.slicesTimeList数组中取值时用i-1 for (let i = 1; i < tr.length; i++) { - tr[i].querySelector('input')!.value = this.slicestimeList[i - 1].color; + tr[i].querySelector('input')!.value = this.slicesTimeList[i - 1].color; // 点击色块修改颜色 tr[i].querySelector('input')?.addEventListener('change', (event: any) => { if ( - this.tableDataSource[i].startTime === this.slicestimeList[i - 1].startTime && - this.tableDataSource[i].endTime === this.slicestimeList[i - 1].endTime + this.tableDataSource[i].startTime === this.slicesTimeList[i - 1].startTime && + this.tableDataSource[i].endTime === this.slicesTimeList[i - 1].endTime ) { - this.systemTrace!.slicesList = this.slicestimeList || []; - this.slicestimeList[i - 1].color = event?.target.value; - document.dispatchEvent(new CustomEvent('slices-change', { detail: this.slicestimeList[i - 1] })); + this.systemTrace!.slicesList = this.slicesTimeList || []; + this.slicesTimeList[i - 1].color = event?.target.value; + document.dispatchEvent(new CustomEvent('slices-change', { detail: this.slicesTimeList[i - 1] })); // 卡尺颜色改变时，重绘泳道图 this.systemTrace?.refreshCanvas(true); } @@ -152,13 +154,12 @@ export class TabPaneCurrent extends BaseElement { // 点击remove按钮移除 tr[i]!.querySelector('.remove')?.addEventListener('click', (event: any) => { if ( - this.tableDataSource[i].startTime === this.slicestimeList[i - 1].startTime && - this.tableDataSource[i].endTime === this.slicestimeList[i - 1].endTime + this.tableDataSource[i].startTime === this.slicesTimeList[i - 1].startTime && + this.tableDataSource[i].endTime === this.slicesTimeList[i - 1].endTime ) { - this.slicestimeList[i - 1].hidden = true; - this.systemTrace!.slicesList = this.slicestimeList || []; - document.dispatchEvent(new CustomEvent('slices-change', { detail: this.slicestimeList[i - 1] })); - this.slicestimeList.splice(this.slicestimeList.indexOf(this.slicestimeList[i - 1]), 1); + this.slicesTimeList[i - 1].hidden = true; + this.systemTrace!.slicesList = this.slicesTimeList || []; + document.dispatchEvent(new CustomEvent('slices-change', { detail: this.slicesTimeList[i - 1] })); // 移除时更新表格内容 this.setTableData(); } diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts index 8e891e002..ef348c5f1 100644 --- a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.ts @@ -290,7 +290,7 @@ export class TabPaneHiSysEventSummary extends BaseElement { private buildTreeTblNodes(eventTreeNodes: HiSysEventStruct[]): HiSysEventTreeNode[] { let id = 0; - let root: HiSysEventTreeNode = { id: id, depth: 0, children: [], summaryName: 'All', count: 0 }; + let root: HiSysEventTreeNode = { id: id, depth: 0, children: [], summaryName: '', count: 0 }; eventTreeNodes.forEach((item) => { id++; let levelNode = root.children.find((node) => node.summaryName === item.level); diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts index be7ba8cc2..0437b6c0e 100644 --- a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts @@ -60,15 +60,17 @@ export class TabPaneHisysEvents extends BaseElement { if (this.hiSysEventTable) { this.hiSysEventTable.recycleDataSource = []; } + if (this.detailsTbl) { + this.detailsTbl!.recycleDataSource = []; + } this.initTabSheetEl(); + this.currentSelection = systemEventParam; + this.hiSysEventTable!.recycleDataSource = systemEventParam.hiSysEvents; + this.hisysEventSource = systemEventParam.hiSysEvents; queryRealTime().then((result) => { if (result && result.length > 0) { this.realTime = Math.floor(result[0].ts / millisecond); } - this.currentSelection = systemEventParam; - this.hiSysEventTable!.recycleDataSource = systemEventParam.hiSysEvents; - this.hisysEventSource = systemEventParam.hiSysEvents; - this.detailsTbl!.recycleDataSource = []; }); } @@ -487,7 +489,7 @@ export class TabPaneHisysEvents extends BaseElement { }]; const content = JSON.parse(data.contents ?? '{}'); if (content && typeof content === 'object') { - let isFirstTime = false; + let isFirstTime = true; let inputTimeTs = ''; let keyList = Object.keys(content); keyList.forEach(key => { @@ -495,15 +497,13 @@ export class TabPaneHisysEvents extends BaseElement { let contentValue = value; if (key.endsWith('_TIME')) { if (this.realTime === 0) { - contentValue = ((Number(value) - this.realTime) > 0) ? String(Number(value) - this.realTime) : value; + contentValue = value; } if (!isNaN(Number(value))) { - let diffTime = (Number(value) - this.realTime) * millisecond; - // @ts-ignore - contentValue = String(diffTime - (window.recordStartNS || 0)); - if (!isFirstTime) { + contentValue = ((Number(value) - this.realTime) * millisecond).toString(); + if (isFirstTime) { this.baseTime = contentValue; - isFirstTime = true; + isFirstTime = false; } } if (key === 'INPUT_TIME') { diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts index f4a4a75c8..19fe949a8 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts @@ -402,6 +402,9 @@ export class TabpaneNMCalltree extends BaseElement { this.needShowMenu = needShowMenu; }); this.nmCallTreeTbl!.rememberScrollTop = true; + this.nmCallTreeTbl!.exportTextHandleMap.set('heapSizeStr', (value) => { + return `${value['size']}`; + }); this.nmCallTreeFilter = this.shadowRoot?.querySelector('#nm-call-tree-filter'); this.nmCallTreeTbl!.addEventListener('row-click', (event: any): void => { // @ts-ignore diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts index f4186cccf..0389bb358 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.ts @@ -302,6 +302,12 @@ export class TabPaneNMSampleList extends BaseElement { } }); TabPaneNMSampleList.filter!.firstSelect = TabPaneNMSampleList.filterSelect; + TabPaneNMSampleList.sampleTbl!.exportTextHandleMap.set('totalGrowth', (value) => { + return `${value['total']}`; + }); + TabPaneNMSampleList.sampleTbl!.exportTextHandleMap.set('growth', (value) => { + return `${value['heapSize']}`; + }); } connectedCallback() { diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts index c15fc6d69..a7a4b00a0 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts @@ -267,6 +267,20 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { let title = `${this.titleEl!.textContent}/${evt.detail.data.symbolName}`; this.clickRight(evt, title); }); + let exportHandlerMap = new Map string>(); + exportHandlerMap.set('existSizeFormat', (value) => { + return `${value['existSize']}`; + }); + exportHandlerMap.set('applySizeFormat', (value) => { + return `${value['applySize']}`; + }); + exportHandlerMap.set('releaseSizeFormat', (value) => { + return `${value['releaseSize']}`; + }); + this.tableType!.exportTextHandleMap = exportHandlerMap; + this.threadUsageTbl!.exportTextHandleMap = exportHandlerMap; + this.soUsageTbl!.exportTextHandleMap = exportHandlerMap; + this.functionUsageTbl!.exportTextHandleMap = exportHandlerMap; } private clickRight(evt: any, title: string): void { @@ -722,12 +736,34 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { this.progressEL!.loading = true; let threadMap = new Map>(); let types = this.getTypes(item); + let typeName = item.typeName; this.resetCurrentLevelData(item); for (let itemData of this.processData) { // @ts-ignore - if (!types.includes(itemData.type)) { - continue; + if (typeName === TYPE_ALLOC_STRING) { + // @ts-ignore + if (!types.includes(itemData.type)) { + continue; + } + } else if (typeName === TYPE_MAP_STRING) { + if (!itemData.subType) { + // @ts-ignore + if (!types.includes(itemData.type)) { + continue; + } + } else { + continue; + } + } else { + if (itemData.subType) { + // @ts-ignore + if (!types.includes(itemData.subType) || !types.includes(itemData.type)) { + continue; + } + } else { + continue; + } } if (threadMap.has(itemData.tid)) { threadMap.get(itemData.tid)?.push(itemData); @@ -891,6 +927,9 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { continue; } } + if (tid !== undefined && tid !== data.tid) { + continue; + } if (symbolMap.has(data.symbolId)) { symbolMap.get(data.symbolId)?.push(data); } else { diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts index 59033ab87..d12c76130 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts @@ -242,6 +242,18 @@ export class TabPaneNMStatstics extends BaseElement { // @ts-ignore this.sortByColumn(evt.detail.key, evt.detail.sort); }); + this.nativeStatisticsTbl!.exportTextHandleMap.set('existingString', (value) => { + return `${value['existing']}`; + }); + this.nativeStatisticsTbl!.exportTextHandleMap.set('freeByteString', (value) => { + return `${value['totalBytes'] - value['existing']}`; + }); + this.nativeStatisticsTbl!.exportTextHandleMap.set('totalBytesString', (value) => { + return `${value['totalBytes']}`; + }); + this.nativeStatisticsTbl!.exportTextHandleMap.set('maxStr', (value) => { + return `${value['max']}`; + }); } connectedCallback(): void { diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts index be2bdb2e2..e81641dff 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMemory.ts @@ -279,6 +279,10 @@ export class TabPaneNMemory extends BaseElement { this.memoryTbl!.itemTextHandleMap.set('heapSize', (heapSize) => { return getByteWithUnit(heapSize); }); + this.memoryTbl!.exportTextHandleMap.set('heapSize', (value) => { + return `${value['heapSize']}`; + }); + this.shadowRoot?.querySelector('#filter')!.getFilterData((data: FilterData) => { if (data.mark) { document.dispatchEvent( diff --git a/ide/src/trace/component/trace/timer-shaft/TabPaneFlag.ts b/ide/src/trace/component/trace/timer-shaft/TabPaneFlag.ts index 74fa05d19..e556a3180 100644 --- a/ide/src/trace/component/trace/timer-shaft/TabPaneFlag.ts +++ b/ide/src/trace/component/trace/timer-shaft/TabPaneFlag.ts @@ -30,8 +30,8 @@ export class TabPaneFlag extends BaseElement { initElements(): void { this.systemTrace = document - .querySelector('body > sp-application')?. - shadowRoot!.querySelector('#sp-system-trace'); + .querySelector('body > sp-application') + ?.shadowRoot!.querySelector('#sp-system-trace'); this.panelTable = this.shadowRoot!.querySelector('.notes-editor-panel'); this.panelTable!.addEventListener('row-click', (evt: any) => { this.flagList = this.systemTrace?.timerShaftEL!.sportRuler?.flagList || []; diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index 1760e2b29..9e7fdfd3d 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -5639,15 +5639,12 @@ export const queryCpuFreqFilterId = (): Promise> => export const queryRealTime = (): Promise< Array<{ - ts: number; - value: string; + ts: number }> > => query( 'queryRealTime', - `select CS.ts -TR.start_ts as ts ,clock_name - from clock_snapshot as CS ,trace_range as TR - where clock_name = 'realtime';` + `select CS.ts as ts from clock_snapshot as CS where clock_name = 'realtime';` ); export const queryHiSysEventData = (): Promise> => query( diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts index 8432fa892..187754573 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts @@ -990,24 +990,22 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { let callChains = this.createThreadSample(nativeHookSample); let topIndex = isTopDown ? 0 : callChains.length - 1; if (callChains.length > 0) { - let root = - this.currentTreeMapData[ + let key = ''; + if (this.isHideThread) { + key = (callChains[topIndex].symbolId || '') + '-' + (callChains[topIndex].fileId || ''); + } else { + key = nativeHookSample.tid + - '-' + - (callChains[topIndex].symbolId || '') + - '-' + - (callChains[topIndex].fileId || '') - ]; + '-' + + (callChains[topIndex].symbolId || '') + + '-' + + (callChains[topIndex].fileId || ''); + } + let root = this.currentTreeMapData[key]; if (root === undefined) { root = new NativeHookCallInfo(); root.threadName = nativeHookSample.threadName; - this.currentTreeMapData[ - nativeHookSample.tid + - '-' + - (callChains[topIndex].symbolId || '') + - '-' + - (callChains[topIndex].fileId || '') - ] = root; + this.currentTreeMapData[key] = root; this.currentTreeList.push(root); } NativeHookCallInfo.merageCallChainSample(root, callChains[topIndex], nativeHookSample); diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts index 840e03bcc..d99e4c504 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerHiSysEvent.ts @@ -75,15 +75,7 @@ export function hiSysEvent( let item = hiSysEventList[index]; if ((item.ts || 0) + (item.dur || 0) >= startNS && (item.ts || 0) <= endNS) { HiSysEventStruct.setSysEventFrame(item, startNS, endNS, totalNS, row.frame); - if ( - index > 0 && - (hiSysEventList[index - 1].frame?.x || 0) === (item.frame?.x || 0) && - (hiSysEventList[index - 1].frame?.width || 0) === (item.frame?.width || 0) && - (hiSysEventList[index - 1].depth === item.depth) - ) { - } else { - hiSysEventFilter.push(item); - } + hiSysEventFilter.push(item); } } } -- Gitee From d8ec862ad9acbc3cad32e1c2f266aa2f65fefb93 Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 10:56:43 +0800 Subject: [PATCH 08/15] =?UTF-8?q?featut=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- .../headLine/Lit-headline.test.ts} | 41 +- ide/test/base-ui/table/LitTable.test.ts | 2 +- .../trace/component/SpRecordTrace.test.ts | 2 +- .../component/SpRecyclerSystemTrace.test.ts | 126 ------ .../trace/component/SpSystemTrace.test.ts | 11 +- .../trace/component/chart/SpFreqChart.test.ts | 5 + .../trace/component/chart/SpHiPerf.test.ts | 7 + .../chart/SpHiSysEnergyChart.test.ts | 280 +++++++++++++ .../component/chart/SpHiSysEventChart.test.ts | 286 ++----------- .../trace/component/chart/SpMpsChart.test.ts | 53 +++ .../component/chart/SpVmTrackerChart.test.ts | 2 +- .../component/metrics/CpuStrategy.test.ts | 44 ++ .../metrics/DistributeTermStrategy.test.ts | 39 ++ .../component/metrics/MemAggStrategy.test.ts | 83 ++++ .../component/metrics/MemStrategy.test.ts | 32 ++ .../metrics/MetaDataStrategy.test.ts | 30 ++ .../metrics/SysCallsStrategy.test.ts | 32 ++ .../metrics/SysCallsTopStrategy.test.ts | 35 ++ .../metrics/TraceStatsStrategy.test.ts | 31 ++ .../metrics/TraceTaskStrategy.test.ts | 30 ++ .../component/setting/SpAllocations.test.ts | 19 +- .../component/setting/SpRecordSetting.test.ts | 79 +++- .../component/trace/base/TraceSheet.test.ts | 17 - .../sheet/cpu/TabPaneFrequencySample.test.ts | 2 + .../sheet/file-system/TabPaneCallTree.test.ts | 1 + ...abPaneFilesystemStatisticsAnalysis.test.ts | 47 +-- .../TabPaneIOTierStatisticsAnalysis.test.ts | 39 +- ...aneVirtualMemoryStatisticsAnalysis.test.ts | 46 +- .../frequsage/TabPaneFreqDataCut.test.ts | 129 ++++++ .../sheet/frequsage/TabPaneFreqUsage.test.ts | 95 +++++ .../trace/sheet/gpu/TabPaneGpuGL.test.ts | 2 +- .../TabPaneHiSysEventSummary.test.ts | 51 +++ .../hi-sysevent/TabPaneHisysEvents.test.ts | 150 +++++++ .../sheet/hilog/TabPaneHilogSummary.test.ts | 112 +++++ .../trace/sheet/hilog/TabPaneHilogs.test.ts | 152 +++++++ .../sheet/hiperf/TabPanePerfAnalysis.test.ts | 23 +- .../native-memory/TabPaneNMCallInfo.test.ts | 362 ++++++++++++++++ .../native-memory/TabPaneNMCallTree.test.ts | 3 - .../native-memory/TabPaneNMSampleList.test.ts | 12 +- .../TabPaneNMStatisticAnalysis.test.ts | 68 ++- .../sheet/smaps/TabPaneSmapsRecord.test.ts | 11 - .../sheet/snapshot/TabPaneComparison.test.ts | 396 ++++++++++++++++++ .../sheet/snapshot/TabPaneSummary.test.ts | 363 ++++++++++++++++ .../ProcedureLogicWorkerNativeNemory.test.ts | 11 +- .../ProcedureLogicWorkerPerf.test.ts | 61 +-- .../ui-worker/ProcedureWorkerCommon.test.ts | 4 - .../ProcedureWorkerHiPerfCPU.test.ts | 2 +- .../ProcedureWorkerHiPerfProcess.test.ts | 2 +- .../ProcedureWorkerHiPerfThread.test.ts | 2 +- .../ui-worker/ProcedureWorkerSmaps.test.ts | 189 +++++++++ 50 files changed, 2964 insertions(+), 657 deletions(-) rename ide/test/{trace/component/DisassemblingWindow.test.ts => base-ui/headLine/Lit-headline.test.ts} (38%) delete mode 100644 ide/test/trace/component/SpRecyclerSystemTrace.test.ts create mode 100644 ide/test/trace/component/chart/SpHiSysEnergyChart.test.ts create mode 100644 ide/test/trace/component/chart/SpMpsChart.test.ts create mode 100644 ide/test/trace/component/metrics/CpuStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/DistributeTermStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/MemAggStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/MemStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/MetaDataStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/SysCallsStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/SysCallsTopStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/TraceStatsStrategy.test.ts create mode 100644 ide/test/trace/component/metrics/TraceTaskStrategy.test.ts create mode 100644 ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.test.ts create mode 100644 ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.test.ts create mode 100644 ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHiSysEventSummary.test.ts create mode 100644 ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHisysEvents.test.ts create mode 100644 ide/test/trace/component/trace/sheet/hilog/TabPaneHilogSummary.test.ts create mode 100644 ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts create mode 100644 ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallInfo.test.ts create mode 100644 ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts create mode 100644 ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts create mode 100644 ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts diff --git a/ide/test/trace/component/DisassemblingWindow.test.ts b/ide/test/base-ui/headLine/Lit-headline.test.ts similarity index 38% rename from ide/test/trace/component/DisassemblingWindow.test.ts rename to ide/test/base-ui/headLine/Lit-headline.test.ts index d2671379e..de4644ecc 100644 --- a/ide/test/trace/component/DisassemblingWindow.test.ts +++ b/ide/test/base-ui/headLine/Lit-headline.test.ts @@ -12,32 +12,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// @ts-ignore -import { DisassemblingWindow, Disassembling } from '../../../dist/trace/component/DisassemblingWindow.js'; - -describe('DisassemblingWindow Test', () => { - let disassemblingWindow = new DisassemblingWindow(); - - it('DisassemblingWindowTest01', function () { - expect(disassemblingWindow.getMap('', '')).not.toBeUndefined(); - }); - it('DisassemblingWindowTest02', function () { - expect(disassemblingWindow.resetCanvas(2, 1, 1, 1)).toBeUndefined(); +// @ts-ignore +import { LitHeadLine } from '../../../src/base-ui/headline/lit-headline.js'; +describe('LitHeadLine Test', () => { + beforeAll(() => { + document.body.innerHTML = ``; }); - - it('DisassemblingWindowTest03', function () { - document.body.innerHTML = - '
    '; - let disassemblingWindow = document.querySelector('#ccc') as DisassemblingWindow; - expect(disassemblingWindow.showLoading()).toBeUndefined(); + it('test 01', () => { + let headline = document.querySelector('#headLine') as LitHeadLine; + headline.isShow = true; + expect(headline.isShow).toBeTruthy(); }); - - it('DisassemblingWindowTest04', function () { - expect(disassemblingWindow.removeCloseListener()).toBeUndefined(); + it('test 02', () => { + let headline = document.querySelector('#headLine') as LitHeadLine; + headline.isShow = false; + expect(headline.isShow).toBeFalsy(); }); - - it('DisassemblingWindowTest05', function () { - expect(disassemblingWindow.showContent('error', '')).toBeUndefined(); + it('test 03', () => { + let headline = document.querySelector('#headLine') as LitHeadLine; + let titleBox = headline.shadowRoot?.querySelector('#titleContext'); + headline.titleTxt = 'aaaa'; + expect(headline.titleTxt).toEqual('aaaa'); }); }); diff --git a/ide/test/base-ui/table/LitTable.test.ts b/ide/test/base-ui/table/LitTable.test.ts index f88f2e725..b92990431 100644 --- a/ide/test/base-ui/table/LitTable.test.ts +++ b/ide/test/base-ui/table/LitTable.test.ts @@ -304,7 +304,7 @@ describe('LitTable Test', () => { }); it('LitTableTest25', () => { - expect(litTable.dispatchRowClickEvent({ data: { isSelected: '' } })).toBeUndefined(); + expect(litTable.dispatchRowClickEvent({ data: { isSelected: '' } }, [], {button: ''})).toBeUndefined(); }); it('LitTableTest26', () => { diff --git a/ide/test/trace/component/SpRecordTrace.test.ts b/ide/test/trace/component/SpRecordTrace.test.ts index 182228905..9b3be3e50 100644 --- a/ide/test/trace/component/SpRecordTrace.test.ts +++ b/ide/test/trace/component/SpRecordTrace.test.ts @@ -94,6 +94,7 @@ describe('SpRecordTrace Test', () => { spRecordTrace.spAllocations.appProcess.indexOf = jest.fn(() => ''); spRecordTrace.spAllocations.appProcess.lastIndexOf = jest.fn(() => 1); spRecordTrace.spAllocations.appProcess.slice = jest.fn(() => 1); + spRecordTrace.spAllocations.expandPids = jest.fn(() => []); expect(spRecordTrace.createNativePluginConfig(1)).toEqual({ configData: { blocked: true, @@ -101,7 +102,6 @@ describe('SpRecordTrace Test', () => { filterSize: undefined, fpUnwind: undefined, maxStackDepth: undefined, - pid: 1, processName: '', saveFile: false, smbPages: undefined, diff --git a/ide/test/trace/component/SpRecyclerSystemTrace.test.ts b/ide/test/trace/component/SpRecyclerSystemTrace.test.ts deleted file mode 100644 index c7c85d3a1..000000000 --- a/ide/test/trace/component/SpRecyclerSystemTrace.test.ts +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// @ts-ignore -window.ResizeObserver = window.ResizeObserver || - jest.fn().mockImplementation(() => ({ - disconnect: jest.fn(), - observe: jest.fn(), - unobserve: jest.fn(), - })); - -jest.mock('../../../dist/trace/component/trace/TimerShaftElement.js', () => { - return {}; -}); - -// @ts-ignore -import { TraceRow } from '../../../dist/trace/component/trace/base/TraceRow.js'; -// @ts-ignore -import { SpRecyclerSystemTrace } from '../../../dist/trace/component/SpRecyclerSystemTrace.js'; -jest.mock('../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { - return {}; -}); - -describe('SpRecyclerSystemTrace Test', () => { - let spRecyclerSystemTrace = new SpRecyclerSystemTrace(); - const newEl = 1; - const targetEl = { - parentNode: 1, - nextSibling: 1, - }; - - spRecyclerSystemTrace.initElements = jest.fn(() => true); - - it('SpRecyclerSystemTraceTest01', function () { - expect(spRecyclerSystemTrace.getScrollWidth()).toBe(1); - }); - - it('SpRecyclerSystemTraceTest02', function () { - let resultLength = spRecyclerSystemTrace.getVisibleRows([{}]).length; - expect(resultLength).toBe(0); - }); - - it('SpRecyclerSystemTraceTest03', function () { - expect(spRecyclerSystemTrace.timerShaftELRangeChange('')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest04', function () { - expect(spRecyclerSystemTrace.rowsElOnScroll('Scroll')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest05', function () { - let htmlElement = document.createElement('div'); - spRecyclerSystemTrace.rangeSelect.rowsPaneEL = htmlElement; - spRecyclerSystemTrace.rangeSelect.MouseDown = jest.fn(() => {}); - expect(spRecyclerSystemTrace.documentOnMouseDown('MouseDown')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest06', function () { - expect(spRecyclerSystemTrace.documentOnMouseUp('MouseUp')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest07', function () { - spRecyclerSystemTrace.rangeSelec = jest.fn(() => true); - spRecyclerSystemTrace.rangeSelect.mouseMove = jest.fn(() => true); - expect(spRecyclerSystemTrace.documentOnMouseMove('MouseMove')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest08', function () { - expect(spRecyclerSystemTrace.hoverStructNull('')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest09', function () { - expect(spRecyclerSystemTrace.selectStructNull('')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest10', function () { - spRecyclerSystemTrace.rangeSelec = jest.fn(() => true); - spRecyclerSystemTrace.rangeSelect.mouseMove = jest.fn(() => true); - expect(spRecyclerSystemTrace.documentOnClick('OnClick')).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest11', function () { - expect(spRecyclerSystemTrace.connectedCallback()).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest12', function () { - expect(spRecyclerSystemTrace.disconnectedCallback()).toBeUndefined(); - }); - - it('SpRecyclerSystemTraceTest13', function () { - expect(spRecyclerSystemTrace.init).toBeTruthy(); - }); - - it('SpRecyclerSystemTraceTest15', function () { - spRecyclerSystemTrace.loadDatabaseUrl = jest.fn(() => true); - expect(spRecyclerSystemTrace.loadDatabaseUrl()).toBeTruthy(); - }); - - it('SpRecyclerSystemTraceTest16', function () { - spRecyclerSystemTrace.loadDatabaseArrayBuffer = jest.fn(() => true); - expect(spRecyclerSystemTrace.loadDatabaseArrayBuffer()).toBeTruthy(); - }); - - it('SpRecyclerSystemTraceTest18', function () { - const newEl = 1; - const targetEl = { - parentNode: { - insertBefore: jest.fn(() => true), - }, - nextSibling: 1, - }; - - expect(spRecyclerSystemTrace.insertAfter(newEl, targetEl)).toBeUndefined(); - }); -}); diff --git a/ide/test/trace/component/SpSystemTrace.test.ts b/ide/test/trace/component/SpSystemTrace.test.ts index 9f906685d..ec7ee3454 100644 --- a/ide/test/trace/component/SpSystemTrace.test.ts +++ b/ide/test/trace/component/SpSystemTrace.test.ts @@ -129,7 +129,7 @@ describe('SpSystemTrace Test', () => { spSystemTrace.rowsPaneEL.scrollTo = jest.fn(() => offset); spSystemTrace.rowsPaneEL.removeEventListener = jest.fn(() => true); spSystemTrace.rowsPaneEL.addEventListener = jest.fn(() => true); - expect(spSystemTrace.rowScrollTo(offset, callback)).toBeUndefined(); + expect(spSystemTrace.scrollToActFunc(offset, callback)).toBeUndefined(); }); it('SpSystemTraceTest16', function () { @@ -258,15 +258,6 @@ describe('SpSystemTrace Test', () => { spSystemTrace.appendChild(anomalyTraceRow); expect(spSystemTrace.scrollToDepth()).toBeUndefined(); }); - it('SpSystemTraceTest27', function () { - let spSystemTrace = new SpSystemTrace({ - canvasNumber: 1, - alpha: true, - contextId: '2d', - isOffScreen: true, - }); - expect(spSystemTrace.searchThreadsAndProcesses()).toStrictEqual([]); - }); it('SpSystemTraceTest28', function () { let spSystemTrace = new SpSystemTrace({ canvasNumber: 1, diff --git a/ide/test/trace/component/chart/SpFreqChart.test.ts b/ide/test/trace/component/chart/SpFreqChart.test.ts index 867a4be34..ffb22b853 100644 --- a/ide/test/trace/component/chart/SpFreqChart.test.ts +++ b/ide/test/trace/component/chart/SpFreqChart.test.ts @@ -14,12 +14,15 @@ */ // @ts-ignore +import { queryCpuCount } from '../../../../dist/trace/database/SqlLite.js'; + window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ disconnect: jest.fn(), observe: jest.fn(), unobserve: jest.fn(), })); +// @ts-ignore import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; // @ts-ignore import { SpFreqChart } from '../../../../dist/trace/component/chart/SpFreqChart.js'; @@ -118,6 +121,8 @@ describe('spFpsChart Test', () => { let MockgetCpuLimitFreqMax = sqlit.getCpuLimitFreqMax; MockgetCpuLimitFreqMax.mockResolvedValue([{ maxValue: 100, filterId: 9 }]); + let MockgetCpuCount = sqlit.queryCpuCount; + MockgetCpuCount.mockResolvedValue([{ maxCount: 100, filterId: 9 }]); it('spFpsChart01', function () { expect(spFpsChart.init()).toBeDefined(); }); diff --git a/ide/test/trace/component/chart/SpHiPerf.test.ts b/ide/test/trace/component/chart/SpHiPerf.test.ts index 72e2949ca..fb60f0e4f 100644 --- a/ide/test/trace/component/chart/SpHiPerf.test.ts +++ b/ide/test/trace/component/chart/SpHiPerf.test.ts @@ -22,6 +22,8 @@ import { } from '../../../../src/trace/database/SqlLite.js'; // @ts-ignore import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; +// @ts-ignore +import { queryPerfEventType } from '../../../../dist/trace/database/SqlLite.js'; const sqlit = require('../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { @@ -124,6 +126,11 @@ describe('SpHiPerf Test', () => { startNS: 129792, }, ]); + let getPerfEventType = sqlit.queryPerfEventType; + getPerfEventType.mockResolvedValue([{ + id:1, + report_value:'sched:sched_waking', + }]) let ss = new SpChartManager(); let spHiPerf = new SpHiPerf(ss); it('SpHiPerf01', function () { diff --git a/ide/test/trace/component/chart/SpHiSysEnergyChart.test.ts b/ide/test/trace/component/chart/SpHiSysEnergyChart.test.ts new file mode 100644 index 000000000..c5c8d978b --- /dev/null +++ b/ide/test/trace/component/chart/SpHiSysEnergyChart.test.ts @@ -0,0 +1,280 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import '../../../../dist/trace/component/chart/SpHiSysEnergyChart.js'; +// @ts-ignore +import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; +import '../../../../dist/trace/component/chart/SpChartManager.js'; +import '../../../../dist/trace/component/SpSystemTrace.js'; +// @ts-ignore +import { LitPopover } from '../../../../dist/base-ui/popover/LitPopoverV.js'; +// @ts-ignore +import { SpHiSysEnergyChart } from '../../../../dist/trace/component/chart/SpHiSysEnergyChart.js'; + +jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +const sqlite = require('../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../dist/trace/database/SqlLite.js'); + +describe('SpHiSysEnergyChart Test', () => { + let ss = new SpChartManager(); + let spHiSysEnergyChart = new SpHiSysEnergyChart(ss); + + let htmlDivElement = document.createElement('div'); + htmlDivElement.setAttribute('id', 'appNameList'); + + let anomalyData = sqlite.queryAnomalyData; + anomalyData.mockResolvedValue([]); + + let maxStateValue = sqlite.queryMaxStateValue; + let max = [ + { + maxValue: 200, + type: 'state', + }, + { + maxValue: 300, + type: 'sensor', + }, + ]; + maxStateValue.mockResolvedValue(max); + let MockExits = sqlite.queryEnergyEventExits; + MockExits.mockResolvedValue(['trace_hisys_event']); + let powerData = sqlite.queryPowerData; + let power = [ + { + startNS: 5999127351, + eventName: 'POWER_IDE_AUDIO', + appKey: 'APPNAME', + eventValue: 'com.example.himusicdemo,com.example.himusicdemo_js,com.example.himusicdemo_app', + }, + { + startNS: 1291120516, + eventName: 'POWER_IDE_AUDIO', + appKey: 'BACKGROUND_ENERGY', + eventValue: '854,258,141', + }, + ]; + powerData.mockResolvedValue(power); + + let stateData = sqlite.queryStateData; + stateData.mockResolvedValue([]); + + let sysEventAppName = sqlite.queryEnergyAppName; + let appName = [ + { + string_value: 'app_name', + }, + ]; + sysEventAppName.mockResolvedValue(appName); + + let querySystemLocationData = sqlite.querySystemLocationData; + let querySystemLockData = sqlite.querySystemLockData; + let querySystemSchedulerData = sqlite.querySystemSchedulerData; + let queryConfigSysEventAppName = sqlite.queryConfigEnergyAppName; + let location = [ + { + ts: 100652222, + eventName: 'GNSS_STATE', + appKey: 'TYPE', + Value: '1', + }, + { + ts: 3333332224, + eventName: 'GNSS_STATE', + appKey: 'TAG', + Value: '2', + }, + ]; + + let lock = [ + { + ts: 96555551, + eventName: 'POWER_RUNNINGLOCK', + appKey: 'TYPE', + Value: '1', + }, + { + ts: 333234222, + eventName: 'POWER_RUNNINGLOCK', + appKey: 'TAG', + Value: '2', + }, + ]; + + let work = [ + { + ts: 100593835619, + eventName: 'WORK_ADD', + appKey: 'TYPE', + Value: '1', + }, + { + ts: 2315652241, + eventName: 'WORK_STOP', + appKey: 'TAG', + Value: '2', + }, + ]; + + let process = [ + { + process_name: 'process1', + }, + ]; + querySystemLocationData.mockResolvedValue(location); + querySystemLockData.mockResolvedValue(lock); + querySystemSchedulerData.mockResolvedValue(work); + queryConfigSysEventAppName.mockResolvedValue(process); + + it('SpHiSysEnergyChartTest01', function () { + spHiSysEnergyChart.init(); + expect(SpHiSysEnergyChart.app_name).toBeUndefined(); + }); + + it('SpHiSysEnergyChartTest02', function () { + let result = [ + { + ts: 210000001, + eventName: 'WORK_START', + appKey: 'TYPE', + Value: '1', + }, + { + ts: 3005933657, + eventName: 'POWER_RUNNINGLOCK', + appKey: 'TAG,', + Value: 'DUBAI_TAG_RUNNINGLOCK_REMOVE', + }, + { + ts: 4005938319, + eventName: 'GNSS_STATE', + appKey: 'STATE', + Value: 'stop', + }, + { + ts: 5005933657, + eventName: 'POWER_RUNNINGLOCK', + appKey: 'TAG', + Value: 'DUBAI_TAG_RUNNINGLOCK_ADD', + }, + { + ts: 6005938319, + eventName: 'GNSS_STATE', + appKey: 'STATE', + Value: 'start', + }, + { + ts: 9005938319, + eventName: 'WORK_STOP', + appKey: 'TYPE', + Value: '1', + }, + { + ts: 10005938319, + eventName: 'WORK_REMOVE', + appKey: 'TYPE', + Value: '1', + }, + ]; + expect(spHiSysEnergyChart.getSystemData([result, result, result])).toEqual({ + '0': [ + { count: 1, startNs: 5005933657, token: undefined, type: 1 }, + { count: 0, startNs: 6005938319, token: undefined, type: 1 }, + ], + '1': [ + { count: 1, startNs: 210000001, state: 'start', type: 2 }, + { count: 2, startNs: 3005933657, state: 'start', type: 2 }, + { count: 1, startNs: 4005938319, state: 'stop', type: 2 }, + { count: 2, startNs: 5005933657, state: 'start', type: 2 }, + { count: 3, startNs: 6005938319, state: 'start', type: 2 }, + { count: 4, startNs: 9005938319, state: 'start', type: 2 }, + { count: 5, startNs: 10005938319, state: 'start', type: 2 }, + ], + '2': [ + { count: 1, startNs: 210000001, type: 0 }, + { count: 0, startNs: undefined, type: 0 }, + ], + }); + }); + + it('spHiSysEventChartTest03', function () { + expect(spHiSysEnergyChart.getSystemData([]).length).toBeUndefined(); + }); + + it('SpHiSysEnergyChartTest04', function () { + let result = [ + { + startNS: 33255112, + eventName: 'POWER_IDE_AUDIO', + appKey: 'APPNAME', + eventValue: 'com.example.himusicdemo,com.example.himusicdemo_js,com.example.himusicdemo_app', + }, + { + startNS: 5999127352, + eventName: 'POWER_IDE_AUDIO', + appKey: 'BACKGROUND_ENERGY', + eventValue: '854,258,141', + }, + { + startNS: 223224352, + eventName: 'POWER_IDE_BLUETOOTH', + appKey: 'APPNAME', + eventValue: 'com.ohos.settings,bt_switch,bt_switch_js,bt_switch_app', + }, + { + startNS: 86222222, + eventName: 'POWER_IDE_BLUETOOTH', + appKey: 'BACKGROUND_ENERGY', + eventValue: '76,12,43,431', + }, + { + startNS: 5999127382, + eventName: 'POWER_IDE_CAMERA', + appKey: 'APPNAME', + eventValue: 'com.ohos.camera,com.ohos.camera_app,com.ohos.camera_js,com.ohos.camera_ts', + }, + { + startNS: 264166822, + eventName: 'POWER_IDE_CAMERA', + appKey: 'BACKGROUND_ENERGY', + eventValue: '375,475,255,963', + }, + ]; + expect(spHiSysEnergyChart.getPowerData(result)).toStrictEqual(Promise.resolve()); + }); + + it('SpHiSysEnergyChartTest05', function () { + expect(spHiSysEnergyChart.getPowerData([])).toStrictEqual(Promise.resolve()); + }); + + it('SpHiSysEnergyChartTest6', function () { + expect(spHiSysEnergyChart.initHtml).toMatchInlineSnapshot(`undefined`); + }); + + it('SpHiSysEnergyChartTest7', function () { + expect(htmlDivElement.onclick).toBe(null); + }); +}); diff --git a/ide/test/trace/component/chart/SpHiSysEventChart.test.ts b/ide/test/trace/component/chart/SpHiSysEventChart.test.ts index 795e083ab..ae18e5bdc 100644 --- a/ide/test/trace/component/chart/SpHiSysEventChart.test.ts +++ b/ide/test/trace/component/chart/SpHiSysEventChart.test.ts @@ -15,274 +15,36 @@ // @ts-ignore import { SpHiSysEventChart } from '../../../../dist/trace/component/chart/SpHiSysEventChart.js'; -import '../../../../dist/trace/component/chart/SpHiSysEventChart.js'; // @ts-ignore import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; -import '../../../../dist/trace/component/chart/SpChartManager.js'; -// @ts-ignore -import { SpSystemTrace } from '../../../../dist/trace/component/SpSystemTrace.js'; -import '../../../../dist/trace/component/SpSystemTrace.js'; -// @ts-ignore -import { LitPopover } from '../../../../dist/base-ui/popover/LitPopoverV.js'; -import { - querySystemLocationData, - querySystemLockData, - querySystemSchedulerData, - queryConfigSysEventAppName, -} from '../../../../src/trace/database/SqlLite.js'; - +const sqlite = require('../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { return {}; }); -window.ResizeObserver = - window.ResizeObserver || - jest.fn().mockImplementation(() => ({ - disconnect: jest.fn(), - observe: jest.fn(), - unobserve: jest.fn(), - })); - -const sqlite = require('../../../../dist/trace/database/SqlLite.js'); -jest.mock('../../../../dist/trace/database/SqlLite.js'); - describe('SpHiSysEventChart Test', () => { - let ss = new SpChartManager(); - let spHiSysEventChart = new SpHiSysEventChart(ss); - - let htmlDivElement = document.createElement('div'); - htmlDivElement.setAttribute('id', 'appNameList'); - - let anomalyData = sqlite.queryAnomalyData; - anomalyData.mockResolvedValue([]); - - let maxStateValue = sqlite.queryMaxStateValue; - let max = [ - { - maxValue: 200, - type: 'state', - }, - { - maxValue: 300, - type: 'sensor', - }, - ]; - maxStateValue.mockResolvedValue(max); - let MockExits = sqlite.queryHisystemEventExits; - MockExits.mockResolvedValue(['trace_hisys_event']); - let powerData = sqlite.queryPowerData; - let power = [ - { - startNS: 5999127351, - eventName: 'POWER_IDE_AUDIO', - appKey: 'APPNAME', - eventValue: 'com.example.himusicdemo,com.example.himusicdemo_js,com.example.himusicdemo_app', - }, - { - startNS: 1291120516, - eventName: 'POWER_IDE_AUDIO', - appKey: 'BACKGROUND_ENERGY', - eventValue: '854,258,141', - }, - ]; - powerData.mockResolvedValue(power); - - let stateData = sqlite.queryStateData; - stateData.mockResolvedValue([]); - - let sysEventAppName = sqlite.querySyseventAppName; - let appName = [ - { - string_value: 'app_name', - }, - ]; - sysEventAppName.mockResolvedValue(appName); - - let querySystemLocationData = sqlite.querySystemLocationData; - let querySystemLockData = sqlite.querySystemLockData; - let querySystemSchedulerData = sqlite.querySystemSchedulerData; - let queryConfigSysEventAppName = sqlite.queryConfigSysEventAppName; - let location = [ - { - ts: 100652222, - eventName: 'GNSS_STATE', - appKey: 'TYPE', - Value: '1', - }, - { - ts: 3333332224, - eventName: 'GNSS_STATE', - appKey: 'TAG', - Value: '2', - }, - ]; - - let lock = [ - { - ts: 96555551, - eventName: 'POWER_RUNNINGLOCK', - appKey: 'TYPE', - Value: '1', - }, - { - ts: 333234222, - eventName: 'POWER_RUNNINGLOCK', - appKey: 'TAG', - Value: '2', - }, - ]; - - let work = [ - { - ts: 100593835619, - eventName: 'WORK_ADD', - appKey: 'TYPE', - Value: '1', - }, - { - ts: 2315652241, - eventName: 'WORK_STOP', - appKey: 'TAG', - Value: '2', - }, - ]; - - let process = [ - { - process_name: 'process1', - }, - ]; - querySystemLocationData.mockResolvedValue(location); - querySystemLockData.mockResolvedValue(lock); - querySystemSchedulerData.mockResolvedValue(work); - queryConfigSysEventAppName.mockResolvedValue(process); - - it('spHiSysEventChartTest01', function () { - spHiSysEventChart.init(); - expect(SpHiSysEventChart.app_name).toBeUndefined(); - }); - - it('spHiSysEventChartTest02', function () { - let result = [ - { - ts: 210000001, - eventName: 'WORK_START', - appKey: 'TYPE', - Value: '1', - }, - { - ts: 3005933657, - eventName: 'POWER_RUNNINGLOCK', - appKey: 'TAG,', - Value: 'DUBAI_TAG_RUNNINGLOCK_REMOVE', - }, - { - ts: 4005938319, - eventName: 'GNSS_STATE', - appKey: 'STATE', - Value: 'stop', - }, - { - ts: 5005933657, - eventName: 'POWER_RUNNINGLOCK', - appKey: 'TAG', - Value: 'DUBAI_TAG_RUNNINGLOCK_ADD', - }, - { - ts: 6005938319, - eventName: 'GNSS_STATE', - appKey: 'STATE', - Value: 'start', - }, - { - ts: 9005938319, - eventName: 'WORK_STOP', - appKey: 'TYPE', - Value: '1', - }, - { - ts: 10005938319, - eventName: 'WORK_REMOVE', - appKey: 'TYPE', - Value: '1', - }, - ]; - expect(spHiSysEventChart.getSystemData([result, result, result])).toEqual({ - '0': [ - { count: 1, startNs: 5005933657, token: undefined, type: 1 }, - { count: 0, startNs: 6005938319, token: undefined, type: 1 }, - ], - '1': [ - { count: 1, startNs: 210000001, state: 'start', type: 2 }, - { count: 2, startNs: 3005933657, state: 'start', type: 2 }, - { count: 1, startNs: 4005938319, state: 'stop', type: 2 }, - { count: 2, startNs: 5005933657, state: 'start', type: 2 }, - { count: 3, startNs: 6005938319, state: 'start', type: 2 }, - { count: 4, startNs: 9005938319, state: 'start', type: 2 }, - { count: 5, startNs: 10005938319, state: 'start', type: 2 }, - ], - '2': [ - { count: 1, startNs: 210000001, type: 0 }, - { count: 0, startNs: undefined, type: 0 }, - ], - }); - }); - - it('spHiSysEventChartTest03', function () { - expect(spHiSysEventChart.getSystemData([]).length).toBeUndefined(); - }); - - it('spHiSysEventChartTest04', function () { - let result = [ - { - startNS: 33255112, - eventName: 'POWER_IDE_AUDIO', - appKey: 'APPNAME', - eventValue: 'com.example.himusicdemo,com.example.himusicdemo_js,com.example.himusicdemo_app', - }, - { - startNS: 5999127352, - eventName: 'POWER_IDE_AUDIO', - appKey: 'BACKGROUND_ENERGY', - eventValue: '854,258,141', - }, - { - startNS: 223224352, - eventName: 'POWER_IDE_BLUETOOTH', - appKey: 'APPNAME', - eventValue: 'com.ohos.settings,bt_switch,bt_switch_js,bt_switch_app', - }, - { - startNS: 86222222, - eventName: 'POWER_IDE_BLUETOOTH', - appKey: 'BACKGROUND_ENERGY', - eventValue: '76,12,43,431', - }, - { - startNS: 5999127382, - eventName: 'POWER_IDE_CAMERA', - appKey: 'APPNAME', - eventValue: 'com.ohos.camera,com.ohos.camera_app,com.ohos.camera_js,com.ohos.camera_ts', - }, - { - startNS: 264166822, - eventName: 'POWER_IDE_CAMERA', - appKey: 'BACKGROUND_ENERGY', - eventValue: '375,475,255,963', - }, - ]; - expect(spHiSysEventChart.getPowerData(result)).toStrictEqual(Promise.resolve()); - }); - - it('spHiSysEventChartTest05', function () { - expect(spHiSysEventChart.getPowerData([])).toStrictEqual(Promise.resolve()); - }); - - it('spHiSysEventChartTest6', function () { - expect(spHiSysEventChart.initHtml).toMatchInlineSnapshot(`undefined`); - }); - - it('spHiSysEventChartTest7', function () { - expect(htmlDivElement.onclick).toBe(null); + let spHiSysEvent = new SpHiSysEventChart(new SpChartManager()); + let hiSysEventList =sqlite.queryHiSysEventData; + let hiSysEventListData = [{ + id: 1, + domain:'STARTUP', + eventName: 'PROCESS_EXIT', + eventType: '4', + ts: 1, + tz: 'dad', + pid: 1, + tid: 1, + uid: 1, + info: '', + level: 'MINOR', + seq: '92860', + contents: 'APP_PID', + dur: 1, + depth: 1, + }] + hiSysEventList.mockResolvedValue(hiSysEventListData); + it('SpHiSysEventChart01', function () { + expect(spHiSysEvent.init()).toBeTruthy(); }); }); diff --git a/ide/test/trace/component/chart/SpMpsChart.test.ts b/ide/test/trace/component/chart/SpMpsChart.test.ts new file mode 100644 index 000000000..8d5b6d1e5 --- /dev/null +++ b/ide/test/trace/component/chart/SpMpsChart.test.ts @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import { SmapsChart } from '../../../../dist/trace/component/chart/SmapsChart.js'; +// @ts-ignore +import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; + +const sqlit = require('../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../dist/trace/database/SqlLite.js'); + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +describe('SpMpsChart Test', () => { + let MockquerySmapsExits = sqlit.querySmapsExits; + MockquerySmapsExits.mockResolvedValue([ + { + event_name: 'trace_smaps', + stat_type: 'received', + count: 1, + }, + ]); + + let MockquerySmapsDataMax = sqlit.querySmapsDataMax; + MockquerySmapsDataMax.mockResolvedValue([ + { + max_value: 11111, + }, + ]); + let trace = new SpChartManager(); + let spMapsChart = new SmapsChart(trace); + it('SpMpsChart01', function () { + spMapsChart.init(); + expect(SmapsChart).toBeInstanceOf(Function); + }); +}); diff --git a/ide/test/trace/component/chart/SpVmTrackerChart.test.ts b/ide/test/trace/component/chart/SpVmTrackerChart.test.ts index 8ee433a39..f97024227 100644 --- a/ide/test/trace/component/chart/SpVmTrackerChart.test.ts +++ b/ide/test/trace/component/chart/SpVmTrackerChart.test.ts @@ -85,7 +85,7 @@ describe('SpVmTrackerChart Test', () => { }, ]; purgeableProcessData.mockResolvedValue(processData); - let gpuGlData = sqlite.queryGpuGLData; + let gpuGlData = sqlite.queryGpuData; let glData = [ { startNs: 0, diff --git a/ide/test/trace/component/metrics/CpuStrategy.test.ts b/ide/test/trace/component/metrics/CpuStrategy.test.ts new file mode 100644 index 000000000..68a9c926b --- /dev/null +++ b/ide/test/trace/component/metrics/CpuStrategy.test.ts @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initTest, initCpuStrategyData } from '../../../../dist/trace/component/metrics/CpuStrategy.js'; + +describe('CpuStrategy Test', () => { + const metricData = [ + { + length: 1, + event_name: 'name', + stat_type: 1, + count: 1, + source: 1, + serverity: 0, + avg_frequency: null, + cpu: 1, + min_freq: '', + max_freq: '', + duration: 1, + process_name: '', + thread_name: '', + }, + ]; + + it('initTestTest01', () => { + expect(initTest(metricData)).toBeTruthy(); + }); + + it('initCpuStrategyDataTest02', () => { + expect(initCpuStrategyData(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/DistributeTermStrategy.test.ts b/ide/test/trace/component/metrics/DistributeTermStrategy.test.ts new file mode 100644 index 000000000..632af51c3 --- /dev/null +++ b/ide/test/trace/component/metrics/DistributeTermStrategy.test.ts @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initDistributedTermData } from '../../../../dist/trace/component/metrics/DistributeTermStrategy.js'; + +describe('DistributeTermStrategy Test', () => { + let metricData = [ + { + length: 1, + funName: 'name', + ts: 'ts', + dur: '', + flag: 'fd,fdsf.fds', + trace_name: 'name1', + chainId: '1', + spanId: 'span', + parentSpanId: '', + processId: '', + threadId: '', + threadName: '', + processName: '', + }, + ]; + it('initDistributedTermDataTest01', () => { + expect(initDistributedTermData(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/MemAggStrategy.test.ts b/ide/test/trace/component/metrics/MemAggStrategy.test.ts new file mode 100644 index 000000000..62017c3a8 --- /dev/null +++ b/ide/test/trace/component/metrics/MemAggStrategy.test.ts @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initMemoryAggStrategy } from '../../../../dist/trace/component/metrics/MemAggStrategy.js'; + +describe('MemAggStrategy Test', () => { + it('initMemoryAggStrategyTest01', () => { + const metricData = [ + { + length: 1, + processName: 'name', + name: 'oom_score_adj', + value: '', + ts: '', + }, + ]; + expect(initMemoryAggStrategy(metricData)).toBeTruthy(); + }); + + it('initMemoryAggStrategyTest02', () => { + const metricData = [ + { + length: 1, + processName: 'name', + name: 'mem.rss.anon', + value: '', + ts: '', + }, + ]; + expect(initMemoryAggStrategy(metricData)).toBeTruthy(); + }); + + it('initMemoryAggStrategyTest03', () => { + const metricData = [ + { + length: 1, + processName: 'name', + name: 'mem.swap', + value: '', + ts: '', + }, + ]; + expect(initMemoryAggStrategy(metricData)).toBeTruthy(); + }); + + it('initMemoryAggStrategyTest04', () => { + const metricData = [ + { + length: 1, + processName: 'name', + name: 'mem.rss.file', + value: '', + ts: '', + }, + ]; + expect(initMemoryAggStrategy(metricData)).toBeTruthy(); + }); + + it('initMemoryAggStrategyTest05', () => { + const metricData = [ + { + length: 1, + processName: 'name', + name: 'oom_score_adj', + value: '', + ts: '', + }, + ]; + expect(initMemoryAggStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/MemStrategy.test.ts b/ide/test/trace/component/metrics/MemStrategy.test.ts new file mode 100644 index 000000000..e5559fb20 --- /dev/null +++ b/ide/test/trace/component/metrics/MemStrategy.test.ts @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initMemoryStrategy } from '../../../../dist/trace/component/metrics/MemStrategy.js'; + +describe('MemStrategy Test', () => { + const metricData = [ + { + length: 1, + minNum: 'name', + maxNum: '', + avgNum: '', + processName: '', + }, + ]; + + it('initMemoryStrategyTest01', () => { + expect(initMemoryStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/MetaDataStrategy.test.ts b/ide/test/trace/component/metrics/MetaDataStrategy.test.ts new file mode 100644 index 000000000..f4aeb459e --- /dev/null +++ b/ide/test/trace/component/metrics/MetaDataStrategy.test.ts @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initMetaDataStrategy } from '../../../../dist/trace/component/metrics/MetaDataStrategy.js'; + +describe('MetaDataStrategy Test', () => { + const metricData = [ + { + length: 1, + name: 'name', + valueText: '', + }, + ]; + + it('initMetaDataStrategyTest01', () => { + expect(initMetaDataStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/SysCallsStrategy.test.ts b/ide/test/trace/component/metrics/SysCallsStrategy.test.ts new file mode 100644 index 000000000..5c4f3e606 --- /dev/null +++ b/ide/test/trace/component/metrics/SysCallsStrategy.test.ts @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initSysCallsStrategy } from '../../../../dist/trace/component/metrics/SysCallsStrategy.js'; + +describe('SysCallsStrategy Test', () => { + const metricData = [ + { + length: 1, + funName: 'name', + maxDur: '', + minDur: '', + avgDur: '', + }, + ]; + + it('initMetaDataStrategyTest01', () => { + expect(initSysCallsStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/SysCallsTopStrategy.test.ts b/ide/test/trace/component/metrics/SysCallsTopStrategy.test.ts new file mode 100644 index 000000000..43cea5bf6 --- /dev/null +++ b/ide/test/trace/component/metrics/SysCallsTopStrategy.test.ts @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initSysCallsTopStrategy } from '../../../../dist/trace/component/metrics/SysCallsTopStrategy.js'; + +describe('SysCallsTopStrategy Test', () => { + const metricData = [ + { + length: 1, + pid: 'pi', + tid: 'ti', + process_name: '', + maxDur: 'name', + minDur: '', + avgDur: '', + funName: '', + }, + ]; + + it('initSysCallsTopStrategyTest01', () => { + expect(initSysCallsTopStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/TraceStatsStrategy.test.ts b/ide/test/trace/component/metrics/TraceStatsStrategy.test.ts new file mode 100644 index 000000000..f63abbf54 --- /dev/null +++ b/ide/test/trace/component/metrics/TraceStatsStrategy.test.ts @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initTraceStateStrategy } from '../../../../dist/trace/component/metrics/TraceStatsStrategy.js'; + +describe('TraceTaskStrategy Test', () => { + let metricData = [ + { + length: 1, + event_name: 'name', + count: 1, + source: 1, + serverity: 0, + }, + ]; + it('initTraceStateStrategyTest01', () => { + expect(initTraceStateStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/metrics/TraceTaskStrategy.test.ts b/ide/test/trace/component/metrics/TraceTaskStrategy.test.ts new file mode 100644 index 000000000..5c47e34ad --- /dev/null +++ b/ide/test/trace/component/metrics/TraceTaskStrategy.test.ts @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { initTraceTaskStrategy } from '../../../../dist/trace/component/metrics/TraceTaskStrategy.js'; + +describe('TraceTaskStrategy Test', () => { + let metricData = [ + { + length: 1, + process_name: '', + thread_name: '', + pid: 3, + }, + ]; + it('initTraceTaskStrategyTest01', () => { + expect(initTraceTaskStrategy(metricData)).toBeTruthy(); + }); +}); diff --git a/ide/test/trace/component/setting/SpAllocations.test.ts b/ide/test/trace/component/setting/SpAllocations.test.ts index d22d65492..cc1017874 100644 --- a/ide/test/trace/component/setting/SpAllocations.test.ts +++ b/ide/test/trace/component/setting/SpAllocations.test.ts @@ -43,7 +43,6 @@ describe('SpAllocations Test', () => { it(' SpAllocations set attrValue', function () { let spEle = document.querySelector('#sp') as SpAllocations; - spEle.processId.value = '2'; spEle.unwindEL.value = '111'; spEle.shareMemory.value = '222'; spEle.shareMemoryUnit.value = 'MB'; @@ -57,7 +56,6 @@ describe('SpAllocations Test', () => { it(' SpAllocations set attrValue2', function () { let spEle = document.querySelector('#sp') as SpAllocations; - spEle.processId.value = '3'; spEle.unwindEL.value = '1121'; spEle.shareMemory!.value = '222'; spEle.shareMemoryUnit.value = 'KB'; @@ -71,7 +69,6 @@ describe('SpAllocations Test', () => { it(' SpAllocations set attrValue03', function () { let spEle = new SpAllocations(); - spEle.processId.value = '3'; spEle.unwindEL.value = '1121'; spEle.shareMemory.value = '222'; spEle.filterMemory.value = '111'; @@ -83,23 +80,9 @@ describe('SpAllocations Test', () => { it('SpAllocations test05', function () { let spAllocations = document.querySelector('#sp') as SpAllocations; - expect(spAllocations.appProcess).toBe('3'); + expect(spAllocations.appProcess).toBe(''); }); - it('SpAllocations test06', function () { - let spAllocations = document.querySelector('#sp') as SpAllocations; - expect(spAllocations.convertToValue('0', 'MB')).toBe(0); - }); - - it('SpAllocations test07', function () { - let spAllocations = document.querySelector('#sp') as SpAllocations; - expect(spAllocations.convertToValue('1', 'KB')).toBe(16384); - }); - - it('SpAllocations test08', function () { - let spAllocations = document.querySelector('#sp') as SpAllocations; - expect(spAllocations.convertToValue('1', '')).toBe(0); - }); it('SpAllocations test09', function () { let spAllocations = document.querySelector('#sp') as SpAllocations; expect(spAllocations.fp_unwind).toBeTruthy(); diff --git a/ide/test/trace/component/setting/SpRecordSetting.test.ts b/ide/test/trace/component/setting/SpRecordSetting.test.ts index bd9102205..dd08113f8 100644 --- a/ide/test/trace/component/setting/SpRecordSetting.test.ts +++ b/ide/test/trace/component/setting/SpRecordSetting.test.ts @@ -15,7 +15,6 @@ // @ts-ignore import { SpRecordSetting } from '../../../../dist/trace/component/setting/SpRecordSetting.js'; - describe('SpRecordSetting Test', () => { beforeAll(() => { document.body.innerHTML = ` @@ -37,4 +36,82 @@ describe('SpRecordSetting Test', () => { let spEle = document.querySelector('#setting') as SpRecordSetting; expect(spEle.resetValue()).toBeUndefined(); }); + it('SpRecordSettingTest05', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + let maxFileSizeEl = null; + expect(spEle.longTraceSingleFileMaxSize).toEqual(200); + }) + it('SpRecordSettingTest06', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.radioBox = null; + expect(spEle.recordMod).toBeFalsy(); + }) + it('SpRecordSettingTest07', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.outputPath = spEle.shadowRoot?.querySelector('#trace_path') as HTMLInputElement; + spEle.outputPath.value = '' + expect(spEle.longOutPath).toEqual('/data/local/tmp/long_trace/'); + }) + it('SpRecordSettingTest08', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.outputPath = undefined + expect(spEle.longOutPath).toEqual('/data/local/tmp/long_trace/'); + }) + it('SpRecordSettingTest09', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.outputPath = spEle.shadowRoot?.querySelector('#trace_path') as HTMLInputElement; + spEle.outputPath.value = 'long_trace/' + expect(spEle.longOutPath).toEqual('/data/local/tmp/long_trace/'); + }) + it('SpRecordSettingTest10', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.outputPath = spEle.shadowRoot?.querySelector('#trace_path') as HTMLInputElement; + spEle.outputPath.value = 'long' + expect(spEle.longOutPath).toEqual(`/data/local/tmp/long/`); + }) + it('SpRecordSettingTest11', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.isRecordTemplate = undefined; + spEle.outputPath = undefined; + expect(spEle.output).toEqual('/data/local/tmp/hiprofiler_data.htrace'); + }) + it('SpRecordSettingTest12', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.isRecordTemplate = true; + spEle.outputPath = undefined; + expect(spEle.output).toEqual('/data/local/tmp/hiprofiler_data.htrace'); + }) + it('SpRecordSettingTest13', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.isRecordTemplate = true; + spEle.outputPath = spEle.shadowRoot?.querySelector('#trace_path') as HTMLInputElement; + spEle.outputPath.value = '1111' + expect(spEle.output).toEqual(`/data/local/tmp/1111`); + }) + it('SpRecordSettingTest14', function (){ + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.bufferNumber = undefined; + expect(spEle.bufferSize).toEqual(64); + }) + it('SpRecordSettingTest15', function () { + let spEle = document.querySelector('#setting') as SpRecordSetting; + spEle.bufferNumber = spEle.shadowRoot.querySelector('.buffer-size') as HTMLElement; + let parentElement = spEle.memoryBufferSlider!.parentNode as Element; + let bufferInput = spEle.shadowRoot.querySelector('.memory_buffer_result') as HTMLInputElement; + let htmlInputElement = spEle.memoryBufferSlider!.shadowRoot.querySelector('#slider') as HTMLInputElement; + bufferInput.value = '60'; + bufferInput.dispatchEvent(new Event('input')); + expect(spEle.memoryBufferSlider.percent).toEqual(bufferInput.value); + expect(htmlInputElement.value).toEqual(bufferInput.value); + expect(spEle.memoryBufferSlider.sliderStyle).toEqual({ + minRange: 4, + maxRange: 512, + defaultValue: bufferInput.value, + resultUnit: 'MB', + stepSize: 2, + lineColor: 'var(--dark-color3,#46B1E3)', + buttonColor: '#999999', + }); + expect(parentElement.getAttribute('percent')).toEqual(bufferInput.value); + }); }); diff --git a/ide/test/trace/component/trace/base/TraceSheet.test.ts b/ide/test/trace/component/trace/base/TraceSheet.test.ts index 0144613ac..e5e200fc3 100644 --- a/ide/test/trace/component/trace/base/TraceSheet.test.ts +++ b/ide/test/trace/component/trace/base/TraceSheet.test.ts @@ -102,21 +102,4 @@ describe('TraceSheet Test', () => { let traceSheet = new TraceSheet(); expect(traceSheet.constructor()).toBeTruthy(); }); - it('TraceSheet Test13', () => { - let nativeHookResponseTypes = sqlit.queryNativeHookResponseTypes; - let hookTypeData = [ - { - lastLibId:33, - value:'bc' - }, - ]; - nativeHookResponseTypes.mockResolvedValue(hookTypeData); - let traceSheet = new TraceSheet(); - let param = { - leftNs: 0, - rightNs: 1000, - nativeMemory: ['All Heap & Anonymous VM', 'All Heap', 'Heap'], - }; - expect(traceSheet.initFilterLibList(param)).toBeUndefined(); - }); }); diff --git a/ide/test/trace/component/trace/sheet/cpu/TabPaneFrequencySample.test.ts b/ide/test/trace/component/trace/sheet/cpu/TabPaneFrequencySample.test.ts index fbaa55ad7..6621011b9 100644 --- a/ide/test/trace/component/trace/sheet/cpu/TabPaneFrequencySample.test.ts +++ b/ide/test/trace/component/trace/sheet/cpu/TabPaneFrequencySample.test.ts @@ -100,6 +100,8 @@ describe('TabPaneFrequencySample Test', () => { maxDuration: 63332, stdDuration: '', cpuFreqFilterIds: [1, 2, 9, 3], + cpuStateRowsId:[], + cpuFreqFilterNames:[], }; it('TabPaneCounterSampleTest01', function () { diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneCallTree.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneCallTree.test.ts index 55cae9413..00a9ae307 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneCallTree.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneCallTree.test.ts @@ -187,6 +187,7 @@ describe('TabPaneCallTree Test', () => { thirdSelect: '', type: 'inputValue', }; + calltree.callTreeTbl.reMeauseHeight = jest.fn(()=>true) expect(calltree.switchFlameChart(switchData)).toBeUndefined(); }); it('TabPaneCallTreeTest06', function () { diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts index a2634b151..6c0b9fb48 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts @@ -21,6 +21,11 @@ import { LitTable } from '../../../../../../dist/base-ui/table/lit-table.js'; import crypto from 'crypto'; // @ts-ignore import { TabPaneFilter } from '../../../../../../dist/trace/component/trace/sheet/TabPaneFilter.js'; +jest.mock('../../../../../../dist/trace/component/trace/sheet/SheetUtils.js', () => { + return { + initSort: ()=>{} + }; +}); // @ts-ignore window.ResizeObserver = window.ResizeObserver || @@ -129,7 +134,7 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { tabPane.filter = filter; tabPane.loadingList = []; tabPane.data = param; - expect(tabPane.fileStatisticsAnalysisCurrentSelection).not.toBeUndefined(); + expect(tabPane.fileStatisticsAnalysisCurrentSelection).toBeUndefined(); }); it('systemStatisticsAnalysis02', function () { @@ -274,35 +279,27 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); }); it('systemStatisticsAnalysis13', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.fileProcessLevelClickEvent(it)).toBeUndefined(); }); it('systemStatisticsAnalysis14', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.fileTypeLevelClickEvent(it)).toBeUndefined(); }); it('systemStatisticsAnalysis15', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.fileThreadLevelClickEvent(it)).toBeUndefined(); }); it('systemStatisticsAnalysis16', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.fileSoLevelClickEvent(it)).toBeUndefined(); }); it('TabPanePerfAnalysisTest17 ', function () { @@ -317,7 +314,7 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { tabPane.processStatisticsData = jest.fn(() => true); tabPane.processStatisticsData.allDuration = jest.fn(() => true); tabPane.fileStatisticsAnalysisPidData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.fsBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); it('TabPanePerfAnalysisTest18 ', function () { @@ -332,7 +329,7 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { tabPane.threadStatisticsData = jest.fn(() => true); tabPane.threadStatisticsData.allDuration = jest.fn(() => true); tabPane.fileStatisticsAnalysisThreadData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.fsBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); it('TabPanePerfAnalysisTest19 ', function () { @@ -347,7 +344,7 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { tabPane.libStatisticsData = jest.fn(() => true); tabPane.libStatisticsData.allDuration = jest.fn(() => true); tabPane.fileStatisticsAnalysisSoData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.fsBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); it('TabPanePerfAnalysisTest20 ', function () { @@ -362,7 +359,7 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { tabPane.typeStatisticsData = jest.fn(() => true); tabPane.typeStatisticsData.allDuration = jest.fn(() => true); tabPane.fileStatisticsAnalysisTypeData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.fsBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); }); diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts index 87d1ce1be..e94d5d920 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts @@ -33,7 +33,11 @@ Object.defineProperty(global.self, 'crypto', { getRandomValues: (arr: string | any[]) => crypto.randomBytes(arr.length), }, }); - +jest.mock('../../../../../../dist/trace/component/trace/sheet/SheetUtils.js', () => { + return { + initSort: ()=>{} + }; +}); describe('TabPaneIOTierStatisticsAnalysis Test', () => { document.body.innerHTML = ``; let tabPane = document.querySelector('#statistics-analysis'); @@ -266,35 +270,27 @@ describe('TabPaneIOTierStatisticsAnalysis Test', () => { expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); }); it('tabPaneIOTierStatisticsAnalysis14', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.ioTierProcessLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneIOTierStatisticsAnalysis15', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.ioTierTypeLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneIOTierStatisticsAnalysis16', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.ioTierThreadLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneIOTierStatisticsAnalysis17', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.ioTierSoLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneIOTierStatisticsAnalysis18', function () { @@ -339,6 +335,7 @@ describe('TabPaneIOTierStatisticsAnalysis Test', () => { tabPane.threadStatisticsData = jest.fn(() => true); tabPane.threadStatisticsData.allDuration = jest.fn(() => true); tabPane.threadData = [{}, {}]; + tabPane.data = param; tabPane.iOTierStatisticsAnalysisBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts index 6fffff938..043c3af73 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts @@ -32,7 +32,11 @@ window.ResizeObserver = Object.defineProperty(global.self, 'crypto', { value: { getRandomValues: (arr: string | any[]) => crypto.randomBytes(arr.length) }, }); - +jest.mock('../../../../../../dist/trace/component/trace/sheet/SheetUtils.js', () => { + return { + initSort: ()=>{} + }; +}); describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { document.body.innerHTML = ``; let tabPane = document.querySelector('#statistics-analysis'); @@ -250,35 +254,27 @@ describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis12', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.vmProcessLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis13', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.vmTypeLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis14', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.vmThreadLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis15', function () { - let it = [ - { - tabName: '', - }, - ]; + let it = { + tableName: '', + }; expect(tabPane.vmSoLevelClickEvent(it)).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis16', function () { @@ -293,7 +289,7 @@ describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { tabPane.processStatisticsData = jest.fn(() => true); tabPane.processStatisticsData.allDuration = jest.fn(() => true); tabPane.vmStatisticsAnalysisPidData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.vmBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis17', function () { @@ -308,7 +304,7 @@ describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { tabPane.typeStatisticsData = jest.fn(() => true); tabPane.typeStatisticsData.allDuration = jest.fn(() => true); tabPane.vmStatisticsAnalysisTypeData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.vmBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis18', function () { @@ -323,7 +319,7 @@ describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { tabPane.threadStatisticsData = jest.fn(() => true); tabPane.threadStatisticsData.allDuration = jest.fn(() => true); tabPane.vmStatisticsAnalysisThreadData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.vmBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); it('tabPaneVirtualMemoryStatisticsAnalysis19', function () { @@ -338,7 +334,7 @@ describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { tabPane.libStatisticsData = jest.fn(() => true); tabPane.libStatisticsData.allDuration = jest.fn(() => true); tabPane.vmStatisticsAnalysisSoData = [{}, {}]; - tabPane.back!.dispatchEvent(itemClick); + tabPane.vmBack!.dispatchEvent(itemClick); expect(tabPane.goBack()).toBeUndefined(); }); }); diff --git a/ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.test.ts b/ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.test.ts new file mode 100644 index 000000000..5bdca44d3 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.test.ts @@ -0,0 +1,129 @@ +/* + * Copyright (C) 2023 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +//@ts-ignore +import { TabPaneFreqDataCut } from '../../../../../../dist/trace/component/trace/sheet/frequsage/TabPaneFreqDataCut.js'; + +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return { + snapshotDataSource: () => { + }, + removeAttribute: () => { + }, + }; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); + +describe('TabPaneFreqDataCut Test', () => { + let data = { + leftNs: 0, + rightNs: 0, + processIds: [1, 2], + }; + let getTabRunningPercent = sqlite.getTabRunningPercent; + getTabRunningPercent.mockResolvedValue([ + { + pid: 1, + tid: 1, + state: 'Running', + cpu: 0, + dur: 0, + ts: 1, + } + ]); + let queryCpuFreqFilterId = sqlite.queryCpuFreqFilterId; + queryCpuFreqFilterId.mockResolvedValue([{ + id: 1, + cpu: 0, + }]); + let queryCpuFreqUsageData = sqlite.queryCpuFreqUsageData; + queryCpuFreqUsageData.mockResolvedValue([{ + value: '', + dur: '', + startNS: 0, + filter_id: 1, + }]); + it('TabPaneFreqDataCutTest01 ', function () { + let tabPaneFreqDataCut = new TabPaneFreqDataCut(); + tabPaneFreqDataCut.data = data; + expect(tabPaneFreqDataCut.data).toBeUndefined(); + }); + it('TabPaneFreqDataCutTest02', () => { + let tabPaneFreqDataCut = new TabPaneFreqDataCut(); + const arr = [ + {percent: 50, children: []}, + {percent: 75.123456, children: [{percent: 80, children: []}]}, + ]; + tabPaneFreqDataCut.fixedDeal(arr); + expect(arr[0].percent).toBe('50.00'); + expect(arr[1].percent).toBe('75.12'); + expect(arr[1].children[0].percent).toBe('80.00'); + }); + it('TabPaneFreqDataCutTest03', () => { + let tabPaneFreqDataCut = new TabPaneFreqDataCut(); + const threadArr = [ + {pid: 1, tid: 1, children: []}, + {pid: 2, tid: 2, children: []}, + ]; + const totalData = [ + {pid: 1, tid: 1}, + ]; + tabPaneFreqDataCut.mergeTotalData(threadArr, totalData); + expect(threadArr).toEqual([ + {pid: 1, tid: 1, children: [{pid: 1, tid: 1, thread: 'TotalData'}]}, + {pid: 2, tid: 2, children: []}, + ]); + }); + it('TabPaneFreqDataCutTest04 ', function () { + let tabPaneFreqDataCut = new TabPaneFreqDataCut(); + const obj = { + children: [], + count: 0, + dur: 0, + percent: 0 + }; + const arr = [ + {count: 1, dur: 10, percent: 10}, + {count: 2, dur: 20, percent: 20}, + {count: 0, dur: 0, percent: 0}, + {count: 3, dur: 30, percent: 30} + ]; + tabPaneFreqDataCut.mergeCycleData(obj, arr); + expect(obj.children.length).toBe(3); + expect(obj.children).toContainEqual({count: 1, dur: 10, percent: 10}); + expect(obj.children).toContainEqual({count: 2, dur: 20, percent: 20}); + expect(obj.children).toContainEqual({count: 3, dur: 30, percent: 30}); + expect(obj.count).toBe(6); + expect(obj.dur).toBe(60); + expect(obj.percent).toBe(60); + }); + it('TabPaneFreqDataCutTest05 ', function () { + let tabPaneFreqDataCut = new TabPaneFreqDataCut(); + const resList = [ + {cpu: 'A', freq: 1, id: 1, dur: 10, percent: 50, count: 1}, + {cpu: 'A', freq: 1, id: 1, dur: 20, percent: 30, count: 2}, + {cpu: 'B', freq: 2, id: 2, dur: 15, percent: 40, count: 1}, + {cpu: 'B', freq: 2, id: 2, dur: 25, percent: 20, count: 2}, + ]; + tabPaneFreqDataCut.mergeData(resList); + expect(resList).toEqual([ + {cpu: 'A', freq: 1, id: 1, dur: 30, percent: 80, count: 3}, + {cpu: 'B', freq: 2, id: 2, dur: 40, percent: 60, count: 3} + ]); + }); +}); \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.test.ts b/ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.test.ts new file mode 100644 index 000000000..bb154caaa --- /dev/null +++ b/ide/test/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.test.ts @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +//@ts-ignore +import { TabPaneFreqUsage } from '../../../../../../dist/trace/component/trace/sheet/frequsage/TabPaneFreqUsage.js'; + +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return { + snapshotDataSource: () => { + }, + removeAttribute: () => { + }, + }; +}); +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +describe('TabPaneFreqUsage Test', () => { + let tabPaneFreqUsage = new TabPaneFreqUsage(); + let data = { + leftNs: 0, + rightNs: 0, + processIds: [1, 2], + }; + let getTabRunningPercent = sqlite.getTabRunningPercent; + getTabRunningPercent.mockResolvedValue([ + { + pid: 1, + tid: 1, + state: 'Running', + cpu: 0, + dur: 0, + ts: 1, + } + ]); + let queryCpuFreqFilterId = sqlite.queryCpuFreqFilterId; + queryCpuFreqFilterId.mockResolvedValue([{ + id: 1, + cpu: 0, + }]); + let queryCpuFreqUsageData = sqlite.queryCpuFreqUsageData; + queryCpuFreqUsageData.mockResolvedValue([{ + value: '', + dur: '', + startNS: 0, + filter_id: 1, + }]); + it('TabPaneFreqUsageTest01 ', function () { + tabPaneFreqUsage.data = data; + expect(tabPaneFreqUsage.data).toBeUndefined(); + }); + it('TabPaneFreqUsageTest02', () => { + let tabPaneFreqUsage = new TabPaneFreqUsage(); + const threadStatesTblSource = [ + {process: ' ', value: 3}, + {process: 'ABC', value: 2}, + {process: 'XYZ', value: 1}, + ]; + tabPaneFreqUsage.sortByColumn({key: 'value', sort: 1}, threadStatesTblSource); + expect(threadStatesTblSource).toEqual([ + { + 'process': ' ', + 'value': 3 + }, + { + 'process': 'ABC', + 'value': 2 + }, + { + 'process': 'XYZ', + 'value': 1 + } + ]); + }); +}); \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/gpu/TabPaneGpuGL.test.ts b/ide/test/trace/component/trace/sheet/gpu/TabPaneGpuGL.test.ts index 344a45ef7..2e5404363 100644 --- a/ide/test/trace/component/trace/sheet/gpu/TabPaneGpuGL.test.ts +++ b/ide/test/trace/component/trace/sheet/gpu/TabPaneGpuGL.test.ts @@ -34,7 +34,7 @@ window.ResizeObserver = describe('TabPaneGpuGL Test', () => { document.body.innerHTML = `
    `; let tabPaneGpuGL = document.querySelector('#tree'); - let queryGpuGLDataByRange = sqlite.queryGpuGLDataByRange; + let queryGpuGLDataByRange = sqlite.queryGpuDataTab; queryGpuGLDataByRange.mockResolvedValue([ { startTs: 23, diff --git a/ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHiSysEventSummary.test.ts b/ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHiSysEventSummary.test.ts new file mode 100644 index 000000000..3c9dafb69 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHiSysEventSummary.test.ts @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TabPaneHiSysEventSummary } from '../../../../../../dist/trace/component/trace/sheet/hisysevent/TabPaneHiSysEventSummary.js'; + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +describe('TabPaneHilogSummary Test', () => { + let summaryTab = new TabPaneHiSysEventSummary(); + let summaryData = { + hiSysEvents: [{ + id: 1, + domain: 'DISPLAY', + eventName: 'AMBIENT_LIGHT', + eventType: 2, + ts: 2797000000, + tz: '23925', + pid: 23925, + tid: 24086, + uid: 5523, + info: '', + level:'MINOR', + seq: '92839', + contents: '{"LEVEL":126}', + dur: 0, + depth: 0, + isSelected: false, + }] + }; + it('TabPaneHilogSummaryTest01', function () { + summaryTab.data = summaryData; + expect(summaryTab.data).toBeUndefined(); + }); +}); \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHisysEvents.test.ts b/ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHisysEvents.test.ts new file mode 100644 index 000000000..6128d397b --- /dev/null +++ b/ide/test/trace/component/trace/sheet/hi-sysevent/TabPaneHisysEvents.test.ts @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +//@ts-ignore +import { TabPaneHisysEvents } from '../../../../../../dist/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.js'; + +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneHisysEvents Test', () => { + it('TabPaneHisysEvents01 ', function () { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + let MockRealTime = sqlit.queryRealTime; + let Realtime = [{ + ts: 1000, + clock_name: '', + }]; + let tabData = { + hiSysEvents: [{ + id: 1, + domain: 'DISPLAY', + eventName: 'AMBIENT_LIGHT', + eventType: 2, + ts: 2797000000, + tz: '23925', + pid: 23925, + tid: 24086, + uid: 5523, + info: '', + level: 'MINOR', + seq: '92839', + contents: '{"LEVEL":126}', + dur: 0, + depth: 0, + }] + }; + MockRealTime.mockResolvedValue(Realtime); + tabPaneHisysEvents.data = tabData.hiSysEvents; + expect(tabPaneHisysEvents.data).toBeUndefined(); + }); + it('TabPaneHisysEvents02 ', function () { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + const domainValue = 'DISPLAY'; + const tagElement = tabPaneHisysEvents.buildTag(domainValue); + expect(tagElement.className).toBe('tagElement'); + expect(tagElement.id).toBe(domainValue); + const tag = tagElement.querySelector('.tag'); + expect(tag.innerHTML).toBe(domainValue); + const closeButton = tagElement.querySelector('lit-icon'); + expect(closeButton.getAttribute('name')).toBe('close-light'); + expect(closeButton.style.color).toBe('rgb(255, 255, 255)'); + }); + it('TabPaneHisysEvents03', () => { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + expect(tabPaneHisysEvents.updateData()).toBeUndefined(); + }); + it('TabPaneHisysEvents04', () => { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + expect(tabPaneHisysEvents.filterData()).toBeTruthy(); + }); + it('TabPaneHisysEvents05', () => { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + expect(tabPaneHisysEvents.updateDetail()).toBeUndefined(); + }); + it('TabPaneHisysEvents06', () => { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + let hisysEventSource = [ + { key: 'A', sort: 1 }, + { key: 'B', sort: 2 }, + { key: 'C', sort: 3 }, + ] + let hiSysEventTable = { recycleDataSource: [] }; + tabPaneHisysEvents.sortByColumn.call({ hisysEventSource, hiSysEventTable }, { key: 'key', sort: 1, type: 'number' }); + expect(hisysEventSource).toEqual([ + { key: 'A', sort: 1 }, + { key: 'B', sort: 2 }, + { key: 'C', sort: 3 }, + ]); + expect(hiSysEventTable.recycleDataSource).toEqual([ + { key: 'A', sort: 1 }, + { key: 'B', sort: 2 }, + { key: 'C', sort: 3 }, + ]); + }); + it('TabPaneHisysEvents07', () => { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + tabPaneHisysEvents.baseTime = ''; + tabPaneHisysEvents.currentDetailList = [{ + key: 'key', + value: 'value' + }]; + tabPaneHisysEvents.realTime = 0; + tabPaneHisysEvents.changeInput = document.createElement('input'); + tabPaneHisysEvents.detailsTbl = document.createElement('table'); + tabPaneHisysEvents.slicerTrack = document.createElement('div'); + tabPaneHisysEvents.boxDetails = document.createElement('div'); + tabPaneHisysEvents.detailbox = document.createElement('div'); + const data = { + contents: JSON.stringify({ + key1: 'value1', + key2: 'value2', + INPUT_TIME: '1234567890' + }) + }; + tabPaneHisysEvents.convertData(data); + expect(tabPaneHisysEvents.baseTime).toBe('1234567890000000'); + expect(tabPaneHisysEvents.changeInput.value).toBe('1234567890000000'); + expect(tabPaneHisysEvents.slicerTrack.style.visibility).toBe('visible'); + expect(tabPaneHisysEvents.detailsTbl.style.paddingLeft).toBe('20px'); + expect(tabPaneHisysEvents.boxDetails.style.width).toBe('65%'); + expect(tabPaneHisysEvents.detailbox.style.display).toBe('block'); + expect(tabPaneHisysEvents.detailsTbl.recycleDataSource).toEqual([ + { key: 'key', value: 'value' }, + { key: 'key1', value: 'value1' }, + { key: 'key2', value: 'value2' }, + { key: 'INPUT_TIME', value: '1234567890000000' } + ]); + }); + it('TabPaneHisysEvents08 ', function () { + let tabPaneHisysEvents = new TabPaneHisysEvents(); + let changeInput = { + value: '', + }; + let mockUpdateDetail = jest.fn(); + changeInput.value = 'abc'; + tabPaneHisysEvents.changeInputEvent.call({ changeInput: changeInput, updateDetail: mockUpdateDetail }); + expect(changeInput.value).toEqual('abc'); + }); +}); \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogSummary.test.ts b/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogSummary.test.ts new file mode 100644 index 000000000..26091746d --- /dev/null +++ b/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogSummary.test.ts @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import { TabPaneHiLogSummary } from '../../../../../../dist/trace/component/trace/sheet/hilog/TabPaneHiLogSummary.js'; + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneHilogSummary Test', () => { + let summaryTab = new TabPaneHiLogSummary(); + + let summaryData = { + leftNs: 0, + rightNs: 33892044011, + hiLogs: [{ + id: 2, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33872275426, + level: 'I', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 3, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33874375717, + level: 'W', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 4, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33878711051, + level: 'D', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 5, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33885632885, + level: 'E', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 6, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33889724969, + level: 'F', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 7, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33892044011, + level: 'A', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + }] + }; + + it('TabPaneHilogSummaryTest01', function () { + summaryTab.data = summaryData; + expect(summaryTab.data).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts b/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts new file mode 100644 index 000000000..63cda0b59 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts @@ -0,0 +1,152 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import { TabPaneHiLogs } from '../../../../../../dist/trace/component/trace/sheet/hilog/TabPaneHiLogs.js'; +// @ts-ignore +import { TraceSheet } from '../../../../../../dist/trace/component/trace/base/TraceSheet.js'; +import '../../../../../../dist/base-ui/table/LitPageTable.js' +// @ts-ignore +import { TraceRow } from '../../../../../../dist/trace/component/trace/base/TraceRow.js'; +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return { + recycleDataSource: (): void => {}, + }; +}); +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +const intersectionObserverMock = (): {observe: ()=> null} => ({ + observe: (): null => null, +}); +window.IntersectionObserver = jest.fn().mockImplementation(intersectionObserverMock); + +jest.mock('../../../../../../dist/trace/component/trace/base/TraceSheet.js', () => { + return { + }; +}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorkerCPU.js', () => { + return { + cpuCount: 1, + CpuRender: Object, + EmptyRender: Object, + }; +}); + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneHilogs Test', (): void => { + TraceRow.range = jest.fn(() => true); + TraceRow.range!.startNS = jest.fn(() => 0); + TraceRow.range!.endNS = jest.fn(() => 27763331331); + TraceRow.range!.totalNS = jest.fn(() => 27763331331); + let hiLogsTab = new TabPaneHiLogs(); + document.body.innerHTML = '
    '; + let container = document.querySelector('#container'); + container!.append(hiLogsTab); + let logsData = { + leftNs: 0, + rightNs: 33892044011, + hiLogs: [{ + id: 2, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33872275426, + level: 'I', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 3, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33874375717, + level: 'W', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 4, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33878711051, + level: 'D', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 5, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33885632885, + level: 'E', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 6, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33889724969, + level: 'F', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + },{ + id: 7, + pid: 1119, + tid: 1172, + processName: 'process1119', + startTs: 33892044011, + level: 'A', + tag: 'C02d0c/Hiprofiler', + context: 'ParseTimeExtend: upd', + time: 0, + depth: 0, + dur: 0, + }] + }; + + it('TabPaneHilogsTest01', function () { + let htmlElement = document.createElement('div'); + let sheetEl = document.createElement('trace-sheet') as TraceSheet; + sheetEl!.systemLogFlag = undefined; + hiLogsTab.initTabSheetEl(htmlElement, sheetEl); + hiLogsTab.data = logsData; + hiLogsTab.refreshTable(); + expect(hiLogsTab.isFilterLog(logsData)).toBeFalsy(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts b/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts index d97fabb00..d0fe93748 100644 --- a/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts @@ -18,6 +18,10 @@ import { TabPanePerfAnalysis } from '../../../../../../dist/trace/component/trac import crypto from 'crypto'; //@ts-ignore import { queryHiPerfProcessCount } from '../../../../../../dist/trace/database/SqlLite.js'; +//@ts-ignore +import { TabPaneFilter } from '../../../../../../dist/trace/component/trace/sheet/TabPaneFilter.js'; + +import '../../../../../../dist/trace/component/trace/sheet/TabPaneFilter.js'; // @ts-ignore window.ResizeObserver = @@ -53,6 +57,12 @@ jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => return {}; }); +jest.mock('../../../../../../dist/trace/component/trace/sheet/SheetUtils.js', () => { + return { + initSort: ()=>{} + }; +}); + describe('TabPanePerfAnalysis Test', () => { it('TabPanePerfAnalysisTest01 ', function () { let tabPanePerfAnalysis = new TabPanePerfAnalysis(); @@ -210,8 +220,10 @@ describe('TabPanePerfAnalysis Test', () => { let tabPanePerfAnalysis = new TabPanePerfAnalysis(); expect(tabPanePerfAnalysis.totalCountData(1)).toStrictEqual({ allCount: 1, - count: 0, - countFormat: '1.00ms', + count: 1, + allEventCount: undefined, + eventCount: undefined, + eventPercent: "100.00", percent: '100.00', pid: '', }); @@ -575,11 +587,10 @@ describe('TabPanePerfAnalysis Test', () => { document.body.innerHTML = ` `; let tabPanePerfAnalysis = document.getElementById('slc') as TabPanePerfAnalysis; - let it = [ + let it = { - tabName: '', - }, - ]; + tableName: '', + }; tabPanePerfAnalysis.perfAnalysisPie = jest.fn(() => true); tabPanePerfAnalysis.perfAnalysisPie.hideTip = jest.fn(() => true); expect(tabPanePerfAnalysis.perfSoLevelClickEvent(it, [])).toBeUndefined(); diff --git a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallInfo.test.ts b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallInfo.test.ts new file mode 100644 index 000000000..ac98d9e86 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallInfo.test.ts @@ -0,0 +1,362 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import { TabPaneNMCallInfo } from '../../../../../../dist/trace/component/trace/sheet/native-memory/TabPaneNMCallInfo.js'; +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {} +}); + +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneNMCallInfo Test', () => { + document.body.innerHTML = ''; + let tabPaneNMCallInfo = document.querySelector('#ddd'); + + let nativeHookData = [ + { + eventId: 0, + eventType: '', + subType: '', + heapSize: 0, + addr: '', + startTs: 0, + endTs: 0, + sumHeapSize: 0, + max: 0, + count: 0, + tid: 0, + isSelected: false, + }, + { + eventId: 0, + eventType: '', + subType: '', + heapSize: 0, + addr: '', + startTs: 0, + endTs: 0, + sumHeapSize: 0, + max: 0, + count: 0, + tid: 0, + isSelected: false, + }, + ]; + + tabPaneNMCallInfo.currentSelection = jest.fn(() => true); + TabPaneNMCallInfo.data = { + cpus: [], + threadIds: [], + trackIds: [], + funTids: [], + heapIds: [], + nativeMemory: [], + leftNs: 0, + rightNs: 0, + hasFps: false, + statisticsSelectData: undefined, + }; + + let sortArr = [{ + id: '0', + pid: '', + library: '', + symbolId: 0, + title: '', + count: 0, + countValue: '', + countPercent: '', + type: 0, + heapSize: 0, + heapPercent: '', + heapSizeStr: '', + eventId: 0, + threadId: 0, + threadName: '', + isSelected: false, + }, { + id: '1', + pid: '', + library: '', + symbolId: 0, + title: '', + count: 0, + countValue: '', + countPercent: '', + type: 0, + heapSize: 0, + heapPercent: '', + heapSizeStr: '', + eventId: 0, + threadId: 0, + threadName: '', + isSelected: false, + }] + + let iconRowClick = new CustomEvent('row-click', { + detail: { + data: { + id: '', + pid: '', + library: '', + symbolId: 0, + title: '', + count: 0, + countValue: '', + countPercent: '', + type: 0, + heapSize: 0, + heapPercent: '', + heapSizeStr: '', + eventId: 0, + threadId: 0, + threadName: '', + isSelected: false, + children: [] + }, + callBack: (call: boolean) => {} + }, + composed: true, + }); + + it('TabPaneNMCallInfoTest2', function () { + sortArr.map = jest.fn(()=>[]) + expect(tabPaneNMCallInfo.sortTree(sortArr, 'size', 0)).toBe(sortArr); + }); + it('TabPaneNMCallInfoTest3', function () { + sortArr.map = jest.fn(()=>[]) + expect(tabPaneNMCallInfo.sortTree(sortArr, 'size', 1)).toBe(sortArr); + }); + it('TabPaneNMCallInfoTest4', function () { + sortArr.map = jest.fn(()=>[]) + expect(tabPaneNMCallInfo.sortTree(sortArr, 'size', 2)).toBe(sortArr); + }); + it('TabPaneNMCallInfoTest5', function () { + sortArr.map = jest.fn(()=>[]) + expect(tabPaneNMCallInfo.sortTree(sortArr, 'num', 0)).toBe(sortArr); + }); + it('TabPaneNMCallInfoTest6', function () { + sortArr.map = jest.fn(()=>[]) + expect(tabPaneNMCallInfo.sortTree(sortArr, 'num', 1)).toBe(sortArr); + }); + it('TabPaneNMCallInfoTest7', function () { + sortArr.map = jest.fn(()=>[]) + expect(tabPaneNMCallInfo.sortTree(sortArr, 'num', 2)).toBe(sortArr); + }); + + it('TabPaneNMCallInfoTest08', function () { + let hookLeft = { + id: '', + pid: '', + library: '', + title: '', + count: 0, + children: [], + depth: 0, + frame: undefined, + isHover: false, + parent: undefined, + size: 2, + symbol: '', + type: 0, + heapSize: 0, + heapSizeStr: '', + eventId: 0, + threadId: 0, + }; + let groupByWithTid = tabPaneNMCallInfo.setRightTableData(hookLeft); + expect(groupByWithTid).toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest10', function () { + expect(tabPaneNMCallInfo.sortTreeByColumn()).toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest11', function () { + let tab = new TabPaneNMCallInfo(); + let MockqueryNativeHookEventTid = sqlit.queryNativeHookEventTid; + MockqueryNativeHookEventTid.mockResolvedValue([ + { + eventId: 0, + eventType: 'AllocEvent', + heap_size: 2, + addr: 'addr', + startTs: 0, + endTs: 500, + tid: 2, + threadName: 'threadName', + }, + ]); + tab.data = { + leftNs: 0, + rightNs: 500, + nativeMemory: 'All Heap & Anonymous VM', + }; + + tab.startWorker = jest.fn(() => true); + expect(tab.data).toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest12', function () { + expect(tabPaneNMCallInfo.initHtml()).toMatchInlineSnapshot(` +" + +
    + + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + +     +     + + + + + +
    +
    + " +`); + }); + it('TabPaneNMCallInfoTest11', function () { + let hook = { + id: 1, + dur: 1, + children: [], + }; + let id = '1'; + expect(tabPaneNMCallInfo.getParentTree([hook], { id: 1 }, [])).not.toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest13', function () { + expect(tabPaneNMCallInfo.showButtomMenu()).toBeUndefined(); + }); + it('TabPaneNMCallInfoTest14', function () { + let isShow = 1; + expect(tabPaneNMCallInfo.showButtomMenu(isShow)).toBeUndefined(); + }); + it('TabPaneNMCallInfoTest15', function () { + expect(tabPaneNMCallInfo.showButtomMenu({},{})).toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest16', function () { + let hook = { + eventId: 1, + dur: 1, + children: [], + }; + expect(tabPaneNMCallInfo.getChildTree([hook], 1, [])).not.toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest17', function () { + let hook = { + eventId: 1, + dur: 1, + children: [], + }; + expect(tabPaneNMCallInfo.getChildTree([hook], 2, [])).not.toBeUndefined(); + }); + + it('TabPaneNMCallInfoTest18', function () { + tabPaneNMCallInfo.tblData.clearAllSelection = jest.fn(()=>true); + tabPaneNMCallInfo.tblData.setCurrentSelection = jest.fn(()=>[]); + tabPaneNMCallInfo.callInfoTbl.clearAllSelection = jest.fn(()=>true); + tabPaneNMCallInfo.callInfoTbl.scrollToData = jest.fn(()=>true); + tabPaneNMCallInfo.callInfoTbl.dispatchEvent(iconRowClick); + tabPaneNMCallInfo.tblData.dispatchEvent(iconRowClick); + let hook = { + id: 1, + dur: 1, + children: [], + }; + let id = '1'; + expect(tabPaneNMCallInfo.getParentTree([hook], { id: 2 }, [])).not.toBeUndefined(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.test.ts b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.test.ts index 25a8dbdcc..336fcc587 100644 --- a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.test.ts +++ b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.test.ts @@ -19,8 +19,6 @@ import { TabPaneNMCallTree } from '../../../../../../dist/trace/component/trace/ import { TabPaneFilter } from '../../../../../../dist/trace/component/trace/sheet/TabPaneFilter.js'; // @ts-ignore import { FrameChart } from '../../../../../../dist/trace/component/chart/FrameChart.js'; -// @ts-ignore -import { DisassemblingWindow } from '../../../../../../dist/trace/component/DisassemblingWindow.js'; jest.mock('../../../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { return {}; @@ -42,7 +40,6 @@ describe('TabPaneNMCallTree Test', () => { let dom = new FrameChart(); dom.setAttribute('id', 'framechart'); tabPaneNMCallTree.frameChart = dom; - tabPaneNMCallTree.modal = new DisassemblingWindow(); tabPaneNMCallTree.filter = new TabPaneFilter(); it('TabPaneNMCallTreeTest01', function () { diff --git a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.test.ts b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.test.ts index 0d1f4ed0a..08cb90212 100644 --- a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.test.ts +++ b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.test.ts @@ -15,8 +15,11 @@ // @ts-ignore import { TabPaneNMSampleList } from '../../../../../../dist/trace/component/trace/sheet/native-memory/TabPaneNMSampleList.js'; -// @ts-ignore -import { LitTable } from '../../../../../../dist/base-ui/table/lit-table'; +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return { + recycleDataSource: () => {}, + }; +}); // @ts-ignore import { NativeHookSampleQueryInfo, NativeHookSamplerInfo } from '../../../../../../dist/trace/bean/NativeHook.js'; // @ts-ignore @@ -25,8 +28,8 @@ import { NativeMemory } from '../../../../../../dist/trace/bean/NativeHook.js'; jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { return {}; }); +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); -import { queryAllHookData } from '../../../../../../dist/trace/database/SqlLite.js'; jest.mock('../../../../../../dist/trace/database/SqlLite.js'); // @ts-ignore window.ResizeObserver = window.ResizeObserver || @@ -38,8 +41,7 @@ window.ResizeObserver = window.ResizeObserver || describe('TabPaneNMSampleList Test', () => { document.body.innerHTML = ''; let tabPaneNMSampleList = document.querySelector('#ddt'); - - TabPaneNMSampleList.source = [ + TabPaneNMSampleList.samplerInfoSource = [ { current: '', currentSize: 101, diff --git a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.test.ts b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.test.ts index 0df9d8635..854f1b570 100644 --- a/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.test.ts @@ -26,11 +26,6 @@ window.ResizeObserver = observe: jest.fn(), unobserve: jest.fn(), })); - -jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { - return {}; -}); - Object.defineProperty(global.self, 'crypto', { value: { getRandomValues: (arr: string | any[]) => crypto.randomBytes(arr.length), @@ -42,13 +37,17 @@ jest.mock('../../../../../../dist/base-ui/chart/pie/LitChartPie.js', () => { }); jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceSheet.js', () => {}); +import '../../../../../../dist/trace/component/trace/sheet/TabPaneFilter.js'; +jest.mock('../../../../../../dist/trace/component/trace/sheet/SheetUtils.js', () => { + return { + initSort: () =>{} + }; +}); describe('TabPaneNMStatisticAnalysis Test', () => { let htmlDivElement = document.createElement('div'); let tabStatisticAnalysis = new TabPaneNMStatisticAnalysis(); - tabStatisticAnalysis.tableType.reMeauseHeight = jest.fn(() => true); - tabStatisticAnalysis.soUsageTbl.reMeauseHeight = jest.fn(() => true); - tabStatisticAnalysis.functionUsageTbl.reMeauseHeight = jest.fn(() => true); htmlDivElement.append(tabStatisticAnalysis); let dataArray = { applyCount: 25336, @@ -76,6 +75,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { rightNs: 48320174407, hasFps: false, nativeMemory: ['All Heap & Anonymous VM', 'All Heap'], + nativeMemoryStatistic:[] }; let processData = [ { @@ -107,13 +107,13 @@ describe('TabPaneNMStatisticAnalysis Test', () => { tabStatisticAnalysis.tabName.textContent = 'Statistic By Library Size'; tabStatisticAnalysis.eventTypeData = [dataArray]; let mouseMoveEvent: MouseEvent = new MouseEvent('click', { movementX: 1, movementY: 2 }); - tabStatisticAnalysis.back.dispatchEvent(mouseMoveEvent); - tabStatisticAnalysis.back.dispatchEvent(mouseMoveEvent); + tabStatisticAnalysis.nmBack.dispatchEvent(mouseMoveEvent); + tabStatisticAnalysis.nmBack.dispatchEvent(mouseMoveEvent); }); it('statisticAnalysis03', function () { - tabStatisticAnalysis.getLibSize(dataArray, select); - expect(tabStatisticAnalysis.currentLevel).toEqual(1); + tabStatisticAnalysis.getNMLibSize(dataArray, select); + expect(tabStatisticAnalysis.currentLevel).toEqual(2); }); it('statisticAnalysis04', function () { @@ -121,7 +121,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { }); it('statisticAnalysis05', function () { - tabStatisticAnalysis.calTypeSize(select, processData); + tabStatisticAnalysis.getNMTypeSize(select, processData); expect(tabStatisticAnalysis.processData.length).toBe(1); }); @@ -144,7 +144,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { type: 11, }, ]; - tabStatisticAnalysis.calTypeSize(select, processData); + tabStatisticAnalysis.getNMTypeSize(select, processData); expect(tabStatisticAnalysis.currentLevelReleaseCount).toBe(0); }); @@ -167,7 +167,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { type: 92, }, ]; - tabStatisticAnalysis.calTypeSize(select, processData); + tabStatisticAnalysis.getNMTypeSize(select, processData); expect(tabStatisticAnalysis.currentLevelApplySize).toBe(0); }); @@ -190,26 +190,26 @@ describe('TabPaneNMStatisticAnalysis Test', () => { type: 30, }, ]; - tabStatisticAnalysis.calTypeSize(select, processData); + tabStatisticAnalysis.getNMTypeSize(select, processData); expect(tabStatisticAnalysis.processData.length).toBe(1); }); it('statisticAnalysis09', function () { tabStatisticAnalysis.currentLevel = 0; tabStatisticAnalysis.sortByColumn('', 0); - expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(1); + expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(0); }); it('statisticAnalysis10', function () { tabStatisticAnalysis.currentLevel = 1; tabStatisticAnalysis.sortByColumn('', 0); - expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(1); + expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(0); }); it('statisticAnalysis11', function () { tabStatisticAnalysis.currentLevel = 2; tabStatisticAnalysis.sortByColumn('', 0); - expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(1); + expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(0); }); it('statisticAnalysis12', function () { @@ -259,7 +259,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { }, ]; tabStatisticAnalysis.sortByColumn('existCountPercent', 1); - expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(3); + expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(0); }); it('statisticAnalysis13', function () { @@ -300,7 +300,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { }, ]; tabStatisticAnalysis.sortByColumn('releaseCountPercent', 1); - expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(3); + expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(0); }); it('statisticAnalysis14', function () { @@ -341,7 +341,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { }, ]; tabStatisticAnalysis.sortByColumn('applyCountPercent', 1); - expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(3); + expect(tabStatisticAnalysis.tableType.recycleDataSource.length).toBe(0); }); it('statisticAnalysis15', function () { @@ -367,7 +367,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { it('statisticAnalysis17', function () { tabStatisticAnalysis.tabName.textContent; let mouseMoveEvent: MouseEvent = new MouseEvent('click', { movementX: 1, movementY: 2 }); - tabStatisticAnalysis.back.dispatchEvent(mouseMoveEvent); + tabStatisticAnalysis.nmBack.dispatchEvent(mouseMoveEvent); tabStatisticAnalysis.isStatistic = false; let val = { @@ -378,22 +378,21 @@ describe('TabPaneNMStatisticAnalysis Test', () => { expect(tabStatisticAnalysis.getNMEventTypeSize(val)).toBeUndefined(); }); it('statisticAnalysis18', function () { - let it = [ + let it = { - tabName: '', - }, - ]; + tableName: '', + }; tabStatisticAnalysis.totalData = jest.fn(() => true); tabStatisticAnalysis.pie = jest.fn(() => true); tabStatisticAnalysis.pie.hideTip = jest.fn(() => true); + tabStatisticAnalysis.nmPieChart.hideTip = jest.fn(() => true); expect(tabStatisticAnalysis.nativeProcessLevelClickEvent(it)).toBeUndefined(); }); it('statisticAnalysis19', function () { - let it = [ + let it = { - tabName: '', - }, - ]; + libName: '', + }; tabStatisticAnalysis.totalData = jest.fn(() => true); tabStatisticAnalysis.pie = jest.fn(() => true); tabStatisticAnalysis.pie.hideTip = jest.fn(() => true); @@ -406,9 +405,6 @@ describe('TabPaneNMStatisticAnalysis Test', () => { expect(tabStatisticAnalysis.calSizeObj([])).toBeTruthy(); }); it('statisticAnalysis23', function () { - tabStatisticAnalysis.threadUsageTbl = jest.fn(() => true); - tabStatisticAnalysis.threadUsageTbl.reMeauseHeight = jest.fn(() => true); - tabStatisticAnalysis.threadUsageTbl.addEventListener = jest.fn(() => true); expect(tabStatisticAnalysis.getNMThreadSize(dataArray, select)).toBeUndefined(); }); it('statisticAnalysis24', function () { @@ -423,7 +419,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { tabStatisticAnalysis.typeStatisticsData = jest.fn(() => true); tabStatisticAnalysis.typeStatisticsData.allDuration = jest.fn(() => true); tabStatisticAnalysis.eventTypeData = [{}, {}]; - tabStatisticAnalysis.back!.dispatchEvent(itemClick); + tabStatisticAnalysis.nmBack!.dispatchEvent(itemClick); expect(tabStatisticAnalysis.getBack()).toBeUndefined(); }); it('statisticAnalysis25', function () { @@ -438,7 +434,7 @@ describe('TabPaneNMStatisticAnalysis Test', () => { tabStatisticAnalysis.libStatisticsData = jest.fn(() => true); tabStatisticAnalysis.libStatisticsData.allDuration = jest.fn(() => true); tabStatisticAnalysis.soData = [{}, {}]; - tabStatisticAnalysis.back!.dispatchEvent(itemClick); + tabStatisticAnalysis.nmBack!.dispatchEvent(itemClick); expect(tabStatisticAnalysis.getBack()).toBeUndefined(); }); }); diff --git a/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts b/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts index 4a39ed6f5..e5b4fa6dc 100644 --- a/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts +++ b/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts @@ -96,18 +96,7 @@ describe('TabPaneSmapsRecord Test', () => { smaps.privateClean = 3; let result = [smaps, smaps]; - it('tabPaneSmapsRecord01', function () { - expect( - tabPaneSmapsRecord.sortByColumn({ - key: '', - sort: '', - }) - ).toBeUndefined(); - }); it('tabPaneSmapsRecord02', () => { expect(tabPaneSmapsRecord.initElements()).toBeUndefined(); }); - it('tabPaneSmapsRecord03', () => { - expect(tabPaneSmapsRecord.filteredData(result)).toBeUndefined(); - }); }); diff --git a/ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts b/ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts new file mode 100644 index 000000000..6bd43a8f9 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts @@ -0,0 +1,396 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +//@ts-ignore +import { TabPaneComparison } from '../../../../../../dist/trace/component/trace/sheet/snapshot/TabPaneComparison.js'; +import '../../../../../../dist/trace/component/trace/sheet/snapshot/TabPaneComparison.js'; + +//@ts-ignore +import { HeapDataInterface } from '../../../../../../dist/js-heap/HeapDataInterface.js'; + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return { + snapshotDataSource: () => {}, + removeAttribute: () => {}, + }; +}); + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +// @ts-ignore +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneComparison Test', () => { + let data = { + end_time: 5373364415, + file_name: 'Snapshot1', + frame: { height: 40, width: 24, x: 272, y: 0 }, + id: 1, + pid: 4243, + start_time: 4937360912, + textMetricsWidth: 60.697265625, + }; + let dataList = [ + { + id: 0, + file_name: 'Snapshot0', + start_time: 0, + end_time: 435811002, + pid: 4243, + textMetricsWidth: 50.5810546875, + }, + ]; + + let childenData = [ + { + addedCount: 6491111, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: 'edgeName', + fileId: 0, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + }, + { + addedCount: 649, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: '', + fileId: 1, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + }, + ]; + let ddd = [ + { + addedCount: 6482222, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: 'edgeName', + fileId: 0, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + isString: jest.fn(() => true), + }, + { + addedCount: 6483333, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: '', + fileId: 1, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + isString: jest.fn(() => true), + }, + { + addedCount: 6485555, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: '', + fileId: 2, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 2, + isString: jest.fn(() => true), + }, + ]; + let rowObjectData = { + top: 0, + height: 0, + rowIndex: 0, + data: { + status: true, + targetFileId: 12, + children: childenData, + getChildren: () => {}, + }, + expanded: true, + rowHidden: false, + children: childenData, + depth: -1, + }; + + let iconClick = new CustomEvent('icon-click', { + detail: { + ...rowObjectData.data, + data: rowObjectData.data, + }, + composed: true, + }); + let iconRowClick = new CustomEvent('row-click', { + detail: { + ...rowObjectData.data, + data: ddd[0], + }, + composed: true, + }); + let iconColumnClickData = new CustomEvent('column-click', { + detail: { + key: 'addedCount', + sort: 1, + }, + composed: true, + }); + let iconColumnClick = new CustomEvent('column-click', { + detail: { + key: 'addedCount', + sort: 1, + }, + composed: true, + }); + let iconkeyUpClick = new CustomEvent('keyup', { + detail: { + key: 'addedCount', + sort: 1, + }, + composed: true, + }); + document.body.innerHTML = ` + `; + let tabPaneComparisons = document.getElementById('sss') as TabPaneComparison; + + HeapDataInterface.getInstance().getClassListForComparison = jest.fn(() => []); + HeapDataInterface.getInstance().getNextForComparison = jest.fn(() => ddd); + let htmlInputElement = document.createElement('input'); + htmlInputElement.value = 'input'; + tabPaneComparisons.search = jest.fn(() => htmlInputElement); + let heapDataInterface = new HeapDataInterface(); + heapDataInterface.fileStructs = [data]; + let htmlDivElement = document.createElement('div'); + tabPaneComparisons.leftTheadTable = jest.fn(() => htmlDivElement); + tabPaneComparisons.comparisonTable = jest.fn(() => htmlDivElement); + tabPaneComparisons.rightTheadTable = jest.fn(() => htmlDivElement); + tabPaneComparisons.rightTheadTable.removeAttribute = jest.fn(() => true); + tabPaneComparisons.rightTheadTable.hasAttribute = jest.fn(() => {}); + tabPaneComparisons.leftTheadTable = jest.fn(() => htmlDivElement); + tabPaneComparisons.leftTheadTable.hasAttribute = jest.fn(() => {}); + tabPaneComparisons.leftTheadTable.removeAttribute = jest.fn(() => true); + + it('TabPaneComparisonTest01', () => { + tabPaneComparisons.comparisonsData = jest.fn(() => ddd); + tabPaneComparisons.comparisonTableEl.reMeauseHeight = jest.fn(() => true); + tabPaneComparisons.initComparison(data, dataList); + + let retainsData = [ + { + shallowSize: 10, + retainedSize: 10, + shallowPercent: 10, + retainedPercent: 10, + distance: 1000000001, + nodeName: 'nodeName', + objectName: 'objectName', + edgeName: 'edgeName', + children: childenData, + }, + { + shallowSize: 1, + retainedSize: 1, + shallowPercent: 1, + retainedPercent: 1, + distance: 100000000, + nodeName: 'nodeName', + objectName: 'objectName', + edgeName: 'edgeName', + children: childenData, + }, + ]; + HeapDataInterface.getInstance().getRetains = jest.fn(() => retainsData); + + tabPaneComparisons.comparisonTableEl!.dispatchEvent(iconClick); + tabPaneComparisons.comparisonTableEl!.dispatchEvent(iconRowClick); + tabPaneComparisons.comparisonTableEl!.dispatchEvent(iconColumnClickData); + tabPaneComparisons.retainerTableEl.reMeauseHeight = jest.fn(() => true); + tabPaneComparisons.retainerTableEl!.dispatchEvent(iconColumnClick); + + tabPaneComparisons.sortComprisonByColumn('addedCount', 0); + tabPaneComparisons.sortComprisonByColumn('removedCount', 1); + tabPaneComparisons.sortComprisonByColumn('addedCount', 1); + tabPaneComparisons.sortComprisonByColumn('deltaCount', 1); + tabPaneComparisons.sortComprisonByColumn('objectName', 1); + tabPaneComparisons.sortComprisonByColumn('addedSize', 1); + tabPaneComparisons.sortComprisonByColumn('removedSize', 1); + tabPaneComparisons.sortComprisonByColumn('deltaSize', 1); + + tabPaneComparisons.sortRetainerByColumn('distance', 0); + tabPaneComparisons.sortRetainerByColumn('shallowSize', 1); + tabPaneComparisons.sortRetainerByColumn('retainedSize', 1); + tabPaneComparisons.sortRetainerByColumn('objectName', 1); + expect(tabPaneComparisons.comparisonTableEl!.snapshotDataSource).toEqual([]); + }); + + it('TabPaneComparisonTest2', () => { + tabPaneComparisons.retainsData = [ + { + distance: 1, + }, + ]; + tabPaneComparisons.retainerTableEl!.dispatchEvent(iconClick); + expect(tabPaneComparisons.retainsData).not.toBe([]); + }); + + it('TabPaneComparisonTest12', () => { + let tabPaneComparison = new TabPaneComparison(); + let data = [ + { + end_time: 5373364415, + file_name: 'Snapshot1', + frame: { height: 40, width: 24, x: 272, y: 0 }, + id: 1, + pid: 4243, + start_time: 4937360912, + textMetricsWidth: 60.697265625, + }, + ]; + expect(tabPaneComparison.initSelect(0, data)).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts b/ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts new file mode 100644 index 000000000..8e04bd193 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts @@ -0,0 +1,363 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +//@ts-ignore +import { TabPaneSummary } from '../../../../../../dist/trace/component/trace/sheet/snapshot/TabPaneSummary.js'; +//@ts-ignore +import { HeapDataInterface } from '../../../../../../dist/js-heap/HeapDataInterface.js'; +//@ts-ignore +import { SpJsMemoryChart } from '../../../../../../dist/trace/component/chart/SpJsMemoryChart.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); +// @ts-ignore +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneSummary Test', () => { + let tabPaneSummary = new TabPaneSummary(); + it('TabPaneSummaryTest01', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; + tabPaneSummary.tbsTable = jest.fn(() => { + return { + scrollTop: 0, + }; + }); + let childenData = [ + { + addedCount: 649, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: 'edgeName', + fileId: 0, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + }, + { + addedCount: 649, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: '', + fileId: 1, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + }, + ]; + let retainsData = [ + { + shallowSize: 10, + retainedSize: 10, + shallowPercent: 10, + retainedPercent: 10, + distance: 1000000001, + nodeName: 'nodeName', + objectName: 'objectName', + edgeName: 'edgeName', + children: childenData, + }, + { + shallowSize: 1, + retainedSize: 1, + shallowPercent: 1, + retainedPercent: 1, + distance: 100000000, + nodeName: 'nodeName', + objectName: 'objectName', + edgeName: 'edgeName', + children: childenData, + }, + ]; + let ddd = [ + { + addedCount: 648, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: 'edgeName', + fileId: 0, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + }, + { + addedCount: 648, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: '', + fileId: 1, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 4, + }, + { + addedCount: 648, + addedIndx: [319, 326], + addedSize: 38936, + childCount: 1296, + children: [], + classChildren: [], + deletedIdx: [325, 338], + deltaCount: 0, + deltaSize: -16, + distance: -1, + edgeCount: 0, + edgeName: '', + fileId: 2, + hasNext: true, + id: -1, + index: 0, + isAdd: false, + isHover: false, + isSelected: false, + nextId: [], + nodeName: 'nodeName', + objectName: 'objectName', + removedCount: 648, + removedSize: 38952, + retainedSize: -1, + retains: [], + shallowSize: -1, + showBox: false, + showCut: false, + status: true, + targetFileId: 1, + traceNodeId: -1, + type: 2, + }, + ]; + let htmlDivElement = document.createElement('div'); + tabPaneSummary.leftTheadTable = jest.fn(() => htmlDivElement); + tabPaneSummary.rightTheadTable = jest.fn(() => htmlDivElement); + tabPaneSummary.tbsTable = jest.fn(() => { + return { + scrollTop: 0, + }; + }); + + tabPaneSummary.rightTheadTable.removeAttribute = jest.fn(() => true); + tabPaneSummary.rightTheadTable.hasAttribute = jest.fn(() => {}); + + tabPaneSummary.leftTheadTable.hasAttribute = jest.fn(() => {}); + tabPaneSummary.leftTheadTable.removeAttribute = jest.fn(() => true); + + SpJsMemoryChart.file = { + file_name: 'Timeline', + id: '', + }; + HeapDataInterface.getInstance().getAllocationStackData = jest.fn(() => { + return [ + { + id: 0, + index: 0, + name: '', + scriptName: '', + scriptId: 0, + line: 0, + column: 0, + }, + { + id: 0, + index: 0, + name: '', + scriptName: 'string', + scriptId: 0, + line: 0, + column: 0, + }, + ]; + }); + + let htmlDivElement1 = document.createElement('div'); + htmlDivElement1.className = 'table'; + tabPaneSummary.tbs.meauseTreeRowElement = jest.fn(() => { + return []; + }); + tabPaneSummary.tblSummary.meauseTreeRowElement = jest.fn(() => { + return []; + }); + let rowObjectData = { + top: 0, + height: 0, + rowIndex: 0, + data: { + status: true, + targetFileId: 12, + children: childenData, + getChildren: () => {}, + }, + expanded: true, + rowHidden: false, + children: childenData, + depth: -1, + }; + HeapDataInterface.getInstance().getRetains = jest.fn(() => retainsData); + let iconRowClick = new CustomEvent('row-click', { + detail: { + data: rowObjectData.data, + }, + composed: true, + }); + + let iconClick = new CustomEvent('icon-click', { + detail: { + data: rowObjectData.data, + }, + composed: true, + }); + iconClick.detail.data.isString = jest.fn(() => true); + tabPaneSummary.tblSummary.dispatchEvent(iconRowClick); + tabPaneSummary.tblSummary.dispatchEvent(iconClick); + tabPaneSummary.tbs.dispatchEvent(iconClick); + tabPaneSummary.sortByLeftTable('distance', 0); + tabPaneSummary.sortByLeftTable('shallowSize', 1); + tabPaneSummary.sortByLeftTable('retainedSize', 1); + tabPaneSummary.sortByLeftTable('objectName', 1); + HeapDataInterface.getInstance().getClassesListForSummary = jest.fn(() => { + return retainsData; + }); + + expect(tabPaneSummary.initSummaryData(1, 0, 0)).toBeUndefined(); + }); + it('TabPaneSummaryTest12', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; + expect(tabPaneSummary.sortByLeftTable('shallowSize', 1)).toBeUndefined(); + }); + it('TabPaneSummaryTest03', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; + expect(tabPaneSummary.sortByLeftTable('retainedSize', 1)).toBeUndefined(); + }); + it('TabPaneSummaryTest04', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; + expect(tabPaneSummary.sortByLeftTable('objectName', 1)).toBeUndefined(); + }); + it('TabPaneSummaryTest09', () => { + expect(tabPaneSummary.clickToggleTable()).toBeUndefined(); + }); + it('TabPaneSummaryTest10', () => { + expect(tabPaneSummary.classFilter()).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.test.ts b/ide/test/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.test.ts index cfdf537e8..b665ee33e 100644 --- a/ide/test/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.test.ts +++ b/ide/test/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.test.ts @@ -379,7 +379,9 @@ describe('ProcedureLogicWorkerNativeNemory Test', () => { id: 1, params: [ { - list: '', + list: [{ + value: 'name/value' + }], }, ], action: '', @@ -395,6 +397,7 @@ describe('ProcedureLogicWorkerNativeNemory Test', () => { params: [ { list: '', + value:'' }, ], action: '', @@ -409,7 +412,11 @@ describe('ProcedureLogicWorkerNativeNemory Test', () => { id: 1, params: [ { - list: '', + list: [ + { + value: 'name/value' + } + ], }, ], action: 'a', diff --git a/ide/test/trace/database/logic-worker/ProcedureLogicWorkerPerf.test.ts b/ide/test/trace/database/logic-worker/ProcedureLogicWorkerPerf.test.ts index 13edfb973..820f5fb8d 100644 --- a/ide/test/trace/database/logic-worker/ProcedureLogicWorkerPerf.test.ts +++ b/ide/test/trace/database/logic-worker/ProcedureLogicWorkerPerf.test.ts @@ -26,6 +26,7 @@ import { PerfCallChain, PerfAnalysisSample, } from '../../../../dist/trace/database/logic-worker/ProcedureLogicWorkerPerf.js'; + //@ts-ignore import { PerfCall } from '../../../../dist/trace/database/logic-worker/ProcedureLogicWorkerCommon.js'; @@ -154,20 +155,6 @@ describe('ProcedureLogicWorkerPerf Test', () => { expect(procedureLogicWorkerPerf.clearAll()).toBeUndefined(); }); - it('ProcedureLogicWorkerPerfTest14', function () { - let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); - let callChain = { - sampleId: '', - depth: 0, - canCharge: false, - name: '', - tid: '', - fileName: '', - threadName: '', - }; - expect(procedureLogicWorkerPerf.addPerfCallData(callChain)).toBeUndefined(); - }); - it('ProcedureLogicWorkerPerfTest19', function () { let perfCountSample = new PerfCountSample(); perfCountSample = { @@ -330,28 +317,6 @@ describe('ProcedureLogicWorkerPerf Test', () => { expect(procedureLogicWorkerPerf.getCurrentDataFromDb(selectionParam)).toBeUndefined(); }); - it('ProcedureLogicWorkerPerfTest41', function () { - let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); - let currentNode = { - children: [], - initChildren: [], - }; - let list = [ - { - length: 1, - name: '', - }, - ]; - expect(procedureLogicWorkerPerf.merageChildren(currentNode, list, true)).toBeUndefined(); - }); - it('ProcedureLogicWorkerPerfTest42', function () { - let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); - let sampleIds = { - length: 1, - }; - let isTopDown = {}; - expect(procedureLogicWorkerPerf.groupNewTreeNoId(sampleIds, isTopDown)).toStrictEqual([]); - }); it('ProcedureLogicWorkerPerfTest46', function () { let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); let node = { @@ -437,7 +402,6 @@ describe('ProcedureLogicWorkerPerf Test', () => { path: '', pid: 0, searchShow: true, - self: '0s', selfDur: 0, size: 0, symbol: '', @@ -447,6 +411,10 @@ describe('ProcedureLogicWorkerPerf Test', () => { vaddrInFile: 0, weight: '', weightPercent: '', + eventCount: 0, + eventPercent: '', + isProcess: false, + isThread: false }); }); it('PerfCallChainMerageDataTest03', function () { @@ -536,20 +504,6 @@ describe('ProcedureLogicWorkerPerf Test', () => { let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); expect(procedureLogicWorkerPerf.splitAllProcess([])).toBeUndefined(); }); - it('ProcedureLogicWorkerPerfTest57', function () { - let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); - let callChains = [ - { - tid: 1, - sampleId: 20, - }, - { - tid: 2, - sampleId: 30, - }, - ]; - expect(procedureLogicWorkerPerf.initPerfCallChainBottomUp(callChains)).toBeUndefined(); - }); it('ProcedureLogicWorkerPerfTest58', function () { let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); let callChains = [ @@ -592,10 +546,7 @@ describe('ProcedureLogicWorkerPerf Test', () => { ]; expect(procedureLogicWorkerPerf.addPerfGroupData(callChains)).toBeUndefined(); }); - it('ProcedureLogicWorkerPerfTest60', function () { - let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); - expect(procedureLogicWorkerPerf.getPerfCallChainsBySampleIds([], true)).toBeTruthy(); - }); + it('ProcedureLogicWorkerPerfTest61', function () { let procedureLogicWorkerPerf = new ProcedureLogicWorkerPerf(); let currentNode = { diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerCommon.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerCommon.test.ts index e7d3da6ef..2f4183ea2 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerCommon.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerCommon.test.ts @@ -248,10 +248,6 @@ describe('ProcedureWorkerCommon Test', () => { expect(ns2s(1)).toBe('1.0 ns'); }); - it('ProcedureWorkerCommon24', function () { - expect(ns2s(-1)).toBe('-1.0 s'); - }); - it('ProcedureWorkerCommon25', function () { expect(ColorUtils.hashFunc('', 10, 10)).toBe(3); }); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.test.ts index 16534ecba..a954e8d92 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfCPU.test.ts @@ -62,7 +62,7 @@ describe('ProcedureWorkerHiPerfCPU Test', () => { it('ProcedureWorkerHiPerfCPUTest05', function () { expect(HiPerfCpuStruct.groupBy10MS([{ id: 1, NS: 3 }, { copy: '1' }], 10, '')).toEqual([ - { dur: 10000000, height: Infinity, startNS: NaN }, + { dur: 10000000, height: NaN, eventCount: NaN ,startNS: NaN }, ]); }); it('ProcedureWorkerHiPerfCPUTest06', function () { diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.test.ts index 746b1f318..fe8eca5a0 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfProcess.test.ts @@ -67,7 +67,7 @@ describe('ProcedureWorkerHiPerfProcess Test', () => { it('ProcedureWorkerHiPerfProcessTest04', function () { expect(HiPerfProcessStruct.groupBy10MS([{ a: '1', b: 2, c: 3 }], 10)).toEqual([ - { dur: 10000000, height: 40, startNS: NaN }, + { dur: 10000000, height: NaN, eventCount: undefined, startNS: NaN }, ]); }); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfThread.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfThread.test.ts index 89f03140c..ee40d5ffb 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfThread.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerHiPerfThread.test.ts @@ -92,7 +92,7 @@ describe('ProcedureWorkerHiPerfThread Test', () => { it('ProcedureWorkerHiPerfThreadTest04', function () { expect(HiPerfThreadStruct.groupBy10MS([{ ps: 1 }, { coX: '1' }], 10, '')).toEqual([ - { dur: 10000000, height: Infinity, startNS: NaN }, + { dur: 10000000, eventCount: NaN, height: NaN, startNS: NaN }, ]); }); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts new file mode 100644 index 000000000..54017383b --- /dev/null +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts @@ -0,0 +1,189 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +jest.mock('../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); + +// @ts-ignore +import { smaps, SmapsRender, SmapsStruct } from '../../../../dist/trace/database/ui-worker/ProcedureWorkerSmaps.js'; + +describe('ProcedureWorkerSmaps Test', () => { + it('ProcedureWorkerSmapsTest01', function () { + let List = [ + { + length: 1, + ts: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + }, + ]; + let arr = [ + { + frame: null, + length: 1, + }, + ]; + let frame = { + x: 20, + y: 20, + width: 100, + height: 100, + }; + expect(smaps(List, arr, 1, 1, 1, frame, true)).toBeUndefined(); + }); + + it('ProcedureWorkerSmapsTest02', function () { + let List = [ + { + length: 1, + ts: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + }, + ]; + let arr = [ + { + frame: null, + length: 0, + }, + ]; + let frame = { + x: 20, + y: 20, + width: 100, + height: 100, + }; + expect(smaps(List, arr, 1, 1, 1, frame, false)).toBeUndefined(); + }); + + it('ProcedureWorkerSmapsTest03', () => { + const data = { + startNs: 1, + value: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + startTime: 1, + ts: 1, + }; + const canvas = document.createElement('canvas'); + canvas.width = 1; + canvas.height = 1; + const ctx = canvas.getContext('2d'); + expect(SmapsStruct.draw(ctx, data, 1)).toBeUndefined(); + }); + + it('ProcedureWorkerSmapsTest04', () => { + let node = { + startNs: 1, + value: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + ts: 1, + dur: 1, + }; + let frame = { + x: 20, + y: 20, + width: 100, + height: 100, + }; + expect(SmapsStruct.setSmapsFrame(node, 2, 1, 2, 2, frame)).toBeUndefined(); + }); + + it('ProcedureWorkerSmapsTest05', () => { + let node = { + startNs: 1, + value: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + ts: 0, + dur: 3, + }; + let frame = { + x: 20, + y: 20, + width: 100, + height: 100, + }; + expect(SmapsStruct.setSmapsFrame(node, 2, 1, 2, 2, frame)).toBeUndefined(); + }); + + it('ProcedureWorkerSmapsTest06', function () { + let sMapsRender = new SmapsRender(); + let req = { + lazyRefresh: true, + type: '', + startNS: 1, + endNS: 1, + totalNS: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + useCache: false, + range: { + refresh: '', + }, + canvas: '', + context: { + font: '11px sans-serif', + fillStyle: '#ffffff', + globalAlpha: 0.6, + }, + lineColor: '', + isHover: true, + hoverX: 1, + wakeupBean: undefined, + flagMoveInfo: '', + flagSelectedInfo: '', + slicesTime: 3, + id: 1, + x: 20, + y: 20, + width: 100, + height: 100, + params: { + maxValue: 10, + maxValueName: 'maxValueName', + rowName: 'rowName', + }, + }; + window.postMessage = jest.fn(() => true); + expect(sMapsRender.render(req, [], [])).toBeUndefined(); + }); +}); -- Gitee From c70be5728d18cfc03b02dd7fa280ccd45098e87a Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Mon, 13 Nov 2023 11:00:33 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/doc/md/quickstart_hiperf.md | 166 +++-- ide/src/doc/md/quickstart_hisystemevent.md | 178 ++--- ide/src/doc/md/quickstart_native_memory.md | 4 +- ...ickstart_Application_operation_skills.html | 2 +- ide/src/doc/quickstart_hiperf.html | 600 ++++++++--------- ide/src/doc/quickstart_hisystemevent.html | 576 +++++++++-------- ide/src/doc/quickstart_native_memory.html | 610 +++++++++--------- .../HiSystemEvent/hisyseventStatistics.jpg | Bin 0 -> 71355 bytes .../HiSystemEvent/hisyseventsetting.jpg | Bin 15305 -> 21349 bytes .../figures/HiSystemEvent/hisyseventtab.jpg | Bin 0 -> 217428 bytes .../HiSystemEvent/hisystemeventrow.jpg | Bin 0 -> 16840 bytes .../figures/NativeMemory/hook_moreprocess.jpg | Bin 0 -> 105358 bytes ide/src/figures/perf/cpuandthreadrow.jpg | Bin 0 -> 92195 bytes ide/src/figures/perf/perf_analysisjump.jpg | Bin 0 -> 70501 bytes ide/src/figures/perf/perf_hide.jpg | Bin 0 -> 122793 bytes ide/src/figures/perf/perf_jumpframe.jpg | Bin 0 -> 78804 bytes ide/src/figures/perf/perf_nocallstack.jpg | Bin 0 -> 48377 bytes ide/src/figures/perf/showevent.jpg | Bin 0 -> 88156 bytes ide/src/trace/component/chart/FrameChart.ts | 2 +- .../ui-worker/ProcedureWorkerHiSysEvent.ts | 40 +- 20 files changed, 1128 insertions(+), 1050 deletions(-) create mode 100644 ide/src/figures/HiSystemEvent/hisyseventStatistics.jpg create mode 100644 ide/src/figures/HiSystemEvent/hisyseventtab.jpg create mode 100644 ide/src/figures/HiSystemEvent/hisystemeventrow.jpg create mode 100644 ide/src/figures/NativeMemory/hook_moreprocess.jpg create mode 100644 ide/src/figures/perf/cpuandthreadrow.jpg create mode 100644 ide/src/figures/perf/perf_analysisjump.jpg create mode 100644 ide/src/figures/perf/perf_hide.jpg create mode 100644 ide/src/figures/perf/perf_jumpframe.jpg create mode 100644 ide/src/figures/perf/perf_nocallstack.jpg create mode 100644 ide/src/figures/perf/showevent.jpg diff --git a/ide/src/doc/md/quickstart_hiperf.md b/ide/src/doc/md/quickstart_hiperf.md index 467a02e55..5739293e8 100644 --- a/ide/src/doc/md/quickstart_hiperf.md +++ b/ide/src/doc/md/quickstart_hiperf.md @@ -1,102 +1,92 @@ -# HiPerf 的抓取和展示说明 - -HiPerf 工具是对系统性能数据进行采样记录，并将采样数据保存为文件，进行读取，展示分析。 - -## HiPerf 的抓取 - -### HiPerf 抓取配置参数 - +# HiPerf的抓取和展示说明 +HiPerf工具是对系统性能数据进行采样记录，并将采样数据保存为文件，进行读取，展示分析。 +## HiPerf的抓取 +### HiPerf抓取配置参数 ![GitHub Logo](../../figures/perf/perfsetting.jpg) 配置项说明： - -- Start Hiperf Sampling：配置项的总开关。 -- Process：离线模式下配置的是整个系统的。 -- Frequency：配置抓取的频率。 -- Call Stack：配置抓取的堆栈类型。 -- Advance Options：更多的抓取配置项。 - 再点击 Record setting，在 output file path 输入文件名 hiprofiler_data_perf.htrace，拖动滚动条设置 buffer size 大小是 64M，抓取时长是 50s。 - ![GitHub Logo](../../figures/perf/perfset.jpg) - 点击 Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。 - ![GitHub Logo](../../figures/perf/perfcommand.jpg) - 输入 hdc_shell，进入设备，执行命令。 - ![GitHub Logo](../../figures/perf/perfexcutecommand.jpg) - 执行完成后，进入指定目录查看，在/data/local/tmp 下就会生成 trace 文件。 - ![GitHub Logo](../../figures/perf/perffile.jpg) - -### HiPerf 展示说明 - -将抓取的 trace 文件导入 smartperf 界面查看。 ++ Start Hiperf Sampling：配置项的总开关。 ++ Process：离线模式下配置的是整个系统的。 ++ Frequency：配置抓取的频率。 ++ Call Stack：配置抓取的堆栈类型。 ++ Advance Options：更多的抓取配置项。 +再点击Record setting，在output file path输入文件名hiprofiler_data_perf.htrace，拖动滚动条设置buffer size大小是64M，抓取时长是50s。 +![GitHub Logo](../../figures/perf/perfset.jpg) +点击Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。 +![GitHub Logo](../../figures/perf/perfcommand.jpg) +输入hdc_shell，进入设备，执行命令。 +![GitHub Logo](../../figures/perf/perfexcutecommand.jpg) +执行完成后，进入指定目录查看，在/data/local/tmp下就会生成trace文件。 +![GitHub Logo](../../figures/perf/perffile.jpg) +### HiPerf展示说明 +将抓取的trace文件导入smartperf界面查看。 ![GitHub Logo](../../figures/perf/summary.jpg) -界面布局介绍：Perf 整体界面布局分为 3 个部分： +界面布局介绍：Perf整体界面布局分为3个部分： ++ 红色区域：泳道图。 ++ 绿色区域：详细信息(Perf Profile和Sample List)。 ++ 黄色区域：辅助信息(Callstack)。 -- 红色区域：泳道图。 -- 绿色区域：详细信息(Perf Profile和Sample List)。 -- 黄色区域：辅助信息(Callstack)。 - -### HiPerf 泳道图展示 - -Perf 泳道图展示按照 CPU 使用量和线程和进程展示，鼠标移动到泳道图上，悬浮框会显示 CPU 的使用量。 +### HiPerf泳道图展示 +Perf泳道图展示按照CPU使用量和线程和进程展示，鼠标移动到泳道图上，悬浮框会显示CPU的使用量。 ![GitHub Logo](../../figures/perf/chart.jpg) -按住 w 键放大界面，泳道图会出现 P 的标志，鼠标移动到 P 图标上，悬浮框会显示每个 callstack 和调用的深度如下图。 +按住w键放大界面，泳道图会出现P的标志，鼠标移动到P图标上，悬浮框会显示每个callstack和调用的深度如下图。 ![GitHub Logo](../../figures/perf/callstack.jpg) - -### HiPerf 泳道图的框选功能 - -可以对 CPU 使用量区，线程和进程区数据进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有两个 tab 页。 -Perf Profile 的 Tab 页如图： +Perf泳道图上浅色表示无效调用栈的采样点，抓取时由于设备上的对应的so无符号信息，函数跟地址都无法获取到，固该采样点在tab页中不做显示。 +![GitHub Logo](../../figures/perf/perf_nocallstack.jpg) +### HiPerf泳道图的框选功能 +可以对CPU使用量区，线程和进程区数据进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有两个tab页。 +Perf Profile的Tab页如图： ![GitHub Logo](../../figures/perf/PerfProfile.jpg) - -- Call Stack：为经过符号解析后的Callstack，并且给出动态链接库或者进程名的信息。 -- Local：为该调用方法自身占用的CPU时间。 -- Weight：调用方法的执行次数和占比。 - Sample List 的 Tab 页如图： - ![GitHub Logo](../../figures/perf/Samplelist.jpg) -- Sample Time：采样的时间戳信息。 -- Core：当前的CPU核信息。 -- Process：进程名。 -- Thread：线程名。 -- State：运行状态。 -- Backtrace：栈顶的调用栈名称。 - -### HiPerf 支持多种 Options 展示风格 - -点击 Perf Profile 的 Tab 页底部的 Options，会有两个 CheckBox 复选框。 ++ Call Stack：为经过符号解析后的Callstack，并且给出动态链接库或者进程名的信息。 ++ Local：为该调用方法自身占用的CPU时间。 ++ Weight：调用方法的执行次数和占比。 +Sample List的Tab页如图： +![GitHub Logo](../../figures/perf/Samplelist.jpg) ++ Sample Time：采样的时间戳信息。 ++ Core：当前的CPU核信息。 ++ Process：进程名。 ++ Thread：线程名。 ++ State：运行状态。 ++ Backtrace：栈顶的调用栈名称。 + +### HiPerf支持多种Options展示风格 +点击Perf Profile的Tab页底部的Options，会有两个CheckBox复选框。 ![GitHub Logo](../../figures/perf/Options.jpg) - -- Invert：反向输出调用树。 -- Hide System so：隐藏系统库文件。 - -### HiPerf 支持过滤调用栈调用次数的展示风格 - -点击 Perf Profile 的 Tab 页底部的 Sample Counter Filter，可以填上区间值。过滤出符合该区间值调用次数的调用栈信息。 ++ Invert：反向输出调用树。 ++ Hide System so：隐藏系统库文件。 +### HiPerf支持过滤调用栈调用次数的展示风格 +点击Perf Profile的Tab页底部的Sample Counter Filter，可以填上区间值。过滤出符合该区间值调用次数的调用栈信息。 ![GitHub Logo](../../figures/perf/samplecounter.jpg) -### HiPerf 功能的调用栈 Group 展示-数据分析支持剪裁功能 - +### HiPerf功能的调用栈Group展示-数据分析支持剪裁功能 ![GitHub Logo](../../figures/perf/datamining.jpg) - -- 裁剪 Callstack，点击 Callstack 上一个节点符号，再点击底部 Symbol Filter 按钮，则该符号自动被裁剪掉，同时将该节点往下所有的 Callstack 内容裁剪掉。 - -- 裁剪 Library，点击 Library Filter 按钮，则该库文件符号下所有的子节点也被裁剪。 -- 点击 Reset 按钮，将恢复选中的裁剪内容。 - -### HiPerf 功能的调用栈 Group 展示支持按条件过滤 - -在 Input Filter 输入关键字，会显示出带有该关键字的展示信息。 -![GitHub Logo](../../figures/perf/inputfilter.jpg) - -### HiPerf 辅助信息区展示调用栈 - -当在详细信息区选择一个符号时，将展示与该符号相关的完整的调用栈。对上展示到根节点，对下则展示 CPU 占用率最大的调用栈。调用栈右侧有 Sliding bar 可以滚动。 -如下图的 Heaviest Stack Trace： -![GitHub Logo](../../figures/perf/heaviesttrace1.jpg) - -### HiPerf 的火焰图功能 - -点击 Perf Profile 左下角的柱状图的图标，会切换到火焰图页面。 ++ 裁剪Callstack，点击Callstack上一个节点符号，再点击底部Symbol Filter按钮，则该符号自动被裁剪掉，同时将该节点往下所有的Callstack内容裁剪掉。 + ++ 裁剪Library，点击Library Filter按钮，则该库文件符号下所有的子节点也被裁剪。 ++ 点击Reset按钮，将恢复选中的裁剪内容。 +### HiPerf功能的调用栈Group展示支持按条件过滤 +在Input Filter输入关键字，会显示出带有该关键字的展示信息。 + ![GitHub Logo](../../figures/perf/inputfilter.jpg) +### HiPerf辅助信息区展示调用栈 +当在详细信息区选择一个符号时，将展示与该符号相关的完整的调用栈。对上展示到根节点，对下则展示CPU占用率最大的调用栈。调用栈右侧有Sliding bar可以滚动。 +如下图的Heaviest Stack Trace： + ![GitHub Logo](../../figures/perf/heaviesttrace1.jpg) +### HiPerf的火焰图功能 +点击Perf Profile左下角的柱状图的图标，会切换到火焰图页面。 ![GitHub Logo](../../figures/perf/flame.jpg) -进入到火焰图页面，火焰图的展示跟 Callinfo 的 tab 页的调用栈显示一致，鼠标放到色块上，悬浮框可以显示调用栈名称和 count 大小。 +进入到火焰图页面，火焰图的展示跟Callinfo的tab页的调用栈显示一致，鼠标放到色块上，悬浮框可以显示调用栈名称，lib，addr，Count，%in current thread，%in current process，&in all process。 ![GitHub Logo](../../figures/perf/flameshow.jpg) -鼠标左键火焰图，会进入下一级界面，右键回到上一级。 -![GitHub Logo](../../figures/perf/flamelevel2.jpg) +### HiPerf的show event count功能 +在Hiperf的父级泳道图上增加筛选功能，可在Cpu Usage 和各种event type之间选择，切换选择之后即可将Hiperf下级各个泳道图数据更新，悬浮框可以根据选择的事件名显示对应的event count。 +![GitHub Logo](../../figures/perf/showevent.jpg) +### HiPerf的CPU/进程级/线程级泳道支持时序火焰图， 按照每个时间点的调用栈显示功能 +根据Hiperf父级泳道图所筛选的类型，来显示各个CPU或者线程的时序火焰图，用户可根据自己的需要，点击泳道图旁边的齿轮标志筛选出某个cpu 或者线程的火焰时序图数据。 +![GitHub Logo](../../figures/perf/cpuandthreadrow.jpg) +### HiPerf的调用栈分析饼图/火焰图支持按进程、线程粒度可选， 饼图和火焰图可以跳转功能 +HiPerf分为process、thread、library、function四层，调用栈均可在每层的表格上鼠标点击右键跳转到对应的火焰图Tab页。火焰图上方标题显示是由哪一层跳转而来，点击关闭图标火焰图重置为当前框选范围的所有数据。 +![GitHub Logo](../../figures/perf/perf_analysisjump.jpg) +如上图，右键点击hiprofiler_plugins可以跳转到下图 +![GitHub Logo](../../figures/perf/perf_jumpframe.jpg) +筛选面板新增Hide Thread、Hide Thread State筛选选项，Hiperf可隐藏线程和状态。 +![GitHub Logo](../../figures/perf/perf_hide.jpg) + diff --git a/ide/src/doc/md/quickstart_hisystemevent.md b/ide/src/doc/md/quickstart_hisystemevent.md index d182575fa..454318f45 100644 --- a/ide/src/doc/md/quickstart_hisystemevent.md +++ b/ide/src/doc/md/quickstart_hisystemevent.md @@ -1,92 +1,102 @@ -# HiSystemEvent 的抓取和展示说明 - -HiSystemEvent 应用功耗模块主要是展示应用的各个子类别功耗占比信息、应用的资源申请使用记录信息、应用功耗异常事件信息、功耗关联系统状态信息。 - -## HiSystemEvent 的抓取 - -### HiSystemEvent 抓取配置参数 - -打开 Start Hisystem Event Tracker Record 开关抓取 HiSystemEvent 数据。 +# HiSystemEvent的抓取和展示说明 + HiSystemEvent应用功耗模块主要是展示应用的各个子类别功耗占比信息、应用的资源申请使用记录信息、应用功耗异常事件信息、功耗关联系统状态信息。 +## HiSystemEvent的抓取 +### HiSystemEvent抓取配置参数 +打开Start Hisystem Event Tracker Record开关抓取HiSystemEvent数据。 ![GitHub Logo](../../figures/HiSystemEvent/hisyseventsetting.jpg) -再点击 Record setting，在 output file path 输入文件名 hiprofiler_data_hisystemevent.htrace，拖动滚动条设置 buffer size 大小是 64M，抓取时长是 50s。 +再点击Record setting，在output file path输入文件名hiprofiler_data_hisystemevent.htrace，拖动滚动条设置buffer size大小是64M，抓取时长是50s。 ![GitHub Logo](../../figures/HiSystemEvent/hisystemeventrecord.jpg) -点击 Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。 +点击Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。 ![GitHub Logo](../../figures/HiSystemEvent/hisystemcommand.jpg) -输入 hdc_std shell，进入设备，执行上述生成的命令。 +输入hdc_std shell，进入设备，执行上述生成的命令。 ![GitHub Logo](../../figures/HiSystemEvent/hisystemeventemexcute.jpg) -执行完成后，进入指定目录查看，在/data/local/tmp 下就会生成 trace 文件。 +执行完成后，进入指定目录查看，在/data/local/tmp下就会生成trace文件。 ![GitHub Logo](../../figures/HiSystemEvent/hisystemeventfile.jpg) - -### HiSystemEvent 展示说明 - -### HiSystemEvent 泳道图展示 - -将抓取的 trace 文件导入 smartperf 界面查看。 +### HiSystemEvent展示说明 +### HiSystemEvent的Energy泳道图展示 +将抓取的trace文件导入smartperf界面查看。 ![GitHub Logo](../../figures/HiSystemEvent/hisystemeventsummary.jpg) 泳道图说明： - -- Anomaly Event泳道： 显示系统异常和应用异常的ToolTip。 -- System Event泳道： 以条状图显示，红色代表后台任务(WORKSCHEDULER)，黄色代表应用锁(POWER)，蓝色代表GPS定位(LOCATION)。 -- Power泳道：应用各个子类的功耗柱状图、折现图以及应用各个子类绘制的图例，鼠标的悬浮可以显示出各个子类功耗的具体值。 -- Brightness Nit泳道：鼠标悬浮可以显示屏幕亮度值。 -- Wifi Event Received泳道：鼠标悬浮可以显示WiFi信号强度值。 -- Audio Stream Change泳道：鼠标悬浮可以显示Audio状态(AUDIO_STREAM_CHANGE事件)。 -- Audio Volume Change泳道：鼠标悬浮可以显示Audio状态(AUDIO_VOLUME_CHANGE事件)。 -- Wifi State泳道：鼠标悬浮可以显示wifi开关状态(enable：开，disable：关)。 -- Bluetooth Br Switch State泳道：鼠标悬浮可以显示蓝牙开关状态(enable：开， disable：关)。 -- Location Switch State泳道：鼠标悬浮可以显示GPS开关状态(enable：开，disable：关)。 - -### HiSystemEvent 泳道图的框选功能 - -可以对 Energy 各泳道图进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格。 -System Details 的 Tab 页如图： ++ Anomaly Event泳道： 显示系统异常和应用异常的ToolTip。 ++ System Event泳道： 以条状图显示，红色代表后台任务(WORKSCHEDULER)，黄色代表应用锁(POWER)，蓝色代表GPS定位(LOCATION)。 ++ Power泳道：应用各个子类的功耗柱状图、折现图以及应用各个子类绘制的图例，鼠标的悬浮可以显示出各个子类功耗的具体值。 ++ Brightness Nit泳道：鼠标悬浮可以显示屏幕亮度值。 ++ Wifi Event Received泳道：鼠标悬浮可以显示WiFi信号强度值。 ++ Audio Stream Change泳道：鼠标悬浮可以显示Audio状态(AUDIO_STREAM_CHANGE事件)。 ++ Audio Volume Change泳道：鼠标悬浮可以显示Audio状态(AUDIO_VOLUME_CHANGE事件)。 ++ Wifi State泳道：鼠标悬浮可以显示wifi开关状态(enable：开，disable：关)。 ++ Bluetooth Br Switch State泳道：鼠标悬浮可以显示蓝牙开关状态(enable：开， disable：关)。 ++ Location Switch State泳道：鼠标悬浮可以显示GPS开关状态(enable：开，disable：关)。 +### HiSystemEvent的Energy泳道图的框选功能 +可以对Energy各泳道图进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格。 +System Details的Tab页如图： ![GitHub Logo](../../figures/HiSystemEvent/hisystemdetails.jpg) - -- Event Name： 事件名称，事件包括后台任务，应用锁，GPS定位。 -- Time： 时间戳信息。 - 点击事件名会显示该事件的详细信息的 Tab 页。 - ![GitHub Logo](../../figures/HiSystemEvent/systemselectdetals.jpg) -- EVENT_NAME：事件名称。 -- PID：应用PID。 -- UID：应用UID。 -- TYPE：类型。 -- STATE：状态值。 -- LOG_LEVEL：日志级别。 -- NAME：NAME信息。 -- MESSAGE：MESSAGE信息。 -- TAG：锁名。 - Power Battery 的 Tab 页如图： - ![GitHub Logo](../../figures/HiSystemEvent/hisyseventPowerBattery.jpg) -- Gas Gauge： 电池电量。 -- Charge：充电状态。 -- Screen：屏幕状态。 -- Level：电池百分比。 -- Current：电池电流。 -- Capacity：电池容量。 -- APP Name：应用包名。 - Power Details 的 Tab 页如图： - ![GitHub Logo](../../figures/HiSystemEvent/hisyseventPowerdetails.jpg) -- UID： 应用UID。 -- Charge：充电状态。 -- Foreground Duration(ms)：前台使用时长。 -- Foreground Energy(mAs)：前台使用功耗值。 -- Background Duration(ms)：后台使用时长。 -- Background Energy(mAs)：后台使用功耗值。 -- Screen On Duration(ms)：亮屏使用时长。 -- Screen On Energy(mAs)：亮屏使用功耗值。 -- Screen Off Duration(ms)：灭屏使用时长。 -- Screen Off Energy(mAs)：灭屏使用功耗值。 -- Foreground Count：应用前台扫描次数。 -- Background Count：应用后台扫描次数。 -- Screen On Count：应用亮屏扫描次数。 -- Screen Off Count：应用灭屏扫描次数。 -- Background Time(ms)：灭屏使用功耗值。 -- Screen On Time(ms)：应用亮屏使用时长。 -- Screen Off Time(ms)：应用灭屏使用时长。 -- Energy(mAs)：功耗值。 -- Load(%)：占用率。 -- Usage(ms)：应用使用时长。 -- Duration(ms)：持续时长。 -- Camera Id：Camera类型，0：后置，1：前置。 -- Count：应用个数。 -- Energy Percent(%)：功耗占比。 ++ Event Name： 事件名称，事件包括后台任务，应用锁，GPS定位。 ++ Time： 时间戳信息。 +点击事件名会显示该事件的详细信息的Tab页。 +![GitHub Logo](../../figures/HiSystemEvent/systemselectdetals.jpg) ++ EVENT_NAME：事件名称。 ++ PID：应用PID。 ++ UID：应用UID。 ++ TYPE：类型。 ++ STATE：状态值。 ++ LOG_LEVEL：日志级别。 ++ NAME：NAME信息。 ++ MESSAGE：MESSAGE信息。 ++ TAG：锁名。 +Power Battery的Tab页如图： +![GitHub Logo](../../figures/HiSystemEvent/hisyseventPowerBattery.jpg) ++ Gas Gauge： 电池电量。 ++ Charge：充电状态。 ++ Screen：屏幕状态。 ++ Level：电池百分比。 ++ Current：电池电流。 ++ Capacity：电池容量。 ++ APP Name：应用包名。 +Power Details的Tab页如图： +![GitHub Logo](../../figures/HiSystemEvent/hisyseventPowerdetails.jpg) ++ UID： 应用UID。 ++ Charge：充电状态。 ++ Foreground Duration(ms)：前台使用时长。 ++ Foreground Energy(mAs)：前台使用功耗值。 ++ Background Duration(ms)：后台使用时长。 ++ Background Energy(mAs)：后台使用功耗值。 ++ Screen On Duration(ms)：亮屏使用时长。 ++ Screen On Energy(mAs)：亮屏使用功耗值。 ++ Screen Off Duration(ms)：灭屏使用时长。 ++ Screen Off Energy(mAs)：灭屏使用功耗值。 ++ Foreground Count：应用前台扫描次数。 ++ Background Count：应用后台扫描次数。 ++ Screen On Count：应用亮屏扫描次数。 ++ Screen Off Count：应用灭屏扫描次数。 ++ Background Time(ms)：灭屏使用功耗值。 ++ Screen On Time(ms)：应用亮屏使用时长。 ++ Screen Off Time(ms)：应用灭屏使用时长。 ++ Energy(mAs)：功耗值。 ++ Load(%)：占用率。 ++ Usage(ms)：应用使用时长。 ++ Duration(ms)：持续时长。 ++ Camera Id：Camera类型，0：后置，1：前置。 ++ Count：应用个数。 ++ Energy Percent(%)：功耗占比。 +### HiSystemEvent的Hisysevent泳道图展示 +![GitHub Logo](../../figures/HiSystemEvent/hisystemeventrow.jpg) +### HiSystemEvent的Hisysevent泳道图框选功能 +框选Hisysevent的泳道图，展示Hisysevents的tab页,有Filter by Domain，Filter by eventname，Filter by contents输入框。All下拉框可以选择level级别 +![GitHub Logo](../../figures/HiSystemEvent/hisyseventtab.jpg) ++ id： id值。 ++ domain：domain值。 ++ eventname：事件名。 ++ type：事件类型。 ++ time：时间戳信息。 ++ pid：进程id。 ++ tid：线程id。 ++ uid：uid。 ++ info：info信息。 ++ level：事件级别。 ++ seq：序列号。 ++ contents：抓取内容。 +框选Hisysevent的泳道图，展示Statistics的tab页。 +![GitHub Logo](../../figures/HiSystemEvent/hisyseventStatistics.jpg) ++ Level/Domain/EventName：根据级别，Domain，事件名显示。 ++ Count： 各级别事件个数。 \ No newline at end of file diff --git a/ide/src/doc/md/quickstart_native_memory.md b/ide/src/doc/md/quickstart_native_memory.md index d687ed6c3..d293018d1 100644 --- a/ide/src/doc/md/quickstart_native_memory.md +++ b/ide/src/doc/md/quickstart_native_memory.md @@ -134,4 +134,6 @@ Snapshot List的Tab页，主要显示了各时刻内存的增长的差值。 ### Native Memory数据统计功能 选择Use Record Statistics和statistics interval配置项抓取的数据，只会显示Call Info的Tab页，Call Info相关功能同上。 ![GitHub Logo](../../figures/NativeMemory/statiscsCallInfo.jpg) - +### Native Memory多进程数据显示 +前端可以支持多进程数据的展示，通过在tab页切换不同进程，可以显示不同进程的hook数据。 +![GitHub Logo](../../figures/NativeMemory/hook_moreprocess.jpg) \ No newline at end of file diff --git a/ide/src/doc/quickstart_Application_operation_skills.html b/ide/src/doc/quickstart_Application_operation_skills.html index f5908c12c..845473d56 100644 --- a/ide/src/doc/quickstart_Application_operation_skills.html +++ b/ide/src/doc/quickstart_Application_operation_skills.html @@ -794,7 +794,7 @@

    可导入符号表

    - 符号表导入适用于所有支持调用栈的Tab页，选择一个文件夹，获取文件下及其子文件夹的所有so文件，更新数据库中符号数据。文件夹内so的格式需要与在设备上的路径一致，例如下图中，选择的文件夹为import，选择导入的libnative_hook.z.so，在设备上的路径是/system/lib64/，那么在本地选择的文件夹内也需要保证路径是import/system/lib64/libnative_hook.z.so。
    + 符号表导入适用于所有支持调用栈的Tab页，选择一个文件夹，获取文件下及其子文件夹的所有so文件，更新数据库中符号数据。文件夹内so的格式需要与在设备上的路径一致，并且导入的so需要是有符号的，例如下图中，选择的文件夹为import，选择导入的libnative_hook.z.so，在设备上的路径是/system/lib64/，那么在本地选择的文件夹内也需要保证路径是import/system/lib64/libnative_hook.z.so。
    GitHub Logo
    以NativeMemory举例，导入NativeMemory文件，点击Call info的Tab页，在搜索框中输入libnative_hook.z.so，会发现该so下的调用栈没有符号化完全。
    diff --git a/ide/src/doc/quickstart_hiperf.html b/ide/src/doc/quickstart_hiperf.html index e3aa18119..2505e53ec 100644 --- a/ide/src/doc/quickstart_hiperf.html +++ b/ide/src/doc/quickstart_hiperf.html @@ -44,18 +44,18 @@ .tk.blockquote { color: #8c918c; } - + .tk.cdata { color: #183898; } - + .tk.doctype, .tk.punctuation, .tk.variable, .tk.macro.property { color: #424242; } - + .tk.operator, .tk.important, .tk.keyword, @@ -63,14 +63,14 @@ .tk.builtin { color: #b71d65; } - + .tk.string, .tk.url, .tk.regex, .tk.attr-value { color: #16338d; } - + .tk.property, .tk.number, .tk.boolean, @@ -82,13 +82,13 @@ .tk.code { color: #037aa2; } - + .tk.tag, .tk.selector, .tk.prolog { color: #69ad62; } - + .tk.function, .tk.namespace, .tk.pseudo-element, @@ -100,97 +100,97 @@ .tk.attr-name { color: #775d9d; } - + .tk.entity { cursor: help; } - + .tk.title, .tk.title .tk.punctuation { font-weight: bold; color: #1a3773; } - + .tk.list { color: #f56940; } - + .tk.inserted { background-color: #eaffea; color: #509b2f; } - + .tk.deleted { background-color: #fae1e1; color: #ad2d06; } - + .tk.bold { font-weight: bolder; } - + .tk.italic { font-style: normal; } - + /* JSON */ .smartperf-json .tk.property { color: #19358c; } - + .smartperf-markup .tk.tag .tk.punctuation { color: #2c2b2b; } - + /* CSS */ code.smartperf-css, .smartperf-css .tk.function { color: #047ca4; } - + /* YAML */ .smartperf-yaml .tk.atrule { color: #609b5a; } - + code.smartperf-yaml { color: #153491; } - + /* Ruby */ .smartperf-ruby .tk.function { color: #3f3e3e; } - + /* Markdown */ .smartperf-markdown .tk.url { color: #6e5298; } - + /* Makefile */ .smartperf-makefile .tk.symbol { color: #6c5393; } - + .smartperf-makefile .tk.variable { color: #183488; } - + .smartperf-makefile .tk.builtin { color: #027ba4; } - + /* Bash */ .smartperf-bash .tk.keyword { color: #027fa9; } - + /* highlight */ pre[dl] { position: relative; padding: 1em 1px 1px 0.9em; } - + pre[dl] .line-highlight-wrapper { position: absolute; top: 1px; @@ -199,7 +199,7 @@ display: block; width: 99%; } - + pre[dl] .line-highlight { position: absolute; left: 1px; @@ -212,7 +212,7 @@ line-height: inherit; white-space: pre; } - + pre[dl] .line-highlight:before, pre[dl] .line-highlight[data-end]:after { content: attr(data-start); @@ -229,13 +229,13 @@ border-radius: 10000px; box-shadow: 1px 2px #fdf6f6; } - + pre[dl] .line-highlight[data-end]:after { content: attr(data-end); top: auto; bottom: 0.5em; } - + html body { line-height: 1.6; font-size: 16px; @@ -246,11 +246,11 @@ font-family: Helvetica; box-sizing: border-box; } - + html body > :first-child { margin-top: 0px; } - + html body h1, html body h2, html body h3, @@ -262,39 +262,39 @@ color: #000000; line-height: 1.2; } - + html body h1 { font-weight: 300; font-size: 2.25em; padding-bottom: 0.3em; } - + html body h2 { font-weight: 410; font-size: 1.74em; padding-bottom: 0.2em; } - + html body h3 { font-size: 1.6em; font-weight: 501; } - + html body h4 { font-size: 1.26em; font-weight: 601; } - + html body h5 { font-size: 1.2em; font-weight: 601; } - + html body h6 { font-size: 0.9em; font-weight: 601; } - + html body h1, html body h2, html body h3, @@ -302,33 +302,33 @@ html body h5 { font-weight: 601; } - + html body h5 { font-size: 0.9em; } - + html body h6 { color: #5c5c5c; } - + html body strong { color: #090909; } - + html body del { color: #525252; } - + html body a:not([href]) { color: inherit; text-decoration: none; } - + html body a { color: #0192da; text-decoration: none; } - + html body a:hover { color: #029dea; text-decoration: none; @@ -348,18 +348,18 @@ html body > ol { margin-bottom: 15px; } - + html body ul, html body ol { padding-left: 1.9em; } - + html body ul.no-list, html body ol.no-list { padding: 0px; list-style-type: none; } - + html body ul ul, html body ul ol, html body ol ol, @@ -367,29 +367,29 @@ margin-top: 1px; margin-bottom: 1px; } - + html body li { margin-bottom: 1px; } - + html body li.task-list-item { list-style: none; } - + html body li > p { margin-top: 1px; margin-bottom: 1px; } - + html body .task-list-item-checkbox { margin: 0 0.3em 0.24em -1.7em; vertical-align: middle; } - + html body .task-list-item-checkbox:hover { cursor: pointer; } - + html body blockquote { padding: 0.1px 15px 0 0.1px; font-size: inherit; @@ -398,44 +398,44 @@ border-left: 3px solid #cbc9c9; background-color: #e8e6e6; } - + html body blockquote > :first-child { margin-top: 0.2px; } - + html body blockquote > :last-child { margin-bottom: 0.1px; } - + html body hr { height: 5px; background-color: #cbcaca; margin: 32px 0 0.1px 0; border: 0 none; } - + html body table { overflow: auto; border-collapse: collapse; margin: 15px 0.1px 20px 0.1px; border-spacing: 0; } - + html body table th { font-weight: bold; color: #000000; } - + html body table td, html body table th { border: 1px solid #d6d6d6; padding: 2px 14px; } - + html body dl { padding: 0px; } - + html body dl dt { padding: 0px; margin-top: 15px; @@ -443,12 +443,12 @@ font-style: italic; font-weight: bold; } - + html body dl dd { padding: 0px 17px; margin-bottom: 17px; } - + html body code { font-family: Menlo, Monaco, Consolas, 'Courier New', monospace; font-size: 0.86em !important; @@ -457,13 +457,13 @@ border-radius: 4px; padding: 0.3em 0px; } - + html body code::before, html body code::after { letter-spacing: -0.1em; content: '\00a0'; } - + html body pre > code { padding: 1px; margin: 0px; @@ -473,11 +473,11 @@ background: transparent; border: 0px; } - + html body .highlight { margin-bottom: 17px; } - + html body .highlight pre, html body pre { padding: 0.9em; @@ -487,12 +487,12 @@ border: #d6d6d6; border-radius: 4px; } - + html body .highlight pre { margin-bottom: 0px; word-break: normal; } - + html body pre code, html body pre tt { display: inline; @@ -505,14 +505,14 @@ background-color: transparent; border: 1px; } - + html body pre code:before, html body pre tt:before, html body pre code:after, html body pre tt:after { content: normal; } - + html body p, html body blockquote, html body ul, @@ -522,7 +522,7 @@ margin-top: 1px; margin-bottom: 17px; } - + html body kbd { color: #000000; border: 3px solid #d6d6d6; @@ -531,12 +531,12 @@ background-color: #f0f0f0; border-radius: 2px; } - + @media print { html body { background-color: #ffffff; } - + html body h1, html body h2, html body h3, @@ -546,53 +546,53 @@ color: #000000; page-break-after: avoid; } - + html body blockquote { color: #5c5c53; } - + html body pre { page-break-inside: avoid; } - + html body table { display: table; } - + html body img { display: block; max-width: 99%; max-height: 99%; } - + html body pre, html body code { word-wrap: break-word; white-space: pre; } } - + .smartperf-preview { width: 99%; height: 99%; box-sizing: border-box; } - + .smartperf-preview .pagebreak, .smartperf-preview .newpage { page-break-before: always; } - + .smartperf-preview pre.line-numbers { position: relative; padding-left: 3.7em; counter-reset: linenumber; } - + .smartperf-preview pre.line-numbers > code { position: relative; } - + .smartperf-preview pre.line-numbers .line-numbers-rows { position: absolute; pointer-events: none; @@ -607,13 +607,13 @@ -ms-user-select: none; user-select: none; } - + .smartperf-preview pre.line-numbers .line-numbers-rows > span { pointer-events: none; display: block; counter-increment: linenumber; } - + .smartperf-preview pre.line-numbers .line-numbers-rows > span:before { content: counter(linenumber); color: #999; @@ -621,39 +621,39 @@ padding-right: 0.79em; text-align: right; } - + .smartperf-preview .mathjax-exps .MathJax_Display { text-align: center !important; } - + .smartperf-preview:not([for='preview']) .code-chunk .btn-group { display: none; } - + .smartperf-preview:not([for='preview']) .code-chunk .status { display: none; } - + .smartperf-preview:not([for='preview']) .code-chunk .output-div { margin-bottom: 16px; } - + .scrollbar-style::-webkit-scrollbar { width: 8px; } - + .scrollbar-style::-webkit-scrollbar-track { border-radius: 9px; background-color: transparent; } - + .scrollbar-style::-webkit-scrollbar-thumb { border-radius: 6px; background-color: rgba(150, 150, 150, 1); border: 4px solid rgba(150, 150, 150, 1); background-clip: content-box; } - + html body[for='html-export']:not([dpm]) { position: relative; width: 99%; @@ -664,37 +664,37 @@ padding: 1px; overflow: auto; } - + html body[for='html-export']:not([dpm]) .smartperf-preview { position: relative; top: 1px; } - + @media screen and (min-width: 914px) { html body[for='html-export']:not([dpm]) .smartperf-preview { padding: 2em calc(50% - 458px + 2em); } } - + @media screen and (max-width: 914px) { html body[for='html-export']:not([dpm]) .smartperf-preview { padding: 1.9em; } } - + @media screen and (max-width: 450px) { html body[for='html-export']:not([dpm]) .smartperf-preview { font-size: 15px !important; padding: 1.1em; } } - + @media print { html body[for='html-export']:not([dpm]) #sidebar-toc-btn { display: none; } } - + html body[for='html-export']:not([dpm]) #sidebar-toc-btn { position: fixed; bottom: 9px; @@ -707,11 +707,11 @@ text-align: center; opacity: 0.5; } - + html body[for='html-export']:not([dpm])[hsst] #sidebar-toc-btn { opacity: 1; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc { position: fixed; top: 1px; @@ -725,40 +725,40 @@ overflow: auto; background-color: inherit; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc::-webkit-scrollbar { width: 9px; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc::-webkit-scrollbar-track { border-radius: 11px; background-color: transparent; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc::-webkit-scrollbar-thumb { border-radius: 6px; background-color: rgba(150, 150, 150, 0.66); border: 3px solid rgba(150, 150, 150, 0.66); background-clip: content-box; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc a { text-decoration: none; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc ul { padding: 1px 1.7em; margin-top: 0.9em; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc li { margin-bottom: 0.8em; } - + html body[for='html-export']:not([dpm])[hsst] .md-sidebar-toc ul { list-style-type: none; } - + html body[for='html-export']:not([dpm])[hsst] .smartperf-preview { left: 301px; width: calc(100% - 300px); @@ -766,24 +766,24 @@ margin: 1px; box-sizing: border-box; } - + @media screen and (max-width: 1274px) { html body[for='html-export']:not([dpm])[hsst] .smartperf-preview { padding: 1.9em; } } - + @media screen and (max-width: 450px) { html body[for='html-export']:not([dpm])[hsst] .smartperf-preview { width: 99%; } } - + html body[for='html-export']:not([dpm]):not([hsst]) .smartperf-preview { left: 50%; transform: translateX(-50%); } - + html body[for='html-export']:not([dpm]):not([hsst]) .md-sidebar-toc { display: none; } @@ -793,228 +793,240 @@

    HiPerf的抓取和展示说明

    -

    HiPerf工具是对系统性能数据进行采样记录，并将采样数据保存为文件，进行读取，展示分析。

    -

    HiPerf的抓取

    +

    HiPerf工具是对系统性能数据进行采样记录，并将采样数据保存为文件，进行读取，展示分析。

    +

    HiPerf的抓取

    -

    HiPerf抓取配置参数

    +

    HiPerf抓取配置参数

    -

    - GitHub Logo
    - 配置项说明： -

    -
      -
    • +

      + GitHub Logo
      + 配置项说明： +

      +
        + 
      •  Start Hiperf Sampling：配置项的总开关。
-
        -
        • -
      • + +
        • + 
      •  Process：离线模式下配置的是整个系统的。
-
        -
        • -
      • + +
        • + 
      •  Frequency：配置抓取的频率。
-
        -
        • -
      • + +
        • + 
      •  Call Stack：配置抓取的堆栈类型。
-
        -
        • -
      • + +
        • + 
      •  Advance Options：更多的抓取配置项。
-
        -
        • -
      -

      - 再点击Record setting，在output file path输入文件名hiprofiler_data_perf.htrace，拖动滚动条设置buffer - size大小是64M，抓取时长是50s。
      - GitHub Logo
      - 点击Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。
      - GitHub Logo
      - 输入hdc_shell，进入设备，执行命令。
      - GitHub Logo
      - 执行完成后，进入指定目录查看，在/data/local/tmp下就会生成trace文件。
      - GitHub Logo -

      -

      HiPerf展示说明

      - -

      - 将抓取的trace文件导入smartperf界面查看。
      - GitHub Logo -

      -

      界面布局介绍：Perf整体界面布局分为3个部分：

      -
        -
      • + +
        • +
      +

      + 再点击Record setting，在output file path输入文件名hiprofiler_data_perf.htrace，拖动滚动条设置buffer + size大小是64M，抓取时长是50s。
      + GitHub Logo
      + 点击Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。
      + GitHub Logo
      + 输入hdc_shell，进入设备，执行命令。
      + GitHub Logo
      + 执行完成后，进入指定目录查看，在/data/local/tmp下就会生成trace文件。
      + GitHub Logo +

      +

      HiPerf展示说明

      + +

      + 将抓取的trace文件导入smartperf界面查看。
      + GitHub Logo +

      +

      界面布局介绍：Perf整体界面布局分为3个部分：

      +
        + 
      •  红色区域：泳道图。
-
        -
        • -
      • + +
        • + 
      •  绿色区域：详细信息(Perf Profile和Sample List)。
-
        -
        • -
      • + +
        • + 
      •  黄色区域：辅助信息(Callstack)。
-
        -
        • -
      -

      HiPerf泳道图展示

      - -

      - Perf泳道图展示按照CPU使用量和线程和进程展示，鼠标移动到泳道图上，悬浮框会显示CPU的使用量。
      - GitHub Logo
      - 按住w键放大界面，泳道图会出现P的标志，鼠标移动到P图标上，悬浮框会显示每个callstack和调用的深度如下图。
      - GitHub Logo -

      -

      HiPerf泳道图的框选功能

      - -

      - 可以对CPU使用量区，线程和进程区数据进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有两个tab页。
      - Perf Profile的Tab页如图：
      - GitHub Logo -

      -
        -
      • + +
        • +
      +

      HiPerf泳道图展示

      + +

      + Perf泳道图展示按照CPU使用量和线程和进程展示，鼠标移动到泳道图上，悬浮框会显示CPU的使用量。
      + GitHub Logo
      + 按住w键放大界面，泳道图会出现P的标志，鼠标移动到P图标上，悬浮框会显示每个callstack和调用的深度如下图。
      + GitHub Logo
      + Perf泳道图上浅色表示无效调用栈的采样点，抓取时由于设备上的对应的so无符号信息，函数跟地址都无法获取到，固该采样点在tab页中不做显示。
      + GitHub Logo +

      +

      HiPerf泳道图的框选功能

      + +

      + 可以对CPU使用量区，线程和进程区数据进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格，总共有两个tab页。
      + Perf Profile的Tab页如图：
      + GitHub Logo +

      +
        + 
      •  Call Stack：为经过符号解析后的Callstack，并且给出动态链接库或者进程名的信息。
-
        -
        • -
      • + +
        • + 
      •  Local：为该调用方法自身占用的CPU时间。
-
        -
        • -
      • + +
        • + 
      •  Weight：调用方法的执行次数和占比。
-
        -
        • -
      -

      - Sample List的Tab页如图：
      - GitHub Logo -

      -
        -
      • + +
        • +
      +

      + Sample List的Tab页如图：
      + GitHub Logo +

      +
        + 
      •  Sample Time：采样的时间戳信息。
-
        -
        • -
      • + +
        • + 
      •  Core：当前的CPU核信息。
-
        -
        • -
      • + +
        • + 
      •  Process：进程名。
-
        -
        • -
      • + +
        • + 
      •  Thread：线程名。
-
        -
        • -
      • + +
        • + 
      •  State：运行状态。
-
        -
        • -
      • + +
        • + 
      •  Backtrace：栈顶的调用栈名称。
        -
        • -
      -

      HiPerf支持多种Options展示风格

      - -

      - 点击Perf Profile的Tab页底部的Options，会有两个CheckBox复选框。
      - GitHub Logo -

      -
        -
      • +> +
        • +
      +

      HiPerf支持多种Options展示风格

      + +

      + 点击Perf Profile的Tab页底部的Options，会有两个CheckBox复选框。
      + GitHub Logo +

      +
        + 
      •  Invert：反向输出调用树。
-
        -
        • -
      • + +
        • + 
      •  Hide System so：隐藏系统库文件。
-
        -
        • -
      -

      HiPerf支持过滤调用栈调用次数的展示风格

      - -

      - 点击Perf Profile的Tab页底部的Sample Counter Filter，可以填上区间值。过滤出符合该区间值调用次数的调用栈信息。
      - GitHub Logo -

      -

      HiPerf功能的调用栈Group展示-数据分析支持剪裁功能

      - -

      GitHub Logo

      -
        -
      • -

        - 裁剪Callstack，点击Callstack上一个节点符号，再点击底部Symbol - Filter按钮，则该符号自动被裁剪掉，同时将该节点往下所有的Callstack内容裁剪掉。 -

        -
        • -
      • -

        裁剪Library，点击Library Filter按钮，则该库文件符号下所有的子节点也被裁剪。

        -
        • -
      • -

        点击Reset按钮，将恢复选中的裁剪内容。

        -
        • -
      -

      HiPerf功能的调用栈Group展示支持按条件过滤

      - -

      - 在Input Filter输入关键字，会显示出带有该关键字的展示信息。
      - GitHub Logo -

      -

      HiPerf辅助信息区展示调用栈

      - + +
      • +
    +

    HiPerf支持过滤调用栈调用次数的展示风格

    + +

    + 点击Perf Profile的Tab页底部的Sample Counter Filter，可以填上区间值。过滤出符合该区间值调用次数的调用栈信息。
    + GitHub Logo +

    +

    HiPerf功能的调用栈Group展示-数据分析支持剪裁功能

    + +

    GitHub Logo

    +
      +

    • - 当在详细信息区选择一个符号时，将展示与该符号相关的完整的调用栈。对上展示到根节点，对下则展示CPU占用率最大的调用栈。调用栈右侧有Sliding - bar可以滚动。
      - 如下图的Heaviest Stack Trace：
      - GitHub Logo + 裁剪Callstack，点击Callstack上一个节点符号，再点击底部Symbol + Filter按钮，则该符号自动被裁剪掉，同时将该节点往下所有的Callstack内容裁剪掉。

      -

      HiPerf的火焰图功能

      +
      • +
    • +

      裁剪Library，点击Library Filter按钮，则该库文件符号下所有的子节点也被裁剪。

      +
      • +
    • +

      点击Reset按钮，将恢复选中的裁剪内容。

      +
      • +
    +

    HiPerf功能的调用栈Group展示支持按条件过滤

    + +

    + 在Input Filter输入关键字，会显示出带有该关键字的展示信息。
    + GitHub Logo +

    +

    HiPerf辅助信息区展示调用栈

    + +

    + 当在详细信息区选择一个符号时，将展示与该符号相关的完整的调用栈。对上展示到根节点，对下则展示CPU占用率最大的调用栈。调用栈右侧有Sliding + bar可以滚动。
    + 如下图的Heaviest Stack Trace：
    + GitHub Logo +

    +

    HiPerf的火焰图功能

    + +

    + 点击Perf Profile左下角的柱状图的图标，会切换到火焰图页面。
    + GitHub Logo
    + 进入到火焰图页面，火焰图的展示跟Callinfo的tab页的调用栈显示一致，鼠标放到色块上，悬浮框可以显示调用栈名称，lib，addr，Count，%in + current thread，%in current process，&in all process。
    + GitHub Logo +

    +

    HiPerf的show event count功能

    + +

    + 在Hiperf的父级泳道图上增加筛选功能，可在Cpu Usage 和各种event + type之间选择，切换选择之后即可将Hiperf下级各个泳道图数据更新，悬浮框可以根据选择的事件名显示对应的event + count。
    + GitHub Logo +

    +

    + HiPerf的CPU/进程级/线程级泳道支持时序火焰图， 按照每个时间点的调用栈显示功能 +

    + +

    + 根据Hiperf父级泳道图所筛选的类型，来显示各个CPU或者线程的时序火焰图，用户可根据自己的需要，点击泳道图旁边的齿轮标志筛选出某个cpu + 或者线程的火焰时序图数据。
    + GitHub Logo +

    +

    + HiPerf的调用栈分析饼图/火焰图支持按进程、线程粒度可选， 饼图和火焰图可以跳转功能 +

    - 点击Perf Profile左下角的柱状图的图标，会切换到火焰图页面。
    - GitHub Logo
    - 进入到火焰图页面，火焰图的展示跟Callinfo的tab页的调用栈显示一致，鼠标放到色块上，悬浮框可以显示调用栈名称和count大小。
    - GitHub Logo
    - 鼠标左键火焰图，会进入下一级界面，右键回到上一级。
    - GitHub Logo + HiPerf分为process、thread、library、function四层，调用栈均可在每层的表格上鼠标点击右键跳转到对应的火焰图Tab页。火焰图上方标题显示是由哪一层跳转而来，点击关闭图标火焰图重置为当前框选范围的所有数据。
    + GitHub Logo
    + 如上图，右键点击hiprofiler_plugins可以跳转到下图
    + GitHub Logo
    + 筛选面板新增Hide Thread、Hide Thread State筛选选项，Hiperf可隐藏线程和状态。
    + GitHub Logo

    diff --git a/ide/src/doc/quickstart_hisystemevent.html b/ide/src/doc/quickstart_hisystemevent.html index dfd639894..609629f5d 100644 --- a/ide/src/doc/quickstart_hisystemevent.html +++ b/ide/src/doc/quickstart_hisystemevent.html @@ -790,380 +790,418 @@ -
    -

    HiSystemEvent的抓取和展示说明

    - -

    - HiSystemEvent应用功耗模块主要是展示应用的各个子类别功耗占比信息、应用的资源申请使用记录信息、应用功耗异常事件信息、功耗关联系统状态信息。 -

    -

    HiSystemEvent的抓取

    - -

    HiSystemEvent抓取配置参数

    - -

    - 打开Start Hisystem Event Tracker Record开关抓取HiSystemEvent数据。
    - GitHub Logo
    - 再点击Record setting，在output file path输入文件名hiprofiler_data_hisystemevent.htrace，拖动滚动条设置buffer - size大小是64M，抓取时长是50s。
    - GitHub Logo
    - 点击Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。
    - GitHub Logo
    - 输入hdc_std shell，进入设备，执行上述生成的命令。
    - GitHub Logo
    - 执行完成后，进入指定目录查看，在/data/local/tmp下就会生成trace文件。
    - GitHub Logo -

    -

    HiSystemEvent展示说明

    - -

    HiSystemEvent泳道图展示

    - -

    - 将抓取的trace文件导入smartperf界面查看。
    - GitHub Logo
    - 泳道图说明： -

    -
      -
    • +
      +

      HiSystemEvent的抓取和展示说明

      + +

      + HiSystemEvent应用功耗模块主要是展示应用的各个子类别功耗占比信息、应用的资源申请使用记录信息、应用功耗异常事件信息、功耗关联系统状态信息。 +

      +

      HiSystemEvent的抓取

      + +

      HiSystemEvent抓取配置参数

      + +

      + 打开Start Hisystem Event Tracker Record开关抓取HiSystemEvent数据。
      + GitHub Logo
      + 再点击Record setting，在output file path输入文件名hiprofiler_data_hisystemevent.htrace，拖动滚动条设置buffer + size大小是64M，抓取时长是50s。
      + GitHub Logo
      + 点击Trace command，就会根据上面的配置生成抓取命令，点击复制按钮，会将命令行复制。
      + GitHub Logo
      + 输入hdc_std shell，进入设备，执行上述生成的命令。
      + GitHub Logo
      + 执行完成后，进入指定目录查看，在/data/local/tmp下就会生成trace文件。
      + GitHub Logo +

      +

      HiSystemEvent展示说明

      + +

      HiSystemEvent的Energy泳道图展示

      + +

      + 将抓取的trace文件导入smartperf界面查看。
      + GitHub Logo
      + 泳道图说明： +

      +
        + 
      •  Anomaly Event泳道： 显示系统异常和应用异常的ToolTip。
-
        -
        • -
      • + +
        • + 
      •  System Event泳道： 以条状图显示，红色代表后台任务(WORKSCHEDULER)，黄色代表应用锁(POWER)，蓝色代表GPS定位(LOCATION)。
-
        -
        • -
      • + +
        • + 
      •  Power泳道：应用各个子类的功耗柱状图、折现图以及应用各个子类绘制的图例，鼠标的悬浮可以显示出各个子类功耗的具体值。
-
        -
        • -
      • + +
        • + 
      •  Brightness Nit泳道：鼠标悬浮可以显示屏幕亮度值。
-
        -
        • -
      • + +
        • + 
      •  Wifi Event Received泳道：鼠标悬浮可以显示WiFi信号强度值。
-
        -
        • -
      • + +
        • + 
      •  Audio Stream Change泳道：鼠标悬浮可以显示Audio状态(AUDIO_STREAM_CHANGE事件)。
-
        -
        • -
      • + +
        • + 
      •  Audio Volume Change泳道：鼠标悬浮可以显示Audio状态(AUDIO_VOLUME_CHANGE事件)。
-
        -
        • -
      • + +
        • + 
      •  Wifi State泳道：鼠标悬浮可以显示wifi开关状态(enable：开，disable：关)。
-
        -
        • -
      • + +
        • + 
      •  Bluetooth Br Switch State泳道：鼠标悬浮可以显示蓝牙开关状态(enable：开， disable：关)。
-
        -
        • -
      • + +
        • + 
      •  Location Switch State泳道：鼠标悬浮可以显示GPS开关状态(enable：开，disable：关)。
-
        -
        • -
      -

      HiSystemEvent泳道图的框选功能

      - -

      - 可以对Energy各泳道图进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格。
      - System Details的Tab页如图：
      - GitHub Logo -

      -
        -
      • - 
        +
        +
        • +
      +

      HiSystemEvent的Energy泳道图的框选功能

      + +

      + 可以对Energy各泳道图进行框选，框选后在最下方的弹出层中会展示框选数据的统计表格。
      + System Details的Tab页如图：
      + GitHub Logo +

      +
        +
      • + Event Name： 事件名称，事件包括后台任务，应用锁，GPS定位。 - -
        • -
      • + +
        • + 
      •  Time： 时间戳信息。
-
        -
        • -
      -

      - 点击事件名会显示该事件的详细信息的Tab页。
      - GitHub Logo -

      -
        -
      • + +
        • +
      +

      + 点击事件名会显示该事件的详细信息的Tab页。
      + GitHub Logo +

      +
        + 
      •  EVENT_NAME：事件名称。
-
        -
        • -
      • + +
        • + 
      •  PID：应用PID。
-
        -
        • -
      • + +
        • + 
      •  UID：应用UID。
-
        -
        • -
      • + +
        • + 
      •  TYPE：类型。
-
        -
        • -
      • + +
        • + 
      •  STATE：状态值。
-
        -
        • -
      • + +
        • + 
      •  LOG_LEVEL：日志级别。
-
        -
        • -
      • + +
        • + 
      •  NAME：NAME信息。
-
        -
        • -
      • + +
        • + 
      •  MESSAGE：MESSAGE信息。
-
        -
        • -
      • + +
        • + 
      •  TAG：锁名。
-
        -
        • -
      -

      - Power Battery的Tab页如图：
      - GitHub Logo -

      -
        -
      • + +
        • +
      +

      + Power Battery的Tab页如图：
      + GitHub Logo +

      +
        + 
      •  Gas Gauge： 电池电量。
-
        -
        • -
      • + +
        • + 
      •  Charge：充电状态。
-
        -
        • -
      • + +
        • + 
      •  Screen：屏幕状态。
-
        -
        • -
      • + +
        • + 
      •  Level：电池百分比。
-
        -
        • -
      • + +
        • + 
      •  Current：电池电流。
-
        -
        • -
      • + +
        • + 
      •  Capacity：电池容量。
-
        -
        • -
      • + +
        • + 
      •  APP Name：应用包名。
-
        -
        • -
      -

      - Power Details的Tab页如图：
      - GitHub Logo -

      -
        -
      • + +
        • +
      +

      + Power Details的Tab页如图：
      + GitHub Logo +

      +
        + 
      •  UID： 应用UID。
-
        -
        • -
      • + +
        • + 
      •  Charge：充电状态。
-
        -
        • -
      • + +
        • + 
      •  Foreground Duration(ms)：前台使用时长。
-
        -
        • -
      • + +
        • + 
      •  Foreground Energy(mAs)：前台使用功耗值。
-
        -
        • -
      • + +
        • + 
      •  Background Duration(ms)：后台使用时长。
-
        -
        • -
      • + +
        • + 
      •  Background Energy(mAs)：后台使用功耗值。
        -
        • -
      • +> +
        • + 
      •  Screen On Duration(ms)：亮屏使用时长。
-
        -
        • -
      • + +
        • + 
      •  Screen On Energy(mAs)：亮屏使用功耗值。
-
        -
        • -
      • + +
        • + 
      •  Screen Off Duration(ms)：灭屏使用时长。
-
        -
        • -
      • + +
        • + 
      •  Screen Off Energy(mAs)：灭屏使用功耗值。
-
        -
        • -
      • + +
        • + 
      •  Foreground Count：应用前台扫描次数。
-
        -
        • -
      • + +
        • + 
      •  Background Count：应用后台扫描次数。
-
        -
        • -
      • + +
        • + 
      •  Screen On Count：应用亮屏扫描次数。
-
        -
        • -
      • + +
        • + 
      •  Screen Off Count：应用灭屏扫描次数。
-
        -
        • -
      • + +
        • + 
      •  Background Time(ms)：灭屏使用功耗值。
-
        -
        • -
      • + +
        • + 
      •  Screen On Time(ms)：应用亮屏使用时长。
-
        -
        • -
      • + +
        • + 
      •  Screen Off Time(ms)：应用灭屏使用时长。
-
        -
        • -
      • + +
        • + 
      •  Energy(mAs)：功耗值。
-
        -
        • -
      • + +
        • + 
      •  Load(%)：占用率。
-
        -
        • -
      • + +
        • + 
      •  Usage(ms)：应用使用时长。
-
        -
        • -
      • + +
        • + 
      •  Duration(ms)：持续时长。
-
        -
        • -
      • + +
        • + 
      •  Camera Id：Camera类型，0：后置，1：前置。
-
        -
        • -
      • + +
        • + 
      •  Count：应用个数。
-
        -
        • -
      • + +
        • + 
      •  Energy Percent(%)：功耗占比。
+
        +
        • +
      +

      HiSystemEvent的Hisysevent泳道图展示

      + +

      GitHub Logo

      +

      HiSystemEvent的Hisysevent泳道图框选功能

      + +

      + 框选Hisysevent的泳道图，展示Hisysevents的tab页,有Filter by Domain，Filter by eventname，Filter by + contents输入框。All下拉框可以选择level级别
      + GitHub Logo +

      +
        +
      • + 
        +id： id值。
+
        +
        • +
      • + 
        +domain：domain值。
+
        +
        • +
      • + 
        +eventname：事件名。
+
        +
        • +
      • + 
        +type：事件类型。
+
        +
        • +
      • + 
        +time：时间戳信息。
+
        +
        • +
      • + 
        +pid：进程id。
+
        +
        • +
      • + 
        +tid：线程id。
+
        +
        • +
      • + 
        +uid：uid。
+
        +
        • +
      • + 
        +info：info信息。
        -
        • -
      -
      +> +
      • +
    • + 
      +level：事件级别。
+
      +
      • +
    • + 
      +seq：序列号。
+
      +
      • +
    • + 
      +contents：抓取内容。
+
      +
      • +
    +

    + 框选Hisysevent的泳道图，展示Statistics的tab页。
    + GitHub Logo +

    +
      +
    • + 
      +Level/Domain/EventName：根据级别，Domain，事件名显示。
+
      +
      • +
    • + 
      +Count： 各级别事件个数。
+
      +
      • +
    +