diff --git a/ide/src/base-ui/select/LitSelectV.ts b/ide/src/base-ui/select/LitSelectV.ts index 32b2c054fe0c4ba05c4588d472762464746594bc..fd050676eccd054d7a1cfe349c84b43502095c86 100644 --- a/ide/src/base-ui/select/LitSelectV.ts +++ b/ide/src/base-ui/select/LitSelectV.ts @@ -158,11 +158,18 @@ export class LitSelectV extends BaseElement { this.selectVBody = this.shadowRoot!.querySelector('.body') as HTMLDivElement; this.selectVOptions = this.shadowRoot!.querySelector('.body-opt') as HTMLDivElement; this.selectVIconEl = this.shadowRoot!.querySelector('.icon'); - this.selectVInputEl!.onkeydown = (ev: KeyboardEvent) => { + this.selectVInputEl!.oninput = (ev: InputEvent) => { // @ts-ignore - if (ev.key === '0' && ev.target.value.length === 1 && ev.target.value === '0') { + if (this.selectVInputEl!.value === '00') { + this.selectVInputEl!.value = '0'; ev.preventDefault(); } + if (this.selectVInputEl!.value === '') { + this.shadowRoot?.querySelectorAll('lit-select-option').forEach((it) => { + it.removeAttribute('selected'); + this.showItems = []; + }); + } }; this.selectVSearchInputEl!.onkeydown = (ev: KeyboardEvent) => { // @ts-ignore diff --git a/ide/src/doc/md/quickstart_smaps.md b/ide/src/doc/md/quickstart_smaps.md deleted file mode 100644 index b0117a5db3a10284932e3a1d1439b24bcd2fb844..0000000000000000000000000000000000000000 --- a/ide/src/doc/md/quickstart_smaps.md +++ /dev/null @@ -1,62 +0,0 @@ -# 进程 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 deleted file mode 100644 index 644dda7fe55c21c92286e4538e9a3865eff60b2d..0000000000000000000000000000000000000000 --- a/ide/src/doc/quickstart_smaps.html +++ /dev/null @@ -1,1010 +0,0 @@ - - - - - quickstart_smaps - - - - - - -
-

进程smaps的抓取和展示说明

- -

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

-

smaps的抓取

- -

smaps抓取配置参数

- -

- GitHub Logo
- 配置项说明： -

- -

- 再点击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 -

- -

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

- -
- - - - diff --git a/ide/src/figures/smaps/smapschart.jpg b/ide/src/figures/smaps/smapschart.jpg deleted file mode 100644 index 032d543261f85121367fa3f7e260e688b018d815..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapschart.jpg and /dev/null differ diff --git a/ide/src/figures/smaps/smapsexcuting.jpg b/ide/src/figures/smaps/smapsexcuting.jpg deleted file mode 100644 index 53f86e1472c53801d7d3637ffadae6d493233921..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapsexcuting.jpg and /dev/null differ diff --git a/ide/src/figures/smaps/smapslist.jpg b/ide/src/figures/smaps/smapslist.jpg deleted file mode 100644 index 598f6a1289980ead2857757d8d7ff513d5a022d9..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapslist.jpg and /dev/null differ diff --git a/ide/src/figures/smaps/smapsrecord.jpg b/ide/src/figures/smaps/smapsrecord.jpg deleted file mode 100644 index 9380722264bf06e22a1b1231e97eca0f06a0db1f..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapsrecord.jpg and /dev/null differ diff --git a/ide/src/figures/smaps/smapssetting.jpg b/ide/src/figures/smaps/smapssetting.jpg deleted file mode 100644 index c79f7f9d047c0ca2e4d4b90ab15a58f81e279f81..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapssetting.jpg and /dev/null differ diff --git a/ide/src/figures/smaps/smapsstatistics.jpg b/ide/src/figures/smaps/smapsstatistics.jpg deleted file mode 100644 index 4af1ef5ad619eeb8a0ed024286c868421118c428..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapsstatistics.jpg and /dev/null differ diff --git a/ide/src/figures/smaps/smapssummary.jpg b/ide/src/figures/smaps/smapssummary.jpg deleted file mode 100644 index df74018bc3bdfd6bec26d540415e2125e929530a..0000000000000000000000000000000000000000 Binary files a/ide/src/figures/smaps/smapssummary.jpg and /dev/null differ diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts index 3a55237d345d79b100abd8cb6d3fe64a7d3ae55f..8ad2fe8521495770c315941cebfd8e565e870f2d 100644 --- a/ide/src/trace/SpApplication.ts +++ b/ide/src/trace/SpApplication.ts @@ -55,6 +55,8 @@ 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 { type SpKeyboard } from './component/SpKeyboard.js'; +import './component/SpKeyboard.js'; @element('sp-application') export class SpApplication extends BaseElement { @@ -501,8 +503,10 @@ export class SpApplication extends BaseElement { display: flex; } -
+
+
@@ -571,19 +575,18 @@ export class SpApplication extends BaseElement { let spInfoAndStats = this.shadowRoot!.querySelector('#sp-info-and-stats') as SpInfoAndStats; // new SpInfoAndStats(); let spSystemTrace = this.shadowRoot!.querySelector('#sp-system-trace'); this.spHelp = this.shadowRoot!.querySelector('#sp-help'); + let SpKeyboard = this.shadowRoot!.querySelector('#sp-keyboard') as SpKeyboard; let spFlags = this.shadowRoot!.querySelector('#sp-flags') as SpFlags; let spRecordTrace = this.shadowRoot!.querySelector('#sp-record-trace'); let spRecordTemplate = this.shadowRoot!.querySelector('#sp-record-template'); let spSchedulingAnalysis = this.shadowRoot!.querySelector( '#sp-scheduling-analysis' ) as SpSchedulingAnalysis; - let appContent = this.shadowRoot?.querySelector('#app-content') as HTMLDivElement; let mainMenu = this.shadowRoot?.querySelector('#main-menu') as LitMainMenu; let menu = mainMenu.shadowRoot?.querySelector('.menu-button') as HTMLDivElement; let progressEL = this.shadowRoot?.querySelector('.progress') as LitProgressBar; let litSearch = this.shadowRoot?.querySelector('#lit-search') as LitSearch; let litRecordSearch = this.shadowRoot?.querySelector('#lit-record-search') as LitSearch; - let search = this.shadowRoot?.querySelector('.search-container') as HTMLElement; let sidebarButton: HTMLDivElement | undefined | null = this.shadowRoot?.querySelector('.sidebar-button'); let chartFilter = this.shadowRoot?.querySelector('.chart-filter') as TraceRowConfig; let cutTraceFile = this.shadowRoot?.querySelector('.cut-trace-file') as HTMLImageElement; @@ -608,6 +611,7 @@ export class SpApplication extends BaseElement { this.spHelp, spRecordTemplate, spFlags, + SpKeyboard, ]; document.addEventListener('visibilitychange', function () { if (document.visibilityState === 'visible') { @@ -763,6 +767,7 @@ export class SpApplication extends BaseElement { filterConfig.style.visibility = 'visible'; } else { that.removeAttribute('custom-color'); + customColor!.setAttribute('hidden', ''); customColor.cancelOperate(); menu!.style.pointerEvents = 'none'; sidebarButton!.style.pointerEvents = 'none'; @@ -785,9 +790,6 @@ export class SpApplication extends BaseElement { that!.removeAttribute('custom-color'); customColor!.setAttribute('hidden', ''); customColor.cancelOperate(); - } else { - that!.setAttribute('custom-color', ''); - customColor!.removeAttribute('hidden'); } if (node === showNode) { showNode.style.visibility = 'visible'; @@ -1061,7 +1063,7 @@ export class SpApplication extends BaseElement { mainMenu.menus!.splice(1, mainMenu.menus!.length > 2 ? 1 : 0, { collapsed: false, title: 'Current Trace', - second:false, + second: false, describe: 'Actions on the current trace', children: getTraceOptionMenus(showFileName, fileSize, fileName, true, dbName), }); @@ -1397,8 +1399,8 @@ export class SpApplication extends BaseElement { let enc = new TextDecoder(); let headerStr = enc.decode(traceHeadData); let rowTraceStr = Array.from(new Uint8Array(DbPool.sharedBuffer!.slice(0, 2))) - .map((byte) => byte.toString(16).padStart(2, '0')) - .join(''); + .map((byte) => byte.toString(16).padStart(2, '0')) + .join(''); if (headerStr.indexOf('OHOSPROF') !== 0 && rowTraceStr.indexOf('49df') !== 0) { isAllowTrace = false; } @@ -1445,6 +1447,18 @@ 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) { @@ -1659,6 +1673,7 @@ export class SpApplication extends BaseElement { function openTraceFile(ev: any, isClickHandle?: boolean) { that.removeAttribute('custom-color'); + customColor!.setAttribute('hidden', ''); longTracePage.style.display = 'none'; litSearch.style.marginLeft = '0px'; let pageListDiv = that.shadowRoot?.querySelector('.page-number-list') as HTMLDivElement; @@ -1860,6 +1875,18 @@ 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/component/DisassemblingWindow.ts b/ide/src/trace/component/DisassemblingWindow.ts deleted file mode 100644 index e7a9b36871a63120e358e1631a7104889e4dbd60..0000000000000000000000000000000000000000 --- a/ide/src/trace/component/DisassemblingWindow.ts +++ /dev/null @@ -1,213 +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('tab-native-data-modal') -export class DisassemblingWindow extends BaseElement { - private canvas: HTMLCanvasElement | undefined | null; - private window: HTMLElement | undefined | null; - private loading: HTMLElement | undefined | null; - private ctx: CanvasRenderingContext2D | null | undefined; - private hintLine = 0; - private addrArray = new Array(); - private maxBinSize = 0; - private close: Function | undefined | null; - setCloseListener(callback: Function) { - this.close = callback; - } - - removeCloseListener() { - this.close = null; - } - - private getMap(content: string, hintAttr: string) { - let lines = content.split('\n'); - this.addrArray = new Array(); - let lineMap = new Map(); - let effectLint = 0; - this.maxBinSize = 0; - for (let line of lines) { - let lineContents = line.split(':'); - if (lineContents.length === 2) { - let addrHex = lineContents[0].trim(); - let addr = '0x' + addrHex; - let value = lineContents[1].split('\t'); - try { - let binary = value[0]; - let lineStruct = new Disassembling(); - if (binary === '') { - if (line.includes('Disassembly') || line.includes('file format')) { - continue; - } else { - if (addr.includes(' ')) { - let funcs = addr.split(' '); - lineStruct.addr = funcs[0]; - lineStruct.binary = funcs[1]; - } - } - } else { - lineStruct.addr = addr; - lineStruct.binary = value[0].trim(); - lineStruct.type = value.length > 1 ? value[1] : ''; - lineStruct.code = value.length > 2 ? value[2] : ''; - } - lineMap.set(addrHex, lineStruct); - this.maxBinSize = Math.max(this.ctx!.measureText(lineStruct.addr + lineStruct.binary).width, this.maxBinSize); - this.addrArray.push(addrHex); - if (addrHex === hintAttr) this.hintLine = effectLint; - effectLint++; - } catch (e) { - console.log(e); - } - } - } - return lineMap; - } - - public showContent(content: string, hintAddr: string): void { - this.loading!.style.display = 'none'; - this.window!.style.display = 'block'; - if (content.startsWith('error')) { - this.window!.innerHTML = `${content}`; - return; - } - let lineMap = this.getMap(content, hintAddr); - this.maxBinSize = this.maxBinSize * 1.7; - this.window!.innerHTML = ''; - for (let addr of this.addrArray) { - if (!lineMap.has(addr)) continue; - let struct = lineMap.get(addr); - if (this.addrArray[this.hintLine] == addr) { - this.window!.innerHTML += `
- ${struct!.addr} : ${struct!.binary} - ${struct!.type} - ${struct!.code}
`; - (this.window!.querySelector('#emphasis') as HTMLElement)!.style.width = this.window!.scrollWidth + 'px'; - (this.window!.querySelector('#emphasis') as HTMLElement)!.style.background = '#0A59F7'; - } else { - this.window!.innerHTML += `
- ${struct!.addr} : ${struct!.binary} - ${struct!.type} - ${struct!.code}
`; - } - } - this.window!.scrollTo( - 0, - (this.hintLine - 1) * this.shadowRoot!.querySelector('#window>.line')!.clientHeight - - this.window!.clientHeight / 2 - ); - } - - private resetCanvas(styleWidth: number, styleHeight: number, width: number, height: number): void { - this.canvas!.style.width = styleWidth + 'px'; - this.canvas!.style.height = styleHeight + 'px'; - this.canvas!.width = width; - this.canvas!.height = height; - } - - public showLoading(): void { - this.loading!.style.display = 'block'; - this.window!.style.display = 'none'; - this.style.display = 'block'; - this.style.position = 'absolute'; - this.style.left = '0px'; - this.style.border = '1px solid #d8d8d8'; - } - - initElements(): void { - this.canvas = this.shadowRoot?.querySelector('#canvas'); - let close = this.shadowRoot?.querySelector('#close'); - this.window = this.shadowRoot?.querySelector('#window'); - this.loading = this.shadowRoot?.querySelector('#loading'); - this.ctx = this.canvas!.getContext('2d'); - this.resetCanvas(0, 0, 0, 0); - close!.addEventListener('click', () => { - if (this.close) { - this.close(); - } - return true; - }); - } - - initHtml(): string { - return ` - - - `; - } -} - -class Disassembling { - addr = ''; - binary = ''; - type = ''; - code = ''; -} diff --git a/ide/src/trace/component/SpKeyboard.ts b/ide/src/trace/component/SpKeyboard.ts new file mode 100644 index 0000000000000000000000000000000000000000..40c05d1c1b6ae80b12b91154f2cfb1dfdf80ea9c --- /dev/null +++ b/ide/src/trace/component/SpKeyboard.ts @@ -0,0 +1,226 @@ +/* + * 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 { + initElements(): void { + let parentElement = this.parentNode as HTMLElement; + parentElement.style.overflow = 'hidden'; + let closeWindow = this.shadowRoot?.querySelector('.close-icon'); + let keyboardDiv = document + .querySelector('body > sp-application')! + .shadowRoot!.querySelector('#sp-keyboard')!; + let welcomeDiv = document + .querySelector('body > sp-application')! + .shadowRoot!.querySelector('#sp-welcome')!; + let shadow_box = this.shadowRoot?.querySelector('.shadow-box')!; + closeWindow!.addEventListener('click', () => { + keyboardDiv.style.visibility = 'hidden'; + welcomeDiv.style.visibility = 'visible'; + }); + shadow_box!.addEventListener('click', () => { + keyboardDiv.style.visibility = 'hidden'; + welcomeDiv.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 ` + + `; + } +} diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index f7d154f4e6e8b51954f21fed41f028fca0ceb9bd..053f5b47442f9eee33ca32a9a00f8aac5cf25721 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -149,6 +149,9 @@ export class SpRecordTrace extends BaseElement { 'MEMINFO_VMALLOC_USED', 'MEMINFO_WRITEBACK', 'MEMINFO_KERNEL_RECLAIMABLE', + 'PMEM_ACTIVE_PURG', + 'PMEM_INACTIVE_PURG', + 'PMEM_PINED_PURG' ]; static VMEM_INFO = [ 'VMEMINFO_UNSPECIFIED', @@ -310,6 +313,9 @@ export class SpRecordTrace extends BaseElement { 'MEMINFO_CMA_TOTAL', 'MEMINFO_CMA_FREE', 'MEMINFO_KERNEL_RECLAIMABLE', + 'PMEM_ACTIVE_PURG', + 'PMEM_INACTIVE_PURG', + 'PMEM_PINED_PURG' ]; schedulingEvents = [ @@ -2181,6 +2187,7 @@ export class SpRecordTrace extends BaseElement { fpUnwind: this.spAllocations!.fp_unwind, blocked: true, }; + let maxProcessSize = 4; if (SpRecordTrace.selectVersion !== undefined && SpRecordTrace.selectVersion !== '3.2') { nativeConfig.callframeCompress = true; nativeConfig.recordAccurately = this.spAllocations!.record_accurately; @@ -2189,9 +2196,16 @@ export class SpRecordTrace extends BaseElement { nativeConfig.statisticsInterval = this.spAllocations!.statistics_interval; } nativeConfig.startupMode = this.spAllocations!.startup_mode; + if (this.spAllocations!.response_lib_mode) { + nativeConfig.responseLibraryMode = this.spAllocations!.response_lib_mode; + maxProcessSize = 8; + } + if (this.spAllocations!.sample_interval) { + nativeConfig.sampleInterval = this.spAllocations!.sample_interval; + } } if (this.spAllocations!.expandPids.length > 0) { - nativeConfig.expandPids = this.spAllocations!.expandPids; + nativeConfig.expandPids = this.spAllocations!.expandPids.splice(0, maxProcessSize); } let nativePluginConfig: ProfilerPluginConfig = { pluginName: 'nativehook', diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index ef60e9245d0f6fd07f5cc41b07729e2cc8194689..f909b021eb39021c63018b15cc7064a1d9ae99c7 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -103,7 +103,9 @@ 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'; +import { type HiSysEventStruct } from '../database/ui-worker/ProcedureWorkerHiSysEvent.js'; +import { InitAnalysis } from '../database/logic-worker/ProcedureLogicWorkerCommon.js'; +import { type SpKeyboard } from '../component/SpKeyboard.js'; function dpr() { return window.devicePixelRatio || 1; @@ -2046,6 +2048,13 @@ 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') { @@ -4306,6 +4315,7 @@ export class SpSystemTrace extends BaseElement { HeapDataInterface.getInstance().clearData(); procedurePool.clearCache(); Utils.clearData(); + InitAnalysis.getInstance().isInitAnalysis = true; procedurePool.submitWithName('logic0', 'clear', {}, undefined, (res: any) => {}); procedurePool.submitWithName('logic1', 'clear', {}, undefined, (res: any) => {}); } diff --git a/ide/src/trace/component/chart/FrameChart.ts b/ide/src/trace/component/chart/FrameChart.ts index 36f7ffec42169fe83143e8031d65b7d830f73e93..a1a6d751f0625ef4e876b9127288a5b670ea3e33 100644 --- a/ide/src/trace/component/chart/FrameChart.ts +++ b/ide/src/trace/component/chart/FrameChart.ts @@ -890,7 +890,7 @@ export class FrameChart extends BaseElement { private listenerResize(): void { new ResizeObserver(() => { this.resizeChange(); - if (this.rootNode) { + if (this.rootNode && this.canvas.clientWidth !== 0) { this.rootNode.frame!.width = this.canvas.clientWidth; } }).observe(this); diff --git a/ide/src/trace/component/chart/SpHiSysEnergyChart.ts b/ide/src/trace/component/chart/SpHiSysEnergyChart.ts index 077abaa88a73d5870aba91c18ffc5434edf49510..3a3f0dde7a7752b9e9697d7cbed4854fe331959f 100644 --- a/ide/src/trace/component/chart/SpHiSysEnergyChart.ts +++ b/ide/src/trace/component/chart/SpHiSysEnergyChart.ts @@ -43,6 +43,42 @@ export class SpHiSysEnergyChart { private trace: SpSystemTrace; private energyTraceRow: TraceRow | undefined; private timer: any; + private stateName: Array = [ + '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', + ]; + private initValueList: Array = [ + 'brightness', + 'nocolumn', + 'nocolumn', + 'nocolumn', + 'nocolumn', + 'wifi', + 'bt_state', + 'bt_state', + 'location', + 'nocolumn', + ]; + private stateList: Array = [ + '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', + ]; constructor(trace: SpSystemTrace) { this.trace = trace; @@ -51,11 +87,31 @@ export class SpHiSysEnergyChart { 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(); + let anomalyData = await queryAnomalyData(); + let systemData = await Promise.all([querySystemLocationData(), querySystemLockData(), querySystemSchedulerData()]); + let systemDataList: any = {}; + systemDataList[0] = this.handleLockData(systemData[1]); + systemDataList[1] = this.handleLocationData(systemData[0]); + systemDataList[2] = this.handleWorkData(systemData[2]); + let powerData = await queryPowerData(); + let stateData: any = {}; + let stateDataSize: number = 0; + for (let index = 0; index < this.stateList.length; index++) { + let stateResult = await Promise.all([ + queryStateInitValue(this.stateName[index], this.initValueList[index]), + queryStateData(this.stateName[index]), + ]); + let stateInitValue = this.initValueList[index] == 'nocolumn' ? [] : stateResult[0]; + stateData[index] = stateInitValue.concat(stateResult[1]); + stateDataSize += stateData[index].length; + } + if (anomalyData.length > 0 || systemDataList[0].length > 0 || systemDataList[1].length > 0 || systemDataList[2].length > 0 || powerData.length > 0 || stateDataSize > 0) { + await this.initEnergyRow(); + this.initAnomaly(anomalyData); + this.initSystem(systemDataList); + this.initPower(powerData); + await this.initState(stateData); + } } private initEnergyRow = async () => { @@ -76,7 +132,7 @@ export class SpHiSysEnergyChart { if (appNameFromTable.length > 0 && SpHiSysEnergyChart.app_name == '') { SpHiSysEnergyChart.app_name = appNameFromTable[0].string_value; } - this.energyTraceRow = TraceRow.skeleton(); + this.energyTraceRow = TraceRow.skeleton(); let appNameList = this.energyTraceRow?.shadowRoot!.querySelector('#appNameList'); let addFlag = false; appNameList?.addEventListener('click', () => { @@ -134,7 +190,7 @@ export class SpHiSysEnergyChart { 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.supplier = () => new Promise>((resolve) => resolve([])); this.energyTraceRow.onThreadHandler = (useCache) => { this.energyTraceRow?.canvasSave(this.trace.canvasPanelCtx!); if (this.energyTraceRow!.expansion) { @@ -164,7 +220,7 @@ export class SpHiSysEnergyChart { this.trace.rowsEL?.appendChild(this.energyTraceRow!); }; - private initAnomaly = async () => { + private initAnomaly = (anomalyData: EnergyAnomalyStruct[]): void => { let time = new Date().getTime(); let anomalyTraceRow = TraceRow.skeleton(); anomalyTraceRow.rowParentId = `energy`; @@ -179,7 +235,7 @@ export class SpHiSysEnergyChart { anomalyTraceRow.style.width = `100%`; anomalyTraceRow.setAttribute('children', ''); anomalyTraceRow.name = 'Anomaly Event'; - anomalyTraceRow.supplier = () => queryAnomalyData(); + anomalyTraceRow.supplier = () => new Promise>((resolve): void => resolve(anomalyData)); anomalyTraceRow.focusHandler = () => { this.trace?.displayTip( anomalyTraceRow, @@ -215,7 +271,7 @@ export class SpHiSysEnergyChart { info('The time to load the anomaly is: ', durTime); }; - private initSystem = async () => { + private initSystem = (systemDataList: any): void => { let time = new Date().getTime(); let systemTraceRow = TraceRow.skeleton(); systemTraceRow.rowParentId = `energy`; @@ -230,10 +286,7 @@ export class SpHiSysEnergyChart { 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.supplier = () => new Promise>((resolve): void => resolve(systemDataList)); systemTraceRow.focusHandler = () => { this.trace?.displayTip( systemTraceRow, @@ -277,22 +330,16 @@ export class SpHiSysEnergyChart { 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>) { + private handleLocationData(result: Array<{ + ts: string; + eventName: string; + appKey: string; + Value: string; + }>) { let locationIndex = -1; let locationCount = 0; let locationData: any[] = []; - result[0].forEach((item: any) => { + result.forEach((item: any) => { let da: any = {}; if (item.Value == 'stop') { if (locationIndex == -1) { @@ -317,11 +364,16 @@ export class SpHiSysEnergyChart { return locationData; } - private handleLockData(result: Array>) { + private handleLockData(result: Array<{ + ts: string; + eventName: string; + appKey: string; + Value: string; + }>) { let lockCount = 0; let tokedIds: Array = []; let lockData: any[] = []; - result[1].forEach((item: any) => { + result.forEach((item: any) => { let running: any = {}; let split = item.Value.split(','); if (item.Value.indexOf('ADD') > -1) { @@ -350,8 +402,7 @@ export class SpHiSysEnergyChart { return lockData; } - private handleWorkData(result: Array>) { - let workDataArray = result[2]; + private handleWorkData(workDataArray: Array) { let workCountMap: Map = new Map(); let nameIdMap: Map> = new Map(); let workData: any[] = []; @@ -411,7 +462,12 @@ export class SpHiSysEnergyChart { return workData; } - private initPower = async () => { + private initPower = (powerData: Array<{ + startNS: number; + eventName: string; + appKey: string; + eventValue: string; + }>): void => { let time = new Date().getTime(); let powerTraceRow = TraceRow.skeleton(); powerTraceRow.rowParentId = `energy`; @@ -426,10 +482,7 @@ export class SpHiSysEnergyChart { powerTraceRow.style.width = `100%`; powerTraceRow.setAttribute('children', ''); powerTraceRow.name = 'Power'; - powerTraceRow.supplier = () => - queryPowerData().then((items) => { - return this.getPowerData(items); - }); + powerTraceRow.supplier = () => this.getPowerData(powerData); powerTraceRow.findHoverStruct = () => { EnergyPowerStruct.hoverEnergyPowerStruct = powerTraceRow.getHoverStruct(); }; @@ -545,47 +598,10 @@ export class SpHiSysEnergyChart { return Object.values(powerDataMap); } - private initState = async () => { + private initState = async (stateData: any) => { 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]); + for (let index = 0; index < this.stateList.length; index++) { + let maxStateData = await queryMaxStateValue(this.stateName[index]); if (!maxStateData[0]) { continue; } @@ -601,22 +617,15 @@ export class SpHiSysEnergyChart { let stateTraceRow = TraceRow.skeleton(); stateTraceRow.rowParentId = `energy`; stateTraceRow.rowHidden = true; - stateTraceRow.rowId = `energy-state-${stateList[index]}`; + stateTraceRow.rowId = `energy-state-${this.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.name = `${this.stateList[index]}`; + stateTraceRow.supplier = () => new Promise>((resolve): void => resolve(stateData[index])); stateTraceRow.findHoverStruct = () => { EnergyStateStruct.hoverEnergyStateStruct = stateTraceRow.getHoverStruct(); }; diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts index 9d9303354fdf48f0f5f95faef0496d15a6c0fd4e..2f65c50b8e86f6198de76690d8c6f7e461139c27 100644 --- a/ide/src/trace/component/setting/SpAllocations.ts +++ b/ide/src/trace/component/setting/SpAllocations.ts @@ -38,10 +38,11 @@ export class SpAllocations extends BaseElement { private recordAccurately: LitSwitch | null | undefined; private offlineSymbol: LitSwitch | null | undefined; private startupMode: LitSwitch | null | undefined; + private responseLibMode: LitSwitch | null | undefined; private recordStatisticsResult: HTMLDivElement | null | undefined; + private sampleInterval: HTMLInputElement | null | undefined; private filterSize: HTMLInputElement | null | undefined; - private maxProcessSize: number = 4; set startSamp(allocationStart: boolean) { if (allocationStart) { @@ -122,6 +123,14 @@ export class SpAllocations extends BaseElement { return 10; } + get response_lib_mode(): boolean { + let value = this.responseLibMode?.checked; + if (value != undefined) { + return value; + } + return false; + } + get startup_mode(): boolean { let value = this.startupMode?.checked; if (value != undefined) { @@ -145,15 +154,16 @@ export class SpAllocations extends BaseElement { let item = result[index]; let currentPid = item!.replace('(', '').replace(')', ''); allPidList.push(Number(currentPid)); - if (index === this.maxProcessSize - 1) { - break; - } } } } return allPidList; } + get sample_interval(): number { + return Number(this.sampleInterval!.value); + } + connectedCallback() { this.unwindEL?.addEventListener('keydown', this.handleInputChange); this.shareMemory?.addEventListener('keydown', this.handleInputChange); @@ -214,6 +224,8 @@ export class SpAllocations extends BaseElement { this.recordAccurately = this.shadowRoot?.getElementById('use_record_accurately') as LitSwitch; this.offlineSymbol = this.shadowRoot?.getElementById('use_offline_symbolization') as LitSwitch; this.startupMode = this.shadowRoot?.getElementById('use_startup_mode') as LitSwitch; + this.responseLibMode = this.shadowRoot?.getElementById('response_lib_mode') as LitSwitch; + this.sampleInterval = this.shadowRoot?.getElementById('sample-interval-input') as HTMLInputElement; let stepValue = [0, 1, 10, 30, 60, 300, 600, 1800, 3600]; this.statisticsSlider = this.shadowRoot?.querySelector('#interval-slider') as LitSlider; @@ -374,6 +386,12 @@ export class SpAllocations extends BaseElement { if (this.startupMode) { this.startupMode.disabled = false; } + if (this.responseLibMode) { + this.responseLibMode.disabled = false; + } + if (this.sampleInterval) { + this.sampleInterval.disabled = false; + } this.processId!.removeAttribute('disabled'); let inputBoxes = this.shadowRoot?.querySelectorAll('.inputBoxes'); inputBoxes!.forEach((item) => { @@ -396,6 +414,12 @@ export class SpAllocations extends BaseElement { if (this.offlineSymbol) { this.offlineSymbol.disabled = true; } + if (this.responseLibMode) { + this.responseLibMode.disabled = true; + } + if (this.sampleInterval) { + this.sampleInterval.disabled = true; + } this.processId!.setAttribute('disabled', ''); let inputBoxes = this.shadowRoot?.querySelectorAll('.inputBoxes'); inputBoxes!.forEach((item) => { @@ -415,6 +439,7 @@ export class SpAllocations extends BaseElement { } .title { grid-column: span 2 / auto; + margin-top: 5vh; } .allocation-font-style{ font-family: Helvetica-Bold; @@ -424,13 +449,14 @@ export class SpAllocations extends BaseElement { font-weight: 700; } .root { - padding-top: 45px; + padding-top: 30px; margin-left: 40px; display: grid; grid-template-columns: repeat(2, 1fr); grid-template-rows: min-content 1fr min-content; width: 90%; border-radius: 0px 16px 16px 0px; + margin-bottom: 30px; } .allocation-inner-font-style { font-family: Helvetica,serif; @@ -600,7 +626,7 @@ export class SpAllocations extends BaseElement {
-
+
Start Native Memory Record
@@ -635,6 +661,11 @@ export class SpAllocations extends BaseElement { Use Fp Unwind
+
+ Sample Interval (Available on recent OpenHarmony 4.0) + Max Sample Interval Rang is 1 - 65535, default 256 + +
Use Record Accurately (Available on recent OpenHarmony 4.0) @@ -647,7 +678,11 @@ export class SpAllocations extends BaseElement { Use Startup Mode (Available on recent OpenHarmony 4.0)
-
+
+ Use Response Lib Mode (Available on recent OpenHarmony 4.0) + +
+
Use Record Statistics (Available on recent OpenHarmony 4.0) Time between following interval (0 = disabled) diff --git a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts index cc1a5eb42e14e4c9dc445478b97769b935f61562..a4709f49205d1a764d8a9ad9bf91bbf5273ac59d 100644 --- a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts +++ b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts @@ -689,6 +689,9 @@ export enum SysMeminfoType { MEMINFO_CMA_TOTAL = 'PMEM_CMA_TOTAL', MEMINFO_CMA_FREE = 'PMEM_CMA_FREE', MEMINFO_KERNEL_RECLAIMABLE = 'PMEM_KERNEL_RECLAIMABLE', + PMEM_ACTIVE_PURG = 'PMEM_ACTIVE_PURG', + PMEM_INACTIVE_PURG = 'PMEM_INACTIVE_PURG', + PMEM_PINED_PURG = 'PMEM_PINED_PURG', UNRECOGNIZED = 'UNRECOGNIZED', } @@ -799,6 +802,15 @@ export function sysMeminfoTypeFromJSON(object: any): SysMeminfoType { case 34: case 'MEMINFO_KERNEL_RECLAIMABLE': return SysMeminfoType.MEMINFO_KERNEL_RECLAIMABLE; + case 35: + case 'PMEM_ACTIVE_PURG': + return SysMeminfoType.PMEM_ACTIVE_PURG; + case 36: + case 'PMEM_INACTIVE_PURG': + return SysMeminfoType.PMEM_INACTIVE_PURG; + case 37: + case 'PMEM_PINED_PURG': + return SysMeminfoType.PMEM_PINED_PURG; case -1: case 'UNRECOGNIZED': default: @@ -872,7 +884,9 @@ export interface NativeHookConfig { callframeCompress?: boolean; startupMode?: boolean; statisticsInterval?: number; + sampleInterval?: number; expandPids?: number[]; + responseLibraryMode?: boolean; } export interface FpsConfig { diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts index 0437b6c0e02e8e6825b580bb16cdd7b33938b666..6f109f090ac5717075e02d2c0d5a42969fa7718c 100644 --- a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts +++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts @@ -490,15 +490,11 @@ export class TabPaneHisysEvents extends BaseElement { const content = JSON.parse(data.contents ?? '{}'); if (content && typeof content === 'object') { let isFirstTime = true; - 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 = value; - } if (!isNaN(Number(value))) { contentValue = ((Number(value) - this.realTime) * millisecond).toString(); if (isFirstTime) { @@ -507,7 +503,8 @@ export class TabPaneHisysEvents extends BaseElement { } } if (key === 'INPUT_TIME') { - inputTimeTs = contentValue; + this.baseTime = contentValue; + isFirstTime = false; } } this.currentDetailList.push({ @@ -515,9 +512,6 @@ export class TabPaneHisysEvents extends BaseElement { value: contentValue }); }); - if (keyList.indexOf('INPUT_TIME') >= 0) { - this.baseTime = inputTimeTs; - } } this.changeInput!.value = `${this.baseTime}`; this.detailsTbl!.recycleDataSource = this.currentDetailList; 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 19fe949a8f96db8d02f6dda0725d0dc5b58b6997..d9bf3be9bc3293387bc01261bce20af556618d76 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts @@ -77,10 +77,6 @@ export class TabpaneNMCalltree extends BaseElement { this.headLine!.titleTxt = value; } - get treeData(): Array { - return this.nmCallTreeSource; - } - set filterData(data: FilterByAnalysis) { // click from analysis this._filterData = data; @@ -98,10 +94,15 @@ export class TabpaneNMCalltree extends BaseElement { if (nmCallTreeParam === this.currentSelection) { return; } + this.nmCallTreeSource = []; this.currentSelection = nmCallTreeParam; this.currentSelectIPid = nmCallTreeParam.nativeMemoryCurrentIPid; + this.init(nmCallTreeParam); + } + + private async init(nmCallTreeParam: SelectionParam): Promise { this.initUI(); - this.initFilterTypes(); + await this.initFilterTypes(); let types: Array = []; this.initTypes(nmCallTreeParam, types); const initWidth = this._analysisTabWidth > 0 ? this._analysisTabWidth : this.clientWidth; 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 a7a4b00a0086379b02cbdd1c5368f39e46520dfc..13ae181f9cae22fa997576e239433e2483fa95da 100644 --- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts +++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatisticAnalysis.ts @@ -26,6 +26,7 @@ import { LitCheckBox } from '../../../../../base-ui/checkbox/LitCheckBox.js'; import { initSort } from '../SheetUtils.js'; import { TabpaneNMCalltree } from './TabPaneNMCallTree.js'; import { FilterByAnalysis } from '../../../../bean/NativeHook.js'; +import { InitAnalysis } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; const TYPE_ALLOC_STRING = 'AllocEvent'; const TYPE_MAP_STRING = 'MmapEvent'; @@ -301,12 +302,13 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { data.symbolName ); // 首次打开初始化数据 非首次初始化UI - if (treeTab?.treeData && treeTab.treeData.length > 0) { - treeTab.initUI(); - treeTab.filterByAnalysis(); + if (!InitAnalysis.getInstance().isInitAnalysis) { + treeTab?.initUI(); + treeTab?.filterByAnalysis(); } else { treeTab!.initFromAnalysis = true; treeTab!.data = this.currentSelection; + InitAnalysis.getInstance().isInitAnalysis = false; } treeTab!.banTypeAndLidSelect(); @@ -629,7 +631,7 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { // @ts-ignore let title = typeName; if (!this.hideThreadCheckBox?.checked) { - this.threadName = `(Thread)${it.tid}`; + this.threadName = `Thread(${it.tid})`; title += ` / ${this.threadName}`; } this.titleEl!.textContent = title; @@ -774,14 +776,18 @@ export class TabPaneNMStatisticAnalysis extends BaseElement { } } this.threadData = []; - threadMap.forEach((dbData: Array, tid: number) => { + threadMap.forEach((dbData: Array, tid: number) => { const sizeObj = this.calSizeObj(dbData); let analysis = new AnalysisObj(sizeObj.applySize, sizeObj.applyCount, sizeObj.releaseSize, sizeObj.releaseCount); this.calPercent(analysis); analysis.typeId = item.typeId; analysis.typeName = item.typeName; analysis.tid = tid; - analysis.tName = `Thread ${tid}`; + if (dbData[0].threadName && dbData[0].threadName.length > 0) { + analysis.tName = `${dbData[0].threadName}(${tid})`; + } else { + analysis.tName = `Thread ${tid}`; + } analysis.tableName = analysis.tName; this.threadData.push(analysis); }); diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index 9e7fdfd3d3b1ea156c1901c7af586b154eea35e1..a65756ee4478a88781cdb96af01e5e599d8e9e3d 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -3218,10 +3218,10 @@ export const queryAnomalyData = (): Promise> => export const querySystemLocationData = (): Promise< Array<{ - startNs: string; + ts: string; eventName: string; - type: string; - state: string; + appKey: string; + Value: string; }> > => query( @@ -3248,10 +3248,10 @@ export const querySystemLocationData = (): Promise< export const querySystemLockData = (): Promise< Array<{ - startNs: string; + ts: string; eventName: string; - type: string; - state: string; + appKey: string; + Value: string; }> > => query( diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts index 4018c04505d6d9c00fa637f2ad84df401ba3b365..568a35900800e43c33ec8d38cea5525734c519ed 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerCommon.ts @@ -667,3 +667,14 @@ export class DataCache { this.perfSymbolMap.clear(); } } + +export class InitAnalysis { + public static instance: InitAnalysis | undefined; + public isInitAnalysis: boolean = true; + public static getInstance(): InitAnalysis { + if (!this.instance) { + this.instance = new InitAnalysis(); + } + return this.instance; + } +} diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts index 1877545736a69886997817a2a5efe8cf2ebada96..4a9eddbdbe2c9b49e33933dbe4daef26e198cd63 100644 --- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts +++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerNativeNemory.ts @@ -898,6 +898,7 @@ export class ProcedureLogicWorkerNativeMemory extends LogicHandler { analysisSample.endTs = sample.endTs; analysisSample.addr = sample.addr; analysisSample.tid = sample.tid; + analysisSample.threadName = sample.threadName; analysisSample.subType = subType; } @@ -1491,6 +1492,7 @@ class AnalysisSample { endTs?: number; subType?: string; tid?: number; + threadName?: string; addr?: string; libId!: number; diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerEnergySystem.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerEnergySystem.ts index 5867740b323531de245bf9b5d650b6876d131779..0de99ab6cc2fb24730a761dd09d8a7a02c8bc97b 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerEnergySystem.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerEnergySystem.ts @@ -298,6 +298,7 @@ export class EnergySystemStruct extends BaseStruct { startNs: number | undefined; dur: number | undefined; count: number | undefined; + token: number | undefined; workScheduler: string | undefined; power: string | undefined; location: string | undefined; diff --git a/trace_streamer/gn/BUILD.gn b/trace_streamer/gn/BUILD.gn index 489954fa19d0ce539379b301e3e95f6a2d71c470..31c35eeae503e8ad9a37cc82122ac6ddfa8435ab 100644 --- a/trace_streamer/gn/BUILD.gn +++ b/trace_streamer/gn/BUILD.gn @@ -66,6 +66,7 @@ config("default") { cflags += [ "-fsanitize=address", "-fno-omit-frame-pointer", + "-fstandalone-debug", ] ldflags += [ "-fsanitize=address" ] } diff --git a/trace_streamer/pare_third_party.sh b/trace_streamer/pare_third_party.sh index ee36a919ec980e21f221886d1e6f7fe656db1ac4..19cf58cc43d9a22e064cbe364e72e32fe1d373ab 100755 --- a/trace_streamer/pare_third_party.sh +++ b/trace_streamer/pare_third_party.sh @@ -119,6 +119,7 @@ if [ ! -d "perf_include/hiviewdfx/faultloggerd" ];then $sed -i '/getpid() == gettid()/s/getpid() == gettid()/false/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/unwinder.cpp $sed -i '/!realpath(path, realPath)/s/!realpath(path, realPath)/false/g' perf_include/hiviewdfx/faultloggerd/common/dfxutil/dfx_util.cpp $sed -i '/#include "dfx_util.h"/a #include "utilities.h"' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_mmap.cpp + $sed -i '/#include /a #include "utilities.h"' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/dfx_mmap.h $sed -i '/#ifndef is_ohos_lite/s/#ifndef is_ohos_lite/#if false/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_elf.cpp fi if [ ! -f "hiperf/BUILD.gn" ];then diff --git a/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn b/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn index 7d00cdd984c85c45dc8b71ceda988718eb7b6e36..8bbefbef960f13218b22cb882c94d025ce6593f2 100644 --- a/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn +++ b/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_BUILD.gn @@ -49,7 +49,7 @@ ohos_source_set("hiviewdfx_source") { } if (use_wasm) { include_dirs += - [ "//prebuilts/emsdk/emsdk/emscripten/cache/sysroot/include/" ] + [ "${PREBUILTS}/emsdk/emsdk/emscripten/cache/sysroot/include/" ] } sources += [ "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_elf.cpp", diff --git a/trace_streamer/src/base/index_map.h b/trace_streamer/src/base/index_map.h index 870e9cf219183481df1673028cb6a646dcf8d285..6b8b63f5d3c8945be68decbf4f481adfba0d5761 100644 --- a/trace_streamer/src/base/index_map.h +++ b/trace_streamer/src/base/index_map.h @@ -78,44 +78,36 @@ public: rowIndexBak_.clear(); switch (op) { case SQLITE_INDEX_CONSTRAINT_EQ: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != value; }, - [&](TableRowId id) -> bool { return dataQueue[id] == value; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != value; }, + [&](TableRowId id) -> bool { return dataQueue[id] == value; }); break; case SQLITE_INDEX_CONSTRAINT_NE: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == value; }, - [&](TableRowId id) -> bool { return dataQueue[id] != value; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == value; }, + [&](TableRowId id) -> bool { return dataQueue[id] != value; }); break; case SQLITE_INDEX_CONSTRAINT_ISNULL: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; }, - [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; }, + [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; }); break; case SQLITE_INDEX_CONSTRAINT_ISNOTNULL: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; }, - [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; }, + [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; }); break; case SQLITE_INDEX_CONSTRAINT_GT: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] <= value; }, - [&](TableRowId id) -> bool { return dataQueue[id] > value; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] <= value; }, + [&](TableRowId id) -> bool { return dataQueue[id] > value; }); break; case SQLITE_INDEX_CONSTRAINT_GE: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] < value; }, - [&](TableRowId id) -> bool { return dataQueue[id] >= invalidValue; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] < value; }, + [&](TableRowId id) -> bool { return dataQueue[id] >= invalidValue; }); break; case SQLITE_INDEX_CONSTRAINT_LE: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] > value; }, - [&](TableRowId id) -> bool { return dataQueue[id] < invalidValue; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] > value; }, + [&](TableRowId id) -> bool { return dataQueue[id] < invalidValue; }); break; case SQLITE_INDEX_CONSTRAINT_LT: - ProcessData( - dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] >= value; }, - [&](TableRowId id) -> bool { return dataQueue[id] < invalidValue; }); + ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] >= value; }, + [&](TableRowId id) -> bool { return dataQueue[id] < invalidValue; }); break; default: break; diff --git a/trace_streamer/src/filter/hi_sysevent_measure_filter.cpp b/trace_streamer/src/filter/hi_sysevent_measure_filter.cpp index e3664638f340fb983342e2a052957db84d77ff5e..bbe8402bd885484d1ead6940454d03a179834a87 100644 --- a/trace_streamer/src/filter/hi_sysevent_measure_filter.cpp +++ b/trace_streamer/src/filter/hi_sysevent_measure_filter.cpp @@ -198,7 +198,6 @@ void HiSysEventMeasureFilter::NoArrayDataParse(JsonData jData, for (auto itor = noArrayIndex.begin(); itor != noArrayIndex.end(); itor++) { auto value = jData.value[*itor]; auto key = jData.key[*itor]; - streamFilters_->hiSysEventMeasureFilter_->GetOrCreateFilterId(eventSourceIndex); DataIndex keyIndex = traceDataCache_->GetDataIndex(key); AppendStringValue(value, hiSysEventLineId, eventSourceIndex, keyIndex, jData.timeStamp); } @@ -214,7 +213,6 @@ void HiSysEventMeasureFilter::ArrayDataParse(JsonData jData, auto value = jData.value[*itor][i]; std::string key = jData.key[*itor]; DataIndex keyIndex = traceDataCache_->GetDataIndex(key); - streamFilters_->hiSysEventMeasureFilter_->GetOrCreateFilterId(eventSourceIndex); if (value.is_number()) { double valueIndex = value; streamFilters_->hiSysEventMeasureFilter_->AppendNewValue(hiSysEventLineId, jData.timeStamp, @@ -251,7 +249,6 @@ void HiSysEventMeasureFilter::CommonDataParser(JsonData jData, DataIndex eventSo std::string key = jData.key[i]; auto value = jData.value[i]; DataIndex keyIndex = traceDataCache_->GetDataIndex(key); - streamFilters_->hiSysEventMeasureFilter_->GetOrCreateFilterId(eventSourceIndex); AppendStringValue(value, hiSysEventLineId, eventSourceIndex, keyIndex, jData.timeStamp); } } @@ -259,53 +256,12 @@ DataIndex HiSysEventMeasureFilter::GetOrCreateFilterIdInternal(DataIndex appName { uint64_t appKeyId = appKey_.Find(appNameId, key); if (appKeyId == INVALID_DATAINDEX) { - appKeyId = traceDataCache_->GetHiSysEventSubkeysData()->AppendSysEventSubkey(1, appNameId, key); + appKeyId = traceDataCache_->GetHiSysEventSubkeysData()->AppendSysEventSubkey(appNameId, key); appKey_.Insert(appNameId, key, appKeyId); } return appKeyId; } -DataIndex HiSysEventMeasureFilter::GetOrCreateFilterId(DataIndex eventNameId) -{ - DataIndex eventSourceFilterId = INVALID_DATAINDEX; - if (eventSource_.find(eventNameId) == eventSource_.end()) { - eventSourceFilterId = streamFilters_->sysEventSourceFilter_->AppendNewMeasureFilter(eventNameId); - eventSource_.insert(std::make_pair(eventNameId, eventSourceFilterId)); - } else { - eventSourceFilterId = eventSource_.at(eventNameId); - } - return eventSourceFilterId; -} -DataIndex HiSysEventMeasureFilter::GetOrCreateFilterId(DataIndex eventNameId, DataIndex appName) -{ - DataIndex eventSourceFilterId = INVALID_DATAINDEX; - DataIndex appNameId = INVALID_DATAINDEX; - if (eventSource_.find(eventNameId) == eventSource_.end()) { - eventSourceFilterId = streamFilters_->sysEventSourceFilter_->AppendNewMeasureFilter(eventNameId); - eventSource_.insert(std::make_pair(eventNameId, eventSourceFilterId)); - } else { - eventSourceFilterId = eventSource_.at(eventNameId); - } - appNameId = appName_.Find(eventSourceFilterId, appName); - if (appNameId == INVALID_DATAINDEX) { - appNameId = traceDataCache_->GetHiSysEventSubkeysData()->AppendSysEventSubkey(0, eventSourceFilterId, appName); - appName_.Insert(eventSourceFilterId, appName, appNameId); - } - return appNameId; -} -std::tuple HiSysEventMeasureFilter::GetOrCreateFilterId(DataIndex eventNameId, - DataIndex appName, - DataIndex key) -{ - DataIndex appNameId = GetOrCreateFilterId(eventNameId, appName); - uint64_t appKeyId = appKey_.Find(appNameId, key); - if (appKeyId == INVALID_DATAINDEX) { - appKeyId = traceDataCache_->GetHiSysEventSubkeysData()->AppendSysEventSubkey(1, appNameId, key); - appKey_.Insert(appNameId, key, appKeyId); - } - return std::make_tuple(appNameId, appKeyId); -} - void HiSysEventMeasureFilter::Clear() { appKey_.Clear(); diff --git a/trace_streamer/src/filter/hi_sysevent_measure_filter.h b/trace_streamer/src/filter/hi_sysevent_measure_filter.h index c055d6658f1faeb9c310eccbbf6d01913ba5b489..02f5534ba795510e3483d1efdaccee437fc168b7 100644 --- a/trace_streamer/src/filter/hi_sysevent_measure_filter.h +++ b/trace_streamer/src/filter/hi_sysevent_measure_filter.h @@ -48,9 +48,6 @@ public: HiSysEventMeasureFilter(const HiSysEventMeasureFilter&) = delete; HiSysEventMeasureFilter& operator=(const HiSysEventMeasureFilter&) = delete; ~HiSysEventMeasureFilter() override; - DataIndex GetOrCreateFilterId(DataIndex eventNameId); - DataIndex GetOrCreateFilterId(DataIndex eventNameId, DataIndex appName); - std::tuple GetOrCreateFilterId(DataIndex eventNameId, DataIndex appName, DataIndex key); DataIndex AppendNewValue(uint64_t serial, uint64_t timeStamp, DataIndex appNameId, diff --git a/trace_streamer/src/filter/native_hook_filter.cpp b/trace_streamer/src/filter/native_hook_filter.cpp index 199efa3d7b77f912ba04479e81e5e21d668280f7..c18081621792a45e80affa8c37b09654f58cac32 100644 --- a/trace_streamer/src/filter/native_hook_filter.cpp +++ b/trace_streamer/src/filter/native_hook_filter.cpp @@ -46,7 +46,7 @@ void NativeHookFilter::ParseConfigInfo(ProtoReader::BytesView& protoData) isCallStackCompressedMode_ = true; isStringCompressedMode_ = true; } - if (configReader.has_offline_symbolization()) { + if (configReader.has_response_library_mode() || configReader.has_offline_symbolization()) { isOfflineSymbolizationMode_ = true; isCallStackCompressedMode_ = true; isStringCompressedMode_ = true; @@ -586,7 +586,7 @@ std::tuple NativeHookFilter::GetNeedUpdateProcessMapsAddrRan } inline void NativeHookFilter::FillOfflineSymbolizationFrames( - std::map>>::iterator mapItor) + std::map>>::iterator mapItor) { auto curCacheIpid = mapItor->second->back(); stackIdToCallChainIdMap_.insert(std::make_pair(mapItor->first, ++callChainId_)); @@ -663,11 +663,9 @@ void NativeHookFilter::ParseMapsEvent(std::unique_ptr& nativ auto endAddr = reader->end(); uint64_t start = INVALID_UINT64; uint64_t end = INVALID_UINT64; - uint32_t ipid = INVALID_UINT32; + auto ipid = streamFilters_->processFilter_->UpdateOrCreateProcessWithName(reader->pid(), ""); if (isSingleProcData_) { ipid = SINGLE_PROC_IPID; - } else { - ipid = streamFilters_->processFilter_->UpdateOrCreateProcessWithName(reader->pid(), ""); } // Get [start, end) of ips addr range which need to update std::tie(start, end) = GetNeedUpdateProcessMapsAddrRange(ipid, startAddr, endAddr); @@ -730,18 +728,13 @@ void NativeHookFilter::ParseSymbolTableEvent(std::unique_ptr return; } auto reader = std::make_shared(symbolTableByteView); - uint32_t ipid = INVALID_UINT32; - uint64_t ipidWithPathIdIndex = INVALID_UINT64; + auto ipid = streamFilters_->processFilter_->UpdateOrCreateProcessWithName(reader->pid(), ""); if (isSingleProcData_) { ipid = SINGLE_PROC_IPID; - ipidWithPathIdIndex = reader->file_path_id(); - } else { - ipid = streamFilters_->processFilter_->UpdateOrCreateProcessWithName(reader->pid(), ""); - ipidWithPathIdIndex = - traceDataCache_->GetDataIndex(std::to_string(ipid) + "_" + std::to_string(reader->file_path_id())); } auto filePathId = reader->file_path_id(); - if (filePathIdToSymbolTableMap_.count(ipidWithPathIdIndex)) { // SymbolTable already exists. + auto symbolTablePtr = ipidTofilePathIdToSymbolTableMap_.Find(ipid, filePathId); + if (symbolTablePtr != nullptr) { // SymbolTable already exists. /* First parse the updated call stacks, then parse the main events, and finally update Maps or SymbolTable Note that when tsToMainEventsMap_.size() > MAX_CACHE_SIZE and main events need to be resolved, this logic should also be followed. */ @@ -776,10 +769,9 @@ void NativeHookFilter::ParseSymbolTableEvent(std::unique_ptr } } ReparseStacksWithAddrRange(start, end); - - filePathIdToSymbolTableMap_.at(ipidWithPathIdIndex) = reader; + symbolTablePtr = reader; } else { - filePathIdToSymbolTableMap_.insert(std::make_pair(ipidWithPathIdIndex, reader)); + ipidTofilePathIdToSymbolTableMap_.Insert(ipid, filePathId, reader); } auto symEntrySize = reader->sym_entry_size(); diff --git a/trace_streamer/src/filter/native_hook_filter.h b/trace_streamer/src/filter/native_hook_filter.h index 149299d2619150662aa8decb16ecebc31dcf4d10..a1921b8459b425f65ce0a1185ca17f07b1e7aca4 100644 --- a/trace_streamer/src/filter/native_hook_filter.h +++ b/trace_streamer/src/filter/native_hook_filter.h @@ -113,7 +113,7 @@ private: void UpdateSymbolTablePtrAndStValueToSymAddrMap(T* firstSymbolAddr, const int size, std::shared_ptr reader); - void FillOfflineSymbolizationFrames(std::map>>::iterator itor); + void FillOfflineSymbolizationFrames(std::map>>::iterator itor); void ReparseStacksWithAddrRange(uint64_t start, uint64_t end); void ReparseStacksWithDifferentMeans(); void CompressStackAndFrames(uint64_t row, ProtoReader::RepeatedDataAreaIterator frames); @@ -129,14 +129,14 @@ private: private: std::multimap> tsToMainEventsMap_ = {}; - std::map>> reparseStackIdToFramesMap_ = {}; - std::map>> allStackIdToFramesMap_ = {}; - std::map>> stackIdToFramesMap_ = {}; + std::map>> reparseStackIdToFramesMap_ = {}; + std::map>> allStackIdToFramesMap_ = {}; + std::map>> stackIdToFramesMap_ = {}; std::map callChainIdToStackHashValueMap_ = {}; DoubleMap> ipidToFrameIdToFrameBytes_; std::unordered_map> stackHashValueToFramesHashMap_ = {}; std::unordered_map> frameHashToFrameInfoMap_ = {}; - std::unordered_map threadNameIdToThreadNameIndex_ = {}; + std::unordered_map threadNameIdToThreadNameIndex_ = {}; std::unordered_map> callIdToLastCallerPathIndex_ = {}; std::unordered_map functionNameIndexToVaddr_ = {}; DoubleMap ipidToSymIdToSymIndex_; @@ -161,11 +161,9 @@ private: bool isStringCompressedMode_ = false; bool isStatisticMode_ = false; const size_t MAX_CACHE_SIZE = 200000; - const uint32_t SINGLE_PROC_IPID = 0; uint32_t callChainId_ = 0; CommHookData commHookData_; std::unique_ptr hookPluginData_ = nullptr; - bool isSingleProcData_ = true; }; } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/filter/offline_symbolization_filter.cpp b/trace_streamer/src/filter/offline_symbolization_filter.cpp index 13310762c85147e087338166c962ddf6489833a2..4a5cbc0fe9f5fdb6aeac0646b314f31298222b24 100644 --- a/trace_streamer/src/filter/offline_symbolization_filter.cpp +++ b/trace_streamer/src/filter/offline_symbolization_filter.cpp @@ -23,7 +23,8 @@ OfflineSymbolizationFilter::OfflineSymbolizationFilter(TraceDataCache* dataCache filePathIdAndStValueToSymAddr_(nullptr), symbolTablePtrAndStValueToSymAddr_(nullptr), ipidToStartAddrToMapsInfoMap_(nullptr), - ipidToIpToFrameInfo_(nullptr) + ipidToIpToFrameInfo_(nullptr), + ipidTofilePathIdToSymbolTableMap_(nullptr) { } std::shared_ptr>> OfflineSymbolizationFilter::OfflineSymbolization( @@ -88,6 +89,9 @@ bool OfflineSymbolizationFilter::FillFrameInfo(const std::shared_ptr& std::shared_ptr OfflineSymbolizationFilter::OfflineSymbolizationByIp(uint64_t ipid, uint64_t ip) { + if (isSingleProcData_) { + ipid = SINGLE_PROC_IPID; + } auto frameInfoPtr = ipidToIpToFrameInfo_.Find(ipid, ip); if (frameInfoPtr != nullptr) { return frameInfoPtr; @@ -100,16 +104,14 @@ std::shared_ptr OfflineSymbolizationFilter::OfflineSymbolizationByIp( return nullptr; } // find SymbolTable by filePathId - auto ipidWithPathIdIndex = - traceDataCache_->GetDataIndex(std::to_string(ipid) + "_" + std::to_string(frameInfo->filePathId_)); - auto itor = filePathIdToSymbolTableMap_.find(ipidWithPathIdIndex); - if (itor == filePathIdToSymbolTableMap_.end()) { + auto symbolTable = ipidTofilePathIdToSymbolTableMap_.Find(ipid, frameInfo->filePathId_); + if (symbolTable == nullptr) { // find matching SymbolTable failed, but filePathId is availiable ipidToIpToFrameInfo_.Insert(ipid, ip, frameInfo); - TS_LOGD("find matching filePathId failed, ip = %lu, filePathId = %u", ip, frameInfo->filePathId_); + TS_LOGD("find matching filePathId failed, ipid = %" PRIu64 ", ip = %lu, filePathId = %u", ipid, ip, + frameInfo->filePathId_); return frameInfo; } - auto symbolTable = itor->second; // calculate symVaddr = ip - vmStart + vmOffset + phdrVaddr - phdrOffset uint64_t symVaddr = ip - vmStart + vmOffset + symbolTable->text_exec_vaddr() - symbolTable->text_exec_vaddr_file_offset(); @@ -145,7 +147,7 @@ std::shared_ptr OfflineSymbolizationFilter::OfflineSymbolizationByIp( frameInfo->offset_ = ip; frameInfo->symbolOffset_ = 0; ipidToIpToFrameInfo_.Insert(ipid, ip, frameInfo); - TS_LOGD("symbolStart is %lu invaliable!!!", symbolStart); + TS_LOGD("symbolStart is %u invaliable!!!", symbolStart); return frameInfo; } diff --git a/trace_streamer/src/filter/offline_symbolization_filter.h b/trace_streamer/src/filter/offline_symbolization_filter.h index 1d744e5fdeee8b97eae26dc39fbea5063f46cf30..0cf5803a59e85d71cd712108c593daa5f51b6cc7 100644 --- a/trace_streamer/src/filter/offline_symbolization_filter.h +++ b/trace_streamer/src/filter/offline_symbolization_filter.h @@ -68,8 +68,10 @@ protected: enum SYSTEM_ENTRY_VALUE { ELF32_SYM = 16, ELF64_SYM = 24 }; using StartAddrToMapsInfoType = std::map>; // first is ipid, second is startAddr, third is MapsInfo ptr - DoubleMap> ipidToStartAddrToMapsInfoMap_; - std::unordered_map> filePathIdToSymbolTableMap_ = {}; + DoubleMap> + ipidToStartAddrToMapsInfoMap_; + DoubleMap> + ipidTofilePathIdToSymbolTableMap_; std::unordered_map> filePathIdToImportSymbolTableMap_ = {}; DoubleMap filePathIdAndStValueToSymAddr_; DoubleMap, uint64_t, const uint8_t*> @@ -91,6 +93,10 @@ private: uint64_t& vmStart, uint64_t& vmOffset, uint64_t ipid); + +protected: + const uint32_t SINGLE_PROC_IPID = 0; + bool isSingleProcData_ = true; }; } // namespace TraceStreamer diff --git a/trace_streamer/src/parser/hiperf_parser/perf_data_parser.cpp b/trace_streamer/src/parser/hiperf_parser/perf_data_parser.cpp index abf9379312abac01c780087944d1bb7cb617b61d..8f313becf7b91b1d18add79fb896b43de54e7d14 100644 --- a/trace_streamer/src/parser/hiperf_parser/perf_data_parser.cpp +++ b/trace_streamer/src/parser/hiperf_parser/perf_data_parser.cpp @@ -382,7 +382,10 @@ bool PerfDataParser::SplitPerfWaitForFinish(const std::deque& dequeBuff PerfDataParser::~PerfDataParser() { - (void)remove(tmpPerfData_.c_str()); + recordDataReader_.reset(); + if (remove(tmpPerfData_.c_str()) == -1) { + TS_LOGE("remove %s err:%s\n", tmpPerfData_.c_str(), strerror(errno)); + } TS_LOGI("perf data ts MIN:%llu, MAX:%llu", static_cast(GetPluginStartTime()), static_cast(GetPluginEndTime())); } diff --git a/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto b/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto index 728749267641457c0374da210ad842a82cb70a26..4307f597e52e11c43a41b4bc4c975e09da282e8a 100755 --- a/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto +++ b/trace_streamer/src/protos/types/plugins/native_hook/native_hook_config.proto @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Huawei Device Co., Ltd. +// Copyright (c) 2021-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 @@ -42,5 +42,8 @@ message NativeHookConfig { // Configure zero to disable the data statistics function, // greater than zero reports statistical data according to the configured numeric interval uint32 statistics_interval = 22; + string clock = 23; + uint32 sample_interval = 24; + bool response_library_mode = 25; repeated int32 expand_pids = 26; } diff --git a/trace_streamer/src/rpc/rpc_server.cpp b/trace_streamer/src/rpc/rpc_server.cpp index abbc4051006e30318c39a5ad62296872f0e83853..46601265c738b72953b5ad41896fbbde3e2764c2 100644 --- a/trace_streamer/src/rpc/rpc_server.cpp +++ b/trace_streamer/src/rpc/rpc_server.cpp @@ -68,7 +68,7 @@ bool RpcServer::ParseData(const uint8_t* data, size_t len, ResultCallBack result size_t parseSize = std::min(len, blockSize); std::unique_ptr buf = std::make_unique(parseSize); std::copy(data, data + parseSize, buf.get()); - if (!ts_->ParseTraceDataSegment(std::move(buf), parseSize, false, isFinish)) { + if (!ts_->ParseTraceDataSegment(std::move(buf), parseSize, false, isFinish && (len <= blockSize))) { if (resultCallBack) { resultCallBack("formaterror\r\n", SEND_FINISH); } diff --git a/trace_streamer/src/rpc/wasm_func.cpp b/trace_streamer/src/rpc/wasm_func.cpp index 344763020b7e56d106778d55b1a29fba235daeb5..f20a0b25fcac43d648b55e58ab3bbadc1c8e3916 100644 --- a/trace_streamer/src/rpc/wasm_func.cpp +++ b/trace_streamer/src/rpc/wasm_func.cpp @@ -198,7 +198,7 @@ EMSCRIPTEN_KEEPALIVE int32_t TraceStreamerParseData(const uint8_t* data, int32_t // return 0 while ok, -1 while failed EMSCRIPTEN_KEEPALIVE int32_t TraceStreamerParseDataEx(int32_t dataLen, bool isFinish) { - if (g_wasmTraceStreamer.ParseData(g_reqBuf, dataLen, nullptr, false)) { + if (g_wasmTraceStreamer.ParseData(g_reqBuf, dataLen, nullptr, isFinish)) { return 0; } return -1; diff --git a/trace_streamer/src/table/base/span_join.cpp b/trace_streamer/src/table/base/span_join.cpp index 1014af7b712e614aa9e64cb9c48db4caf43a27e8..934feb39d90d4cc22d2fa691dfc56f28e0ac6f4b 100644 --- a/trace_streamer/src/table/base/span_join.cpp +++ b/trace_streamer/src/table/base/span_join.cpp @@ -150,7 +150,7 @@ void SpanJoin::GetColumns(const TraceDataCache* dataCache, { char sql[MAXSIZE]; std::string querySql = "SELECT name, type from PRAGMA_table_info(\"%s\")"; - int32_t n = snprintf_s(sql, sizeof(sql), 1, querySql.c_str(), tableName.c_str()); + int32_t n = snprintf_s(sql, sizeof(sql), sizeof(sql), querySql.c_str(), tableName.c_str()); sqlite3_stmt* stmt = nullptr; int32_t ret = sqlite3_prepare_v2(dataCache->db_, sql, n, &stmt, nullptr); while (!ret) { diff --git a/trace_streamer/src/table/hi_sysevent/sysevent_subkey_table.cpp b/trace_streamer/src/table/hi_sysevent/sysevent_subkey_table.cpp index 47fab9223a7d47e04dbfdaac52cc4e3472fe8f88..63e58c88dca3d98804f6f47989a0540a207247dc 100644 --- a/trace_streamer/src/table/hi_sysevent/sysevent_subkey_table.cpp +++ b/trace_streamer/src/table/hi_sysevent/sysevent_subkey_table.cpp @@ -17,11 +17,10 @@ namespace SysTuning { namespace TraceStreamer { -enum class Index : int32_t { ID = 0, FLAG, APP_NAME, APP_KEY }; +enum class Index : int32_t { ID = 0, APP_NAME, APP_KEY }; SysEventSubkeyTable::SysEventSubkeyTable(const TraceDataCache* dataCache) : TableBase(dataCache) { tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER")); - tableColumn_.push_back(TableBase::ColumnInfo("flag", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("app_name", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("app_key", "INTEGER")); tablePriKey_.push_back("id"); @@ -48,9 +47,6 @@ int32_t SysEventSubkeyTable::Cursor::Column(int32_t column) const case Index::ID: sqlite3_result_int64(context_, sysEventSubkeys_.IdsData()[CurrentRow()]); break; - case Index::FLAG: - sqlite3_result_int(context_, sysEventSubkeys_.Falgs()[CurrentRow()]); - break; case Index::APP_NAME: sqlite3_result_int64(context_, sysEventSubkeys_.SysEventNameId()[CurrentRow()]); break; diff --git a/trace_streamer/src/trace_data/trace_stdtype.cpp b/trace_streamer/src/trace_data/trace_stdtype.cpp index 7d8abe64af963381599841429fe5ec54555927da..034696740d244ba286dd3016ff63faebf2e0f471 100644 --- a/trace_streamer/src/trace_data/trace_stdtype.cpp +++ b/trace_streamer/src/trace_data/trace_stdtype.cpp @@ -1812,18 +1812,13 @@ const std::deque& EbpfElfSymbol::StSizes() const return stSizes_; } #endif -uint32_t HiSysEventSubkeys::AppendSysEventSubkey(uint8_t flags, DataIndex eventSource, DataIndex appName) +uint32_t HiSysEventSubkeys::AppendSysEventSubkey(DataIndex eventSource, DataIndex appName) { - flags_.push_back(flags); - sysEventNameIds_.push_back(eventSource); - subkeyNameIds_.push_back(appName); - ids_.push_back(subkeyNameIds_.size() - 1); + sysEventNameIds_.emplace_back(eventSource); + subkeyNameIds_.emplace_back(appName); + ids_.emplace_back(subkeyNameIds_.size() - 1); return Size() - 1; } -const std::deque& HiSysEventSubkeys::Falgs() const -{ - return flags_; -} const std::deque& HiSysEventSubkeys::SysEventNameId() const { return sysEventNameIds_; @@ -1848,7 +1843,7 @@ void HiSysEventMeasureData::AppendData(uint64_t serial, types_.emplace_back(type); numValues_.emplace_back(numericValue); stringValues_.emplace_back(stringValue); - ids_.push_back(rowCount_); + ids_.emplace_back(rowCount_); rowCount_++; } const std::deque& HiSysEventMeasureData::Serial() const @@ -1920,7 +1915,7 @@ void HiSysEventDeviceStateData::AppendNewData(int32_t brightness, accessibilitys_.emplace_back(accessibility); recordings_.emplace_back(recording); streamAlls_.emplace_back(streamAll); - ids_.push_back(rowCounts_); + ids_.emplace_back(rowCounts_); rowCounts_++; } const std::deque& HiSysEventDeviceStateData::Brightness() const @@ -2008,7 +2003,7 @@ void TraceConfig::AppendNewData(std::string traceSource, std::string key, std::s traceSource_.emplace_back(traceSource); key_.emplace_back(key); value_.emplace_back(value); - ids_.push_back(rowCounts_); + ids_.emplace_back(rowCounts_); rowCounts_++; } const std::deque& TraceConfig::TraceSource() const @@ -2146,7 +2141,7 @@ void SmapsData::AppendNewData(uint64_t timeStamp, swap_.emplace_back(swap); swapPss_.emplace_back(swapPss); type_.emplace_back(type); - ids_.push_back(rowCount_); + ids_.emplace_back(rowCount_); rowCount_++; } const std::deque& SmapsData::TimeStamps() const @@ -2467,8 +2462,8 @@ size_t FrameMaps::AppendNew(FrameSlice* frameSlice, uint64_t src, uint64_t dst) { timeStamps_.emplace_back(0); ids_.emplace_back(ids_.size()); - srcs_.push_back(src); - dsts_.push_back(dst); + srcs_.emplace_back(src); + dsts_.emplace_back(dst); if (frameSlice->Types().at(dst) == FrameSlice::EXPECT_SLICE) { uint64_t expRsStartTime = frameSlice->TimeStampData().at(dst); uint64_t expUiEndTime = frameSlice->TimeStampData().at(src) + frameSlice->Durs().at(src); @@ -3418,7 +3413,7 @@ void AshMemData::AppendNewData(InternalPid ipid, refCounts_.emplace_back(refCount); purgeds_.emplace_back(purged); flags_.emplace_back(flag); - ids_.push_back(rowCount_); + ids_.emplace_back(rowCount_); rowCount_++; } void AshMemData::SetFlag(uint64_t rowId, uint32_t flag) @@ -3491,7 +3486,7 @@ void DmaMemData::AppendNewData(InternalPid ipid, bufNameIds_.emplace_back(bufNameId); expNameIds_.emplace_back(expNameId); flags_.emplace_back(flag); - ids_.push_back(rowCount_); + ids_.emplace_back(rowCount_); rowCount_++; } void DmaMemData::SetFlag(uint64_t rowId, uint32_t flag) @@ -3550,7 +3545,7 @@ void GpuProcessMemData::AppendNewData(uint64_t ts, ipids_.emplace_back(ipid); itids_.emplace_back(itid); usedGpuSizes_.emplace_back(usedGpuSize); - ids_.push_back(rowCount_); + ids_.emplace_back(rowCount_); rowCount_++; } const std::deque& GpuProcessMemData::GpuNameIds() const @@ -3596,7 +3591,7 @@ void GpuWindowMemData::AppendNewData(uint64_t ts, counts_.emplace_back(count); purgeableSizes_.emplace_back(purgeableSize); ipids_.emplace_back(INVALID_IPID); - ids_.push_back(rowCount_); + ids_.emplace_back(rowCount_); rowCount_++; } const std::deque& GpuWindowMemData::WindowNameIds() const diff --git a/trace_streamer/src/trace_data/trace_stdtype.h b/trace_streamer/src/trace_data/trace_stdtype.h index ec941dd7002de2a09075e8f2407de1b12df95135..c54894ca79ddc4f99a2f3840854a6cb7873e2324 100644 --- a/trace_streamer/src/trace_data/trace_stdtype.h +++ b/trace_streamer/src/trace_data/trace_stdtype.h @@ -1549,20 +1549,17 @@ private: #endif class HiSysEventSubkeys : public CacheBase { public: - uint32_t AppendSysEventSubkey(uint8_t flags, DataIndex eventSource, DataIndex appName); - const std::deque& Falgs() const; + uint32_t AppendSysEventSubkey(DataIndex eventSource, DataIndex appName); const std::deque& SysEventNameId() const; const std::deque& SysEventSubkeyId() const; void Clear() override { CacheBase::Clear(); - flags_.clear(); sysEventNameIds_.clear(); subkeyNameIds_.clear(); } private: - std::deque flags_ = {}; std::deque sysEventNameIds_ = {}; std::deque subkeyNameIds_ = {}; }; diff --git a/trace_streamer/src/version.cpp b/trace_streamer/src/version.cpp index cdbb64503f9ab3930e20598191853793db1f7148..19c4d8392a04722548dd170718ae93f8e339e187 100644 --- a/trace_streamer/src/version.cpp +++ b/trace_streamer/src/version.cpp @@ -15,5 +15,5 @@ #include "version.h" size_t g_loadSize = 0; size_t g_fileSize = 0; -const std::string g_traceStreamerVersion = "3.5.4"; // version -const std::string g_traceStreamerPublishVersion = "2023/11/06"; // publish datetime +const std::string g_traceStreamerVersion = "3.5.6"; // version +const std::string g_traceStreamerPublishVersion = "2023/11/13"; // publish datetime diff --git a/trace_streamer/test/BUILD.gn b/trace_streamer/test/BUILD.gn index 21380b4c78f543bc8a172b3c5f1c4b132a4791fe..4edf49e5aa19d4f986707298e75fbde08b302554 100644 --- a/trace_streamer/test/BUILD.gn +++ b/trace_streamer/test/BUILD.gn @@ -29,6 +29,7 @@ if (is_test) { "unittest/ebpf_file_system_test.cpp", "unittest/ebpf_parser_test.cpp", "unittest/event_parser_test.cpp", + "unittest/export_test.cpp", # Don't comment, for common method "unittest/filter_filter_test.cpp", "unittest/frame_filter_test.cpp", "unittest/ftrace_field_processor_test.cpp", @@ -139,6 +140,17 @@ if (is_test) { "${SRC}/parser/rawtrace_parser", ] + include_dirs += [ + "${THIRD_PARTY}/perf_include/hiviewdfx/hilog/include", + "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/common/cutil", + "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/common/dfxlog", + "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/common/dfxutil", + "${THIRD_PARTY}/perf_include/hiviewdfx/hilog/include", + "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/common", + "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/nonlinux", + "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include", + ] + cflags = [ "-Wno-inconsistent-missing-override", "-Dprivate=public", #allow test code access private members diff --git a/trace_streamer/test/resource/callstack_compression.htrace b/trace_streamer/test/resource/callstack_compression.htrace new file mode 100644 index 0000000000000000000000000000000000000000..c25f656af8eb0c2f29d12023b33ef9d613eead91 Binary files /dev/null and b/trace_streamer/test/resource/callstack_compression.htrace differ diff --git a/trace_streamer/test/resource/offline_symbolization_statistical_data.htrace b/trace_streamer/test/resource/offline_symbolization_statistical_data.htrace new file mode 100644 index 0000000000000000000000000000000000000000..f9258924611537227f7e8e4564d02200971fc783 Binary files /dev/null and b/trace_streamer/test/resource/offline_symbolization_statistical_data.htrace differ diff --git a/trace_streamer/test/unittest/app_start_filter_test.cpp b/trace_streamer/test/unittest/app_start_filter_test.cpp index 6982349847b6cb716448563c759be449327e4892..9cc535937a276ebab8519fb4feec22246ffed16a 100644 --- a/trace_streamer/test/unittest/app_start_filter_test.cpp +++ b/trace_streamer/test/unittest/app_start_filter_test.cpp @@ -17,6 +17,7 @@ #include #include "app_start_filter.h" +#include "parser/bytrace_parser/bytrace_parser.h" #include "slice_filter.h" #include "trace_streamer_selector.h" @@ -37,42 +38,58 @@ public: }; /** - * @tc.name: ProcessCreateTest - * @tc.desc: Process Create TEST + * @tc.name: ProcessAllTest + * @tc.desc: Process All TEST, for ProcessTouchEvent、StartUIAbilityBySCB、LoadAbility etc. * @tc.type: FUNC */ -HWTEST_F(AppStartFilterTest, ProcessCreateTest, TestSize.Level1) +HWTEST_F(AppStartFilterTest, ProcessAllTest, TestSize.Level1) { TS_LOGI("test40-1"); - - const std::string parent_str = - "H:virtual int OHOS::AAFwk::AbilityManagerService::StartAbility(" - "const OHOS::AAFwk::Want &, const sptr &, int32_t, int)"; - const std::string process_create_str = - "H:int OHOS::AAFwk::MissionListManager::StartAbilityLocked(" - "const std::shared_ptr &, const std::shared_ptr &, " - "const OHOS::AAFwk::AbilityRequest &)##com.ohos.smartperf##MainAbility"; - uint64_t ts1 = 168758662957000; - uint64_t ts2 = 168758663011000; - uint64_t ts3 = 168758663057000; - uint64_t ts4 = 168758663111000; - uint32_t pid1 = 1655; - uint32_t threadGroupId1 = 1127; - DataIndex cat = stream_.traceDataCache_->GetDataIndex("Catalog"); - DataIndex parent_splitStrIndex = stream_.traceDataCache_->GetDataIndex(parent_str.c_str()); - DataIndex splitStrIndex = stream_.traceDataCache_->GetDataIndex(process_create_str.c_str()); - - stream_.streamFilters_->sliceFilter_->BeginSlice("comm", ts1, pid1, threadGroupId1, cat, parent_splitStrIndex); - stream_.streamFilters_->sliceFilter_->BeginSlice("comm", ts2, pid1, threadGroupId1, cat, splitStrIndex); - stream_.streamFilters_->sliceFilter_->EndSlice(ts3, pid1, threadGroupId1); - stream_.streamFilters_->sliceFilter_->EndSlice(ts4, pid1, threadGroupId1); - + std::vector processTouchEventVec = { + "ohos.sceneboard-2037 ( 2037) [002] .... 233.207960: print: B|2037|H:client dispatch touchId:850", + "ohos.sceneboard-2037 ( 2037) [004] .... 233.225036: print: B|2037|H:client dispatch touchId:851", + "ohos.sceneboard-2037 ( 2037) [004] .... 233.225153: print: B|2037|H:client dispatch touchId:852", + "ohos.sceneboard-2037 ( 2037) [004] .... 233.225203: print: B|2037|H:client dispatch touchId:853", + }; + std::vector startUIAbilityBySCBVec = { + "SceneSessionMan-2396 ( 2037) [005] .... 233.273283: print: B|2037|H:OHOS::ErrCode " + "OHOS::AAFwk::AbilityManagerClient::StartUIAbilityBySCB(sptr) ", + }; + std::vector loadAbilityVec = { + "ffrtwk/CPU-2-17-4540 ( 1093) [006] .... 233.279339: print: B|1093|H:virtual void " + "OHOS::AppExecFwk::AppMgrServiceInner::LoadAbility(const sptr &, const " + "sptr &, const std::shared_ptr &, const std::shared_ptr &, " + "const std::shared_ptr &)"}; + std::string appLaunchStr( + "ffrtwk/CPU-2-16-4537 ( 1093) [007] .... 233.300562: print: B|1093|H:virtual void " + "OHOS::AppExecFwk::AppMgrServiceInner::AttachApplication(const pid_t, const " + "sptr &)##com.taobao.taobao"); + std::string uiLaunchStr( + "m.taobao.taobao-4794 ( 4794) [007] .... 233.309669: print: B|4794|H:void " + "OHOS::AppExecFwk::MainThread::HandleLaunchAbility(const std::shared_ptr " + "&)##com.taobao.taobao"); + std::string uiOnForegroundStr( + "m.taobao.taobao-4794 ( 4794) [007] .... 233.330670: print: B|4794|H:void " + "OHOS::AbilityRuntime::FAAbilityThread::HandleAbilityTransaction(const OHOS::AbilityRuntime::Want &, const " + "OHOS::AbilityRuntime::LifeCycleStateInfo &, sptr)##EntryAbility"); + BytraceParser bytraceParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + for (auto&& str : processTouchEventVec) { + bytraceParser.ParseTraceDataItem(str); + } + for (auto&& str : startUIAbilityBySCBVec) { + bytraceParser.ParseTraceDataItem(str); + } + for (auto&& str : loadAbilityVec) { + bytraceParser.ParseTraceDataItem(str); + } + bytraceParser.ParseTraceDataItem(appLaunchStr); + bytraceParser.ParseTraceDataItem(uiLaunchStr); + bytraceParser.ParseTraceDataItem(uiOnForegroundStr); + bytraceParser.WaitForParserEnd(); stream_.streamFilters_->appStartupFilter_->FilterAllAPPStartupData(); - - auto dataIndex = stream_.traceDataCache_->GetDataIndex("com.ohos.smartperf"); - EXPECT_TRUE(stream_.streamFilters_->appStartupFilter_->mAPPStartupData_.size() == 1); - EXPECT_TRUE(stream_.streamFilters_->appStartupFilter_->mAPPStartupData_.find(dataIndex) != - stream_.streamFilters_->appStartupFilter_->mAPPStartupData_.end()); + EXPECT_TRUE(stream_.streamFilters_->appStartupFilter_->procTouchItems_.size() == 0); + EXPECT_TRUE(stream_.streamFilters_->appStartupFilter_->startUIAbilityBySCBItems_.size() == 0); + EXPECT_TRUE(stream_.streamFilters_->appStartupFilter_->loadAbilityItems_.size() == 0); } /** diff --git a/trace_streamer/test/unittest/export_test.cpp b/trace_streamer/test/unittest/export_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3109a6eb533d41bc93ecf319dc78ce5cbd46a6dd --- /dev/null +++ b/trace_streamer/test/unittest/export_test.cpp @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2021 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 obts_in 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 + * limits_tions under the License. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "file.h" +#include "trace_streamer_selector.h" + +using namespace testing::ext; +using namespace SysTuning::TraceStreamer; + +namespace SysTuning { +namespace TraceStreamer { +constexpr size_t G_FILE_PERMISSION = 664; +constexpr uint8_t RAW_TRACE_PARSE_MAX = 2; +constexpr size_t G_CHUNK_SIZE = 1024 * 1024; + +class ExportTest : public ::testing::Test { +public: + void SetUp() + { + ts_.InitFilter(); + } + + void TearDown() {} + +public: + TraceStreamerSelector ts_; +}; + +bool ParseTraceFile(TraceStreamerSelector& ts_, const std::string& tracePath) +{ + int32_t fd(base::OpenFile(tracePath, O_RDONLY, G_FILE_PERMISSION)); + TS_CHECK_TRUE(fd >= 0, false, "Failed to open trace file (errno: %d, %s)", errno, strerror(errno)); + struct stat statBuff; + stat(tracePath.c_str(), &statBuff); + size_t curFileSize = statBuff.st_size; + auto isFinish = false; + size_t curLoadSize = 0; + auto curParseCnt = 1; + while (true) { + // for rawtrace next parse.the first parse is for last comm dats_; + if (isFinish && ts_.GetFileType() == TRACE_FILETYPE_RAW_TRACE && curParseCnt < RAW_TRACE_PARSE_MAX) { + ++curParseCnt; + isFinish = false; + curLoadSize = 0; + TS_CHECK_TRUE(lseek(fd, 0, SEEK_SET) != -1, false, "lseek error:%s", strerror(errno)); + } + std::unique_ptr buf = std::make_unique(G_CHUNK_SIZE); + auto rsize = read(fd, buf.get(), G_CHUNK_SIZE); + if (rsize == 0) { + break; + } + + if (rsize < 0) { + TS_LOGE("Reading trace file failed (errno: %d, %s)", errno, strerror(errno)); + return false; + } + curLoadSize += rsize; + if (curLoadSize == curFileSize) { + isFinish = true; + } + if (!ts_.ParseTraceDataSegment(std::move(buf), static_cast(rsize), false, isFinish)) { + return false; + }; + printf("\rLoadingFile:\t%.2f MB\r", static_cast(curLoadSize) / 1E6); + } + close(fd); + ts_.WaitForParserEnd(); + return true; +} + +/** + * @tc.name: ExportPerfReadableText + * @tc.desc: Export Perf Readable Text + * @tc.type: FUNC + */ +HWTEST_F(ExportTest, ExportPerfReadableText, TestSize.Level1) +{ + TS_LOGE("test44-1"); + std::string perfFilePath("../../test/resource/hiprofiler_data_perf.htrace"); + EXPECT_TRUE(ParseTraceFile(ts_, perfFilePath)); + std::string errFilePath("/err"); + std::string sucessFilePath("export_hiprofiler_data_perf.txt"); + EXPECT_EQ(ts_.ExportPerfReadableText(errFilePath), 1); + EXPECT_EQ(ts_.ExportPerfReadableText(sucessFilePath), 0); + if (access(sucessFilePath.c_str(), F_OK) == 0) { + remove(sucessFilePath.c_str()); + } +} +} // namespace TraceStreamer +} // namespace SysTuning \ No newline at end of file diff --git a/trace_streamer/test/unittest/hisys_event_parser_test.cpp b/trace_streamer/test/unittest/hisys_event_parser_test.cpp index 734be42744fc05bb5e5a13a02883a1b7ea91bbe3..e248729f2d7cd3326e0b77cae49bcbd55cb0bce2 100644 --- a/trace_streamer/test/unittest/hisys_event_parser_test.cpp +++ b/trace_streamer/test/unittest/hisys_event_parser_test.cpp @@ -62,19 +62,19 @@ HWTEST_F(HtraceHisysEventParserTest, ParseNoArray, TestSize.Level1) std::stringstream ss; ss << jsMessage; ss >> jMessage; - HtraceHisyseventParser HisysEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + HtraceHisyseventParser hisysEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); (void)stream_.streamFilters_->hiSysEventMeasureFilter_->JGetData(jMessage, jData, maxArraySize, noArrayIndex, arrayIndex); - EXPECT_TRUE(jData.eventSource == "POWER_IDE_BATTERY"); - EXPECT_EQ(jData.timeStamp, 22611696002); + EXPECT_TRUE(jData.eventName == "POWER_IDE_BATTERY"); + EXPECT_EQ(jData.timeStamp, 22611696002000000); EXPECT_EQ(maxArraySize, 0); EXPECT_EQ(noArrayIndex.size(), 17); EXPECT_EQ(arrayIndex.size(), 0); - DataIndex eventSourceIndex = stream_.traceDataCache_->GetDataIndex(jData.eventSource); - HisysEvent.CommonDataParser(jData, eventSourceIndex, serial); - auto size = stream_.traceDataCache_->GetConstSyseventMeasureData().Size(); + DataIndex eventSourceIndex = stream_.traceDataCache_->GetDataIndex(jData.eventName); + (void)stream_.streamFilters_->hiSysEventMeasureFilter_->CommonDataParser(jData, eventSourceIndex, serial); + auto size = stream_.traceDataCache_->GetConstHiSyseventMeasureData().Size(); EXPECT_EQ(size, 17); - auto anticipate = stream_.traceDataCache_->GetConstSyseventMeasureData().Serial()[0]; + auto anticipate = stream_.traceDataCache_->GetConstHiSyseventMeasureData().Serial()[0]; EXPECT_EQ(anticipate, serial); EXPECT_TRUE(base::num0 == "15"); EXPECT_TRUE(base::num1 == "f"); @@ -104,20 +104,22 @@ HWTEST_F(HtraceHisysEventParserTest, ParseHaveArrayData, TestSize.Level1) std::stringstream ss; ss << jsMessage; ss >> jMessage; - HtraceHisyseventParser HisysEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + HtraceHisyseventParser hisysEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); (void)stream_.streamFilters_->hiSysEventMeasureFilter_->JGetData(jMessage, jData, maxArraySize, noArrayIndex, arrayIndex); - EXPECT_TRUE(jData.eventSource == "POWER_IDE_WIFISCAN"); - EXPECT_EQ(jData.timeStamp, 16611696002); + EXPECT_TRUE(jData.eventName == "POWER_IDE_WIFISCAN"); + EXPECT_EQ(jData.timeStamp, 16611696002000000); EXPECT_EQ(maxArraySize, 3); EXPECT_EQ(noArrayIndex.size(), 12); EXPECT_EQ(arrayIndex.size(), 9); - DataIndex eventSourceIndex = stream_.traceDataCache_->GetDataIndex(jData.eventSource); - HisysEvent.NoArrayDataParse(jData, noArrayIndex, eventSourceIndex, serial); - HisysEvent.ArrayDataParse(jData, arrayIndex, eventSourceIndex, maxArraySize, serial); - auto size = stream_.traceDataCache_->GetConstSyseventMeasureData().Size(); + DataIndex eventSourceIndex = stream_.traceDataCache_->GetDataIndex(jData.eventName); + (void)stream_.streamFilters_->hiSysEventMeasureFilter_->NoArrayDataParse(jData, noArrayIndex, eventSourceIndex, + serial); + (void)stream_.streamFilters_->hiSysEventMeasureFilter_->ArrayDataParse(jData, arrayIndex, eventSourceIndex, + maxArraySize, serial); + auto size = stream_.traceDataCache_->GetConstHiSyseventMeasureData().Size(); EXPECT_EQ(size, (9 * 3 + 12)); - auto anticipate = stream_.traceDataCache_->GetConstSyseventMeasureData().Serial()[0]; + auto anticipate = stream_.traceDataCache_->GetConstHiSyseventMeasureData().Serial()[0]; EXPECT_EQ(anticipate, serial); } /** @@ -154,33 +156,35 @@ HWTEST_F(HtraceHisysEventParserTest, MixedDataAnalysis, TestSize.Level1) std::stringstream ss; ss << *i; ss >> jMessage; - HtraceHisyseventParser HisysEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + HtraceHisyseventParser hisysEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); (void)stream_.streamFilters_->hiSysEventMeasureFilter_->JGetData(jMessage, jData, maxArraySize, noArrayIndex, arrayIndex); - if (jData.eventSource == "POWER_IDE_WIFISCAN") { - EXPECT_TRUE(jData.eventSource == "POWER_IDE_WIFISCAN"); - EXPECT_EQ(jData.timeStamp, 16611696002); + if (jData.eventName == "POWER_IDE_WIFISCAN") { + EXPECT_TRUE(jData.eventName == "POWER_IDE_WIFISCAN"); + EXPECT_EQ(jData.timeStamp, 16611696002000000); EXPECT_EQ(maxArraySize, 3); EXPECT_EQ(noArrayIndex.size(), 12); EXPECT_EQ(arrayIndex.size(), 9); } else { - EXPECT_TRUE(jData.eventSource == "POWER_IDE_BATTERY"); - EXPECT_EQ(jData.timeStamp, 22611696002); + EXPECT_TRUE(jData.eventName == "POWER_IDE_BATTERY"); + EXPECT_EQ(jData.timeStamp, 22611696002000000); EXPECT_EQ(maxArraySize, 0); EXPECT_EQ(noArrayIndex.size(), 17); EXPECT_EQ(arrayIndex.size(), 0); } - DataIndex eventSourceIndex = stream_.traceDataCache_->GetDataIndex(jData.eventSource); + DataIndex eventSourceIndex = stream_.traceDataCache_->GetDataIndex(jData.eventName); if (maxArraySize) { - HisysEvent.NoArrayDataParse(jData, noArrayIndex, eventSourceIndex, serial); - HisysEvent.ArrayDataParse(jData, arrayIndex, eventSourceIndex, maxArraySize, serial); + (void)stream_.streamFilters_->hiSysEventMeasureFilter_->NoArrayDataParse(jData, noArrayIndex, + eventSourceIndex, serial); + (void)stream_.streamFilters_->hiSysEventMeasureFilter_->ArrayDataParse(jData, arrayIndex, eventSourceIndex, + maxArraySize, serial); } else { - HisysEvent.CommonDataParser(jData, eventSourceIndex, serial); + (void)stream_.streamFilters_->hiSysEventMeasureFilter_->CommonDataParser(jData, eventSourceIndex, serial); } } - auto size = stream_.traceDataCache_->GetConstSyseventMeasureData().Size(); + auto size = stream_.traceDataCache_->GetConstHiSyseventMeasureData().Size(); EXPECT_EQ(size, 17 + (9 * 3 + 12)); - auto anticipate = stream_.traceDataCache_->GetConstSyseventMeasureData().Serial()[0]; + auto anticipate = stream_.traceDataCache_->GetConstHiSyseventMeasureData().Serial()[0]; EXPECT_EQ(anticipate, serial); } } // namespace TraceStreamer diff --git a/trace_streamer/test/unittest/http_server_test.cpp b/trace_streamer/test/unittest/http_server_test.cpp index 699a0503eaa7e35e126cd1e88cd7b8cfa8253bc9..720437978f8fbc1be97d166584bc7b1c21b10bfe 100644 --- a/trace_streamer/test/unittest/http_server_test.cpp +++ b/trace_streamer/test/unittest/http_server_test.cpp @@ -88,8 +88,8 @@ int32_t HttpClient(const char* buf) return -1; } - if (!memset_s(g_clientRecvBuf, strlen(g_clientRecvBuf), 0, strlen(g_clientRecvBuf))) { - TS_LOGE("memset_s error"); + if (memset_s(g_clientRecvBuf, strlen(g_clientRecvBuf), 0, strlen(g_clientRecvBuf)) != 0) { + TS_LOGE("memset_s error:%s", strerror(errno)); return -1; } int32_t index = 0; diff --git a/trace_streamer/test/unittest/native_hook_parser_test.cpp b/trace_streamer/test/unittest/native_hook_parser_test.cpp index ed38ad0109eedd69a2967d767f11762677d32206..856c6cdf649a831815e38737225ec862ec28ce4b 100644 --- a/trace_streamer/test/unittest/native_hook_parser_test.cpp +++ b/trace_streamer/test/unittest/native_hook_parser_test.cpp @@ -18,6 +18,7 @@ #include #include +#include "file.h" #include "htrace_native_hook_parser.h" #include "native_hook_result.pb.h" #include "native_hook_result.pbreader.h" @@ -30,6 +31,7 @@ using namespace SysTuning::TraceStreamer; namespace SysTuning { namespace TraceStreamer { +extern bool ParseTraceFile(TraceStreamerSelector& ts_, const std::string& tracePath); const uint64_t TV_SEC_01 = 1632675525; const uint64_t TV_SEC_02 = 1632675526; const uint64_t TV_SEC_03 = 1632675527; @@ -383,10 +385,10 @@ private: HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOutNativeHookData, TestSize.Level1) { TS_LOGI("test24-1"); - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -421,10 +423,10 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneMalloc, TestSize.Level frame->set_symbol_offset(SYMBOL_OFFSET_01); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookData = batchNativeHookData->add_events(); + auto nativeHookData = batchNativeHookData.add_events(); nativeHookData->set_tv_sec(TV_SEC_01); nativeHookData->set_tv_nsec(TV_NSEC_01); nativeHookData->set_allocated_alloc_event(allocEvent); @@ -433,7 +435,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneMalloc, TestSize.Level HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -526,15 +528,15 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleMalloc, TestSize. secondAllocSecondFrame->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add first NativeHookData - auto firstNativeHookData = batchNativeHookData->add_events(); + auto firstNativeHookData = batchNativeHookData.add_events(); firstNativeHookData->set_tv_sec(TV_SEC_01); firstNativeHookData->set_tv_nsec(TV_NSEC_01); firstNativeHookData->set_allocated_alloc_event(firstAllocEvent); // add second NativeHookData - auto secondNativeHookData = batchNativeHookData->add_events(); + auto secondNativeHookData = batchNativeHookData.add_events(); secondNativeHookData->set_tv_sec(TV_SEC_02); secondNativeHookData->set_tv_nsec(TV_NSEC_02); secondNativeHookData->set_allocated_alloc_event(secondAllocEvent); @@ -543,7 +545,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleMalloc, TestSize. HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -636,10 +638,10 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneFree, TestSize.Level1) frame->set_symbol_offset(SYMBOL_OFFSET_01); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookData = batchNativeHookData->add_events(); + auto nativeHookData = batchNativeHookData.add_events(); nativeHookData->set_tv_sec(TV_SEC_01); nativeHookData->set_tv_nsec(TV_NSEC_01); nativeHookData->set_allocated_free_event(freeEvent); @@ -648,7 +650,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneFree, TestSize.Level1) HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -719,15 +721,15 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleFree, TestSize.Le secondFreeSecondFrame->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add first NativeHookData - auto firstNativeHookData = batchNativeHookData->add_events(); + auto firstNativeHookData = batchNativeHookData.add_events(); firstNativeHookData->set_tv_sec(TV_SEC_01); firstNativeHookData->set_tv_nsec(TV_NSEC_01); firstNativeHookData->set_allocated_free_event(firstFreeEvent); // add second NativeHookData - auto secondNativeHookData = batchNativeHookData->add_events(); + auto secondNativeHookData = batchNativeHookData.add_events(); secondNativeHookData->set_tv_sec(TV_SEC_02); secondNativeHookData->set_tv_nsec(TV_NSEC_02); secondNativeHookData->set_allocated_free_event(secondFreeEvent); @@ -736,7 +738,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleFree, TestSize.Le HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -795,14 +797,14 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOnePairsMallocAndFree, Te freeframe->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookMallocData = batchNativeHookData->add_events(); + auto nativeHookMallocData = batchNativeHookData.add_events(); nativeHookMallocData->set_tv_sec(TV_SEC_01); nativeHookMallocData->set_tv_nsec(TV_NSEC_01); nativeHookMallocData->set_allocated_alloc_event(allocEvent); - auto nativeHookFreeData = batchNativeHookData->add_events(); + auto nativeHookFreeData = batchNativeHookData.add_events(); nativeHookFreeData->set_tv_sec(TV_SEC_02); nativeHookFreeData->set_tv_nsec(TV_NSEC_02); nativeHookFreeData->set_allocated_free_event(freeEvent); @@ -811,7 +813,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOnePairsMallocAndFree, Te HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -902,14 +904,14 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithNotMatchMallocAndFree, Te freeframe->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookMallocData = batchNativeHookData->add_events(); + auto nativeHookMallocData = batchNativeHookData.add_events(); nativeHookMallocData->set_tv_sec(TV_SEC_01); nativeHookMallocData->set_tv_nsec(TV_NSEC_01); nativeHookMallocData->set_allocated_alloc_event(allocEvent); - auto nativeHookFreeData = batchNativeHookData->add_events(); + auto nativeHookFreeData = batchNativeHookData.add_events(); nativeHookFreeData->set_tv_sec(TV_SEC_02); nativeHookFreeData->set_tv_nsec(TV_NSEC_02); nativeHookFreeData->set_allocated_free_event(freeEvent); @@ -918,7 +920,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithNotMatchMallocAndFree, Te HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -990,22 +992,22 @@ HWTEST_F(NativeHookParserTest, ParseTwoMallocAndFreeEventMatched, TestSize.Level secondFreeEvent->set_addr(MEM_ADDR_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto firstMallocData = batchNativeHookData->add_events(); + auto firstMallocData = batchNativeHookData.add_events(); firstMallocData->set_tv_sec(TV_SEC_01); firstMallocData->set_tv_nsec(TV_NSEC_01); firstMallocData->set_allocated_alloc_event(firstAllocEvent); - auto firstFreeData = batchNativeHookData->add_events(); + auto firstFreeData = batchNativeHookData.add_events(); firstFreeData->set_tv_sec(TV_SEC_02); firstFreeData->set_tv_nsec(TV_NSEC_02); firstFreeData->set_allocated_free_event(firstFreeEvent); - auto secondMallocData = batchNativeHookData->add_events(); + auto secondMallocData = batchNativeHookData.add_events(); secondMallocData->set_tv_sec(TV_SEC_03); secondMallocData->set_tv_nsec(TV_NSEC_03); secondMallocData->set_allocated_alloc_event(secondAllocEvent); - auto secondFreeData = batchNativeHookData->add_events(); + auto secondFreeData = batchNativeHookData.add_events(); secondFreeData->set_tv_sec(TV_SEC_04); secondFreeData->set_tv_nsec(TV_NSEC_04); secondFreeData->set_allocated_free_event(secondFreeEvent); @@ -1014,7 +1016,7 @@ HWTEST_F(NativeHookParserTest, ParseTwoMallocAndFreeEventMatched, TestSize.Level HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1095,22 +1097,22 @@ HWTEST_F(NativeHookParserTest, ParseTwoMallocAndFreeEventPartialMatched, TestSiz secondFreeEvent->set_addr(MEM_ADDR_03); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto firstMallocData = batchNativeHookData->add_events(); + auto firstMallocData = batchNativeHookData.add_events(); firstMallocData->set_tv_sec(TV_SEC_01); firstMallocData->set_tv_nsec(TV_NSEC_01); firstMallocData->set_allocated_alloc_event(firstAllocEvent); - auto firstFreeData = batchNativeHookData->add_events(); + auto firstFreeData = batchNativeHookData.add_events(); firstFreeData->set_tv_sec(TV_SEC_02); firstFreeData->set_tv_nsec(TV_NSEC_02); firstFreeData->set_allocated_free_event(firstFreeEvent); - auto secondMallocData = batchNativeHookData->add_events(); + auto secondMallocData = batchNativeHookData.add_events(); secondMallocData->set_tv_sec(TV_SEC_03); secondMallocData->set_tv_nsec(TV_NSEC_03); secondMallocData->set_allocated_alloc_event(secondAllocEvent); - auto secondFreeData = batchNativeHookData->add_events(); + auto secondFreeData = batchNativeHookData.add_events(); secondFreeData->set_tv_sec(TV_SEC_04); secondFreeData->set_tv_nsec(TV_NSEC_04); secondFreeData->set_allocated_free_event(secondFreeEvent); @@ -1118,7 +1120,7 @@ HWTEST_F(NativeHookParserTest, ParseTwoMallocAndFreeEventPartialMatched, TestSiz // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1183,10 +1185,10 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneMmap, TestSize.Level1) frame->set_symbol_offset(SYMBOL_OFFSET_01); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookData = batchNativeHookData->add_events(); + auto nativeHookData = batchNativeHookData.add_events(); nativeHookData->set_tv_sec(TV_SEC_01); nativeHookData->set_tv_nsec(TV_NSEC_01); nativeHookData->set_allocated_mmap_event(mmapEvent); @@ -1194,7 +1196,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneMmap, TestSize.Level1) // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1257,10 +1259,10 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneMunmap, TestSize.Level frame->set_symbol_offset(SYMBOL_OFFSET_01); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookData = batchNativeHookData->add_events(); + auto nativeHookData = batchNativeHookData.add_events(); nativeHookData->set_tv_sec(TV_SEC_01); nativeHookData->set_tv_nsec(TV_NSEC_01); nativeHookData->set_allocated_munmap_event(munmapEvent); @@ -1268,7 +1270,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithOneMunmap, TestSize.Level // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1332,14 +1334,14 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleMmap, TestSize.Le secondFrame->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto firstNativeHookData = batchNativeHookData->add_events(); + auto firstNativeHookData = batchNativeHookData.add_events(); firstNativeHookData->set_tv_sec(TV_SEC_01); firstNativeHookData->set_tv_nsec(TV_NSEC_01); firstNativeHookData->set_allocated_mmap_event(firstMmapEvent); - auto secondNativeHookData = batchNativeHookData->add_events(); + auto secondNativeHookData = batchNativeHookData.add_events(); secondNativeHookData->set_tv_sec(TV_SEC_02); secondNativeHookData->set_tv_nsec(TV_NSEC_02); secondNativeHookData->set_allocated_mmap_event(secondMmapEvent); @@ -1347,7 +1349,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleMmap, TestSize.Le // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1441,14 +1443,14 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleMunmap, TestSize. secondFrame->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto firstNativeHookData = batchNativeHookData->add_events(); + auto firstNativeHookData = batchNativeHookData.add_events(); firstNativeHookData->set_tv_sec(TV_SEC_01); firstNativeHookData->set_tv_nsec(TV_NSEC_01); firstNativeHookData->set_allocated_munmap_event(firstMunmapEvent); - auto secondNativeHookData = batchNativeHookData->add_events(); + auto secondNativeHookData = batchNativeHookData.add_events(); secondNativeHookData->set_tv_sec(TV_SEC_02); secondNativeHookData->set_tv_nsec(TV_NSEC_02); secondNativeHookData->set_allocated_munmap_event(secondMunmapEvent); @@ -1456,7 +1458,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithMultipleMunmap, TestSize. // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1518,14 +1520,14 @@ HWTEST_F(NativeHookParserTest, ParseOnePairsMmapAndMunmapEvent, TestSize.Level1) munmapEvent->set_size(MEM_SIZE_01); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookMmapData = batchNativeHookData->add_events(); + auto nativeHookMmapData = batchNativeHookData.add_events(); nativeHookMmapData->set_tv_sec(TV_SEC_01); nativeHookMmapData->set_tv_nsec(TV_NSEC_01); nativeHookMmapData->set_allocated_mmap_event(mmapEvent); - auto nativeHookMunmapData = batchNativeHookData->add_events(); + auto nativeHookMunmapData = batchNativeHookData.add_events(); nativeHookMunmapData->set_tv_sec(TV_SEC_02); nativeHookMunmapData->set_tv_nsec(TV_NSEC_02); nativeHookMunmapData->set_allocated_munmap_event(munmapEvent); @@ -1533,7 +1535,7 @@ HWTEST_F(NativeHookParserTest, ParseOnePairsMmapAndMunmapEvent, TestSize.Level1) // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1626,14 +1628,14 @@ HWTEST_F(NativeHookParserTest, ParseNotMatchMmapAndMunmapEvent, TestSize.Level1) munmapEvent->set_size(MEM_SIZE_01); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookMmapData = batchNativeHookData->add_events(); + auto nativeHookMmapData = batchNativeHookData.add_events(); nativeHookMmapData->set_tv_sec(TV_SEC_01); nativeHookMmapData->set_tv_nsec(TV_NSEC_01); nativeHookMmapData->set_allocated_mmap_event(mmapEvent); - auto nativeHookMunmapData = batchNativeHookData->add_events(); + auto nativeHookMunmapData = batchNativeHookData.add_events(); nativeHookMunmapData->set_tv_sec(TV_SEC_02); nativeHookMunmapData->set_tv_nsec(TV_NSEC_02); nativeHookMunmapData->set_allocated_munmap_event(munmapEvent); @@ -1641,7 +1643,7 @@ HWTEST_F(NativeHookParserTest, ParseNotMatchMmapAndMunmapEvent, TestSize.Level1) // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1726,22 +1728,22 @@ HWTEST_F(NativeHookParserTest, ParseTwoPairsMatchedMmapAndMunmapEvent, TestSize. secondMunmapEvent->set_size(MEM_SIZE_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto firstNativeHookMmapData = batchNativeHookData->add_events(); + auto firstNativeHookMmapData = batchNativeHookData.add_events(); firstNativeHookMmapData->set_tv_sec(TV_SEC_01); firstNativeHookMmapData->set_tv_nsec(TV_NSEC_01); firstNativeHookMmapData->set_allocated_mmap_event(firstMmapEvent); - auto firstNativeHookMunmapData = batchNativeHookData->add_events(); + auto firstNativeHookMunmapData = batchNativeHookData.add_events(); firstNativeHookMunmapData->set_tv_sec(TV_SEC_02); firstNativeHookMunmapData->set_tv_nsec(TV_NSEC_02); firstNativeHookMunmapData->set_allocated_munmap_event(firstMunmapEvent); - auto secondNativeHookMmapData = batchNativeHookData->add_events(); + auto secondNativeHookMmapData = batchNativeHookData.add_events(); secondNativeHookMmapData->set_tv_sec(TV_SEC_03); secondNativeHookMmapData->set_tv_nsec(TV_NSEC_03); secondNativeHookMmapData->set_allocated_mmap_event(secondMmapEvent); - auto secondNativeHookMunmapData = batchNativeHookData->add_events(); + auto secondNativeHookMunmapData = batchNativeHookData.add_events(); secondNativeHookMunmapData->set_tv_sec(TV_SEC_04); secondNativeHookMunmapData->set_tv_nsec(TV_NSEC_04); secondNativeHookMunmapData->set_allocated_munmap_event(secondMunmapEvent); @@ -1749,7 +1751,7 @@ HWTEST_F(NativeHookParserTest, ParseTwoPairsMatchedMmapAndMunmapEvent, TestSize. // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1833,22 +1835,22 @@ HWTEST_F(NativeHookParserTest, ParsePartialMatchedMmapAndMunmapEvent, TestSize.L secondMunmapEvent->set_size(MEM_SIZE_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto firstNativeHookMmapData = batchNativeHookData->add_events(); + auto firstNativeHookMmapData = batchNativeHookData.add_events(); firstNativeHookMmapData->set_tv_sec(TV_SEC_01); firstNativeHookMmapData->set_tv_nsec(TV_NSEC_01); firstNativeHookMmapData->set_allocated_mmap_event(firstMmapEvent); - auto firstNativeHookMunmapData = batchNativeHookData->add_events(); + auto firstNativeHookMunmapData = batchNativeHookData.add_events(); firstNativeHookMunmapData->set_tv_sec(TV_SEC_02); firstNativeHookMunmapData->set_tv_nsec(TV_NSEC_02); firstNativeHookMunmapData->set_allocated_munmap_event(firstMunmapEvent); - auto secondNativeHookMmapData = batchNativeHookData->add_events(); + auto secondNativeHookMmapData = batchNativeHookData.add_events(); secondNativeHookMmapData->set_tv_sec(TV_SEC_03); secondNativeHookMmapData->set_tv_nsec(TV_NSEC_03); secondNativeHookMmapData->set_allocated_mmap_event(secondMmapEvent); - auto secondNativeHookMunmapData = batchNativeHookData->add_events(); + auto secondNativeHookMunmapData = batchNativeHookData.add_events(); secondNativeHookMunmapData->set_tv_sec(TV_SEC_04); secondNativeHookMunmapData->set_tv_nsec(TV_NSEC_04); secondNativeHookMunmapData->set_allocated_munmap_event(secondMunmapEvent); @@ -1856,7 +1858,7 @@ HWTEST_F(NativeHookParserTest, ParsePartialMatchedMmapAndMunmapEvent, TestSize.L // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -1974,22 +1976,22 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithAllTypesEvents, TestSize. freeframe->set_symbol_offset(SYMBOL_OFFSET_02); // construct BatchNativeHookData - BatchNativeHookData* batchNativeHookData = new BatchNativeHookData(); + BatchNativeHookData batchNativeHookData; // add NativeHookData - auto nativeHookMmapData = batchNativeHookData->add_events(); + auto nativeHookMmapData = batchNativeHookData.add_events(); nativeHookMmapData->set_tv_sec(TV_SEC_01); nativeHookMmapData->set_tv_nsec(TV_NSEC_01); nativeHookMmapData->set_allocated_mmap_event(mmapEvent); - auto nativeHookMunmapData = batchNativeHookData->add_events(); + auto nativeHookMunmapData = batchNativeHookData.add_events(); nativeHookMunmapData->set_tv_sec(TV_SEC_02); nativeHookMunmapData->set_tv_nsec(TV_NSEC_02); nativeHookMunmapData->set_allocated_munmap_event(munmapEvent); - auto nativeHookAllocData = batchNativeHookData->add_events(); + auto nativeHookAllocData = batchNativeHookData.add_events(); nativeHookAllocData->set_tv_sec(TV_SEC_03); nativeHookAllocData->set_tv_nsec(TV_NSEC_03); nativeHookAllocData->set_allocated_alloc_event(allocEvent); - auto nativeHookFreeData = batchNativeHookData->add_events(); + auto nativeHookFreeData = batchNativeHookData.add_events(); nativeHookFreeData->set_tv_sec(TV_SEC_04); nativeHookFreeData->set_tv_nsec(TV_NSEC_04); nativeHookFreeData->set_allocated_free_event(freeEvent); @@ -1997,7 +1999,7 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithAllTypesEvents, TestSize. // start parse HtraceNativeHookParser htraceNativeHookParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); std::string hookStrMsg = ""; - batchNativeHookData->SerializeToString(&hookStrMsg); + batchNativeHookData.SerializeToString(&hookStrMsg); HtraceDataSegment dataSeg; dataSeg.seg = std::make_shared(hookStrMsg); ProtoReader::BytesView hookBytesView(reinterpret_cast(hookStrMsg.data()), hookStrMsg.size()); @@ -2047,5 +2049,27 @@ HWTEST_F(NativeHookParserTest, ParseBatchNativeHookWithAllTypesEvents, TestSize. eventCount = stream_.traceDataCache_->GetConstStatAndInfo().GetValue(TRACE_NATIVE_HOOK_FREE, STAT_EVENT_RECEIVED); EXPECT_TRUE(1 == eventCount); } +/** + * @tc.name: ParseOfflineSymAndStatisticalData + * @tc.desc: Parse Offline Sym And Statistical Data + * @tc.type: FUNC + */ +HWTEST_F(NativeHookParserTest, ParseOfflineSymAndStatisticalData, TestSize.Level1) +{ + std::string path("../../test/resource/offline_symbolization_statistical_data.htrace"); + TS_LOGI("test24-19"); + EXPECT_TRUE(ParseTraceFile(stream_, path)); +} +/** + * @tc.name: ParseCallStackCompressionData + * @tc.desc: Parse CallStack Compression Data + * @tc.type: FUNC + */ +HWTEST_F(NativeHookParserTest, ParseCallStackCompressionData, TestSize.Level1) +{ + std::string path("../../test/resource/callstack_compression.htrace"); + TS_LOGI("test24-20"); + EXPECT_TRUE(ParseTraceFile(stream_, path)); +} } // namespace TraceStreamer } // namespace SysTuning \ No newline at end of file diff --git a/trace_streamer/test/unittest/rawtrace_parser_test.cpp b/trace_streamer/test/unittest/rawtrace_parser_test.cpp index 48b67708c166f4d1a31bc824419af5dba7141aee..a1c247a0b785e569ba39a0240f1b79728ea657dc 100644 --- a/trace_streamer/test/unittest/rawtrace_parser_test.cpp +++ b/trace_streamer/test/unittest/rawtrace_parser_test.cpp @@ -32,6 +32,8 @@ using namespace SysTuning::base; namespace SysTuning { namespace TraceStreamer { +extern bool ParseTraceFile(TraceStreamerSelector& ts_, const std::string& tracePath); + constexpr uint64_t PRINTK_VALID_ADDR = 0xffffffc011bdd3ea; class RawTraceParserTest : public ::testing::Test { public: @@ -39,9 +41,6 @@ public: { selector_.InitFilter(); selector_.EnableMetaTable(false); - if (access(rawTraceBinPath_.c_str(), F_OK) == 0) { - binFs_.open(rawTraceBinPath_, std::ios::binary | std::ios::in); - } if (access(rawTraceDataPath_.c_str(), F_OK) == 0) { dataFs_.open(rawTraceDataPath_, std::ios::binary | std::ios::in); } @@ -50,7 +49,6 @@ public: void TearDown() { - binFs_.close(); dataFs_.close(); } @@ -83,7 +81,6 @@ public: std::string line_; std::string chunckStr_; const size_t bufferSize_ = 1024 * 1024; - std::ifstream binFs_; std::ifstream dataFs_; }; @@ -95,23 +92,7 @@ public: HWTEST_F(RawTraceParserTest, ParseAllData, TestSize.Level1) { TS_LOGI("test38-1"); - EXPECT_TRUE(binFs_.is_open() && parser_ != nullptr); - while (true) { - std::unique_ptr buf = std::make_unique(bufferSize_); - binFs_.read((char*)buf.get(), bufferSize_); - auto readSize = binFs_.gcount(); - if (readSize == 0) { - break; - } - if (readSize < 0) { - TS_LOGD("Reading trace file failed (errno: %d, %s)", errno, strerror(errno)); - break; - } - if (!selector_.ParseTraceDataSegment(std::move(buf), readSize, false, false)) { - break; - }; - } - selector_.WaitForParserEnd(); + EXPECT_TRUE(ParseTraceFile(selector_, rawTraceBinPath_)); } /** * @tc.name: ParseFileHeader @@ -242,26 +223,5 @@ HWTEST_F(RawTraceParserTest, HandleTgids, TestSize.Level1) } } } -/** - * @tc.name: ParseCpuData - * @tc.desc: Test ParseTraceDataSegment interface Parse cpuData - * @tc.type: FUNC - */ -HWTEST_F(RawTraceParserTest, ParseCpuData, TestSize.Level1) -{ - TS_LOGI("test38-8"); - EXPECT_TRUE(dataFs_.is_open() && parser_ != nullptr); - auto cpuId = 2; - EXPECT_FALSE(parser_->ParseCpuRawData(cpuId, chunckStr_)); - while (std::getline(dataFs_, line_)) { - if (StartWith(line_, cpuDataCmd_)) { - chunckStr_ = ChunkToString(dataFs_); - EXPECT_TRUE(parser_->ParseCpuRawData(cpuId, chunckStr_)); - } else if (StartWith(line_, headPageFormatsCmd_)) { - chunckStr_ = ChunkToString(dataFs_); - EXPECT_TRUE(parser_->ftraceProcessor_->HandleHeaderPageFormat(chunckStr_)); - } - } -} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/test/unittest/split_file_data_test.cpp b/trace_streamer/test/unittest/split_file_data_test.cpp index 022760b00cb21e330f46570e32d6cf8c6cd34df8..648adb0d67a822469f24d2bd7aa01c54555e2f65 100644 --- a/trace_streamer/test/unittest/split_file_data_test.cpp +++ b/trace_streamer/test/unittest/split_file_data_test.cpp @@ -204,7 +204,7 @@ HWTEST_F(SplitFileDataTest, SplitFileDataByEbpfTest, TestSize.Level1) uint64_t dataSize = 0; for (auto it = splitResult.begin(); it != splitResult.end(); ++it) { if (it->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) { - dataSize += it->json.size; + dataSize += it->originSeg.size; } } std::unique_ptr combinedBuf(new uint8_t[dataSize + PROFILE_HEADER + headDataSize]); @@ -217,9 +217,9 @@ HWTEST_F(SplitFileDataTest, SplitFileDataByEbpfTest, TestSize.Level1) } for (auto it = splitResult.begin(); it != splitResult.end(); ++it) { if (it->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) { - inputFile.seekg(it->json.offset); - inputFile.read(reinterpret_cast(combinedBuf.get()) + currentOffset, it->json.size); - currentOffset += it->json.size; + inputFile.seekg(it->originSeg.offset); + inputFile.read(reinterpret_cast(combinedBuf.get()) + currentOffset, it->originSeg.size); + currentOffset += it->originSeg.size; } if (!inputFile) { std::cerr << "Error reading from file." << std::endl; @@ -324,7 +324,7 @@ HWTEST_F(SplitFileDataTest, SplitFileDataByPerfTest, TestSize.Level1) uint64_t dataSize = 0; for (auto it = splitResult.begin(); it != splitResult.end(); ++it) { if (it->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) { - dataSize += it->json.size; + dataSize += it->originSeg.size; } } std::unique_ptr combinedBuf(new uint8_t[dataSize + PROFILE_HEADER + headDataSize]); @@ -337,9 +337,9 @@ HWTEST_F(SplitFileDataTest, SplitFileDataByPerfTest, TestSize.Level1) } for (auto it = splitResult.begin(); it != splitResult.end(); ++it) { if (it->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) { - inputFile.seekg(it->json.offset); - inputFile.read(reinterpret_cast(combinedBuf.get()) + currentOffset, it->json.size); - currentOffset += it->json.size; + inputFile.seekg(it->originSeg.offset); + inputFile.read(reinterpret_cast(combinedBuf.get()) + currentOffset, it->originSeg.size); + currentOffset += it->originSeg.size; } if (!inputFile) { std::cerr << "Error reading from file." << std::endl; diff --git a/trace_streamer/test/unittest/table_test.cpp b/trace_streamer/test/unittest/table_test.cpp index 5a4556a7ad7bb971ef8184e1a0851c33e313b789..6fb7c3d520415b5283602af9ce416511fde6932d 100644 --- a/trace_streamer/test/unittest/table_test.cpp +++ b/trace_streamer/test/unittest/table_test.cpp @@ -49,7 +49,7 @@ HWTEST_F(TableTest, AppnameTableTest, TestSize.Level1) uint8_t flags = 0; DataIndex eventSource = stream_.traceDataCache_->GetDataIndex("eventSource"); DataIndex appName = stream_.traceDataCache_->GetDataIndex("app1"); - stream_.traceDataCache_->GetAppNamesData()->AppendAppName(flags, eventSource, appName); + stream_.traceDataCache_->GetHiSysEventSubkeysData()->AppendSysEventSubkey(flags, eventSource, appName); auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false); EXPECT_EQ(row, 1); } @@ -536,8 +536,8 @@ HWTEST_F(TableTest, HisysEventMeasureTableTest, TestSize.Level1) double numericValue = 0; DataIndex stringValue = stream_.traceDataCache_->GetDataIndex("stringValue"); - stream_.traceDataCache_->GetSyseventMeasureData()->AppendData(ts, nameId, keyId, type, numericValue, stringValue, - serial); + stream_.traceDataCache_->GetHiSysEventMeasureData()->AppendData(ts, nameId, keyId, type, numericValue, stringValue, + serial); auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false); EXPECT_EQ(row, 1); }