+ - 备注：当前扩展服务版本为1.1.2，如果本地存在以其他方式安装的非正式版本，请手动关闭扩展服务，并重新按照该指导安装 + 备注：当前扩展服务版本为1.1.4，如果本地存在以其他方式安装的非正式版本，请手动关闭扩展服务，并重新按照该指导安装
@@ -840,8 +840,7 @@ targetElement.scrollIntoView({ behavior: 'smooth' }); } // 假设这是你的文件的 URL - const fileUrl = `https://${window.location.host.split(':')[0]}:${window.location.port - }/application/extend/hi-smart-perf-host-extend.zip`; + const fileUrl = `../extend/hi-smart-perf-host-extend.zip`; const fileName = 'hi-smart-perf-host-extend'; // 创建一个隐藏的 a 元素 const a = document.createElement('a'); diff --git a/ide/src/doc/quickstart_schedulinganalysis.html b/ide/src/doc/quickstart_schedulinganalysis.html index a4104ab2bf9838938a3d185ba1c97cc4c95bef5a..e7738ee12cf7e7dd2b9db1cb7f2983dd5cdab577 100644 --- a/ide/src/doc/quickstart_schedulinganalysis.html +++ b/ide/src/doc/quickstart_schedulinganalysis.html @@ -1016,7 +1016,7 @@ duration：运行总时长。Top20线程大中小核占用率
- 选择Thread Analysis标签页，各个CPU通过勾选big或者middle或者small来设置CPU的分类。
+ 选择Thread Analysis标签页，各个CPU通过勾选big或者middle或者little来设置CPU的分类。
@@ -1080,7 +1080,7 @@ middle core：中核占用时长。
-small core：小核占用时长。 +little core：小核占用时长。
diff --git a/ide/src/trace/component/SpFlags.ts b/ide/src/trace/component/SpFlags.ts
index d3bf084543549f1adf13fd55484064a0fa4bf7dc..8d9594c888967e538c8fdbdf21624f22c48aa644 100644
--- a/ide/src/trace/component/SpFlags.ts
+++ b/ide/src/trace/component/SpFlags.ts
@@ -15,6 +15,9 @@
import { BaseElement, element } from '../../base-ui/BaseElement';
import { SpFlagHtml } from './SpFlag.html';
+import { LitSelectV } from '../../base-ui/select/LitSelectV';
+import { SysCallMap } from './trace/base/SysCallUtils';
+
const NUM = '000000';
//vsync二级下拉选框对应的value和content
const VSYNC_CONTENT = [
@@ -46,14 +49,75 @@ const CONFIG_STATE: unknown = {
export class SpFlags extends BaseElement {
private bodyEl: HTMLElement | undefined | null;
private xiaoLubanEl: Element | null | undefined;
+ private systemCallSelect: LitSelectV | undefined | null;
+ private systemCallInput: HTMLInputElement | undefined | null;
+ private systemCallEventId: number[] = [];
+ private systemCallSwitch: HTMLSelectElement | undefined | null;
+
+
+ connectedCallback(): void {
+ this.systemCallSelect?.addEventListener('blur', this.systemCallSelectBlurHandler);
+ }
+
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ this.systemCallSelect?.removeEventListener('blur', this.systemCallSelectBlurHandler);
+ }
initElements(): void {
let parentElement = this.parentNode as HTMLElement;
parentElement.style.overflow = 'hidden';
this.bodyEl = this.shadowRoot?.querySelector('.body');
this.initConfigList();
+ this.systemCallSelect = this.shadowRoot?.querySelector("lit-select-v[title='SystemCall']");
+ this.systemCallSwitch = this.shadowRoot?.querySelector("select[title='System Calls']");
+ this.systemCallInput = this.systemCallSelect!.shadowRoot?.querySelector('input') as HTMLInputElement;
+ this.updateSystemCallSelect();
+ }
+
+ private updateSystemCallSelect(): void {
+ const selectedArr = FlagsConfig.getSystemcallEventId('SystemParsing');
+ let checkAll = true;
+ systemCallConfigList[0].selectArray = Array.from(SysCallMap.entries())
+ .map(([id, name]) => {
+ if (!selectedArr.includes(id)) {
+ checkAll = false;
+ }
+ return `${name}`;
+ });
+ this.systemCallSelect?.dataSource(systemCallConfigList[0].selectArray, 'ALL-SystemCall');
+ this.systemCallSelect?.setIgnoreValues(['ALL-SystemCall']);
+ if (this.systemCallSwitch?.title === 'System Calls' && this.systemCallSwitch.selectedOptions[0].value === 'Enabled') {
+ this.systemCallSelect?.removeAttribute('disabled');
+ const arr = checkAll ? ['ALL-SystemCall' ] : [];
+ FlagsConfig.getSystemcallEventId('SystemParsing').forEach(it => arr.push(SysCallMap.get(it) || ''));
+ this.systemCallSelect?.setSelectedOptions(arr);
+ } else {
+ this.systemCallSelect?.setAttribute('disabled', 'disabled');
+ this.systemCallSelect?.setSelectedOptions([]);
+ }
}
+ private systemCallSelectBlurHandler = () => {
+ let systemCallSelectOptions = this.systemCallSelect!.shadowRoot?.querySelectorAll('.option');
+ this.systemCallEventId = [];
+ systemCallSelectOptions!.forEach((option) => {
+ if (option.hasAttribute('selected')) {
+ const systemCallEventItem = Array.from(SysCallMap.entries())
+ .find(([id, name]) => name === option.getAttribute('value'));
+ if (systemCallEventItem) {
+ this.handleSystemCallEventId(systemCallEventItem[0]);
+ }
+ }
+ });
+ FlagsConfig.updateSystemcallEventId(this.systemCallEventId, 'SystemParsing');
+ return this.systemCallEventId;
+ };
+
+ private handleSystemCallEventId = (systemCallEventId: number): void => {
+ this.systemCallEventId.push(systemCallEventId);
+ };
+
initHtml(): string {
return SpFlagHtml;
}
@@ -102,6 +166,16 @@ export class SpFlags extends BaseElement {
this.xiaoLubanEl?.removeAttribute('enabled');
}
}
+ if (configSelect.title === 'System Calls') {
+ if (configSelect.selectedOptions[0].value === 'Enabled') {
+ this.systemCallSelect?.removeAttribute('disabled');
+ } else {
+ this.systemCallSelect?.setAttribute('disabled', 'disabled');
+ this.systemCallEventId = [];
+ FlagsConfig.updateSystemcallEventId([], 'SystemParsing');
+ this.systemCallSelect?.setSelectedOptions([]);
+ }
+ }
});
let userIdInput: HTMLInputElement | null | undefined = this.shadowRoot?.querySelector('#user_id_input');
if (configSelect.title === 'AI' && configSelect.selectedOptions[0].value === 'Enabled' && userIdInput?.value === '') {
@@ -226,10 +300,51 @@ export class SpFlags extends BaseElement {
configFooterDiv.appendChild(userIdInputEl);
configDiv.appendChild(configFooterDiv);
}
+ if (config.title === 'System Calls') {
+ let configFooterDiv = document.createElement('div');
+ configFooterDiv.className = 'config_footer';
+ let systemCallConfigEl = document.createElement('div');
+ systemCallConfigEl.className = 'system-call-config';
+ systemCallConfigList.forEach((config) => {
+ let systemCallConfigDiv = document.createElement('div');
+ if (config.hidden) {
+ systemCallConfigDiv.className = 'systemCall-config-div hidden';
+ } else {
+ systemCallConfigDiv.className = 'systemCall-config-div';
+ }
+ switch (config.type) {
+ case 'select-multiple':
+ this.configTypeBySelectMultiple(config, systemCallConfigDiv);
+ break;
+ default:
+ break;
+ }
+ systemCallConfigEl.appendChild(systemCallConfigDiv);
+ })
+ configFooterDiv.appendChild(systemCallConfigEl);
+ configDiv.appendChild(configFooterDiv);
+ }
this.bodyEl!.appendChild(configDiv);
});
}
+ private configTypeBySelectMultiple(config: unknown, systemCallConfigDiv: HTMLDivElement): void {
+ let html = '';
+ //@ts-ignore
+ let placeholder = config.selectArray[0];
+ html += ``;
+ //@ts-ignore
+ config.selectArray.forEach((value: string) => {
+ html += `${value} `;
+ });
+ html += ' ';
+ systemCallConfigDiv.innerHTML = systemCallConfigDiv.innerHTML + html;
+ }
+
private createPersonOption(list: unknown, key: string, config: unknown): HTMLDivElement {
let configFooterDiv = document.createElement('div');
configFooterDiv.className = 'config_footer';
@@ -279,6 +394,7 @@ export type Params = {
export class FlagsConfig {
static FLAGS_CONFIG_KEY = 'FlagsConfig';
+ static SYSTEM_PRASE = 'SystemParsing';
static DEFAULT_CONFIG: Array = [
{
title: 'TaskPool',
@@ -359,6 +475,12 @@ export class FlagsConfig {
switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }],
describeContent: 'Start AI',
addInfo: { userId: '' },
+ },
+ {
+ title: 'System Calls',
+ switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }],
+ describeContent: 'Start System Call Parsing',
+ addInfo: { userId: '' },
}
];
@@ -417,6 +539,11 @@ export class FlagsConfig {
});
// @ts-ignore
parseConfig[configItem.title] = selectedOption[0].option === 'Enabled' ? 1 : 0;
+ // @ts-ignore
+ if (configItem.title === 'System Calls') {
+ // @ts-ignore
+ parseConfig[configItem.title] = selectedOption[0].option === 'Enabled' ? FlagsConfig.getSystemcallEventId('SystemParsing').join(';') : '';
+ }
});
return JSON.stringify({ config: parseConfig });
}
@@ -471,6 +598,20 @@ export class FlagsConfig {
flagConfigObj[key] = value;
window.localStorage.setItem(FlagsConfig.FLAGS_CONFIG_KEY, JSON.stringify(flagConfigObj));
}
+
+
+ static getSystemcallEventId(value: string): number[] {
+ let list = window.localStorage.getItem(FlagsConfig.SYSTEM_PRASE);
+ return JSON.parse(list!) || [];
+ }
+
+ static updateSystemcallEventId(systemCallEventId: number[], value: unknown): void {
+ let systemCallEventIdArray:number[] = [];
+ if (systemCallEventId !== null) {
+ systemCallEventIdArray = systemCallEventId;
+ }
+ window.localStorage.setItem(FlagsConfig.SYSTEM_PRASE, JSON.stringify(systemCallEventIdArray));
+ }
}
export interface FlagConfigItem {
@@ -484,3 +625,12 @@ export interface OptionItem {
option: string;
selected?: boolean;
}
+
+const systemCallConfigList = [
+ {
+ title: 'SystemCall',
+ des: '',
+ hidden: true,
+ type: 'select-multiple',
+ selectArray: [''],
+ }]
diff --git a/ide/src/trace/component/SpHelp.ts b/ide/src/trace/component/SpHelp.ts
index 3aca9c13dd8ad4549d6d2e3a15d91f4c00af5c8a..4cd235c63d2895706bfc1b4a1ccc3b1a8661309d 100644
--- a/ide/src/trace/component/SpHelp.ts
+++ b/ide/src/trace/component/SpHelp.ts
@@ -39,7 +39,7 @@ export class SpHelp extends BaseElement {
}
this.helpFile!.innerHTML =
'`;
this.navbarInit(helpDocDetail!.name);
@@ -269,13 +269,13 @@ export class SpHelp extends BaseElement {
event: event,
action: 'help_doc',
});
- that.helpFile!.innerHTML = ``;
+ that.helpFile!.innerHTML = ``;
this.navbarInit(docName);
this.changeItemURL(index!);
}
private navbarInit(docName: string): void {
- fetch(`/application/doc/${docName}.html`)
+ fetch(`doc/${docName}.html`)
.then(response => response.text())
.then(htmlString => {
const parser = new DOMParser();
@@ -303,7 +303,7 @@ export class SpHelp extends BaseElement {
navLink.closest('li')!.classList.add('active');
let targetId = navLink.id;
e.preventDefault();
- this.helpFile!.innerHTML = ``;
+ this.helpFile!.innerHTML = ``;
});
});
@@ -312,7 +312,7 @@ export class SpHelp extends BaseElement {
navLinks.forEach((navLink) => {
navLink.closest('li')?.classList.remove('active');
});
- this.helpFile!.innerHTML = ``;
+ this.helpFile!.innerHTML = ``;
});
})
diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts
index dfb8d1b8f04082732bf5ffdf90519120b60e4870..27649444b8f9cc29020ebf8eda8d1f6bc940e607 100644
--- a/ide/src/trace/component/SpRecordTrace.ts
+++ b/ide/src/trace/component/SpRecordTrace.ts
@@ -114,10 +114,15 @@ export class SpRecordTrace extends BaseElement {
private spWebShell: SpWebHdcShell | undefined;
private menuGroup: LitMainMenuGroup | undefined | null;
private appContent: HTMLElement | undefined | null;
+ private optionNum: number = 0;
private record = 'Record';
private stop = 'StopRecord';
private nowChildItem: HTMLElement | undefined;
private longTraceList: Array = [];
+ private fileList: Array<{
+ fileName: string,
+ file: File
+ }> = [];
private refreshDeviceTimer: number | undefined;
private hintEl: HTMLSpanElement | undefined;
private selectedTemplate: Map = new Map();
@@ -134,6 +139,7 @@ export class SpRecordTrace extends BaseElement {
public static usbGetEvent: string;
public static usbGetApp: string;
private static usbGetVersion: string;
+ public static usbGetHisystem: string;
static snapShotList: Array = [];
static snapShotDuration: number = 0;
static isSnapShotCapture: boolean = false;
@@ -532,6 +538,7 @@ export class SpRecordTrace extends BaseElement {
let isCheckSnapshot = this.spArkTs!.radioBoxType === 0 ? true : false; // 是否check snapshot
let isCheckTimeLine = this.spArkTs!.radioBoxType === 1 ? true : false; // 是否 check timeline
+ let isLongTrace = SpApplication.isLongTrace;
let maxDur = this.recordSetting!.maxDur; // 抓取trace的时长
let snapShotDur = this.recordSetting!.snapShot;//截图
SpRecordTrace.snapShotDuration = snapShotDur;
@@ -542,6 +549,7 @@ export class SpRecordTrace extends BaseElement {
let enableCpuProfiler = this.spArkTs!.isStartCpuProfiler;
let params: unknown = {
+ isLongTrace: isLongTrace,
isRecordArkTs: isRecordArkTs,
isRecordHitrace: isRecordHitrace,
type: '',
@@ -591,7 +599,7 @@ export class SpRecordTrace extends BaseElement {
this.progressEL!.loading = false;// @ts-ignore
let errorMsg = new TextDecoder().decode(result);
this.useExtentTip!.style.display = 'block';
- let urlAsciiArr = [104,116,116,112,115,58,47,47,119,105,107,105,46,104,117,97,119,101,105,46,99,111,109,47,100,111,109,97,105,110,115,47,55,54,57,49,49,47,119,105,107,105,47,49,50,53,52,56,48,47,87,73,75,73,50,48,50,53,48,49,49,54,53,55,53,48,52,53,52];
+ let urlAsciiArr = [104, 116, 116, 112, 115, 58, 47, 47, 119, 105, 107, 105, 46, 104, 117, 97, 119, 101, 105, 46, 99, 111, 109, 47, 100, 111, 109, 97, 105, 110, 115, 47, 55, 54, 57, 49, 49, 47, 119, 105, 107, 105, 47, 49, 50, 53, 52, 56, 48, 47, 87, 73, 75, 73, 50, 48, 50, 53, 48, 49, 49, 54, 53, 55, 53, 48, 52, 53, 52];
let exceptGuid = String.fromCodePoint(...urlAsciiArr);
this.useExtentTip!.innerHTML = `抓取trace异常：${errorMsg} 可根据[常见异常处理]解决异常`;
this.refreshDisableStyle(false, false);
@@ -613,12 +621,88 @@ export class SpRecordTrace extends BaseElement {
this.litSearch!.setPercent('Tracing htrace down', -1);
} else if (cmd === 8) {
this.litSearch!.setPercent('Downloading Hitrace file...', -1);
+ } else if (cmd === 9) {// @ts-ignore
+ let re = JSON.parse(new TextDecoder('utf-8').decode(result));
+ let binaryString = window.atob(re.data);
+ let len = binaryString.length;
+ let bytes = new Uint8Array(len);
+ for (let i = 0; i < len; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ re.data = bytes.buffer;
+ let fileInfo = {
+ fileName: re.fileName,
+ file: new File([re.data], re.fileName)
+ };
+ this.fileList.push(fileInfo);
+ this.longTraceList.push(fileInfo.fileName);
+ if (this.fileList.length === re.total) {
+ this.openLongTraceHandle();
+ }
}
};
WebSocketManager.getInstance()!.registerMessageListener(TypeConstants.ARKTS_TYPE, onmessageCallBack, this.eventCallBack);
WebSocketManager.getInstance()!.sendMessage(TypeConstants.ARKTS_TYPE, 1, encoder.encode(JSON.stringify(params)));
};
+ async openLongTraceHandle() {
+ this.fileList.sort((a, b) => {
+ const getNumber = (name: string) => {
+ const match = name.match(/_(\d+)\.htrace$/);
+ return match ? parseInt(match[1]) : 0;
+ };
+ return getNumber(a.fileName) - getNumber(b.fileName);
+ });
+ let timStamp = new Date().getTime();
+ this.sp!.longTraceHeadMessageList = [];
+ for (const fileInfo of this.fileList) {
+ await this.saveLongTrace(fileInfo.file, timStamp);
+ }
+ await this.openLongTrace(timStamp);
+ this.fileList = [];
+ this.longTraceList = [];
+ }
+
+ async saveLongTrace(file: File, timStamp: number) {
+ let traceTypePage = this.getLongTraceTypePage();
+ let types = this.sp!.fileTypeList.filter(type =>
+ file.name.toLowerCase().includes(type.toLowerCase())
+ );
+ let pageNumber = 0;
+ let fileType = types[0] || 'trace';
+ if (types.length === 0) {
+ let searchNumber = Number(
+ file.name.substring(
+ file.name.lastIndexOf('_') + 1,
+ file.name.lastIndexOf('.')
+ )
+ ) - 1;
+ pageNumber = traceTypePage.lastIndexOf(searchNumber);
+ }
+ this.litSearch!.setPercent(`downloading ${fileType} file`, 101);
+ await this.saveIndexDBByLongTrace(file, fileType, pageNumber, timStamp);
+ }
+
+ async openLongTrace(timStamp: number) {
+ let main = this.parentNode!.parentNode!.querySelector('lit-main-menu') as LitMainMenu;
+ let children = main.menus as Array;
+ let child = children[1].children as Array
+
Top20线程小核占用率
-
small
+ little
-
diff --git a/ide/src/trace/component/schedulingAnalysis/Top20ThreadCpuUsage.ts b/ide/src/trace/component/schedulingAnalysis/Top20ThreadCpuUsage.ts
index e1c86a497861390c67cf70ae37bd7aca9a1a9a87..c78526ffb04e61c0af7c43ded4c3b57f59392501 100644
--- a/ide/src/trace/component/schedulingAnalysis/Top20ThreadCpuUsage.ts
+++ b/ide/src/trace/component/schedulingAnalysis/Top20ThreadCpuUsage.ts
@@ -36,7 +36,7 @@ export class Top20ThreadCpuUsage extends BaseElement {
private table: LitTable | null | undefined;
private tableBig: LitTable | null | undefined;
private tableMid: LitTable | null | undefined;
- private tableSmall: LitTable | null | undefined;
+ private tableLittle: LitTable | null | undefined;
private chartTotal: LitChartColumn | null | undefined;
private chart2: LitChartColumn | null | undefined;
private chart3: LitChartColumn | null | undefined;
@@ -49,10 +49,10 @@ export class Top20ThreadCpuUsage extends BaseElement {
private data: Array = [];
private dataBig: Array = [];
private dataMid: Array = [];
- private dataSmall: Array = [];
+ private dataLittle: Array = [];
private sort: unknown = {
total: { key: '', sort: 0 },
- small: { key: '', sort: 0 },
+ little: { key: '', sort: 0 },
mid: { key: '', sort: 0 },
big: { key: '', sort: 0 },
};
@@ -82,9 +82,9 @@ export class Top20ThreadCpuUsage extends BaseElement {
('#tb-thread-usage');
this.tableBig = this.shadowRoot!.querySelector('#tb-thread-big');
this.tableMid = this.shadowRoot!.querySelector('#tb-thread-mid');
- this.tableSmall = this.shadowRoot!.querySelector('#tb-thread-small');
+ this.tableLittle = this.shadowRoot!.querySelector('#tb-thread-little');
this.chartTotal = this.shadowRoot!.querySelector('#chart_total');
this.chart2 = this.shadowRoot!.querySelector('#chart_2');
this.chart3 = this.shadowRoot!.querySelector('#chart_3');
this.chart4 = this.shadowRoot!.querySelector('#chart_4');
this.map = new Map();
this.map.set('total', { chart: this.chartTotal!, table: this.table! });
- this.map.set('small', { chart: this.chart2!, table: this.tableSmall! });
+ this.map.set('little', { chart: this.chart2!, table: this.tableLittle! });
this.map.set('mid', { chart: this.chart3!, table: this.tableMid! });
this.map.set('big', { chart: this.chart4!, table: this.tableBig! });
this.setting = this.shadowRoot!.querySelector('#setting');
@@ -110,8 +110,8 @@ export class Top20ThreadCpuUsage extends BaseElement {
//@ts-ignore
(this.shadowRoot!.querySelector('#total')! as unknown).style.display = 'grid';
//@ts-ignore
- (this.shadowRoot!.querySelector('#small')! as unknown).style.display =
- CheckCpuSetting.small_cores.length > 0 ? 'grid' : 'none';
+ (this.shadowRoot!.querySelector('#little')! as unknown).style.display =
+ CheckCpuSetting.little_cores.length > 0 ? 'grid' : 'none';
//@ts-ignore
(this.shadowRoot!.querySelector('#mid')! as unknown).style.display =
CheckCpuSetting.mid_cores.length > 0 ? 'grid' : 'none';
@@ -153,9 +153,9 @@ export class Top20ThreadCpuUsage extends BaseElement {
if (key === 'total') {
//@ts-ignore
this.sortByColumn(evt.detail, tab, this.data);
- } else if (key === 'small') {
+ } else if (key === 'little') {
//@ts-ignore
- this.sortByColumn(evt.detail, tab, this.dataSmall);
+ this.sortByColumn(evt.detail, tab, this.dataLittle);
} else if (key === 'mid') {
//@ts-ignore
this.sortByColumn(evt.detail, tab, this.dataMid);
@@ -211,8 +211,8 @@ export class Top20ThreadCpuUsage extends BaseElement {
key = 'big';
} else if (key === 'midTimeStr') {
key = 'mid';
- } else if (key === 'smallTimeStr') {
- key = 'small';
+ } else if (key === 'littleTimeStr') {
+ key = 'little';
} else if (
key === 'bigPercent' ||
key === 'ratio' ||
@@ -296,7 +296,7 @@ export class Top20ThreadCpuUsage extends BaseElement {
//@ts-ignore
mid: it.mid,
//@ts-ignore
- small: it.small,
+ little: it.little,
no: index + 1,
visible: 1,
//@ts-ignore
@@ -304,13 +304,13 @@ export class Top20ThreadCpuUsage extends BaseElement {
//@ts-ignore
midPercent: it.midPercent,
//@ts-ignore
- smallPercent: it.smallPercent,
+ littlePercent: it.littlePercent,
//@ts-ignore
bigTimeStr: it.bigTimeStr,
//@ts-ignore
midTimeStr: it.midTimeStr,
//@ts-ignore
- smallTimeStr: it.smallTimeStr,
+ littleTimeStr: it.littleTimeStr,
hideHandler: (): void => {
//@ts-ignore
let arr = source.filter((o) => o.visible === 1);
@@ -333,8 +333,8 @@ export class Top20ThreadCpuUsage extends BaseElement {
private assignmentData(key: string, source: unknown[], obj: { chart: LitChartColumn; table: LitTable }): void {
if (key === 'total') {
this.data = source;
- } else if (key === 'small') {
- this.dataSmall = source;
+ } else if (key === 'little') {
+ this.dataLittle = source;
} else if (key === 'mid') {
this.dataMid = source;
} else if (key === 'big') {
@@ -362,7 +362,7 @@ export class Top20ThreadCpuUsage extends BaseElement {
return '#2f72f8'; //@ts-ignore
} else if (a.size === 'middle core') {
return '#ffab67'; //@ts-ignore
- } else if (a.size === 'small core') {
+ } else if (a.size === 'little core') {
return '#a285d2';
} else {
return '#0a59f7';
@@ -450,10 +450,10 @@ export class Top20ThreadCpuUsage extends BaseElement {
pName: obj.pName, //@ts-ignore
tid: obj.tid, //@ts-ignore
tName: obj.tName, //@ts-ignore
- total: obj.small,
- size: 'small core', //@ts-ignore
+ total: obj.little,
+ size: 'little core', //@ts-ignore
no: obj.no, //@ts-ignore
- timeStr: obj.smallTimeStr,
+ timeStr: obj.littleTimeStr,
});
} else {
data.push({
@@ -479,7 +479,7 @@ export class Top20ThreadCpuUsage extends BaseElement {
{
bigCores: CheckCpuSetting.big_cores,
midCores: CheckCpuSetting.mid_cores,
- smallCores: CheckCpuSetting.small_cores,
+ littleCores: CheckCpuSetting.little_cores,
},
undefined,
handler
@@ -490,13 +490,13 @@ export class Top20ThreadCpuUsage extends BaseElement {
getTableColumns(type: string): string {
if (type === 'total') {
- return `${this.publicColumns}${this.bigColumn}${this.midColumn}${this.smallColumn}`;
+ return `${this.publicColumns}${this.bigColumn}${this.midColumn}${this.littleColumn}`;
} else if (type === 'big') {
return `${this.publicColumns}${this.bigColumn}`;
} else if (type === 'mid') {
return `${this.publicColumns}${this.midColumn}`;
- } else if (type === 'small') {
- return `${this.publicColumns}${this.smallColumn}`;
+ } else if (type === 'little') {
+ return `${this.publicColumns}${this.littleColumn}`;
} else {
return '';
}
diff --git a/ide/src/trace/component/setting/SpHisysEvent.ts b/ide/src/trace/component/setting/SpHisysEvent.ts
index 779567297cb6ed1c237e00214fa2db891cdb30a7..1bddae3872e74399e9051d5f8293f5b5eeef603a 100644
--- a/ide/src/trace/component/setting/SpHisysEvent.ts
+++ b/ide/src/trace/component/setting/SpHisysEvent.ts
@@ -22,6 +22,8 @@ import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager';
import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect';
import { SpHiSysEventHtml } from './SpHisysEvent.html';
import { LitSelectV } from '../../../base-ui/select/LitSelectV';
+import { WebSocketManager } from '../../../webSocket/WebSocketManager';
+import { TypeConstants } from '../../../webSocket/Constants';
@element('sp-hisys-event')
export class SpHisysEvent extends BaseElement {
@@ -64,7 +66,7 @@ export class SpHisysEvent extends BaseElement {
}
get sysEventConfigPath(): string {
- return '/system/etc/hiview/hisysevent.def';
+ return '//data/system/hiview/unzip_configs/sys_event_def/hisysevent.def';
}
initElements(): void {
@@ -99,11 +101,11 @@ export class SpHisysEvent extends BaseElement {
if (SpRecordTrace.serialNumber === '') {
this.domainInputEL!.dataSource([], '');
} else {
- HdcDeviceManager.fileRecv(this.sysEventConfigPath, () => { }).then((pullRes) => {
- pullRes.arrayBuffer().then((buffer) => {
- if (buffer.byteLength > 0) {
- let dec = new TextDecoder();
- this.eventConfig = JSON.parse(dec.decode(buffer));
+ if (SpRecordTrace.useExtend) {
+ WebSocketManager.getInstance()!.sendMessage(TypeConstants.USB_TYPE, TypeConstants.USB_GET_HISYSTEM, new TextEncoder().encode(SpRecordTrace.serialNumber));
+ setTimeout(() => {
+ if (SpRecordTrace.usbGetHisystem) {
+ this.eventConfig = JSON.parse(SpRecordTrace.usbGetHisystem);
let domainList = Object.keys(this.eventConfig!);
if (domainList.length > 0) {
this.domainInputEL!.dataSource(domainList, 'ALL-Domain', true);
@@ -111,8 +113,23 @@ export class SpHisysEvent extends BaseElement {
this.domainInputEL!.dataSource([], '');
}
}
+ }, 1000);
+ } else {
+ HdcDeviceManager.fileRecv(this.sysEventConfigPath, () => { }).then((pullRes) => {
+ pullRes.arrayBuffer().then((buffer) => {
+ if (buffer.byteLength > 0) {
+ let dec = new TextDecoder();
+ this.eventConfig = JSON.parse(dec.decode(buffer));
+ let domainList = Object.keys(this.eventConfig!);
+ if (domainList.length > 0) {
+ this.domainInputEL!.dataSource(domainList, 'ALL-Domain', true);
+ } else {
+ this.domainInputEL!.dataSource([], '');
+ }
+ }
+ });
});
- });
+ }
}
this.domainInputEl!.removeAttribute('readonly');
} else {
diff --git a/ide/src/trace/component/setting/SpRecordSetting.ts b/ide/src/trace/component/setting/SpRecordSetting.ts
index 6973ae7a26170165b08ec17a9fd393d342554012..6ed9c65f5bd9230af5a32794afaadd706b3fd36c 100644
--- a/ide/src/trace/component/setting/SpRecordSetting.ts
+++ b/ide/src/trace/component/setting/SpRecordSetting.ts
@@ -244,12 +244,14 @@ export class SpRecordSetting extends BaseElement {
rootEl.removeChild(longTraceMaxSlide);
}
this.outputPath!.value = 'hiprofiler_data.htrace';
+ this.snapShotNumber!.style.display = 'grid';
}
private longTraceModelRadioHandler(rootEl: HTMLDivElement, longTraceMaxSlide: HTMLDivElement): void {
SpApplication.isLongTrace = true;
rootEl.appendChild(longTraceMaxSlide);
this.outputPath!.value = 'long_trace';
+ this.snapShotNumber!.style.display = 'none';
}
private maxSizeInputHandler(maxSizeSliders: LitSlider, maxSizeParentElement: Element): void {
diff --git a/ide/src/trace/component/setting/SpSdkConfig.ts b/ide/src/trace/component/setting/SpSdkConfig.ts
index a8426c1a3e1de4ece2cb47b6fc7050a7daa552d3..868475ee1f8dbd2cad1ddf881de3008fc9bf131f 100644
--- a/ide/src/trace/component/setting/SpSdkConfig.ts
+++ b/ide/src/trace/component/setting/SpSdkConfig.ts
@@ -149,9 +149,9 @@ export class SpSdkConfig extends BaseElement {
private initSdkWasm(): void {
try {
let spApplication = document.querySelector('sp-application');
- let wasmJsonUrl = `https://${window.location.host.split(':')[0]}:${window.location.port}/application/wasm.json`;
+ let wasmJsonUrl = `https://${window.location.host.split(':')[0]}:${window.location.port}${window.location.pathname}wasm.json`;
if (spApplication!.hasAttribute('vs')) {
- wasmJsonUrl = `http://${window.location.host.split(':')[0]}:${window.location.port}/wasm.json`;
+ wasmJsonUrl = `http://${window.location.host.split(':')[0]}:${window.location.port}${window.location.pathname}/wasm.json`;
}
fetch(wasmJsonUrl)
.then((res): void => {
diff --git a/ide/src/trace/component/trace/base/SysCallUtils.ts b/ide/src/trace/component/trace/base/SysCallUtils.ts
new file mode 100644
index 0000000000000000000000000000000000000000..eda34c18f8cdb6b2efd40e2bb82f6b660d127c15
--- /dev/null
+++ b/ide/src/trace/component/trace/base/SysCallUtils.ts
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const SysCallMap = new Map([
+ [0, "sys_io_setup"],
+ [1, "sys_io_destroy"],
+ [2, "sys_io_submit"],
+ [3, "sys_io_cancel"],
+ [4, "sys_io_getevents"],
+ [5, "sys_setxattr"],
+ [6, "sys_lsetxattr"],
+ [7, "sys_fsetxattr"],
+ [8, "sys_getxattr"],
+ [9, "sys_lgetxattr"],
+ [10, "sys_fgetxattr"],
+ [11, "sys_listxattr"],
+ [12, "sys_llistxattr"],
+ [13, "sys_flistxattr"],
+ [14, "sys_removexattr"],
+ [15, "sys_lremovexattr"],
+ [16, "sys_fremovexattr"],
+ [17, "sys_getcwd"],
+ [18, "sys_lookup_dcookie"],
+ [19, "sys_eventfd2"],
+ [20, "sys_epoll_create1"],
+ [21, "sys_epoll_ctl"],
+ [22, "sys_epoll_pwait"],
+ [23, "sys_dup"],
+ [24, "sys_dup3"],
+ [25, "sys_fcntl"],
+ [26, "sys_inotify_init1"],
+ [27, "sys_inotify_add_watch"],
+ [28, "sys_inotify_rm_watch"],
+ [29, "sys_ioctl"],
+ [30, "sys_ioprio_set"],
+ [31, "sys_ioprio_get"],
+ [32, "sys_flock"],
+ [33, "sys_mknodat"],
+ [34, "sys_mkdirat"],
+ [35, "sys_unlinkat"],
+ [36, "sys_symlinkat"],
+ [37, "sys_linkat"],
+ [38, "sys_renameat"],
+ [39, "sys_umount2"],
+ [40, "sys_mount"],
+ [41, "sys_pivot_root"],
+ [42, "sys_nfsservctl"],
+ [43, "sys_statfs"],
+ [44, "sys_fstatfs"],
+ [45, "sys_truncate"],
+ [46, "sys_ftruncate"],
+ [47, "sys_fallocate"],
+ [48, "sys_faccessat"],
+ [49, "sys_chdir"],
+ [50, "sys_fchdir"],
+ [51, "sys_chroot"],
+ [52, "sys_fchmod"],
+ [53, "sys_fchmodat"],
+ [54, "sys_fchownat"],
+ [55, "sys_fchown"],
+ [56, "sys_openat"],
+ [57, "sys_close"],
+ [58, "sys_vhangup"],
+ [59, "sys_pipe2"],
+ [60, "sys_quotactl"],
+ [61, "sys_getdents64"],
+ [62, "sys_lseek"],
+ [63, "sys_read"],
+ [64, "sys_write"],
+ [65, "sys_readv"],
+ [66, "sys_writev"],
+ [67, "sys_pread64"],
+ [68, "sys_pwrite64"],
+ [69, "sys_preadv"],
+ [70, "sys_pwritev"],
+ [71, "sys_sendfile"],
+ [72, "sys_pselect6"],
+ [73, "sys_ppoll"],
+ [74, "sys_signalfd4"],
+ [75, "sys_vmsplice"],
+ [76, "sys_splice"],
+ [77, "sys_tee"],
+ [78, "sys_readlinkat"],
+ [79, "sys_fstatat"],
+ [80, "sys_fstat"],
+ [81, "sys_sync"],
+ [82, "sys_fsync"],
+ [83, "sys_fdatasync"],
+ [84, "sys_sync_file_range"],
+ [85, "sys_timerfd_create"],
+ [86, "sys_timerfd_settime"],
+ [87, "sys_timerfd_gettime"],
+ [88, "sys_utimensat"],
+ [89, "sys_acct"],
+ [90, "sys_capget"],
+ [91, "sys_capset"],
+ [92, "sys_personality"],
+ [93, "sys_exit"],
+ [94, "sys_exit_group"],
+ [95, "sys_waitid"],
+ [96, "sys_set_tid_address"],
+ [97, "sys_unshare"],
+ [98, "sys_futex"],
+ [99, "sys_set_robust_list"],
+ [100, "sys_get_robust_list"],
+ [101, "sys_nanosleep"],
+ [102, "sys_getitimer"],
+ [103, "sys_setitimer"],
+ [104, "sys_kexec_load"],
+ [105, "sys_init_module"],
+ [106, "sys_delete_module"],
+ [107, "sys_timer_create"],
+ [108, "sys_timer_gettime"],
+ [109, "sys_timer_getoverrun"],
+ [110, "sys_timer_settime"],
+ [111, "sys_timer_delete"],
+ [112, "sys_clock_settime"],
+ [113, "sys_clock_gettime"],
+ [114, "sys_clock_getres"],
+ [115, "sys_clock_nanosleep"],
+ [116, "sys_syslog"],
+ [117, "sys_ptrace"],
+ [118, "sys_sched_setparam"],
+ [119, "sys_sched_setscheduler"],
+ [120, "sys_sched_getscheduler"],
+ [121, "sys_sched_getparam"],
+ [122, "sys_sched_setaffinity"],
+ [123, "sys_sched_getaffinity"],
+ [124, "sys_sched_yield"],
+ [125, "sys_sched_get_priority_max"],
+ [126, "sys_sched_get_priority_min"],
+ [127, "sys_sched_rr_get_interval"],
+ [128, "sys_restart_syscall"],
+ [129, "sys_kill"],
+ [130, "sys_tkill"],
+ [131, "sys_tgkill"],
+ [132, "sys_sigaltstack"],
+ [133, "sys_rt_sigsuspend"],
+ [134, "sys_rt_sigaction"],
+ [135, "sys_rt_sigprocmask"],
+ [136, "sys_rt_sigpending"],
+ [137, "sys_rt_sigtimedwait"],
+ [138, "sys_rt_sigqueueinfo"],
+ [139, "sys_rt_sigreturn"],
+ [140, "sys_setpriority"],
+ [141, "sys_getpriority"],
+ [142, "sys_reboot"],
+ [143, "sys_setregid"],
+ [144, "sys_setgid"],
+ [145, "sys_setreuid"],
+ [146, "sys_setuid"],
+ [147, "sys_setresuid"],
+ [148, "sys_getresuid"],
+ [149, "sys_setresgid"],
+ [150, "sys_getresgid"],
+ [151, "sys_setfsuid"],
+ [152, "sys_setfsgid"],
+ [153, "sys_times"],
+ [154, "sys_setpgid"],
+ [155, "sys_getpgid"],
+ [156, "sys_getsid"],
+ [157, "sys_setsid"],
+ [158, "sys_getgroups"],
+ [159, "sys_setgroups"],
+ [160, "sys_uname"],
+ [161, "sys_sethostname"],
+ [162, "sys_setdomainname"],
+ [163, "sys_getrlimit"],
+ [164, "sys_setrlimit"],
+ [165, "sys_getrusage"],
+ [166, "sys_umask"],
+ [167, "sys_prctl"],
+ [168, "sys_getcpu"],
+ [169, "sys_gettimeofday"],
+ [170, "sys_settimeofday"],
+ [171, "sys_adjtimex"],
+ [172, "sys_getpid"],
+ [173, "sys_getppid"],
+ [174, "sys_getuid"],
+ [175, "sys_geteuid"],
+ [176, "sys_getgid"],
+ [177, "sys_getegid"],
+ [178, "sys_gettid"],
+ [179, "sys_sysinfo"],
+ [180, "sys_mq_open"],
+ [181, "sys_mq_unlink"],
+ [182, "sys_mq_timedsend"],
+ [183, "sys_mq_timedreceive"],
+ [184, "sys_mq_notify"],
+ [185, "sys_mq_getsetattr"],
+ [186, "sys_msgget"],
+ [187, "sys_msgctl"],
+ [188, "sys_msgrcv"],
+ [189, "sys_msgsnd"],
+ [190, "sys_semget"],
+ [191, "sys_semctl"],
+ [192, "sys_semtimedop"],
+ [193, "sys_semop"],
+ [194, "sys_shmget"],
+ [195, "sys_shmctl"],
+ [196, "sys_shmat"],
+ [197, "sys_shmdt"],
+ [198, "sys_socket"],
+ [199, "sys_socketpair"],
+ [200, "sys_bind"],
+ [201, "sys_listen"],
+ [202, "sys_accept"],
+ [203, "sys_connect"],
+ [204, "sys_getsockname"],
+ [205, "sys_getpeername"],
+ [206, "sys_sendto"],
+ [207, "sys_recvfrom"],
+ [208, "sys_setsockopt"],
+ [209, "sys_getsockopt"],
+ [210, "sys_shutdown"],
+ [211, "sys_sendmsg"],
+ [212, "sys_recvmsg"],
+ [213, "sys_readahead"],
+ [214, "sys_brk"],
+ [215, "sys_munmap"],
+ [216, "sys_mremap"],
+ [217, "sys_add_key"],
+ [218, "sys_request_key"],
+ [219, "sys_keyctl"],
+ [220, "sys_clone"],
+ [221, "sys_execve"],
+ [222, "sys_mmap"],
+ [223, "sys_fadvise64"],
+ [224, "sys_swapon"],
+ [225, "sys_swapoff"],
+ [226, "sys_mprotect"],
+ [227, "sys_msync"],
+ [228, "sys_mlock"],
+ [229, "sys_munlock"],
+ [230, "sys_mlockall"],
+ [231, "sys_munlockall"],
+ [232, "sys_mincore"],
+ [233, "sys_madvise"],
+ [234, "sys_remap_file_pages"],
+ [235, "sys_mbind"],
+ [236, "sys_get_mempolicy"],
+ [237, "sys_set_mempolicy"],
+ [238, "sys_migrate_pages"],
+ [239, "sys_move_pages"],
+ [240, "sys_rt_tgsigqueueinfo"],
+ [241, "sys_perf_event_open"],
+ [242, "sys_accept4"],
+ [243, "sys_recvmmsg"],
+ [244, "sys_arch_specific_syscall"],
+ [260, "sys_wait4"],
+ [261, "sys_prlimit64"],
+ [262, "sys_fanotify_init"],
+ [263, "sys_fanotify_mark"],
+ [264, "sys_name_to_handle_at"],
+ [265, "sys_open_by_handle_at"],
+ [266, "sys_clock_adjtime"],
+ [267, "sys_syncfs"],
+ [268, "sys_setns"],
+ [269, "sys_sendmmsg"],
+ [270, "sys_process_vm_readv"],
+ [271, "sys_process_vm_writev"],
+ [272, "sys_kcmp"],
+ [273, "sys_finit_module"],
+ [274, "sys_sched_setattr"],
+ [275, "sys_sched_getattr"],
+ [276, "sys_renameat2"],
+ [277, "sys_seccomp"],
+ [278, "sys_getrandom"],
+ [279, "sys_memfd_create"],
+ [280, "sys_bpf"],
+ [281, "sys_execveat"],
+ [282, "sys_userfaultfd"],
+ [283, "sys_membarrier"],
+ [284, "sys_mlock2"],
+ [285, "sys_copy_file_range"],
+ [286, "sys_preadv2"],
+ [287, "sys_pwritev2"],
+ [288, "sys_pkey_mprotect"],
+ [289, "sys_pkey_alloc"],
+ [290, "sys_pkey_free"],
+ [291, "sys_statx"],
+ [292, "sys_io_pgetevents"],
+ [293, "sys_rseq"],
+ [294, "sys_kexec_file_load"],
+ [403, "sys_clock_gettime64"],
+ [404, "sys_clock_settime64"],
+ [405, "sys_clock_adjtime64"],
+ [406, "sys_clock_getres_time64"],
+ [407, "sys_clock_nanosleep_time64"],
+ [408, "sys_timer_gettime64"],
+ [409, "sys_timer_settime64"],
+ [410, "sys_timerfd_gettime64"],
+ [411, "sys_timerfd_settime64"],
+ [412, "sys_utimensat_time64"],
+ [413, "sys_pselect6_time64"],
+ [414, "sys_ppoll_time64"],
+ [416, "sys_io_pgetevents_time64"],
+ [417, "sys_recvmmsg_time64"],
+ [418, "sys_mq_timedsend_time64"],
+ [419, "sys_mq_timedreceive_time64"],
+ [420, "sys_semtimedop_time64"],
+ [421, "sys_rt_sigtimedwait_time64"],
+ [422, "sys_futex_time64"],
+ [423, "sys_sched_rr_get_interval_time64"],
+ [424, "sys_pidfd_send_signal"],
+ [425, "sys_io_uring_setup"],
+ [426, "sys_io_uring_enter"],
+ [427, "sys_io_uring_register"],
+ [428, "sys_open_tree"],
+ [429, "sys_move_mount"],
+ [430, "sys_fsopen"],
+ [431, "sys_fsconfig"],
+ [432, "sys_fsmount"],
+ [433, "sys_fspick"],
+ [434, "sys_pidfd_open"],
+ [435, "sys_clone3"],
+ [436, "sys_close_range"],
+ [437, "sys_openat2"],
+ [438, "sys_pidfd_getfd"],
+ [439, "sys_faccessat2"],
+ [440, "sys_process_madvise"],
+ [441, "sys_epoll_pwait2"],
+ [442, "sys_mount_setattr"],
+ [443, "sys_quotactl_fd"],
+ [444, "sys_landlock_create_ruleset"],
+ [445, "sys_landlock_add_rule"],
+ [446, "sys_landlock_restrict_self"],
+ [447, "sys_memfd_secret"],
+ [448, "sys_process_mrelease"],
+ [449, "sys_futex_waitv"],
+ [450, "sys_set_mempolicy_home_node"],
+ [451, "sys_cachestat"],
+ [452, "sys_fchmodat2"],
+ [453, "sys_syscalls"]
+]);
\ No newline at end of file
diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts
index 7bda9c89dd3648f3c8ef1ef178b154f1c7cd029f..c5873d745de8af9417a49f028c4f8914859cb0e4 100644
--- a/ide/src/trace/component/trace/base/TraceRow.ts
+++ b/ide/src/trace/component/trace/base/TraceRow.ts
@@ -79,6 +79,7 @@ export class TraceRow extends HTMLElement {
static ROW_TYPE_APP_STARTUP = 'app-startup';
static ROW_TYPE_STATIC_INIT = 'static-init';
static ROW_TYPE_THREAD = 'thread';
+ static ROW_TYPE_THREAD_SYS_CALL = 'thread-sys-call';
static ROW_TYPE_THREAD_NAME = 'sameThread_process';
static ROW_TYPE_MEM = 'mem';
static ROW_TYPE_VIRTUAL_MEMORY_GROUP = 'virtual-memory-group';
@@ -354,12 +355,21 @@ export class TraceRow extends HTMLElement {
}
set rowDiscard(value: boolean) {
+ let height = 0;
if (value) {
this.setAttribute('row-discard', '');
this.style.display = 'none';
+ height = 0;
} else {
this.removeAttribute('row-discard');
this.style.display = 'block';
+ height = this.clientHeight;
+ }
+ if (this.collect) {
+ window.publish(window.SmartEvent.UI.RowHeightChange, {
+ expand: this.funcExpand,
+ value: height,
+ });
}
}
@@ -656,7 +666,7 @@ export class TraceRow extends HTMLElement {
}
// @ts-ignore
- addChildTraceRowAfter(child: TraceRow, targetRow: TraceRow): void {
+ addChildTraceRowAfter(child: TraceRow, targetRow: TraceRow, hidden: boolean = false): void {
// @ts-ignore
TraceRowConfig.allTraceRowList.push(child);
child.parentRowEl = this;
@@ -665,11 +675,11 @@ export class TraceRow extends HTMLElement {
child.setAttribute('scene', '');
if (index !== -1) {
this.childrenList.splice(index + 1, 0, child);
- child.rowHidden = false;
+ child.rowHidden = hidden;
this.fragment.insertBefore(child, this.fragment.childNodes.item(index + 1));
} else {
this.childrenList.push(child);
- child.rowHidden = false;
+ child.rowHidden = hidden;
this.fragment.append(child);
}
}
@@ -1022,21 +1032,23 @@ export class TraceRow extends HTMLElement {
this.describeEl?.appendChild(this.rowCheckFilePop);
}
- addRowSettingCheckBox(): void {
+ addRowSettingCheckBox(appendAll: boolean = true): void {
let nameEl = this.shadowRoot && (this.shadowRoot.querySelector('.name') as HTMLLabelElement);
nameEl && (nameEl.style.maxWidth = '160px');
let collectEl = (this.shadowRoot && this.shadowRoot.querySelector('.collect') as LitIcon);
collectEl && (collectEl.style.marginRight = '20px');
this.rowSettingCheckBoxPop = document.createElement('lit-popover') as LitPopover;
let checkboxHtml = '';
- checkboxHtml += `
+ if (appendAll) {
+ checkboxHtml += `
extends HTMLElement {
item.onchange = (e: unknown): void => {
// @ts-ignore
this._rowSettingCheckedBoxList[this._rowSettingCheckBoxList?.indexOf(item.value)] = item.checked;
- const allChecked = this._rowSettingCheckedBoxList!.every(item => item);
- allCheckBox.checked = allChecked;
+ if (appendAll) {
+ const allChecked = this._rowSettingCheckedBoxList!.every(item => item);
+ allCheckBox.checked = allChecked;
+ }
this.onRowSettingCheckBoxChangeHandler?.(this._rowSettingCheckedBoxList!);
};
});
- allCheckBox.onchange = (e: unknown): void => {
- checkBoxItems.forEach(item => {
- // @ts-ignore
- item.checked = allCheckBox.checked;
- });
- this._rowSettingCheckedBoxList!.forEach((_, index) => {
- this._rowSettingCheckedBoxList![index] = allCheckBox.checked;
- });
- this.onRowSettingCheckBoxChangeHandler?.(this._rowSettingCheckedBoxList!);
- };
+ if (appendAll) {
+ allCheckBox.onchange = (e: unknown): void => {
+ checkBoxItems.forEach(item => {
+ // @ts-ignore
+ item.checked = allCheckBox.checked;
+ });
+ this._rowSettingCheckedBoxList!.forEach((_, index) => {
+ this._rowSettingCheckedBoxList![index] = allCheckBox.checked;
+ });
+ this.onRowSettingCheckBoxChangeHandler?.(this._rowSettingCheckedBoxList!);
+ };
+ }
this.rowSettingCheckBoxPop.id = 'rowSetting';
this.rowSettingCheckBoxPop.className = 'popover setting';
this.rowSettingCheckBoxPop.setAttribute('placement', 'bottomLeft');
@@ -1122,6 +1138,14 @@ export class TraceRow extends HTMLElement {
return [];
}
+ getRowSettingCheckStateByKey(key: string): boolean {
+ const index = this._rowSettingCheckBoxList?.indexOf(key);
+ if (index != undefined) {
+ return this._rowSettingCheckedBoxList?.[index] === true;
+ }
+ return false;
+ }
+
//@ts-ignore
expandFunc(rootRow: TraceRow, sp: SpSystemTrace): void {
if (this._enableCollapseChart && !this.funcExpand) {
@@ -1388,6 +1412,10 @@ export class TraceRow extends HTMLElement {
if (this.tipEL) {
this.tipEL.style.display = 'none';
}
+ if (this.rowSettingCheckBoxPop) {
+ //@ts-ignore
+ this.rowSettingCheckBoxPop.visible = false;
+ }
}
loadingPin1: number = 0;
@@ -1395,7 +1423,7 @@ export class TraceRow extends HTMLElement {
static currentActiveRows: Array = [];
drawFrame(): void {
- if (!this.hasAttribute('row-hidden')) {
+ if (!this.hasAttribute('row-hidden') && !this.hasAttribute('row-discard')) {
if (!this.loadingFrame || window.isLastFrame || !this.isComplete) {
if (this.needRefresh || window.isLastFrame) {
this.loadingFrame = true;
diff --git a/ide/src/trace/component/trace/base/TraceRowConfig.ts b/ide/src/trace/component/trace/base/TraceRowConfig.ts
index 904bef122abc92cd741173e055e3b43992b04803..b43e77e9dcabfe8ad94f508fa042bf1750c85fa2 100644
--- a/ide/src/trace/component/trace/base/TraceRowConfig.ts
+++ b/ide/src/trace/component/trace/base/TraceRowConfig.ts
@@ -441,7 +441,7 @@ export class TraceRowConfig extends BaseElement {
private initSwitchClickListener(): void {
let jsonUrl = `https://${window.location.host.split(':')[0]}:${window.location.port
- }/application/trace/config/custom_temp_config.json`;
+ }${window.location.pathname}trace/config/custom_temp_config.json`;
this.switchButton!.addEventListener('click', () => {
// @ts-ignore
this.inputElement?.value = '';
diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts
index c16465188dfee9496b841f1b2ba3ec8adc196a22..5a20b88e859eafb17705310524e1cf0c9a1f420c 100644
--- a/ide/src/trace/component/trace/base/TraceSheet.ts
+++ b/ide/src/trace/component/trace/base/TraceSheet.ts
@@ -16,7 +16,13 @@
import { BaseElement, element } from '../../../../base-ui/BaseElement';
import { type LitTabs } from '../../../../base-ui/tabs/lit-tabs';
import { LitTabpane } from '../../../../base-ui/tabs/lit-tabpane';
-import { BoxJumpParam, SelectionParam, SliceBoxJumpParam } from '../../../bean/BoxSelection';
+import {
+ BoxJumpParam,
+ SelectionParam,
+ SysCallBoxJumpParam,
+ SliceBoxJumpParam,
+ PerfSampleBoxJumpParam
+} from '../../../bean/BoxSelection';
import { type TabPaneCurrentSelection } from '../sheet/TabPaneCurrentSelection';
import { type TabPaneFlag } from '../timer-shaft/TabPaneFlag';
import { type Flag } from '../timer-shaft/Flag';
@@ -28,6 +34,7 @@ import { type CpuStruct } from '../../../database/ui-worker/cpu/ProcedureWorkerC
import { CpuFreqStruct } from '../../../database/ui-worker/ProcedureWorkerFreq';
import { CpuFreqLimitsStruct } from '../../../database/ui-worker/cpu/ProcedureWorkerCpuFreqLimits';
import { type ThreadStruct } from '../../../database/ui-worker/ProcedureWorkerThread';
+import { type ThreadSysCallStruct } from '../../../database/ui-worker/ProcedureWorkerThreadSysCall';
import { type FuncStruct } from '../../../database/ui-worker/ProcedureWorkerFunc';
import { ProcessMemStruct } from '../../../database/ui-worker/ProcedureWorkerMem';
import { CpuStateStruct } from '../../../database/ui-worker/cpu/ProcedureWorkerCpuState';
@@ -110,6 +117,8 @@ import { PerfFunctionAsmParam } from '../../../bean/PerfAnalysis';
import { info, error } from '../../../../log/Log';
import { XpowerThreadCountStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerThreadCount';
import { XpowerGpuFreqCountStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerGpuFreqCount';
+import { TabPaneSysCallChild } from '../sheet/process/TabPaneSysCallChild';
+import { TabPanePerfSampleChild } from '../sheet/hiperf/TabPerfSampleChild';
@element('trace-sheet')
@@ -119,6 +128,7 @@ export class TraceSheet extends BaseElement {
private switchDiv: LitPopover | undefined | null;
private processTree: LitTree | undefined | null;
private importDiv: HTMLDivElement | undefined | null;
+ private symbolDiv: HTMLDivElement | undefined | null;
private exportBt: LitIcon | undefined | null;
private nav: HTMLDivElement | undefined | null;
private tabs: HTMLDivElement | undefined | null;
@@ -195,6 +205,7 @@ export class TraceSheet extends BaseElement {
e.preventDefault();
});
this.importDiv = this.shadowRoot?.querySelector('#import_div');
+ this.symbolDiv = this.shadowRoot?.querySelector('#symbol_div');
this.switchDiv = this.shadowRoot?.querySelector('#select-process');
this.processTree = this.shadowRoot?.querySelector('#processTree');
this.optionsDiv = this.shadowRoot?.querySelector('#options');
@@ -301,6 +312,14 @@ export class TraceSheet extends BaseElement {
this.getComponentByID('box-slices')?.addEventListener('td-click', (evt: unknown) => {
this.tdSliceClickHandler(evt);
});
+ // @ts-ignore
+ this.getComponentByID('box-thread-syscall')?.addEventListener('td-click', (evt: unknown) => {
+ this.tdSysCallClickHandler(evt);
+ });
+ // @ts-ignore
+ this.getComponentByID('box-perf-profile')?.addEventListener('td-click', (evt: unknown) => {
+ this.tdPerfSampleClickHandler(evt);
+ });
}
private perfAnalysisListener(evt: MouseEvent): void {
@@ -609,19 +628,32 @@ export class TraceSheet extends BaseElement {
let importFileBt: HTMLInputElement | undefined | null =
this.shadowRoot?.querySelector('#import-file');
importFileBt!.addEventListener('change', (event): void => {
- let files = importFileBt?.files;
- if (files) {
- let fileList: Array = [];
- for (let file of files) {
- fileList.push(file);
+ WebSocketManager.instance = null;
+ WebSocketManager.getInstance();
+ let timerOut = window.setTimeout(() => {
+ window.clearTimeout(timerOut);
+ let errorTipHtml = document.querySelector('body > sp-application')?.shadowRoot?.querySelector('#sp-system-trace')
+ ?.shadowRoot?.querySelector('div > trace-sheet')?.shadowRoot?.querySelector('#box-perf-analysis > tabpane-perf-analysis')?.shadowRoot?.querySelector('#SO-err-tips');
+ let connected = document.querySelector('body > sp-application')
+ ?.shadowRoot?.querySelector('#main-menu')?.shadowRoot?.querySelector('div.bottom > div.extend_connect') as HTMLDivElement;
+ if (connected && connected.style.backgroundColor !== 'green') {
+ errorTipHtml!.innerHTML = 'Please check if the extension service is enabled and try again!';
+ importFileBt!.files = null;
+ importFileBt!.value = '';
+ return;
}
- if (fileList.length > 0) {
- importFileBt!.disabled = true;
- this.loadSoComplete = false;
- window.publish(window.SmartEvent.UI.Loading, { loading: true, text: 'Import So File' });
- this.uploadSoOrAN(fileList).then(r => {
- // @ts-ignore
- document.querySelector('body > sp-application').shadowRoot.querySelector('#sp-system-trace').shadowRoot.querySelector('div > trace-sheet').shadowRoot.querySelector('#box-perf-analysis > tabpane-perf-analysis').shadowRoot.querySelector('#SO-err-tips')?.innerHTML = '';
+ let files = importFileBt?.files;
+ if (files) {
+ let fileList: Array = [];
+ for (let file of files) {
+ fileList.push(file);
+ }
+ if (fileList.length > 0) {
+ importFileBt!.disabled = true;
+ this.loadSoComplete = false;
+ window.publish(window.SmartEvent.UI.Loading, { loading: true, text: 'Import So File' });
+ this.uploadSoOrAN(fileList).then(r => {
+ errorTipHtml!.innerHTML = '';
let soFileList = fileList.filter(item => !item.name.includes('.an'));
if (soFileList.length === 0) {
window.publish(window.SmartEvent.UI.UploadSOFile, {});
@@ -653,7 +685,57 @@ export class TraceSheet extends BaseElement {
}
importFileBt!.files = null;
importFileBt!.value = '';
+ }, 500)
});
+ this.addClickEventToSoSymbolImport();
+ }
+
+ private addClickEventToSoSymbolImport(): void{
+ let symbolBt: HTMLInputElement | undefined | null =
+ this.shadowRoot?.querySelector('#so-symbolization');
+ symbolBt!.addEventListener('change', (event): void => {
+ let files = symbolBt?.files;
+ if (files) {
+ let fileList: Array = [];
+ for (let file of files) {
+ fileList.push(file);
+ }
+ if (fileList.length > 0) {
+ symbolBt!.disabled = true;
+ window.publish(window.SmartEvent.UI.Loading, { loading: true, text: 'Import So File' });
+ // @ts-ignore
+ document.querySelector('body > sp-application').shadowRoot.querySelector('#sp-system-trace').shadowRoot.querySelector('div > trace-sheet').shadowRoot.querySelector('#box-perf-analysis > tabpane-perf-analysis').shadowRoot.querySelector('#SO-err-tips')?.innerHTML = '';
+ let soFileList = fileList.filter(item => item.name.includes('.so'));
+ if (soFileList.length === 0) {
+ window.publish(window.SmartEvent.UI.UploadSOFile, {});
+ symbolBt!.disabled = false;
+ return;
+ }
+ threadPool.submit(
+ 'upload-so',
+ '',
+ soFileList,
+ (res: unknown) => {
+ symbolBt!.disabled = false;
+ setTimeout(() => {
+ // @ts-ignore
+ if (res.result === 'ok') {
+ window.publish(window.SmartEvent.UI.UploadSOFile, {});
+ } else {
+ // @ts-ignore
+ const failedList = res.failedArray.join(',');
+ window.publish(window.SmartEvent.UI.Error, `parse so file ${failedList} failed!`);
+ }
+ }, 500);
+ },
+ 'upload-so'
+ );
+ }
+ fileList.length = 0;
+ }
+ symbolBt!.files = null;
+ symbolBt!.value = '';
+ })
}
private async uploadSoOrAN(fileList: Array): Promise {
@@ -728,21 +810,21 @@ export class TraceSheet extends BaseElement {
let blob: Blob | null = file.slice(writeSize, writeSize + sliceLen);
let buffer: ArrayBuffer | null = await blob.arrayBuffer();
let data: Uint8Array | null = new Uint8Array(buffer);
-
- const dataObject = {
+ const dataObject = {
file_name: fileName,
buffer_index: bufferIndex,
buffer_size: sliceLen,
total_size: file.size,
- is_last: writeSize + sliceLen >= file.size,
- buffer: Array.from(data),
+ is_last: writeSize + sliceLen >= file.size
};
-
-
const dataString = JSON.stringify(dataObject);
+ const jsonStr = `${dataString.length}|${dataString}`;
const textEncoder = new TextEncoder();
- const encodedData = textEncoder.encode(dataString);
- wsInstance!.sendMessage(TypeConstants.DISASSEMBLY_TYPE, Constants.DISASSEMBLY_SAVE_CMD, encodedData);
+ const jsonData = textEncoder.encode(jsonStr);
+ let mergeData: Uint8Array = new Uint8Array(jsonData.length + data.length);
+ mergeData.set(jsonData);
+ mergeData.set(data, jsonData.length);
+ wsInstance!.sendMessage(TypeConstants.DISASSEMBLY_TYPE, Constants.DISASSEMBLY_SAVE_CMD, mergeData);
writeSize += sliceLen;
// 等待服务器端确认当前分片的 ACK
await waitForAck();
@@ -836,9 +918,16 @@ export class TraceSheet extends BaseElement {
-
`;
});
- this._rowSettingCheckedBoxList = new Array(this._rowSettingCheckBoxList?.length).fill(true);
+ this._rowSettingCheckedBoxList = new Array(this._rowSettingCheckBoxList?.length).fill(appendAll);
this.rowSettingCheckBoxPop.innerHTML = `
${checkboxHtml}
@@ -1048,21 +1060,25 @@ export class TraceRow
+ = [];
+ private processMap: Map = new Map();
+ private sortKey: string = 'timeString';
+ private sortType: number = 0;
+
+ set data(sampleChildParam: PerfSampleBoxJumpParam | null | undefined) {
+ if (sampleChildParam === this.param || !sampleChildParam?.isJumpPage) {
+ return;
+ }
+ this.param = sampleChildParam;
+ this.perfSampleTbl!.style.visibility = 'visible';
+ // @ts-ignore
+ this.perfSampleTbl?.shadowRoot?.querySelector('.table')?.style?.height = `${
+ this.parentElement!.clientHeight - 40
+ }px`;
+ this.perfSampleTbl!.recycleDataSource = [];
+ // @ts-ignore
+ this.tblData?.shadowRoot?.querySelector('.table')?.style?.height = `${this.parentElement!.clientHeight - 25}px`;
+ this.tblData!.recycleDataSource = [];
+ if (sampleChildParam) {
+ Promise.all([
+ queryPerfProcess(),
+ queryPerfSampleChildListByTree(
+ sampleChildParam.leftNs,
+ sampleChildParam.rightNs,
+ sampleChildParam.pid,
+ sampleChildParam.tid,
+ ),
+ ]).then((results) => {
+ let processes = results[0] as Array;
+ log(`queryPerfProcess size : ${processes.length}`);
+ let samples = results[1] as Array;
+ log(`queryPerfSampleChildListByTree size : ${samples.length}`);
+ this.processMap.clear();
+ for (let process of processes) {
+ this.processMap.set(process.pid, process);
+ }
+
+ this.initPerfSampleData(samples.filter(it => {
+ if (sampleChildParam.tsArr && sampleChildParam.tsArr.length > 0) {
+ return sampleChildParam.tsArr.some(ts => it.time === ts)
+ }
+ return true;
+ }));
+ });
+ }
+ }
+
+ private initPerfSampleData(samples: PerfSample[]): void {
+ for (let sample of samples) {
+ let process = this.processMap.get(sample.pid);
+ sample.processName =
+ process === null || process === undefined
+ ? `Process(${sample.pid})`
+ : `${process!.processName || 'Process'}(${sample.pid})`;
+ sample.threadName =
+ sample.threadName === null || sample.threadName === undefined
+ ? `Thread(${sample.tid})`
+ : `${sample.threadName}(${sample.tid})`;
+ sample.coreName = `CPU ${sample.core}`;
+ sample.timeString = Utils.getTimeString(sample.time);
+ sample.backtrace = [];
+ let call = perfDataQuery.callChainMap.get(sample.sampleId);
+ if (call === undefined || call === null) {
+ sample.depth = 0;
+ sample.backtrace.push('No Effective Call Stack');
+ } else {
+ sample.depth = call.depth;
+ if (typeof call.name === 'number') {
+ call.name = SpSystemTrace.DATA_DICT.get(call.name) || '';
+ }
+ sample.backtrace.push(call.name);
+ sample.backtrace.push(`(${sample.depth} other frames)`);
+ }
+ }
+ this.perfSampleSource = samples;
+ this.sortPerfSampleTable(this.sortKey, this.sortType);
+ }
+
+ setRightTableData(sample: PerfSample): void {
+ queryPerfSampleCallChain(sample.sampleId).then((result) => {
+ for (let stack of result) {
+ if (stack.sourceId !== undefined) {
+ stack.sourceFile = SpSystemTrace.DATA_DICT.get(stack.sourceId) || '';
+ }
+ if (typeof stack.symbol === 'number') {
+ stack.symbol = SpSystemTrace.DATA_DICT.get(stack.symbol) || '';
+ }
+ if (stack.sourceFile && stack.lineNumber !== undefined) {
+ stack.symbol = `${stack.symbol}[${stack.sourceFile}(${stack.lineNumber})]`;
+ }
+ // @ts-ignore
+ let files = (perfDataQuery.filesData[stack.fileId] ?? []) as Array;
+ stack.path = files[stack.symbolId]?.path || '';
+ stack.type = stack.path.endsWith('.so.1') || stack.path.endsWith('.dll') || stack.path.endsWith('.so') ? 0 : 1;
+ }
+ this.tblData!.dataSource = result;
+ });
+ }
+
+ initElements(): void {
+ this.perfSampleTbl = this.shadowRoot?.querySelector('#tb-perf-sample');
+ this.tblData = this.shadowRoot?.querySelector('#tb-stack-data');
+ //监听row的点击事件，在对应起始时间上画标记棋子,并设置调用栈数据
+ this.perfSampleTbl!.addEventListener('row-click', (e) => {
+ // @ts-ignore
+ let data = e.detail.data as PerfSample;
+ this.setRightTableData(data);
+ // @ts-ignore
+ data.isSelected = true;
+ this.perfSampleTbl!.clearAllSelection(data);
+ this.perfSampleTbl!.setCurrentSelection(data);
+ document.dispatchEvent(
+ new CustomEvent('triangle-flag', {
+ detail: { time: [data.time], type: 'triangle' },
+ })
+ );
+ });
+ this.perfSampleTbl!.addEventListener('column-click', (evt) => {
+ // @ts-ignore
+ this.sortKey = evt.detail.key;
+ // @ts-ignore
+ this.sortType = evt.detail.sort;
+ // @ts-ignore
+ this.sortPerfSampleTable(evt.detail.key, evt.detail.sort);
+ });
+ }
+
+ connectedCallback(): void {
+ super.connectedCallback();
+ new ResizeObserver(() => {
+ if (this.parentElement?.clientHeight !== 0) {
+ // @ts-ignore
+ this.perfSampleTbl?.shadowRoot.querySelector('.table').style.height = `${
+ this.parentElement!.clientHeight - 40
+ }px`;
+ // @ts-ignore
+ this.tblData?.shadowRoot.querySelector('.table').style.height = `${this.parentElement.clientHeight - 25}px`;
+ this.perfSampleTbl?.reMeauseHeight();
+ this.tblData?.reMeauseHeight();
+ }
+ }).observe(this.parentElement!);
+ }
+
+ sortPerfSampleTable(key: string, type: number): void {
+ this.perfSampleSource.sort((perfSampleA, perfSampleB): number => {
+ if (key === 'timeString') {
+ if (type === 0) {
+ return perfSampleA.time - perfSampleB.time;
+ } else if (type === 1) {
+ return perfSampleA.time - perfSampleB.time;
+ } else {
+ return perfSampleB.time - perfSampleA.time;
+ }
+ } else {
+ if (type === 0) {
+ return perfSampleA.core - perfSampleB.core;
+ } else if (type === 1) {
+ return perfSampleA.core - perfSampleB.core;
+ } else {
+ return perfSampleB.core - perfSampleA.core;
+ }
+ }
+ });
+ this.perfSampleTbl!.recycleDataSource = this.perfSampleSource;
+ }
+
+ initHtml(): string {
+ return `
+;
stack.path = files[stack.symbolId]?.path || '';
stack.type = stack.path.endsWith('.so.1') || stack.path.endsWith('.dll') || stack.path.endsWith('.so') ? 0 : 1;
diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts
index 212d6bd788ce0d79eaf1e97794542d0aafb752a5..83ea5de7bddf9c295c805b07a17bfba0273a09b2 100644
--- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts
+++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMStatstics.ts
@@ -76,11 +76,6 @@ export class TabPaneNMStatstics extends BaseElement {
queryData(nativeStatisticsParam: SelectionParam): void {
Promise.all([
queryNativeHookStatistics(nativeStatisticsParam.leftNs, nativeStatisticsParam.rightNs, this.currentSelectIPid),
- queryNativeHookStatisticsSubType(
- nativeStatisticsParam.leftNs,
- nativeStatisticsParam.rightNs,
- this.currentSelectIPid
- ),
queryNativeHookStatisticsMalloc(
nativeStatisticsParam.leftNs,
nativeStatisticsParam.rightNs,
@@ -94,7 +89,7 @@ export class TabPaneNMStatstics extends BaseElement {
let index3 = nativeStatisticsParam.nativeMemory.indexOf(this.nativeType[2]);
this.setMemoryTypeData(nativeStatisticsParam, values[0], arr);
if (index1 !== -1 || index3 !== -1) {
- this.setSubTypeTableData(values[1], arr);
+ this.setSubTypeTableData([values[0][1]], arr);
}
let type = 0;
if (index1 !== -1 || (index2 !== -1 && index3 !== -1)) {
@@ -102,7 +97,7 @@ export class TabPaneNMStatstics extends BaseElement {
} else {
type = index2 !== -1 ? 1 : 2;
}
- this.setMallocTableData(values[2], arr, type);
+ this.setMallocTableData(values[1], arr, type);
this.nativeStatisticsSource = arr;
this.sortByColumn(this.sortColumn, this.sortType);
});
diff --git a/ide/src/trace/component/trace/sheet/parallel/TabPaneMtParallel.ts b/ide/src/trace/component/trace/sheet/parallel/TabPaneMtParallel.ts
index 0da3c2f3efba7d0a0985ec53248143846b38a620..123880cc106f33653ce3fa4974d94b4d8f062a9b 100644
--- a/ide/src/trace/component/trace/sheet/parallel/TabPaneMtParallel.ts
+++ b/ide/src/trace/component/trace/sheet/parallel/TabPaneMtParallel.ts
@@ -30,9 +30,9 @@ import { Utils } from '../../base/Utils';
const UNIT: number = 1000000.0;
const NUM_DIGITS: number = 3;
const CORE_NUM: number = 12;
-const SMALL_CPU_NUM: Array = [0, 1, 2, 3];
+const LITTLE_CPU_NUM: Array = [0, 1, 2, 3];
const MID_CPU_NUM12: Array = [4, 5, 6, 7, 8, 9];
-const LARGE_CPU_NUM12: Array = [10, 11];
+const BIG_CPU_NUM12: Array = [10, 11];
const CORE_JSON = {
'group1': [4, 5],
'group2': [6, 7],
@@ -41,9 +41,9 @@ const CORE_JSON = {
};
export class CpuStatus {
cpu: number = 0;
- small: boolean = false;
+ little: boolean = false;
medium: boolean = false;
- large: boolean = false;
+ big: boolean = false;
}
@element('tabpane-mt-parallel')
export class TabPaneMtParallel extends BaseElement {
@@ -57,8 +57,8 @@ export class TabPaneMtParallel extends BaseElement {
private leftStartNs: number = 0;
private rightEndNs: number = 0;
private midCores: Array = [];
- private largeCores: Array = [];
- private smallCores: Array = [];
+ private bigCores: Array = [];
+ private littleCores: Array = [];
private isCreateCpu: boolean = true;
private isCreateGroup: boolean = true;
private coreTypeMap: Map = new Map();
@@ -94,7 +94,7 @@ export class TabPaneMtParallel extends BaseElement {
if (this.isCreateCpu) {
this.initDefaultConfig();
this.isCreateCpu = false;
- this.bottomFilterEl!.setCoreConfigList(Utils.getInstance().getWinCpuCount(), this.smallCores, this.midCores, this.largeCores);
+ this.bottomFilterEl!.setCoreConfigList(Utils.getInstance().getWinCpuCount(), this.littleCores, this.midCores, this.bigCores);
};
};
this.litSettingPopoverEl!.querySelector('.confirm-button')!.addEventListener('click', (e: unknown) => {
@@ -171,7 +171,7 @@ export class TabPaneMtParallel extends BaseElement {
updateDataSource(flag: boolean): void {
let param = flag ? this.bufferGroupMap.size !== 0 : Utils.getInstance().getWinCpuCount() === CORE_NUM;
let value = flag ? this.bufferGroupMap : new Map(Object.entries(CORE_JSON));
- if ((this.midCores.length || this.largeCores.length || this.smallCores.length) && param) {
+ if ((this.midCores.length || this.bigCores.length || this.littleCores.length) && param) {
this.coreTypeMap.clear();
this.dataSourceMap.clear();
this.parallelTable!.loading = true;
@@ -186,7 +186,7 @@ export class TabPaneMtParallel extends BaseElement {
}
}
async getMtParallelData(obj: Map) :Promise {
- let cpuObj: unknown = { 'L': this.largeCores, 'M': this.midCores, 'S': this.smallCores };
+ let cpuObj: unknown = { 'B': this.bigCores, 'M': this.midCores, 'L': this.littleCores };
let processIds: Array = [...new Set(this.selectionParam!.processIds)];
for (const [key, cpuGroup] of obj.entries()) {
//判断配的的组是否在同一个核分类中，如果在，返回是那个核分类，反之，返回null
@@ -238,7 +238,7 @@ export class TabPaneMtParallel extends BaseElement {
}
//判断自配的相同物理核是否符合计算MT并行度的要求
- handleSamePhysicsCore(arr: unknown, obj: { 'L': Array; 'M': Array; 'S': Array }): string | null {
+ handleSamePhysicsCore(arr: unknown, obj: { 'B': Array; 'M': Array; 'S': Array }): string | null {
let core = null;
// @ts-ignore
if (arr.length > 2) { return null }
@@ -384,13 +384,13 @@ export class TabPaneMtParallel extends BaseElement {
initDefaultConfig(): void {
if (this.isCreateCpu) {
if (Utils.getInstance().getWinCpuCount() === CORE_NUM) {
- this.smallCores = [...SMALL_CPU_NUM];
+ this.littleCores = [...LITTLE_CPU_NUM];
this.midCores = [...MID_CPU_NUM12];
- this.largeCores = [...LARGE_CPU_NUM12];
+ this.bigCores = [...BIG_CPU_NUM12];
} else {
- this.smallCores = [];
+ this.littleCores = [];
this.midCores = [];
- this.largeCores = [];
+ this.bigCores = [];
}
}
}
@@ -424,7 +424,7 @@ export class TabPaneMtParallel extends BaseElement {
disabled:
Utils.getInstance().getWinCpuCount() === CORE_NUM && str !== 'cut' && this.isReset ?
!(switchArr.includes(i)) :
- !([...this.smallCores, ...this.midCores, ...this.largeCores].includes(i))
+ !([...this.littleCores, ...this.midCores, ...this.bigCores].includes(i))
};
this.creatGroupLineDIv(obj);
}
diff --git a/ide/src/trace/component/trace/sheet/parallel/TabPaneTimeParallel.ts b/ide/src/trace/component/trace/sheet/parallel/TabPaneTimeParallel.ts
index 4e0acbdd625193fe7d73682b33df7f43203ea64c..34535d254b4abe62ccaba5234da14c38c1117bbc 100644
--- a/ide/src/trace/component/trace/sheet/parallel/TabPaneTimeParallel.ts
+++ b/ide/src/trace/component/trace/sheet/parallel/TabPaneTimeParallel.ts
@@ -29,9 +29,9 @@ import { Utils } from '../../base/Utils';
const UNIT: number = 1000000.0;
const NUM_DIGITS: number = 3;
const CORE_NUM: number = 12;
-const SMALL_CPU_NUM: Array = [0, 1, 2, 3];
+const LITTLE_CPU_NUM: Array = [0, 1, 2, 3];
const MID_CPU_NUM12: Array = [4, 5, 6, 7, 8, 9];
-const LARGE_CPU_NUM12: Array = [10, 11];
+const BIG_CPU_NUM12: Array = [10, 11];
@element('tabpane-time-parallel')
export class TabPaneTimeParallel extends BaseElement {
@@ -44,8 +44,8 @@ export class TabPaneTimeParallel extends BaseElement {
private leftStartNs: number = 0;
private rightEndNs: number = 0;
private midCores: Array = [];
- private largeCores: Array = [];
- private smallCores: Array = [];
+ private bigCores: Array = [];
+ private littleCores: Array = [];
private initStatus: boolean = true;
set data(threadStatesParam: SelectionParam) {
@@ -70,7 +70,7 @@ export class TabPaneTimeParallel extends BaseElement {
if (this.initStatus) {
this.initDefaultConfig();
this.initStatus = false;
- this.bottomFilterEl!.setCoreConfigList(Utils.getInstance().getWinCpuCount(), this.smallCores, this.midCores, this.largeCores);
+ this.bottomFilterEl!.setCoreConfigList(Utils.getInstance().getWinCpuCount(), this.littleCores, this.midCores, this.bigCores);
}
};
this.litPopoverEl!.querySelector('.confirm-button')!.addEventListener('click', (e: unknown) => {
@@ -85,7 +85,7 @@ export class TabPaneTimeParallel extends BaseElement {
// @ts-ignore
this.litPopoverEl!.visible = false;
//当大中小核未分组时，默认查询所有核
- if (!this.midCores.length && !this.largeCores.length && !this.smallCores.length) {
+ if (!this.midCores.length && !this.bigCores.length && !this.littleCores.length) {
this.assignAllCore();
} else {
this.assignGroupCore();
@@ -142,13 +142,13 @@ export class TabPaneTimeParallel extends BaseElement {
initDefaultConfig(): void {
if (this.initStatus) {
if (Utils.getInstance().getWinCpuCount() === CORE_NUM) {
- this.smallCores = [...SMALL_CPU_NUM];
+ this.littleCores = [...LITTLE_CPU_NUM];
this.midCores = [...MID_CPU_NUM12];
- this.largeCores = [...LARGE_CPU_NUM12];
+ this.bigCores = [...BIG_CPU_NUM12];
} else {
- this.smallCores = [];
+ this.littleCores = [];
this.midCores = [];
- this.largeCores = [];
+ this.bigCores = [];
}
}
}
@@ -166,9 +166,9 @@ export class TabPaneTimeParallel extends BaseElement {
let dataSourceMap: Map = new Map();
let processIds: Array = [...new Set(this.selectionParam!.processIds)];
let cpuObj: Object = {
- 'L': this.largeCores,
+ 'B': this.bigCores,
'M': this.midCores,
- 'S': this.smallCores
+ 'L': this.littleCores
};
for (const [key, val] of Object.entries(cpuObj)) {
if (val.length) {
diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts
index e75097d1ddeacdf678056a825c76d442d759ffe3..c8e6916c30af4d9c7b25856b32e51fefe0aa2e42 100644
--- a/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneSliceChild.ts
@@ -37,8 +37,10 @@ export class TabPaneSliceChild extends BaseElement {
//合并SF异步信息，相同pid和tid的name
let sfAsyncFuncMap: Map = new Map();
let filterSfAsyncFuncName = boxChildValue.selection!.funAsync;
- if (!boxChildValue.param.isSummary!) {
- filterSfAsyncFuncName = filterSfAsyncFuncName.filter((item) => item.name === boxChildValue.param.name![0]);
+ if (boxChildValue.param.name) {
+ filterSfAsyncFuncName = filterSfAsyncFuncName.filter((item) =>
+ boxChildValue.param.name?.some((boxItem) => item.name === boxItem)
+ );
}
filterSfAsyncFuncName.forEach((it: { name: string; pid: number, tid: number | undefined }) => {
if (sfAsyncFuncMap.has(`${it.pid}-${it.tid}`)) {
diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSysCall.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSysCall.ts
new file mode 100644
index 0000000000000000000000000000000000000000..45304351a00f0c8b278193f78461856d7c56a0d0
--- /dev/null
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneSysCall.ts
@@ -0,0 +1,243 @@
+/*
+ * 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';
+import { LitTable } from '../../../../../base-ui/table/lit-table';
+import { SelectionParam } from '../../../../bean/BoxSelection';
+import { log } from '../../../../../log/Log';
+import { getProbablyTime } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon';
+import { resizeObserver } from '../SheetUtils';
+import { querySysCallEventWithBoxSelect } from '../../../../database/sql/ProcessThread.sql';
+import { Utils } from '../../base/Utils';
+import { SysCallMap } from '../../base/SysCallUtils';
+
+interface SysCallItem {
+ nameId: number;
+ name: string;
+ pName: string;
+ tName: string;
+ tid: number;
+ pid: number;
+ totalCount: number;
+ sumDur: number;
+ durStr?: string;
+}
+
+interface SysCallTreeItem {
+ name: string;
+ id: number;
+ parentId?: number;
+ totalCount: number;
+ sumDur: number;
+ durStr: string;
+ level: string;
+ children: SysCallTreeItem[]
+}
+
+@element('tabpane-syscall')
+export class TabPaneSysCall extends BaseElement {
+ private sysCallTbl: LitTable | null | undefined;
+ private range: HTMLLabelElement | null | undefined;
+ private sysCallSource: Array = [];
+ private currentSelectionParam: SelectionParam | undefined;
+
+ set data(sysCallParam: SelectionParam | unknown) {
+ if (this.currentSelectionParam === sysCallParam) {
+ return;
+ } // @ts-ignore
+ this.currentSelectionParam = sysCallParam;
+ //@ts-ignore
+ this.sysCallTbl?.shadowRoot?.querySelector('.table')?.style?.height = `${this.parentElement!.clientHeight - 45}px`; // @ts-ignore
+ this.range!.textContent = `Selected range: ${((sysCallParam.rightNs - sysCallParam.leftNs) / 1000000.0).toFixed(
+ 5
+ )} ms`;
+ this.sysCallTbl!.loading = true;
+ let ipidArr: number[] = [];
+ Array.from(Utils.getInstance().sysCallEventTidsMap.values()).forEach(it => {
+ //@ts-ignore
+ if (sysCallParam?.processSysCallIds?.includes(it.pid)) {
+ ipidArr.push(it.ipid);
+ }
+ })
+ //@ts-ignore
+ querySysCallEventWithBoxSelect(ipidArr, sysCallParam.threadSysCallIds, sysCallParam.leftNs, sysCallParam.rightNs).then(
+ (retult) => {
+ this.flatternToTree(retult as SysCallItem[]);
+ }
+ );
+ }
+
+ private flatternToTree(result: SysCallItem[]): void {
+ this.sysCallTbl!.loading = false;
+ if (result !== null && result.length > 0) {
+ log(`getTabsysCalls result size : ${result.length}`);
+ let map: Map = new Map();
+ result.forEach((item) => {
+ item.name = SysCallMap.get(item.nameId) || '';
+ item.durStr = getProbablyTime(item.sumDur);
+ this.processSysCallItem(item, map);
+ });
+ let sysCalls: SysCallTreeItem[] = Array.from(map.values());
+ this.sysCallSource = sysCalls;
+ this.sysCallTbl!.recycleDataSource = this.sysCallSource;
+ } else {
+ this.sysCallSource = [];
+ this.sysCallTbl!.recycleDataSource = [];
+ }
+ }
+
+ private processSysCallItem(item: SysCallItem, map: Map): void {
+ const treeItem: SysCallTreeItem = {
+ id: item.nameId,
+ name: item.name,
+ level: 'SysCall',
+ parentId: item.tid,
+ totalCount: item.totalCount,
+ sumDur: item.sumDur,
+ durStr: item.durStr!,
+ children:[]
+ };
+ let ps = map.get(item.pid!);
+ if (ps) {
+ ps.sumDur += item.sumDur || 0;
+ ps.durStr = getProbablyTime(ps.sumDur);
+ ps.totalCount += item.totalCount || 0;
+ let ts = ps.children?.find(it => it.id === item.tid);
+ if (ts) {
+ ts.sumDur += item.sumDur || 0;
+ ts.durStr = getProbablyTime(ts.sumDur);
+ ts.totalCount += item.totalCount || 0;
+ ts.children.push(treeItem);
+ } else {
+ ps.children.push({
+ id: item.tid,
+ name: item.tName,
+ parentId: item.pid,
+ level: 'Thread',
+ totalCount: item.totalCount,
+ sumDur: item.sumDur,
+ durStr: item.durStr!,
+ children: [treeItem]
+ })
+ }
+ } else {
+ map.set(item.pid!, {
+ id: item.pid,
+ level: 'Process',
+ name: `${item.pName} [${item.pid}]`,
+ totalCount: item.totalCount,
+ sumDur: item.sumDur,
+ durStr: item.durStr!,
+ children: [{
+ id: item.tid,
+ level: 'Thread',
+ parentId: item.pid,
+ name: `${item.tName} [${item.tid}]`,
+ durStr: item.durStr!,
+ totalCount: item.totalCount,
+ sumDur: item.sumDur,
+ children: [treeItem]
+ }]
+ });
+ }
+ }
+
+ initElements(): void {
+ this.sysCallTbl = this.shadowRoot?.querySelector('#tb-syscall');
+ this.range = this.shadowRoot?.querySelector('#syscall-time-range');
+ this.sysCallTbl!.addEventListener('column-click', (evt: unknown) => {
+ // @ts-ignore
+ this.sortByColumn(evt.detail);
+ });
+ }
+
+ connectedCallback(): void {
+ super.connectedCallback();
+ resizeObserver(this.parentElement!, this.sysCallTbl!);
+ }
+
+ initHtml(): string {
+ return `
+
+ = [];
+ private boxChildParam: SysCallBoxJumpParam | null | undefined;
+
+ set data(boxChildValue: SysCallBoxJumpParam) {
+ //切换Tab页 保持childTab数据不变 除非重新点击跳转
+ if (boxChildValue === this.boxChildParam || !boxChildValue.isJumpPage) {
+ return;
+ } // @ts-ignore
+ this.boxChildParam = boxChildValue;
+ //显示框选范围对应的时间
+ this.boxChildRange!.textContent = `Selected range: ${parseFloat(
+ ((boxChildValue.rightNs - boxChildValue.leftNs) / 1000000.0).toFixed(5)
+ )} ms`;
+ this.boxChildTbl!.recycleDataSource = [];
+ this.getDataByDB(boxChildValue);
+ }
+
+ initElements(): void {
+ this.boxChildTbl = this.shadowRoot?.querySelector('#tb-syscall-child');
+ this.boxChildRange = this.shadowRoot?.querySelector('#time-range');
+ this.boxChildTbl!.addEventListener('column-click', (evt): void => {
+ // @ts-ignore
+ this.sortByColumn(evt.detail);
+ });
+ //监听row的点击事件，在对应起始时间上画标记棋子
+ this.boxChildTbl!.addEventListener('row-click', (evt): void => {
+ //@ts-ignore
+ let param = evt.detail.data;
+ param.isSelected = true;
+ this.boxChildTbl!.clearAllSelection(param);
+ this.boxChildTbl!.setCurrentSelection(param);
+ document.dispatchEvent(
+ new CustomEvent('triangle-flag', {
+ detail: { time: [param.startTime], type: 'triangle' },
+ })
+ );
+ });
+ }
+
+ connectedCallback(): void {
+ super.connectedCallback();
+ resizeObserver(this.parentElement!, this.boxChildTbl!);
+ }
+
+ getDataByDB(val: SysCallBoxJumpParam): void {
+ this.boxChildTbl!.loading = true;
+ let ipidArr: number[] = [];
+ let itidArr: number[] = [];
+ Array.from(Utils.getInstance().sysCallEventTidsMap.values()).forEach(it => {
+ if (val?.processId?.includes(it.pid)) {
+ ipidArr.push(it.ipid);
+ }
+ if (val?.threadId?.includes(it.tid)) {
+ itidArr.push(it.itid);
+ }
+ });
+ querySysCallEventWithRange(ipidArr, itidArr, val.leftNs, val.rightNs, val.sysCallId).then(result => {
+ this.boxChildTbl!.loading = false;
+ const arr: Array = [];
+ result.forEach(it => {
+ arr.push({
+ pName: it.pName,
+ tName: it.tName,
+ pid: it.pid,
+ tid: it.tid,
+ name: SysCallMap.get(it.nameId) || 'unknown event',
+ nameId: it.nameId,
+ startTime: it.startTs,
+ startTs: Utils.getProbablyTime(it.startTs),
+ // @ts-ignore
+ absoluteTs: ((window as unknown).recordStartNS + it.startTs) / 1000000000,
+ dur: it.dur / 1000000,
+ args: it.args,
+ ret: it.ret
+ });
+ });
+ this.boxChildSource = arr;
+ if (this.boxChildTbl) {
+ // @ts-ignore
+ this.boxChildTbl.recycleDataSource = arr;
+ }
+ });
+ }
+
+ initHtml(): string {
+ return `
+
+
+ ,
+ traceId?: string
+): Promise {
+ let trafic: number = TraficEnum.Memory;
+ let width = row.clientWidth || row.parentRowEl!.clientWidth - CHART_OFFSET_LEFT;
+ if (trafic === TraficEnum.SharedArrayBuffer && !row.sharedArrayBuffers) {
+ row.sharedArrayBuffers = {
+ startTs: new SharedArrayBuffer(Float64Array.BYTES_PER_ELEMENT * MAX_COUNT),
+ dur: new SharedArrayBuffer(Float64Array.BYTES_PER_ELEMENT * MAX_COUNT),
+ id: new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * MAX_COUNT),
+ itid: new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * MAX_COUNT),
+ ipid: new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT * MAX_COUNT),
+ };
+ }
+ return new Promise((resolve): void => {
+ getThreadPool(traceId).submitProto(
+ QueryEnum.ThreadDataSysCall,
+ {
+ itid: itid,
+ startNS: TraceRow.range?.startNS || 0,
+ endNS: TraceRow.range?.endNS || 0,
+ recordStartNS: Utils.getInstance().getRecordStartNS(traceId),
+ recordEndNS: Utils.getInstance().getRecordEndNS(traceId),
+ width: width,
+ trafic: trafic,
+ sharedArrayBuffers: row.sharedArrayBuffers,
+ },
+ (res: unknown, len: number, transfer: boolean, isEmpty: boolean): void => {
+ if (isEmpty) {
+ resolve(true);
+ } else {
+ resolve(arrayBufferHandler(transfer ? res : row.sharedArrayBuffers, len, tid, pid));
+ }
+ }
+ );
+ });
+}
+
+function arrayBufferHandler(buffers: unknown, len: number, tid: number, pid: number): ThreadSysCallStruct[] {
+ let outArr: ThreadSysCallStruct[] = []; //@ts-ignore
+ let startTs = new Float64Array(buffers.startTs); //@ts-ignore
+ let dur = new Float64Array(buffers.dur); //@ts-ignore
+ let id = new Int32Array(buffers.id); //@ts-ignore
+ let itid = new Int32Array(buffers.itid); //@ts-ignore
+ for (let i = 0; i < len; i++) {
+ //@ts-ignore
+ outArr.push({
+ startTs: startTs[i],
+ dur: dur[i],
+ id: id[i],
+ itid: itid[i],
+ name: SysCallMap.get(id[i]) || 'unknown event',
+ tid: tid,
+ pid: pid,
+ } as ThreadSysCallStruct);
+ }
+ return outArr;
+}
diff --git a/ide/src/trace/database/data-trafic/utils/AllMemoryCache.ts b/ide/src/trace/database/data-trafic/utils/AllMemoryCache.ts
index d73f3e6f25769a350b560909750efdc2e77167f6..3abdb0f6ad21e7491b200d9afda7e7d321deb0ad 100644
--- a/ide/src/trace/database/data-trafic/utils/AllMemoryCache.ts
+++ b/ide/src/trace/database/data-trafic/utils/AllMemoryCache.ts
@@ -47,6 +47,8 @@ export const processList: Map> = new Map();
export const memList: Map> = new Map();
//线程状态 泳道图 memory 模式缓存
export const threadStateList: Map> = new Map();
+//线程系统调用 泳道图 memory数据缓存
+export const threadSysCallList: Map> = new Map();
//进程下卡顿丢帧 泳道图 memory 模式缓存
export const processFrameList: Map> = new Map();
//hiSysEvent 泳道图 memory 模式缓存
@@ -78,6 +80,7 @@ export function clearMemoryCache(data: unknown, proc: Function): void {
processList.clear();
memList.clear();
threadStateList.clear();
+ threadSysCallList.clear();
processFrameList.clear();
lostFrameList.clear();
hitchTimeList.clear();
diff --git a/ide/src/trace/database/data-trafic/utils/ExecProtoForWorker.ts b/ide/src/trace/database/data-trafic/utils/ExecProtoForWorker.ts
index 5531a9f3d4c4a83cb72837956223289356a7ee2c..f551dee718bbe1c46e18b2ab62f364357ad496c8 100644
--- a/ide/src/trace/database/data-trafic/utils/ExecProtoForWorker.ts
+++ b/ide/src/trace/database/data-trafic/utils/ExecProtoForWorker.ts
@@ -87,6 +87,7 @@ import { hangDataReceiver } from '../HangDataReceiver';
import { xpowerStatisticDataReceiver } from '../xpower/XpowerStatisticDataReceiver';
import { xpowerDataGpuFreqCountReceiver, xpowerDataGpuFreqReceiver } from '../xpower/XpowerGpuFrequencyRecevier';
import { xpowerDataThreadCountReceiver, xpowerDataThreadInfoReceiver } from '../xpower/XpowerThreadReceiver';
+import { threadSysCallDataReceiver } from '../process/ThreadSysCallDataReceiver';
// @ts-ignore
const traficHandlers: Map = new Map([]); // @ts-ignore
@@ -100,6 +101,7 @@ traficHandlers.set(QueryEnum.CpuStateData, cpuStateReceiver);
traficHandlers.set(QueryEnum.CpuFreqLimitData, cpuFreqLimitReceiver);
traficHandlers.set(QueryEnum.ProcessData, processDataReceiver);
traficHandlers.set(QueryEnum.ThreadData, threadDataReceiver);
+traficHandlers.set(QueryEnum.ThreadDataSysCall, threadSysCallDataReceiver);
traficHandlers.set(QueryEnum.FuncData, funcDataReceiver);
traficHandlers.set(QueryEnum.HiperfCallChart, hiPerfCallChartDataHandler);
traficHandlers.set(QueryEnum.HiperfCallStack, hiPerfCallStackCacheHandler);
diff --git a/ide/src/trace/database/data-trafic/utils/QueryEnum.ts b/ide/src/trace/database/data-trafic/utils/QueryEnum.ts
index f50d855c826233e00e3d61d82a8e716ad4df8ee9..e5cd437539e63894c498d967baff3e1bc2c8f10d 100644
--- a/ide/src/trace/database/data-trafic/utils/QueryEnum.ts
+++ b/ide/src/trace/database/data-trafic/utils/QueryEnum.ts
@@ -98,8 +98,8 @@ export enum QueryEnum {
XpowerGpuFreqData = 308,
XpowerStatisticData = 309,
XpowerWifiData = 310,
- XpowerAppDetailData = 311
-
+ XpowerAppDetailData = 311,
+ ThreadDataSysCall = 312,
}
export const MAX_COUNT = 2000;
export enum TraficEnum {
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
index ade2ef7987bd95aca3f9f224df00de9112cca238..814c862e551d3dc4833f55f21ae0575e6452a22f 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
@@ -1449,10 +1449,13 @@ export class ProcedureLogicWorkerPerf extends LogicHandler {
combineCallChainForAnalysis(obj?: unknown): PerfAnalysisSample[] {
let sampleCallChainList: Array = [];
for (let sample of this.samplesData) {
+ if (!this.callChainData[sample.sampleId]) {
+ continue;
+ }
let callChains = [...this.callChainData[sample.sampleId]];
const lastCallChain = callChains[callChains.length - 1];
const threadName = this.threadData[sample.tid].threadName || 'Thread';
- const processName = this.threadData[sample.pid].threadName || 'Process';
+ const processName = this.threadData[sample.pid] ? this.threadData[sample.pid].threadName : 'Process';
const funcName = this.dataCache.dataDict.get(lastCallChain.name as number);
if (
//@ts-ignore
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts
index 9533835a02198a69d0f053a5c2ddb74dac181458..5c3af47bb028cfa20c181e82f223bee1d2d12068 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerSchedulingAnalysis.ts
@@ -24,7 +24,7 @@ export class ProcedureLogicWorkerSchedulingAnalysis extends LogicHandler {
freq: number = 0;
bigCores: Array = [];
midCores: Array = [];
- smallCores: Array = [];
+ littleCores: Array = [];
cpuFreqMap: Map> = new Map>();
cpuIdle0Map: Map> = new Map>();
threadMap: Map = new Map();
@@ -34,7 +34,7 @@ export class ProcedureLogicWorkerSchedulingAnalysis extends LogicHandler {
clearAll(): void {
this.bigCores.length = 0;
this.midCores.length = 0;
- this.smallCores.length = 0;
+ this.littleCores.length = 0;
this.cpuAnalysisMap.clear();
this.threadMap.clear();
this.processMap.clear();
@@ -283,9 +283,9 @@ export class ProcedureLogicWorkerSchedulingAnalysis extends LogicHandler {
//@ts-ignore
this.midCores = data.params.midCores || [];
//@ts-ignore
- this.smallCores = data.params.smallCores || [];
+ this.littleCores = data.params.littleCores || [];
//@ts-ignore
- this.queryThreadCpuUsage(data.params.bigCores || [], data.params.midCores || [], data.params.smallCores || []);
+ this.queryThreadCpuUsage(data.params.bigCores || [], data.params.midCores || [], data.params.littleCores || []);
}
}
private schedulingThreadRunTime(data: { id: string; action: string; params: unknown }): void {
@@ -526,7 +526,7 @@ where cmf.name = 'cpu_idle' and value != 0
);
}
- queryThreadCpuUsage(bigCores: number[], midCores: number[], smallCores: number[]): void {
+ queryThreadCpuUsage(bigCores: number[], midCores: number[], littleCores: number[]): void {
let sql = `
select A.pid,A.tid,A.cpu,
sum(A.dur) as total
@@ -919,7 +919,7 @@ where cpu not null
})
.slice(0, 20);
}
- private filterThreadCpuUsageArr(arr: unknown, sumBig: number, sumMid: number, sumSmall: number): void {
+ private filterThreadCpuUsageArr(arr: unknown, sumBig: number, sumMid: number, sumLittle: number): void {
//@ts-ignore
return arr.reduce((group: unknown, item: { total: number; pid: number; tid: number; cpu: number }) => {
const { tid } = item;
@@ -934,9 +934,9 @@ where cpu not null
cpuType = 'mid';
sumMid += item.total;
}
- if (this.smallCores.includes(item.cpu)) {
- cpuType = 'small';
- sumSmall += item.total;
+ if (this.littleCores.includes(item.cpu)) {
+ cpuType = 'little';
+ sumLittle += item.total;
}
if (tidObj) {
//@ts-ignore
@@ -944,7 +944,7 @@ where cpu not null
//@ts-ignore
tidObj.mid += cpuType === 'mid' ? item.total : 0;
//@ts-ignore
- tidObj.small += cpuType === 'small' ? item.total : 0;
+ tidObj.little += cpuType === 'little' ? item.total : 0;
//@ts-ignore
tidObj.total += item.total;
//@ts-ignore
@@ -959,7 +959,7 @@ where cpu not null
total: item.total,
big: cpuType === 'big' ? item.total : 0,
mid: cpuType === 'mid' ? item.total : 0,
- small: cpuType === 'small' ? item.total : 0,
+ little: cpuType === 'little' ? item.total : 0,
};
//@ts-ignore
group[`${tid}`][`cpu${item.cpu}`] = item.total;
@@ -971,8 +971,8 @@ where cpu not null
private handlerThreadCpuUsageData(arr: Array): Map {
let sumBig = 0;
let sumMid = 0;
- let sumSmall = 0;
- let reduceObj = this.filterThreadCpuUsageArr(arr, sumBig, sumMid, sumSmall);
+ let sumLittle = 0;
+ let reduceObj = this.filterThreadCpuUsageArr(arr, sumBig, sumMid, sumLittle);
// @ts-ignore
let source: unknown[] = Object.values(reduceObj);
for (let obj of source) {
@@ -981,13 +981,13 @@ where cpu not null
// @ts-ignore
obj.midPercent = sumMid === 0 ? '0' : ((obj.mid / sumMid) * 100).toFixed(2);
// @ts-ignore
- obj.smallPercent = sumSmall === 0 ? '0' : ((obj.small / sumSmall) * 100).toFixed(2);
+ obj.littlePercent = sumLittle === 0 ? '0' : ((obj.little / sumLittle) * 100).toFixed(2);
// @ts-ignore
obj.bigTimeStr = getProbablyTime(obj.big);
// @ts-ignore
obj.midTimeStr = getProbablyTime(obj.mid);
// @ts-ignore
- obj.smallTimeStr = getProbablyTime(obj.small);
+ obj.littleTimeStr = getProbablyTime(obj.little);
}
let map: Map> = new Map>();
// @ts-ignore
@@ -997,7 +997,7 @@ where cpu not null
// @ts-ignore
map.set('mid', source.sort((a, b) => b.mid - a.mid).slice(0, 20));
// @ts-ignore
- map.set('small', source.sort((a, b) => b.small - a.small).slice(0, 20));
+ map.set('little', source.sort((a, b) => b.little - a.little).slice(0, 20));
// @ts-ignore
return map;
}
@@ -1115,13 +1115,13 @@ export class ThreadCpuUsage {
total: number = 0;
big: number = 0;
mid: number = 0;
- small: number = 0;
+ little: number = 0;
bigPercent: string = '';
bigTimeStr: string = '';
midPercent: string = '';
midTimeStr: string = '';
- smallPercent: string = '';
- smallTimeStr: string = '';
+ littlePercent: string = '';
+ littleTimeStr: string = '';
}
export class FreqThread {
diff --git a/ide/src/trace/database/sql/Func.sql.ts b/ide/src/trace/database/sql/Func.sql.ts
index d99a23090d963a890c553b682cb8c42cf6b256e6..f9ca8595cc8e109af7bcc7bcdcd4dee04103112d 100644
--- a/ide/src/trace/database/sql/Func.sql.ts
+++ b/ide/src/trace/database/sql/Func.sql.ts
@@ -152,14 +152,19 @@ export const queryProcessAsyncFunc = (
P.pid,
c.ts-${traceRange.startTs} as startTs,
c.dur,
- c.cat,
+ c.custom_category as category,
c.id,
c.depth,
c.argsetid,
- c.cookie
+ c.cookie,
+ c.trace_level,
+ c.trace_tag,
+ c.custom_args,
+ c.child_callid
FROM
- (SELECT id, ts, parent_id, dur, depth, argsetid, cookie, cat from callstack where cookie NOT NULL) c
- LEFT JOIN thread A ON A.id = c.parent_id
+ (SELECT id, ts, parent_id, dur, depth, argsetid, cookie, custom_category, child_callid, trace_level,
+ trace_tag, custom_args from callstack where cookie NOT NULL) c
+ LEFT JOIN thread A ON A.id = c.child_callid
LEFT JOIN process P ON P.id = A.ipid
WHERE
startTs NOT NULL;`,
@@ -179,21 +184,26 @@ export const queryProcessAsyncFuncCat = (
select
A.tid,
P.pid,
- c.cat as threadName,
+ c.custom_category as threadName,
c.name as funName,
c.ts-${traceRange.startTs} as startTs,
c.dur,
c.depth,
- c.cookie
+ c.cookie,
+ c.trace_level,
+ c.trace_tag,
+ c.custom_args,
+ c.child_callid
from
- (select callid, name, ts, dur, cat, depth, cookie, parent_id from callstack where cookie not null and cat not null and parent_id is null) C
+ (select callid, name, ts, dur, custom_category, depth, cookie, parent_id,trace_level,trace_tag,
+ custom_args,child_callid from callstack where cookie not null and custom_category not null and child_callid is null) c
left join
- thread A on A.id = C.callid
+ thread A on A.id = c.callid
left join
process P on P.id = A.ipid
where
startTs not null
- order by cat;
+ order by custom_category;
`,
{}
);
@@ -590,6 +600,10 @@ export const querySearchFunc = (search: string): Promise>
t.name as threadName,
p.pid,
c.argsetid,
+ c.trace_level,
+ c.trace_tag,
+ c.custom_args,
+ c.custom_category as category,
'func' as type
from callstack c left join thread t on c.callid = t.id left join process p on t.ipid = p.id
left join trace_range r
@@ -613,6 +627,10 @@ export const querySearchFunc = (search: string): Promise>
t.name as threadName,
p.pid,
c.argsetid,
+ c.trace_level,
+ c.trace_tag,
+ c.custom_args,
+ c.custom_category as category,
'func' as type
from callstack c left join thread t on c.callid = t.id left join process p on t.ipid = p.id
left join trace_range r
diff --git a/ide/src/trace/database/sql/Perf.sql.ts b/ide/src/trace/database/sql/Perf.sql.ts
index 8bd8b12977675ef358685c3a7836922817f78dd4..1f403d308d6315fea238560370d79aee59c1c4c6 100644
--- a/ide/src/trace/database/sql/Perf.sql.ts
+++ b/ide/src/trace/database/sql/Perf.sql.ts
@@ -80,6 +80,36 @@ where time >= $leftNs and time <= $rightNs and A.thread_id != 0
});
};
+export const queryPerfSampleChildListByTree = (
+ leftNs: number,
+ rightNs: number,
+ pid?: number,
+ tid?: number,
+): Promise> => {
+ let sql = `
+select A.callchain_id as sampleId,
+ A.thread_id as tid,
+ C.thread_name as threadName,
+ A.thread_state as state,
+ C.process_id as pid,
+ (timestamp_trace - R.start_ts) as time,
+ cpu_id as core
+from perf_sample A,trace_range R
+left join perf_thread C on A.thread_id = C.thread_id
+where time >= $leftNs and time <= $rightNs and A.thread_id != 0
+ `;
+ if (pid) {
+ sql = `${sql} and C.process_id = ${pid}`;
+ }
+ if (pid && tid !== undefined) {
+ sql = `${sql} and A.thread_id = ${tid}`;
+ }
+ return query('queryPerfSampleChildListByTree', sql, {
+ $leftNs: leftNs,
+ $rightNs: rightNs,
+ });
+};
+
export const queryPerfSampleIdsByTimeRange = (
leftNs: number,
rightNs: number,
@@ -116,6 +146,8 @@ export const queryPerfSampleCallChain = (sampleId: number): Promise> =>
+ query(
+ 'querySysCallThreadIds',
+ `SELECT tid, pid, itid, thread.ipid
+FROM
+ thread left join process on thread.ipid = process.ipid
+WHERE
+ itid IN (SELECT DISTINCT( itid ) FROM syscall )
+ `,
+ {},
+ { traceId: traceId}
+ );
+
+export const querySysCallEventDetail =
+(itid: number, startTs: number, dur: number, traceId?: string): Promise> =>
+ query(
+ 'querySysCallEventDetail',
+ `SELECT tid, thread.name as tName, pid, process.name as pName, args, ret
+FROM
+ (select * from syscall where itid= ${itid} and ts = ${startTs} and dur = ${dur}) A
+ left join thread on A.itid = thread.itid
+ left join process on thread.ipid = process.ipid
+ `,
+ {},
+ { traceId: traceId}
+ );
+
+export const querySysCallEventWithBoxSelect =
+(ipidArr: Array, itidArr: Array, leftNs: number, rightNs: number): Promise> =>
+ query(
+ 'querySysCallEventWithBoxSelect',
+ `select ifnull(process.name, 'Process') as pName,
+ ifnull(thread.name, 'Thread') as tName,
+ process.pid,
+ thread.tid,
+ A.nameId,
+ A.sumDur,
+ A.totalCount
+from (
+select itid, syscall_number as nameId, sum(dur) as sumDur, count(1) as totalCount
+from syscall
+where
+ ${itidArr.length > 0 ? 'itid in (' + itidArr.join(',') + ')' : '1 = 1'}
+ and not ((ts - ${window.recordStartNS} + ifnull(dur,0) < ${leftNs}) or (ts - ${window.recordStartNS} > ${rightNs}))
+group by itid, syscall_number
+) as A
+left join thread on A.itid = thread.itid
+left join process on thread.ipid = process.ipid
+where
+ ${ipidArr.length > 0 ? 'thread.ipid in (' + ipidArr.join(',') + ')' : '1 = 1'}
+ `,
+ {}
+ );
+
+ export const querySysCallEventWithRange =
+(ipidArr: Array, itidArr: Array, leftNs: number, rightNs: number, sysCallId?: number): Promise> =>
+ query(
+ 'querySysCallEventWithRange',
+ `select ifnull(process.name, 'Process') as pName,
+ ifnull(thread.name, 'Thread') as tName,
+ process.pid,
+ thread.tid,
+ A.nameId,
+ A.startTs,
+ A.dur,
+ A.args,
+ A.ret
+from (
+ select itid, syscall_number as nameId, (ts - ${window.recordStartNS}) as startTs, dur, args, ret
+ from syscall
+ where
+ ${itidArr.length > 0 ? 'itid in (' + itidArr.join(',') + ')' : '1 = 1'}
+ and ${sysCallId !== undefined ? 'syscall_number = ' + sysCallId : '1 = 1' }
+ and not ((ts - ${window.recordStartNS} + ifnull(dur,0) < ${leftNs}) or (ts - ${window.recordStartNS} > ${rightNs}))
+ ) as A
+ left join thread on A.itid = thread.itid
+ left join process on thread.ipid = process.ipid
+where
+ ${ipidArr.length > 0 ? 'thread.ipid in (' + ipidArr.join(',') + ')' : '1 = 1'}
+ `,
+ {}
+ );
+
export const queryProcessContentCount = (traceId?: string): Promise> =>
query(
`queryProcessContentCount`,
diff --git a/ide/src/trace/database/sql/SqlLite.sql.ts b/ide/src/trace/database/sql/SqlLite.sql.ts
index 2b547526cca08af488a76c7dbba48ba403ec8f3b..aa6364e1fb9df78adcea3cd45a39abfc855d3c02 100644
--- a/ide/src/trace/database/sql/SqlLite.sql.ts
+++ b/ide/src/trace/database/sql/SqlLite.sql.ts
@@ -29,6 +29,7 @@ import type { DeviceStruct } from '../../bean/FrameComponentBean';
import { LogStruct } from '../ui-worker/ProcedureWorkerLog';
import { query } from '../SqlLite';
import { Utils } from '../../component/trace/base/Utils';
+import { FuncStruct } from '../ui-worker/ProcedureWorkerFunc';
export const queryEventCountMap = (
traceId?: string
@@ -405,7 +406,11 @@ export const queryBinderBySliceId = (
c.depth,
c.argsetid,
c.name AS funName,
- c.cookie
+ c.cookie,
+ c.trace_level,
+ c.trace_tag,
+ c.custom_category as category,
+ c.custom_args
FROM
callstack c,
trace_range D
@@ -449,8 +454,12 @@ export const queryBinderByArgsId = (
p.pid,
c.depth,
c.argsetid,
- c.name as funName,
- c.cookie
+ c.name as funName,
+ c.cookie,
+ c.trace_level,
+ c.trace_tag,
+ c.custom_category as category,
+ c.custom_args
from callstack c,trace_range D
left join thread t on c.callid = t.id
left join process p on p.id = t.ipid
@@ -1592,3 +1601,21 @@ export const queryPerfToolsDur = (): Promise> =>
dur
FROM callstack where name = 'H:GRAB'`
);
+
+export const queryCallstackDetail = (): Promise> =>
+ query(
+ 'queryCallstackDetail',
+ `SELECT
+ id,
+ trace_level,
+ trace_tag,
+ custom_category as category,
+ custom_args
+ FROM callstack, trace_range AS TR
+ where (trace_level is not null or
+ trace_tag is not null or
+ custom_args is not null or
+ custom_category is not null)
+ and ts - TR.start_ts >= 0
+ and TR.end_ts - ts >=0;`
+ );
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts
index cba4720f12009088d68766b9640d1f743e943a39..b4391b7e202dac7e0d417f8a0956bcf49258f976 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts
@@ -78,6 +78,7 @@ import { XpowerWifiRender } from './ProcedureWorkerXpowerWifi';
import { XpowerGpuFreqCountRender } from './ProcedureWorkerXpowerGpuFreqCount';
import { XpowerGpuFreqRender } from './ProcedureWorkerXpowerGpuFreq';
import { SnapShotRender } from './ProcedureWorkerSnaps';
+import { ThreadSysCallRender } from './ProcedureWorkerThreadSysCall';
let dataList: unknown = {};
let dataList2: unknown = {};
@@ -106,6 +107,7 @@ export let renders = {
'heap-snapshot': new HeapSnapshotRender(),
mem: new MemRender(),
thread: new ThreadRender(),
+ threadSysCall: new ThreadSysCallRender(),
func: new FuncRender(),
native: new NativeMemoryRender(),
'HiPerf-Group': new EmptyRender(),
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerThreadSysCall.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerThreadSysCall.ts
new file mode 100644
index 0000000000000000000000000000000000000000..823fe4f2e4606d356dd456f8a52e0520d68ee7a8
--- /dev/null
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerThreadSysCall.ts
@@ -0,0 +1,137 @@
+/*
+ * 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 {
+ dataFilterHandler,
+ BaseStruct,
+ isFrameContainPoint,
+ Render,
+ RequestMessage,
+ drawString,
+ drawLoadingFrame,
+} from './ProcedureWorkerCommon';
+import { TraceRow } from '../../component/trace/base/TraceRow';
+import { ColorUtils } from '../../component/trace/base/ColorUtils';
+import { SpSystemTrace } from '../../component/SpSystemTrace';
+
+export class ThreadSysCallRender extends Render {
+ renderMainThread(
+ threadReq: {
+ context: CanvasRenderingContext2D;
+ useCache: boolean;
+ type: string;
+ translateY: number;
+ },
+ row: TraceRow
+ ): void {
+ let threadList = row.dataList;
+ let threadFilter = row.dataListCache;
+ dataFilterHandler(threadList, threadFilter, {
+ startKey: 'startTs',
+ durKey: 'dur',
+ startNS: TraceRow.range?.startNS ?? 0,
+ endNS: TraceRow.range?.endNS ?? 0,
+ totalNS: TraceRow.range?.totalNS ?? 0,
+ frame: row.frame,
+ paddingTop: 3,
+ useCache: threadReq.useCache || !(TraceRow.range?.refresh ?? false),
+ });
+ drawLoadingFrame(threadReq.context, threadFilter, row);
+ threadReq.context.beginPath();
+ let find: boolean = false;
+ for (let re of threadFilter) {
+ re.translateY = threadReq.translateY;
+ ThreadSysCallStruct.drawThread(threadReq.context, re);
+ if (row.isHover && re.frame && isFrameContainPoint(re.frame!, row.hoverX, row.hoverY)) {
+ ThreadSysCallStruct.hoverStruct = re;
+ find = true;
+ }
+ }
+ threadReq.context.closePath();
+ }
+
+ render(threadReq: RequestMessage, threadList: Array, threadFilter: Array): void {}
+}
+
+export function ThreadSysCallStructOnClick(
+ clickRowType: string,
+ sp: SpSystemTrace,
+ entry?: ThreadSysCallStruct
+): Promise {
+ return new Promise((resolve, reject) => {
+ if (clickRowType === TraceRow.ROW_TYPE_THREAD_SYS_CALL && (ThreadSysCallStruct.hoverStruct || entry)) {
+ ThreadSysCallStruct.selectStruct = entry || ThreadSysCallStruct.hoverStruct;
+ sp.timerShaftEL?.drawTriangle(ThreadSysCallStruct.selectStruct!.startTs || 0, 'inverted');
+ sp.traceSheetEL?.displaySysCallData(ThreadSysCallStruct.selectStruct!);
+ sp.timerShaftEL?.modifyFlagList(undefined);
+ reject(new Error());
+ } else {
+ resolve(null);
+ }
+ });
+}
+export class ThreadSysCallStruct extends BaseStruct {
+ static hoverStruct: ThreadSysCallStruct | undefined;
+ static selectStruct: ThreadSysCallStruct | undefined;
+ name: string | undefined;
+ tid: number | undefined;
+ id: number | undefined;
+ pid: number | undefined;
+ itid: number | undefined;
+ startTs: number | undefined;
+ dur: number | undefined;
+ args: string | undefined;
+ ret: number | undefined;
+
+ static drawThread(threadContext: CanvasRenderingContext2D, data: ThreadSysCallStruct): void {
+ if (data.frame) {
+ threadContext.globalAlpha = 1;
+ threadContext.fillStyle = ColorUtils.FUNC_COLOR[ColorUtils.hashFunc(data.name || '', 0, ColorUtils.FUNC_COLOR.length)];
+ let textColor = ColorUtils.FUNC_COLOR[ColorUtils.hashFunc(data.name || '', 0, ColorUtils.FUNC_COLOR.length)];
+ if (ThreadSysCallStruct.hoverStruct && data.name === ThreadSysCallStruct.hoverStruct.name) {
+ threadContext.globalAlpha = 0.7;
+ }
+ threadContext.fillRect(data.frame.x, data.frame.y, data.frame.width, data.frame.height);
+ threadContext.fillStyle = ColorUtils.funcTextColor(textColor);
+ threadContext.textBaseline = 'middle';
+ threadContext.font = '8px sans-serif';
+ data.frame.width > 7 && data.name && drawString(threadContext, data.name, 2, data.frame, data);
+ if (
+ ThreadSysCallStruct.selectStruct &&
+ ThreadSysCallStruct.equals(ThreadSysCallStruct.selectStruct, data)
+ ) {
+ threadContext.strokeStyle = '#232c5d';
+ threadContext.lineWidth = 2;
+ threadContext.strokeRect(
+ data.frame.x,
+ data.frame.y,
+ data.frame.width - 2,
+ data.frame.height
+ );
+ }
+ }
+ }
+
+ static equals(d1: ThreadSysCallStruct, d2: ThreadSysCallStruct): boolean {
+ return (
+ d1 &&
+ d2 &&
+ d1.tid === d2.tid &&
+ d1.name === d2.name &&
+ d1.startTs === d2.startTs &&
+ d1.dur === d2.dur
+ );
+ }
+}
diff --git a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
index 01730f73f533b26b6c0133e2f2e770d4fd82c7b6..9419ba8e56728ea69682687e42a3f2cd209ce3fc 100644
--- a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
+++ b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
@@ -273,7 +273,6 @@ export class CpuStruct extends BaseStruct {
ctx.globalAlpha = 1;
ctx.fillStyle = '#e0e0e0';
}
- ctx.clearRect(data.frame.x, data.frame.y, width, data.frame.height);
ctx.fillRect(data.frame.x, data.frame.y, width, data.frame.height);
ctx.globalAlpha = 1;
CpuStruct.drawText(ctx, data, width, pid, tid);
diff --git a/ide/src/webSocket/Constants.ts b/ide/src/webSocket/Constants.ts
index 491dd660e6e34d9fddfeea1005c6f2fb9205f7e3..b4eb937f71b2c0432256c15f1fc4a7751e0895e2 100644
--- a/ide/src/webSocket/Constants.ts
+++ b/ide/src/webSocket/Constants.ts
@@ -47,4 +47,5 @@ export class TypeConstants {
static USB_GET_EVENT = 4;
static USB_GET_APP = 5;
static USB_GET_VERSION = 6;
+ static USB_GET_HISYSTEM = 7;
}
\ No newline at end of file
diff --git a/ide/src/webSocket/WebSocketManager.ts b/ide/src/webSocket/WebSocketManager.ts
index fc9897fae3221ab00b8515877095d9e6a5ca3690..b92eaa3c231604e3e816b19c40e719132fa10c50 100644
--- a/ide/src/webSocket/WebSocketManager.ts
+++ b/ide/src/webSocket/WebSocketManager.ts
@@ -38,11 +38,10 @@ export class WebSocketManager {
private sessionId: number | null | undefined;
private session: bigint | null | undefined;
private heartbeatInterval: number | null | undefined;
- private status: string = GetStatuses.UNCONNECTED;
+ public status: string = GetStatuses.UNCONNECTED;
private cacheInfo: Map = new Map();
private reconnect: number = -1;
private connectStatus: HTMLElement | null | undefined;
- static disaStatus: string = GetStatuses.UNCONNECTED;
constructor() {
if (WebSocketManager.instance) {
@@ -58,8 +57,6 @@ export class WebSocketManager {
this.connectStatus = document.querySelector("body > sp-application").shadowRoot.querySelector("#main-menu").shadowRoot.querySelector("div.bottom > div.extend_connect");
this.websocket = new WebSocket(this.url);
this.websocket.binaryType = 'arraybuffer';
- // @ts-ignore
- setInterval(this.checkConnectionStatus(this.websocket), 5000);
this.websocket.onopen = (): void => {
this.status = GetStatuses.CONNECTED;
// 设置心跳定时器
@@ -80,11 +77,12 @@ export class WebSocketManager {
this.websocket.onerror = (error): void => {
console.error('error:', error);
+ this.extendTips(false);
};
this.websocket.onclose = (event): void => {
this.status = GetStatuses.UNCONNECTED;
- this.checkConnectionStatus(this.websocket);
+ this.extendTips(false);
this.finalStatus();
//初始化标志位
this.initLoginInfo();
@@ -92,19 +90,6 @@ export class WebSocketManager {
};
}
- /**
- * 实时监听websockets连接状态
- */
- checkConnectionStatus(websocket: WebSocket | null | undefined) {
- // @ts-ignore
- if (websocket?.readyState === websocket?.OPEN) {
- // @ts-ignore
- this.connectStatus?.style.backgroundColor = 'green';
- } else {
- // @ts-ignore
- this.connectStatus?.style.backgroundColor = 'red';
- }
- }
/**
* 接收webSocket返回的buffer数据
@@ -117,9 +102,22 @@ export class WebSocketManager {
} else if (decode.type === TypeConstants.UPDATE_TYPE) {// 升级
this.updateMessage(decode);
} else {// type其他
+ this.businessMessage(decode);
+ }
+ }
+
+ // 扩展服务连接状态提示
+ extendTips(flag: boolean): void {
+ if(flag) {
// @ts-ignore
this.connectStatus?.style.backgroundColor = 'green';
- this.businessMessage(decode);
+ // @ts-ignore
+ this.connectStatus?.title = 'The extended service is connected.';
+ }else{
+ // @ts-ignore
+ this.connectStatus?.style.backgroundColor = 'red';
+ // @ts-ignore
+ this.connectStatus?.title = 'The extended service is not connected.';
}
}
@@ -129,8 +127,6 @@ export class WebSocketManager {
this.status = GetStatuses.LOGINED;
this.sessionId = decode.session_id;
this.session = decode.session;
- // @ts-ignore
- this.connectStatus?.style.backgroundColor = 'green';
//检查版本
this.getVersion();
} else if (decode.cmd === Constants.SESSION_EXCEED) { // session满了
@@ -143,7 +139,7 @@ export class WebSocketManager {
updateMessage(decode: MessageParam): void {
if (decode.cmd === Constants.GET_VERSION_CMD) {
// 小于则升级
- let targetVersion = '1.1.2';
+ let targetVersion = '1.1.4';
let currentVersion = new TextDecoder().decode(decode.data);
let result = this.compareVersion(currentVersion, targetVersion);
if (result === -1) {
@@ -152,6 +148,7 @@ export class WebSocketManager {
return;
}
this.status = GetStatuses.READY;
+ this.extendTips(true);
this.finalStatus();
} else if (decode.cmd === Constants.UPDATE_SUCCESS_CMD) { // 升级成功
this.status = GetStatuses.UPGRADESUCCESS;
@@ -204,7 +201,7 @@ export class WebSocketManager {
updateVersion(): void {
// 扩展程序升级
let url = `https://${window.location.host.split(':')[0]}:${window.location.port
- }/application/extend/hi-smart-perf-host-extend-update.zip`;
+ }${window.location.pathname}extend/hi-smart-perf-host-extend-update.zip`;
fetch(url).then(response => {
if (!response.ok) {
throw new Error('No corresponding upgrade compression package found');
@@ -237,7 +234,7 @@ export class WebSocketManager {
* listener是不同模块传来接收数据的函数
* 模块调用
*/
-registerMessageListener(type: number, callback: Function, eventCallBack: Function, allowMultipleCallback: boolean = false): void {
+ registerMessageListener(type: number, callback: Function, eventCallBack: Function, allowMultipleCallback: boolean = false): void {
let callbackObj = this.distributeMap.get(type);
if (!callbackObj) {
callbackObj = {
@@ -282,7 +279,6 @@ registerMessageListener(type: number, callback: Function, eventCallBack: Functio
} else {
this.send(type, cmd, data);
}
- WebSocketManager.disaStatus = this.status;
}
send(type: number, cmd?: number, data?: Uint8Array): void {
@@ -302,9 +298,6 @@ registerMessageListener(type: number, callback: Function, eventCallBack: Functio
sendHeartbeat(): void {
this.heartbeatInterval = window.setInterval(() => {
if (this.status === GetStatuses.READY) {
- WebSocketManager.disaStatus = GetStatuses.READY;
- // @ts-ignore
- this.connectStatus?.style.backgroundColor = 'green';
this.send(TypeConstants.HEARTBEAT_TYPE, undefined, undefined);
}
}, Constants.INTERVAL_TIME);
@@ -360,16 +353,10 @@ registerMessageListener(type: number, callback: Function, eventCallBack: Functio
finalStatus(): void {
if (this.reconnect !== -1) {
if (this.status === GetStatuses.READY) {
- WebSocketManager.disaStatus = GetStatuses.READY;
- // @ts-ignore
- this.connectStatus?.style.backgroundColor = 'green';
// @ts-ignore
this.sendMessage(this.reconnect, this.cacheInfo.get(this.reconnect)!.cmd, this.cacheInfo.get(this.reconnect)!.data);
return;
}
- WebSocketManager.disaStatus = GetStatuses.UNCONNECTED;
- // @ts-ignore
- this.connectStatus?.style.backgroundColor = 'red';
this.distributeMap.get(this.reconnect)!.eventCallBack(this.status);
}
this.reconnect = -1;
diff --git a/ide/webpack.config.js b/ide/webpack.config.js
index 598d3265edea0742edad28b764801d58b83f9797..4ff1db13cad343f8f96c164c7a5b3a5988f97b28 100644
--- a/ide/webpack.config.js
+++ b/ide/webpack.config.js
@@ -147,6 +147,10 @@ const config = {
from: './src/doc',
to: 'doc',
},
+ {
+ from: './src/config',
+ to: 'config',
+ },
{
from: './src/base-ui/icon.svg',
to: 'base-ui/icon.svg',
diff --git a/trace_streamer/build/build_base_func.sh b/trace_streamer/build/build_base_func.sh
index f635395e1f93ac6354c8fc738a3dce7084192ca8..42292804250d57625c4f7b5aa522eefc7d5d54a2 100644
--- a/trace_streamer/build/build_base_func.sh
+++ b/trace_streamer/build/build_base_func.sh
@@ -17,6 +17,7 @@ function help() {
echo "Usage: $1 [linux/wasm/windows/macx] [debug] [-e ] [-d ]"
echo " -e , enable the default plugins."
echo " -d , enable the extend plugins."
+ echo " -m , enable the macro plugins."
echo " -l Show the all plugin list."
echo " -h Show the help info."
exit
diff --git a/trace_streamer/build/ts.gni b/trace_streamer/build/ts.gni
index d2fdef54b5402418d6a5378aa60da7b84d12ca8b..4e7b0ba7bd137f0b55f5b2321953e97f68a2e59a 100644
--- a/trace_streamer/build/ts.gni
+++ b/trace_streamer/build/ts.gni
@@ -13,6 +13,7 @@
declare_args() {
is_independent_compile = false
+ hiperf_debug = true
enable_hiperf = true
enable_ebpf = true
enable_native_hook = true
diff --git a/trace_streamer/build_operator.sh b/trace_streamer/build_operator.sh
index f4b86177376bff3442e0411faed1205b4f298027..656c8ee438d4e8181935bfa0e8b5fc43ffe5095b 100755
--- a/trace_streamer/build_operator.sh
+++ b/trace_streamer/build_operator.sh
@@ -62,6 +62,14 @@ else
echo "begin to build ..."
prebuilts/"$gn_path"/"$ninja" -C "$out_dir"
fi
+if [ "$target" != "wasm" ]; then
+ if [ -f "config/config.json" ]; then
+ cp -r "config" "$out_dir"
+ echo "Successfully found the configuration!"
+ else
+ echo "Failed to find the configuration!"
+ fi
+fi
if [ "$out_dir" == "out/macx" ];then
./mac_depend.sh
fi
\ No newline at end of file
diff --git a/trace_streamer/config/config.json b/trace_streamer/config/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..6b4ff707e4ac4994d91ccaefd8be8ced8ed21ca8
--- /dev/null
+++ b/trace_streamer/config/config.json
@@ -0,0 +1,136 @@
+{
+ "_comment": "这是动效的相关打点",
+ "Animation": {
+ "_comment": "动效过程打点线程，render_service为并行化前的打点线程，RSUniRenderThre为并行化后的打点线程",
+ "animationProcEvents_": [
+ "render_service",
+ "RSUniRenderThre"
+ ],
+ "_comment": "动效相关打点，H:LAUNCHER_APP_LAUNCH_FROM_ICON为桌面图标点击启动，H:LAUNCHER_APP_LAUNCH_FROM_NOTIFICATIONBAR为通知栏通知消息点击启动，H:LAUNCHER_APP_LAUNCH_FROM_NOTIFICATIONBAR_IN_LOCKSCREEN为锁屏通知消息点击启动,H:LAUNCHER_APP_LAUNCH_FROM_RECENT为多任务点击应用，H:LAUNCHER_APP_SWIPE_TO_HOME为HOME键返回桌面,H:LAUNCHER_APP_BACK_TO_HOME为Back键返回桌面，H:APP_TRANSITION_TO_OTHER_APP为应用切换到另一个应用,H:APP_TRANSITION_FROM_OTHER_APP为从另一个应用跳回,H:APP_LIST_FLING为应用中列表滑动",
+ "onAnimationStartEvents_": [
+ "H:LAUNCHER_APP_LAUNCH_FROM_ICON",
+ "H:LAUNCHER_APP_LAUNCH_FROM_NOTIFICATIONBAR",
+ "H:LAUNCHER_APP_LAUNCH_FROM_NOTIFICATIONBAR_IN_LOCKSCREEN",
+ "H:LAUNCHER_APP_LAUNCH_FROM_RECENT",
+ "H:LAUNCHER_APP_SWIPE_TO_HOME",
+ "H:LAUNCHER_APP_BACK_TO_HOME",
+ "H:APP_TRANSITION_TO_OTHER_APP",
+ "H:APP_TRANSITION_FROM_OTHER_APP",
+ "H:APP_LIST_FLING"
+ ],
+ "_comment": "H:GenerateVsyncCount,用于计算设备的平均帧率，累计6次后输出平均帧率",
+ "frameRateCmd_": [
+ "H:GenerateVsyncCount"
+ ],
+ "_comment": "H:RSJankStats::RecordAnimationDynamicFrameRate,用于更新动效的帧率，若存在此打点，则以这个打点为准，否则以H:Repaint为准",
+ "realFrameRateCmd_": [
+ "H:RSJankStats::RecordAnimationDynamicFrameRate"
+ ],
+ "_comment": "H:Repaint(硬件合成器合成绘制),用于计算动效帧率",
+ "frameCountCmd_": [
+ "H:Repaint"
+ ],
+ "_comment": "H:RSUniRender::Process:[WindowScene_和H:RSSurfaceRenderNodeDrawable::OnDraw:[WindowScene_用来获取动效帧数据的打点，其中H:RSUniRender::Process:[WindowScene_为并行化前打点",
+ "frameBeginCmd_": [
+ "H:RSUniRender::Process:[WindowScene_",
+ "H:RSSurfaceRenderNodeDrawable::OnDraw:[WindowScene_"
+ ],
+ "_comment": "H:RSUniRender::Process:[SCBDesktop和H:RSSurfaceRenderNodeDrawable::OnDraw:[SCBDesktop用来获取设备的宽高，其中H:RSUniRender::Process:[SCBDesktop为并行化前打点",
+ "screenSizeCmd_": [
+ "H:RSUniRender::Process:[SCBDesktop",
+ "H:RSSurfaceRenderNodeDrawable::OnDraw:[SCBDesktop"
+ ],
+ "_comment": "H:RSMainThread::DoComposition和H:RenderFrame用来获取动效帧的结束时间，其中H:RSMainThread::DoComposition为并行化前的打点",
+ "frameEndTimeCmd_": [
+ "H:RenderFrame"
+ ],
+ "_comment": "H:PostAndWait, parallel type并行化的标志",
+ "parallelTypeCmd_": [
+ "H:PostAndWait, parallel type"
+ ]
+ },
+ "_comment": "这是启动场景的相关打点",
+ "AppStartup": {
+ "_comment": "启动第一阶段，手指点击",
+ "phase1": {
+ "pName": "ProcessTouchEvent",
+ "start": [
+ "H:client dispatch touchId:"
+ ],
+ "end": [
+ "H:OHOS::ErrCode OHOS::AAFwk::AbilityManagerClient::StartUIAbilityBySCB"
+ ]
+ },
+ "_comment": "启动第二阶段，处理创建进程信息，创建窗口",
+ "phase2": {
+ "pName": "StartUIAbilityBySCB",
+ "start": [
+ "H:OHOS::ErrCode OHOS::AAFwk::AbilityManagerClient::StartUIAbilityBySCB"
+ ],
+ "end": [
+ "H:virtual void OHOS::AppExecFwk::AppMgrServiceInner::LoadAbility"
+ ]
+ },
+ "_comment": "启动第三阶段，拉起应用进程",
+ "phase3": {
+ "pName": "LoadAbility",
+ "start": [
+ "H:virtual void OHOS::AppExecFwk::AppMgrServiceInner::LoadAbility"
+ ],
+ "end": [
+ "H:virtual void OHOS::AppExecFwk::AppMgrServiceInner::AttachApplication(const pid_t, const sptr &)##"
+ ]
+ },
+ "_comment": "启动第四阶段，加载应用",
+ "phase4": {
+ "pName": "Application Launching",
+ "start": [
+ "H:virtual void OHOS::AppExecFwk::AppMgrServiceInner::AttachApplication(const pid_t, const sptr &)##"
+ ],
+ "end": [
+ "H:void OHOS::AppExecFwk::MainThread::HandleLaunchAbility(const std::shared_ptr &)##"
+ ]
+ },
+ "_comment": "启动第五阶段，加载 UI Ability",
+ "phase5": {
+ "pName": "UI Ability Launching",
+ "start": [
+ "H:void OHOS::AppExecFwk::MainThread::HandleLaunchAbility(const std::shared_ptr &)##"
+ ],
+ "end": [
+ "H:void OHOS::AbilityRuntime::FAAbilityThread::HandleAbilityTransaction(const OHOS::AbilityRuntime::Want &, const OHOS::AbilityRuntime::LifeCycleStateInfo &, sptr)##",
+ "H:void OHOS::AbilityRuntime::UIAbilityThread::HandleAbilityTransaction"
+ ]
+ },
+ "_comment": "启动第六阶段，应用进入前台",
+ "phase6": {
+ "pName": "UI Ability OnForeground",
+ "start": [
+ "H:void OHOS::AbilityRuntime::FAAbilityThread::HandleAbilityTransaction(const OHOS::AbilityRuntime::Want &, const OHOS::AbilityRuntime::LifeCycleStateInfo &, sptr)##",
+ "H:void OHOS::AbilityRuntime::UIAbilityThread::HandleAbilityTransaction"
+ ],
+ "end": [
+ "H:ReceiveVsync dataCount"
+ ]
+ }
+ },
+ "_comment": "Flag 开关",
+ "config": {
+ "TaskPool": 0,
+ "AnimationAnalysis": 0,
+ "AppStartup": 0,
+ "SchedulingAnalysis": 0,
+ "BinderRunnable": 0,
+ "FfrtConvert": 0,
+ "HMKernel": 1,
+ "VSync": 0,
+ "Hangs Detection": 0,
+ "LTPO": 0,
+ "Start&Finish Trace Category": 0,
+ "UserPluginsRow": 0,
+ "CPU by Irq": 0,
+ "RawTraceCutStartTs": 1,
+ "AI": 0,
+ "System Calls": ""
+ }
+}
\ No newline at end of file
diff --git a/trace_streamer/doc/des_tables.md b/trace_streamer/doc/des_tables.md
index fa1e90f3074a8cc056974e4ae524e4249965db93..494ef6ca99007294674ef3f2c69c6c4782c582c9 100755
--- a/trace_streamer/doc/des_tables.md
+++ b/trace_streamer/doc/des_tables.md
@@ -18,7 +18,7 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库
| app_startup | 记录了应用启动相关数据|
| args | 记录方法参数集合|
| bio_latency_sample | 记录IO操作相关方法调用，及调用栈数据|
-| callstack | 记录调用堆栈和异步调用信息，其中depth,stack_id和parent_stack_id仅在非异步调用中有效。当cookid不为空时，为异步调用，此时callid为进程唯一号，否则为线程唯一号|
+| callstack | 记录调用堆栈和异步调用信息，其中depth仅在非异步调用中有效。当cookid不为空时，为异步调用，此时callid为进程唯一号，child_callid为子线程唯一号|
| clk_event_filter | 记录时钟相关的信息|
| clock_event_filter | 此结构用来维护时钟事件，cpu与唯一的ID做关联|
| clock_snapshot | 时钟号和时间，时钟名的映射表|
@@ -359,8 +359,13 @@ js_heap_sample:记录timeline的时间轴信息
|spanId |TEXT |
|parentSpanId |TEXT |
|flag |TEXT |
+|trace_level |TEXT |
+|trace_tag |TEXT |
+|custom_category |TEXT |
+|custom_args |TEXT |
+|child_callid |INT |
#### 表描述
-记录调用堆栈和异步调用信息，其中depth,stack_id和parent_stack_id仅在非异步的调用中有效。当cookid不为空时，为异步调用，此时callid为进程唯一号，否则为线程唯一号。
+记录调用堆栈和异步调用信息，其中depth仅在非异步的调用中有效。当cookid不为空时，为异步调用，此时callid为进程唯一号，child_callid为子线程唯一号。
#### 字段详细描述
- id: 唯一标识
- ts: 数据事件上报时间戳
@@ -376,6 +381,11 @@ js_heap_sample:记录timeline的时间轴信息
- spanId：分布式调用关联关系，当前帧的id
- parentSpanId: 分布式调用关联关系，当前帧的parent的SpanId，对应当前表的spandId
- flag：C表示分布式调用发送方，S表示接受方
+- trace_level：决定trace的等级，log和nolog等级不同，其中log表示详细记录所有相关的调用信息，nolog 表示不记录
+- trace_tag：Tag标签，标识请求的来源或类型
+- custom_category：聚合标签，用于关联同类信息
+- custom_args：自定义参数，用于存储与调用相关的额外信息
+- child_callid：当为异步调用，此时callid为进程唯一号，child_callid为子线程唯一号，反之为无效值
### clk_event_filter表
#### 表结构
@@ -1469,19 +1479,21 @@ source_arg_set_id: 同一个source_arg_set_id代表一组数据，一般取得
#### 表结构
| Columns Name | SQL TYPE |
|---- |---- |
-|syscall_num |INT |
-|type |TEXT |
-|ipid |INT |
+|syscall_number|INT |
|ts |INT |
+|dur |INT |
+|itid |INT |
+|args |TEXT |
|ret |INT |
#### 表描述
记录用户空间函数与内核空间函数相互调用记录。
#### 相关字段描述
-- syscall_num：系统调用的序号
-- type：固定取值：enter或者exit
-- ipid：线程所属的进程ID
-- ts：时间戳
-- ret：返回值，在type为exit时有效
+- syscall_number：系统调用的序号
+- ts：时间戳
+- dur：持续时间，记录系统调用的执行时间
+- itid: 记录发起调用的线程
+- args: 参数，记录系统调用的参数信息
+- ret：返回值，记录系统调用的返回结果
### sys_event_filter表
#### 表结构
diff --git a/trace_streamer/gn/BUILD.gn b/trace_streamer/gn/BUILD.gn
index 1037621711538bdbcab17813a695866f8b642141..9cd142f5395ef28a6b8a346c67bf6d4c69acfe5e 100644
--- a/trace_streamer/gn/BUILD.gn
+++ b/trace_streamer/gn/BUILD.gn
@@ -59,6 +59,12 @@ config("default") {
"-Wformat",
"-Wno-unused-variable",
]
+
+ # for third part hiperf
+ defines += [ "HIPERF_DEBUG" ]
+
+ # for third part libbpf
+ defines += [ "__LITTLE_ENDIAN_BITFIELD" ]
if (enable_hiperf) {
defines += [ "ENABLE_HIPERF" ]
}
@@ -191,17 +197,17 @@ config("default") {
cflags += [ "-D SUPPORTTHREAD" ]
}
if (is_win) {
- cflags += [ "-D is_mingw" ]
+ cflags += [ "-D is_mingw=true" ]
defines += [ "WIN32_LEAN_AND_MEAN" ]
libs += [ "wsock32" ]
libs += [ "ws2_32" ]
cflags += [ "-Wno-attributes" ]
}
if (is_linux) {
- cflags += [ "-D is_linux" ]
+ cflags += [ "-D is_linux=true" ]
}
if (is_mac) {
- cflags += [ "-D is_mac" ]
+ cflags += [ "-D is_mac=true" ]
}
}
diff --git a/trace_streamer/pare_third_party.sh b/trace_streamer/pare_third_party.sh
index 498c209f454033585fa2b4e2e01b524d1029fc76..8b50614aaf4479ee6a5d2a68b4320c466ba1b754 100755
--- a/trace_streamer/pare_third_party.sh
+++ b/trace_streamer/pare_third_party.sh
@@ -30,7 +30,7 @@ cd third_party
if [ ! -f "sqlite/BUILD.gn" ];then
rm -rf sqlite
- git clone git@gitee.com:openharmony/third_party_sqlite.git
+ git clone https://gitee.com/openharmony/third_party_sqlite.git
if [ -d "third_party_sqlite" ];then
mv third_party_sqlite sqlite
cd sqlite
@@ -41,7 +41,7 @@ if [ ! -f "sqlite/BUILD.gn" ];then
fi
if [ ! -f "protobuf/BUILD.gn" ];then
rm -rf protobuf
- git clone git@gitee.com:openharmony/third_party_protobuf.git
+ git clone https://gitee.com/openharmony/third_party_protobuf.git
if [ -d "third_party_protobuf" ];then
mv third_party_protobuf protobuf
cd protobuf
@@ -52,29 +52,16 @@ if [ ! -f "protobuf/BUILD.gn" ];then
fi
if [ ! -f "zlib/BUILD.gn" ];then
- rm -rf zlib
- git clone --depth=1 git@gitee.com:openharmony/third_party_zlib.git
- if [ -d "third_party_zlib" ];then
- mv third_party_zlib zlib
- $cp ../prebuilts/patch_zlib/zlibbuild.gn zlib/BUILD.gn
- fi
+ git clone --depth=1 git@gitee.com:openharmony/third_party_zlib.git zlib
fi
if [ ! -f "bzip2/BUILD.gn" ];then
- rm -rf bzip2
- git clone --depth=1 git@gitee.com:openharmony/third_party_bzip2.git
- if [ -d "third_party_bzip2" ];then
- mv third_party_bzip2 bzip2
- $cp ../prebuilts/patch_bzip2/bzip2build.gn bzip2/BUILD.gn
- cd bzip2
- ./install.sh $(pwd)
- cd ..
- fi
+ git clone --depth=1 git@gitee.com:openharmony/third_party_bzip2.git bzip2
fi
if [ ! -f "googletest/BUILD.gn" ];then
rm -rf googletest
- git clone --depth=1 git@gitee.com:openharmony/third_party_googletest.git
+ git clone --depth=1 https://gitee.com/openharmony/third_party_googletest.git
if [ -d "third_party_googletest" ];then
mv third_party_googletest googletest
$cp ../prebuilts/patch_googletest/googletestbuild.gn ../third_party/googletest/BUILD.gn
@@ -84,127 +71,39 @@ fi
if [ ! -f "json/BUILD.gn" ];then
rm -rf json
- git clone --depth=1 git@gitee.com:openharmony/third_party_json.git
+ git clone --depth=1 https://gitee.com/openharmony/third_party_json.git
if [ -d "third_party_json" ];then
mv third_party_json json
fi
fi
-if [ ! -f "libunwind/BUILD.gn" ];then
- rm -rf libunwind
- git clone git@gitee.com:openharmony/third_party_libunwind.git
- if [ -d "third_party_libunwind" ];then
- mv third_party_libunwind libunwind
- cd libunwind
- git reset --hard 2c16627236d5e62c8fe78e088d21eca3c362c71c
- cd ..
- $cp ../prebuilts/patch_libunwind/libunwindbuild.gn libunwind/BUILD.gn
- fi
+if [ ! -d "libbpf" ];then
+ git clone --depth=1 git@gitee.com:openharmony/third_party_libbpf.git libbpf
fi
-if [ ! -f "perf_include/libbpf/linux/perf_event.h" ];then
- mkdir -p perf_include/libbpf/linux
- rm -rf perf_event.h
- curl https://gitee.com/openharmony/third_party_libbpf/raw/20221117/github.com/libbpf/libbpf/refs/tags/v0.7.0/include/uapi/linux/perf_event.h > perf_event.h
- mv perf_event.h perf_include/libbpf/linux/perf_event.h
- $patch -p0 perf_include/libbpf/linux/perf_event.h ../prebuilts/patch_perf_event/perf_event.h.patch
+if [ ! -d "hiviewdfx/faultloggerd" ];then
+ git clone --depth=1 git@gitee.com:openharmony/hiviewdfx_faultloggerd.git hiviewdfx/faultloggerd/
+ cd hiviewdfx/faultloggerd
+ perl -pi -e 's/\r$//' interfaces/innerkits/unwinder/src/elf/dfx_elf.cpp
+ $patch -p1 < ../../../prebuilts/patch_hiperf/hiviewdfx_faultloggerd.patch
+ cd ../../
fi
-if [ ! -d "perf_include/hiviewdfx/faultloggerd" ];then
- rm -rf hiviewdfx_faultloggerd perf_include/hiviewdfx/faultloggerd
- mkdir -p perf_include/hiviewdfx/faultloggerd/interfaces/innerkits
- git clone git@gitee.com:openharmony/hiviewdfx_faultloggerd.git
- cd hiviewdfx_faultloggerd
- git reset --hard 7296f69c0d418cd9353638f3117296e4b494e4e5
- cd ..
- mv hiviewdfx_faultloggerd/common/ perf_include/hiviewdfx/faultloggerd
- mv hiviewdfx_faultloggerd/interfaces/common/ perf_include/hiviewdfx/faultloggerd/interfaces
- mv hiviewdfx_faultloggerd/interfaces/nonlinux/ perf_include/hiviewdfx/faultloggerd/interfaces
- mv hiviewdfx_faultloggerd/interfaces/innerkits/unwinder/ perf_include/hiviewdfx/faultloggerd/interfaces/innerkits
- find perf_include/hiviewdfx/faultloggerd -type f -name "*.gn" -delete
- $cp ../prebuilts/patch_hiperf/hiviewdfx_BUILD.gn ../third_party/perf_include/hiviewdfx/BUILD.gn
- rm -rf hiviewdfx_faultloggerd
- rm -rf perf_include/hiviewdfx/common/build
- rm -rf perf_include/hiviewdfx/common/cutil
- rm perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_regs_x86_64.cpp
- $sed -i '/TRAP_BRANCH/s/^/\/\/ /' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_signal.cpp
- $sed -i '/TRAP_HWBKPT/s/^/\/\/ /' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_signal.cpp
- $sed -i '/is_ohos/s/is_ohos/true/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_mmap.cpp
- $sed -i '/is_ohos/s/is_ohos/true/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/dfx_regs.h
- $sed -i '/#include /a #include "debug_logger.h"' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/unwinder.h
- $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 '/#if is_ohos && !is_mingw/s/#if is_ohos && !is_mingw/#if is_linux/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/dfx_elf.h
- $sed -i '/#if is_ohos && !is_mingw/s/#if is_ohos && !is_mingw/#if is_linux/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_elf.cpp
- $sed -i '/#if is_ohos/s/#if is_ohos/#if true/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/dfx_elf.h
- $sed -i '/#if is_ohos/s/#if is_ohos/#if true/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_elf.cpp
- $sed -i '/#ifndef is_ohos_lite/s/#ifndef is_ohos_lite/#if false/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_elf.cpp
- $sed -i '/#if is_mingw/s/#if is_mingw/#ifndef is_linux/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/dfx_elf.cpp
- $sed -i '/#if !is_mingw/s/#if !is_mingw/#if is_linux/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/dfx_elf_define.h
- $sed -i '/#if is_mingw/s/#if is_mingw/#ifndef is_linux/g' perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include/dfx_elf_parser.h
- $sed -i '/#define DFX_NONLINUX_DEFINE_H/a #ifndef is_linux' perf_include/hiviewdfx/faultloggerd/interfaces/nonlinux/dfx_nonlinux_define.h
- $sed -i '/#if is_mingw/s/#if is_mingw/#ifndef is_linux/g' perf_include/hiviewdfx/faultloggerd/interfaces/common/byte_order.h
- $sed -i '$a #endif' perf_include/hiviewdfx/faultloggerd/interfaces/nonlinux/dfx_nonlinux_define.h
- $cp ../prebuilts/patch_hiperf/string_view_util.h ../third_party/perf_include/hiviewdfx/faultloggerd/common/dfxutil/string_view_util.h
-fi
if [ ! -f "hiperf/BUILD.gn" ];then
- rm -rf hiperf developtools_hiperf
- git clone git@gitee.com:openharmony/developtools_hiperf.git
- cd developtools_hiperf
- git reset --hard 9d189f41d76c1ae6e8e12238aef5ef5b8cdbc09f
- cd ..
- if [ -d "developtools_hiperf" ];then
- mv developtools_hiperf hiperf
- $cp ../prebuilts/patch_hiperf/BUILD.gn ../third_party/hiperf/BUILD.gn
- $sed -i "/FRIEND_TEST/s/^\(.*\)$/\/\/\1/g" hiperf/include/virtual_thread.h
- # $sed -i "s/HIPERF_DEBUG/ALWAYSTRUE/g" hiperf/include/virtual_thread.h
- $sed -i "/#include \"report_json_file.h\"/s/^\(.*\)$/\/\/\1/g" hiperf/include/report.h
- $sed -i "/#include /s/^\(.*\)$/\/\/\1/g" hiperf/include/debug_logger.h
- $sed -i "/#include /s/^\(.*\)$/\/\/\1/g" hiperf/include/utilities.h
- $sed -i "/FRIEND_TEST/s/^\(.*\)$/\/\/\1/g" hiperf/include/virtual_thread.h
- $sed -i "/FRIEND_TEST/s/^\(.*\)$/\/\/\1/g" hiperf/include/callstack.h
- # $sed -i '/unwinder.h/s/^/\/\/ /' hiperf/include/callstack.h
- $sed -i "/FRIEND_TEST/s/^\(.*\)$/\/\/\1/g" hiperf/include/symbols_file.h
- $sed -i "/FRIEND_TEST/s/^\(.*\)$/\/\/\1/g" hiperf/include/virtual_runtime.h
- $sed -i "/FRIEND_TEST/s/^\(.*\)$/\/\/\1/g" hiperf/include/report.h
- $sed -i "s/HIPERF_DEBUG/ALWAYSTRUE/g" hiperf/include/virtual_thread.h
- # $sed -i "/using __s8 = char;/a #define unw_word_t uint64_t" hiperf/include/nonlinux/linux/types.h
- # $sed -i '/^void Report::PrepareConsole(/,/^}/ s/^.*$/\/\/&/; /^void Report::PrepareConsole(/,/return;/ s/^[[:blank:]]*/ /' hiperf/src/report.cpp
- # $sed -i '/namespace HiPerf {/avoid Report::PrepareConsole(){ return;}' hiperf/src/report.cpp
- # $sed -i '/HITRACE_METER_NAME/s/^/\/\/ /' hiperf/src/callstack.cpp
- # $sed -i '/hitrace_meter.h/s/^/\/\/ /' hiperf/src/callstack.cpp
- # $sed -i '/dlfcn.h/s/^/\/\/ /' hiperf/src/callstack.cpp
- # $sed -i '/dfx_ark.h/s/^/\/\/ /' hiperf/src/callstack.cpp
- # $sed -i '/dfx_regs.h/s/^/\/\/ /' hiperf/src/callstack.cpp
- $sed -i '/return DoUnwind2/s/^/\/\/ /' hiperf/src/callstack.cpp
- # $sed -i '/#if defined(is_ohos) && is_ohos/s/defined(is_ohos) && is_ohos/true/g' hiperf/src/virtual_runtime.cpp
- # $sed -i '/#if defined(is_ohos) && is_ohos/s/defined(is_ohos) && is_ohos/true/g' hiperf/include/virtual_runtime.h
- # $sed -i '/symbolsTable, elfFile_, elfPath/s/symbolsTable, elfFile_, elfPath/symbolsTable, elfFile_, filePath_/g' hiperf/src/symbols_file.cpp
- $sed -i '/spe_decoder.h/s/^/\/\/ /' hiperf/src/virtual_runtime.cpp
- $sed -i '/spe_decoder.h/s/^/\/\/ /' hiperf/src/perf_event_record.cpp
- fi
+ git clone --depth=1 -b adjust_build_for_smartperf_host git@gitee.com:li-yiting880505/developtools_hiperf_1.git hiperf
fi
if [ ! -f "bounds_checking_function/BUILD.gn" ];then
- rm -rf bounds_checking_function
git clone --depth=1 git@gitee.com:openharmony/third_party_bounds_checking_function.git bounds_checking_function
- $cp ../prebuilts/patch_bounds_checking_function/bounds_checking_functionbuild.gn bounds_checking_function/BUILD.gn
fi
-if [ ! -d "commonlibrary" ];then
- rm -rf commonlibrary
- git clone --depth=1 git@gitee.com:openharmony/commonlibrary_c_utils.git
- if [ -d "commonlibrary_c_utils" ];then
- mv commonlibrary_c_utils commonlibrary
- rm -rf commonlibrary_c_utils
- fi
+if [ ! -d "commonlibrary/c_utils" ];then
+ git clone --depth=1 git@gitee.com:openharmony/commonlibrary_c_utils.git commonlibrary/c_utils
fi
if [ ! -f "profiler/device/plugins/ftrace_plugin/include/ftrace_common_type.h" ];then
rm -rf profiler
- git clone --depth=1 git@gitee.com:openharmony/developtools_profiler.git
+ git clone --depth=1 https://gitee.com/openharmony/developtools_profiler.git
if [ -d "developtools_profiler" ];then
mkdir -p profiler/device/plugins/ftrace_plugin/include
$cp developtools_profiler/device/plugins/ftrace_plugin/include/ftrace_common_type.h profiler/device/plugins/ftrace_plugin/include
@@ -215,7 +114,7 @@ fi
if [ ! -d "llvm-project" ];then
rm -rf llvm-project
- git clone --depth=1 git@gitee.com:openharmony/third_party_llvm-project.git
+ git clone --depth=1 https://gitee.com/openharmony/third_party_llvm-project.git
if [ -d "third_party_llvm-project" ];then
mv third_party_llvm-project llvm-project
cd llvm-project
diff --git a/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_faultloggerd.patch b/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_faultloggerd.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8fd8419fc75d40072c95151d2c2325522016f820
--- /dev/null
+++ b/trace_streamer/prebuilts/patch_hiperf/hiviewdfx_faultloggerd.patch
@@ -0,0 +1,1680 @@
+diff --git a/common/dfxutil/smart_fd.h b/common/dfxutil/smart_fd.h
+index fd5e838..858ae73 100644
+--- a/common/dfxutil/smart_fd.h
++++ b/common/dfxutil/smart_fd.h
+@@ -28,9 +28,11 @@ public:
+ SmartFd() = default;
+ explicit SmartFd(int fd, bool fdsan = true) : fd_(fd), fdsan_(fdsan)
+ {
++#if is_ohos
+ if (fd_ >= 0 && fdsan_) {
+ fdsan_exchange_owner_tag(fd_, 0, fdsan_create_owner_tag(FDSAN_OWNER_TYPE_FILE, LOG_DOMAIN));
+ }
++#endif
+ }
+
+ ~SmartFd()
+@@ -85,11 +87,14 @@ private:
+ if (fd_ < 0) {
+ return;
+ }
++#if is_ohos
+ if (fdsan_) {
+ fdsan_close_with_tag(fd_, fdsan_create_owner_tag(FDSAN_OWNER_TYPE_FILE, LOG_DOMAIN));
+ return;
+ }
++#else
+ close(fd_);
++#endif
+ }
+
+ int fd_{-1};
+diff --git a/common/dfxutil/string_view_util.h b/common/dfxutil/string_view_util.h
+index b44a59e..7dbd356 100644
+--- a/common/dfxutil/string_view_util.h
++++ b/common/dfxutil/string_view_util.h
+@@ -24,6 +24,24 @@
+
+ namespace OHOS {
+ namespace HiviewDFX {
++#ifdef is_mac
++class SpinLock {
++public:
++ void lock()
++ {
++ while (locked_.test_and_set(std::memory_order_acquire)) {
++ ;
++ }
++ }
++ void unlock()
++ {
++ locked_.clear(std::memory_order_release);
++ }
++
++private:
++ std::atomic_flag locked_ = ATOMIC_FLAG_INIT;
++};
++#endif
+ class StringViewHold {
+ public:
+ static StringViewHold &Get()
+@@ -34,50 +52,77 @@ public:
+
+ const char* Hold(STRING_VIEW view)
+ {
++#ifndef is_mac
+ pthread_spin_lock(&spin_lock_);
++#else
++ std::lock_guard lockGurand(spinlock_);
++#endif
+ if (view.size() == 0) {
++#ifndef is_mac
+ pthread_spin_unlock(&spin_lock_);
++#endif
+ return "";
+ }
+
+ char *p = new (std::nothrow) char[view.size() + 1];
+ if (p == nullptr) {
++#ifndef is_mac
+ pthread_spin_unlock(&spin_lock_);
++#endif
+ return "";
+ }
+ if (memset_s(p, view.size() + 1, '\0', view.size() + 1) != 0) {
++#ifndef is_mac
+ pthread_spin_unlock(&spin_lock_);
++#endif
+ return "";
+ }
+ std::copy(view.data(), view.data() + view.size(), p);
+ views_.emplace_back(p);
++#ifndef is_mac
+ pthread_spin_unlock(&spin_lock_);
++#endif
+ return p;
+ }
+
+ // only use in UT
+ void Clean()
+ {
++#ifndef is_mac
+ pthread_spin_lock(&spin_lock_);
++#else
++ std::lock_guard lockGurand(spinlock_);
++#endif
+ for (auto &p : views_) {
+ delete[] p;
+ }
+ views_.clear();
++#ifndef is_mac
+ pthread_spin_unlock(&spin_lock_);
++#endif
+ }
++
+ private:
++#ifndef is_mac
+ StringViewHold()
+ {
+ pthread_spin_init(&spin_lock_, PTHREAD_PROCESS_PRIVATE);
+ }
++#endif
+ ~StringViewHold()
+ {
+ Clean();
++#ifndef is_mac
+ pthread_spin_destroy(&spin_lock_);
++#endif
+ }
+
+ std::vector views_;
++#ifndef is_mac
+ pthread_spinlock_t spin_lock_;
++#else
++ SpinLock spinlock_;
++#endif
+ };
+ } // namespace HiviewDFX
+ } // namespace OHOS
+diff --git a/interfaces/common/byte_order.h b/interfaces/common/byte_order.h
+index 3c40993..a55d9db 100644
+--- a/interfaces/common/byte_order.h
++++ b/interfaces/common/byte_order.h
+@@ -16,7 +16,7 @@
+ #ifndef BYTE_ORDER_H
+ #define BYTE_ORDER_H
+
+-#if is_mingw
++#if is_mingw || is_mac
+ #define UNWIND_LITTLE_ENDIAN 1234
+ #define UNWIND_BIG_ENDIAN 4321
+ #define UNWIND_BYTE_ORDER -1 // Unknown
+diff --git a/interfaces/innerkits/unwinder/include/dfx_elf_define.h b/interfaces/innerkits/unwinder/include/dfx_elf_define.h
+index 6bc9394..a71d76b 100644
+--- a/interfaces/innerkits/unwinder/include/dfx_elf_define.h
++++ b/interfaces/innerkits/unwinder/include/dfx_elf_define.h
+@@ -17,7 +17,7 @@
+
+ #include
+ #include
+-#if !is_mingw
++#if !is_mingw && !is_mac
+ #include
+ #include
+ #endif
+diff --git a/interfaces/innerkits/unwinder/include/dfx_elf_parser.h b/interfaces/innerkits/unwinder/include/dfx_elf_parser.h
+index b4c8443..86a4bdd 100644
+--- a/interfaces/innerkits/unwinder/include/dfx_elf_parser.h
++++ b/interfaces/innerkits/unwinder/include/dfx_elf_parser.h
+@@ -16,7 +16,7 @@
+ #define DFX_ELF_PARSER_H
+
+ #include
+-#if is_mingw
++#if is_mingw || is_mac
+ #include "dfx_nonlinux_define.h"
+ #else
+ #include
+diff --git a/interfaces/innerkits/unwinder/src/elf/dfx_elf.cpp b/interfaces/innerkits/unwinder/src/elf/dfx_elf.cpp
+index 9398e59..79d230e 100644
+--- a/interfaces/innerkits/unwinder/src/elf/dfx_elf.cpp
++++ b/interfaces/innerkits/unwinder/src/elf/dfx_elf.cpp
+@@ -1,749 +1,749 @@
+-/*
+- * Copyright (c) 2021-2025 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.
+- */
+-
+-#include "dfx_elf.h"
+-
+-#include
+-#include
+-#include
+-#include
+-#include
+-#if is_mingw
+-#include "dfx_nonlinux_define.h"
+-#else
+-#include
+-#include
+-#endif
+-#include
+-#include
+-#include
+-#include
+-
+-#include "dfx_define.h"
+-#include "dfx_log.h"
+-#include "dfx_instr_statistic.h"
+-#include "dfx_util.h"
+-#include "dfx_maps.h"
+-#include "dfx_trace_dlsym.h"
+-#include "dwarf_define.h"
+-#include "elf_factory.h"
+-#include "string_util.h"
+-#include "unwinder_config.h"
+-
+-namespace OHOS {
+-namespace HiviewDFX {
+-namespace {
+-#undef LOG_DOMAIN
+-#undef LOG_TAG
+-#define LOG_DOMAIN 0xD002D11
+-#define LOG_TAG "DfxElf"
+-#if is_ohos && !is_mingw
+-enum HdrSection {
+- SECTION_TEXT = 0,
+- SECTION_ARMEXIDX = 1,
+- SECTION_DYNAMIC = 2,
+- SECTION_EHFRAMEHDR = 3
+-};
+-#endif
+-}
+-
+-void DfxElf::Init()
+-{
+- uti_.namePtr = 0;
+- uti_.format = -1;
+- hasTableInfo_ = false;
+-}
+-
+-void DfxElf::Clear()
+-{
+- if (elfParse_ != nullptr) {
+- elfParse_.reset();
+- elfParse_ = nullptr;
+- }
+-
+- if (mmap_ != nullptr) {
+- mmap_->Clear();
+- mmap_.reset();
+- mmap_ = nullptr;
+- }
+-}
+-
+-bool DfxElf::InitHeaders()
+-{
+- if (mmap_ == nullptr) {
+- return false;
+- }
+-
+- if (elfParse_ != nullptr) {
+- return true;
+- }
+-
+- uint8_t ident[SELFMAG + 1];
+- if (!Read(0, ident, SELFMAG) || !IsValidElf(ident, SELFMAG)) {
+- return false;
+- }
+-
+- if (!Read(EI_CLASS, &classType_, sizeof(uint8_t))) {
+- return false;
+- }
+-
+- if (classType_ == ELFCLASS32) {
+- elfParse_ = std::unique_ptr(new ElfParser32(mmap_));
+- } else if (classType_ == ELFCLASS64) {
+- elfParse_ = std::unique_ptr(new ElfParser64(mmap_));
+- } else {
+- DFXLOGW("InitHeaders failed, classType: %{public}d", classType_);
+- return false;
+- }
+- if (elfParse_ != nullptr) {
+- valid_ = true;
+- elfParse_->InitHeaders();
+- }
+- return valid_;
+-}
+-
+-bool DfxElf::IsValid()
+-{
+- if (valid_ == false) {
+- InitHeaders();
+- }
+- return valid_;
+-}
+-
+-uint8_t DfxElf::GetClassType()
+-{
+- if (IsValid()) {
+- return classType_;
+- }
+- return ELFCLASSNONE;
+-}
+-
+-ArchType DfxElf::GetArchType()
+-{
+- if (IsValid()) {
+- elfParse_->GetArchType();
+- }
+- return ARCH_UNKNOWN;
+-}
+-
+-int64_t DfxElf::GetLoadBias()
+-{
+- if (loadBias_ == 0) {
+- if (IsValid()) {
+- loadBias_ = elfParse_->GetLoadBias();
+- DFXLOGU("Elf loadBias: %{public}" PRIx64 "", (uint64_t)loadBias_);
+- }
+- }
+- return loadBias_;
+-}
+-
+-uint64_t DfxElf::GetLoadBase(uint64_t mapStart, uint64_t mapOffset)
+-{
+- if (loadBase_ == static_cast(-1)) {
+- if (IsValid()) {
+- DFXLOGU("mapStart: %{public}" PRIx64 ", mapOffset: %{public}" PRIx64 "",
+- (uint64_t)mapStart, (uint64_t)mapOffset);
+- loadBase_ = mapStart - mapOffset - static_cast(GetLoadBias());
+- DFXLOGU("Elf loadBase: %{public}" PRIx64 "", (uint64_t)loadBase_);
+- }
+- }
+- return loadBase_;
+-}
+-
+-void DfxElf::SetLoadBase(uint64_t base)
+-{
+- loadBase_ = base;
+-}
+-
+-void DfxElf::SetBaseOffset(uint64_t offset)
+-{
+- baseOffset_ = offset;
+-}
+-
+-uint64_t DfxElf::GetBaseOffset()
+-{
+- return baseOffset_;
+-}
+-
+-uint64_t DfxElf::GetStartPc()
+-{
+- if (startPc_ == static_cast(-1)) {
+- if (IsValid()) {
+- auto startVaddr = elfParse_->GetStartVaddr();
+- if (loadBase_ != static_cast(-1) && startVaddr != static_cast(-1)) {
+- startPc_ = startVaddr + loadBase_;
+- DFXLOGU("Elf startPc: %{public}" PRIx64 "", (uint64_t)startPc_);
+- }
+- }
+- }
+- return startPc_;
+-}
+-
+-uint64_t DfxElf::GetStartVaddr()
+-{
+- if (IsValid()) {
+- return elfParse_->GetStartVaddr();
+- }
+- return 0;
+-}
+-
+-uint64_t DfxElf::GetEndPc()
+-{
+- if (endPc_ == 0) {
+- if (IsValid()) {
+- auto endVaddr = elfParse_->GetEndVaddr();
+- if (loadBase_ != static_cast(-1) && endVaddr != 0) {
+- endPc_ = endVaddr + loadBase_;
+- DFXLOGU("Elf endPc: %{public}" PRIx64 "", (uint64_t)endPc_);
+- }
+- }
+- }
+- return endPc_;
+-}
+-
+-uint64_t DfxElf::GetEndVaddr()
+-{
+- if (IsValid()) {
+- return elfParse_->GetEndVaddr();
+- }
+- return 0;
+-}
+-
+-uint64_t DfxElf::GetStartOffset()
+-{
+- if (IsValid()) {
+- return elfParse_->GetStartOffset();
+- }
+- return 0;
+-}
+-
+-uint64_t DfxElf::GetRelPc(uint64_t pc, uint64_t mapStart, uint64_t mapOffset)
+-{
+- return (pc - GetLoadBase(mapStart, mapOffset));
+-}
+-
+-uint64_t DfxElf::GetElfSize()
+-{
+- if (!IsValid()) {
+- return 0;
+- }
+- return elfParse_->GetElfSize();
+-}
+-
+-std::string DfxElf::GetElfName()
+-{
+- if (!IsValid()) {
+- return "";
+- }
+- return elfParse_->GetElfName();
+-}
+-
+-void DfxElf::SetBuildId(const std::string& buildId)
+-{
+- buildId_ = buildId;
+-}
+-
+-std::string DfxElf::GetBuildId(uint64_t noteAddr, uint64_t noteSize)
+-{
+- return ElfParser::ParseHexBuildId(noteAddr, noteSize);
+-}
+-
+-std::string DfxElf::GetBuildId()
+-{
+- if (buildId_.empty()) {
+- if (!IsValid()) {
+- return "";
+- }
+- return elfParse_->GetBuildId();
+- }
+- return buildId_;
+-}
+-
+-
+-uintptr_t DfxElf::GetGlobalPointer()
+-{
+- if (!IsValid()) {
+- return 0;
+- }
+- return elfParse_->GetGlobalPointer();
+-}
+-
+-bool DfxElf::GetSectionInfo(ShdrInfo& shdr, const std::string secName)
+-{
+- if (!IsValid()) {
+- return false;
+- }
+- return elfParse_->GetSectionInfo(shdr, secName);
+-}
+-
+-bool DfxElf::GetSectionData(unsigned char* buf, uint64_t size, std::string secName)
+-{
+- if (!IsValid()) {
+- return false;
+- }
+- return elfParse_->GetSectionData(buf, size, secName);
+-}
+-
+-GnuDebugDataHdr DfxElf::GetGnuDebugDataHdr()
+-{
+- if (!IsValid()) {
+- return {};
+- }
+- return elfParse_->GetGnuDebugDataHdr();
+-}
+-
+-bool DfxElf::IsMiniDebugInfoValid()
+-{
+- if (miniDebugInfo_ == nullptr) {
+-#if defined(ENABLE_MINIDEBUGINFO)
+- MiniDebugInfoFactory miniDebugInfoFactory(elfParse_->GetGnuDebugDataHdr());
+- miniDebugInfo_ = miniDebugInfoFactory.Create();
+-#endif
+- }
+- return miniDebugInfo_ != nullptr;
+-}
+-
+-const std::set& DfxElf::GetFuncSymbols()
+-{
+- if (!IsValid() || !funcSymbols_.empty()) {
+- return funcSymbols_;
+- }
+- if (IsMiniDebugInfoValid()) {
+- funcSymbols_ = miniDebugInfo_->elfParse_->GetFuncSymbols();
+- DFXLOGU("Get MiniDebugInfo FuncSymbols, size: %{public}zu", funcSymbols_.size());
+- }
+- const auto &symbols = elfParse_->GetFuncSymbols();
+- funcSymbols_.insert(symbols.begin(), symbols.end());
+- DFXLOGU("GetFuncSymbols, size: %{public}zu", funcSymbols_.size());
+- return funcSymbols_;
+-}
+-
+-bool DfxElf::GetFuncInfoLazily(uint64_t addr, ElfSymbol& elfSymbol)
+-{
+- DFX_TRACE_SCOPED_DLSYM("GetFuncInfoLazily");
+- if (FindFuncSymbol(addr, funcSymbols_, elfSymbol)) {
+- return true;
+- }
+- bool findSymbol = elfParse_->GetFuncSymbolByAddr(addr, elfSymbol);
+- if (!findSymbol && IsMiniDebugInfoValid()) {
+- findSymbol = miniDebugInfo_->elfParse_->GetFuncSymbolByAddr(addr, elfSymbol);
+- }
+-
+- if (findSymbol) {
+- funcSymbols_.emplace(elfSymbol);
+- DFXLOGU("GetFuncInfoLazily, size: %{public}zu", funcSymbols_.size());
+- }
+- return findSymbol;
+-}
+-
+-bool DfxElf::GetFuncInfo(uint64_t addr, ElfSymbol& elfSymbol)
+-{
+- if (!IsValid()) {
+- return false;
+- }
+- if (UnwinderConfig::GetEnableLoadSymbolLazily()) {
+- return GetFuncInfoLazily(addr, elfSymbol);
+- }
+-
+- const auto &symbols = GetFuncSymbols();
+- return FindFuncSymbol(addr, symbols, elfSymbol);
+-}
+-
+-bool DfxElf::FindFuncSymbol(uint64_t addr, const std::set& symbols, ElfSymbol& elfSymbol)
+-{
+- DFX_TRACE_SCOPED_DLSYM("FindFuncSymbol");
+- if (symbols.empty()) {
+- return false;
+- }
+- // Find the first position that is not less than value
+- ElfSymbol tmpSym;
+- tmpSym.value = addr;
+- auto next = symbols.upper_bound(tmpSym);
+- if (next != symbols.begin()) {
+- next--;
+- }
+- if (next->value <= addr && addr < (next->value + next->size)) {
+- elfSymbol = *next;
+- return true;
+- }
+- return false;
+-}
+-
+-const std::unordered_map& DfxElf::GetPtLoads()
+-{
+- return elfParse_->GetPtLoads();
+-}
+-
+-bool DfxElf::FillUnwindTableByExidx(ShdrInfo shdr, uintptr_t loadBase, struct UnwindTableInfo* uti)
+-{
+- if (uti == nullptr) {
+- return false;
+- }
+- uti->gp = 0;
+- uti->tableData = loadBase + shdr.addr;
+- uti->tableLen = shdr.size;
+- INSTR_STATISTIC(InstructionEntriesArmExidx, shdr.size, 0);
+- uti->format = UNW_INFO_FORMAT_ARM_EXIDX;
+- DFXLOGU("[%{public}d]: tableData: %{public}" PRIx64 ", tableLen: %{public}d", __LINE__,
+- (uint64_t)uti->tableData, (int)uti->tableLen);
+- return true;
+-}
+-
+-#if is_ohos && !is_mingw
+-bool DfxElf::FillUnwindTableByEhhdrLocal(struct DwarfEhFrameHdr* hdr, struct UnwindTableInfo* uti)
+-{
+- if (hdr == nullptr) {
+- return false;
+- }
+- if (hdr->version != DW_EH_VERSION) {
+- DFXLOGE("[%{public}d]: version(%{public}d) error", __LINE__, hdr->version);
+- return false;
+- }
+-
+- uintptr_t ptr = (uintptr_t)(&(hdr->ehFrame));
+- DFXLOGU("[%{public}d]: hdr: %{public}" PRIx64 ", ehFrame: %{public}" PRIx64 "", __LINE__,
+- (uint64_t)hdr, (uint64_t)ptr);
+- auto memory = std::make_shared(UNWIND_TYPE_LOCAL);
+- DFXLOGU("[%{public}d]: gp: %{public}" PRIx64 ", ehFramePtrEnc: %{public}x, fdeCountEnc: %{public}x", __LINE__,
+- (uint64_t)uti->gp, hdr->ehFramePtrEnc, hdr->fdeCountEnc);
+- memory->SetDataOffset(uti->gp);
+- MAYBE_UNUSED uintptr_t ehFrameStart = memory->ReadEncodedValue(ptr, hdr->ehFramePtrEnc);
+- uintptr_t fdeCount = memory->ReadEncodedValue(ptr, hdr->fdeCountEnc);
+- DFXLOGU("[%{public}d]: ehFrameStart: %{public}" PRIx64 ", fdeCount: %{public}d", __LINE__,
+- (uint64_t)ehFrameStart, (int)fdeCount);
+-
+- if (hdr->tableEnc != (DW_EH_PE_datarel | DW_EH_PE_sdata4)) {
+- DFXLOGU("tableEnc: %{public}x", hdr->tableEnc);
+- if (hdr->fdeCountEnc == DW_EH_PE_omit) {
+- fdeCount = ~0UL;
+- }
+- if (hdr->ehFramePtrEnc == DW_EH_PE_omit) {
+- DFXLOGE("ehFramePtrEnc(%{public}x) error", hdr->ehFramePtrEnc);
+- return false;
+- }
+- uti->isLinear = true;
+- uti->tableLen = fdeCount;
+- uti->tableData = ehFrameStart;
+- } else {
+- uti->isLinear = false;
+- uti->tableLen = (fdeCount * sizeof(DwarfTableEntry)) / sizeof(uintptr_t);
+- uti->tableData = ptr;
+- uti->segbase = (uintptr_t)hdr;
+- }
+- uti->format = UNW_INFO_FORMAT_REMOTE_TABLE;
+- DFXLOGU("[%{public}d]: tableData: %{public}" PRIx64 ", tableLen: %{public}d", __LINE__,
+- (uint64_t)uti->tableData, (int)uti->tableLen);
+- return true;
+-}
+-#endif
+-
+-bool DfxElf::FillUnwindTableByEhhdr(struct DwarfEhFrameHdr* hdr, uintptr_t shdrBase, struct UnwindTableInfo* uti)
+-{
+- if ((hdr == nullptr) || (uti == nullptr)) {
+- return false;
+- }
+- if (hdr->version != DW_EH_VERSION) {
+- DFXLOGE("[%{public}d]: version(%{public}d) error", __LINE__, hdr->version);
+- return false;
+- }
+- uintptr_t ptr = (uintptr_t)(&(hdr->ehFrame));
+- DFXLOGU("[%{public}d]: hdr: %{public}" PRIx64 ", ehFrame: %{public}" PRIx64 "", __LINE__,
+- (uint64_t)hdr, (uint64_t)ptr);
+-
+- uti->gp = GetGlobalPointer();
+- DFXLOGU("[%{public}d]: gp: %{public}" PRIx64 ", ehFramePtrEnc: %{public}x, fdeCountEnc: %{public}x", __LINE__,
+- (uint64_t)uti->gp, hdr->ehFramePtrEnc, hdr->fdeCountEnc);
+- mmap_->SetDataOffset(uti->gp);
+- auto ptrOffset = ptr - reinterpret_cast(GetMmapPtr());
+- MAYBE_UNUSED uintptr_t ehFrameStart = mmap_->ReadEncodedValue(ptrOffset, hdr->ehFramePtrEnc);
+- uintptr_t fdeCount = mmap_->ReadEncodedValue(ptrOffset, hdr->fdeCountEnc);
+- DFXLOGU("[%{public}d]: ehFrameStart: %{public}" PRIx64 ", fdeCount: %{public}d", __LINE__,
+- (uint64_t)ehFrameStart, (int)fdeCount);
+- ptr = reinterpret_cast(GetMmapPtr()) + ptrOffset;
+-
+- if (hdr->tableEnc != (DW_EH_PE_datarel | DW_EH_PE_sdata4)) {
+- DFXLOGU("[%{public}d]: tableEnc: %{public}x", __LINE__, hdr->tableEnc);
+- if (hdr->fdeCountEnc == DW_EH_PE_omit) {
+- fdeCount = ~0UL;
+- }
+- if (hdr->ehFramePtrEnc == DW_EH_PE_omit) {
+- DFXLOGE("[%{public}d]: ehFramePtrEnc(%{public}x) error", __LINE__, hdr->ehFramePtrEnc);
+- return false;
+- }
+- uti->isLinear = true;
+- uti->tableLen = fdeCount;
+- uti->tableData = shdrBase + ehFrameStart;
+- uti->segbase = shdrBase;
+- } else {
+- uti->isLinear = false;
+- uti->tableLen = (fdeCount * sizeof(DwarfTableEntry)) / sizeof(uintptr_t);
+- uti->tableData = shdrBase + ptr - (uintptr_t)hdr;
+- uti->segbase = shdrBase;
+- }
+- uti->format = UNW_INFO_FORMAT_REMOTE_TABLE;
+- DFXLOGU("[%{public}d]: tableData: %{public}" PRIx64 ", tableLen: %{public}d", __LINE__,
+- (uint64_t)uti->tableData, (int)uti->tableLen);
+- return true;
+-}
+-
+-int DfxElf::FindUnwindTableInfo(uintptr_t pc, std::shared_ptr map, struct UnwindTableInfo& uti)
+-{
+- if (hasTableInfo_ && pc >= uti_.startPc && pc < uti_.endPc) {
+- uti = uti_;
+- DFXLOGU("FindUnwindTableInfo had found");
+- return UNW_ERROR_NONE;
+- }
+- if (map == nullptr) {
+- return UNW_ERROR_INVALID_MAP;
+- }
+- uintptr_t loadBase = GetLoadBase(map->begin, map->offset);
+- uti.startPc = GetStartPc();
+- uti.endPc = GetEndPc();
+- if (pc < uti.startPc || pc >= uti.endPc) {
+- DFXLOGU("Elf startPc: %{public}" PRIx64 ", endPc: %{public}" PRIx64 "",
+- (uint64_t)uti.startPc, (uint64_t)uti.endPc);
+- return UNW_ERROR_PC_NOT_IN_UNWIND_INFO;
+- }
+-
+- ShdrInfo shdr;
+-#if defined(__arm__)
+- if (GetSectionInfo(shdr, ARM_EXIDX)) {
+- hasTableInfo_ = FillUnwindTableByExidx(shdr, loadBase, &uti);
+- }
+-#endif
+-
+- if (!hasTableInfo_) {
+- struct DwarfEhFrameHdr* hdr = nullptr;
+- struct DwarfEhFrameHdr synthHdr;
+- if (GetSectionInfo(shdr, EH_FRAME_HDR) && GetMmapPtr() != nullptr) {
+- INSTR_STATISTIC(InstructionEntriesEhFrame, shdr.size, 0);
+- hdr = (struct DwarfEhFrameHdr *) (shdr.offset + (char *)GetMmapPtr());
+- } else if (GetSectionInfo(shdr, EH_FRAME) && GetMmapPtr() != nullptr) {
+- DFXLOGW("[%{public}d]: Elf(%{public}s) no found .eh_frame_hdr section, " \
+- "using synthetic .eh_frame section", __LINE__, map->name.c_str());
+- INSTR_STATISTIC(InstructionEntriesEhFrame, shdr.size, 0);
+- synthHdr.version = DW_EH_VERSION;
+- synthHdr.ehFramePtrEnc = DW_EH_PE_absptr |
+- ((sizeof(ElfW(Addr)) == 4) ? DW_EH_PE_udata4 : DW_EH_PE_udata8); // 4 : four bytes
+- synthHdr.fdeCountEnc = DW_EH_PE_omit;
+- synthHdr.tableEnc = DW_EH_PE_omit;
+- synthHdr.ehFrame = (ElfW(Addr))(shdr.offset + (char*)GetMmapPtr());
+- hdr = &synthHdr;
+- }
+- uintptr_t shdrBase = static_cast(loadBase + shdr.addr);
+- hasTableInfo_ = FillUnwindTableByEhhdr(hdr, shdrBase, &uti);
+- }
+-
+- if (hasTableInfo_) {
+- uti_ = uti;
+- return UNW_ERROR_NONE;
+- }
+- return UNW_ERROR_NO_UNWIND_INFO;
+-}
+-
+-int DfxElf::FindUnwindTableLocal(uintptr_t pc, struct UnwindTableInfo& uti)
+-{
+-#if is_ohos && !is_mingw
+- DlCbData cbData;
+- (void)memset_s(&cbData, sizeof(cbData), 0, sizeof(cbData));
+- cbData.pc = pc;
+- cbData.uti.format = -1;
+- int ret = dl_iterate_phdr(DlPhdrCb, &cbData);
+- if (ret > 0) {
+- if (cbData.uti.format != -1) {
+- uti = cbData.uti;
+- return UNW_ERROR_NONE;
+- }
+- }
+- return UNW_ERROR_NO_UNWIND_INFO;
+-#else
+- return UNW_ERROR_UNSUPPORTED_VERSION;
+-#endif
+-}
+-
+-#if is_ohos && !is_mingw
+-bool DfxElf::FindSection(struct dl_phdr_info* info, const std::string secName, ShdrInfo& shdr)
+-{
+- if (info == nullptr) {
+- return false;
+- }
+- const char* file = info->dlpi_name;
+- if (strlen(file) == 0) {
+- file = PROC_SELF_EXE_PATH;
+- }
+- RegularElfFactory elfFactory(file);
+- auto elf = elfFactory.Create();
+- if (elf == nullptr) {
+- return false;
+- }
+-
+- return elf->GetSectionInfo(shdr, secName);
+-}
+-
+-void DfxElf::ParsePhdr(struct dl_phdr_info* info, const ElfW(Phdr)* (&pHdrSections)[4], const uintptr_t pc)
+-{
+- const ElfW(Phdr)* phdr = info->dlpi_phdr;
+- for (size_t i = 0; i < info->dlpi_phnum && phdr != nullptr; i++, phdr++) {
+- switch (phdr->p_type) {
+- case PT_LOAD: {
+- ElfW(Addr) vaddr = phdr->p_vaddr + info->dlpi_addr;
+- if (pc >= vaddr && pc < vaddr + phdr->p_memsz) {
+- pHdrSections[SECTION_TEXT] = phdr;
+- }
+- break;
+- }
+-#if defined(__arm__)
+- case PT_ARM_EXIDX: {
+- pHdrSections[SECTION_ARMEXIDX] = phdr;
+- break;
+- }
+-#endif
+- case PT_GNU_EH_FRAME: {
+- pHdrSections[SECTION_EHFRAMEHDR] = phdr;
+- break;
+- }
+- case PT_DYNAMIC: {
+- pHdrSections[SECTION_DYNAMIC] = phdr;
+- break;
+- }
+- default:
+- break;
+- }
+- }
+-}
+-
+-bool DfxElf::ProccessDynamic(const ElfW(Phdr)* pDynamic, ElfW(Addr) loadBase, UnwindTableInfo* uti)
+-{
+- ElfW(Dyn)* dyn = reinterpret_cast(pDynamic->p_vaddr + loadBase);
+- if (dyn == nullptr) {
+- return false;
+- }
+- for (; dyn->d_tag != DT_NULL; ++dyn) {
+- if (dyn->d_tag == DT_PLTGOT) {
+- uti->gp = dyn->d_un.d_ptr;
+- break;
+- }
+- }
+- return true;
+-}
+-
+-struct DwarfEhFrameHdr* DfxElf::InitHdr(struct DwarfEhFrameHdr& synthHdr,
+- struct dl_phdr_info* info, const ElfW(Phdr)* pEhHdr)
+-{
+- struct DwarfEhFrameHdr* hdr = nullptr;
+- if (pEhHdr) {
+- INSTR_STATISTIC(InstructionEntriesEhFrame, pEhHdr->p_memsz, 0);
+- hdr = reinterpret_cast(pEhHdr->p_vaddr + info->dlpi_addr);
+- } else {
+- ShdrInfo shdr;
+- if (FindSection(info, EH_FRAME, shdr)) {
+- DFXLOGW("[%{public}d]: Elf(%{public}s) no found .eh_frame_hdr section, " \
+- "using synthetic .eh_frame section", __LINE__, info->dlpi_name);
+- INSTR_STATISTIC(InstructionEntriesEhFrame, shdr.size, 0);
+- synthHdr.version = DW_EH_VERSION;
+- synthHdr.ehFramePtrEnc = DW_EH_PE_absptr |
+- ((sizeof(ElfW(Addr)) == 4) ? DW_EH_PE_udata4 : DW_EH_PE_udata8); // 4 : four bytes
+- synthHdr.fdeCountEnc = DW_EH_PE_omit;
+- synthHdr.tableEnc = DW_EH_PE_omit;
+- synthHdr.ehFrame = (ElfW(Addr))(shdr.addr + info->dlpi_addr);
+- hdr = &synthHdr;
+- }
+- }
+- return hdr;
+-}
+-
+-int DfxElf::DlPhdrCb(struct dl_phdr_info* info, size_t size, void* data)
+-{
+- struct DlCbData* cbData = reinterpret_cast(data);
+- if ((info == nullptr) || (cbData == nullptr)) {
+- return -1;
+- }
+- UnwindTableInfo* uti = &cbData->uti;
+- uintptr_t pc = cbData->pc;
+- const int numOfPhdrSections = 4;
+- const ElfW(Phdr)* pHdrSections[numOfPhdrSections] = {nullptr};
+- ParsePhdr(info, pHdrSections, pc);
+-
+- if (pHdrSections[SECTION_TEXT] == nullptr) {
+- return 0;
+- }
+- ElfW(Addr) loadBase = info->dlpi_addr;
+- uti->startPc = pHdrSections[SECTION_TEXT]->p_vaddr + loadBase;
+- uti->endPc = uti->startPc + pHdrSections[SECTION_TEXT]->p_memsz;
+- DFXLOGU("Elf name: %{public}s", info->dlpi_name);
+- uti->namePtr = reinterpret_cast(info->dlpi_name);
+-
+-#if defined(__arm__)
+- if (pHdrSections[SECTION_ARMEXIDX]) {
+- ShdrInfo shdr;
+- shdr.addr = pHdrSections[SECTION_ARMEXIDX]->p_vaddr;
+- shdr.size = pHdrSections[SECTION_ARMEXIDX]->p_memsz;
+- return FillUnwindTableByExidx(shdr, loadBase, uti);
+- }
+-#endif
+-
+- if (pHdrSections[SECTION_DYNAMIC]) {
+- if (!ProccessDynamic(pHdrSections[SECTION_DYNAMIC], loadBase, uti)) {
+- return 0;
+- }
+- } else {
+- uti->gp = 0;
+- }
+-
+- struct DwarfEhFrameHdr synthHdr;
+- struct DwarfEhFrameHdr* hdr = InitHdr(synthHdr, info, pHdrSections[SECTION_EHFRAMEHDR]);
+-
+- return FillUnwindTableByEhhdrLocal(hdr, uti);
+-}
+-#endif
+-
+-bool DfxElf::Read(uintptr_t pos, void* buf, size_t size)
+-{
+- if ((mmap_ != nullptr) && (mmap_->Read(pos, buf, size) == size)) {
+- return true;
+- }
+- return false;
+-}
+-
+-const uint8_t* DfxElf::GetMmapPtr()
+-{
+- if (mmap_ == nullptr) {
+- return nullptr;
+- }
+- return static_cast(mmap_->Get());
+-}
+-
+-size_t DfxElf::GetMmapSize()
+-{
+- if (mmap_ == nullptr) {
+- return 0;
+- }
+- return mmap_->Size();
+-}
+-
+-bool DfxElf::IsValidElf(const void* ptr, size_t size)
+-{
+- if (ptr == nullptr) {
+- return false;
+- }
+-
+- if (memcmp(ptr, ELFMAG, size) != 0) {
+- DFXLOGD("Invalid elf hdr?");
+- return false;
+- }
+- return true;
+-}
+-} // namespace HiviewDFX
+-} // namespace OHOS
++/*
++ * Copyright (c) 2021-2025 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.
++ */
++
++#include "dfx_elf.h"
++
++#include
++#include
++#include
++#include
++#include
++#if is_mingw || is_mac
++#include "dfx_nonlinux_define.h"
++#else
++#include
++#include
++#endif
++#include
++#include
++#include
++#include
++
++#include "dfx_define.h"
++#include "dfx_log.h"
++#include "dfx_instr_statistic.h"
++#include "dfx_util.h"
++#include "dfx_maps.h"
++#include "dfx_trace_dlsym.h"
++#include "dwarf_define.h"
++#include "elf_factory.h"
++#include "string_util.h"
++#include "unwinder_config.h"
++
++namespace OHOS {
++namespace HiviewDFX {
++namespace {
++#undef LOG_DOMAIN
++#undef LOG_TAG
++#define LOG_DOMAIN 0xD002D11
++#define LOG_TAG "DfxElf"
++#if is_ohos && !is_mingw
++enum HdrSection {
++ SECTION_TEXT = 0,
++ SECTION_ARMEXIDX = 1,
++ SECTION_DYNAMIC = 2,
++ SECTION_EHFRAMEHDR = 3
++};
++#endif
++}
++
++void DfxElf::Init()
++{
++ uti_.namePtr = 0;
++ uti_.format = -1;
++ hasTableInfo_ = false;
++}
++
++void DfxElf::Clear()
++{
++ if (elfParse_ != nullptr) {
++ elfParse_.reset();
++ elfParse_ = nullptr;
++ }
++
++ if (mmap_ != nullptr) {
++ mmap_->Clear();
++ mmap_.reset();
++ mmap_ = nullptr;
++ }
++}
++
++bool DfxElf::InitHeaders()
++{
++ if (mmap_ == nullptr) {
++ return false;
++ }
++
++ if (elfParse_ != nullptr) {
++ return true;
++ }
++
++ uint8_t ident[SELFMAG + 1];
++ if (!Read(0, ident, SELFMAG) || !IsValidElf(ident, SELFMAG)) {
++ return false;
++ }
++
++ if (!Read(EI_CLASS, &classType_, sizeof(uint8_t))) {
++ return false;
++ }
++
++ if (classType_ == ELFCLASS32) {
++ elfParse_ = std::unique_ptr(new ElfParser32(mmap_));
++ } else if (classType_ == ELFCLASS64) {
++ elfParse_ = std::unique_ptr(new ElfParser64(mmap_));
++ } else {
++ DFXLOGW("InitHeaders failed, classType: %{public}d", classType_);
++ return false;
++ }
++ if (elfParse_ != nullptr) {
++ valid_ = true;
++ elfParse_->InitHeaders();
++ }
++ return valid_;
++}
++
++bool DfxElf::IsValid()
++{
++ if (valid_ == false) {
++ InitHeaders();
++ }
++ return valid_;
++}
++
++uint8_t DfxElf::GetClassType()
++{
++ if (IsValid()) {
++ return classType_;
++ }
++ return ELFCLASSNONE;
++}
++
++ArchType DfxElf::GetArchType()
++{
++ if (IsValid()) {
++ elfParse_->GetArchType();
++ }
++ return ARCH_UNKNOWN;
++}
++
++int64_t DfxElf::GetLoadBias()
++{
++ if (loadBias_ == 0) {
++ if (IsValid()) {
++ loadBias_ = elfParse_->GetLoadBias();
++ DFXLOGU("Elf loadBias: %{public}" PRIx64 "", (uint64_t)loadBias_);
++ }
++ }
++ return loadBias_;
++}
++
++uint64_t DfxElf::GetLoadBase(uint64_t mapStart, uint64_t mapOffset)
++{
++ if (loadBase_ == static_cast(-1)) {
++ if (IsValid()) {
++ DFXLOGU("mapStart: %{public}" PRIx64 ", mapOffset: %{public}" PRIx64 "",
++ (uint64_t)mapStart, (uint64_t)mapOffset);
++ loadBase_ = mapStart - mapOffset - static_cast(GetLoadBias());
++ DFXLOGU("Elf loadBase: %{public}" PRIx64 "", (uint64_t)loadBase_);
++ }
++ }
++ return loadBase_;
++}
++
++void DfxElf::SetLoadBase(uint64_t base)
++{
++ loadBase_ = base;
++}
++
++void DfxElf::SetBaseOffset(uint64_t offset)
++{
++ baseOffset_ = offset;
++}
++
++uint64_t DfxElf::GetBaseOffset()
++{
++ return baseOffset_;
++}
++
++uint64_t DfxElf::GetStartPc()
++{
++ if (startPc_ == static_cast(-1)) {
++ if (IsValid()) {
++ auto startVaddr = elfParse_->GetStartVaddr();
++ if (loadBase_ != static_cast(-1) && startVaddr != static_cast(-1)) {
++ startPc_ = startVaddr + loadBase_;
++ DFXLOGU("Elf startPc: %{public}" PRIx64 "", (uint64_t)startPc_);
++ }
++ }
++ }
++ return startPc_;
++}
++
++uint64_t DfxElf::GetStartVaddr()
++{
++ if (IsValid()) {
++ return elfParse_->GetStartVaddr();
++ }
++ return 0;
++}
++
++uint64_t DfxElf::GetEndPc()
++{
++ if (endPc_ == 0) {
++ if (IsValid()) {
++ auto endVaddr = elfParse_->GetEndVaddr();
++ if (loadBase_ != static_cast(-1) && endVaddr != 0) {
++ endPc_ = endVaddr + loadBase_;
++ DFXLOGU("Elf endPc: %{public}" PRIx64 "", (uint64_t)endPc_);
++ }
++ }
++ }
++ return endPc_;
++}
++
++uint64_t DfxElf::GetEndVaddr()
++{
++ if (IsValid()) {
++ return elfParse_->GetEndVaddr();
++ }
++ return 0;
++}
++
++uint64_t DfxElf::GetStartOffset()
++{
++ if (IsValid()) {
++ return elfParse_->GetStartOffset();
++ }
++ return 0;
++}
++
++uint64_t DfxElf::GetRelPc(uint64_t pc, uint64_t mapStart, uint64_t mapOffset)
++{
++ return (pc - GetLoadBase(mapStart, mapOffset));
++}
++
++uint64_t DfxElf::GetElfSize()
++{
++ if (!IsValid()) {
++ return 0;
++ }
++ return elfParse_->GetElfSize();
++}
++
++std::string DfxElf::GetElfName()
++{
++ if (!IsValid()) {
++ return "";
++ }
++ return elfParse_->GetElfName();
++}
++
++void DfxElf::SetBuildId(const std::string& buildId)
++{
++ buildId_ = buildId;
++}
++
++std::string DfxElf::GetBuildId(uint64_t noteAddr, uint64_t noteSize)
++{
++ return ElfParser::ParseHexBuildId(noteAddr, noteSize);
++}
++
++std::string DfxElf::GetBuildId()
++{
++ if (buildId_.empty()) {
++ if (!IsValid()) {
++ return "";
++ }
++ return elfParse_->GetBuildId();
++ }
++ return buildId_;
++}
++
++
++uintptr_t DfxElf::GetGlobalPointer()
++{
++ if (!IsValid()) {
++ return 0;
++ }
++ return elfParse_->GetGlobalPointer();
++}
++
++bool DfxElf::GetSectionInfo(ShdrInfo& shdr, const std::string secName)
++{
++ if (!IsValid()) {
++ return false;
++ }
++ return elfParse_->GetSectionInfo(shdr, secName);
++}
++
++bool DfxElf::GetSectionData(unsigned char* buf, uint64_t size, std::string secName)
++{
++ if (!IsValid()) {
++ return false;
++ }
++ return elfParse_->GetSectionData(buf, size, secName);
++}
++
++GnuDebugDataHdr DfxElf::GetGnuDebugDataHdr()
++{
++ if (!IsValid()) {
++ return {};
++ }
++ return elfParse_->GetGnuDebugDataHdr();
++}
++
++bool DfxElf::IsMiniDebugInfoValid()
++{
++ if (miniDebugInfo_ == nullptr) {
++#if defined(ENABLE_MINIDEBUGINFO)
++ MiniDebugInfoFactory miniDebugInfoFactory(elfParse_->GetGnuDebugDataHdr());
++ miniDebugInfo_ = miniDebugInfoFactory.Create();
++#endif
++ }
++ return miniDebugInfo_ != nullptr;
++}
++
++const std::set& DfxElf::GetFuncSymbols()
++{
++ if (!IsValid() || !funcSymbols_.empty()) {
++ return funcSymbols_;
++ }
++ if (IsMiniDebugInfoValid()) {
++ funcSymbols_ = miniDebugInfo_->elfParse_->GetFuncSymbols();
++ DFXLOGU("Get MiniDebugInfo FuncSymbols, size: %{public}zu", funcSymbols_.size());
++ }
++ const auto &symbols = elfParse_->GetFuncSymbols();
++ funcSymbols_.insert(symbols.begin(), symbols.end());
++ DFXLOGU("GetFuncSymbols, size: %{public}zu", funcSymbols_.size());
++ return funcSymbols_;
++}
++
++bool DfxElf::GetFuncInfoLazily(uint64_t addr, ElfSymbol& elfSymbol)
++{
++ DFX_TRACE_SCOPED_DLSYM("GetFuncInfoLazily");
++ if (FindFuncSymbol(addr, funcSymbols_, elfSymbol)) {
++ return true;
++ }
++ bool findSymbol = elfParse_->GetFuncSymbolByAddr(addr, elfSymbol);
++ if (!findSymbol && IsMiniDebugInfoValid()) {
++ findSymbol = miniDebugInfo_->elfParse_->GetFuncSymbolByAddr(addr, elfSymbol);
++ }
++
++ if (findSymbol) {
++ funcSymbols_.emplace(elfSymbol);
++ DFXLOGU("GetFuncInfoLazily, size: %{public}zu", funcSymbols_.size());
++ }
++ return findSymbol;
++}
++
++bool DfxElf::GetFuncInfo(uint64_t addr, ElfSymbol& elfSymbol)
++{
++ if (!IsValid()) {
++ return false;
++ }
++ if (UnwinderConfig::GetEnableLoadSymbolLazily()) {
++ return GetFuncInfoLazily(addr, elfSymbol);
++ }
++
++ const auto &symbols = GetFuncSymbols();
++ return FindFuncSymbol(addr, symbols, elfSymbol);
++}
++
++bool DfxElf::FindFuncSymbol(uint64_t addr, const std::set& symbols, ElfSymbol& elfSymbol)
++{
++ DFX_TRACE_SCOPED_DLSYM("FindFuncSymbol");
++ if (symbols.empty()) {
++ return false;
++ }
++ // Find the first position that is not less than value
++ ElfSymbol tmpSym;
++ tmpSym.value = addr;
++ auto next = symbols.upper_bound(tmpSym);
++ if (next != symbols.begin()) {
++ next--;
++ }
++ if (next->value <= addr && addr < (next->value + next->size)) {
++ elfSymbol = *next;
++ return true;
++ }
++ return false;
++}
++
++const std::unordered_map& DfxElf::GetPtLoads()
++{
++ return elfParse_->GetPtLoads();
++}
++
++bool DfxElf::FillUnwindTableByExidx(ShdrInfo shdr, uintptr_t loadBase, struct UnwindTableInfo* uti)
++{
++ if (uti == nullptr) {
++ return false;
++ }
++ uti->gp = 0;
++ uti->tableData = loadBase + shdr.addr;
++ uti->tableLen = shdr.size;
++ INSTR_STATISTIC(InstructionEntriesArmExidx, shdr.size, 0);
++ uti->format = UNW_INFO_FORMAT_ARM_EXIDX;
++ DFXLOGU("[%{public}d]: tableData: %{public}" PRIx64 ", tableLen: %{public}d", __LINE__,
++ (uint64_t)uti->tableData, (int)uti->tableLen);
++ return true;
++}
++
++#if is_ohos && !is_mingw
++bool DfxElf::FillUnwindTableByEhhdrLocal(struct DwarfEhFrameHdr* hdr, struct UnwindTableInfo* uti)
++{
++ if (hdr == nullptr) {
++ return false;
++ }
++ if (hdr->version != DW_EH_VERSION) {
++ DFXLOGE("[%{public}d]: version(%{public}d) error", __LINE__, hdr->version);
++ return false;
++ }
++
++ uintptr_t ptr = (uintptr_t)(&(hdr->ehFrame));
++ DFXLOGU("[%{public}d]: hdr: %{public}" PRIx64 ", ehFrame: %{public}" PRIx64 "", __LINE__,
++ (uint64_t)hdr, (uint64_t)ptr);
++ auto memory = std::make_shared(UNWIND_TYPE_LOCAL);
++ DFXLOGU("[%{public}d]: gp: %{public}" PRIx64 ", ehFramePtrEnc: %{public}x, fdeCountEnc: %{public}x", __LINE__,
++ (uint64_t)uti->gp, hdr->ehFramePtrEnc, hdr->fdeCountEnc);
++ memory->SetDataOffset(uti->gp);
++ MAYBE_UNUSED uintptr_t ehFrameStart = memory->ReadEncodedValue(ptr, hdr->ehFramePtrEnc);
++ uintptr_t fdeCount = memory->ReadEncodedValue(ptr, hdr->fdeCountEnc);
++ DFXLOGU("[%{public}d]: ehFrameStart: %{public}" PRIx64 ", fdeCount: %{public}d", __LINE__,
++ (uint64_t)ehFrameStart, (int)fdeCount);
++
++ if (hdr->tableEnc != (DW_EH_PE_datarel | DW_EH_PE_sdata4)) {
++ DFXLOGU("tableEnc: %{public}x", hdr->tableEnc);
++ if (hdr->fdeCountEnc == DW_EH_PE_omit) {
++ fdeCount = ~0UL;
++ }
++ if (hdr->ehFramePtrEnc == DW_EH_PE_omit) {
++ DFXLOGE("ehFramePtrEnc(%{public}x) error", hdr->ehFramePtrEnc);
++ return false;
++ }
++ uti->isLinear = true;
++ uti->tableLen = fdeCount;
++ uti->tableData = ehFrameStart;
++ } else {
++ uti->isLinear = false;
++ uti->tableLen = (fdeCount * sizeof(DwarfTableEntry)) / sizeof(uintptr_t);
++ uti->tableData = ptr;
++ uti->segbase = (uintptr_t)hdr;
++ }
++ uti->format = UNW_INFO_FORMAT_REMOTE_TABLE;
++ DFXLOGU("[%{public}d]: tableData: %{public}" PRIx64 ", tableLen: %{public}d", __LINE__,
++ (uint64_t)uti->tableData, (int)uti->tableLen);
++ return true;
++}
++#endif
++
++bool DfxElf::FillUnwindTableByEhhdr(struct DwarfEhFrameHdr* hdr, uintptr_t shdrBase, struct UnwindTableInfo* uti)
++{
++ if ((hdr == nullptr) || (uti == nullptr)) {
++ return false;
++ }
++ if (hdr->version != DW_EH_VERSION) {
++ DFXLOGE("[%{public}d]: version(%{public}d) error", __LINE__, hdr->version);
++ return false;
++ }
++ uintptr_t ptr = (uintptr_t)(&(hdr->ehFrame));
++ DFXLOGU("[%{public}d]: hdr: %{public}" PRIx64 ", ehFrame: %{public}" PRIx64 "", __LINE__,
++ (uint64_t)hdr, (uint64_t)ptr);
++
++ uti->gp = GetGlobalPointer();
++ DFXLOGU("[%{public}d]: gp: %{public}" PRIx64 ", ehFramePtrEnc: %{public}x, fdeCountEnc: %{public}x", __LINE__,
++ (uint64_t)uti->gp, hdr->ehFramePtrEnc, hdr->fdeCountEnc);
++ mmap_->SetDataOffset(uti->gp);
++ auto ptrOffset = ptr - reinterpret_cast(GetMmapPtr());
++ MAYBE_UNUSED uintptr_t ehFrameStart = mmap_->ReadEncodedValue(ptrOffset, hdr->ehFramePtrEnc);
++ uintptr_t fdeCount = mmap_->ReadEncodedValue(ptrOffset, hdr->fdeCountEnc);
++ DFXLOGU("[%{public}d]: ehFrameStart: %{public}" PRIx64 ", fdeCount: %{public}d", __LINE__,
++ (uint64_t)ehFrameStart, (int)fdeCount);
++ ptr = reinterpret_cast(GetMmapPtr()) + ptrOffset;
++
++ if (hdr->tableEnc != (DW_EH_PE_datarel | DW_EH_PE_sdata4)) {
++ DFXLOGU("[%{public}d]: tableEnc: %{public}x", __LINE__, hdr->tableEnc);
++ if (hdr->fdeCountEnc == DW_EH_PE_omit) {
++ fdeCount = ~0UL;
++ }
++ if (hdr->ehFramePtrEnc == DW_EH_PE_omit) {
++ DFXLOGE("[%{public}d]: ehFramePtrEnc(%{public}x) error", __LINE__, hdr->ehFramePtrEnc);
++ return false;
++ }
++ uti->isLinear = true;
++ uti->tableLen = fdeCount;
++ uti->tableData = shdrBase + ehFrameStart;
++ uti->segbase = shdrBase;
++ } else {
++ uti->isLinear = false;
++ uti->tableLen = (fdeCount * sizeof(DwarfTableEntry)) / sizeof(uintptr_t);
++ uti->tableData = shdrBase + ptr - (uintptr_t)hdr;
++ uti->segbase = shdrBase;
++ }
++ uti->format = UNW_INFO_FORMAT_REMOTE_TABLE;
++ DFXLOGU("[%{public}d]: tableData: %{public}" PRIx64 ", tableLen: %{public}d", __LINE__,
++ (uint64_t)uti->tableData, (int)uti->tableLen);
++ return true;
++}
++
++int DfxElf::FindUnwindTableInfo(uintptr_t pc, std::shared_ptr map, struct UnwindTableInfo& uti)
++{
++ if (hasTableInfo_ && pc >= uti_.startPc && pc < uti_.endPc) {
++ uti = uti_;
++ DFXLOGU("FindUnwindTableInfo had found");
++ return UNW_ERROR_NONE;
++ }
++ if (map == nullptr) {
++ return UNW_ERROR_INVALID_MAP;
++ }
++ uintptr_t loadBase = GetLoadBase(map->begin, map->offset);
++ uti.startPc = GetStartPc();
++ uti.endPc = GetEndPc();
++ if (pc < uti.startPc || pc >= uti.endPc) {
++ DFXLOGU("Elf startPc: %{public}" PRIx64 ", endPc: %{public}" PRIx64 "",
++ (uint64_t)uti.startPc, (uint64_t)uti.endPc);
++ return UNW_ERROR_PC_NOT_IN_UNWIND_INFO;
++ }
++
++ ShdrInfo shdr;
++#if defined(__arm__)
++ if (GetSectionInfo(shdr, ARM_EXIDX)) {
++ hasTableInfo_ = FillUnwindTableByExidx(shdr, loadBase, &uti);
++ }
++#endif
++
++ if (!hasTableInfo_) {
++ struct DwarfEhFrameHdr* hdr = nullptr;
++ struct DwarfEhFrameHdr synthHdr;
++ if (GetSectionInfo(shdr, EH_FRAME_HDR) && GetMmapPtr() != nullptr) {
++ INSTR_STATISTIC(InstructionEntriesEhFrame, shdr.size, 0);
++ hdr = (struct DwarfEhFrameHdr *) (shdr.offset + (char *)GetMmapPtr());
++ } else if (GetSectionInfo(shdr, EH_FRAME) && GetMmapPtr() != nullptr) {
++ DFXLOGW("[%{public}d]: Elf(%{public}s) no found .eh_frame_hdr section, " \
++ "using synthetic .eh_frame section", __LINE__, map->name.c_str());
++ INSTR_STATISTIC(InstructionEntriesEhFrame, shdr.size, 0);
++ synthHdr.version = DW_EH_VERSION;
++ synthHdr.ehFramePtrEnc = DW_EH_PE_absptr |
++ ((sizeof(ElfW(Addr)) == 4) ? DW_EH_PE_udata4 : DW_EH_PE_udata8); // 4 : four bytes
++ synthHdr.fdeCountEnc = DW_EH_PE_omit;
++ synthHdr.tableEnc = DW_EH_PE_omit;
++ synthHdr.ehFrame = (ElfW(Addr))(shdr.offset + (char*)GetMmapPtr());
++ hdr = &synthHdr;
++ }
++ uintptr_t shdrBase = static_cast(loadBase + shdr.addr);
++ hasTableInfo_ = FillUnwindTableByEhhdr(hdr, shdrBase, &uti);
++ }
++
++ if (hasTableInfo_) {
++ uti_ = uti;
++ return UNW_ERROR_NONE;
++ }
++ return UNW_ERROR_NO_UNWIND_INFO;
++}
++
++int DfxElf::FindUnwindTableLocal(uintptr_t pc, struct UnwindTableInfo& uti)
++{
++#if is_ohos && !is_mingw
++ DlCbData cbData;
++ (void)memset_s(&cbData, sizeof(cbData), 0, sizeof(cbData));
++ cbData.pc = pc;
++ cbData.uti.format = -1;
++ int ret = dl_iterate_phdr(DlPhdrCb, &cbData);
++ if (ret > 0) {
++ if (cbData.uti.format != -1) {
++ uti = cbData.uti;
++ return UNW_ERROR_NONE;
++ }
++ }
++ return UNW_ERROR_NO_UNWIND_INFO;
++#else
++ return UNW_ERROR_UNSUPPORTED_VERSION;
++#endif
++}
++
++#if is_ohos && !is_mingw
++bool DfxElf::FindSection(struct dl_phdr_info* info, const std::string secName, ShdrInfo& shdr)
++{
++ if (info == nullptr) {
++ return false;
++ }
++ const char* file = info->dlpi_name;
++ if (strlen(file) == 0) {
++ file = PROC_SELF_EXE_PATH;
++ }
++ RegularElfFactory elfFactory(file);
++ auto elf = elfFactory.Create();
++ if (elf == nullptr) {
++ return false;
++ }
++
++ return elf->GetSectionInfo(shdr, secName);
++}
++
++void DfxElf::ParsePhdr(struct dl_phdr_info* info, const ElfW(Phdr)* (&pHdrSections)[4], const uintptr_t pc)
++{
++ const ElfW(Phdr)* phdr = info->dlpi_phdr;
++ for (size_t i = 0; i < info->dlpi_phnum && phdr != nullptr; i++, phdr++) {
++ switch (phdr->p_type) {
++ case PT_LOAD: {
++ ElfW(Addr) vaddr = phdr->p_vaddr + info->dlpi_addr;
++ if (pc >= vaddr && pc < vaddr + phdr->p_memsz) {
++ pHdrSections[SECTION_TEXT] = phdr;
++ }
++ break;
++ }
++#if defined(__arm__)
++ case PT_ARM_EXIDX: {
++ pHdrSections[SECTION_ARMEXIDX] = phdr;
++ break;
++ }
++#endif
++ case PT_GNU_EH_FRAME: {
++ pHdrSections[SECTION_EHFRAMEHDR] = phdr;
++ break;
++ }
++ case PT_DYNAMIC: {
++ pHdrSections[SECTION_DYNAMIC] = phdr;
++ break;
++ }
++ default:
++ break;
++ }
++ }
++}
++
++bool DfxElf::ProccessDynamic(const ElfW(Phdr)* pDynamic, ElfW(Addr) loadBase, UnwindTableInfo* uti)
++{
++ ElfW(Dyn)* dyn = reinterpret_cast(pDynamic->p_vaddr + loadBase);
++ if (dyn == nullptr) {
++ return false;
++ }
++ for (; dyn->d_tag != DT_NULL; ++dyn) {
++ if (dyn->d_tag == DT_PLTGOT) {
++ uti->gp = dyn->d_un.d_ptr;
++ break;
++ }
++ }
++ return true;
++}
++
++struct DwarfEhFrameHdr* DfxElf::InitHdr(struct DwarfEhFrameHdr& synthHdr,
++ struct dl_phdr_info* info, const ElfW(Phdr)* pEhHdr)
++{
++ struct DwarfEhFrameHdr* hdr = nullptr;
++ if (pEhHdr) {
++ INSTR_STATISTIC(InstructionEntriesEhFrame, pEhHdr->p_memsz, 0);
++ hdr = reinterpret_cast(pEhHdr->p_vaddr + info->dlpi_addr);
++ } else {
++ ShdrInfo shdr;
++ if (FindSection(info, EH_FRAME, shdr)) {
++ DFXLOGW("[%{public}d]: Elf(%{public}s) no found .eh_frame_hdr section, " \
++ "using synthetic .eh_frame section", __LINE__, info->dlpi_name);
++ INSTR_STATISTIC(InstructionEntriesEhFrame, shdr.size, 0);
++ synthHdr.version = DW_EH_VERSION;
++ synthHdr.ehFramePtrEnc = DW_EH_PE_absptr |
++ ((sizeof(ElfW(Addr)) == 4) ? DW_EH_PE_udata4 : DW_EH_PE_udata8); // 4 : four bytes
++ synthHdr.fdeCountEnc = DW_EH_PE_omit;
++ synthHdr.tableEnc = DW_EH_PE_omit;
++ synthHdr.ehFrame = (ElfW(Addr))(shdr.addr + info->dlpi_addr);
++ hdr = &synthHdr;
++ }
++ }
++ return hdr;
++}
++
++int DfxElf::DlPhdrCb(struct dl_phdr_info* info, size_t size, void* data)
++{
++ struct DlCbData* cbData = reinterpret_cast(data);
++ if ((info == nullptr) || (cbData == nullptr)) {
++ return -1;
++ }
++ UnwindTableInfo* uti = &cbData->uti;
++ uintptr_t pc = cbData->pc;
++ const int numOfPhdrSections = 4;
++ const ElfW(Phdr)* pHdrSections[numOfPhdrSections] = {nullptr};
++ ParsePhdr(info, pHdrSections, pc);
++
++ if (pHdrSections[SECTION_TEXT] == nullptr) {
++ return 0;
++ }
++ ElfW(Addr) loadBase = info->dlpi_addr;
++ uti->startPc = pHdrSections[SECTION_TEXT]->p_vaddr + loadBase;
++ uti->endPc = uti->startPc + pHdrSections[SECTION_TEXT]->p_memsz;
++ DFXLOGU("Elf name: %{public}s", info->dlpi_name);
++ uti->namePtr = reinterpret_cast(info->dlpi_name);
++
++#if defined(__arm__)
++ if (pHdrSections[SECTION_ARMEXIDX]) {
++ ShdrInfo shdr;
++ shdr.addr = pHdrSections[SECTION_ARMEXIDX]->p_vaddr;
++ shdr.size = pHdrSections[SECTION_ARMEXIDX]->p_memsz;
++ return FillUnwindTableByExidx(shdr, loadBase, uti);
++ }
++#endif
++
++ if (pHdrSections[SECTION_DYNAMIC]) {
++ if (!ProccessDynamic(pHdrSections[SECTION_DYNAMIC], loadBase, uti)) {
++ return 0;
++ }
++ } else {
++ uti->gp = 0;
++ }
++
++ struct DwarfEhFrameHdr synthHdr;
++ struct DwarfEhFrameHdr* hdr = InitHdr(synthHdr, info, pHdrSections[SECTION_EHFRAMEHDR]);
++
++ return FillUnwindTableByEhhdrLocal(hdr, uti);
++}
++#endif
++
++bool DfxElf::Read(uintptr_t pos, void* buf, size_t size)
++{
++ if ((mmap_ != nullptr) && (mmap_->Read(pos, buf, size) == size)) {
++ return true;
++ }
++ return false;
++}
++
++const uint8_t* DfxElf::GetMmapPtr()
++{
++ if (mmap_ == nullptr) {
++ return nullptr;
++ }
++ return static_cast(mmap_->Get());
++}
++
++size_t DfxElf::GetMmapSize()
++{
++ if (mmap_ == nullptr) {
++ return 0;
++ }
++ return mmap_->Size();
++}
++
++bool DfxElf::IsValidElf(const void* ptr, size_t size)
++{
++ if (ptr == nullptr) {
++ return false;
++ }
++
++ if (memcmp(ptr, ELFMAG, size) != 0) {
++ DFXLOGD("Invalid elf hdr?");
++ return false;
++ }
++ return true;
++}
++} // namespace HiviewDFX
++} // namespace OHOS
diff --git a/trace_streamer/prebuilts/patch_llvm/llvm.patch b/trace_streamer/prebuilts/patch_llvm/llvm.patch
index 3dbb0d441f5a87bffac40a9e18bf611f4f84a05a..fcde97762192e38963c5e229d4cdb2b75c744b69 100644
--- a/trace_streamer/prebuilts/patch_llvm/llvm.patch
+++ b/trace_streamer/prebuilts/patch_llvm/llvm.patch
@@ -144,7 +144,7 @@ index 56d5b2ce7dc3..827184b7a5e0 100644
+ deps = [
+ "//llvm/include/llvm/Config:config",
+ "//llvm/lib/Demangle",
-+ "//third_party/zlib:libz",
++ "//src/parser/hiperf_parser:libz",
+ ]
+ } else {
+ deps = [
diff --git a/trace_streamer/src/BUILD.gn b/trace_streamer/src/BUILD.gn
index 2a07f38406bf9a459077d5876d0d57a254c9bb21..c40825e3d27abb4ca95d9c10cd075398c946dae0 100644
--- a/trace_streamer/src/BUILD.gn
+++ b/trace_streamer/src/BUILD.gn
@@ -106,11 +106,10 @@ ohos_source_set("trace_streamer_source") {
"filter:filter",
"metrics:metrics_parser",
"parser:parser",
+ "parser/hiperf_parser:libsec_static",
"proto_reader:proto_reader",
"table:table",
"trace_data:trace_data",
- "//third_party/bounds_checking_function:libsec_static",
- "//third_party/perf_include/hiviewdfx:libfaultloggerd",
]
public_configs = [ ":trace_streamer_cfg" ]
public_deps = []
diff --git a/trace_streamer/src/base/BUILD.gn b/trace_streamer/src/base/BUILD.gn
index f577bc201291bca06b9e72037d875ff4d7bdd6c9..2996b3d614fd6ea9ecad3d31ae4b9422cedf1eec 100644
--- a/trace_streamer/src/base/BUILD.gn
+++ b/trace_streamer/src/base/BUILD.gn
@@ -17,7 +17,7 @@ ohos_source_set("base") {
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
part_name = "${OHOS_PROFILER_PART_NAME}"
public_deps = [
- "${THIRD_PARTY}/zlib:libz",
+ "../parser/hiperf_parser:libz",
"sqlite_ext:sqliteext",
]
include_dirs = [
diff --git a/trace_streamer/src/base/string_help.cpp b/trace_streamer/src/base/string_help.cpp
index f18316d33e958b1df1f235b6fbaa8ae681501925..8fd7dbdd3dfcd38f18ee2e37fce3ff028259bd27 100644
--- a/trace_streamer/src/base/string_help.cpp
+++ b/trace_streamer/src/base/string_help.cpp
@@ -44,19 +44,21 @@ bool EndWith(const std::string &str, const std::string &res)
return str.compare(str.size() - res.size(), res.size(), res) == 0;
}
-std::vector SplitStringToVec(const std::string &str, const std::string &pat)
+std::vector SplitStringToVec(const std::string &str, const std::string &pat, uint32_t expectedCount)
{
std::vector result;
size_t curPos = 0;
size_t strSize = str.size();
size_t patSize = pat.size();
+ uint32_t endFlag = 0;
while (curPos < strSize) {
auto patPos = str.find(pat, curPos);
- if (patPos == std::string::npos) {
+ if (patPos == std::string::npos || endFlag == expectedCount) {
break;
}
result.emplace_back(str.substr(curPos, patPos - curPos));
curPos = patPos + patSize;
+ endFlag++;
}
if (curPos < strSize) {
result.emplace_back(str.substr(curPos));
diff --git a/trace_streamer/src/base/string_help.h b/trace_streamer/src/base/string_help.h
index c104641078c1baae30e38c2e020c1d2f0a43a81d..df4bb6a7e3edda5428cfb691cdf62f5b47ba08c6 100644
--- a/trace_streamer/src/base/string_help.h
+++ b/trace_streamer/src/base/string_help.h
@@ -23,7 +23,9 @@
namespace SysTuning {
namespace base {
char *GetDemangleSymbolIndex(const char *mangled);
-std::vector SplitStringToVec(const std::string &str, const std::string &pat);
+std::vector SplitStringToVec(const std::string &str,
+ const std::string &pat,
+ uint32_t expectedCount = UINT32_MAX);
bool StartWith(const std::string &str, const std::string &res);
bool EndWith(const std::string &str, const std::string &res);
std::string FormatString(const char *p);
diff --git a/trace_streamer/src/filter/BUILD.gn b/trace_streamer/src/filter/BUILD.gn
index cbe1e74f18f99d352780a73bed960d413b1eb5fe..cb8a9f50a47cd92360477fff57943cb2c2b8a178 100644
--- a/trace_streamer/src/filter/BUILD.gn
+++ b/trace_streamer/src/filter/BUILD.gn
@@ -46,12 +46,13 @@ config("filter_cfg") {
"${THIRD_PARTY}/sqlite/include",
"${PERF_DIR}/hiperf/include",
"${PERF_DIR}/hiperf/include/nonlinux/linux",
- "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include",
- "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/nonlinux",
- "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/interfaces/common",
- "${THIRD_PARTY}/perf_include/hiviewdfx/faultloggerd/common/dfxutil",
+ "${THIRD_PARTY}/hiviewdfx/faultloggerd/interfaces/innerkits/unwinder/include",
+ "${THIRD_PARTY}/hiviewdfx/faultloggerd/interfaces/nonlinux",
+ "${THIRD_PARTY}/hiviewdfx/faultloggerd/interfaces/common",
+ "${THIRD_PARTY}/hiviewdfx/faultloggerd/common/dfxutil",
+ "${THIRD_PARTY}/hiviewdfx/faultloggerd/common/dfxlog",
"${PERF_DIR}/hiperf/include/nonlinux",
- "${THIRD_PARTY}/perf_include/libbpf",
+ "${THIRD_PARTY}/libbpf/include/uapi",
"${THIRD_PARTY}/bounds_checking_function/include",
"${THIRD_PARTY}/json/single_include/nlohmann",
"../proto_reader/include",
@@ -82,6 +83,7 @@ ohos_source_set("filter") {
"args_filter.cpp",
"binder_filter.cpp",
"clock_filter_ex.cpp",
+ "config_filter.cpp",
"cpu_filter.cpp",
"filter_base.cpp",
"filter_filter.cpp",
@@ -91,6 +93,7 @@ ohos_source_set("filter") {
"process_filter.cpp",
"slice_filter.cpp",
"stat_filter.cpp",
+ "syscall_filter.cpp",
"system_event_measure_filter.cpp",
"task_pool_filter.cpp",
]
diff --git a/trace_streamer/src/filter/animation_filter.cpp b/trace_streamer/src/filter/animation_filter.cpp
index 4dbe7d94e0d9fb80501c1a049f5d20c65481d8ec..478cf77d80cc62599ea52febd5f7ab06c7092067 100644
--- a/trace_streamer/src/filter/animation_filter.cpp
+++ b/trace_streamer/src/filter/animation_filter.cpp
@@ -34,18 +34,15 @@ AnimationFilter::AnimationFilter(TraceDataCache *dataCache, const TraceStreamerF
if (dynamicFrame_ == nullptr || callStackSlice_ == nullptr) {
TS_LOGE("dynamicFrame_ or callStackSlice_ is nullptr.");
}
- onAnimationStartEvents_ = {
- traceDataCache_->GetDataIndex("H:LAUNCHER_APP_LAUNCH_FROM_ICON"),
- traceDataCache_->GetDataIndex("H:LAUNCHER_APP_LAUNCH_FROM_NOTIFICATIONBAR"),
- traceDataCache_->GetDataIndex("H:LAUNCHER_APP_LAUNCH_FROM_NOTIFICATIONBAR_IN_LOCKSCREEN"),
- traceDataCache_->GetDataIndex("H:LAUNCHER_APP_LAUNCH_FROM_RECENT"),
- traceDataCache_->GetDataIndex("H:LAUNCHER_APP_SWIPE_TO_HOME"),
- traceDataCache_->GetDataIndex("H:LAUNCHER_APP_BACK_TO_HOME"),
- traceDataCache_->GetDataIndex("H:APP_TRANSITION_TO_OTHER_APP"),
- traceDataCache_->GetDataIndex("H:APP_TRANSITION_FROM_OTHER_APP"),
- traceDataCache_->GetDataIndex("H:APP_LIST_FLING")};
}
AnimationFilter::~AnimationFilter() {}
+void AnimationFilter::InitAnimationStartEvents()
+{
+ auto res = streamFilters_->configFilter_->GetAnimationConfig().GetOnAnimationStartEvents();
+ for (auto &eventName : res) {
+ onAnimationStartEvents_.insert(traceDataCache_->GetDataIndex(eventName));
+ }
+}
bool AnimationFilter::UpdateDeviceFps(const BytraceLine &line)
{
generateVsyncCnt_++;
@@ -87,24 +84,24 @@ bool AnimationFilter::UpdateDeviceScreenSize(const TracePoint &point)
bool AnimationFilter::UpdateDeviceInfoEvent(const TracePoint &point, const BytraceLine &line)
{
if (traceDataCache_->GetConstDeviceInfo().PhysicalFrameRate() == INVALID_UINT32 &&
- StartWith(point.name_, frameRateCmd_)) {
+ streamFilters_->configFilter_->GetAnimationConfig().CheckIfFrameRateCmd(point.name_)) {
return UpdateDeviceFps(line);
} else if (traceDataCache_->GetConstDeviceInfo().PhysicalWidth() == INVALID_UINT32 &&
- (StartWith(point.name_, newScreenSizeCmd_) || StartWith(point.name_, screenSizeCmd_))) {
+ streamFilters_->configFilter_->GetAnimationConfig().CheckIfScreenSizeCmd(point.name_)) {
return UpdateDeviceScreenSize(point);
}
return false;
}
bool AnimationFilter::BeginDynamicFrameEvent(const TracePoint &point, size_t callStackRow)
{
- if (StartWith(point.name_, paralleCmd_)) {
+ if (streamFilters_->configFilter_->GetAnimationConfig().CheckIfParallelCmd(point.name_)) {
isNewAnimation_ = true;
return true;
}
- if (StartWith(point.name_, frameCountCmd_)) {
+ if (streamFilters_->configFilter_->GetAnimationConfig().CheckIfFrameCountCmd(point.name_)) {
frameCountRows_.insert(callStackRow);
return true;
- } else if (StartWith(point.name_, realFrameRateCmd_)) {
+ } else if (streamFilters_->configFilter_->GetAnimationConfig().CheckIfRealFrameRateCmd(point.name_)) {
// eg: `frame rate is 88.61: APP_LIST_FLING, com.taobao.taobao, pages/Index`
auto infos = SplitStringToVec(point.funcArgs_, ": ");
auto curRealFrameRateFlagInadex = traceDataCache_->GetDataIndex("H:" + infos.back());
@@ -116,7 +113,7 @@ bool AnimationFilter::BeginDynamicFrameEvent(const TracePoint &point, size_t cal
traceDataCache_->GetAnimation()->UpdateFrameInfo(animationRow,
traceDataCache_->GetDataIndex(curFrameNum + curRealFrameRate));
return true;
- } else if (StartWith(point.name_, newFrameBeginCmd_) || StartWith(point.name_, frameBeginCmd_)) {
+ } else if (streamFilters_->configFilter_->GetAnimationConfig().CheckIfFrameBeginCmd(point.name_)) {
// get the parent frame of data
const std::optional &parentId = callStackSlice_->ParentIdData()[callStackRow];
uint8_t depth = callStackSlice_->Depths()[callStackRow];
@@ -178,8 +175,9 @@ bool AnimationFilter::UpdateDynamicEndTime(const uint64_t curFrameRow, uint64_t
curStackRow = callStackSlice_->ParentIdData()[curStackRow].value();
// use frameEndTimeCmd_'s endTime as dynamicFrame endTime
auto nameIndex = callStackSlice_->NamesData()[curStackRow];
- if (isNewAnimation_ && StartWith(traceDataCache_->GetDataFromDict(nameIndex), renderFrameCmd_) ||
- StartWith(traceDataCache_->GetDataFromDict(nameIndex), frameEndTimeCmd_)) {
+ if ((!isNewAnimation_ && StartWith(traceDataCache_->GetDataFromDict(nameIndex), frameEndTimeCmd_)) ||
+ streamFilters_->configFilter_->GetAnimationConfig().CheckIfFrameEndTimeCmd(
+ traceDataCache_->GetDataFromDict(nameIndex))) {
auto endTime = callStackSlice_->TimeStampData()[curStackRow] + callStackSlice_->DursData()[curStackRow];
dynamicFrame_->UpdateEndTime(curFrameRow, endTime);
return true;
diff --git a/trace_streamer/src/filter/animation_filter.h b/trace_streamer/src/filter/animation_filter.h
index 3201e06ca675504c4005cc51e3c3b6d51539a60f..177ebbddc5669afbb91d00174f858f523eeace29 100644
--- a/trace_streamer/src/filter/animation_filter.h
+++ b/trace_streamer/src/filter/animation_filter.h
@@ -25,6 +25,7 @@
#include "string_help.h"
#include "string_to_numerical.h"
#include "trace_streamer_filters.h"
+#include "config_filter.h"
namespace SysTuning {
namespace TraceStreamer {
@@ -40,6 +41,7 @@ public:
bool FinishAnimationEvent(const BytraceLine &line, size_t callStackRow);
void UpdateDynamicFrameInfo();
void UpdateFrameInfo();
+ void InitAnimationStartEvents();
void Clear();
private:
@@ -49,18 +51,7 @@ private:
const std::regex framePixPattern_ =
std::regex(R"(\[(.*?)\]\s*\(\s*-?(\d+),\s*-?(\d+),\s*(\d+),\s*(\d+)\)\s*Alpha:\s+-*(\d+\.\d+))");
// for calculate the frame rate
- const std::string frameRateCmd_ = "H:GenerateVsyncCount";
- // if the realFrameRate present, no calculation is required
- const std::string realFrameRateCmd_ = "H:RSJankStats::RecordAnimationDynamicFrameRate"; // 动效过程帧率
- const std::string frameCountCmd_ = "H:Repaint";
- const std::string frameBeginCmd_ = "H:RSUniRender::Process:[WindowScene_";
- const std::string newFrameBeginCmd_ = "H:RSSurfaceRenderNodeDrawable::OnDraw:[WindowScene_"; // 动效帧数据
- const std::string frameBeginPrefix_ = "H:RSUniRender::Process:[";
- const std::string screenSizeCmd_ = "H:RSUniRender::Process:[SCBDesktop";
- const std::string newScreenSizeCmd_ = "H:RSSurfaceRenderNodeDrawable::OnDraw:[SCBDesktop"; // 设备分辨率
const std::string frameEndTimeCmd_ = "H:RSMainThread::DoComposition";
- const std::string paralleCmd_ = "H:PostAndWait, parallel type"; // 并行化标志
- const std::string renderFrameCmd_ = "H:RenderFrame"; // 并行化后动效帧结束时间相关trace点
std::unordered_set
+
+
+
+
@@ -870,6 +959,9 @@ export class TraceSheet extends BaseElement {
scrollPrio,
callback
);
+
+ displaySysCallData = (data: ThreadSysCallStruct) =>
+ this.displayTab('current-selection').setSysCallData(data);
displayMemData = (data: ProcessMemStruct): void =>
this.displayTab('current-selection').setMemData(data);
displayHangData = (data: HangStruct, sp: SpSystemTrace, scrollCallback: Function): Promise =>
@@ -1252,6 +1344,7 @@ export class TraceSheet extends BaseElement {
param.nativeMemoryCurrentIPid = ipid;
}
}
+ param.isImportSo = true;
this.rangeSelect(param, true);
return true;
} else {
@@ -1274,8 +1367,10 @@ export class TraceSheet extends BaseElement {
selection.threadIds.length > 0)
) {
this.importDiv!.style.display = 'flex';
+ this.symbolDiv!.style.display = 'flex';
} else {
this.importDiv!.style.display = 'none';
+ this.symbolDiv!.style.display = 'none';
}
}
isProcessEqual(treeData: Array<{ pid: number; ipid: number }>): boolean {
@@ -1382,6 +1477,72 @@ export class TraceSheet extends BaseElement {
(pane.children.item(0) as TabPaneBoxChild).data = param;
}
+ tdSysCallClickHandler(e: unknown): void {
+ // @ts-ignore
+ this.currentPaneID = e.target.parentElement.id;
+ //隐藏除了当前Tab页的其他Tab页
+ this.shadowRoot!.querySelectorAll('lit-tabpane').forEach((it): boolean =>
+ it.id !== this.currentPaneID ? (it.hidden = true) : (it.hidden = false)
+ ); //todo：看能不能优化
+ let pane = this.getPaneByID('box-thread-syscall-child'); //通过Id找到需要展示的Tab页
+ pane.closeable = true; //关闭的ican显示
+ pane.hidden = false;
+ this.litTabs!.activeByKey(pane.key); //显示key值对应的Tab页
+ // @ts-ignore
+ pane.tab = e.detail.name; //设置Tab页标题，有的标题可直接用，有的标题需在此转换成需要展示的字符串
+ let param = new SysCallBoxJumpParam();
+ param.traceId = this.selection!.traceId;
+ param.leftNs = this.selection!.leftNs;
+ param.rightNs = this.selection!.rightNs;
+ // @ts-ignore
+ const level = e.detail.level;
+ if (level === 'Process') {
+ // @ts-ignore
+ param.processId = [e.detail.id];
+ } else if (level === 'Thread'){
+ // @ts-ignore
+ param.processId = [e.detail.parentId];
+ // @ts-ignore
+ param.threadId = [e.detail.id];
+ } else {
+ // @ts-ignore
+ param.threadId = [e.detail.parentId];
+ // @ts-ignore
+ param.sysCallId = e.detail.id;
+ }
+ param.isJumpPage = true; // @ts-ignore
+ (pane.children.item(0) as TabPaneSysCallChild).data = param;
+ }
+
+ tdPerfSampleClickHandler(e: unknown): void {
+ // @ts-ignore
+ this.currentPaneID = e.target.parentElement.id;
+ //隐藏除了当前Tab页的其他Tab页
+ this.shadowRoot!.querySelectorAll('lit-tabpane').forEach((it): boolean =>
+ it.id !== this.currentPaneID ? (it.hidden = true) : (it.hidden = false)
+ ); //todo：看能不能优化
+ let pane = this.getPaneByID('box-perf-sample-child'); //通过Id找到需要展示的Tab页
+ pane.closeable = true; //关闭的ican显示
+ pane.hidden = false;
+ this.litTabs!.activeByKey(pane.key); //显示key值对应的Tab页
+ // @ts-ignore
+ pane.tab = e.detail.symbol; //设置Tab页标题，有的标题可直接用，有的标题需在此转换成需要展示的字符串
+ let param = new PerfSampleBoxJumpParam();
+ param.traceId = this.selection!.traceId;
+ param.leftNs = this.selection!.leftNs;
+ param.rightNs = this.selection!.rightNs;
+ //@ts-ignore
+ param.pid = e.detail.pid;
+ //@ts-ignore
+ param.tid = e.detail.tid;
+ //@ts-ignore
+ param.count = e.detail.dur || 0;
+ //@ts-ignore
+ param.tsArr = e.detail.tsArray || [];
+ param.isJumpPage = true;
+ (pane.children.item(0) as TabPanePerfSampleChild).data = param;
+ }
+
//Slice Tab点击Occurrences列下的td进行跳转
tdSliceClickHandler(e: unknown): void {
// @ts-ignore
diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts
index f5de86153d7f696dfb84db3e8839022138880bc7..44ab3360c2e4b8fbd9154f42c05dac4f16a3dc62 100644
--- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts
+++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts
@@ -30,6 +30,7 @@ import { TabPaneNMStatstics } from '../sheet/native-memory/TabPaneNMStatstics';
import { TabPaneNMemory } from '../sheet/native-memory/TabPaneNMemory';
import { TabPaneNMSampleList } from '../sheet/native-memory/TabPaneNMSampleList';
import { TabpanePerfProfile } from '../sheet/hiperf/TabPerfProfile';
+import { TabPanePerfSampleChild } from '../sheet/hiperf/TabPerfSampleChild';
import { TabPanePerfSample } from '../sheet/hiperf/TabPerfSampleList';
import { TabPaneLiveProcesses } from '../sheet/ability/TabPaneLiveProcesses';
import { TabPaneHistoryProcesses } from '../sheet/ability/TabPaneHistoryProcesses';
@@ -91,6 +92,7 @@ import { TabPaneIOTierStatisticsAnalysis } from '../sheet/file-system/TabPaneIOT
import { TabPaneVirtualMemoryStatisticsAnalysis } from '../sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis';
import { TabPaneCurrent } from '../sheet/TabPaneCurrent';
import { TabPaneStartup } from '../sheet/process/TabPaneStartup';
+import { TabPaneSysCall } from '../sheet/process/TabPaneSysCall';
import { TabPaneStaticInit } from '../sheet/process/TabPaneStaticInit';
import { TabPaneTaskFrames } from '../sheet/task/TabPaneTaskFrames';
import { TabPaneFrameDynamic } from '../sheet/frame/TabPaneFrameDynamic';
@@ -151,6 +153,7 @@ import { TabPanePerfAsync } from '../sheet/hiperf/TabPerfAsyncList';
import { TabPaneUserPlugin } from '../sheet/userPlugin/TabPaneUserPlugin';
import { TabPaneDmaFence } from '../sheet/dma-fence/TabPaneDmaFenceSelect';
import { TabPaneSliceChild } from '../sheet/process/TabPaneSliceChild';
+import { TabPaneSysCallChild } from '../sheet/process/TabPaneSysCallChild';
import { TabPerfFuncAsm } from '../sheet/hiperf/TabPerfFuncAsm';
export let tabConfig: {
@@ -216,6 +219,15 @@ export let tabConfig: {
type: TabPaneStartup,
require: (param: SelectionParam) => param.processIds.length > 0 && param.startup,
},
+ 'box-thread-syscall': {
+ title: 'SysCall Event',
+ type: TabPaneSysCall,
+ require: (param: SelectionParam) => param.processSysCallIds.length > 0 || param.threadSysCallIds.length > 0,
+ },
+ 'box-thread-syscall-child': {
+ title: '',
+ type: TabPaneSysCallChild,
+ },
'box-process-static-init': {
title: 'Static Initialization',
type: TabPaneStaticInit,
@@ -251,6 +263,10 @@ export let tabConfig: {
type: TabPanePerfSample,
require: (param: SelectionParam) => param.perfSampleIds.length > 0,
},
+ 'box-perf-sample-child': {
+ title: '',
+ type: TabPanePerfSampleChild
+ },
'box-perf-async': {
title: 'Async Call Profile',
type: TabPanePerfAsync,
diff --git a/ide/src/trace/component/trace/base/Utils.ts b/ide/src/trace/component/trace/base/Utils.ts
index e9e4435a69e2d127719ad203228d72dabd53c7e9..f8ebc2fb51a3d8203d080f5ed085966ecfdeef88 100644
--- a/ide/src/trace/component/trace/base/Utils.ts
+++ b/ide/src/trace/component/trace/base/Utils.ts
@@ -23,6 +23,8 @@ export class Utils {
static currentSelectTrace: string | null | undefined;
static currentTraceMode: TraceMode = TraceMode.NORMAL;
static distributedTrace: string[] = [];
+ static isRangeSelectRefresh: boolean = false;
+ static currentTraceName: string = '';
static DMAFENCECAT_MAP: Map<
number,
{
@@ -54,6 +56,7 @@ export class Utils {
totalNS: number = 1;
private trace1ThreadMap: Map = new Map();
private trace1ProcessMap: Map = new Map();
+ sysCallEventTidsMap: Map = new Map();
private trace1SchedSliceMap: Map<
string,
{
@@ -222,6 +225,7 @@ export class Utils {
this.trace2ThreadMap.clear();
this.trace1SchedSliceMap.clear();
this.trace2SchedSliceMap.clear();
+ this.sysCallEventTidsMap.clear();
Utils.distributedTrace = [];
}
diff --git a/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts b/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts
index 9e4d54868053ab42e121b1b4bc21d85cd8c1aee4..0cfe639213d9866fdbb67cd37c68251d71ff4cc6 100644
--- a/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts
+++ b/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts
@@ -51,6 +51,7 @@ import {
queryDistributedRelationAllData,
queryRWakeUpFrom,
queryRunnableTimeByRunning,
+ querySysCallEventDetail,
queryThreadStateArgs,
queryThreadWakeUp,
queryThreadWakeUpFrom,
@@ -70,6 +71,7 @@ import { XpowerAppDetailStruct } from '../../../database/ui-worker/ProcedureWork
import { XpowerWifiStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerWifi';
import { XpowerThreadCountStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerThreadCount';
import { XpowerGpuFreqCountStruct } from '../../../database/ui-worker/ProcedureWorkerXpowerGpuFreqCount';
+import { ThreadSysCallStruct } from '../../../database/ui-worker/ProcedureWorkerThreadSysCall';
const INPUT_WORD =
'This is the interval from when the task became eligible to run \n(e.g.because of notifying a wait queue it was a suspended on) to\n when it started running.';
@@ -473,6 +475,7 @@ export class TabPaneCurrentSelection extends BaseElement {
}
list.push(item);
});
+ this.addTabSliceDetail(data, list)
this.currentSelectionTbl!.dataSource = list;
// @ts-ignore
let startTimeAbsolute = (data.startTs || 0) + (window as unknown).recordStartNS;
@@ -494,6 +497,7 @@ export class TabPaneCurrentSelection extends BaseElement {
name: 'Thread',
value: (this.transferString(threadName ?? '') || 'NULL') + ' [' + dataTid + '] ',
});
+ this.addTabSliceDetail(data, list)
list.push({
name: 'StartTime(Relative)',
value: getTimeString(data.startTs || 0),
@@ -599,6 +603,7 @@ export class TabPaneCurrentSelection extends BaseElement {
argset.forEach((item) => {
list.push({ name: item.keyName, value: item.strValue });
});
+ this.addTabSliceDetail(data, list)
this.addTabPanelContent(list, data, information);
this.currentSelectionTbl!.dataSource = list;
});
@@ -653,6 +658,7 @@ export class TabPaneCurrentSelection extends BaseElement {
}
);
}
+ this.addTabSliceDetail(data, list)
this.addTabPanelContent(list, data, information);
this.currentSelectionTbl!.dataSource = list;
let funcClick = this.currentSelectionTbl?.shadowRoot?.querySelector('#function-jump');
@@ -686,6 +692,21 @@ export class TabPaneCurrentSelection extends BaseElement {
});
}
+ private addTabSliceDetail(data: FuncStruct, list: unknown[]) {
+ const properties = [
+ {key: 'trace_level', name: 'TraceLevel'},
+ {key: 'trace_tag', name: 'TraceTag'},
+ {key: 'category', name: 'Category'},
+ {key: 'custom_args', name: 'CustomArgs'},
+ ];
+ properties.forEach(prop => {
+ if (data[prop.key] && list !== undefined) {
+ list!.push({name: prop.name, value: data[prop.key]});
+ }
+ });
+ return list;
+ }
+
private handleAsyncBinder(
data: FuncStruct,
list: unknown[],
@@ -748,6 +769,7 @@ export class TabPaneCurrentSelection extends BaseElement {
value: (this.transferString(threadName ?? '') || 'NULL') + ' [' + data.tid + '] ',
});
}
+ this.addTabSliceDetail(data, list)
this.addTabPanelContent(list, data, information);
this.currentSelectionTbl!.dataSource = list;
let funcClick = this.currentSelectionTbl?.shadowRoot?.querySelector('#function-jump');
@@ -1197,6 +1219,35 @@ export class TabPaneCurrentSelection extends BaseElement {
});
}
+ async setSysCallData(data: ThreadSysCallStruct) {
+ this.setTableHeight('350px');
+ this.initCanvas();
+ let leftTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#leftTitle');
+ this.setTitleAndButtonStyle();
+ if (leftTitle) {
+ leftTitle.innerText = 'SysCall Event';
+ }
+ let list: unknown[] = [];
+ list.push({ name: 'Name', value: `${data.name} [${data.id}]` });
+ list.push({
+ name: 'StartTime(Relative)',
+ value: getTimeString(data.startTs || 0),
+ });
+ list.push({
+ name: 'StartTime(Absolute)',
+ value: ((data.startTs || 0) + Utils.getInstance().getRecordStartNS()) / 1000000000 + 's',
+ });
+ list.push({ name: 'Duration', value: getTimeString(data.dur || 0) });
+ const eventValue = await querySysCallEventDetail(data.itid!, data.startTs! + Utils.getInstance().getRecordStartNS(), data.dur!);
+ if (eventValue[0]) {
+ list.push({ name: 'Process', value: `${eventValue[0].pName} [${data.pid}]` });
+ list.push({ name: 'Thread', value: `${eventValue[0].tName} [${data.tid}]` });
+ list.push({ name: 'args', value: eventValue[0].args });
+ list.push({ name: 'ret', value: eventValue[0].ret });
+ }
+ this.currentSelectionTbl!.dataSource = list;
+ }
+
async setThreadData(
data: ThreadStruct,
scrollCallback: ((d: unknown) => void) | undefined,
diff --git a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts
index 5fdf7b28d571d9a351f87671510dd0c84ad86814..fbaaf9f1b93f239ebb1efa9e83c4107d0da74051 100644
--- a/ide/src/trace/component/trace/sheet/TabPaneFilter.ts
+++ b/ide/src/trace/component/trace/sheet/TabPaneFilter.ts
@@ -43,9 +43,9 @@ export interface MiningData {
export class CpuStatus {
cpu: number = 0;
- small: boolean = false;
+ little: boolean = false;
medium: boolean = false;
- large: boolean = false;
+ big: boolean = false;
}
@element('tab-pane-filter')
@@ -482,7 +482,7 @@ export class TabPaneFilter extends BaseElement {
}
//添加cpu列表
- setCoreConfigList(count: number, small: Array, mid: Array, large: Array): void {
+ setCoreConfigList(count: number, little: Array, mid: Array, big: Array): void {
let divEl = this.shadowRoot!.querySelector('#data-core-popover > div > #tb_core_setting');
divEl!.innerHTML = '';
this.createCoreHeaderDiv(divEl);
@@ -490,13 +490,13 @@ export class TabPaneFilter extends BaseElement {
let obj = {
cpu: i,
// @ts-ignore
- small: small.includes(i),
+ little: little.includes(i),
// @ts-ignore
medium: mid.includes(i),
// @ts-ignore
- large: large.includes(i),
+ big: big.includes(i),
};
- this.createCheckBoxLine(divEl, obj, small, mid, large);
+ this.createCheckBoxLine(divEl, obj, little, mid, big);
}
}
@@ -507,89 +507,89 @@ export class TabPaneFilter extends BaseElement {
cpuIdLine.style.fontSize = '12px';
cpuIdLine.textContent = 'Cpu';
cpuIdLine.style.textAlign = 'center';
- let smallLine = document.createElement('div');
- smallLine.className = 'core_line';
- smallLine.style.fontWeight = 'bold';
- smallLine.textContent = 'S';
- smallLine.style.fontSize = '12px';
- smallLine.style.textAlign = 'center';
+ let littleLine = document.createElement('div');
+ littleLine.className = 'core_line';
+ littleLine.style.fontWeight = 'bold';
+ littleLine.textContent = 'L';
+ littleLine.style.fontSize = '12px';
+ littleLine.style.textAlign = 'center';
let mediumLine = document.createElement('div');
mediumLine.className = 'core_line';
mediumLine.style.fontWeight = 'bold';
mediumLine.textContent = 'M';
mediumLine.style.fontSize = '12px';
mediumLine.style.textAlign = 'center';
- let largeLine = document.createElement('div');
- largeLine.className = 'core_line';
- largeLine.style.fontWeight = 'bold';
- largeLine.textContent = 'L';
- largeLine.style.fontSize = '12px';
- largeLine.style.textAlign = 'center';
+ let bigLine = document.createElement('div');
+ bigLine.className = 'core_line';
+ bigLine.style.fontWeight = 'bold';
+ bigLine.textContent = 'B';
+ bigLine.style.fontSize = '12px';
+ bigLine.style.textAlign = 'center';
// @ts-ignore
- tab?.append(...[cpuIdLine, smallLine, mediumLine, largeLine]);
+ tab?.append(...[cpuIdLine, littleLine, mediumLine, bigLine]);
}
//添加对应的cpu checkbox,并添加对应的监听事件
createCheckBoxLine(
divEl: unknown,
cpuStatus: CpuStatus,
- small: Array,
+ little: Array,
mid: Array,
- large: Array
+ big: Array
): void {
let div = document.createElement('div');
div.textContent = cpuStatus.cpu + '';
div.style.textAlign = 'center';
div.style.fontWeight = 'normal';
- let smallCheckBox: LitCheckBox = new LitCheckBox();
- smallCheckBox.checked = cpuStatus.small;
- smallCheckBox.setAttribute('not-close', '');
- smallCheckBox.style.textAlign = 'center';
- smallCheckBox.style.marginLeft = 'auto';
- smallCheckBox.style.marginRight = 'auto';
+ let littleCheckBox: LitCheckBox = new LitCheckBox();
+ littleCheckBox.checked = cpuStatus.little;
+ littleCheckBox.setAttribute('not-close', '');
+ littleCheckBox.style.textAlign = 'center';
+ littleCheckBox.style.marginLeft = 'auto';
+ littleCheckBox.style.marginRight = 'auto';
let midCheckBox: LitCheckBox = new LitCheckBox();
midCheckBox.checked = cpuStatus.medium;
midCheckBox.setAttribute('not-close', '');
midCheckBox.style.textAlign = 'center';
midCheckBox.style.marginLeft = 'auto';
midCheckBox.style.marginRight = 'auto';
- let largeCheckBox: LitCheckBox = new LitCheckBox();
- largeCheckBox.checked = cpuStatus.large;
- largeCheckBox.setAttribute('not-close', '');
- largeCheckBox.style.marginLeft = 'auto';
- largeCheckBox.style.marginRight = 'auto';
- smallCheckBox.addEventListener('change', (e: unknown) => {
+ let bigCheckBox: LitCheckBox = new LitCheckBox();
+ bigCheckBox.checked = cpuStatus.big;
+ bigCheckBox.setAttribute('not-close', '');
+ bigCheckBox.style.marginLeft = 'auto';
+ bigCheckBox.style.marginRight = 'auto';
+ littleCheckBox.addEventListener('change', (e: unknown) => {
midCheckBox.checked = false;
- largeCheckBox.checked = false;
+ bigCheckBox.checked = false;
// @ts-ignore
- cpuStatus.small = e.detail.checked;
+ cpuStatus.little = e.detail.checked;
// @ts-ignore
- this.canUpdateCheckList(e.detail.checked, small, cpuStatus.cpu);
+ this.canUpdateCheckList(e.detail.checked, little, cpuStatus.cpu);
mid = mid.filter((it) => it !== cpuStatus.cpu);
- large = large.filter((it) => it !== cpuStatus.cpu);
+ big = big.filter((it) => it !== cpuStatus.cpu);
});
midCheckBox.addEventListener('change', (e: unknown) => {
- largeCheckBox.checked = false;
- smallCheckBox.checked = false;
+ bigCheckBox.checked = false;
+ littleCheckBox.checked = false;
// @ts-ignore
cpuStatus.medium = e.detail.checked;
// @ts-ignore
this.canUpdateCheckList(e.detail.checked, mid, cpuStatus.cpu);
- large = large.filter((it) => it !== cpuStatus.cpu);
- small = small.filter((it) => it !== cpuStatus.cpu);
+ big = big.filter((it) => it !== cpuStatus.cpu);
+ little = little.filter((it) => it !== cpuStatus.cpu);
});
- largeCheckBox.addEventListener('change', (e: unknown) => {
+ bigCheckBox.addEventListener('change', (e: unknown) => {
midCheckBox.checked = false;
- smallCheckBox.checked = false;
+ littleCheckBox.checked = false;
// @ts-ignore
- cpuStatus.large = e.detail.checked;
+ cpuStatus.big = e.detail.checked;
// @ts-ignore
- this.canUpdateCheckList(e.detail.checked, large, cpuStatus.cpu);
+ this.canUpdateCheckList(e.detail.checked, big, cpuStatus.cpu);
mid = mid.filter((it) => it !== cpuStatus.cpu);
- small = small.filter((it) => it !== cpuStatus.cpu);
+ little = little.filter((it) => it !== cpuStatus.cpu);
});
// @ts-ignore
- divEl!.append(...[div, smallCheckBox, midCheckBox, largeCheckBox]);
+ divEl!.append(...[div, littleCheckBox, midCheckBox, bigCheckBox]);
}
//判断checkList数组是否需要push数据或删除数据
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.html.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.html.ts
index 02249b1ec86b5d3944b5319a2dcb6c0e05de1126..787aa7d7c5a36c684fa89c4e07f99fd713315485 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.html.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.html.ts
@@ -66,8 +66,21 @@ export const TabPanePerfAnalysisHtml = `
width: 100%;
height: 20px;
}
+@keyframes textGrowth {
+ 0% {
+ font-size: 16px;
+ transform: scale(0.9);
+ }
+ 100% {
+ font-size: 18px;
+ transform: scale(1.0);
+ }
+}
#SO-err-tips{
color:red;
+ animation: textGrowth 2.0s ease-in-out infinite alternate;
+ will-change: transform, font-size;
+ transform: translateZ(0);
}
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.ts
index b0db75e263f836ece63d3a647e6279669f574427..cb3ca4164a3cb7bd2b38ebc2df70a4f61b3920d9 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.ts
@@ -13,6 +13,7 @@
* limitations under the License.
*/
import { TabPerfFuncAsmHtml } from './TabPerfFuncAsm.html';
+import { Utils } from '../../base/Utils';
import { BaseElement, element } from '../../../../../base-ui/BaseElement';
import { LitTable } from '../../../../../base-ui/table/lit-table';
import {
@@ -22,6 +23,7 @@ import {
} from '../../../../bean/PerfAnalysis';
import { WebSocketManager } from '../../../../../webSocket/WebSocketManager';
import { Constants, TypeConstants } from '../../../../../webSocket/Constants';
+import { SpStatisticsHttpUtil } from '../../../../../statistics/util/SpStatisticsHttpUtil';
@element('tab-perf-func-asm')
export class TabPerfFuncAsm extends BaseElement {
@@ -140,6 +142,9 @@ export class TabPerfFuncAsm extends BaseElement {
}
set data(data: PerfFunctionAsmParam) {
+ if (Utils.isRangeSelectRefresh) {
+ this.functionName = '';
+ }
if (this.functionName === data.functionName || data.functionName === undefined) {
return;
}
@@ -151,6 +156,7 @@ export class TabPerfFuncAsm extends BaseElement {
this.totalCount = data.totalCount;
this.updateTotalCount();
this.showLoading();
+ Utils.isRangeSelectRefresh = false;
// @ts-ignore
const vaddrInFile = data.vaddrList[0].vaddrInFile;
// 1. 先转成 BigInt
@@ -170,6 +176,10 @@ export class TabPerfFuncAsm extends BaseElement {
if (cmd === Constants.DISASSEMBLY_QUERY_BACK_CMD) {
const result = JSON.parse(new TextDecoder().decode(e));
if (result.resultCode === 0) {
+ SpStatisticsHttpUtil.addOrdinaryVisitAction({
+ event: 'hiperf_func',
+ action: 'hiperf_func',
+ });
if (result.anFileOff) {
this.textFileOffElement!.innerHTML = `.text section: ${result.anFileOff}`;
this.textFileOffElement!.style.display = 'block';
@@ -256,8 +266,10 @@ export class TabPerfFuncAsm extends BaseElement {
private calcutelateShowUpData(): void {
this.funcSampleMap.forEach((selfCount, offsetToVaddr) => {
let instructionPosition = offsetToVaddr / 4;
- this.formattedAsmIntructionArray[instructionPosition].selfcount = selfCount;
- this.formattedAsmIntructionArray[instructionPosition].percent = Math.round((selfCount / this.totalCount) * 10000) / 100;
+ if (this.formattedAsmIntructionArray[instructionPosition]) {
+ this.formattedAsmIntructionArray[instructionPosition].selfcount = selfCount;
+ this.formattedAsmIntructionArray[instructionPosition].percent = Math.round((selfCount / this.totalCount) * 10000) / 100;
+ }
});
this.originalShowUpData = this.formattedAsmIntructionArray;
}
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.html.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.html.ts
index 21c6f8a95f0102640d25427b1a2cb283bb1e3c6e..1abd315dbe6fb1eef2abea32f5ed782fdf25bda9 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.html.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.html.ts
@@ -64,7 +64,7 @@ selector{
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
index c04d2ce9193ebb9aa8d80437fac8ecac9538ebf6..57993a75d892168db49a87d982efbe7aaad79e4b 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.ts
@@ -68,13 +68,21 @@ export class TabPanePerfAnalysis extends BaseElement {
private isComplete: boolean = true;
private currentSelectionParam: SelectionParam | undefined | null;
static tabLoadingList: Array = [];
+
private vaddrList: Array = [];
private selectedTabfileName: string = '';
private clickFuncVaddrList: Array = [];
private functionListener!: Function | undefined | null;
private currentSoName: string = '';
+ private currentProcessItem: unknown;
+ private currentThreadItem: unknown;
+ private currentLibrayItem: unknown;
set data(val: SelectionParam) {
+ if (val.isImportSo && this.currentLevel > 0) {
+ this.disableHomeRedirectAfterSoLoad(val);
+ return;
+ }
if (val === this.currentSelection) {
this.pidData.unshift(this.allProcessCount);
this.perfTableProcess!.recycleDataSource = this.pidData;
@@ -107,6 +115,66 @@ export class TabPanePerfAnalysis extends BaseElement {
}
}
+ private disableHomeRedirectAfterSoLoad(val: SelectionParam): void {
+ this.getDataByWorker(val, (results: unknown) => {
+ this.isComplete = true;
+ // @ts-ignore
+ this.processData = results;
+ // @ts-ignore
+ if (this.currentLevel === 3) {
+ this.reset(this.tableFunction!, true);
+ this.getHiperfFunction(this.currentLibrayItem);
+ let title = '';
+ if (this.processName.length > 0) {
+ title += `${this.processName} / `;
+ }
+ if (this.threadName.length > 0) {
+ title += `${this.threadName} / `;
+ }
+ if (this.currentSoName.length > 0) {
+ title += this.currentSoName;
+ }
+ this.titleEl!.textContent = title;
+ this.perfAnalysisPie?.hideTip();
+ this.selectedTabfileName = this.currentSoName;
+ } else if (this.currentLevel === 1) {
+ if (this.hideThreadCheckBox!.checked) {
+ this.hideThread(this.currentProcessItem);
+ } else {
+ this.reset(this.perfTableThread!, true);
+ this.getHiperfThread(this.currentProcessItem, val);
+ }
+ // @ts-ignore
+ this.titleEl!.textContent = this.currentProcessItem.tableName;
+ // @ts-ignore
+ this.processName = this.currentProcessItem.tableName;
+ this.perfAnalysisPie?.hideTip();
+ } else if (this.currentLevel === 2) {
+ this.reset(this.perfTableSo!, true);
+ this.getHiperfSo(this.currentThreadItem, val);
+ let pName = this.processName;
+ // @ts-ignore
+ if (this.processName.length > 0 && this.currentThreadItem.tableName.length > 0) {
+ pName = `${this.processName} / `;
+ }
+ // @ts-ignore
+ this.titleEl!.textContent = pName + this.currentThreadItem.tableName;
+ // @ts-ignore
+ this.threadName = this.currentThreadItem.tableName;
+ this.perfAnalysisPie?.hideTip();
+ }
+ const args = [
+ {
+ funcName: 'getVaddrToFile',
+ funcArgs: [val],
+ },
+ ];
+ procedurePool.submitWithName('logic0', 'perf-vaddr', args, undefined, (results: Array) => {
+ this.vaddrList = results;
+ });
+ });
+ }
+
private initPerfTableListener(): void {
for (let perfTable of this.tableArray!) {
let querySelector = perfTable.shadowRoot?.querySelector('.table');
@@ -407,6 +475,7 @@ export class TabPanePerfAnalysis extends BaseElement {
}
private perfProcessLevelClickEvent(it: unknown, val: SelectionParam): void {
+ this.currentProcessItem = it;
if (this.hideThreadCheckBox!.checked) {
this.hideThread(it);
this.showAssignLevel(this.perfTableSo!, this.perfTableProcess!, 1, this.soData);
@@ -478,6 +547,7 @@ export class TabPanePerfAnalysis extends BaseElement {
}
private perfThreadLevelClickEvent(it: unknown, val: SelectionParam): void {
+ this.currentThreadItem = it;
this.reset(this.perfTableSo!, true);
this.showAssignLevel(this.perfTableSo!, this.perfTableThread!, 2, this.soData);
this.getHiperfSo(it, val);
@@ -556,6 +626,7 @@ export class TabPanePerfAnalysis extends BaseElement {
}
private perfSoLevelClickEvent(it: unknown): void {
+ this.currentLibrayItem = it;
this.reset(this.tableFunction!, true);
this.showAssignLevel(this.tableFunction!, this.perfTableSo!, 3, this.functionData);
// @ts-ignore
@@ -623,7 +694,7 @@ export class TabPanePerfAnalysis extends BaseElement {
encodedData = textEncoder.encode(dataString);
WebSocketManager.getInstance()?.registerMessageListener(TypeConstants.DISASSEMBLY_TYPE, this.callback, () => { }, true);
WebSocketManager.getInstance()?.sendMessage(TypeConstants.DISASSEMBLY_TYPE, Constants.DISASSEMBLY_QUERY_ELF_CMD, encodedData);
- if (WebSocketManager.disaStatus !== 'ready') {
+ if (WebSocketManager.getInstance()!.status !== 'ready') {
// @ts-ignore
this.perfAnalysisHeadTips?.innerHTML = 'Request timed out.Install the extended service according to the help document.';
return;
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.html.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.html.ts
index f7b7de69d872931a13d766549d1f7a0499eb3cc4..83e8a071e94e44b625a02bcb14f76b9cdb2dc770 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.html.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfFuncAsm.html.ts
@@ -74,9 +74,9 @@ export const TabPerfFuncAsmHtml = `
+
+
+
+
+ 
+ 
+
+
+
+
+
`;
+ }
+}
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts
index 5397cd4e3b7b4fe8784f0f21d01e19c84585c8ef..49042adb857b9f3337d1fd50ca2093316d6d7ca4 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfSampleList.ts
@@ -106,9 +106,16 @@ export class TabPanePerfSample extends BaseElement {
setRightTableData(sample: PerfSample): void {
queryPerfSampleCallChain(sample.sampleId).then((result) => {
for (let stack of result) {
+ if (stack.sourceId !== undefined) {
+ stack.sourceFile = SpSystemTrace.DATA_DICT.get(stack.sourceId) || '';
+ }
if (typeof stack.symbol === 'number') {
stack.symbol = SpSystemTrace.DATA_DICT.get(stack.symbol) || '';
- } // @ts-ignore
+ }
+ if (stack.sourceFile && stack.lineNumber !== undefined) {
+ stack.symbol = `${stack.symbol}[${stack.sourceFile}(${stack.lineNumber})]`;
+ }
+ //@ts-ignore
let files = (perfDataQuery.filesData[stack.fileId] ?? []) as Array
+
+
+
+
+
+
+
+
+ {{backtrace[0]}}
+ ⬅
+ {{backtrace[1]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `;
+ }
+
+ sortByColumn(sortDetail: unknown): void {
+ let compare = (itemA: SysCallTreeItem, itemB: SysCallTreeItem): number => {
+ // @ts-ignore
+ if (sortDetail.key === 'durStr') {
+ // @ts-ignore
+ if (sortDetail.sort === 0) {
+ return itemA.sumDur - itemB.sumDur; // @ts-ignore
+ } else if (sortDetail.sort === 1) {
+ return itemA.sumDur - itemB.sumDur;
+ } else {
+ return itemB.sumDur - itemA.sumDur;
+ }
+ } else {
+ // @ts-ignore
+ if (sortDetail.sort === 0) {
+ return itemA.totalCount - itemB.totalCount; // @ts-ignore
+ } else if (sortDetail.sort === 1) {
+ return itemA.totalCount - itemB.totalCount;
+ } else {
+ return itemB.totalCount - itemA.totalCount;
+ }
+ }
+ };
+ this.sysCallSource.forEach((syscall) => {
+ syscall.children?.sort(compare);
+ });
+ const deepSort = (arr: SysCallTreeItem[]) => {
+ arr.sort(compare);
+ arr.forEach(item => {
+ if (item.children) {
+ deepSort(item.children);
+ }
+ })
+ };
+ deepSort(this.sysCallSource);
+ this.sysCallTbl!.recycleDataSource = this.sysCallSource;
+ }
+}
diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSysCallChild.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSysCallChild.ts
new file mode 100644
index 0000000000000000000000000000000000000000..5b9317457edb19db54ab5b824dba38f8c756d0e0
--- /dev/null
+++ b/ide/src/trace/component/trace/sheet/process/TabPaneSysCallChild.ts
@@ -0,0 +1,195 @@
+/*
+ * 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';
+import { LitTable } from '../../../../../base-ui/table/lit-table';
+import { SysCallBoxJumpParam, SelectionData } from '../../../../bean/BoxSelection';
+import { Utils } from '../../base/Utils';
+import { resizeObserver } from '../SheetUtils';
+import { querySysCallEventWithRange } from '../../../../database/sql/ProcessThread.sql';
+import { SysCallMap } from '../../base/SysCallUtils';
+
+interface SysCallChildItem {
+ pName: string;
+ tName: string;
+ pid: number;
+ tid: number;
+ nameId: number;
+ name: string;
+ startTs: string;
+ startTime: number;
+ absoluteTs: number;
+ dur: number;
+ args: string;
+ ret: number
+}
+
+@element('tabpane-syscall-child')
+export class TabPaneSysCallChild extends BaseElement {
+ private boxChildTbl: LitTable | null | undefined;
+ private boxChildRange: HTMLLabelElement | null | undefined;
+ private boxChildSource: Array
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `;
+ }
+
+ sortByColumn(detail: unknown): void {
+ // @ts-ignore
+ function compare(property, sort, type) {
+ return function (boxChildLeftData: SelectionData, boxChildRightData: SelectionData): number {
+ if (type === 'number') {
+ return sort === 2
+ // @ts-ignore
+ ? parseFloat(boxChildRightData[property]) - parseFloat(boxChildLeftData[property])
+ // @ts-ignore
+ : parseFloat(boxChildLeftData[property]) - parseFloat(boxChildRightData[property]);
+ } else {
+ // @ts-ignore
+ if (boxChildRightData[property] > boxChildLeftData[property]) {
+ return sort === 2 ? 1 : -1;
+ } else {
+ // @ts-ignore
+ if (boxChildRightData[property] === boxChildLeftData[property]) {
+ return 0;
+ } else {
+ return sort === 2 ? -1 : 1;
+ }
+ }
+ }
+ };
+ }
+
+ // @ts-ignore
+ this.boxChildSource.sort(compare(detail.key, detail.sort, 'string'));
+ this.boxChildTbl!.recycleDataSource = this.boxChildSource;
+ }
+}
diff --git a/ide/src/trace/database/TraceWorker.ts b/ide/src/trace/database/TraceWorker.ts
index 1923ed8af5c7a7984547128917d8c0033d2416ae..ed200f885dd0ae7b17966a7b5088c47af7aea7ec 100644
--- a/ide/src/trace/database/TraceWorker.ts
+++ b/ide/src/trace/database/TraceWorker.ts
@@ -313,6 +313,7 @@ function initModuleCallBackAndFun(): void {
let tlvResultCallback = (heapPtr: number, size: number, type: number, isEnd: number): void => {
//@ts-ignore
let out: Uint8Array = wasmModule.HEAPU8.slice(heapPtr, heapPtr + size);
+ //@ts-ignore
protoDataMap.set(type, BatchSphData.decode(out).values);
};
//@ts-ignore
@@ -332,7 +333,7 @@ function parseThirdWasmByOpenAction(e: MessageEvent): void {
if (parseConfig !== '') {
let parseConfigArray = enc.encode(parseConfig);
//@ts-ignore
- let parseConfigAddr = wasmModule._InitializeParseConfig(1024);
+ let parseConfigAddr = wasmModule._InitializeParseConfig(parseConfigArray.length);
//@ts-ignore
wasmModule.HEAPU8.set(parseConfigArray, parseConfigAddr);
//@ts-ignore
diff --git a/ide/src/trace/database/data-trafic/ClockDataReceiver.ts b/ide/src/trace/database/data-trafic/ClockDataReceiver.ts
index 003775fb86bb8cf593fb595d2f0ae70472ee6df5..30d84c997aa9f7dfe364cc85d4067aa8ef4ca2d5 100644
--- a/ide/src/trace/database/data-trafic/ClockDataReceiver.ts
+++ b/ide/src/trace/database/data-trafic/ClockDataReceiver.ts
@@ -63,10 +63,15 @@ export const chartClockDataSql = (args: Args): string => {
export const chartClockDataSqlMem = (args: Args): string => {
if (args.sqlType === 'clockFrequency') {
return `
- with freq as ( select measure.filter_id, measure.ts, measure.type, measure.value from clock_event_filter
- left join measure
- where clock_event_filter.name = '${args.clockName}' and clock_event_filter.type = 'clock_set_rate' and clock_event_filter.id = measure.filter_id
- order by measure.ts)
+ with freq as ( select
+ m.filter_id,
+ m.ts,
+ m.type,
+ m.value from clock_event_filter as c
+ left join measure as m on c.id = m.filter_id
+ where c.name = '${args.clockName}'
+ and c.type = 'clock_set_rate'
+ order by m.ts)
select freq.filter_id as filterId,freq.ts - r.start_ts as startNs,freq.type,freq.value from freq,trace_range r order by startNs;
`;
} else if (args.sqlType === 'clockState') {
diff --git a/ide/src/trace/database/data-trafic/process/ThreadSysCallDataReceiver.ts b/ide/src/trace/database/data-trafic/process/ThreadSysCallDataReceiver.ts
new file mode 100644
index 0000000000000000000000000000000000000000..8001f4c08111bf0f120ccaffb043d150ea3f9308
--- /dev/null
+++ b/ide/src/trace/database/data-trafic/process/ThreadSysCallDataReceiver.ts
@@ -0,0 +1,92 @@
+// 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 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 { Args } from '../CommonArgs';
+import { threadSysCallList } from '../utils/AllMemoryCache';
+import { filterDataByGroup } from '../utils/DataFilter';
+import { TraficEnum } from '../utils/QueryEnum';
+
+export const chartThreadSysCallDataSql = (args: Args):unknown => {
+ return `SELECT syscall_number as id, itid, ts - ${args.recordStartNS} as startTs, max(dur) as dur,
+ ((ts - ${args.recordStartNS}) / (${Math.floor((args.endNS - args.startNS) / args.width)})) AS px
+ from syscall
+ where itid = ${args.itid}
+ and startTs + dur >= ${Math.floor(args.startNS)}
+ and startTs <= ${Math.floor(args.endNS)}
+ group by px
+ `;
+};
+
+export const sysCallMemSql = (args: Args): unknown => {
+ return `select syscall_number as id, (ts - ${args.recordStartNS}) as startTs, dur from syscall where itid = ${args.itid}`
+}
+
+export function threadSysCallDataReceiver(data: unknown, proc: Function): void {
+ //@ts-ignore
+ let itid: number = data.params.itid;
+ let arr: unknown[] = [];
+ if (threadSysCallList.has(itid)) {
+ arr = threadSysCallList.get(itid) || [];
+ } else {
+ //@ts-ignore
+ let sql = sysCallMemSql(data.params);
+ arr = proc(sql); //@ts-ignore
+ threadSysCallList.set(itid, arr);
+ }
+ let res = filterDataByGroup(
+ arr,
+ 'startTs',
+ 'dur', //@ts-ignore
+ data.params.startNS, //@ts-ignore
+ data.params.endNS, //@ts-ignore
+ data.params.width
+ );
+ arrayBufferHandler(data, res, true, false);
+}
+
+function arrayBufferHandler(data: unknown, res: unknown[], transfer: boolean, isEmpty: boolean): void {
+ //@ts-ignore
+ let startTs = new Float64Array(res.length); //@ts-ignore
+ let dur = new Float64Array(res.length); //@ts-ignore
+ let id = new Int32Array(res.length); //@ts-ignore
+ let itid = new Int32Array(res.length); //@ts-ignore
+ res.forEach((it, i) => {
+ //@ts-ignore
+ data.params.trafic === TraficEnum.ProtoBuffer && (it = it.processThreadSysCallData); //@ts-ignore
+ startTs[i] = it.startTs; //@ts-ignore
+ dur[i] = it.dur; //@ts-ignore
+ id[i] = it.id; //@ts-ignore
+ itid[i] = data.params.itid; //@ts-ignore
+ });
+ (self as unknown as Worker).postMessage(
+ {
+ //@ts-ignore
+ id: data.id, //@ts-ignorew
+ action: data.action,
+ results: transfer
+ ? {
+ id: id.buffer,
+ itid: itid.buffer,
+ startTs: startTs.buffer,
+ dur: dur.buffer,
+ }
+ : {},
+ len: res.length,
+ transfer: transfer,
+ isEmpty: isEmpty,
+ },
+ transfer
+ ? [startTs.buffer, dur.buffer, id.buffer, itid.buffer]
+ : []
+ );
+}
diff --git a/ide/src/trace/database/data-trafic/process/ThreadSysCallDataSender.ts b/ide/src/trace/database/data-trafic/process/ThreadSysCallDataSender.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f874b4f4ca6385924906ca006a5e59dce5bc1ca2
--- /dev/null
+++ b/ide/src/trace/database/data-trafic/process/ThreadSysCallDataSender.ts
@@ -0,0 +1,82 @@
+// 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 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 { CHART_OFFSET_LEFT, MAX_COUNT, QueryEnum, TraficEnum } from '../utils/QueryEnum';
+import { getThreadPool } from '../../SqlLite';
+import { TraceRow } from '../../../component/trace/base/TraceRow';
+import { SysCallMap } from '../../../component/trace/base/SysCallUtils';
+import { Utils } from '../../../component/trace/base/Utils';
+import { ThreadSysCallStruct } from '../../ui-worker/ProcedureWorkerThreadSysCall';
+
+export function threadSysCallDataSender(
+ itid: number,
+ tid: number,
+ pid: number,
+ row: TraceRow