diff --git a/ide/BUILD.gn b/ide/BUILD.gn deleted file mode 100644 index ad5fba00adfb78124448dae15e5edd0d0ad51619..0000000000000000000000000000000000000000 --- a/ide/BUILD.gn +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -action("ts_build_sh") { - deps = [ "../trace_streamer:trace_streamer_port" ] - script = get_path_info("./build.sh", "abspath") - outputs = [ "$root_out_dir/developtools/smartperf_host/dist" ] - args = [ - rebase_path("."), - rebase_path("$root_out_dir/developtools/smartperf_host"), - ] -} diff --git a/ide/build.js b/ide/build.js index bf8795cb069f8b1789bf8b5d4918ddb426f93174..4ead05d71f42e8573b2ebd108268626ca284d5df 100644 --- a/ide/build.js +++ b/ide/build.js @@ -19,7 +19,7 @@ const childProcess = require('child_process'); const os = require('os'); const log4js = require('log4js'); -let compileServer = true; +const compileServer = true; const outDir = 'dist'; const sdkWams = [ @@ -66,35 +66,31 @@ function cpFile(from, to) { } function checkEnvironment() { - if (process.argv.slice(2)[0]) { - return true; - } else { - let goVersion = childProcess.execSync('go version', { - encoding: 'utf-8', - }); - log.info('go is', goVersion); - let nodeVersion = childProcess.execSync('node -v', { - encoding: 'utf-8', - }); - log.info('node version is', nodeVersion); - let tscVersion = childProcess.execSync('tsc -v', { - encoding: 'utf-8', - }); - log.info('tsc version is', tscVersion); - if (goVersion == '' || nodeVersion == '' || tscVersion == '') { - return false; - } - let traceStreamer = path.normalize(path.join(__dirname, '/bin')); - if (!checkDirExist(traceStreamer + '/trace_streamer_builtin.js')) { - log.error(traceStreamer + '/trace_streamer_builtin.js' + ' Must exist'); - return false; - } - if (!checkDirExist(traceStreamer + '/trace_streamer_builtin.wasm')) { - log.error(traceStreamer + '/trace_streamer_builtin.wasm' + ' Must exist'); - return false; - } - return true; + let goVersion = childProcess.execSync('go version', { + encoding: 'utf-8', + }); + log.info('go is', goVersion); + let nodeVersion = childProcess.execSync('node -v', { + encoding: 'utf-8', + }); + log.info('node version is', nodeVersion); + let tscVersion = childProcess.execSync('tsc -v', { + encoding: 'utf-8', + }); + log.info('tsc version is', tscVersion); + if (goVersion == '' || nodeVersion == '' || tscVersion == '') { + return false; + } + let traceStreamer = path.normalize(path.join(__dirname, '/bin')); + if (!checkDirExist(traceStreamer + '/trace_streamer_builtin.js')) { + log.error(traceStreamer + '/trace_streamer_builtin.js' + ' Must exist'); + return false; + } + if (!checkDirExist(traceStreamer + '/trace_streamer_builtin.wasm')) { + log.error(traceStreamer + '/trace_streamer_builtin.wasm' + ' Must exist'); + return false; } + return true; } function initLog() { @@ -111,13 +107,8 @@ function initLog() { function main() { log = initLog(); - let argv = process.argv.slice(2)[0]; - if (!argv){ - if (!checkEnvironment()) { - return; - } - } else { - compileServer = false; + if (!checkEnvironment()) { + return; } // clean outDir let outPath = path.normalize(path.join(__dirname, '/', outDir)); @@ -159,29 +150,27 @@ function main() { let thirdDistFile = path.join(__dirname, outDir, value.distFilePath); cpFile(thirdFile, thirdDistFile); }); - if (!argv) { - let traceStreamer = path.normalize(path.join(__dirname, '/bin')); - if (checkDirExist(traceStreamer)) { - let dest = path.normalize(path.join(__dirname, outDir, '/bin')); - copyDirectory(traceStreamer, dest); - // to mv traceStream Wasm and js - cpFile( - traceStreamer + '/trace_streamer_builtin.js', - rootPath + outDir + '/trace/database/trace_streamer_builtin.js' - ); - cpFile( - traceStreamer + '/trace_streamer_builtin.wasm', - rootPath + outDir + '/trace/database/trace_streamer_builtin.wasm' - ); - if (sdkWams.length > 0) { - sdkWams.forEach((fileName) => { - cpFile(traceStreamer + '/' + fileName, rootPath + outDir + '/trace/database/' + fileName); - }); - } - } else { - log.error('traceStreamer dir is not Exits'); - return; + let traceStreamer = path.normalize(path.join(__dirname, '/bin')); + if (checkDirExist(traceStreamer)) { + let dest = path.normalize(path.join(__dirname, outDir, '/bin')); + copyDirectory(traceStreamer, dest); + // to mv traceStream Wasm and js + cpFile( + traceStreamer + '/trace_streamer_builtin.js', + rootPath + outDir + '/trace/database/trace_streamer_builtin.js' + ); + cpFile( + traceStreamer + '/trace_streamer_builtin.wasm', + rootPath + outDir + '/trace/database/trace_streamer_builtin.wasm' + ); + if (sdkWams.length > 0) { + sdkWams.forEach((fileName) => { + cpFile(traceStreamer + '/' + fileName, rootPath + outDir + '/trace/database/' + fileName); + }); } + } else { + log.error('traceStreamer dir is not Exits'); + return; } // compile server if (compileServer) { diff --git a/ide/build.sh b/ide/build.sh deleted file mode 100755 index c406eaeb745eac78a3f4810e1629393655de96a8..0000000000000000000000000000000000000000 --- a/ide/build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# 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. - -set -e -echo "----------------smartperf_ide--------------------" -echo "1=$1" -echo "2=$2" -SOURCE="${BASH_SOURCE[0]}" -cd $(dirname ${SOURCE}) -npm run compile ohos -mv $1/dist $2/dist -mkdir -p $2/dist/bin -mv $2/trace_streamer $2/dist/bin \ No newline at end of file diff --git a/ide/src/base-ui/chart/pagenation/pagination-box.ts b/ide/src/base-ui/chart/pagenation/PaginationBox.ts similarity index 100% rename from ide/src/base-ui/chart/pagenation/pagination-box.ts rename to ide/src/base-ui/chart/pagenation/PaginationBox.ts diff --git a/ide/src/base-ui/checkbox/LitCheckBox.ts b/ide/src/base-ui/checkbox/LitCheckBox.ts index cacb1cdfb46467ef15272ca0c0262aac71c5b5f0..590cb6bdd647b5a1e03923d9ca7abda1cb127577 100644 --- a/ide/src/base-ui/checkbox/LitCheckBox.ts +++ b/ide/src/base-ui/checkbox/LitCheckBox.ts @@ -83,7 +83,6 @@ export class LitCheckBox extends BaseElement { display:flex; justify-content: center; align-items: center; - margin-right:12px; width: 16px; height:16px; border: 1px solid var(--dark-color1,#4D4D4D); diff --git a/ide/src/base-ui/popover/LitPopoverV.ts b/ide/src/base-ui/popover/LitPopoverV.ts index 80e13782ce1fb39cbdc6b00127f7786a1560b7a6..0e3a6a1325ca60662e58f5a74bb32db8f82f55b5 100644 --- a/ide/src/base-ui/popover/LitPopoverV.ts +++ b/ide/src/base-ui/popover/LitPopoverV.ts @@ -33,6 +33,14 @@ export class LitPopover extends BaseElement { } } + set placement(value) { + this.setAttribute('placement',value || 'bottomLeft'); + } + + get placement() { + return this.getAttribute('placement') + } + get trigger() { return this.getAttribute('trigger') || 'hover'; } @@ -80,7 +88,7 @@ export class LitPopover extends BaseElement { border-bottom: 1px solid #f0f0f0; } .content{ - padding: 10px 15px; + padding: 10px; } .trigger-click { position: absolute; diff --git a/ide/src/base-ui/table/lit-table.ts b/ide/src/base-ui/table/lit-table.ts index c2bd2be24c524b82d8859b39b44859c232937baa..4931e6dcc804d315bdf68413e24247975271a4be 100644 --- a/ide/src/base-ui/table/lit-table.ts +++ b/ide/src/base-ui/table/lit-table.ts @@ -29,6 +29,7 @@ export class LitTable extends HTMLElement { currentRecycleList: HTMLDivElement[] = []; currentTreeDivList: HTMLDivElement[] = []; public rememberScrollTop = false; + public getItemTextColor?: (data: any) => string; private ds: Array = []; private recycleDs: Array = []; private normalDs: Array = []; @@ -1445,6 +1446,9 @@ export class LitTable extends HTMLElement { newTableElement.style.position = 'absolute'; newTableElement.style.top = '0px'; newTableElement.style.left = '0px'; + if (this.getItemTextColor) { + newTableElement.style.color = this.getItemTextColor(rowData.data); + } return newTableElement; } @@ -1577,6 +1581,9 @@ export class LitTable extends HTMLElement { } else { this.setMouseIn(false, [element]); } + if (this.getItemTextColor) { + element.style.color = this.getItemTextColor((element as any).data); + } } setSelectedRow(isSelected: boolean, rows: any[]) { diff --git a/ide/src/base-ui/tabs/lit-tabs.ts b/ide/src/base-ui/tabs/lit-tabs.ts index 59c18808dad21ed301921ebb751cdb995e848e92..aa2958fbb806a2e8d0e147b881b02a295ff8bcc3 100644 --- a/ide/src/base-ui/tabs/lit-tabs.ts +++ b/ide/src/base-ui/tabs/lit-tabs.ts @@ -41,7 +41,6 @@ export class LitTabs extends HTMLElement { width:100%; height:100%; flex-shrink:0; - overflow:auto; } .nav-item{ display: inline-flex; diff --git a/ide/src/base-ui/tree/LitTree.ts b/ide/src/base-ui/tree/LitTree.ts new file mode 100644 index 0000000000000000000000000000000000000000..bbd105bd616ed15bc2b89096d095dbd2004fc24e --- /dev/null +++ b/ide/src/base-ui/tree/LitTree.ts @@ -0,0 +1,581 @@ +/* + * 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 './LitTreeNode.js' +import { BaseElement, element } from '../BaseElement.js'; +import { LitTreeNode } from './LitTreeNode.js'; + +export interface TreeItemData { + key: string; + title: string; + icon?: string; //节点的自定义图标 设置show-icon才会生效 + selected?: boolean; //控制是否选择该节点 + checked?: boolean; + children?: Array | null | undefined; +} + +@element('lit-tree') +export class LitTree extends BaseElement { + + private _treeData: Array = []; + private currentSelectedNode: any; + private currentSelectedData: any; + private proxyData: any; + private nodeList: Array = []; + private contextMenu: HTMLDivElement | null | undefined; + private srcDragElement: any; + private dragDirection: string | null | undefined; + + static get observedAttributes() { + return ['show-line', 'show-icon', 'checkable', 'foldable', 'dragable', 'multiple']; //foldable 表示点击目录是否可以折叠 + } + + set treeData(value: Array) { + this._treeData = value; + this.shadowRoot!.querySelector('#root')!.innerHTML = ''; + this.nodeList = []; + this.drawTree(this.shadowRoot!.querySelector('#root'), value, true); + + /*双向绑定*/ + const handler = { + get: (target: any, propkey: any) => { + return target[propkey]; + }, + set: (target: any, propkey: any, value: any, receiver: any) => { + if (target[propkey] !== value) { + if (!value.children) { + value.children = new Proxy([], handler); + } else { + value.children = new Proxy(value.children, handler); + } + target[propkey] = value; + if (!this.currentSelectedNode) { + this._insertNode(null, value); + } else { + if (this.currentSelectedNode.nextElementSibling) { + this._insertNode(this.currentSelectedNode.nextElementSibling, value); + } else { + this.currentSelectedNode.setAttribute('show-arrow', 'true'); + let ul = document.createElement('ul'); + // @ts-ignore + ul.open = 'true' + ul.style.transition = '.3s all'; + this.currentSelectedNode.parentElement.append(ul); + this.currentSelectedNode.arrow = true; + this._insertNode(ul, value); + } + } + } + return true; + } + }; + let setProxy = (v: Array) => { + v.forEach(a => { + if (!a.children) { + a.children = new Proxy([], handler); + } else { + a.children = new Proxy(a.children, handler); + setProxy(a.children || []); + } + }) + }; + setProxy(this._treeData); + this.proxyData = new Proxy(this._treeData, handler); + } + + set multiple(value: boolean) { + if (value) { + this.setAttribute('multiple',''); + } else { + this.removeAttribute('multiple'); + } + } + + get multiple() { + return this.hasAttribute('multiple'); + } + + get treeData() { + return this.proxyData; + } + + set onSelect(fn: any) { + this.addEventListener('onSelect', fn); + } + + set onChange(fn: any) { + this.addEventListener('onChange', fn); + } + + set foldable(value: any) { + if (value) { + this.setAttribute('foldable', ''); + } else { + this.removeAttribute('foldable'); + } + } + + //当 custom element首次被插入文档DOM时，被调用。 + connectedCallback() { + this.onclick = ev => { + this.contextMenu!.style.display = 'none'; + this.currentSelectedData = null; + this.currentSelectedNode = null; + this.selectedNode(null); + } + } + + getCheckdKeys() { + return Array.from(this.shadowRoot!.querySelectorAll('lit-tree-node[checked]')).map((a: any) => a.data.key); + } + + getCheckdNodes() { + return Array.from(this.shadowRoot!.querySelectorAll('lit-tree-node[checked]')).map((a: any) => a.data); + } + + //展开所有节点 + expandKeys(keys: Array) { + keys.forEach(k => this.shadowRoot!.querySelectorAll(`lit-tree-node[key='${k}']`).forEach((b: any) => b.expand())); + } + + //收起所有节点 + collapseKeys(keys: Array) { + keys.forEach(k => this.shadowRoot!.querySelectorAll(`lit-tree-node[key='${k}']`).forEach((b: any) => b.collapse())); + } + + checkedKeys(keys: Array) { + keys.forEach(k => this.shadowRoot!.querySelectorAll(`lit-tree-node[key='${k}']`).forEach((b: any) => { + b.setAttribute('checked', 'true'); + b.checkHandler(); + })); + } + + uncheckedKeys(keys: Array) { + keys.forEach(k => this.shadowRoot!.querySelectorAll(`lit-tree-node[key='${k}']`).forEach((b: any) => { + b.removeAttribute('checked'); + b.removeAttribute('missing'); + b.checkHandler(); + })); + } + + drawTree(parent: any, array: Array, topDepth: boolean = false) { + let that = this; + array.forEach(a => { + let li = document.createElement('li'); + let node: LitTreeNode = document.createElement('lit-tree-node') as LitTreeNode; + node.title = a.title; + node.setAttribute('key', a.key); + node.topDepth = topDepth; + if (this.hasAttribute('dragable')) { + node.draggable = true; + document.ondragover = function (e) { + e.preventDefault(); + }; + //在拖动目标上触发事件 (源元素) + node.ondrag = ev => this.onDrag(ev);//元素正在拖动时触发 + node.ondragstart = ev => this.onDragStart(ev);//用户开始拖动元素时触发 + node.ondragend = ev => this.onDragEnd(ev);// 用户完成元素拖动后触发 + //释放目标时触发的事件: + node.ondragenter = ev => this.onDragEnter(ev);//当被鼠标拖动的对象进入其容器范围内时触发此事件 + node.ondragover = ev => this.onDragOver(ev);//当某被拖动的对象在另一对象容器范围内拖动时触发此事件 + node.ondragleave = ev => this.onDragLeave(ev);//当被鼠标拖动的对象离开其容器范围内时触发此事件 + node.ondrop = ev => this.onDrop(ev);//在一个拖动过程中，释放鼠标键时触发此事件 + } + node.selected = a.selected || false; //是否选中行 + node.checked = a.checked || false;// 是否勾选 + node.data = a; + node.addEventListener('change', (e: any) => { + if (e.detail && !this.multiple) { + this.nodeList.forEach(item => { + item.checked = item.data!.key === node.data!.key; + item.data!.checked = item.checked; + }); + } + var litTreeNodes = this.nodeList.filter(it => it.checked); + if (litTreeNodes.length === 0) { + node.checked = true; + node.data!.checked = true; + } + that.dispatchEvent(new CustomEvent('onChange', {detail: {data: (node as any).data, checked: e.detail}})); + }); + node.multiple = this.hasAttribute('multiple'); + node.checkable = this.getAttribute('checkable') || 'false'; + this.nodeList.push(node); + // @ts-ignore + li.data = a; + li.append(node); + parent.append(li); + let ul = document.createElement('ul'); + // @ts-ignore + ul.open = 'true'; + ul.style.transition = '.3s all'; + if (a.children && a.children.length > 0) { + if (this.hasAttribute('show-icon')) { + if (a.icon) { + (node as any).iconName = a.icon; + } else { + (node as any).iconName = 'folder' + } + } else { + node.iconName = ''; + } + node.arrow = true; + li.append(ul); + this.drawTree(ul, a.children); + } else { + if (this.hasAttribute('show-icon')) { + if (a.icon) { + node.iconName = a.icon; + } else { + node.iconName = 'file'; + } + } else { + node.iconName = ''; + } + node.arrow = false; + } + li.onclick = (e) => { + e.stopPropagation() + if (this.hasAttribute('foldable')) { + // @ts-ignore + if (li.data.children && li.data.children.length > 0) { + node.autoExpand(); + } else { + // @ts-ignore + this.dispatchEvent(new CustomEvent('onSelect', {detail: li.data})) + this.selectedNode(node); + } + } else { + // @ts-ignore + this.dispatchEvent(new CustomEvent('onSelect', {detail: li.data})) + this.selectedNode(node); + } + }; + // node 添加右键菜单功能 + node.oncontextmenu = ev => { + ev.preventDefault(); + this.selectedNode(node); + this.currentSelectedNode = node; + this.currentSelectedData = node.data; + this.contextMenu!.style.display = 'block'; + this.contextMenu!.style.left = ev.pageX + 'px'; + this.contextMenu!.style.top = ev.pageY + 'px'; + }; + }); + this.oncontextmenu = ev => { + ev.preventDefault(); + this.contextMenu!.style.display = 'block'; + this.contextMenu!.style.left = ev.pageX + 'px'; + this.contextMenu!.style.top = ev.pageY + 'px'; + }; + } + + //取消所有节点的选中状态 然后选中当前node节点 + selectedNode(node: LitTreeNode | null | undefined) { + this.shadowRoot!.querySelectorAll('lit-tree-node').forEach((a) => { + a.selected = false; + }) + if (node) { + node.selected = true; + } + } + + closeContextMenu() { + this.contextMenu!.style.display = 'none'; + } + + onDrag(e: MouseEvent) { + + } + + onDragStart(ev: MouseEvent) { + this.srcDragElement = ev.target; + (ev.target! as LitTreeNode).open = 'true'; + (ev.target! as LitTreeNode).autoExpand(); + return undefined; + } + + onDragEnd(ev: MouseEvent) { + this.srcDragElement = null; + return undefined; + } + + onDragEnter(ev: MouseEvent) { + (ev.target as LitTreeNode).style.backgroundColor = '#42b98333'; + return undefined; + } + + onDragOver(ev: MouseEvent) { + let node = ev.target as LitTreeNode; + if (this.srcDragElement.data.key === node.data!.key) return; + let rect = (ev.currentTarget! as any).getBoundingClientRect(); + if (ev.clientX >= rect.left + rect.width / 3 && ev.clientX < rect.left + rect.width) { //bottom-right + this.dragDirection = 'bottom-right'; + node.drawLine('bottom-right'); + } else if (ev.clientY >= rect.top && ev.clientY < rect.top + rect.height / 2) {//上面 + this.dragDirection = 'top'; + node.drawLine('top'); + } else if (ev.clientY <= rect.bottom && ev.clientY > rect.top + rect.height / 2) {//下面 + this.dragDirection = 'bottom'; + node.drawLine('bottom'); + } + return undefined; + } + + onDragLeave(ev: MouseEvent) { + (ev.target as LitTreeNode).style.backgroundColor = '#ffffff00'; + (ev.target as LitTreeNode).drawLine(''); + return undefined; + } + + onDrop(ev: MouseEvent) { + (ev.target as LitTreeNode).style.backgroundColor = '#ffffff00'; + (ev.target as LitTreeNode).drawLine(''); + //移动的不是node节点 而是上层的li节点 + let srcData = this.srcDragElement.data;//获取原节点的data数据 + let dstData = (ev.target as LitTreeNode).data;//获取目标节点的data数据 + if (srcData.key === dstData!.key) return;//同一个节点不用处理 + let srcElement = this.srcDragElement.parentElement; + let srcParentElement = srcElement.parentElement; + let dstElement = (ev.target as LitTreeNode).parentElement; + srcElement.parentElement.removeChild(srcElement);//node li ul 从 ul 中移除 li + if (this.dragDirection === 'top') { + dstElement!.parentElement!.insertBefore(srcElement, dstElement); + } else if (this.dragDirection === 'bottom') { + dstElement!.parentElement!.insertBefore(srcElement, dstElement!.nextSibling); + } else if (this.dragDirection === 'bottom-right') { + let ul = dstElement!.querySelector('ul'); + if (!ul) { + ul = document.createElement('ul'); + ul.style.cssText = 'transition: all 0.3s ease 0s;'; + dstElement!.appendChild(ul); + } + dstElement!.querySelector('lit-tree-node')!.arrow = true;//拖动进入子节点，需要开启箭头 + ul.appendChild(srcElement); + } + let ul1 = dstElement!.querySelector('ul');//如果拖动后目标节点的子节点没有记录，需要关闭arrow箭头 + if (ul1) { + if (ul1.childElementCount == 0) (ul1.previousElementSibling! as LitTreeNode).arrow = false; + } + if (srcParentElement.childElementCount === 0) srcParentElement.previousElementSibling.arrow = false;//如果拖动的原节点的父节点没有子节点需要 关闭arrow箭头 + //拖动调整结构后修改 data树形数据结构 + this.removeDataNode(this._treeData, srcData); + this.addDataNode(this._treeData, srcData, dstData!.key, this.dragDirection!); + this.dispatchEvent(new CustomEvent('drop', { + detail: { + treeData: this._treeData, + srcData: srcData, + dstData: dstData, + type: this.dragDirection + } + })) + ev.stopPropagation(); + return undefined; + } + + //移除treeData中指定的节点 通过key匹配 + removeDataNode(arr: Array, d: TreeItemData) { + let delIndex = arr.findIndex(v => v.key === d.key); + if (delIndex > -1) { + arr.splice(delIndex, 1); + return; + } + for (let i = 0; i < arr.length; i++) { + if (arr[i].children && arr[i].children!.length > 0) { + this.removeDataNode(arr[i].children!, d); + } + } + } + + //中array中匹配到key为k的节点， t='bottom-right' 把d加入到该节点的children中去 t='top' 添加到找到的节点前面 t='bottom' 添加到找到的节点后面 + addDataNode(arr: Array, d: TreeItemData, k: string, t: string) { + for (let i = 0; i < arr.length; i++) { + if (arr[i].key === k) { + if (t === 'bottom-right') { + if (!arr[i].children) arr[i].children = []; + arr[i].children!.push(d); + } else if (t === 'top') { + arr.splice(i, 0, d); + } else if (t === 'bottom') { + arr.splice(i + 1, 0, d); + } + return; + } else { + if (arr[i].children) this.addDataNode(arr[i].children || [], d, k, t); + } + } + } + + insert(obj: TreeItemData) { + if (this.currentSelectedData) { + this.currentSelectedData.children.push(obj); + } else { + this.treeData.push(obj); + } + } + + _insertNode(parent: any, a: any) { + if (!parent) parent = this.shadowRoot!.querySelector('#root'); + let li = document.createElement('li'); + let insertNode = document.createElement('lit-tree-node') as LitTreeNode; + insertNode.title = a.title; + insertNode.setAttribute('key', a.key); + if (this.hasAttribute('dragable')) { + insertNode.draggable = true; + document.ondragover = function (e) { + e.preventDefault(); + } + //在拖动目标上触发事件 (源元素) + insertNode.ondrag = ev => this.onDrag(ev);//元素正在拖动时触发 + insertNode.ondragstart = ev => this.onDragStart(ev);//用户开始拖动元素时触发 + insertNode.ondragend = ev => this.onDragEnd(ev);// 用户完成元素拖动后触发 + //释放目标时触发的事件: + insertNode.ondragenter = ev => this.onDragEnter(ev);//当被鼠标拖动的对象进入其容器范围内时触发此事件 + insertNode.ondragover = ev => this.onDragOver(ev);//当某被拖动的对象在另一对象容器范围内拖动时触发此事件 + insertNode.ondragleave = ev => this.onDragLeave(ev);//当被鼠标拖动的对象离开其容器范围内时触发此事件 + insertNode.ondrop = ev => this.onDrop(ev);//在一个拖动过程中，释放鼠标键时触发此事件 + } + insertNode.selected = a.selected || false; //是否选中行 + insertNode.checked = a.checked || false;// 是否勾选 + insertNode.data = a; + insertNode.addEventListener('change', (e: any) => { + if (e.detail && !this.multiple) { + this.nodeList.forEach(node => { + node.checked = node.data!.key === insertNode.data!.key; + }); + } + this.dispatchEvent(new CustomEvent('onChange', {detail: {data: insertNode.data, checked: e.detail}})); + }) + this.nodeList.push(insertNode); + insertNode.checkable = this.getAttribute('checkable') || 'false'; + insertNode.multiple = this.hasAttribute('multiple'); + // @ts-ignore + li.data = a; + li.append(insertNode); + parent.append(li) + let ul = document.createElement('ul'); + // @ts-ignore + ul.open = 'true' + ul.style.transition = '.3s all'; + if (a.children && a.children.length > 0) { + if (this.hasAttribute('show-icon')) { + if (a.icon) { + insertNode.iconName = a.icon; + } else { + insertNode.iconName = 'folder'; + } + } else { + insertNode.iconName = ''; + } + insertNode.arrow = true; + li.append(ul); + this.drawTree(ul, a.children); + } else { + if (this.hasAttribute('show-icon')) { + if (a.icon) { + insertNode.iconName = a.icon; + } else { + insertNode.iconName = 'file'; + } + } else { + insertNode.iconName = ''; + } + insertNode.arrow = false; + } + li.onclick = (e) => { + e.stopPropagation() + if (this.hasAttribute('foldable')) { + // @ts-ignore + if (li.data.children && li.data.children.length > 0) { + insertNode.autoExpand(); + } else { + // @ts-ignore + this.dispatchEvent(new CustomEvent('onSelect', {detail: li.data})); + this.selectedNode(insertNode); + } + } else { + // @ts-ignore + this.dispatchEvent(new CustomEvent('onSelect', {detail: li.data})); + this.selectedNode(insertNode); + } + } + // node 添加右键菜单功能 + insertNode.oncontextmenu = (ev) => { + ev.preventDefault(); + this.selectedNode(insertNode); + this.currentSelectedNode = insertNode; + this.currentSelectedData = insertNode.data; + this.contextMenu!.style.display = 'block'; + this.contextMenu!.style.left = ev.pageX + 'px'; + this.contextMenu!.style.top = ev.pageY + 'px'; + }; + } + + initElements(): void { + this.contextMenu = this.shadowRoot!.querySelector('#contextMenu'); + } + + initHtml(): string { + return ` + +
    + + `; + } +} + +if (!customElements.get('lit-tree')) { + customElements.define('lit-tree', LitTree); +} \ No newline at end of file diff --git a/ide/src/base-ui/tree/LitTreeNode.ts b/ide/src/base-ui/tree/LitTreeNode.ts new file mode 100644 index 0000000000000000000000000000000000000000..45ee60ff4feae511346f57995c821bb781c3e8ef --- /dev/null +++ b/ide/src/base-ui/tree/LitTreeNode.ts @@ -0,0 +1,486 @@ +/* + * 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 '../icon/LitIcon.js' +import '../checkbox/LitCheckBox.js' +import { BaseElement, element } from '../BaseElement.js'; +import { LitCheckBox } from '../checkbox/LitCheckBox.js'; +import { LitIcon } from '../icon/LitIcon.js'; +import { TreeItemData } from './LitTree.js'; + +@element('lit-tree-node') +export class LitTreeNode extends BaseElement { + + private arrowElement: HTMLSpanElement | null | undefined; + private itemElement: HTMLDivElement | null | undefined; + private checkboxElement: LitCheckBox | null | undefined; + private iconElement: LitIcon | null | undefined; + private _data: TreeItemData | null | undefined; + + static get observedAttributes() { + return ['icon-name', 'icon-size', 'color', 'path', 'title', 'arrow', 'checkable', 'selected', 'checked', 'missing', 'multiple', 'top-depth']; + } + + get checkable() { + return this.getAttribute('checkable') || 'false'; + } + + set data(value: TreeItemData | null | undefined) { + this._data = value; + } + + get data() { + return this._data; + } + + set checkable(value) { + if (value === 'true') { + this.setAttribute('checkable', 'true'); + } else { + this.setAttribute('checkable', 'false'); + } + } + + set multiple(value: boolean) { + if (value) { + this.setAttribute('multiple', ''); + } else { + this.removeAttribute('multiple'); + } + } + + get multiple() { + return this.hasAttribute('multiple'); + } + + + get iconName() { + return this.getAttribute('icon-name') || ''; + } + + set iconName(value) { + this.setAttribute('icon-name', value); + } + + get topDepth() { + return this.hasAttribute('top-depth'); + } + + set topDepth(value) { + if (value) { + this.setAttribute('top-depth', ''); + } else { + this.removeAttribute('top-depth'); + } + } + + get arrow() { + return this.hasAttribute('arrow'); + } + + set arrow(value) { + if (value) { + this.setAttribute('arrow', 'true'); + } else { + this.removeAttribute('arrow'); + } + } + + get open() { + return this.getAttribute('open') || 'true'; + } + + set open(value) { + this.setAttribute('open', value); + } + + get selected() { + return this.hasAttribute('selected'); + } + + set selected(value) { + if (value) { + this.setAttribute('selected', ''); + } else { + this.removeAttribute('selected'); + } + } + + get checked() { + return this.hasAttribute('checked'); + } + + set checked(value) { + if (value === null || !value) { + this.removeAttribute('checked'); + } else { + this.setAttribute('checked', ''); + } + } + + initElements(): void { + this.arrowElement = this.shadowRoot!.querySelector('#arrow'); + this.iconElement = this.shadowRoot!.querySelector('#icon'); + this.itemElement = this.shadowRoot!.querySelector('#item'); + this.checkboxElement = this.shadowRoot!.querySelector('#checkbox'); + this.arrowElement!.onclick = (e) => { + e.stopPropagation(); + this.autoExpand(); + } + this.checkboxElement!.onchange = (e: any) => { + e.stopPropagation(); + this.onChange(e.detail.checked); + return false; + } + //这里需要给checkbox 添加onclick时间 并停止冒泡，不然onchange事件会触发父节点中的 onclick事件 + this.checkboxElement!.onclick = (e) => { + e.stopPropagation(); + }; + this.itemElement!.onclick = (e) => { + e.stopPropagation(); + this.onChange(!this.data?.checked); + }; + } + + onChange(checked: boolean) { + this.checked = checked; + this.data!.checked = checked; + this.checkHandler(); + this.dispatchEvent(new CustomEvent('change', {detail: checked})); + } + + initHtml(): string { + return ` + + +
    + + + ${this.title} +
    + ` + } + + //当 custom element首次被插入文档DOM时，被调用。 + connectedCallback() { + if (this.hasAttribute('checked')) this.checkboxElement!.checked = true; + this.checkHandler(); + } + + checkHandler() { + if (this.checked) { + this.removeAttribute('missing'); + } + if (this.hasAttribute('multiple')) { + if (this.nextElementSibling) { + if (this.checked) { + this.nextElementSibling.querySelectorAll('lit-tree-node').forEach((a: any) => { + a.checked = true; + a.removeAttribute('missing'); + }); + } else { + this.nextElementSibling.querySelectorAll('lit-tree-node').forEach((a: any) => a.checked = false); + } + } + let setCheckStatus = (element: any) => { + if (element.parentElement.parentElement.previousElementSibling && element.parentElement.parentElement.previousElementSibling.tagName === 'LIT-TREE-NODE') { + let allChecked = Array.from(element.parentElement.parentElement.querySelectorAll('lit-tree-node')).every((item: any) => item.checked); + let someChecked = Array.from(element.parentElement.parentElement.querySelectorAll('lit-tree-node')).some((item: any, index, array) => item.checked); + if (allChecked === true) { + element.parentElement.parentElement.previousElementSibling.checked = true; + element.parentElement.parentElement.previousElementSibling.removeAttribute('missing'); + } else if (someChecked) { + element.parentElement.parentElement.previousElementSibling.setAttribute('missing', '') + element.parentElement.parentElement.previousElementSibling.removeAttribute('checked') + } else { + element.parentElement.parentElement.previousElementSibling.removeAttribute('missing') + element.parentElement.parentElement.previousElementSibling.removeAttribute('checked') + } + setCheckStatus(element.parentElement.parentElement.previousElementSibling) + } + } + setCheckStatus(this); + } + } + + expand() { + if (this.open === 'true') return; + let uul = this.parentElement!.querySelector('ul'); + this.expandSection(uul); + this.arrowElement!.style.transform = 'translateX(-50%) rotateZ(0deg)'; + } + + collapse() { + if (this.open === 'false') return; + let uul = this.parentElement!.querySelector('ul'); + this.collapseSection(uul); + this.arrowElement!.style.transform = 'translateX(-50%) rotateZ(-90deg)'; + } + + autoExpand() { + let uul = this.parentElement!.querySelector('ul'); + if (this.open === 'true') { + this.collapseSection(uul); + this.arrowElement!.style.transform = 'translateX(-50%) rotateZ(-90deg)'; + } else { + this.expandSection(uul); + this.arrowElement!.style.transform = 'translateX(-50%) rotateZ(0deg)'; + } + } + + //收起 + collapseSection(element: any) { + if (!element) return; + let sectionHeight = element.scrollHeight; + let elementTransition = element.style.transition; + element.style.transition = ''; + requestAnimationFrame(function () { + element.style.height = sectionHeight + 'px'; + element.style.transition = elementTransition; + requestAnimationFrame(function () { + element.style.height = 0 + 'px'; + }); + }); + this.open = 'false'; + } + + //展开 + expandSection(element: any) { + if (!element) return; + let sectionHeight = element.scrollHeight; + element.style.height = sectionHeight + 'px'; + element.ontransitionend = (e: any) => { + element.ontransitionend = null; + element.style.height = null; + this.open = 'true'; + }; + } + + //当 custom element从文档DOM中删除时，被调用。 + disconnectedCallback() { + + } + + //当 custom element被移动到新的文档时，被调用。 + adoptedCallback() { + + } + + //当 custom element增加、删除、修改自身属性时，被调用。 + attributeChangedCallback(name: string, oldValue: any, newValue: any) { + if (name === 'title') { + this.shadowRoot!.querySelector('#title')!.textContent = newValue; + } else if (name === 'icon-name') { + if (this.iconElement) { + if (newValue !== null && newValue !== '' && newValue !== 'null') { + this.iconElement!.setAttribute('name', newValue); + this.iconElement!.style.display = 'flex'; + } else { + this.iconElement!.style.display = 'none'; + } + } + } else if (name === 'checkable') { + if (this.checkboxElement) { + if (newValue === 'true') { + this.checkboxElement!.style.display = 'inline-block'; + } else { + this.checkboxElement!.style.display = 'none'; + } + } + } else if (name === 'checked') { + if (this.checkboxElement) { + this.checkboxElement.checked = this.hasAttribute('checked'); + } + } + } + + //在node top top-right bottom bottom-right 画线条 + drawLine(direction: string/*string[top|bottom|top-right|bottom-right]*/) { + let item = this.shadowRoot!.querySelector('#item'); + if (!item) return; + item.removeAttribute('line-top'); + item.removeAttribute('line-top-right'); + item.removeAttribute('line-bottom'); + item.removeAttribute('line-bottom-right'); + switch (direction) { + case 'top': + item.setAttribute('line-top', '') + break; + case 'bottom': + item.setAttribute('line-bottom', '') + break; + case 'top-right': + item.setAttribute('line-top-right', '') + break; + case 'bottom-right': + item.setAttribute('line-bottom-right', '') + break; + } + } +} + +if (!customElements.get('lit-tree-node')) { + customElements.define('lit-tree-node', LitTreeNode); +} \ No newline at end of file diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts index b79fd52eec0aa7cdcb288f819c86b46203d476ea..02ad225ba96917337161bcf4b4f99d81bd23de62 100644 --- a/ide/src/trace/SpApplication.ts +++ b/ide/src/trace/SpApplication.ts @@ -49,7 +49,7 @@ import './component/trace/base/TraceRowConfig.js'; import { TraceRowConfig } from './component/trace/base/TraceRowConfig.js'; import { ColorUtils } from './component/trace/base/ColorUtils.js'; import { SpStatisticsHttpUtil } from '../statistics/util/SpStatisticsHttpUtil.js'; -import { SpFlags } from './component/SpFlags.js'; +import { FlagsConfig, SpFlags } from './component/SpFlags.js'; import './component/SpFlags.js'; @element('sp-application') @@ -331,16 +331,18 @@ export class SpApplication extends BaseElement { color: var(--dark-color1,#47A7E0); } .chart-filter { - display: block; visibility: hidden; z-index: -1; } :host([chart_filter]) .chart-filter { + display: grid; + grid-template-rows: min-content min-content min-content max-content auto; + overflow-y: clip; + height: 99%; visibility: visible; position: absolute; width: 40%; - height: 100%; right: 0; z-index: 1001; top: 0; @@ -388,7 +390,7 @@ export class SpApplication extends BaseElement { - + `; @@ -598,8 +600,10 @@ export class SpApplication extends BaseElement { menu!.style.pointerEvents = 'none'; sidebarButton!.style.pointerEvents = 'none'; that.search = litSearch.isLoading; - litSearch.style.display = 'none'; - litRecordSearch.style.display = 'block'; + if (!that.search) { + litSearch.style.display = 'none'; + litRecordSearch.style.display = 'block'; + } window.publish(window.SmartEvent.UI.KeyboardEnable, { enable: false, }); @@ -731,8 +735,8 @@ export class SpApplication extends BaseElement { }); } } - if ((window as any).cpuCount === 0) { - //if cpu count > 1 then show Scheduling-Analysis menu else hide it + if ((window as any).cpuCount === 0 || !FlagsConfig.getFlagsConfigEnableStatus('SchedulingAnalysis')) { + //if cpu count > 1 or SchedulingAnalysis config 'enable' then show Scheduling-Analysis menu else hide it menus.splice(1, 1); } return menus; @@ -924,6 +928,9 @@ export class SpApplication extends BaseElement { spSystemTrace!.reset((command: string, percent: number) => { setProgress(command); }); + window.publish(window.SmartEvent.UI.MouseEventEnable, { + mouseEnable: false, + }); window.clearTraceRowComplete(); that.freshMenuDisable(true); SpSchedulingAnalysis.resetCpu(); diff --git a/ide/src/trace/bean/AbilityMonitor.ts b/ide/src/trace/bean/AbilityMonitor.ts index 34cc931dcd405a6b66c267299b4e550948d038b7..9a638dfadc530102d9b1b742684e1d768db0c248 100644 --- a/ide/src/trace/bean/AbilityMonitor.ts +++ b/ide/src/trace/bean/AbilityMonitor.ts @@ -130,3 +130,51 @@ export class SystemMemorySummary { cmaFree: string = '0'; zram: string = '0'; } + +export class Dma { + processId: number = -1; + timeStamp: string = ''; + startNs: number = -1; + expTaskComm: string| number = ''; + avgSize: number = -1; + minSize: number = -1; + maxSize: number = -1; + bufName: string | number = ''; + expName: string | number = ''; + size: number = -1; + processName: string = ''; + process: string = ''; //processName + processId + fd: number = -1; + ino: number = -1; + expPid: number = -1; + flag: number = -1; + avgSizes: string = ''; + minSizes: string = ''; + maxSizes: string = ''; + sizes: string = ''; + sumSize: number = -1; + sumSizes: string = ''; +} + +export class GpuMemory { + processId: number = -1; + threadId: number = -1; + timeStamp: string = ''; + expTaskComm: string = ''; + startNs: number = -1; + avgSize: number = -1; + minSize: number = -1; + maxSize: number = -1; + gpuName: string = ''; + processName: string = ''; + process: string = ''; //processName + processId + threadName: string = ''; + thread: string = ''; //threadName + threadI + size: number = -1; + avgSizes: string = ''; + minSizes: string = ''; + maxSizes: string = ''; + sizes: string = ''; + sumSize: number = -1; + sumSizes: string = ''; +} diff --git a/ide/src/trace/bean/BoxSelection.ts b/ide/src/trace/bean/BoxSelection.ts index 8186a2e071fd147d850aab04046a93b8b6c6d47d..530ff16f21abbf05095e758e0b8046c4376766ed 100644 --- a/ide/src/trace/bean/BoxSelection.ts +++ b/ide/src/trace/bean/BoxSelection.ts @@ -72,6 +72,7 @@ export class SelectionParam { powerEnergy: Array = []; anomalyEnergy: Array = []; smapsType: Array = []; + vmtrackershm: Array = []; promiseList: Array> = []; jankFramesData: Array = []; jsMemory: Array = []; @@ -80,6 +81,25 @@ export class SelectionParam { frameAnimation: Array = []; frameSpacing: Array = []; jsCpuProfilerData: Array = []; + gpu: { + gl:boolean, + gpuTotal: boolean, + gpuWindow: boolean + } = { + gl: false, + gpuWindow:false, + gpuTotal: false + } + purgeableTotalAbility: Array = []; + purgeableTotalVM: Array = []; + purgeablePinAbility: Array = []; + purgeablePinVM: Array = []; + purgeableTotalSelection: Array = []; + purgeablePinSelection: Array = []; + dmaAbilityData: Array = []; + gpuMemoryAbilityData: Array = []; + dmaVmTrackerData: Array = []; + gpuMemoryTrackerData: Array = []; } export class BoxJumpParam { diff --git a/ide/src/trace/bean/MemoryConfig.ts b/ide/src/trace/bean/MemoryConfig.ts new file mode 100644 index 0000000000000000000000000000000000000000..014b1f038bd1e51a80a2a3ef7339d71a09fccd1c --- /dev/null +++ b/ide/src/trace/bean/MemoryConfig.ts @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +export class MemoryConfig { + private static instance: MemoryConfig; + pid: number = 0; + iPid: number = 0; + processName: string = ''; + interval: number = 0; + snapshotDur: number = 0; + + public static getInstance(): MemoryConfig { + if (!this.instance) { + this.instance = new MemoryConfig(); + } + return this.instance; + } + + public updateConfig(pid: number, iPid: number, processName: string, interval: number): void { + this.pid = pid; + this.iPid = iPid; + this.processName = processName; + this.interval = interval; + this.snapshotDur = (interval * 1000 * 1000) / 5 + } +} diff --git a/ide/src/trace/bean/SmapsStruct.ts b/ide/src/trace/bean/SmapsStruct.ts index 44862efd90cd58ff7e465cf02a1a82e10f3d80d6..17070f7a4bbb96bc040b7ddaa547ee8e6dc0b4a3 100644 --- a/ide/src/trace/bean/SmapsStruct.ts +++ b/ide/src/trace/bean/SmapsStruct.ts @@ -1,3 +1,4 @@ + /* * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -12,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - export class Smaps { tsNS: number = -1; start_addr: string = ''; @@ -25,31 +25,37 @@ export class Smaps { reside: number = 0; dirty: number = 0; swapper: number = 0; - address: string = ''; - type: string = ''; + type: SmapsType = 0; + typeName: string = ''; dirtyStr: string = ''; swapperStr: string = ''; rssStr: string = ''; pssStr: string = ''; sizeStr: string = ''; resideStr: string = ''; + shared_clean : number = 0; + shared_dirty:number = 0; + private_clean:number = 0; + private_dirty:number = 0; + swap:number = 0; + swap_pss:number = 0; + count:number = 0; } - export class SmapsTreeObj { constructor(id: string, pid: string, type: string) { this.id = id; this.pid = pid; - this.type = type; + this.typeName = type; } id: string = ''; pid: string = ''; rsspro: number = 0; rssproStr: string = ''; - type: string = ''; + typeName: string = ''; reg: number = 0; regStr: string = ''; - path: string = ''; + path: any = ''; rss: number = 0; rssStr: string = ''; dirty: number = 0; @@ -62,5 +68,35 @@ export class SmapsTreeObj { sizeStr: string = ''; respro: number = 0; resproStr: string = ''; + sizePro:number = 0; + sizeProStr :string = ''; + count :number = 0 ; + sharedClean : number = 0; + sharedCleanStr:string = ''; + sharedDirty:number = 0; + sharedDirtyStr:string = ''; + privateClean:number = 0; + privateCleanStr:string = ''; + privateDirty:number = 0; + privateDirtyStr:string = ''; + swap:number = 0; + swapStr:string = ''; + swapPss:number = 0; + swapPssStr:string = ''; children: Array = []; } +export enum SmapsType{ + TYPE_CODE_SYS, + TYPE_CODE_APP, + TYPE_DATA_SYS, + TYPE_DATA_APP, + TYPE_UNKNOWN_ANON, + TYPE_STACK, + TYPE_JS_HEAP, + TYPE_JAVA_VM, + TYPE_NATIVE_HEAP, + TYPE_ASHMEM, + TYPE_OTHER_SYS, + TYPE_OTHER_APP +} +export const TYPE_STRING = ['CODE_SYS','CODE_APP','DATA_SYS','DATA_APP','UNKNOWN_ANON','STACK','JS_HEAP','JAVA_VM','NATIVE_HEAP','ASHMEM','OTHER_SYS','OTHER_APP'] \ No newline at end of file diff --git a/ide/src/trace/component/SpFlags.ts b/ide/src/trace/component/SpFlags.ts index 8c0fcfac7ee5dc3225419e627e1f16733ee0cffc..d1c94b495ed642b3c2657e00729a0555fd0ab270 100644 --- a/ide/src/trace/component/SpFlags.ts +++ b/ide/src/trace/component/SpFlags.ts @@ -244,6 +244,11 @@ export class FlagsConfig { switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }], describeContent: 'App Startup templates', }, + { + title: 'SchedulingAnalysis', + switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }], + describeContent: 'Scheduling analysis templates', + }, ]; static getAllFlagConfig(): Array { @@ -332,6 +337,15 @@ export class FlagsConfig { } } + static getFlagsConfigEnableStatus(flagName: string): boolean { + let config = FlagsConfig.getFlagsConfig(flagName); + let enable: boolean = false; + if (config && config[flagName]) { + enable = config[flagName] === 'Enabled'; + } + return enable; + } + static updateFlagsConfig(key: string, value: unknown): void { let flagsConfigStr = window.localStorage.getItem(FlagsConfig.FLAGS_CONFIG_KEY); let flagConfigObj: Params = {}; diff --git a/ide/src/trace/component/SpInfoAndStas.ts b/ide/src/trace/component/SpInfoAndStas.ts index 9b919242a26adb5d443a3dffd59f3d66fc7c76e1..b2be3ccb7673fe026f74cefb8b601b9a9b3af240 100644 --- a/ide/src/trace/component/SpInfoAndStas.ts +++ b/ide/src/trace/component/SpInfoAndStas.ts @@ -26,42 +26,24 @@ export class SpInfoAndStats extends BaseElement { private infoData: Array = []; private metaTableEl: LitTable | undefined; private infoTableEl: LitTable | undefined; - private th: HTMLElement | undefined; - private progressLoad: LitProgressBar | undefined; - - static get observedAttributes() { - return []; - } initElements(): void { - this.progressLoad = this.shadowRoot?.querySelector('.load-metric') as LitProgressBar; this.metaTableEl = this.shadowRoot!.querySelector('#metaData-table') as LitTable; this.infoTableEl = this.shadowRoot!.querySelector('#stats-table') as LitTable; - - this.infoTableEl.style.overflow = 'visible'; - this.metaTableEl.style.overflow = 'visible'; - this.infoTableEl.style.width = 'auto'; - this.metaTableEl.style.width = 'auto'; - this.th = this.shadowRoot!.querySelector('.th') as HTMLElement; } - initInfoAndStatsData() { - this.progressLoad!.loading = true; + initInfoAndStatsData(): void { + let progressLoad = this.shadowRoot?.querySelector('.load-metric') as LitProgressBar; + progressLoad!.loading = true; let time = new Date().getTime(); this.initMetricItemData().then(() => { let durTime = new Date().getTime() - time; - info('InfoAndStatsData query time is: ' + durTime + 'ms'); + info(`InfoAndStatsData query time is: ${durTime}ms`); if (this.metaData.length > 0) { this.metaTableEl!.recycleDataSource = this.metaData; } else { this.metaTableEl!.recycleDataSource = []; } - new ResizeObserver(() => { - if (this.parentElement?.clientHeight != 0) { - this.metaTableEl!.style.height = '100%'; - this.metaTableEl!.reMeauseHeight(); - } - }).observe(this.parentElement!); info('metaData(metric) size is: ', this.metaData.length); if (this.infoData.length > 0) { this.infoTableEl!.recycleDataSource = this.infoData; @@ -69,32 +51,29 @@ export class SpInfoAndStats extends BaseElement { this.infoTableEl!.recycleDataSource = []; } new ResizeObserver(() => { - if (this.parentElement?.clientHeight != 0) { + if (this.parentElement?.clientHeight !== 0) { + this.metaTableEl!.style.height = '100%'; + this.metaTableEl!.reMeauseHeight(); this.infoTableEl!.reMeauseHeight(); } }).observe(this.parentElement!); info('infoData(metric) size is: ', this.infoData.length); - let metaDataStyle: HTMLDivElement | undefined | null = this.shadowRoot - ?.querySelector('#metaData-table') - ?.shadowRoot?.querySelector('div.body') as HTMLDivElement; - let metaDataHeadStyle: HTMLDivElement | undefined | null = this.shadowRoot - ?.querySelector('#metaData-table') - ?.shadowRoot?.querySelector('div.thead') as HTMLDivElement; - let statsStyle: HTMLDivElement | undefined | null = this.shadowRoot - ?.querySelector('#stats-table') - ?.shadowRoot?.querySelector('div.body') as HTMLDivElement; - let statsHeadStyle: HTMLDivElement | undefined | null = this.shadowRoot - ?.querySelector('#stats-table') - ?.shadowRoot?.querySelector('div.thead') as HTMLDivElement; - + let metaDataStyle: HTMLDivElement | undefined | null = this.metaTableEl!.shadowRoot?. + querySelector('div.body') as HTMLDivElement; + let metaDataHeadStyle: HTMLDivElement | undefined | null = this.metaTableEl!.shadowRoot?. + querySelector('div.thead') as HTMLDivElement; + let statsStyle: HTMLDivElement | undefined | null = this.infoTableEl!.shadowRoot?. + querySelector('div.body') as HTMLDivElement; + let statsHeadStyle: HTMLDivElement | undefined | null = this.infoTableEl!.shadowRoot?. + querySelector('div.thead') as HTMLDivElement; + let timeOutTs = 20; setTimeout(() => { this.initDataTableStyle(metaDataStyle!); this.initDataTableStyle(metaDataHeadStyle!); this.initDataTableStyle(statsStyle!); this.initDataTableStyle(statsHeadStyle!); - }, 20); - - this.progressLoad!.loading = false; + }, timeOutTs); + progressLoad!.loading = false; }); } @@ -111,7 +90,7 @@ export class SpInfoAndStats extends BaseElement { this.infoTableEl!.style.borderRadius = '16'; } - async initMetricItemData() { + async initMetricItemData(): Promise { this.metaData = []; this.infoData = []; let mete = await queryTraceMetaData(); @@ -127,110 +106,106 @@ export class SpInfoAndStats extends BaseElement { if (info) { for (let index = 0; index < info.length; index++) { this.infoData.push({ - event_name: info[index].event_name, - stat_type: info[index].stat_type, + eventName: info[index].event_name, + statType: info[index].stat_type, count: info[index].count, }); } } } - connectedCallback() {} - - disconnectedCallback() {} - - attributeChangedCallback(name: string, oldValue: string, newValue: string) {} - initHtml(): string { return ` -

    System info and metadata

    @@ -248,11 +223,11 @@ export class SpInfoAndStats extends BaseElement {

    Debugging stats

    - + - + - +
    @@ -269,8 +244,8 @@ export class MetaDataTable { } export class InfoDataTable { - event_name: string | undefined; - stat_type: string | undefined; + eventName: string | undefined; + statType: string | undefined; count: number | undefined; source?: string | undefined; serverity?: string | undefined; diff --git a/ide/src/trace/component/SpMetrics.ts b/ide/src/trace/component/SpMetrics.ts index 12cd1cb1398039ae68ea4efb11a8c9c461dc2194..9da9eb51aa46cbca1ea016fd1173a2b57ebaae01 100644 --- a/ide/src/trace/component/SpMetrics.ts +++ b/ide/src/trace/component/SpMetrics.ts @@ -79,36 +79,43 @@ export class SpMetrics extends BaseElement { this.responseJson = this.shadowRoot?.querySelector('.response-json') as HTMLPreElement; if (this.selectMetricEl) { this.selectMetricEl.addEventListener('selectionchange', () => { - if (this.selectMetricEl) this.selectMetricEl.textContent = ''; + if (this.selectMetricEl) { + this.selectMetricEl.textContent = ''; + } }); } this.initMetricDataHandle(); this.initMetricSelectOption(); } - async initMetric(queryItem: MetricQueryItem): Promise { - this.initMetricData(queryItem).then((item) => { + initMetric(queryItem: MetricQueryItem): void { + this.initMetricData(queryItem).then(() => { this.metricProgressLoad!.loading = false; }); } async initMetricData(queryItem: MetricQueryItem): Promise { + let spacesNumber = 4; let metricQuery = queryItem.metricQuery; let queryList = await metricQuery(); info('current Metric Data size is: ', queryList!.length); let metric = queryItem.metricResultHandle; let resultData = metric(queryList); - let jsonText = PluginConvertUtils.BeanToCmdTxtWithObjName(resultData, true, queryItem.metricName, 4); - this.responseJson!.textContent = jsonText; + this.responseJson!.textContent = PluginConvertUtils.BeanToCmdTxtWithObjName(resultData, true, + queryItem.metricName, spacesNumber); } attributeChangedCallback(name: string, oldValue: string, newValue: string): void { switch (name) { case 'metric': - if (this.selectMetricEl) this.selectMetricEl.textContent = newValue; + if (this.selectMetricEl) { + this.selectMetricEl.textContent = newValue; + } break; case 'metricResult': - if (this.selectMetricEl) this.selectMetricEl.textContent = newValue; + if (this.selectMetricEl) { + this.selectMetricEl.textContent = newValue; + } break; } } @@ -122,9 +129,11 @@ export class SpMetrics extends BaseElement { let selectedIndex = this.selectMetricEl!.selectedIndex; let value = this.selectMetricEl!.options[selectedIndex].value; let resultQuery = this.metricOptionalSelects?.filter((item) => { - return item.metricName == value; + return item.metricName === value; }); - if (!resultQuery || resultQuery.length < 1) return; + if (!resultQuery || resultQuery.length === 0) { + return; + } this.initMetric(resultQuery[0]); }; @@ -190,7 +199,6 @@ export class SpMetrics extends BaseElement { initHtml(): string { return ` -

    Select a metric

    diff --git a/ide/src/trace/component/SpQuerySQL.ts b/ide/src/trace/component/SpQuerySQL.ts index c7a6da2588e3819f2402f874a33bf4c561fe1f3e..627c161ca2146b1c1c15f7431340671198214043 100644 --- a/ide/src/trace/component/SpQuerySQL.ts +++ b/ide/src/trace/component/SpQuerySQL.ts @@ -14,35 +14,30 @@ */ import { BaseElement, element } from '../../base-ui/BaseElement.js'; -import { queryCustomizeSelect, querySelectTraceStats } from '../database/SqlLite.js'; +import { queryCustomizeSelect } from '../database/SqlLite.js'; import { LitTable } from '../../base-ui/table/lit-table.js'; import '../../base-ui/table/lit-table.js'; import { LitTableColumn } from '../../base-ui/table/lit-table-column.js'; import { info } from '../../log/Log.js'; import { LitProgressBar } from '../../base-ui/progress-bar/LitProgressBar.js'; import { PageNation } from '../../base-ui/chart/pagenation/PageNation.js'; -import { PaginationBox } from '../../base-ui/chart/pagenation/pagination-box.js'; +import { PaginationBox } from '../../base-ui/chart/pagenation/PaginationBox.js'; import { SpStatisticsHttpUtil } from '../../statistics/util/SpStatisticsHttpUtil.js'; @element('sp-query-sql') export class SpQuerySQL extends BaseElement { private queryTableEl: LitTable | undefined; - private queryText: string | undefined; - private resultText: string | undefined; - private notSupportList: Array | undefined; + private notSupportList: Array | undefined = []; private querySize: HTMLElement | undefined; private keyList: Array | undefined; private selector: HTMLTextAreaElement | undefined; private isSupportSql: boolean = true; - private querySelectTables: string = ''; private response: HTMLDivElement | undefined; - private statDataArray: any = []; - private sliceData: any = []; + private statDataArray: unknown[] = []; + private sliceData: unknown[] = []; private querySqlErrorText: string = ''; private progressLoad: LitProgressBar | undefined; private pagination: PaginationBox | undefined; - private pageSize: number = 200000; - private maxPageSize: number = 500000; initElements(): void { this.progressLoad = this.shadowRoot?.querySelector('.load-query-sql') as LitProgressBar; @@ -54,54 +49,68 @@ export class SpQuerySQL extends BaseElement { this.notSupportList?.push('insert', 'delete', 'update', 'drop', 'alter', 'truncate', 'create'); let htmlDivElement = this.queryTableEl.shadowRoot?.querySelector('.table') as HTMLDivElement; htmlDivElement.style.overflowX = 'scroll'; - window.addEventListener('resize', () => { this.freshTableHeadResizeStyle(); }); - let copyButtonEl = this.shadowRoot?.querySelector('#copy-button') as HTMLButtonElement; copyButtonEl.addEventListener('click', () => { this.copyTableData(); }); - let closeButtonEl = this.shadowRoot?.querySelector('#close-button') as HTMLButtonElement; closeButtonEl.addEventListener('click', () => { - this.querySize!.textContent = 'Query result - 0 counts'; + this.querySize!.textContent = 'Query result - 0 counts.'; this.queryTableEl!.dataSource = []; this.response!.innerHTML = ''; }); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight !== 0) { + this.queryTableEl!.style.height = '100%'; + this.queryTableEl!.reMeauseHeight(); + } + }).observe(this.parentElement!); } - freshTableHeadResizeStyle(): void { + private freshTableHeadResizeStyle(): void { let th = this.queryTableEl!.shadowRoot?.querySelector('.th'); if (th) { let td = th.querySelectorAll('.td'); let firstChild = this.queryTableEl!.shadowRoot?.querySelector('.body')!.firstElementChild; if (firstChild) { let bodyList = firstChild.querySelectorAll('.td'); - for (let index = 0 ; index < bodyList.length ; index++) { - td[index].style.width = bodyList[index].offsetWidth + 'px'; + for (let index = 0; index < bodyList.length; index++) { + td[index].style.width = `${bodyList[index].offsetWidth}px`; td[index].style.overflow = 'hidden'; } } } + let tableHeadStyle: HTMLDivElement | undefined | null = this.queryTableEl?.shadowRoot?.querySelector( + 'div.th' + ) as HTMLDivElement; + if (tableHeadStyle && tableHeadStyle.hasChildNodes()) { + for (let index = 0; index < tableHeadStyle.children.length; index++) { + // @ts-ignore + tableHeadStyle.children[index].style.gridArea = null; + } + } + this.queryTableEl!.style.height = '100%'; } - async copyTableData(): Promise { + private async copyTableData(): Promise { let copyResult = ''; for (let keyListKey of this.keyList!) { - copyResult += keyListKey + '\t'; + copyResult += `${keyListKey}\t`; } copyResult += '\n'; - let copyData = []; - if (this.statDataArray.length > this.maxPageSize) { + let copyData: unknown[]; + if (this.statDataArray.length > maxPageSize) { copyData = this.sliceData; } else { copyData = this.statDataArray; } for (const value of copyData) { this.keyList?.forEach((key) => { - copyResult += value[key] + '\t'; + // @ts-ignore + copyResult += `${value[key]}\t`; }); copyResult += '\n'; } @@ -109,195 +118,104 @@ export class SpQuerySQL extends BaseElement { } selectEventListener = (event: KeyboardEvent): void => { - let that = this; - if (event.ctrlKey && event.keyCode == 13) { + let enterKey = 13; + if (event.ctrlKey && event.keyCode === enterKey) { SpStatisticsHttpUtil.addOrdinaryVisitAction({ event: 'query', action: 'query', }); - if (!this.isSupportSql) { + this.statDataArray = []; + this.keyList = []; + this.queryTableEl!.innerHTML = ''; + if (this.isSupportSql) { + this.progressLoad!.loading = true; + queryCustomizeSelect(this.selector!.value).then((resultList): void => { + if (resultList && resultList.length > 0) { + this.statDataArray = resultList; + this.keyList = Object.keys(resultList[0]); + this.querySize!.textContent = `Query result - ${this.statDataArray.length} counts.`; + this.initDataElement(); + this.response!.appendChild(this.queryTableEl!); + this.setPageNationTableEl(); + } else { + this.querySize!.textContent = `Query result - ${this.statDataArray.length} counts.`; + this.progressLoad!.loading = false; + } + }); + } else { this.querySize!.textContent = this.querySqlErrorText; this.queryTableEl!.dataSource = []; this.response!.innerHTML = ''; return; } - this.progressLoad!.loading = true; - let startData = new Date().getTime(); - this.getInputSqlResult(this.selector!.value).then((resultList) => { - let dur = new Date().getTime() - startData; - this.statDataArray = []; - this.keyList = []; - for (let index = 0 ; index < resultList.length ; index++) { - const dataResult = resultList[index]; - let keys = Object.keys(dataResult); - // @ts-ignore - let values = Object.values(dataResult); - let jsonText = '{'; - for (let keyIndex = 0 ; keyIndex < keys.length ; keyIndex++) { - let key = keys[keyIndex]; - if (this.keyList.indexOf(key) <= -1) { - this.keyList.push(key); - } - let value = values[keyIndex]; - if (typeof value == 'string') { - value = value.replace(//gi, '>'); - } - jsonText += '"' + key + '"' + ': ' + '"' + value + '"'; - if (keyIndex != keys.length - 1) { - jsonText += ','; - } else { - jsonText += '}'; - } - } - this.statDataArray.push(JSON.parse(jsonText)); - } - - this.queryTableEl!.innerHTML = ''; - this.queryText = this.selector!.value; - this.initDataElement(); - this.response!.appendChild(this.queryTableEl!); - setTimeout(() => { - let total = this.statDataArray.length; - if (total > this.maxPageSize) { - that.pagination!.style.opacity = '1'; - new PageNation(this.pagination, { - current: 1, - total: total, - pageSize: this.pageSize, - change(num: number): void { - that.sliceData = that.statDataArray!.slice((num - 1) * that.pageSize, num * that.pageSize); - that.queryTableEl!.recycleDataSource = that.sliceData; - }, - }); - } else { - that.pagination!.style.opacity = '0'; - this.queryTableEl!.recycleDataSource = this.statDataArray; - } - - this.freshTableHeadResizeStyle(); - new ResizeObserver(() => { - if (this.parentElement?.clientHeight != 0) { - this.queryTableEl!.style.height = '100%'; - this.queryTableEl!.reMeauseHeight(); - } - }).observe(this.parentElement!); - info('metric query Sql result Data size is: ', this.statDataArray!.length); - this.initData(); - this.progressLoad!.loading = false; - }, 200); - }); } }; + private setPageNationTableEl(): void { + let that = this; + let timeOutTs: number = 200; + let indexNumber = 1; + setTimeout(() => { + let total = this.statDataArray.length; + if (total > maxPageSize) { + that.pagination!.style.opacity = '1'; + new PageNation(this.pagination, { + current: 1, + total: total, + pageSize: pageSize, + change(num: number): void { + that.sliceData = that.statDataArray!.slice((num - indexNumber) * pageSize, num * pageSize); + that.queryTableEl!.recycleDataSource = that.sliceData; + }, + }); + } else { + that.pagination!.style.opacity = '0'; + this.queryTableEl!.recycleDataSource = this.statDataArray; + } + this.freshTableHeadResizeStyle(); + this.progressLoad!.loading = false; + }, timeOutTs); + } + reset(): void { this.pagination!.style.opacity = '0'; this.response!.innerHTML = ''; this.keyList = []; this.statDataArray = []; this.selector!.value = ''; - this.querySize!.textContent = 'Query result - ' + ' 0 counts'; - this.resizeSqlHeight().then(() => {}); - } - - initDataTableStyle(styleTable: HTMLDivElement): void { - for (let index = 0 ; index < styleTable.children.length ; index++) { - // @ts-ignore - styleTable.children[index].style.backgroundColor = 'var(--dark-background5,#F6F6F6)'; - } + this.querySize!.textContent = 'Please enter a query.'; + this.resizeSqlHeight().then(); } - async initMetricData(): Promise { - if (!this.selector || this.selector.value == null) { - return []; - } - if (this.queryText == '' || this.queryText == null) { - let statList = await querySelectTraceStats(); - for (let index = 0 ; index < statList.length ; index++) { - const statsResult = statList[index]; - let indexArray = { - event_name: statsResult.event_name, - start_type: statsResult.stat_type, - count: statsResult.count, - serverity: statsResult.serverity, - source: statsResult.source, - }; - } - if (this.querySize) { - this.querySize!.textContent = 'Query result - ' + statList.length + ' counts'; - } - this.resultText = 'Query result - ' + statList.length + ' counts'; - } else { - return this.statDataArray; - } - } - - checkSupportSqlAbility(): boolean { - let noSupportChart = ['insert', 'delete', 'update', 'drop', 'alter', 'truncate', 'create']; - let result = noSupportChart.filter((item) => { - return this.selector!.value.indexOf(item) > -1; - }); - if (result.length > 0) { - this.querySqlErrorText = - 'Error: Statement contains a change action keyword,The change operation is not supported.'; - this.isSupportSql = false; - return true; - } else { + private checkSafetySelectSql(): boolean { + if (this.selector?.value.trim() === '') { + this.querySqlErrorText = 'Please enter a query.'; + this.querySize!.textContent = this.querySqlErrorText; return false; - } - } - - checkSafetySelectSql(): boolean { - let split = this.selector?.value.trim().split(' '); - if (split) { - this.querySqlErrorText = 'Error: Incomplete query statement: ' + this.selector!.value; - this.isSupportSql = false; - return !split[0].toLowerCase().startsWith('select'); - } - return false; - } - - getSelectSqlField(): string { - if (this.selector!.value.indexOf('from') < 0) { - return ''; - } - let splitSql = this.selector?.value.split('from'); - if (splitSql) { - if (splitSql[0].indexOf('*') > -1) { - return '*'; - } else { - let fields = splitSql[0].split(','); - return fields[0]; + } else { + let queryNormalLength = 15; + if (this.selector!.value.length < queryNormalLength || + !this.selector?.value.toLowerCase().trim().startsWith('select') + ) { + this.querySqlErrorText = `Query result - (Error): + ${this.selector!.value}.`; + return false; } - } - return ''; - } - - getSelectSqlTableName(str: string): Array { - if (this.selector!.value.indexOf(str) < 0) { - return []; - } - let tableNameList = []; - let splitSql = this.selector?.value.split(str); - if (splitSql) { - for (let index = 1 ; index < splitSql?.length ; index++) { - let splitSqlItem = splitSql[index].trim(); - let tableItem = splitSqlItem.split(' '); - let tableName = tableItem[0].trim(); - tableNameList.push(tableName); - if (tableName.indexOf('(') >= 0) { - tableNameList.pop(); - } else if (tableName.indexOf(')') >= 0) { - tableNameList.pop(); - let unitTableName = tableName.split(')'); - let tableNewName = unitTableName[0]; - tableNameList.push(tableNewName); + if (this.notSupportList && this.notSupportList.length > 0) { + for (let index = 0; index < this.notSupportList.length; index++) { + let regexStr = new RegExp(this.notSupportList[index], 'i'); + if (regexStr.test(this.selector!.value)) { + this.querySqlErrorText = `Query result - (Error): + ${this.selector!.value}.`; + return false; + } } } } - return tableNameList; + return true; } - initDataElement(): void { + private initDataElement(): void { if (this.keyList) { info('Metric query Table Colum size is: ', this.keyList.length); this.keyList.forEach((item) => { @@ -313,10 +231,6 @@ export class SpQuerySQL extends BaseElement { } connectedCallback(): void { - let selectQuery = this.shadowRoot?.querySelector('.query_select'); - if (selectQuery) { - let querySql = selectQuery.textContent; - } // Listen to the sql execution of the query this.addEventListener('keydown', this.selectEventListener); this.selector!.addEventListener('input', this.inputSqlListener); @@ -324,20 +238,25 @@ export class SpQuerySQL extends BaseElement { this.selector!.addEventListener('keydown', this.deleteSqlListener); } - deleteSqlListener = (event: KeyboardEvent): void => { - if (event.key == 'Backspace') { - this.resizeSqlHeight().then(() => {}); + private deleteSqlListener = (event: KeyboardEvent): void => { + if (event.key === 'Backspace') { + this.resizeSqlHeight().then(); + this.isSupportSql = this.checkSafetySelectSql(); } }; - async resizeSqlHeight(): Promise { + private async resizeSqlHeight(): Promise { + let minRowNumber = 10; + let indexNumber = 1; + let multipleNumber = 1.2; + let paddingNumber = 2; let valueLength = this.selector?.value.split('\n').length; - let rowNumber = Number(valueLength) - 1; + let rowNumber = Number(valueLength) - indexNumber; let selectHeight = '3.2em'; if (rowNumber > 0) { - if (rowNumber <= 10) { - let allLength = 1.2 * rowNumber + 2; - selectHeight = allLength + 'em'; + if (rowNumber <= minRowNumber) { + let allLength = multipleNumber * rowNumber + paddingNumber; + selectHeight = `${allLength}em`; } else { selectHeight = '14em'; } @@ -346,30 +265,11 @@ export class SpQuerySQL extends BaseElement { this.selector?.style.height = selectHeight; } - inputSqlListener = async (event: Event): Promise => { - this.resizeSqlHeight().then(() => {}); - let startData = new Date().getTime(); - if (this.selector!.value.trim() == '') { - this.querySqlErrorText = 'Please enter a query'; - this.querySize!.textContent = this.querySqlErrorText; - return; - } - this.checkSafetySelectSql(); - this.checkSupportSqlAbility(); - if (this.selector!.value.length < 15) { - return; - } - this.querySelectTables = this.getSelectSqlTableName('from') - .concat(this.getSelectSqlTableName('join')) - .toLocaleString(); - info('metric query sql table size is: ', this.querySelectTables.length); - this.isSupportSql = true; + private inputSqlListener = async (): Promise => { + this.resizeSqlHeight().then(); + this.isSupportSql = this.checkSafetySelectSql(); }; - async getInputSqlResult(sql: string): Promise { - return await queryCustomizeSelect(sql); - } - disconnectedCallback(): void { this.removeEventListener('keydown', this.selectEventListener); this.selector!.removeEventListener('input', this.inputSqlListener); @@ -377,144 +277,97 @@ export class SpQuerySQL extends BaseElement { this.selector!.removeEventListener('keydown', this.deleteSqlListener); } - initData(): void { - if (this.statDataArray.length > 0) { - this.querySize!.textContent = 'Error: ' + this.selector?.value; - } - if (this.isSupportSql) { - let sqlField = this.keyList?.length == 0 ? '*' : this.keyList?.toLocaleString(); - this.querySize!.textContent = 'Query result - ' + this.statDataArray.length + ' counts'; - } else { - this.querySize!.textContent = this.querySqlErrorText; - } - - let queryHeadStyle: HTMLDivElement | undefined | null = this.queryTableEl?.shadowRoot?.querySelector( - 'div.th' - ) as HTMLDivElement; - if (queryHeadStyle && queryHeadStyle.hasChildNodes()) { - for (let index = 0 ; index < queryHeadStyle.children.length ; index++) { - // @ts-ignore - queryHeadStyle.children[index].style.gridArea = null; - } - } - - this.queryTableEl!.style.height = '100%'; - } - - static get observedAttributes(): string[] { - return ['queryStr']; - } - attributeChangedCallback(name: string, oldValue: string, newValue: string): void { let queryDataSty: HTMLDivElement | undefined | null = this.queryTableEl?.shadowRoot?.querySelector( 'div.tbody' ) as HTMLDivElement; if (queryDataSty && queryDataSty.hasChildNodes()) { - for (let index = 0 ; index < queryDataSty.children.length ; index++) { + for (let index = 0; index < queryDataSty.children.length; index++) { // @ts-ignore queryDataSty.children[index].style.backgroundColor = 'var(--dark-background5,#F6F6F6)'; } } } - private _queryStr?: string; - - get queryStr(): string { - return this.queryStr; - } - - set queryStr(value: string) { - this._queryStr = value; - } - initHtml(): string { return `
    @@ -582,3 +430,6 @@ export class SpQuerySQL extends BaseElement { `; } } + +const pageSize: number = 200000; +const maxPageSize: number = 500000; diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index 7ef932dc940a811529f83217459f27bd49f8c08d..8c1930e60dbc0d011bad2c8f9e3dfb0290450ad6 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -1684,15 +1684,19 @@ export class SpRecordTrace extends BaseElement { let pid = 0; let processName = ''; let processId = ''; - if (appProcess.indexOf('(') != -1) { - processId = appProcess.slice(appProcess.lastIndexOf('(') + 1, appProcess.lastIndexOf(')')); - } else { - processId = appProcess; - } - if (re.test(processId)) { - pid = Number(processId); - } else { + if (this.spAllocations!.startup_mode && Number(SpRecordTrace.selectVersion) >= 4.0) { processName = appProcess; + } else { + if (appProcess.indexOf('(') != -1) { + processId = appProcess.slice(appProcess.lastIndexOf('(') + 1, appProcess.lastIndexOf(')')); + } else { + processId = appProcess; + } + if (re.test(processId)) { + pid = Number(processId); + } else { + processName = appProcess; + } } let nativeConfig: NativeHookConfig = { pid: pid, @@ -1713,6 +1717,7 @@ export class SpRecordTrace extends BaseElement { if (this.spAllocations!.record_statistics) { nativeConfig.statisticsInterval = this.spAllocations!.statistics_interval; } + nativeConfig.startupMode = this.spAllocations!.startup_mode; } let nativePluginConfig: ProfilerPluginConfig = { pluginName: 'nativehook', @@ -1745,8 +1750,14 @@ export class SpRecordTrace extends BaseElement { memoryconfig.reportSysmemVmemInfo = true; memoryconfig.reportProcessMemInfo = true; } + if (hasSmaps || hasMonitorMemory){ + memoryconfig.reportPurgeableAshmemInfo = true; + memoryconfig.reportDmaMemInfo = true; + memoryconfig.reportGpuMemInfo = true; + } if (hasSmaps) { memoryconfig.reportSmapsMemInfo = true; + memoryconfig.reportGpuDumpInfo = true; let pid = Number(this.spVmTracker?.process); memoryconfig.pid.push(pid); } diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index 9eee147696e5ceba067b50fcff8ea687c768af2f..9041dbc67839b9fc017109820cf9a52e6e259cdc 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -33,7 +33,7 @@ import { SelectionParam } from '../bean/BoxSelection.js'; import { procedurePool } from '../database/Procedure.js'; import { SpApplication } from '../SpApplication.js'; import { Flag } from './trace/timer-shaft/Flag.js'; -import { SportRuler, SlicesTime } from './trace/timer-shaft/SportRuler.js'; +import { SlicesTime, SportRuler } from './trace/timer-shaft/SportRuler.js'; import { SpHiPerf } from './chart/SpHiPerf.js'; import { SearchSdkBean, SearchThreadProcessBean } from '../bean/SearchFuncBean.js'; import { error, info } from '../../log/Log.js'; @@ -56,7 +56,7 @@ import { ProcessStruct } from '../database/ui-worker/ProcedureWorkerProcess.js'; import { CpuFreqStruct } from '../database/ui-worker/ProcedureWorkerFreq.js'; import { CpuFreqLimitsStruct } from '../database/ui-worker/ProcedureWorkerCpuFreqLimits.js'; import { ThreadStruct } from '../database/ui-worker/ProcedureWorkerThread.js'; -import { FuncStruct } from '../database/ui-worker/ProcedureWorkerFunc.js'; +import { func, FuncStruct } from '../database/ui-worker/ProcedureWorkerFunc.js'; import { CpuStateStruct } from '../database/ui-worker/ProcedureWorkerCpuState.js'; import { HiPerfCpuStruct } from '../database/ui-worker/ProcedureWorkerHiPerfCPU.js'; import { HiPerfProcessStruct } from '../database/ui-worker/ProcedureWorkerHiPerfProcess.js'; @@ -92,6 +92,7 @@ import { JsCpuProfilerStruct } from '../database/ui-worker/ProcedureWorkerCpuPro import { TabPaneSummary } from './trace/sheet/ark-ts/TabPaneSummary.js'; import { JsCpuProfilerChartFrame } from '../bean/JsStruct.js'; import { FileInfo } from '../../js-heap/model/UiStruct.js'; +import { SnapshotStruct } from '../database/ui-worker/ProcedureWorkerSnapshot.js'; import { setSelectState } from './Utils.js'; function dpr() { @@ -114,6 +115,11 @@ function throttle(fn: any, t: number, ev: any): any { }; } +export class CurrentSlicesTime { + startTime: number | undefined; + endTime: number | undefined; +} + @element('sp-system-trace') export class SpSystemTrace extends BaseElement { static mouseCurrentPosition = 0; @@ -129,6 +135,7 @@ export class SpSystemTrace extends BaseElement { static SDK_CONFIG_MAP: any; static sliceRangeMark: any; static wakeupList: Array = []; + currentSlicesTime: CurrentSlicesTime = new CurrentSlicesTime(); intersectionObserver: IntersectionObserver | undefined; tipEL: HTMLDivElement | undefined | null; rowsEL: HTMLDivElement | undefined | null; @@ -137,6 +144,7 @@ export class SpSystemTrace extends BaseElement { favoriteRowsEL: HTMLDivElement | undefined | null; visibleRows: Array> = []; collectRows: Array> = []; + currentRow: TraceRow | undefined | null; keyboardEnable = true; mouseEventEnable = true; currentRowType = ''; /*保存当前鼠标所在行的类型*/ @@ -224,17 +232,19 @@ export class SpSystemTrace extends BaseElement { document!.querySelector('body > sp-application')?.shadowRoot?.querySelector!( '#main-menu' )?.shadowRoot?.querySelector('div.bottom > div.color'); - let rightButton: HTMLElement | null | undefined = this.shadowRoot - ?.querySelector('div > trace-sheet') - ?.shadowRoot?.querySelector('#current-selection > tabpane-current-selection') + this.traceSheetEL = this.shadowRoot?.querySelector('.trace-sheet'); + let rightButton: HTMLElement | null | undefined = this.traceSheetEL?.shadowRoot + ?.querySelector('#current-selection > tabpane-current-selection') ?.shadowRoot?.querySelector('#rightButton'); + let rightStar: HTMLElement | null | undefined = this.traceSheetEL?.shadowRoot + ?.querySelector('#current-selection > tabpane-current-selection') + ?.shadowRoot?.querySelector('#right-star'); this.rowsEL = this.shadowRoot?.querySelector('.rows'); this.tipEL = this.shadowRoot?.querySelector('.tip'); this.rowsPaneEL = this.shadowRoot?.querySelector('.rows-pane'); this.spacerEL = this.shadowRoot?.querySelector('.spacer'); this.canvasFavoritePanel = this.shadowRoot?.querySelector('.panel-canvas-favorite'); this.timerShaftEL = this.shadowRoot?.querySelector('.timer-shaft'); - this.traceSheetEL = this.shadowRoot?.querySelector('.trace-sheet'); this.favoriteRowsEL = this.shadowRoot?.querySelector('.favorite-rows'); this.rangeSelect = new RangeSelect(this); rightButton?.addEventListener('click', (event: any) => { @@ -247,10 +257,77 @@ export class SpSystemTrace extends BaseElement { setTimeout(() => { requestAnimationFrame(() => this.refreshCanvas(false)); }, 300); + rightStar!.style.visibility = 'visible'; + rightStar!.style.cursor = 'pointer'; SpSystemTrace.btnTimer = setTimeout(() => { SpSystemTrace.btnTimer = null; // 2.清空节流阀，方便下次开启定时器 }, 2000); }); + rightStar?.addEventListener('click', () => { + let wakeupLists = []; + for (let i = 0; i < SpSystemTrace.wakeupList.length; i++) { + wakeupLists.unshift(CpuStruct.selectCpuStruct?.cpu); + wakeupLists.push(SpSystemTrace.wakeupList[i].cpu); + } + let wakeupCpuLists = Array.from(new Set(wakeupLists)).sort(); + for (let i = 0; i < wakeupCpuLists.length; i++) { + let cpuFavoriteRow: any = this.shadowRoot?.querySelector>( + `trace-row[row-type='cpu-data'][row-id='${wakeupCpuLists[i]}']` + ); + cpuFavoriteRow!.setAttribute('collect-type', ''); + let replaceRow = document.createElement('div'); + replaceRow.setAttribute('row-id', cpuFavoriteRow.rowId + '-' + cpuFavoriteRow.rowType); + replaceRow.setAttribute('type', 'replaceRow'); + replaceRow.setAttribute('row-parent-id', cpuFavoriteRow.rowParentId); + replaceRow.style.display = 'none'; + cpuFavoriteRow.rowHidden = !cpuFavoriteRow.hasAttribute('scene'); + if (this.rowsEL!.contains(cpuFavoriteRow)) { + this.rowsEL!.replaceChild(replaceRow, cpuFavoriteRow); + } + this.favoriteRowsEL!.append(cpuFavoriteRow); + this.currentClickRow = null; + cpuFavoriteRow.setAttribute('draggable', 'true'); + cpuFavoriteRow.addEventListener('dragstart', () => { + this.currentClickRow = cpuFavoriteRow; + }); + cpuFavoriteRow.addEventListener('dragover', (ev: any) => { + ev.preventDefault(); + ev.dataTransfer.dropEffect = 'move'; + }); + cpuFavoriteRow.addEventListener('drop', (ev: any) => { + if (this.favoriteRowsEL != null && this.currentClickRow != null && this.currentClickRow !== cpuFavoriteRow) { + let rect = cpuFavoriteRow.getBoundingClientRect(); + if (ev.clientY >= rect.top && ev.clientY < rect.top + rect.height / 2) { + //向上移动 + this.favoriteRowsEL.insertBefore(this.currentClickRow, cpuFavoriteRow); + } else if (ev.clientY <= rect.bottom && ev.clientY > rect.top + rect.height / 2) { + //向下移动 + this.favoriteRowsEL.insertBefore(this.currentClickRow, cpuFavoriteRow.nextSibling); + } + this.refreshFavoriteCanvas(); + } + }); + cpuFavoriteRow.addEventListener('dragend', () => { + this.linkNodes.forEach((itln) => { + if (itln[0].rowEL.collect) { + itln[0].rowEL.translateY = itln[0].rowEL.getBoundingClientRect().top - 195; + } else { + itln[0].rowEL.translateY = itln[0].rowEL.offsetTop - this.rowsPaneEL!.scrollTop; + } + if (itln[1].rowEL.collect) { + itln[1].rowEL.translateY = itln[1].rowEL.getBoundingClientRect().top - 195; + } else { + itln[1].rowEL.translateY = itln[1].rowEL.offsetTop - this.rowsPaneEL!.scrollTop; + } + itln[0].y = itln[0].rowEL.translateY + itln[0].offsetY; + itln[1].y = itln[1].rowEL.translateY + itln[1].offsetY; + }); + this.currentClickRow = null; + }); + } + this.refreshFavoriteCanvas(); + this.refreshCanvas(true); + }); sideColor?.addEventListener('click', (event: any) => { requestAnimationFrame(() => this.refreshCanvas(true)); }); @@ -485,8 +562,8 @@ export class SpSystemTrace extends BaseElement { this.rangeTraceRow = []; } let selection = new SelectionParam(); - selection.leftNs = 0; - selection.rightNs = 0; + selection.leftNs = TraceRow.rangeSelectObject?.startNS || 0; + selection.rightNs = TraceRow.rangeSelectObject?.endNS || 0; selection.recordStartNs = (window as any).recordStartNS; let native_memory = ['All Heap & Anonymous VM', 'All Heap', 'All Anonymous VM']; rows.forEach((it) => { @@ -626,6 +703,38 @@ export class SpSystemTrace extends BaseElement { selection.diskAbilityIds.push(th.rowId!); } else if (th.rowType == TraceRow.ROW_TYPE_NETWORK_ABILITY) { selection.networkAbilityIds.push(th.rowId!); + } else if (th.rowType == TraceRow.ROW_TYPE_DMA_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let dmaAbilityData = th.dataList.filter((dmaAbilityData: SnapshotStruct) => { + return isSelect(dmaAbilityData, TraceRow.rangeSelectObject!); + }); + selection.dmaAbilityData.push(...dmaAbilityData!); + } else if (th.rowType == TraceRow.ROW_TYPE_GPU_MEMORY_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let gpuMemoryAbilityData = th.dataList.filter((gpuMemoryAbilityData: SnapshotStruct) => { + return isSelect(gpuMemoryAbilityData, TraceRow.rangeSelectObject!); + }); + selection.gpuMemoryAbilityData.push(...gpuMemoryAbilityData!); + } else if (th.rowType === TraceRow.ROW_TYPE_PURGEABLE_TOTAL_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let PurgeableTotalDatas = th.dataList.filter((PurgeableTotalData: SnapshotStruct) => { + return isSelect(PurgeableTotalData, TraceRow.rangeSelectObject!); + }); + selection.purgeableTotalAbility.push(...PurgeableTotalDatas); + } else if (th.rowType === TraceRow.ROW_TYPE_PURGEABLE_PIN_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let PurgeablePinDatas = th.dataList.filter((PurgeablePinData: SnapshotStruct) => { + return isSelect(PurgeablePinData, TraceRow.rangeSelectObject!); + }); + selection.purgeablePinAbility.push(...PurgeablePinDatas); } }); } else if (it.rowType == TraceRow.ROW_TYPE_CPU_ABILITY) { @@ -640,6 +749,22 @@ export class SpSystemTrace extends BaseElement { } else if (it.rowType == TraceRow.ROW_TYPE_NETWORK_ABILITY) { selection.networkAbilityIds.push(it.rowId!); info('load Network Ability traceRow id is : ', it.rowId); + } else if (it.rowType == TraceRow.ROW_TYPE_DMA_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let dmaAbilityData = it.dataList.filter((dmaAbilityData: SnapshotStruct) => { + return isSelect(dmaAbilityData, TraceRow.rangeSelectObject!); + }); + selection.dmaAbilityData.push(...dmaAbilityData!); + } else if (it.rowType == TraceRow.ROW_TYPE_GPU_MEMORY_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let gpuMemoryAbilityData = it.dataList.filter((gpuMemoryAbilityData: SnapshotStruct) => { + return isSelect(gpuMemoryAbilityData, TraceRow.rangeSelectObject!); + }); + selection.gpuMemoryAbilityData.push(...gpuMemoryAbilityData!); } else if (it.rowType?.startsWith(TraceRow.ROW_TYPE_SDK)) { if (it.rowType == TraceRow.ROW_TYPE_SDK) { let sdkRows: Array> = [ @@ -731,8 +856,40 @@ export class SpSystemTrace extends BaseElement { selection.anomalyEnergy.push(it.rowId!); } else if (it.rowType == TraceRow.ROW_TYPE_SYSTEM_ENERGY) { info('load anomaly Energy traceRow id is : ', it.rowId); - } else if (it.rowType == TraceRow.ROW_TYPE_SMAPS) { - selection.smapsType.push(it.rowId!); + } else if (it.rowType == TraceRow.ROW_TYPE_VM_TRACKER_SMAPS) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let smapsData = it.dataList.filter((smapsData: SnapshotStruct) => { + return isSelect(smapsData, TraceRow.rangeSelectObject!); + }); + selection.smapsType.push(...smapsData!); + let sMapsChildRows: Array> = [ + ...this.shadowRoot!.querySelectorAll>(`trace-row[row-parent-id='${it.rowId}']`), + ]; + if (!it.expansion) { + sMapsChildRows = [...it.childrenList]; + } + sMapsChildRows.forEach((item) => { + item.rangeSelect = true; + if (item.rowType == TraceRow.ROW_TYPE_VM_TRACKER_SMAPS) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let smapsData = item.dataList.filter((smapsData: SnapshotStruct) => { + return isSelect(smapsData, TraceRow.rangeSelectObject!); + }); + selection.smapsType.push(...smapsData!); + } + }); + } else if (it.rowType == TraceRow.ROW_TYPE_VMTRACKER_SHM) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let vmTrackerShmData = it.dataList.filter((vmTrackerShmData: SnapshotStruct) => { + return isSelect(vmTrackerShmData, TraceRow.rangeSelectObject!); + }); + selection.vmtrackershm.push(...vmTrackerShmData!); } else if (it.rowType == TraceRow.ROW_TYPE_CLOCK) { selection.clockMapData.set( it.rowId || '', @@ -762,6 +919,185 @@ export class SpSystemTrace extends BaseElement { } } }); + } else if (it.rowType === TraceRow.ROW_TYPE_VM_TRACKER) { + let vMTrackerChildRows: Array> = [ + ...this.shadowRoot!.querySelectorAll>(`trace-row[row-parent-id='${it.rowId}']`), + ]; + if (!it.expansion) { + vMTrackerChildRows = [...it.childrenList]; + } + vMTrackerChildRows.forEach((th) => { + th.rangeSelect = true; + if (th.rowType === TraceRow.ROW_TYPE_DMA_VMTRACKER) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let dmaVmTrackerData = th.dataList.filter((dmaVmTrackerData: SnapshotStruct) => { + return isSelect(dmaVmTrackerData, TraceRow.rangeSelectObject!); + }); + selection.dmaVmTrackerData.push(...dmaVmTrackerData!); + } else if (th.rowType === TraceRow.ROW_TYPE_SYS_MEMORY_GPU) { + let vMTrackerGpuChildRows: Array> = [ + ...this.shadowRoot!.querySelectorAll>(`trace-row[row-parent-id='${th.rowId}']`), + ]; + if (!th.expansion) { + vMTrackerGpuChildRows = [...th.childrenList]; + } + vMTrackerGpuChildRows.forEach((item) => { + item.rangeSelect = true; + if (item.rowType == TraceRow.ROW_TYPE_GPU_MEMORY_VMTRACKER) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let gpuMemoryTrackerData = item.dataList.filter((gpuMemoryTrackerData: SnapshotStruct) => { + return isSelect(gpuMemoryTrackerData, TraceRow.rangeSelectObject!); + }); + selection.gpuMemoryTrackerData.push(...gpuMemoryTrackerData!); + } else if (item.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_GL) { + selection.gpu.gl = + item.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } else if (item.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_TOTAL) { + selection.gpu.gpuTotal = + item.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } else if (item.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_WINDOW) { + selection.gpu.gpuWindow = + item.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } + }); + } else if (th.rowType === TraceRow.ROW_TYPE_PURGEABLE_TOTAL_VM) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let purgeableTotalDatas = th.dataList.filter((purgeableTotalData: SnapshotStruct) => { + return isSelect(purgeableTotalData, TraceRow.rangeSelectObject!); + }); + selection.purgeableTotalVM.push(...purgeableTotalDatas); + } else if (th.rowType === TraceRow.ROW_TYPE_PURGEABLE_PIN_VM) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let purgeablePinDatas = th.dataList.filter((purgeablePinData: SnapshotStruct) => { + return isSelect(purgeablePinData, TraceRow.rangeSelectObject!); + }); + selection.purgeablePinVM.push(...purgeablePinDatas); + } else if (th.rowType === TraceRow.ROW_TYPE_VM_TRACKER_SMAPS) { + let sMapsChildRows: Array> = [ + ...this.shadowRoot!.querySelectorAll>(`trace-row[row-parent-id='${th.rowId}']`), + ]; + if (!th.expansion) { + sMapsChildRows = [...th.childrenList]; + } + sMapsChildRows.forEach((item) => { + item.rangeSelect = true; + if (item.rowType == TraceRow.ROW_TYPE_VM_TRACKER_SMAPS) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let smapsData = item.dataList.filter((smapsData: SnapshotStruct) => { + return isSelect(smapsData, TraceRow.rangeSelectObject!); + }); + selection.smapsType.push(...smapsData!); + } + }); + } else if (th.rowType == TraceRow.ROW_TYPE_VMTRACKER_SHM) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let vmTrackerShmData = th.dataList.filter((vmTrackerShmData: SnapshotStruct) => { + return isSelect(vmTrackerShmData, TraceRow.rangeSelectObject!); + }); + selection.vmtrackershm.push(...vmTrackerShmData!); + } + }); + } else if (it.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU) { + let vMTrackerGpuChildRows: Array> = [ + ...this.shadowRoot!.querySelectorAll>(`trace-row[row-parent-id='${it.rowId}']`), + ]; + if (!it.expansion) { + vMTrackerGpuChildRows = [...it.childrenList]; + } + vMTrackerGpuChildRows.forEach((th) => { + th.rangeSelect = true; + if (th.rowType == TraceRow.ROW_TYPE_GPU_MEMORY_VMTRACKER) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let gpuMemoryTrackerData = th.dataList.filter((gpuMemoryTrackerData: SnapshotStruct) => { + return isSelect(gpuMemoryTrackerData, TraceRow.rangeSelectObject!); + }); + selection.gpuMemoryTrackerData.push(...gpuMemoryTrackerData!); + } else if (th.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_GL) { + selection.gpu.gl = + th.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } else if (th.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_TOTAL) { + selection.gpu.gpuTotal = + th.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } else if (th.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_WINDOW) { + selection.gpu.gpuWindow = + th.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } + }); + } else if (it.rowType == TraceRow.ROW_TYPE_GPU_MEMORY_VMTRACKER) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let gpuMemoryTrackerData = it.dataList.filter((gpuMemoryTrackerData: SnapshotStruct) => { + return isSelect(gpuMemoryTrackerData, TraceRow.rangeSelectObject!); + }); + selection.gpuMemoryTrackerData.push(...gpuMemoryTrackerData!); + } else if (it.rowType == TraceRow.ROW_TYPE_DMA_VMTRACKER) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let dmaVmTrackerData = it.dataList.filter((dmaVmTrackerData: SnapshotStruct) => { + return isSelect(dmaVmTrackerData, TraceRow.rangeSelectObject!); + }); + selection.dmaVmTrackerData.push(...dmaVmTrackerData!); + } else if (it.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_GL) { + selection.gpu.gl = + it.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } else if (it.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_TOTAL) { + selection.gpu.gpuTotal = + it.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; + } else if (it.rowType == TraceRow.ROW_TYPE_SYS_MEMORY_GPU_WINDOW) { + selection.gpu.gpuWindow = + it.dataList.filter( + (it) => + (it.startNs >= selection.leftNs && it.startNs <= selection.rightNs) || + (it.endNs >= selection.leftNs && it.endNs <= selection.rightNs) + ).length > 0; } else if (it.rowType == TraceRow.ROW_TYPE_JANK) { let isIntersect = (a: JanksStruct, b: RangeSelectStruct) => Math.max(a.ts! + a.dur!, b!.endNS || 0) - Math.min(a.ts!, b!.startNS || 0) < @@ -834,7 +1170,7 @@ export class SpSystemTrace extends BaseElement { } let jsCpuProfilerData = copyFrameSelectData.filter((item: any) => { if (item.depth == 0) { - setSelectState(item,frameSelectDataIdArr); + setSelectState(item, frameSelectDataIdArr); return item; } }); @@ -867,6 +1203,38 @@ export class SpSystemTrace extends BaseElement { ); }); selection.frameSpacing.push(...frameDatas); + } else if (it.rowType == TraceRow.ROW_TYPE_PURGEABLE_TOTAL_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let PurgeableTotalDatas = it.dataList.filter((PurgeableTotalData: SnapshotStruct) => { + return isSelect(PurgeableTotalData, TraceRow.rangeSelectObject!); + }); + selection.purgeableTotalAbility.push(...PurgeableTotalDatas); + } else if (it.rowType == TraceRow.ROW_TYPE_PURGEABLE_PIN_ABILITY) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let PurgeablePinDatas = it.dataList.filter((PurgeablePinData: SnapshotStruct) => { + return isSelect(PurgeablePinData, TraceRow.rangeSelectObject!); + }); + selection.purgeablePinAbility.push(...PurgeablePinDatas); + } else if (it.rowType == TraceRow.ROW_TYPE_PURGEABLE_TOTAL_VM) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let PurgeableTotalDatas = it.dataList.filter((PurgeableTotalData: SnapshotStruct) => { + return isSelect(PurgeableTotalData, TraceRow.rangeSelectObject!); + }); + selection.purgeableTotalVM.push(...PurgeableTotalDatas); + } else if (it.rowType == TraceRow.ROW_TYPE_PURGEABLE_PIN_VM) { + let isSelect = (a: SnapshotStruct, b: RangeSelectStruct) => + Math.max(a.startNs! + a.dur!, b!.endNS || 0) - Math.min(a.startNs!, b!.startNS || 0) < + a.dur! + (b!.endNS || 0) - (b!.startNS || 0); + let PurgeablePinDatas = it.dataList.filter((PurgeablePinData: SnapshotStruct) => { + return isSelect(PurgeablePinData, TraceRow.rangeSelectObject!); + }); + selection.purgeablePinVM.push(...PurgeablePinDatas); } if (this.rangeTraceRow!.length !== rows.length) { let event = this.createPointEvent(it); @@ -893,8 +1261,6 @@ export class SpSystemTrace extends BaseElement { }) ); } - selection.leftNs = TraceRow.rangeSelectObject?.startNS || 0; - selection.rightNs = TraceRow.rangeSelectObject?.endNS || 0; this.selectStructNull(); this.timerShaftEL?.removeTriangle('inverted'); if (selection.promiseList.length > 0) { @@ -1004,6 +1370,11 @@ export class SpSystemTrace extends BaseElement { }); window.subscribe(window.SmartEvent.UI.MouseEventEnable, (tr) => { this.mouseEventEnable = tr.mouseEnable; + if (this.mouseEventEnable) { + this.removeAttribute('disable'); + } else { + this.setAttribute('disable', ''); + } }); } @@ -1041,7 +1412,7 @@ export class SpSystemTrace extends BaseElement { } } else if (it.rowType === TraceRow.ROW_TYPE_STATE_ENERGY) { event = it.name; - } else if (it.rowType === TraceRow.ROW_TYPE_SMAPS) { + } else if (it.rowType === TraceRow.ROW_TYPE_VM_TRACKER) { if (it.rowParentId === '') { event = 'VM Tracker'; } else { @@ -1436,6 +1807,7 @@ export class SpSystemTrace extends BaseElement { ['s', false], ['a', false], ['d', false], + ['f', false], ]); documentOnKeyPress = (ev: KeyboardEvent) => { if (!this.loadTraceCompleted) return; @@ -1466,17 +1838,68 @@ export class SpSystemTrace extends BaseElement { } }); } + if (keyPress === 'f') { + // 设置当前的slicesTime + this.setCurrentSlicesTime(); + } let keyPressWASD = keyPress === 'w' || keyPress === 'a' || keyPress === 's' || keyPress === 'd'; if (keyPressWASD) { this.keyPressMap.set(keyPress, true); this.hoverFlag = null; } - this.timerShaftEL!.documentOnKeyPress(ev); + this.timerShaftEL!.documentOnKeyPress(ev, this.currentSlicesTime); + if (keyPress === 'f') { + this.verticalScrollToRow(); + } } else { this.stopWASD(); } }; + verticalScrollToRow() { + if (this.currentRow) { + this.currentRow.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); + } + } + + setCurrentSlicesTime() { + if (CpuStruct.selectCpuStruct) { + if (CpuStruct.selectCpuStruct.startTime && CpuStruct.selectCpuStruct.dur) { + this.currentSlicesTime.startTime = CpuStruct.selectCpuStruct.startTime; + this.currentSlicesTime.endTime = CpuStruct.selectCpuStruct.startTime + CpuStruct.selectCpuStruct.dur; + } + } else if (ThreadStruct.selectThreadStruct) { + if (ThreadStruct.selectThreadStruct.startTime && ThreadStruct.selectThreadStruct.dur) { + this.currentSlicesTime.startTime = ThreadStruct.selectThreadStruct.startTime; + this.currentSlicesTime.endTime = + ThreadStruct.selectThreadStruct.startTime + ThreadStruct.selectThreadStruct.dur; + } + } else if (FuncStruct.selectFuncStruct) { + if (FuncStruct.selectFuncStruct.startTs && FuncStruct.selectFuncStruct.dur) { + this.currentSlicesTime.startTime = FuncStruct.selectFuncStruct.startTs; + this.currentSlicesTime.endTime = FuncStruct.selectFuncStruct.startTs + FuncStruct.selectFuncStruct.dur; + } + } else if (IrqStruct.selectIrqStruct) { + if (IrqStruct.selectIrqStruct.startNS && IrqStruct.selectIrqStruct.dur) { + this.currentSlicesTime.startTime = IrqStruct.selectIrqStruct.startNS; + this.currentSlicesTime.endTime = IrqStruct.selectIrqStruct.startNS + IrqStruct.selectIrqStruct.dur; + } + } else if (TraceRow.rangeSelectObject) { + if (TraceRow.rangeSelectObject.startNS && TraceRow.rangeSelectObject.endNS) { + this.currentSlicesTime.startTime = TraceRow.rangeSelectObject.startNS; + this.currentSlicesTime.endTime = TraceRow.rangeSelectObject.endNS; + } + } else if (JankStruct.selectJankStruct) { + if (JankStruct.selectJankStruct.ts && JankStruct.selectJankStruct.dur) { + this.currentSlicesTime.startTime = JankStruct.selectJankStruct.ts; + this.currentSlicesTime.endTime = JankStruct.selectJankStruct.ts + JankStruct.selectJankStruct.dur; + } + } else { + this.currentSlicesTime.startTime = 0; + this.currentSlicesTime.endTime = 0; + } + } + setSLiceMark(shiftKey: boolean): SlicesTime | null | undefined { if (CpuStruct.selectCpuStruct) { this.slicestime = this.timerShaftEL?.setSlicesMark( @@ -1595,6 +2018,9 @@ export class SpSystemTrace extends BaseElement { info('favoriteChangeHandler', row.frame, row.offsetTop, row.offsetHeight); }; + verticalScrollHandler = (row: TraceRow) => { + row.scrollIntoView({ behavior: 'smooth', block: 'nearest' }); + }; selectChangeHandler = (rows: Array>) => { this.isSelectClick = true; this.rangeSelect.rangeTraceRow = rows; @@ -1719,6 +2145,7 @@ export class SpSystemTrace extends BaseElement { FrameDynamicStruct.hoverFrameDynamicStruct = undefined; FrameSpacingStruct.hoverFrameSpacingStruct = undefined; JsCpuProfilerStruct.hoverJsCpuProfilerStruct = undefined; + SnapshotStruct.hoverSnapshotStruct = undefined; } selectStructNull() { @@ -1741,6 +2168,7 @@ export class SpSystemTrace extends BaseElement { FrameAnimationStruct.selectFrameAnimationStruct = undefined; FrameDynamicStruct.selectFrameDynamicStruct = undefined; JsCpuProfilerStruct.selectJsCpuProfilerStruct = undefined; + SnapshotStruct.selectSnapshotStruct = undefined; } isWASDKeyPress() { @@ -1845,6 +2273,14 @@ export class SpSystemTrace extends BaseElement { [TraceRow.ROW_TYPE_STATIC_INIT, () => SoStruct.hoverSoStruct !== null && SoStruct.hoverSoStruct !== undefined], [TraceRow.ROW_TYPE_JANK, () => JankStruct.hoverJankStruct !== null && JankStruct.hoverJankStruct !== undefined], [TraceRow.ROW_TYPE_HEAP, () => HeapStruct.hoverHeapStruct !== null && HeapStruct.hoverHeapStruct !== undefined], + [ + TraceRow.ROW_TYPE_SYS_MEMORY_GPU_TOTAL, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_SYS_MEMORY_GPU_WINDOW, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], [ TraceRow.ROW_TYPE_HEAP_SNAPSHOT, () => HeapSnapshotStruct.hoverSnapshotStruct !== null && HeapSnapshotStruct.hoverSnapshotStruct !== undefined, @@ -1871,10 +2307,51 @@ export class SpSystemTrace extends BaseElement { JsCpuProfilerStruct.hoverJsCpuProfilerStruct !== null && JsCpuProfilerStruct.hoverJsCpuProfilerStruct !== undefined, ], + [ + TraceRow.ROW_TYPE_PURGEABLE_TOTAL_ABILITY, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_PURGEABLE_PIN_ABILITY, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_PURGEABLE_TOTAL_VM, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_PURGEABLE_PIN_VM, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_DMA_ABILITY, + () => SnapshotStruct.selectSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_DMA_VMTRACKER, + () => SnapshotStruct.selectSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_GPU_MEMORY_ABILITY, + () => SnapshotStruct.selectSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_GPU_MEMORY_VMTRACKER, + () => SnapshotStruct.selectSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_VMTRACKER_SHM, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], + [ + TraceRow.ROW_TYPE_VM_TRACKER_SMAPS, + () => SnapshotStruct.hoverSnapshotStruct !== null && SnapshotStruct.hoverSnapshotStruct !== undefined, + ], ]); onClickHandler(clickRowType: string, row?: TraceRow) { if (row) { + this.currentRow = row; this.setAttribute('clickRow', clickRowType); this.setAttribute('rowName', row.name!); this.setAttribute('rowId', row.rowId!); @@ -1884,6 +2361,8 @@ export class SpSystemTrace extends BaseElement { this.selectStructNull(); this.wakeupListNull(); let threadClickHandler: any; + let threadClickPreviousHandler: any; + let threadClickNextHandler: any; let cpuClickHandler: any; let jankClickHandler: any; let snapshotClickHandler: any; @@ -1920,6 +2399,50 @@ export class SpSystemTrace extends BaseElement { ); }; + threadClickPreviousHandler = (d: ThreadStruct) => { + this.observerScrollHeightEnable = false; + let threadRow = this.shadowRoot?.querySelector>( + `trace-row[row-id='${d.tid}'][row-type='thread']` + ); + threadRow?.dataList.forEach((item, index) => { + if (item === d && index !== 0) { + let findEntry = threadRow?.dataList[index - 1]; + this.hoverStructNull(); + this.selectStructNull(); + this.wakeupListNull(); + ThreadStruct.hoverThreadStruct = findEntry; + ThreadStruct.selectThreadStruct = findEntry; + this.timerShaftEL?.drawTriangle(findEntry!.startTime || 0, 'inverted'); + this.traceSheetEL?.displayThreadData( + ThreadStruct.selectThreadStruct!, + threadClickHandler, + cpuClickHandler, + threadClickPreviousHandler, + threadClickNextHandler + ); + } + }); + }; + threadClickNextHandler = (d: ThreadStruct) => { + this.observerScrollHeightEnable = false; + let threadRow = this.shadowRoot?.querySelector>( + `trace-row[row-id='${d.tid}'][row-type='thread']` + ); + let findEntry = threadRow?.dataList.find((dat: any) => dat.startTime === d.startTime! + d.dur!); + this.hoverStructNull(); + this.selectStructNull(); + this.wakeupListNull(); + ThreadStruct.hoverThreadStruct = findEntry; + ThreadStruct.selectThreadStruct = findEntry; + this.timerShaftEL?.drawTriangle(findEntry!.startTime || 0, 'inverted'); + this.traceSheetEL?.displayThreadData( + ThreadStruct.selectThreadStruct!, + threadClickHandler, + cpuClickHandler, + threadClickPreviousHandler, + threadClickNextHandler + ); + }; cpuClickHandler = (d: CpuStruct) => { let traceRow = this.shadowRoot?.querySelector>( `trace-row[row-id='${d.processId}'][row-type='process']` @@ -1949,7 +2472,13 @@ export class SpSystemTrace extends BaseElement { ThreadStruct.hoverThreadStruct = findEntry; ThreadStruct.selectThreadStruct = findEntry; this.timerShaftEL?.drawTriangle(findEntry!.startTime || 0, 'inverted'); - this.traceSheetEL?.displayThreadData(ThreadStruct.selectThreadStruct!, threadClickHandler, cpuClickHandler); + this.traceSheetEL?.displayThreadData( + ThreadStruct.selectThreadStruct!, + threadClickHandler, + cpuClickHandler, + threadClickPreviousHandler, + threadClickNextHandler + ); this.scrollToProcess(`${d.tid}`, `${d.processId}`, 'thread', true); } }; @@ -2067,7 +2596,13 @@ export class SpSystemTrace extends BaseElement { } else if (clickRowType === TraceRow.ROW_TYPE_THREAD && ThreadStruct.hoverThreadStruct) { ThreadStruct.selectThreadStruct = ThreadStruct.hoverThreadStruct; this.timerShaftEL?.drawTriangle(ThreadStruct.selectThreadStruct!.startTime || 0, 'inverted'); - this.traceSheetEL?.displayThreadData(ThreadStruct.selectThreadStruct, threadClickHandler, cpuClickHandler); + this.traceSheetEL?.displayThreadData( + ThreadStruct.selectThreadStruct, + threadClickHandler, + cpuClickHandler, + threadClickPreviousHandler, + threadClickNextHandler + ); this.timerShaftEL?.modifyFlagList(undefined); } else if (clickRowType === TraceRow.ROW_TYPE_FUNC && FuncStruct.hoverFuncStruct) { TabPaneTaskFrames.TaskArray = []; @@ -2104,6 +2639,14 @@ export class SpSystemTrace extends BaseElement { ClockStruct.selectClockStruct = ClockStruct.hoverClockStruct; this.traceSheetEL?.displayClockData(ClockStruct.selectClockStruct); this.timerShaftEL?.modifyFlagList(undefined); + } else if (clickRowType === TraceRow.ROW_TYPE_SYS_MEMORY_GPU_TOTAL && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayGpuSelectedData('total', SnapshotStruct.selectSnapshotStruct.startNs); + this.timerShaftEL?.modifyFlagList(undefined); + } else if (clickRowType === TraceRow.ROW_TYPE_SYS_MEMORY_GPU_WINDOW && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayGpuSelectedData('window', SnapshotStruct.selectSnapshotStruct.startNs); + this.timerShaftEL?.modifyFlagList(undefined); } else if (clickRowType === TraceRow.ROW_TYPE_IRQ && IrqStruct.hoverIrqStruct) { IrqStruct.selectIrqStruct = IrqStruct.hoverIrqStruct; this.traceSheetEL?.displayIrqData(IrqStruct.selectIrqStruct); @@ -2231,6 +2774,38 @@ export class SpSystemTrace extends BaseElement { FrameSpacingStruct.selectFrameSpacingStruct = FrameSpacingStruct.hoverFrameSpacingStruct; this.traceSheetEL?.displayFrameSpacingData(FrameSpacingStruct.selectFrameSpacingStruct); this.timerShaftEL?.modifyFlagList(undefined); + } else if (clickRowType === TraceRow.ROW_TYPE_VM_TRACKER_SMAPS && SnapshotStruct.hoverSnapshotStruct) { + let smapsRow = this.shadowRoot?.querySelector>(`trace-row[row-id='Dirty']`); + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displaySmapsData(SnapshotStruct.selectSnapshotStruct!, smapsRow!.dataList); + } else if (clickRowType === TraceRow.ROW_TYPE_VMTRACKER_SHM && SnapshotStruct.hoverSnapshotStruct) { + let shmRow = this.shadowRoot?.querySelector>(`trace-row[row-id='SHM']`); + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayShmData(SnapshotStruct.selectSnapshotStruct!, shmRow!.dataList); + } else if (clickRowType === TraceRow.ROW_TYPE_PURGEABLE_TOTAL_ABILITY && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayPurgTotalAbilityData(SnapshotStruct.hoverSnapshotStruct); + } else if (clickRowType === TraceRow.ROW_TYPE_PURGEABLE_PIN_ABILITY && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayPurgPinAbilityData(SnapshotStruct.hoverSnapshotStruct); + } else if (clickRowType === TraceRow.ROW_TYPE_PURGEABLE_TOTAL_VM && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayPurgTotalVMData(SnapshotStruct.hoverSnapshotStruct); + } else if (clickRowType === TraceRow.ROW_TYPE_PURGEABLE_PIN_VM && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayPurgPinVMData(SnapshotStruct.hoverSnapshotStruct); + } else if (clickRowType === TraceRow.ROW_TYPE_DMA_ABILITY && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayDmaAbility(SnapshotStruct.selectSnapshotStruct.startNs); + } else if (clickRowType === TraceRow.ROW_TYPE_DMA_VMTRACKER && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayDmaVmTracker(SnapshotStruct.selectSnapshotStruct.startNs); + } else if (clickRowType === TraceRow.ROW_TYPE_GPU_MEMORY_ABILITY && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayGpuMemoryAbility(SnapshotStruct.selectSnapshotStruct.startNs); + } else if (clickRowType === TraceRow.ROW_TYPE_GPU_MEMORY_VMTRACKER && SnapshotStruct.hoverSnapshotStruct) { + SnapshotStruct.selectSnapshotStruct = SnapshotStruct.hoverSnapshotStruct; + this.traceSheetEL?.displayGpuMemoryVmTracker(SnapshotStruct.selectSnapshotStruct.startNs); } else { if (!JankStruct.hoverJankStruct && JankStruct.delJankLineFlag) { this.removeLinkLinesByBusinessType('janks'); @@ -2311,7 +2886,7 @@ export class SpSystemTrace extends BaseElement { 0, row?.translateY!, row, - 25, + (FuncStruct.selectFuncStruct!.depth! + 0.5) * 20, 'task', LineType.bezierCurve, true @@ -2327,7 +2902,7 @@ export class SpSystemTrace extends BaseElement { FuncStruct.selectFuncStruct!.dur!, row?.translateY!, row, - 25, + (FuncStruct.selectFuncStruct!.depth! + 0.5) * 20, 'task', LineType.bezierCurve, false @@ -2390,28 +2965,30 @@ export class SpSystemTrace extends BaseElement { true ) ); - this.addPointPair( - this.makePoint( - value.startTs!, - value.dur!, - executeRow?.translateY!, - executeRow, - (value.depth! + 0.5) * 20, - 'task', - LineType.bezierCurve, - false - ), - this.makePoint( - endStruct.startTs!, - endStruct.dur!, - row?.translateY!, - row, - (endStruct.depth! + 0.5) * 20, - 'task', - LineType.bezierCurve, - false - ) - ); + if (endStruct) { + this.addPointPair( + this.makePoint( + value.startTs!, + value.dur!, + executeRow?.translateY!, + executeRow, + (value.depth! + 0.5) * 20, + 'task', + LineType.bezierCurve, + false + ), + this.makePoint( + endStruct.startTs!, + endStruct.dur!, + row?.translateY!, + row, + (endStruct.depth! + 0.5) * 20, + 'task', + LineType.bezierCurve, + false + ) + ); + } } }); } else if (FuncStruct.selectFuncStruct!.funName!.indexOf('H:Task PerformTask End:') >= 0) { @@ -2481,6 +3058,7 @@ export class SpSystemTrace extends BaseElement { } } drawJankLine(endParentRow: any, selectJankStruct: JankStruct, data: any) { + let collectList = this.favoriteRowsEL?.querySelectorAll>(`trace-row[collect-type]`) || []; let startRow: any; if (selectJankStruct == undefined || selectJankStruct == null) { return; @@ -2494,6 +3072,16 @@ export class SpSystemTrace extends BaseElement { `trace-row[row-id='${`${selectJankStruct?.type}-${selectJankStruct?.pid}`}'][row-type='janks']` ); } + + function collectionHasJank(jankRow: any): boolean { + for (let item of collectList!) { + if (item.rowId === jankRow.rowId && item.rowType === jankRow.rowType) { + return false; + } + } + return true; + } + if (endParentRow) { //终点的父泳道过滤出选中的Struct let endRowStruct: any; @@ -2558,7 +3146,8 @@ export class SpSystemTrace extends BaseElement { let endY = endRowStruct!.translateY! + 20 * (findJankEntry!.depth! + 0.5); let endRowEl = endRowStruct; let endOffSetY = 20 * (findJankEntry!.depth! + 0.5); - if (!endParentRow.expansion) { + let expansionFlag = collectionHasJank(endRowStruct); + if (!endParentRow.expansion && expansionFlag) { endY = endParentRow!.translateY! + 10 * (findJankEntry!.depth! + 0.5); endRowEl = endParentRow; endOffSetY = 10 * (findJankEntry!.depth! + 0.5); @@ -2566,7 +3155,8 @@ export class SpSystemTrace extends BaseElement { let startY = startRow!.translateY! + 20 * (selectJankStruct!.depth! + 0.5); let startRowEl = startRow; let startOffSetY = 20 * (selectJankStruct!.depth! + 0.5); - if (startParentRow && !startParentRow.expansion) { + expansionFlag = collectionHasJank(startRow); + if (startParentRow && !startParentRow.expansion && expansionFlag) { startY = startParentRow!.translateY! + 10 * (selectJankStruct!.depth! + 0.5); startRowEl = startParentRow; startOffSetY = 10 * (selectJankStruct!.depth! + 0.5); @@ -2598,18 +3188,20 @@ export class SpSystemTrace extends BaseElement { let endY = endRowStruct!.translateY! + 20 * (findJankEntry!.depth! + 0.5); let endRowEl = endRowStruct; let endOffSetY = 20 * (findJankEntry!.depth! + 0.5); - if (!endParentRow.expansion) { + let expansionFlag = collectionHasJank(endRowStruct); + if (!endParentRow.expansion && expansionFlag) { endY = endParentRow!.translateY! + 10 * (findJankEntry!.depth! + 0.5); endRowEl = endParentRow; endOffSetY = 10 * (findJankEntry!.depth! + 0.5); } let startY = startRow!.translateY! + 20 * (selectJankStruct!.depth! + 0.5); let startRowEl = startRow; + expansionFlag = collectionHasJank(startRow); let startOffsetY = 20 * (selectJankStruct!.depth! + 0.5); let startParentRow = this.shadowRoot?.querySelector>( `trace-row[row-id='${startRow.rowParentId}'][folder]` ); - if (startParentRow && !startParentRow.expansion) { + if (startParentRow && !startParentRow.expansion && expansionFlag) { startY = startParentRow!.translateY! + 10 * (selectJankStruct!.depth! + 0.5); startRowEl = startParentRow; startOffsetY = 10 * (selectJankStruct!.depth! + 0.5); @@ -2955,6 +3547,9 @@ export class SpSystemTrace extends BaseElement { this.init({ url: url }, '', progress).then((res) => { if (complete) { complete(res); + window.publish(window.SmartEvent.UI.MouseEventEnable, { + mouseEnable: true, + }); } }); } @@ -2972,6 +3567,9 @@ export class SpSystemTrace extends BaseElement { this.rowsEL?.querySelectorAll('trace-row').forEach((it: any) => this.observer.observe(it)); if (complete) { complete(res); + window.publish(window.SmartEvent.UI.MouseEventEnable, { + mouseEnable: true, + }); } }); } @@ -3446,7 +4044,8 @@ export class SpSystemTrace extends BaseElement { } catch (e) { error('getWasmConfigFailed', e); } - let { status, msg, sdkConfigMap } = await threadPool.initSqlite(param.buf, configJson, progress); + let parseConfig = FlagsConfig.getSpTraceStreamParseConfig(); + let { status, msg, sdkConfigMap } = await threadPool.initSqlite(param.buf, parseConfig, configJson, progress); if (!status) { return { status: false, msg: msg }; } @@ -3472,6 +4071,9 @@ export class SpSystemTrace extends BaseElement { this.rowsEL!.querySelectorAll>('trace-row').forEach((it) => { if (rowId !== '' && (it.rowId?.includes(rowId) || it.name.includes(rowId))) { it.addTemplateTypes('Ark Ts'); + for (let child of it.childrenList) { + child.addTemplateTypes('Ark Ts'); + } } if (it.folder) { let offsetYTimeOut: any = undefined; @@ -3672,6 +4274,9 @@ export class SpSystemTrace extends BaseElement { background: var(--dark-background5,#ffffff); box-shadow: 0 10px 10px #00000044; } + :host([disable]) .container{ + pointer-events: none; + } .container{ width: 100%; box-sizing: border-box; diff --git a/ide/src/trace/component/SpWelcomePage.ts b/ide/src/trace/component/SpWelcomePage.ts index e199c6b8daf2f7ebf2f3a03b7df7be6cd487a5ea..59d9e29a342c59e0c9e15ab1b7e7bdcf25f86a06 100644 --- a/ide/src/trace/component/SpWelcomePage.ts +++ b/ide/src/trace/component/SpWelcomePage.ts @@ -30,22 +30,11 @@ export class SpWelcomePage extends BaseElement { align-content: center; background: var(--dark-background5,#F6F6F6); } - .home-page{ - margin-top: -100px; - } .lit-icon{ - margin-top: 50px; - margin-left: 50px; content: var(--dark-img,url('img/pic.png')); }
    -
    -

    黄区域名: https://smartperf.rnd.huawei.com/smartperf/

    -

    绿区域名: https://devecotesting.rnd.huawei.com/smartperf/

    -

    3ms社区: http://3ms.huawei.com/km/groups/3956611/home?|=zh-cn

    -

    welink讨论群: 群1: 473395703, 群2: 485625665

    -
    `; diff --git a/ide/src/trace/component/chart/SmapsChart.ts b/ide/src/trace/component/chart/SmapsChart.ts deleted file mode 100644 index b01530c1ff58a29bed0b26032ac643c843d176f1..0000000000000000000000000000000000000000 --- a/ide/src/trace/component/chart/SmapsChart.ts +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { SpSystemTrace } from '../SpSystemTrace.js'; -import { querySmapsData, querySmapsDataMax, querySmapsExits } from '../../database/SqlLite.js'; -import { TraceRow } from '../trace/base/TraceRow.js'; -import { BaseStruct } from '../../bean/BaseStruct.js'; -import { renders } from '../../database/ui-worker/ProcedureWorker.js'; -import { SmapsRender, SmapsStruct } from '../../database/ui-worker/ProcedureWorkerSmaps.js'; -import { Utils } from '../trace/base/Utils.js'; -import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; - -export class SmapsChart { - private trace: SpSystemTrace; - - constructor(trace: SpSystemTrace) { - this.trace = trace; - } - - async init() { - let result = await querySmapsExits(); - if (result.length <= 0) return; - let smapsRow = this.initSmapsRow(); - let rowNameList: Array = ['Dirty Size', 'Swapped Size', 'Resident Size']; - for (let rowName of rowNameList) { - await this.initRows(smapsRow, rowName); - } - } - - private initSmapsRow = () => { - let smapsRow = TraceRow.skeleton(); - smapsRow.rowId = `smapsRow`; - smapsRow.rowType = TraceRow.ROW_TYPE_SMAPS; - smapsRow.rowParentId = ''; - smapsRow.style.height = '40px'; - smapsRow.folder = true; - smapsRow.name = 'VM Tracker'; - smapsRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - smapsRow.selectChangeHandler = this.trace.selectChangeHandler; - smapsRow.supplier = () => new Promise>((resolve) => resolve([])); - smapsRow.onThreadHandler = (useCache) => { - smapsRow.canvasSave(this.trace.canvasPanelCtx!); - if (smapsRow.expansion) { - this.trace.canvasPanelCtx?.clearRect(0, 0, smapsRow.frame.width, smapsRow.frame.height); - } else { - (renders['empty'] as EmptyRender).renderMainThread( - { - context: this.trace.canvasPanelCtx, - useCache: useCache, - type: ``, - }, - smapsRow - ); - } - smapsRow.canvasRestore(this.trace.canvasPanelCtx!); - }; - this.trace.rowsEL?.appendChild(smapsRow); - return smapsRow; - }; - - private initRows = async (nodeRow: TraceRow, rowName: string) => { - let smapsTraceRow = TraceRow.skeleton(); - smapsTraceRow.rowParentId = `smapsRow`; - smapsTraceRow.rowHidden = !nodeRow.expansion; - smapsTraceRow.rowId = rowName; - smapsTraceRow.rowType = TraceRow.ROW_TYPE_SMAPS; - smapsTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; - smapsTraceRow.selectChangeHandler = this.trace.selectChangeHandler; - smapsTraceRow.style.height = '40px'; - smapsTraceRow.style.width = `100%`; - smapsTraceRow.setAttribute('children', ''); - smapsTraceRow.name = rowName; - let columnName = ''; - if (rowName == 'Dirty Size') { - columnName = 'dirty'; - } else if (rowName == 'Swapped Size') { - columnName = 'swapper'; - } else { - columnName = 'resident_size'; - } - smapsTraceRow.supplier = () => querySmapsData(columnName); - let maxList = await querySmapsDataMax(columnName); - let maxValue = maxList[0].max_value; - smapsTraceRow.focusHandler = (ev) => { - this.trace?.displayTip( - smapsTraceRow, - SmapsStruct.hoverSmapsStruct, - `${Utils.getBinaryByteWithUnit((SmapsStruct.hoverSmapsStruct?.value || 0) * 1024)}` - ); - }; - smapsTraceRow.onThreadHandler = (useCache) => { - let context = smapsTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; - smapsTraceRow.canvasSave(context); - (renders['smaps'] as SmapsRender).renderMainThread( - { - context: context, - useCache: useCache, - type: `smaps`, - rowName: columnName, - maxValue: maxValue, - }, - smapsTraceRow - ); - smapsTraceRow.canvasRestore(context); - }; - nodeRow.addChildTraceRow(smapsTraceRow); - }; -} diff --git a/ide/src/trace/component/chart/SpAbilityMonitorChart.ts b/ide/src/trace/component/chart/SpAbilityMonitorChart.ts index 1d13c54ba06949d14e7e91dc6bdbcb0caaccac20..45bb19bd969234cd3d3cbde8cd8cd253d6f79146 100644 --- a/ide/src/trace/component/chart/SpAbilityMonitorChart.ts +++ b/ide/src/trace/component/chart/SpAbilityMonitorChart.ts @@ -27,21 +27,22 @@ import { queryCpuAbilitySystemData, queryCpuAbilityUserData, queryDiskIoMaxData, + queryDmaAbilityData, + queryGpuMemoryAbilityData, queryMemoryMaxData, queryMemoryUsedAbilityData, queryNetWorkMaxData, queryPacketsInAbilityData, queryPacketsOutAbilityData, + queryPurgeableSysData, queryReadAbilityData, queryWrittenAbilityData, } from '../../database/SqlLite.js'; import { info } from '../../../log/Log.js'; import { TraceRow } from '../trace/base/TraceRow.js'; -import { procedurePool } from '../../database/Procedure.js'; import { Utils } from '../trace/base/Utils.js'; -import { CpuStruct, EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; -import { ProcessRender, ProcessStruct } from '../../database/ui-worker/ProcedureWorkerProcess.js'; -import { CpuFreqStruct, FreqRender } from '../../database/ui-worker/ProcedureWorkerFreq.js'; +import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; +import { ProcessStruct } from '../../database/ui-worker/ProcedureWorkerProcess.js'; import { CpuAbilityMonitorStruct, CpuAbilityRender } from '../../database/ui-worker/ProcedureWorkerCpuAbility.js'; import { MemoryAbilityMonitorStruct, @@ -56,14 +57,14 @@ import { NetworkAbilityRender, } from '../../database/ui-worker/ProcedureWorkerNetworkAbility.js'; import { renders } from '../../database/ui-worker/ProcedureWorker.js'; -import { ColorUtils } from '../trace/base/ColorUtils.js'; +import { SnapshotRender, SnapshotStruct } from '../../database/ui-worker/ProcedureWorkerSnapshot.js'; export class SpAbilityMonitorChart { private trace: SpSystemTrace; constructor(trace: SpSystemTrace) { this.trace = trace; } - memoryMath = (maxByte: number) => { + memoryMath = (maxByte: number): string => { let maxByteName = ''; if (maxByte > 0) { maxByteName = Utils.getBinaryKBWithUnit(maxByte); @@ -71,15 +72,15 @@ export class SpAbilityMonitorChart { return maxByteName; }; - diskIOMath = (maxByte: number) => { + diskIOMath = (maxByte: number): string => { let maxByteName = ''; if (maxByte > 0) { - maxByteName = maxByte + 'KB/S'; + maxByteName = `${maxByte}KB/S`; } return maxByteName; }; - networkMath = (maxValue: number) => { + networkMath = (maxValue: number): string => { let maxByteName = ''; if (maxValue > 0) { maxByteName = Utils.getBinaryByteWithUnit(maxValue); @@ -105,6 +106,10 @@ export class SpAbilityMonitorChart { if (this.hasTable(result, 'trace_network')) { await this.initNetworkAbility(processRow); } + // 初始化PurgeableToTal和PurgeablePin泳道图 + await this.initPurgeableAbility(processRow); + await this.initDmaAbility(processRow); + await this.initGpuMemoryAbility(processRow); let durTime = new Date().getTime() - time; info('The time to load the AbilityMonitor data is: ', durTime); } @@ -117,7 +122,7 @@ export class SpAbilityMonitorChart { private initAbilityRow = () => { let abilityRow = TraceRow.skeleton(); - abilityRow.rowId = `abilityMonitor`; + abilityRow.rowId = 'abilityMonitor'; abilityRow.rowType = TraceRow.ROW_TYPE_MONITOR; abilityRow.style.height = '40px'; abilityRow.rowParentId = ''; @@ -131,11 +136,11 @@ export class SpAbilityMonitorChart { if (abilityRow.expansion) { this.trace.canvasPanelCtx?.clearRect(0, 0, abilityRow.frame.width, abilityRow.frame.height); } else { - (renders['empty'] as EmptyRender).renderMainThread( + (renders.empty as EmptyRender).renderMainThread( { context: this.trace.canvasPanelCtx, useCache: useCache, - type: ``, + type: '', }, abilityRow ); @@ -711,4 +716,189 @@ export class SpAbilityMonitorChart { let durTime = new Date().getTime() - time; info('The time to load the Ability Network is: ', durTime); }; + + private initPurgeableAbility = async (processRow: TraceRow) => { + let time = new Date().getTime(); + let purgeableTotalData = await queryPurgeableSysData(); + if (purgeableTotalData.length > 0) { + for (let i = 0; i < purgeableTotalData.length; i++) { + purgeableTotalData[i].name = 'Snapshot' + i; + } + let totalTraceRow = TraceRow.skeleton(); + totalTraceRow.rowParentId = `abilityMonitor`; + totalTraceRow.rowHidden = !processRow.expansion; + totalTraceRow.rowId = 'System Purgeable Total'; + totalTraceRow.rowType = TraceRow.ROW_TYPE_PURGEABLE_TOTAL_ABILITY; + totalTraceRow.style.height = '40px'; + totalTraceRow.style.width = `100%`; + totalTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + totalTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + totalTraceRow.setAttribute('children', ''); + totalTraceRow.name = `System Purgeable Total`; + totalTraceRow.supplier = () => new Promise>((resolve) => resolve(purgeableTotalData)); + totalTraceRow.focusHandler = (ev) => { + this.trace?.displayTip( + totalTraceRow, + SnapshotStruct.hoverSnapshotStruct, + `Name: ${SnapshotStruct.hoverSnapshotStruct?.name || ''} + Value: ${Utils.getBinaryByteWithUnit(SnapshotStruct.hoverSnapshotStruct?.value || 0)}` + ); + }; + totalTraceRow.onThreadHandler = (useCache) => { + let context = totalTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + totalTraceRow.canvasSave(context); + (renders['snapshot'] as SnapshotRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `snapshot`, + }, + totalTraceRow + ); + totalTraceRow.canvasRestore(context); + }; + processRow.addChildTraceRow(totalTraceRow); + } + let purgeablePinData = await queryPurgeableSysData(true); + if (purgeablePinData.length > 0) { + for (let i = 0; i < purgeablePinData.length; i++) { + purgeablePinData[i].name = 'Snapshot' + i; + } + let pinTraceRow = TraceRow.skeleton(); + pinTraceRow.rowParentId = `abilityMonitor`; + pinTraceRow.rowHidden = !processRow.expansion; + pinTraceRow.rowId = 'System Purgeable Pin'; + pinTraceRow.rowType = TraceRow.ROW_TYPE_PURGEABLE_PIN_ABILITY; + pinTraceRow.style.height = '40px'; + pinTraceRow.style.width = `100%`; + pinTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + pinTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + pinTraceRow.setAttribute('children', ''); + pinTraceRow.name = `System Purgeable Pin`; + pinTraceRow.supplier = () => new Promise>((resolve) => resolve(purgeablePinData)); + pinTraceRow.focusHandler = (ev) => { + this.trace?.displayTip( + pinTraceRow, + SnapshotStruct.hoverSnapshotStruct, + `Name: ${SnapshotStruct.hoverSnapshotStruct?.name || ''} + Value: ${Utils.getBinaryByteWithUnit(SnapshotStruct.hoverSnapshotStruct?.value || 0)}` + ); + }; + pinTraceRow.onThreadHandler = (useCache) => { + let context = pinTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + pinTraceRow.canvasSave(context); + (renders['snapshot'] as SnapshotRender).renderMainThread( + { + context: context, + useCache: useCache, + type: `snapshot`, + }, + pinTraceRow + ); + pinTraceRow.canvasRestore(context); + }; + processRow.addChildTraceRow(pinTraceRow); + } + + let durTime = new Date().getTime() - time; + info('The time to load the Ability Purgeable is: ', durTime); + }; + + /** + * DMA + * @param processRow + */ + private initDmaAbility = async (processRow: TraceRow) => { + let dmaAbilityData = await queryDmaAbilityData(); + for (let i = 0; i < dmaAbilityData.length; i++) { + dmaAbilityData[i].name = 'snapshot' + i; + } + let time = new Date().getTime(); + let dmaTraceRow = TraceRow.skeleton(); + dmaTraceRow.rowParentId = `abilityMonitor`; + dmaTraceRow.rowHidden = !processRow.expansion; + dmaTraceRow.rowId = 'abilityMonitorDma'; + dmaTraceRow.rowType = TraceRow.ROW_TYPE_DMA_ABILITY; + dmaTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + dmaTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + dmaTraceRow.style.height = '40px'; + dmaTraceRow.style.width = `100%`; + dmaTraceRow.setAttribute('children', ''); + dmaTraceRow.name = 'DMA'; + dmaTraceRow.supplier = () => new Promise>((resolve) => resolve(dmaAbilityData)); + //文字悬浮提示 + dmaTraceRow.focusHandler = (ev) => { + this.trace?.displayTip( + dmaTraceRow, + SnapshotStruct.hoverSnapshotStruct, + `${SnapshotStruct.hoverSnapshotStruct?.name || ''} + ${Utils.getBinaryByteWithUnit(SnapshotStruct.hoverSnapshotStruct?.value || 0)}` + ); + }; + dmaTraceRow.onThreadHandler = (useCache) => { + let context = dmaTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + dmaTraceRow.canvasSave(context); + (renders.snapshot as SnapshotRender).renderMainThread( + { + context: context, + useCache: useCache, + type: 'snapshot', + }, + dmaTraceRow! + ); + dmaTraceRow.canvasRestore(context); + }; + processRow.addChildTraceRow(dmaTraceRow); + let durTime = new Date().getTime() - time; + info('The time to load the Ability Dma is: ', durTime); + }; + + /** + * Skia Gpu Memory + * @param processRow + */ + private initGpuMemoryAbility = async (processRow: TraceRow) => { + let gpuMemoryAbilityData = await queryGpuMemoryAbilityData(); + for (let i = 0; i < gpuMemoryAbilityData.length; i++) { + gpuMemoryAbilityData[i].name = 'snapshot' + i; + } + let time = new Date().getTime(); + let gpuMemoryTraceRow = TraceRow.skeleton(); + gpuMemoryTraceRow.rowParentId = `abilityMonitor`; + gpuMemoryTraceRow.rowHidden = !processRow.expansion; + gpuMemoryTraceRow.rowId = 'abilityMonitorGpuMemory'; + gpuMemoryTraceRow.rowType = TraceRow.ROW_TYPE_GPU_MEMORY_ABILITY; + gpuMemoryTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + gpuMemoryTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + gpuMemoryTraceRow.style.height = '40px'; + gpuMemoryTraceRow.style.width = `100%`; + gpuMemoryTraceRow.setAttribute('children', ''); + gpuMemoryTraceRow.name = 'Skia Gpu Memory'; + gpuMemoryTraceRow.supplier = () => new Promise>((resolve) => resolve(gpuMemoryAbilityData)); + //文字悬浮提示 + gpuMemoryTraceRow.focusHandler = (ev) => { + this.trace?.displayTip( + gpuMemoryTraceRow, + SnapshotStruct.hoverSnapshotStruct, + `${SnapshotStruct.hoverSnapshotStruct?.name || ''} + ${Utils.getBinaryByteWithUnit(SnapshotStruct.hoverSnapshotStruct?.value || 0)}` + ); + }; + gpuMemoryTraceRow.onThreadHandler = (useCache) => { + let context = gpuMemoryTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + gpuMemoryTraceRow.canvasSave(context); + (renders.snapshot as SnapshotRender).renderMainThread( + { + context: context, + useCache: useCache, + type: 'snapshot', + }, + gpuMemoryTraceRow! + ); + gpuMemoryTraceRow.canvasRestore(context); + }; + processRow.addChildTraceRow(gpuMemoryTraceRow); + let durTime = new Date().getTime() - time; + info('The time to load the Ability Dma is: ', durTime); + }; } diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index 2592376ebe97e26a5e6b2afcbf7f586052844f06..b1eed8e30924d045f0440bff6ce034175f140582 100644 --- a/ide/src/trace/component/chart/SpChartManager.ts +++ b/ide/src/trace/component/chart/SpChartManager.ts @@ -19,8 +19,9 @@ import { SpCpuChart } from './SpCpuChart.js'; import { SpFreqChart } from './SpFreqChart.js'; import { SpFpsChart } from './SpFpsChart.js'; import { - getCpuUtilizationRate, + getCpuUtilizationRate, queryAppStartupProcessIds, queryDataDICT, + queryMemoryConfig, queryTaskPoolCallStack, queryThreadAndProcessName, queryTotalTime, @@ -34,7 +35,7 @@ import { SpVirtualMemChart } from './SpVirtualMemChart.js'; import { SpFileSystemChart } from './SpFileSystemChart.js'; import { SpSdkChart } from './SpSdkChart.js'; import { SpHiSysEventChart } from './SpHiSysEventChart.js'; -import { SmapsChart } from './SmapsChart.js'; +import { VmTrackerChart } from './SpVmTrackerChart.js'; import { SpClockChart } from './SpClockChart.js'; import { SpIrqChart } from './SpIrqChart.js'; import { renders } from '../../database/ui-worker/ProcedureWorker.js'; @@ -43,8 +44,12 @@ import { TraceRow } from '../trace/base/TraceRow.js'; import { SpFrameTimeChart } from './SpFrameTimeChart.js'; import { Utils } from '../trace/base/Utils.js'; import { SpArkTsChart } from './SpArkTsChart.js'; +import { MemoryConfig } from '../../bean/MemoryConfig.js'; +import { FlagsConfig } from '../SpFlags.js'; export class SpChartManager { + static APP_STARTUP_PID_ARR: Array = []; + private trace: SpSystemTrace; public perf: SpHiPerf; private cpu: SpCpuChart; @@ -57,7 +62,7 @@ export class SpChartManager { private fileSystem: SpFileSystemChart; private sdkChart: SpSdkChart; private hiSyseventChart: SpHiSysEventChart; - private smapsChart: SmapsChart; + private smapsChart: VmTrackerChart; private clockChart: SpClockChart; private irqChart: SpIrqChart; frameTimeChart: SpFrameTimeChart; @@ -76,7 +81,7 @@ export class SpChartManager { this.process = new SpProcessChart(trace); this.sdkChart = new SpSdkChart(trace); this.hiSyseventChart = new SpHiSysEventChart(trace); - this.smapsChart = new SmapsChart(trace); + this.smapsChart = new VmTrackerChart(trace); this.clockChart = new SpClockChart(trace); this.irqChart = new SpIrqChart(trace); this.frameTimeChart = new SpFrameTimeChart(trace); @@ -86,7 +91,13 @@ export class SpChartManager { async init(progress: Function) { progress('load data dict', 50); SpSystemTrace.DATA_DICT.clear(); + SpChartManager.APP_STARTUP_PID_ARR = []; let dict = await queryDataDICT(); + if (FlagsConfig.getFlagsConfigEnableStatus('AppStartup')) { + let appStartUpPids = await queryAppStartupProcessIds(); + appStartUpPids.forEach(it => SpChartManager.APP_STARTUP_PID_ARR.push(it.pid)); + } + await this.initTraceConfig(); dict.map((d) => SpSystemTrace.DATA_DICT.set(d['id'], d['data'])); SpSystemTrace.DATA_TASK_POOL_CALLSTACK.clear(); let taskPoolCallStack = await queryTaskPoolCallStack(); @@ -101,9 +112,11 @@ export class SpChartManager { info('cpu Data initialized'); progress('process/thread state', 73); await this.cpu.initProcessThreadStateData(progress); - await this.cpu.initCpuIdle0Data(progress); - await this.cpu.initSchedulingPTData(progress); - await this.cpu.initSchedulingFreqData(progress); + if (FlagsConfig.getFlagsConfigEnableStatus('SchedulingAnalysis')) { + await this.cpu.initCpuIdle0Data(progress); + await this.cpu.initSchedulingPTData(progress); + await this.cpu.initSchedulingFreqData(progress); + } info('ProcessThreadState Data initialized'); progress('cpu rate', 75); await this.initCpuRate(); @@ -197,6 +210,15 @@ export class SpChartManager { if (this.trace.timerShaftEL) this.trace.timerShaftEL.cpuUsage = rates; info('Cpu UtilizationRate data size is: ', rates.length); }; + + initTraceConfig = async (): Promise => { + queryMemoryConfig().then((result) => { + if (result && result.length > 0) { + const config = result[0]; + MemoryConfig.getInstance().updateConfig(config.pid, config.iPid, config.processName, config.interval); + } + }); + }; } export const FolderSupplier = () => { diff --git a/ide/src/trace/component/chart/SpFrameTimeChart.ts b/ide/src/trace/component/chart/SpFrameTimeChart.ts index 2d3466db953285a0c92e5f4ca613b11bd020aede..8c8d0dc43aca8e3c138cd6f8ba14fe11f9552023 100644 --- a/ide/src/trace/component/chart/SpFrameTimeChart.ts +++ b/ide/src/trace/component/chart/SpFrameTimeChart.ts @@ -20,18 +20,32 @@ import { SpSystemTrace } from '../SpSystemTrace.js'; import { queryActualFrameDate, queryExpectedFrameDate, - queryFrameAnimationData, queryFrameApp, queryFrameDynamicData, queryFrameSpacing, - queryFrameTimeData, queryPhysicalData + queryFrameAnimationData, + queryFrameApp, + queryFrameDynamicData, + queryFrameSpacing, + queryFrameTimeData, + queryPhysicalData } from '../../database/SqlLite.js'; import { JanksStruct } from '../../bean/JanksStruct.js'; import { ns2xByTimeShaft, PairPoint } from '../../database/ui-worker/ProcedureWorkerCommon.js'; import { LitPopover } from '../../../base-ui/popover/LitPopoverV.js'; -import { FrameDynamicRender, FrameDynamicStruct } from '../../database/ui-worker/ProcedureWorkerFrameDynamic.js'; -import { FrameAnimationRender, FrameAnimationStruct } from '../../database/ui-worker/ProcedureWorkerFrameAnimation.js'; +import { + FrameDynamicRender, + FrameDynamicStruct +} from '../../database/ui-worker/ProcedureWorkerFrameDynamic.js'; +import { + FrameAnimationRender, + FrameAnimationStruct +} from '../../database/ui-worker/ProcedureWorkerFrameAnimation.js'; import { BaseStruct } from '../../bean/BaseStruct.js'; -import { FrameSpacingRender, FrameSpacingStruct } from '../../database/ui-worker/ProcedureWorkerFrameSpacing.js'; +import { + FrameSpacingRender, + FrameSpacingStruct +} from '../../database/ui-worker/ProcedureWorkerFrameSpacing.js'; import { FlagsConfig, Params } from '../SpFlags.js'; import { AnimationRanges, DeviceStruct } from '../../bean/FrameComponentBean.js'; +import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; export class SpFrameTimeChart { private trace: SpSystemTrace; @@ -60,31 +74,28 @@ export class SpFrameTimeChart { frameTimeLineRow.folder = true; frameTimeLineRow.name = 'FrameTimeline'; frameTimeLineRow.setAttribute('children', ''); - frameTimeLineRow.supplier = (): Promise => - new Promise((resolve) => { - resolve([]); - }); + frameTimeLineRow.supplier = (): Promise => new Promise((resolve) => { + resolve([]); + }); + frameTimeLineRow.addTemplateTypes('AppStartup'); frameTimeLineRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; frameTimeLineRow.selectChangeHandler = this.trace.selectChangeHandler; frameTimeLineRow.onThreadHandler = (useCache: boolean): void => { - let context: CanvasRenderingContext2D = frameTimeLineRow!.collect ? - this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + let context: CanvasRenderingContext2D = frameTimeLineRow!.collect ? this.trace.canvasFavoritePanelCtx! : + this.trace.canvasPanelCtx!; frameTimeLineRow!.canvasSave(context); - (renders.jank as JankRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'expected_frame_timeline_slice' - }, - frameTimeLineRow! - ); + (renders.jank as JankRender).renderMainThread({ + context: context, useCache: useCache, type: 'expected_frame_timeline_slice' + }, frameTimeLineRow!); frameTimeLineRow!.canvasRestore(context); }; this.trace.rowsEL?.appendChild(frameTimeLineRow); return frameTimeLineRow; } - async initExpectedChart(frameTimeLineRow: TraceRow): Promise { + async initExpectedChart( + frameTimeLineRow: TraceRow + ): Promise { let frameExpectedData = await this.getExpectedFrameDate(); let unitIndex: number = 1; let unitHeight: number = 20; @@ -102,30 +113,26 @@ export class SpFrameTimeChart { expectedTimeLineRow.addTemplateTypes('FrameTimeline'); expectedTimeLineRow.setAttribute('height', `${maxHeight}`); expectedTimeLineRow.setAttribute('children', ''); - expectedTimeLineRow.supplier = (): Promise => - new Promise((resolve): void => { - resolve(frameExpectedData); - }); + expectedTimeLineRow.supplier = (): Promise => new Promise((resolve): void => { + resolve(frameExpectedData); + }); expectedTimeLineRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; expectedTimeLineRow.selectChangeHandler = this.trace.selectChangeHandler; expectedTimeLineRow.onThreadHandler = (useCache: boolean): void => { - let context: CanvasRenderingContext2D = expectedTimeLineRow!.collect ? - this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + let context: CanvasRenderingContext2D = expectedTimeLineRow!.collect ? this.trace.canvasFavoritePanelCtx! : + this.trace.canvasPanelCtx!; expectedTimeLineRow!.canvasSave(context); - (renders.jank as JankRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'expected_frame_timeline_slice' - }, - expectedTimeLineRow! - ); + (renders.jank as JankRender).renderMainThread({ + context: context, useCache: useCache, type: 'expected_frame_timeline_slice' + }, expectedTimeLineRow!); expectedTimeLineRow!.canvasRestore(context); }; frameTimeLineRow.addChildTraceRow(expectedTimeLineRow); } - async initActualChart(frameTimeLineRow: TraceRow): Promise { + async initActualChart( + frameTimeLineRow: TraceRow + ): Promise { let frameActualData = await this.getActualFrameDate(); let unitIndex: number = 1; let unitHeight: number = 20; @@ -151,14 +158,9 @@ export class SpFrameTimeChart { let context: CanvasRenderingContext2D = actualTimeLineRow!.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; actualTimeLineRow!.canvasSave(context); - (renders.jank as JankRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'expected_frame_timeline_slice' - }, - actualTimeLineRow! - ); + (renders.jank as JankRender).renderMainThread({ + context: context, useCache: useCache, type: 'expected_frame_timeline_slice' + }, actualTimeLineRow!); actualTimeLineRow!.canvasRestore(context); }; frameTimeLineRow.addChildTraceRow(actualTimeLineRow); @@ -178,36 +180,78 @@ export class SpFrameTimeChart { async initAnimatedScenesChart( processRow: TraceRow, - process: { - pid: number | null; - processName: string | null; - }, + process: { pid: number | null; processName: string | null; }, firstRow: TraceRow ): Promise { this.flagConfig = FlagsConfig.getFlagsConfig('AnimationAnalysis'); if (this.flagConfig?.AnimationAnalysis === 'Enabled') { if (process.processName?.startsWith('render_service')) { let targetRowList = processRow.childrenList.filter(childRow => - childRow.rowType === 'thread' && childRow.name.startsWith('render_service') - ); - let animationRanges = await this.initAnimationChart(processRow, firstRow); - let nameArr = await queryFrameApp(); - let addRowList: Array> = []; - for (let index = 0; index < nameArr.length; index++) { - let name = nameArr[index].appName; - let dynamicChart = await this.initDynamicCurveChart(processRow, name, animationRanges); - let frameSpacingChart = await this.initFrameSpacing(processRow, name, animationRanges); - addRowList.push(dynamicChart); - addRowList.push(frameSpacingChart); + childRow.rowType === 'thread' && childRow.name.startsWith('render_service')); + let nameArr: { name: string }[] = await queryFrameApp(); + if (nameArr && nameArr.length > 0) { + let currentName = nameArr[0].name; + let frameChart = await this.initFrameChart(processRow, nameArr); + processRow.addChildTraceRowAfter(frameChart, targetRowList[0]); + let animationRanges = await this.initAnimationChart(processRow, firstRow); + await this.initDynamicCurveChart(frameChart, currentName, animationRanges); + await this.initFrameSpacing(nameArr, frameChart, currentName, animationRanges); } - let resultRow = addRowList.reverse(); - resultRow.forEach(row => { - processRow.addChildTraceRowAfter(row, targetRowList[0]); - }); } } } + private async initFrameChart( + processRow: TraceRow, + nameArr: { name: string }[] + ): Promise> { + let frameChart: TraceRow = TraceRow.skeleton(); + let systemPopover = this.addSystemConfigButton(frameChart, nameArr); + systemPopover.style.zIndex = '101'; + let radioList = systemPopover.querySelectorAll('.radio'); + let divElement = systemPopover.querySelectorAll('.option'); + radioList[0].checked = true; + divElement.forEach((divEl, index) => { + divEl.addEventListener('click', () => { + if (radioList[index]) { + radioList[index].checked = true; + frameChart.name = radioList[index].value; + frameChart.childrenList.forEach(childrenRow => { + childrenRow.setAttribute('model-name', `${radioList[index].value}`); + }); + systemPopover.blur(); + TraceRow.range!.refresh = true; + this.trace.refreshCanvas(true); + } + }); + }); + frameChart.rowId = 'frame'; + frameChart.rowType = TraceRow.ROW_TYPE_FRAME; + frameChart.rowHidden = !processRow.expansion; + frameChart.rowParentId = processRow.rowId; + frameChart.style.width = '100%'; + frameChart.style.height = '40px'; + frameChart.folder = true; + frameChart.name = nameArr[0].name; + frameChart.setAttribute('children', ''); + frameChart.supplier = (): Promise => new Promise((resolve) => { + resolve([]); + }); + frameChart.favoriteChangeHandler = this.trace.favoriteChangeHandler; + frameChart.selectChangeHandler = this.trace.selectChangeHandler; + frameChart.onThreadHandler = (useCache: boolean): void => { + let context: CanvasRenderingContext2D = frameChart!.collect ? this.trace.canvasFavoritePanelCtx! : + this.trace.canvasPanelCtx!; + frameChart!.canvasSave(context); + (renders.empty as EmptyRender).renderMainThread({ + context: context, useCache: useCache, type: 'frame' + }, frameChart!); + frameChart!.canvasRestore(context); + }; + this.trace.rowsEL?.appendChild(frameChart); + return frameChart; + } + async initAnimationChart( processRow: TraceRow, firstRow: TraceRow @@ -217,8 +261,7 @@ export class SpFrameTimeChart { if (frameAnimationData.length > 0) { frameAnimationData.forEach(data => { let range = { - start: data.dynamicStartTs, - end: data.dynamicEndTs + start: data.dynamicStartTs, end: data.dynamicEndTs }; animationRanges.push(range); }); @@ -233,24 +276,18 @@ export class SpFrameTimeChart { frameAnimationRow.name = 'Animation'; frameAnimationRow.addTemplateTypes('Animation Effect'); frameAnimationRow.setAttribute('children', ''); - frameAnimationRow.supplier = (): Promise => - new Promise((resolve) => { - resolve(frameAnimationData); - }); + frameAnimationRow.supplier = (): Promise => new Promise((resolve) => { + resolve(frameAnimationData); + }); frameAnimationRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; frameAnimationRow.selectChangeHandler = this.trace.selectChangeHandler; frameAnimationRow.onThreadHandler = (useCache): void => { - let context: CanvasRenderingContext2D = frameAnimationRow!.collect ? - this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + let context: CanvasRenderingContext2D = frameAnimationRow!.collect ? this.trace.canvasFavoritePanelCtx! : + this.trace.canvasPanelCtx!; frameAnimationRow!.canvasSave(context); - (renders.frameAnimation as FrameAnimationRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'frameAnimation' - }, - frameAnimationRow! - ); + (renders.frameAnimation as FrameAnimationRender).renderMainThread({ + context: context, useCache: useCache, type: 'frameAnimation' + }, frameAnimationRow!); frameAnimationRow!.canvasRestore(context); }; processRow.addChildTraceRowBefore(frameAnimationRow, firstRow); @@ -258,32 +295,36 @@ export class SpFrameTimeChart { } async initDynamicCurveChart( - processRow: TraceRow, - componentName: string, + frameChart: TraceRow, + name: string, animationRanges: AnimationRanges[] - ): Promise> { - let frameDynamicCurveData: FrameDynamicStruct[] = await queryFrameDynamicData(componentName); - let systemConfigList: string[] = [' ']; + ): Promise { + let frameDynamicCurveData: FrameDynamicStruct[] = await queryFrameDynamicData(); + let systemConfigList: { + name: string + }[] = [{name: 'x'}, {name: 'y'}, {name: 'width'}, {name: 'height'}, {name: 'alpha'}]; let dynamicCurveRow: TraceRow = TraceRow.skeleton(); let systemPopover = this.addSystemConfigButton(dynamicCurveRow, systemConfigList); - dynamicCurveRow.rowId = `animation Effect Curve-${componentName}`; + this.initSystemConfig(systemPopover, dynamicCurveRow); + dynamicCurveRow.rowId = 'animation-Effect-Curve'; dynamicCurveRow.rowType = TraceRow.ROW_TYPE_FRAME_DYNAMIC; - dynamicCurveRow.rowHidden = !processRow.expansion; - dynamicCurveRow.rowParentId = processRow.rowId; + dynamicCurveRow.rowHidden = !frameChart.expansion; + dynamicCurveRow.rowParentId = frameChart.rowId; dynamicCurveRow.style.width = '100%'; dynamicCurveRow.style.height = '40px'; dynamicCurveRow.style.height = '100px'; let labelName = dynamicCurveRow.shadowRoot?.querySelector('.name') as HTMLLabelElement; labelName.style.marginRight = '77px'; - dynamicCurveRow.name = `Animation Effect Curve (${componentName})`; + dynamicCurveRow.name = 'Animation Effect Curve'; dynamicCurveRow.addTemplateTypes('Animation Effect'); dynamicCurveRow.setAttribute('height', '100px'); dynamicCurveRow.setAttribute('children', ''); - dynamicCurveRow.supplier = (): Promise => - new Promise((resolve): void => { - resolve(frameDynamicCurveData); - }); - dynamicCurveRow.favoriteChangeHandler = () : void => { + dynamicCurveRow.setAttribute('model-type', systemConfigList[0].name); + dynamicCurveRow.setAttribute('model-name', name); + dynamicCurveRow.supplier = (): Promise => new Promise((resolve): void => { + resolve(frameDynamicCurveData); + }); + dynamicCurveRow.favoriteChangeHandler = (): void => { this.favoriteSelect(systemPopover, dynamicCurveRow); }; dynamicCurveRow.selectChangeHandler = this.trace.selectChangeHandler; @@ -291,21 +332,43 @@ export class SpFrameTimeChart { let context: CanvasRenderingContext2D = dynamicCurveRow!.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; dynamicCurveRow!.canvasSave(context); - (renders.frameDynamicCurve as FrameDynamicRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'dynamicEffectCurve', - animationRanges: animationRanges - }, - dynamicCurveRow! - ); + (renders.frameDynamicCurve as FrameDynamicRender).renderMainThread({ + context: context, + useCache: useCache, + type: 'dynamicEffectCurve', + animationRanges: animationRanges + }, dynamicCurveRow!); dynamicCurveRow!.canvasRestore(context); }; - return dynamicCurveRow; + frameChart.addChildTraceRow(dynamicCurveRow); } - private favoriteSelect(systemPopover: LitPopover, dynamicCurveRow: TraceRow) : void { + private initSystemConfig( + systemPopover: LitPopover, + dynamicCurveRow: TraceRow + ): void { + let radioList = systemPopover.querySelectorAll('.radio'); + let divElement = systemPopover.querySelectorAll('.option'); + radioList[0].checked = true; + dynamicCurveRow.setAttribute('model-type', radioList[0].value); + divElement.forEach((divEl, index) => { + divEl.addEventListener('click', () => { + if (radioList[index]) { + radioList[index].checked = true; + dynamicCurveRow.setAttribute('model-type', `${radioList[index].value}`); + systemPopover.blur(); + TraceRow.range!.refresh = true; + this.trace.refreshCanvas(true); + this.trace.clickEmptyArea(); + } + }); + }); + } + + private favoriteSelect( + systemPopover: LitPopover, + dynamicCurveRow: TraceRow + ): void { let popover = systemPopover.querySelector('.dynamicPopover') as HTMLDivElement; if (dynamicCurveRow.collect) { systemPopover.setAttribute('placement', 'right'); @@ -317,51 +380,57 @@ export class SpFrameTimeChart { } async initFrameSpacing( - processRow: TraceRow, - componentName: string, + nameArr: { name: string }[], + frameChart: TraceRow, + name: string, animationRanges: AnimationRanges[] - ): Promise> { - let frameData: FrameSpacingStruct[] = await queryFrameSpacing(componentName); + ): Promise { + let frameData: FrameSpacingStruct[] = await queryFrameSpacing(); let deviceStructArray = await queryPhysicalData(); let deviceStruct: DeviceStruct = deviceStructArray[0]; - this.dataProcessing(frameData, deviceStruct); + let frameResultData: FrameSpacingStruct[] = []; + for (let index = 0; index < nameArr.length; index++) { + let appName: string = nameArr[index].name; + let filterData = frameData.filter(spacingData => spacingData.nameId === appName); + this.dataProcessing(filterData, deviceStruct); + frameResultData.push(...filterData); + } let frameSpacingRow = TraceRow.skeleton(); - frameSpacingRow.rowId = `frame spacing-${componentName}`; + frameSpacingRow.rowId = 'frame spacing'; frameSpacingRow.rowType = TraceRow.ROW_TYPE_FRAME_SPACING; - frameSpacingRow.rowHidden = !processRow.expansion; - frameSpacingRow.rowParentId = processRow.rowId; + frameSpacingRow.rowHidden = !frameChart.expansion; + frameSpacingRow.rowParentId = frameChart.rowId; frameSpacingRow.style.width = '100%'; frameSpacingRow.style.height = '140px'; - frameSpacingRow.name = `Frame spacing (${componentName})`; + frameSpacingRow.name = 'Frame spacing'; frameSpacingRow.addTemplateTypes('Animation Effect'); frameSpacingRow.setAttribute('height', '140'); frameSpacingRow.setAttribute('children', ''); - frameSpacingRow.supplier = (): Promise => - new Promise((resolve): void => { - resolve(frameData); - }); + frameSpacingRow.setAttribute('model-name', name); + frameSpacingRow.supplier = (): Promise => new Promise((resolve): void => { + resolve(frameResultData); + }); frameSpacingRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; frameSpacingRow.selectChangeHandler = this.trace.selectChangeHandler; frameSpacingRow.onThreadHandler = (useCache: boolean): void => { - let context = frameSpacingRow!.collect ? - this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + let context = frameSpacingRow!.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; frameSpacingRow!.canvasSave(context); - (renders.frameSpacing as FrameSpacingRender).renderMainThread( - { - context: context, - useCache: useCache, - type: 'frame_spacing_slice', - frameRate: deviceStruct.physicalFrameRate, - animationRanges: animationRanges - }, - frameSpacingRow! - ); + (renders.frameSpacing as FrameSpacingRender).renderMainThread({ + context: context, + useCache: useCache, + type: 'frame_spacing_slice', + frameRate: deviceStruct.physicalFrameRate, + animationRanges: animationRanges + }, frameSpacingRow!); frameSpacingRow!.canvasRestore(context); }; - return frameSpacingRow; + frameChart.addChildTraceRow(frameSpacingRow); } - dataProcessing(frameData: FrameSpacingStruct[], deviceStruct: DeviceStruct): void { + dataProcessing( + frameData: FrameSpacingStruct[], + deviceStruct: DeviceStruct + ): void { let unitIndex: number = 1; let secondToNanosecond: number = 1000_000_000; let physicalWidth = Number(this.flagConfig!.physicalWidth); @@ -393,8 +462,11 @@ export class SpFrameTimeChart { } } - addSystemConfigButton(dynamicCurveRow: TraceRow, systemConfigList: Array): LitPopover { - let rowContent: HTMLDivElement = dynamicCurveRow.shadowRoot?.querySelector('.describe') as HTMLDivElement; + addSystemConfigButton( + systemTraceRow: TraceRow, + systemConfigList: { name: string }[] + ): LitPopover { + let rowContent: HTMLDivElement = systemTraceRow.shadowRoot?.querySelector('.describe') as HTMLDivElement; let systemPopover: LitPopover = document.createElement('lit-popover') as LitPopover; systemPopover.style.zIndex = '100'; systemPopover.style.position = 'absolute'; @@ -405,47 +477,25 @@ export class SpFrameTimeChart { systemPopover.setAttribute('haveRadio', 'true'); systemPopover.innerHTML = `
    - ${systemConfigList.map((): string => ` -
    - X -
    + ${systemConfigList.map((it): string => `
    - Y -
    -
    - Width -
    -
    - Height -
    -
    - Alpha -
    `).join('')} + ${it.name}
    `).join('')}
    `; rowContent.appendChild(systemPopover); - let radioList = systemPopover.querySelectorAll('.radio'); - let divElement = systemPopover.querySelectorAll('.option'); - divElement.forEach((divEl, index) => { - divEl.addEventListener('click', () => { - if (radioList[index]) { - radioList[index].checked = true; - dynamicCurveRow.setAttribute('modelType', `${radioList[index].value}`); - systemPopover.blur(); - this.trace.refreshCanvas(false); - this.trace.clickEmptyArea(); - } - }); - }); return systemPopover; } - private frameNoExpandTimeOut(event: CustomEventInit<{ - expansion: boolean, - rowType: string, - rowId: string, - rowParentId: string, - }>, frameTimeLineRow: TraceRow): number { + private frameNoExpandTimeOut( + event: CustomEventInit<{ + expansion: boolean, + rowType: string, + rowId: string, + rowParentId: string + }>, + frameTimeLineRow: TraceRow + ): number { if (JankStruct!.selectJankStruct) { JankStruct.selectJankStructList?.push(JankStruct!.selectJankStruct); } @@ -487,12 +537,10 @@ export class SpFrameTimeChart { return offsetYTimeOut; } - private frameExpandTimeOut(event: CustomEventInit<{ - expansion: boolean, - rowType: string, - rowId: string, - rowParentId: string, - }>, actualTimeLineRow: TraceRow): number { + private frameExpandTimeOut( + event: CustomEventInit<{ expansion: boolean, rowType: string, rowId: string, rowParentId: string }>, + actualTimeLineRow: TraceRow + ): number { let topPadding: number = 195; let halfNumber: number = 2; let offsetYTime: number = 300; @@ -541,8 +589,8 @@ export class SpFrameTimeChart { let frameExpectedData = await queryExpectedFrameDate(); if (frameExpectedData.length > 0) { let unitIndex: number = 1; - let isIntersect = (a: JanksStruct, b: JanksStruct): boolean => - Math.max(a.ts! + a.dur!, b.ts! + b.dur!) - Math.min(a.ts!, b.ts!) < a.dur! + b.dur!; + let isIntersect = (a: JanksStruct, b: JanksStruct): boolean => Math.max(a.ts! + a.dur!, b.ts! + b.dur!) - + Math.min(a.ts!, b.ts!) < a.dur! + b.dur!; let depths = []; for (let i: number = 0; i < frameExpectedData.length; i++) { let it = frameExpectedData[i]; @@ -613,47 +661,4 @@ export class SpFrameTimeChart { } return frameActualData; } - - private dynamicHoverTip(dynamicCurveRow: TraceRow): void { - if (FrameDynamicStruct.hoverFrameDynamicStruct) { - this.trace?.displayTip( - dynamicCurveRow, - FrameDynamicStruct.hoverFrameDynamicStruct, - `
    -
    -
    prev
    -
    -
    -
    -
    ts:
    -
    - ${(FrameDynamicStruct.hoverFrameDynamicStruct.ts) || ''} -
    -
    -
    x: -
    -
    - ${(FrameDynamicStruct.hoverFrameDynamicStruct.x) || ''}
    -
    -
    y: -
    -
    - ${(FrameDynamicStruct.hoverFrameDynamicStruct.y) || ''}
    -
    -
    width: -
    -
    - ${(FrameDynamicStruct.hoverFrameDynamicStruct.width) || ''}
    -
    -
    height: -
    -
    - ${(FrameDynamicStruct.hoverFrameDynamicStruct.height) || ''}
    -
    -
    alpha: -
    -
    ` - ); - } - } } diff --git a/ide/src/trace/component/chart/SpHiPerf.ts b/ide/src/trace/component/chart/SpHiPerf.ts index 5cc0b9e91e512ae575d99bba2b8d2746973894d3..c5cdef93ff41a51c255baf5d217f8572ee58bb5a 100644 --- a/ide/src/trace/component/chart/SpHiPerf.ts +++ b/ide/src/trace/component/chart/SpHiPerf.ts @@ -15,7 +15,6 @@ import { SpSystemTrace } from '../SpSystemTrace.js'; import { TraceRow } from '../trace/base/TraceRow.js'; -import { procedurePool } from '../../database/Procedure.js'; import { queryHiPerfCpuData, queryHiPerfCpuMergeData, @@ -39,7 +38,7 @@ import { perfDataQuery } from './PerfDataQuery.js'; import { renders } from '../../database/ui-worker/ProcedureWorker.js'; import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; import { HiperfReportRender, HiPerfReportStruct } from '../../database/ui-worker/ProcedureWorkerHiPerfReport.js'; - +import { SpChartManager } from './SpChartManager.js'; export interface ResultData { existA: boolean | null | undefined; @@ -306,6 +305,9 @@ export class SpHiPerf { row.rowParentId = 'HiPerf'; row.rowHidden = !this.rowFolder.expansion; row.folder = true; + if (SpChartManager.APP_STARTUP_PID_ARR.find(pid => pid === process.pid) !== undefined) { + row.addTemplateTypes('AppStartup'); + } row.name = `${process.processName || 'Process'} [${process.pid}]`; row.folderPaddingLeft = 6; row.style.height = '40px'; diff --git a/ide/src/trace/component/chart/SpNativeMemoryChart.ts b/ide/src/trace/component/chart/SpNativeMemoryChart.ts index 856e9d4f388690bffa298104806b9cb67a192fe3..e7f01d08d25ddd6f42cd7821004705520b1b1f55 100644 --- a/ide/src/trace/component/chart/SpNativeMemoryChart.ts +++ b/ide/src/trace/component/chart/SpNativeMemoryChart.ts @@ -68,13 +68,26 @@ export class SpNativeMemoryChart { nativeRow.name = `Native Memory` + process; nativeRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; nativeRow.selectChangeHandler = this.trace.selectChangeHandler; - nativeRow.onDrawTypeChangeHandler = (type) => { - nativeRow.childrenList.forEach((row) => (row.drawType = type)); + nativeRow.rowSetting = 'enable'; + nativeRow.rowSettingPopoverDirection = 'bottomLeft'; + nativeRow.rowSettingList = [ + { + key: '0', + title: 'Current Bytes', + checked: true, + }, + { + key: '1', + title: 'Native Memory Density' + } + ] + nativeRow.onRowSettingChangeHandler = (value) => { + nativeRow.childrenList.forEach((row) => (row.drawType = parseInt(value[0]))); this.trace.favoriteRowsEL?.querySelectorAll>(`trace-row[row-type='heap']`).forEach((it) => { - it.drawType = type; + it.drawType = parseInt(value[0]); }); this.trace.refreshCanvas(false); - }; + } nativeRow.supplier = () => new Promise>((resolve) => resolve([])); nativeRow.onThreadHandler = (useCache) => { nativeRow.canvasSave(this.trace.canvasPanelCtx!); diff --git a/ide/src/trace/component/chart/SpProcessChart.ts b/ide/src/trace/component/chart/SpProcessChart.ts index dd34ad4ecd1050c58ccdb3be7027753c1c1f00df..713f6ee7d23acd36cd018834d2e352838ef055e1 100644 --- a/ide/src/trace/component/chart/SpProcessChart.ts +++ b/ide/src/trace/component/chart/SpProcessChart.ts @@ -45,7 +45,7 @@ import { ProcessRender, ProcessStruct } from '../../database/ui-worker/Procedure import { ThreadRender, ThreadStruct } from '../../database/ui-worker/ProcedureWorkerThread.js'; import { FuncRender, FuncStruct } from '../../database/ui-worker/ProcedureWorkerFunc.js'; import { MemRender, ProcessMemStruct } from '../../database/ui-worker/ProcedureWorkerMem.js'; -import { FolderSupplier, FolderThreadHandler } from './SpChartManager.js'; +import {FolderSupplier, FolderThreadHandler, SpChartManager} from './SpChartManager.js'; import { JankRender, JankStruct } from '../../database/ui-worker/ProcedureWorkerJank.js'; import { ns2xByTimeShaft } from '../../database/ui-worker/ProcedureWorkerCommon.js'; import { AppStartupRender, AppStartupStruct } from '../../database/ui-worker/ProcedureWorkerAppStartup.js'; @@ -157,7 +157,6 @@ export class SpProcessChart { }; async init(): Promise { - let threadFuncMaxDepthArray = await getMaxDepthByTid(); info('Gets the maximum tier per thread , tid and maxDepth'); threadFuncMaxDepthArray.forEach((it) => { @@ -177,11 +176,7 @@ export class SpProcessChart { this.processAsyncEvent = await getAsyncEvents(); info('The amount of initialized process Event data is : ', this.processAsyncEvent!.length); this.processMem = await queryProcessMem(); - let startupConfig = FlagsConfig.getFlagsConfig('AppStartup'); - let loadAppStartup: boolean = false; - if (startupConfig && startupConfig.AppStartup) { - loadAppStartup = startupConfig.AppStartup === 'Enabled'; - } + let loadAppStartup: boolean = FlagsConfig.getFlagsConfigEnableStatus('AppStartup'); if (loadAppStartup) { this.startupProcessArr = await queryStartupPidArray(); this.processSoMaxDepth = await queryProcessSoMaxDepth(); @@ -239,6 +234,9 @@ export class SpProcessChart { processRow.rowParentId = ''; processRow.style.height = '40px'; processRow.folder = true; + if (SpChartManager.APP_STARTUP_PID_ARR.find(pid => pid === it.pid) !== undefined || it.processName === 'render_service') { + processRow.addTemplateTypes('AppStartup'); + } processRow.name = `${ it.processName || 'Process' } ${ it.pid }`; processRow.supplier = (): Promise> => queryProcessData(it.pid || -1, 0, TraceRow.range?.totalNS || 0); processRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; diff --git a/ide/src/trace/component/chart/SpVmTrackerChart.ts b/ide/src/trace/component/chart/SpVmTrackerChart.ts new file mode 100644 index 0000000000000000000000000000000000000000..f90a57f28fec6d9abe0cb6db5060ac2598a162d9 --- /dev/null +++ b/ide/src/trace/component/chart/SpVmTrackerChart.ts @@ -0,0 +1,442 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { SpSystemTrace } from '../SpSystemTrace.js'; +import { + queryDmaSampsData, + queryGpuMemoryData, + querySmapsData, + querySmapsExits, + queryVmTrackerShmData, + queryPurgeableProcessData, + queryGpuGLData, + queryGpuTotalData, + queryGpuTotalType, + queryGpuWindowData, + queryGpuWindowType, +} from '../../database/SqlLite.js'; +import { TraceRow } from '../trace/base/TraceRow.js'; +import { BaseStruct } from '../../bean/BaseStruct.js'; +import { renders } from '../../database/ui-worker/ProcedureWorker.js'; +import { Utils } from '../trace/base/Utils.js'; +import { EmptyRender } from '../../database/ui-worker/ProcedureWorkerCPU.js'; +import { info } from '../../../log/Log.js'; +import { SnapshotRender, SnapshotStruct } from '../../database/ui-worker/ProcedureWorkerSnapshot.js'; +import { TreeItemData } from '../../../base-ui/tree/LitTree.js'; +import { MemoryConfig } from '../../bean/MemoryConfig.js'; + +export class VmTrackerChart { + private trace: SpSystemTrace; + private rowFolder!: TraceRow; + private sMapsFolder!: TraceRow; + private gpuFolder!: TraceRow; + private memoryConfig: MemoryConfig = MemoryConfig.getInstance(); + static gpuTotalModule: number | null = null; //ns + static gpuWindow: number | null = null; //ns + static gpuWindowModule: number | null = null; //ns + constructor(trace: SpSystemTrace) { + this.trace = trace; + } + + async init(): Promise { + const result = await querySmapsExits(); + if (result.length <= 0) { + return; + } + await this.initVmTrackerFolder(); + await this.initSMapsFolder(); + const rowNameList: Array = ['Dirty', 'Swapped', 'RSS', 'PSS', 'USS']; + for (const rowName of rowNameList) { + await this.initSmapsRows(rowName); + } + await this.initShmRows(); + await this.initPurgeableVM(); + await this.initDmaRow(); + const gpuMemoryData = await queryGpuMemoryData(this.memoryConfig.iPid); + const glArr = await queryGpuGLData(MemoryConfig.getInstance().iPid).then((res) => { + res.forEach((gl, index) => { + (gl as any).name = `SnapShot ${index}`; + }); + return res as SnapshotStruct[]; + }); + if (gpuMemoryData.length > 0 || glArr.length > 0) { + await this.initGpuFolder(); + if (gpuMemoryData.length > 0) { + await this.initGpuMemoryRow(gpuMemoryData); + } + await this.addGpuGLRow(glArr); + if (glArr.length > 0) { + await this.addGpuTotalRow(); + await this.addGpuWindowRow(); + } + } + } + + private initVmTrackerFolder = async (): Promise => { + let VmTrackerRow = TraceRow.skeleton(); + VmTrackerRow.rowId = 'VmTrackerRow'; + VmTrackerRow.rowType = TraceRow.ROW_TYPE_VM_TRACKER; + VmTrackerRow.rowParentId = ''; + VmTrackerRow.style.height = '40px'; + VmTrackerRow.index = 0; + VmTrackerRow.folder = true; + VmTrackerRow.name = `VM Tracker (${this.memoryConfig.processName} ${this.memoryConfig.pid})`; + VmTrackerRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + VmTrackerRow.selectChangeHandler = this.trace.selectChangeHandler; + VmTrackerRow.supplier = (): Promise> => + new Promise>((resolve) => resolve([])); + VmTrackerRow.onThreadHandler = (useCache): void => { + VmTrackerRow.canvasSave(this.trace.canvasPanelCtx!); + if (VmTrackerRow.expansion) { + this.trace.canvasPanelCtx?.clearRect(0, 0, VmTrackerRow.frame.width, VmTrackerRow.frame.height); + } else { + (renders.empty as EmptyRender).renderMainThread( + { + context: this.trace.canvasPanelCtx, + useCache: useCache, + type: '', + }, + VmTrackerRow + ); + } + VmTrackerRow.canvasRestore(this.trace.canvasPanelCtx!); + }; + this.rowFolder = VmTrackerRow; + this.trace.rowsEL?.appendChild(VmTrackerRow); + }; + + private initSMapsFolder = async (): Promise => { + let sMapsRow = TraceRow.skeleton(); + sMapsRow.rowId = 'smapsRow'; + sMapsRow.rowParentId = 'VmTrackerRow'; + sMapsRow.rowHidden = !this.rowFolder.expansion; + sMapsRow.rowType = TraceRow.ROW_TYPE_VM_TRACKER_SMAPS; + sMapsRow.folder = true; + sMapsRow.name = 'Smaps'; + sMapsRow.folderPaddingLeft = 20; + sMapsRow.style.height = '40px'; + sMapsRow.style.width = '100%'; + sMapsRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + sMapsRow.selectChangeHandler = this.trace.selectChangeHandler; + sMapsRow.supplier = (): Promise> => + new Promise>((resolve) => resolve([])); + sMapsRow.onThreadHandler = (useCache): void => { + sMapsRow.canvasSave(this.trace.canvasPanelCtx!); + if (sMapsRow.expansion) { + this.trace.canvasPanelCtx?.clearRect(0, 0, sMapsRow.frame.width, sMapsRow.frame.height); + } else { + (renders.empty as EmptyRender).renderMainThread( + { + context: this.trace.canvasPanelCtx, + useCache: useCache, + type: '', + }, + sMapsRow + ); + } + sMapsRow.canvasRestore(this.trace.canvasPanelCtx!); + }; + this.sMapsFolder = sMapsRow; + this.rowFolder?.addChildTraceRow(sMapsRow); + }; + + private initGpuFolder = async (): Promise> => { + let gpuTraceRow = TraceRow.skeleton(); + gpuTraceRow.rowId = 'skiaGpuTraceRow'; + gpuTraceRow.rowType = TraceRow.ROW_TYPE_SYS_MEMORY_GPU; + gpuTraceRow.rowParentId = 'VmTrackerRow'; + gpuTraceRow.style.height = '40px'; + gpuTraceRow.folder = true; + gpuTraceRow.folderPaddingLeft = 20; + gpuTraceRow.rowHidden = !this.rowFolder.expansion; + gpuTraceRow.name = 'GPU'; + gpuTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + gpuTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + gpuTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve([])); + gpuTraceRow.onThreadHandler = (useCache): void => { + gpuTraceRow.canvasSave(this.trace.canvasPanelCtx!); + if (gpuTraceRow.expansion) { + this.trace.canvasPanelCtx?.clearRect(0, 0, gpuTraceRow.frame.width, gpuTraceRow.frame.height); + } else { + (renders.empty as EmptyRender).renderMainThread( + { + context: this.trace.canvasPanelCtx, + useCache: useCache, + type: '', + }, + gpuTraceRow + ); + } + gpuTraceRow.canvasRestore(this.trace.canvasPanelCtx!); + }; + this.gpuFolder = gpuTraceRow; + this.rowFolder.addChildTraceRow(gpuTraceRow); + return gpuTraceRow; + }; + + private getSmapsKeyName(rowName: string): string { + let columnName = rowName.toLowerCase(); + let keyName = ''; + switch (rowName) { + case 'USS': + keyName = 'private_clean + private_dirty'; + break; + case 'RSS': + keyName = 'resident_size'; + break; + default: + keyName = columnName; + } + return keyName; + } + + private initSmapsRows = async (rowName: string): Promise => { + let sMapsTraceRow = this.initTraceRow(rowName, TraceRow.ROW_TYPE_VM_TRACKER_SMAPS, 'smapsRow'); + sMapsTraceRow.rowHidden = !this.sMapsFolder.expansion; + sMapsTraceRow.folderTextLeft = 40; + let sMapsData = await querySmapsData(this.getSmapsKeyName(rowName)); + for (let i = 0; i < sMapsData.length; i++) { + sMapsData[i].name = `Snapshot${i}`; + } + sMapsTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve(sMapsData)); + this.sMapsFolder.addChildTraceRow(sMapsTraceRow); + }; + + private initShmRows = async (): Promise => { + let shmTraceRow = this.initTraceRow('SHM', TraceRow.ROW_TYPE_VMTRACKER_SHM, 'VmTrackerRow'); + let shmData = await queryVmTrackerShmData(this.memoryConfig.iPid); + for (let i = 0; i < shmData.length; i++) { + shmData[i].name = `Snapshot${i}`; + } + shmTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve(shmData)); + if (shmData.length > 0) { + this.rowFolder.addChildTraceRow(shmTraceRow); + } + }; + + private async initPurgeableTotal(): Promise { + let purgeableTotalData = await queryPurgeableProcessData(this.memoryConfig.iPid); + if (purgeableTotalData.length > 0) { + for (let i = 0; i < purgeableTotalData.length; i++) { + purgeableTotalData[i].name = `Snapshot${i}`; + } + let totalTraceRow = this.initTraceRow('Purgeable Total', TraceRow.ROW_TYPE_PURGEABLE_TOTAL_VM, 'VmTrackerRow'); + totalTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve(purgeableTotalData)); + this.rowFolder.addChildTraceRow(totalTraceRow); + } + } + + private async initPurgeablePin(): Promise { + let purgeablePinData = await queryPurgeableProcessData(this.memoryConfig.iPid, true); + if (purgeablePinData.length > 0) { + for (let i = 0; i < purgeablePinData.length; i++) { + purgeablePinData[i].name = `Snapshot${i}`; + } + let pinTraceRow = this.initTraceRow('Purgeable Pin', TraceRow.ROW_TYPE_PURGEABLE_PIN_VM, 'VmTrackerRow'); + pinTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve(purgeablePinData)); + this.rowFolder.addChildTraceRow(pinTraceRow); + } + } + + private initPurgeableVM = async (): Promise => { + let time = new Date().getTime(); + await this.initPurgeableTotal(); + await this.initPurgeablePin(); + let durTime = new Date().getTime() - time; + info('The time to load the VM Purgeable is: ', durTime); + }; + + private initDmaRow = async (): Promise => { + let dmaData = await queryDmaSampsData(this.memoryConfig.iPid); + if (dmaData.length > 0) { + for (let i = 0; i < dmaData.length; i++) { + dmaData[i].name = `Snapshot${i}`; + } + let dmaTraceRow = this.initTraceRow('DMA', TraceRow.ROW_TYPE_DMA_VMTRACKER, 'VmTrackerRow'); + dmaTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve(dmaData)); + this.rowFolder.addChildTraceRow(dmaTraceRow); + } + }; + + private initGpuMemoryRow = async (gpuMemoryData: Array): Promise => { + for (let i = 0; i < gpuMemoryData.length; i++) { + gpuMemoryData[i].name = `Snapshot${i}`; + } + let gpuMemoryTraceRow = this.initTraceRow( + 'Skia Gpu Memory', + TraceRow.ROW_TYPE_GPU_MEMORY_VMTRACKER, + 'skiaGpuTraceRow' + ); + gpuMemoryTraceRow.rowHidden = !this.gpuFolder.expansion; + gpuMemoryTraceRow.folderTextLeft = 40; + gpuMemoryTraceRow.supplier = (): Promise> => + new Promise>((resolve) => resolve(gpuMemoryData)); + this.gpuFolder.addChildTraceRow(gpuMemoryTraceRow); + }; + + private async addGpuGLRow(glArr: Array): Promise { + if (glArr.length > 0) { + let glRow = this.initTraceRow('GL', TraceRow.ROW_TYPE_SYS_MEMORY_GPU_GL, this.gpuFolder.rowId!); + glRow.addTemplateTypes('sys-memory'); + glRow.folderTextLeft = 40; + glRow.supplier = () => new Promise((resolve) => resolve(glArr)); + this.gpuFolder.addChildTraceRow(glRow); + } + } + + private async addGpuTotalRow(): Promise { + let types = await queryGpuTotalType(); + let gpuTotalRow = this.initTraceRow( + 'Skia Gpu Dump Total', + TraceRow.ROW_TYPE_SYS_MEMORY_GPU_TOTAL, + this.gpuFolder.rowId! + ); + gpuTotalRow.folderTextLeft = 40; + gpuTotalRow.addTemplateTypes('sys-memory'); + gpuTotalRow.rowSetting = 'enable'; + gpuTotalRow.rowSettingList = [ + { + key: 'total', + title: 'Total', + checked: true, + }, + ...types.map((it) => { + return { + key: `${it.id}`, + title: it.data, + }; + }), + ]; + gpuTotalRow.onRowSettingChangeHandler = (setting) => { + if (setting && setting.length > 0) { + gpuTotalRow.dataListCache = []; + gpuTotalRow.dataList = []; + gpuTotalRow.isComplete = false; + VmTrackerChart.gpuTotalModule = setting[0] === 'total' ? null : parseInt(setting[0]); + this.trace.refreshCanvas(false); + } + }; + gpuTotalRow.supplier = (): Promise> => { + return queryGpuTotalData(VmTrackerChart.gpuTotalModule).then((res) => { + res.forEach((it, index) => { + (it as any).name = `SnapShot ${index}`; + }); + return res as SnapshotStruct[]; + }); + }; + this.gpuFolder.addChildTraceRow(gpuTotalRow); + } + + private async addGpuWindowRow(): Promise { + let types = await queryGpuWindowType(); + let settings: TreeItemData[] = types + .filter((it) => it.pid === null) + .map((it) => { + return { + key: `${it.id}`, + title: it.data, + children: [], + }; + }); + settings.forEach((it) => { + it.children = types + .filter((child) => `${child.pid}` === it.key) + .map((item) => { + return { + key: `${it.key}-${item.id}`, + title: item.data, + }; + }); + }); + settings[0].checked = true; + VmTrackerChart.gpuWindow = parseInt(settings[0].key); + VmTrackerChart.gpuWindowModule = null; + let gpuWindowRow = this.initTraceRow( + 'Skia Gpu Dump Window', + TraceRow.ROW_TYPE_SYS_MEMORY_GPU_WINDOW, + this.gpuFolder.rowId! + ); + gpuWindowRow.folderTextLeft = 40; + gpuWindowRow.rowSetting = 'enable'; + gpuWindowRow.rowSettingList = settings; + gpuWindowRow.addTemplateTypes('sys-memory'); + gpuWindowRow.onRowSettingChangeHandler = (setting) => { + if (setting && setting.length > 0) { + let split = setting[0].split('-'); + VmTrackerChart.gpuWindow = parseInt(split[0]); + VmTrackerChart.gpuWindowModule = split.length > 1 ? parseInt(split[1]) : null; + gpuWindowRow.dataListCache = []; + gpuWindowRow.dataList = []; + gpuWindowRow.isComplete = false; + this.trace.refreshCanvas(false); + } + }; + gpuWindowRow.supplier = () => { + return queryGpuWindowData(VmTrackerChart.gpuWindow!, VmTrackerChart.gpuWindowModule).then((res) => { + res.forEach((window, index) => { + (window as any).name = `SnapShot ${index}`; + }); + return res as SnapshotStruct[]; + }); + }; + this.gpuFolder.addChildTraceRow(gpuWindowRow); + } + + private initTraceRow(rowName: string, type: string, rowParentId: string): TraceRow { + let vmTrackerTraceRow = TraceRow.skeleton(); + vmTrackerTraceRow.rowParentId = rowParentId; + vmTrackerTraceRow.rowId = rowName; + vmTrackerTraceRow.rowType = type; + vmTrackerTraceRow.folderTextLeft = 20; + vmTrackerTraceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler; + vmTrackerTraceRow.selectChangeHandler = this.trace.selectChangeHandler; + vmTrackerTraceRow.style.height = '40px'; + vmTrackerTraceRow.style.width = '100%'; + vmTrackerTraceRow.setAttribute('children', ''); + vmTrackerTraceRow.name = rowName; + vmTrackerTraceRow.focusHandler = (): void => { + this.showTip(vmTrackerTraceRow); + }; + vmTrackerTraceRow.onThreadHandler = (useCache): void => { + let context = vmTrackerTraceRow.collect ? this.trace.canvasFavoritePanelCtx! : this.trace.canvasPanelCtx!; + vmTrackerTraceRow.canvasSave(context); + (renders.snapshot as SnapshotRender).renderMainThread( + { + context: context, + useCache: useCache, + type: 'snapshot', + }, + vmTrackerTraceRow + ); + vmTrackerTraceRow.canvasRestore(context); + }; + return vmTrackerTraceRow; + } + + private showTip(traceRow: TraceRow): void { + this.trace?.displayTip( + traceRow, + SnapshotStruct.hoverSnapshotStruct, + `Name: ${SnapshotStruct.hoverSnapshotStruct?.name || ''} + Size: ${Utils.getBinaryByteWithUnit(SnapshotStruct.hoverSnapshotStruct?.value || 0)}` + ); + } +} diff --git a/ide/src/trace/component/metrics/CpuStrategy.ts b/ide/src/trace/component/metrics/CpuStrategy.ts index 21b43b82711e3ceec9ce039ef31f403171a1b6b5..b0d19da3ac4ec5c8819ec19d24cbb6ad7e377a3f 100644 --- a/ide/src/trace/component/metrics/CpuStrategy.ts +++ b/ide/src/trace/component/metrics/CpuStrategy.ts @@ -25,8 +25,9 @@ export const initCpuStrategyData = (metricData: Array<{ avg_frequency: string; }>): ProcessInfoListItem => { info('Cpu Strategy data length is:', metricData.length); + let metricNumber = 10; let processInfoListItems: Array = []; - if (metricData.length === 10) { + if (metricData.length === metricNumber) { } else { } const splitChar: string = ','; diff --git a/ide/src/trace/component/metrics/DistributeTermStrategy.ts b/ide/src/trace/component/metrics/DistributeTermStrategy.ts index 93a5d65f827d92b33fd4f87bfd1ac2e4040b38b6..456f51749305d6ac84a1db5261fee9a846290337 100644 --- a/ide/src/trace/component/metrics/DistributeTermStrategy.ts +++ b/ide/src/trace/component/metrics/DistributeTermStrategy.ts @@ -37,10 +37,8 @@ export const initDistributedTermData = (metricData: Array<{ let threadNamesList = metricData[sqlIndex].threadName.split(splitChar); let processIdList = metricData[sqlIndex].processId.split(splitChar); let processNameList = - metricData[sqlIndex].processName === null - ? threadIdsList.length + '' - : metricData[sqlIndex].processName.split(splitChar); - + metricData[sqlIndex].processName === null ? + `${threadIdsList.length }` : metricData[sqlIndex].processName.split(splitChar); let funNameList = metricData[sqlIndex].funName.split(splitChar); let timeList = metricData[sqlIndex].ts.split(splitChar); let durList = metricData[sqlIndex].dur.split(splitChar); @@ -50,20 +48,22 @@ export const initDistributedTermData = (metricData: Array<{ let chainIdList = metricData[sqlIndex].chainId; let spanIdList = metricData[sqlIndex].spanId; let parentSpanIdList = metricData[sqlIndex].parentSpanId; - let distributedTermListItem: DistributedTermItem = {}; for (let index = 0; index < flagList.length; index++) { let across: boolean = true; let receiverTime: number = 0; let senderTime: number = 0; let delay: number = 0; - if (flag.indexOf('S,C') > -1 || flag.indexOf('C,S') > -1) { + if (flag.indexOf('S,C') >= 0 || flag.indexOf('C,S') >= 0) { across = false; - if (flagList[index] === 'S') receiverTime = Number(timeList[index]); - if (flagList[index] === 'C') senderTime = Number(timeList[index]); + if (flagList[index] === 'S') { + receiverTime = Number(timeList[index]); + } + if (flagList[index] === 'C') { + senderTime = Number(timeList[index]); + } delay = receiverTime - senderTime; } - let type = { acrossTheDevice: across, traceName: traceNameList, diff --git a/ide/src/trace/component/metrics/MemAggStrategy.ts b/ide/src/trace/component/metrics/MemAggStrategy.ts index a65624fee3d1b5d7c6fbb75f5df829eebebd3893..2f96c1abc005a65b57f4eb3af8ded2184ebe4e69 100644 --- a/ide/src/trace/component/metrics/MemAggStrategy.ts +++ b/ide/src/trace/component/metrics/MemAggStrategy.ts @@ -29,12 +29,12 @@ export const initMemoryAggStrategy = (metricData: Array<{ let processInfoSource: ProcessValuesItem = { processName: processNames, }; - if (metricData[sqlIndex].name == null) { + if (metricData[sqlIndex].name === null) { let values = metricData[sqlIndex].value.split(splitChar); - let times = metricData[sqlIndex].ts.split(splitChar); - let oomScoreValue = 0; for (let index = 0; index < values.length; index++) { - if (!processInfoSource) continue; + if (!processInfoSource) { + continue; + } processValuesListItems?.push(processInfoSource); } } else { @@ -54,7 +54,9 @@ export const initMemoryAggStrategy = (metricData: Array<{ oom_score: oomScoreValue, value: values[index], }; - if (!processInfoSource) continue; + if (!processInfoSource) { + continue; + } if ('mem.rss.anon' === names[index]) { processInfoSource.anonRss = typeItem; } diff --git a/ide/src/trace/component/metrics/MetaDataStrategy.ts b/ide/src/trace/component/metrics/MetaDataStrategy.ts index 49b4c3f34140018376604b713ce924d8549fa4cd..3f2fb1779d178204c8228a664fd95499cf63f36a 100644 --- a/ide/src/trace/component/metrics/MetaDataStrategy.ts +++ b/ide/src/trace/component/metrics/MetaDataStrategy.ts @@ -21,17 +21,17 @@ export const initMetaDataStrategy = (metricData: Array<{ }>): TraceMetadata => { info('Meta Strategy data length is:', metricData.length); let traceMetaDataList: Array = []; - let statDataArray = []; - let jsonText = `{`; + let jsonText = '{'; for (let index = 0; index < metricData.length; index++) { let name = metricData[index].name; let value = metricData[index].valueText; if (!value.match('^-?\\d+$')) { - value = '"' + value.replace('\r|\n', '') + '"'; + value = `"${ value.replace('\r|\n', '') }"`; } - jsonText += `'` + name + `'` + `: ` + `'` + value.toString() + `'` + `,`; - if (index >= metricData.length - 1) { - jsonText += `}`; + jsonText += `'${ name }'` + ': ' + `'${ value.toString() }'` + ','; + let indexNumber = 1; + if (index >= metricData.length - indexNumber) { + jsonText += '}'; } } @@ -39,7 +39,7 @@ export const initMetaDataStrategy = (metricData: Array<{ let name = metricData[sqlIndex].name; let value = metricData[sqlIndex].valueText; if (!value.match('^-?\\d+$')) { - value = '"' + value.replace('\r|\n', '') + '"'; + value = `"${ value.replace('\r|\n', '') }"`; } let traceMetaData = { name: name, diff --git a/ide/src/trace/component/metrics/TraceTaskStrategy.ts b/ide/src/trace/component/metrics/TraceTaskStrategy.ts index 7d9c8e3af6ac34c18be1ed2851a5857f4f3a45a4..f564c5ecebb147d778939ce08b52e6aa6160fb7e 100644 --- a/ide/src/trace/component/metrics/TraceTaskStrategy.ts +++ b/ide/src/trace/component/metrics/TraceTaskStrategy.ts @@ -29,7 +29,7 @@ export const initTraceTaskStrategy = (metricData: Array<{ let threadNameList = metricData[sqlIndex].thread_name; let threadNames = []; let newArr = ''; - if (threadNameList != null) { + if (threadNameList !== null) { threadNames = threadNameList.split(','); newArr = threadNames.reduce((prev: any, item: any) => (prev.includes(item) ? prev : prev.concat(item)), []); } diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts index 97c511bbbf8be2f4f202d3828a453898aed5d087..a053ee41aa10fd85bf3121c0069e2c37e7c1f6c5 100644 --- a/ide/src/trace/component/setting/SpAllocations.ts +++ b/ide/src/trace/component/setting/SpAllocations.ts @@ -38,6 +38,7 @@ export class SpAllocations extends BaseElement { private recordAccurately: LitSwitch | null | undefined; private offlineSymbol: LitSwitch | null | undefined; + private startupMode: LitSwitch | null | undefined; private recordStatisticsResult: HTMLDivElement | null | undefined; get appProcess(): string { @@ -107,6 +108,14 @@ export class SpAllocations extends BaseElement { return 3600; } + get startup_mode(): boolean { + let value = this.startupMode?.checked; + if (value != undefined) { + return value; + } + return false; + } + initElements(): void { this.processId = this.shadowRoot?.getElementById('pid') as LitAllocationSelect; let input = this.processId.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; @@ -138,6 +147,7 @@ export class SpAllocations extends BaseElement { this.fpUnWind = this.shadowRoot?.getElementById('use_fp_unwind') as LitSwitch; this.recordAccurately = this.shadowRoot?.getElementById('use_record_accurately') as LitSwitch; this.offlineSymbol = this.shadowRoot?.getElementById('use_offline_symbolization') as LitSwitch; + this.startupMode = this.shadowRoot?.getElementById('use_startup_mode') as LitSwitch; let stepValue = [0, 1, 10, 30, 60, 300, 600, 1800, 3600]; let statisticsSlider = this.shadowRoot?.querySelector('#interval-slider') as LitSlider; @@ -441,9 +451,12 @@ export class SpAllocations extends BaseElement {
    Use Offline Symbolization (Available on recent OpenHarmony 4.0) - +
    - +
    + Use Startup Mode (Available on recent OpenHarmony 4.0) + +
    Use Record Statistics (Available on recent OpenHarmony 4.0) diff --git a/ide/src/trace/component/setting/SpFileSystem.ts b/ide/src/trace/component/setting/SpFileSystem.ts index ebdebb8e599da57e4cf6714e5eead08b97a362bc..32657d046bd148d2308d06d2f55d66ab0af6192a 100644 --- a/ide/src/trace/component/setting/SpFileSystem.ts +++ b/ide/src/trace/component/setting/SpFileSystem.ts @@ -240,18 +240,12 @@ export class SpFileSystem extends BaseElement { }); this.selectProcess = this.processInput!.shadowRoot?.querySelector('input') as HTMLInputElement; this.selectProcess!.addEventListener('mousedown', (ev) => { - if (SpRecordTrace.serialNumber == '') { + if (SpRecordTrace.serialNumber === '') { this.processInput!.dataSource([], ''); - } - }); - - this.selectProcess!.addEventListener('mouseup', () => { - if (SpRecordTrace.serialNumber == '') { - this.processInput?.dataSource([], 'ALL-Process'); } else { Cmd.getProcess().then((processList) => { if (processList.length > 0 && this.startRecord) { - this.processInput!.setAttribute('readonly', 'readonly'); + this.selectProcess!.setAttribute('readonly', 'readonly'); } this.processInput?.dataSource(processList, 'ALL-Process'); }); diff --git a/ide/src/trace/component/setting/SpProbesConfig.ts b/ide/src/trace/component/setting/SpProbesConfig.ts index 20980849e2c0d2a960889d49198c4ca80e754aa5..9681839cca5a1f994794a0843cc23f0027884870 100644 --- a/ide/src/trace/component/setting/SpProbesConfig.ts +++ b/ide/src/trace/component/setting/SpProbesConfig.ts @@ -181,34 +181,43 @@ export class SpProbesConfig extends BaseElement { { value: 'app', isSelect: true }, { value: 'ark', isSelect: true }, { value: 'binder', isSelect: true }, + { value: 'bluetooth', isSelect: false }, + { value: 'cloud', isSelect: false }, { value: 'commonlibrary', isSelect: false }, { value: 'daudio', isSelect: false }, { value: 'dcamera', isSelect: false }, + { value: 'deviceauth', isSelect: false }, { value: 'devicemanager', isSelect: false }, { value: 'deviceprofile', isSelect: false }, { value: 'dhfwk', isSelect: false }, { value: 'dinput', isSelect: false }, { value: 'disk', isSelect: true }, + { value: 'distributeddatamgr', isSelect: false }, { value: 'dlpcre', isSelect: false }, { value: 'dsched', isSelect: false }, { value: 'dscreen', isSelect: false }, { value: 'dslm', isSelect: false }, { value: 'dsoftbus', isSelect: false }, + { value: 'ffrt', isSelect: false }, { value: 'filemanagement', isSelect: false }, { value: 'freq', isSelect: true }, { value: 'graphic', isSelect: true }, { value: 'gresource', isSelect: false }, + { value: 'hdcd', isSelect: false }, + { value: 'hdf', isSelect: false }, { value: 'huks', isSelect: false }, { value: 'i2c', isSelect: false }, { value: 'idle', isSelect: true }, + { value: 'interconn', isSelect: false }, { value: 'irq', isSelect: true }, - { value: 'load', isSelect: false }, { value: 'mdfs', isSelect: false }, + { value: 'memory', isSelect: false }, { value: 'memreclaim', isSelect: true }, { value: 'misc', isSelect: false }, { value: 'mmc', isSelect: true }, { value: 'msdp', isSelect: false }, { value: 'multimodalinput', isSelect: true }, + { value: 'musl', isSelect: false }, { value: 'net', isSelect: false }, { value: 'notification', isSelect: false }, { value: 'nweb', isSelect: false }, @@ -221,7 +230,7 @@ export class SpProbesConfig extends BaseElement { { value: 'sched', isSelect: true }, { value: 'sensors', isSelect: false }, { value: 'sync', isSelect: true }, - { value: 'ufs', isSelect: false }, + { value: 'usb', isSelect: false }, { value: 'useriam', isSelect: false }, { value: 'window', isSelect: true }, { value: 'workq', isSelect: true }, diff --git a/ide/src/trace/component/setting/SpRecordPerf.ts b/ide/src/trace/component/setting/SpRecordPerf.ts index ae0b9893424bf72b1403a86852eefc4a84ba535f..438a5707acea59729bcd8f137bb49dde9ff694c6 100644 --- a/ide/src/trace/component/setting/SpRecordPerf.ts +++ b/ide/src/trace/component/setting/SpRecordPerf.ts @@ -299,13 +299,8 @@ export class SpRecordPerf extends BaseElement { this.recordProcessInput = this.processSelect?.shadowRoot?.querySelector('input'); let querySelector = this.processSelect!.shadowRoot?.querySelector('input') as HTMLInputElement; querySelector.addEventListener('mousedown', (ev) => { - if (SpRecordTrace.serialNumber == '') { + if (SpRecordTrace.serialNumber === '') { this.processSelect!.dataSource([], 'ALL-Process'); - } - }); - querySelector!.addEventListener('mouseup', () => { - if (SpRecordTrace.serialNumber == '') { - this.processSelect?.dataSource([], 'ALL-Process'); } else { if (sp.search) { sp.search = false; diff --git a/ide/src/trace/component/setting/SpRecordTemplate.ts b/ide/src/trace/component/setting/SpRecordTemplate.ts index 0ee2ec7ec02e9fe9de06ff67b07c9797f2379713..448b4a344f4e9ce9baa8de018216dbfc0411e927 100644 --- a/ide/src/trace/component/setting/SpRecordTemplate.ts +++ b/ide/src/trace/component/setting/SpRecordTemplate.ts @@ -113,6 +113,9 @@ export class SpRecordTemplate extends BaseElement { hitraceCategories.push(categories); } }); + if (this.appStartup?.checked){ + hitraceCategories.push('musl'); + } SpRecordTemplate.FRAME_TIMELINE_EVENTS.forEach((ev) => { if (traceEventSet.indexOf(ev) == -1) { traceEventSet.push(ev); @@ -226,7 +229,7 @@ export class SpRecordTemplate extends BaseElement {
    - Dynamic effect + Animation effect
    diff --git a/ide/src/trace/component/setting/SpVmTracker.ts b/ide/src/trace/component/setting/SpVmTracker.ts index d2a8c3deff10f588dbf4f3dafaa937f6be96cafc..d7977151f86a5d0d2a0a5deda8266a44d1e5d5ab 100644 --- a/ide/src/trace/component/setting/SpVmTracker.ts +++ b/ide/src/trace/component/setting/SpVmTracker.ts @@ -21,13 +21,10 @@ import '../../../base-ui/switch/lit-switch.js'; import { LitAllocationSelect } from '../../../base-ui/select/LitAllocationSelect.js'; import { SpRecordTrace } from '../SpRecordTrace.js'; import { Cmd } from '../../../command/Cmd.js'; -import { CmdConstant } from '../../../command/CmdConstant.js'; -import { HdcDeviceManager } from '../../../hdc/HdcDeviceManager.js'; @element('sp-vm-tracker') export class SpVmTracker extends BaseElement { private vmTrackerProcessInput: LitAllocationSelect | undefined | null; - private vmTrackerSelectProcess: HTMLInputElement | undefined | null; private configList: Array = []; set startSamp(start: boolean) { @@ -115,7 +112,6 @@ export class SpVmTracker extends BaseElement { "lit-allocation-select[title='Process']" ); let vmTrackerMul = this.vmTrackerProcessInput?.shadowRoot?.querySelector('.multipleSelect') as HTMLDivElement; - this.vmTrackerSelectProcess = this.vmTrackerProcessInput!.shadowRoot?.querySelector('input') as HTMLInputElement; vmTrackerMul!.addEventListener('mousedown', (ev) => { if (SpRecordTrace.serialNumber == '') { this.vmTrackerProcessInput!.processData = []; diff --git a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts index 5a94bad03405f41499cf14e8ac54fcf05e9b0e01..802edd3da6447e62d933e3523d33188ee401f04f 100644 --- a/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts +++ b/ide/src/trace/component/setting/bean/ProfilerServiceTypes.ts @@ -115,6 +115,14 @@ export interface MemoryConfig { pid: number[]; /** set true to report smaps meminfo from /proc/${pid}/smaps */ reportSmapsMemInfo?: boolean; + /** set true to report ashmem meminfo from /proc/purgeable_ashmem_trigger*/ + reportPurgeableAshmemInfo?: boolean; + /** set true to report DMA meminfo from /proc/process_dmabuf_info. */ + reportDmaMemInfo?: boolean; + /** set true to report gpu meminfo from /proc/gpu_memory. */ + reportGpuMemInfo?: boolean; + /** set true to report gpu info from hidumper. */ + reportGpuDumpInfo?: boolean; } export function sysVMeminfoTypeFromJSON(object: any): SysVMeminfoType { @@ -859,6 +867,7 @@ export interface NativeHookConfig { recordAccurately?: boolean; offlineSymbolization?: boolean; callframeCompress?: boolean; + startupMode?: boolean; statisticsInterval?: number; } diff --git a/ide/src/trace/component/trace/TimerShaftElement.ts b/ide/src/trace/component/trace/TimerShaftElement.ts index a827948659f99c6b19a8276005f8627af3864d43..9262d845d122ad05a39e19e493512a6a1e5e0321 100644 --- a/ide/src/trace/component/trace/TimerShaftElement.ts +++ b/ide/src/trace/component/trace/TimerShaftElement.ts @@ -27,7 +27,7 @@ import { LitTabs } from '../../../base-ui/tabs/lit-tabs.js'; import { LitTabpane } from '../../../base-ui/tabs/lit-tabpane.js'; import { TabPaneCurrent } from './sheet/TabPaneCurrent.js'; import { SelectionParam } from '../../bean/BoxSelection.js'; -import { SpSystemTrace } from '../SpSystemTrace.js'; +import { SpSystemTrace, CurrentSlicesTime } from '../SpSystemTrace.js'; //随机生成十六位进制颜色 export function randomRgbColor() { @@ -199,7 +199,7 @@ export class TimerShaftElement extends BaseElement { this.setSlicesMark(); } this.removeTriangle('inverted'); - this.setRangeNS(0,this.endNS); + this.setRangeNS(0, this.endNS); } initElements(): void { @@ -229,7 +229,7 @@ export class TimerShaftElement extends BaseElement { } if (this.timeTotalEL) this.timeTotalEL.textContent = ns2s(this._totalNS); if (this.timeOffsetEL && this.rangeRuler) - this.timeOffsetEL.textContent = ns2UnitS(this._startNS,this.rangeRuler.getScale()); + this.timeOffsetEL.textContent = ns2UnitS(this._startNS, this.rangeRuler.getScale()); const width = this.canvas?.clientWidth || 0; const height = this.canvas?.clientHeight || 0; if (!this.timeRuler) { @@ -247,7 +247,8 @@ export class TimerShaftElement extends BaseElement { }, (slicetime) => { this.rangeClickHandler?.(slicetime); - }); + } + ); } if (!this.rangeRuler) { this.rangeRuler = new RangeRuler( @@ -274,7 +275,7 @@ export class TimerShaftElement extends BaseElement { this._sportRuler.range = a; } if (this.timeOffsetEL && this.rangeRuler) { - this.timeOffsetEL.textContent = ns2UnitS(a.startNS,this.rangeRuler.getScale()); + this.timeOffsetEL.textContent = ns2UnitS(a.startNS, this.rangeRuler.getScale()); } if (this.loadComplete) { this.rangeChangeHandler?.(a); @@ -349,10 +350,10 @@ export class TimerShaftElement extends BaseElement { this.sportRuler?.mouseOut(ev); }; - documentOnKeyPress = (ev: KeyboardEvent) => { + documentOnKeyPress = (ev: KeyboardEvent, currentSlicesTime?: CurrentSlicesTime) => { if ((window as any).isSheetMove) return; if ((window as any).flagInputFocus) return; - this.rangeRuler?.keyPress(ev); + this.rangeRuler?.keyPress(ev, currentSlicesTime); this.sportRuler?.clearHoverFlag(); }; @@ -432,7 +433,11 @@ export class TimerShaftElement extends BaseElement { this._sportRuler?.removeTriangle(type); } - setSlicesMark(startTime: null | number = null, endTime: null | number = null, shiftKey: null | boolean = false): SlicesTime | null | undefined { + setSlicesMark( + startTime: null | number = null, + endTime: null | number = null, + shiftKey: null | boolean = false + ): SlicesTime | null | undefined { let sliceTime = this._sportRuler?.setSlicesMark(startTime, endTime, shiftKey); if (sliceTime && sliceTime != undefined) { this.traceSheetEL?.displayCurrent(sliceTime); // 给当前pane准备数据 @@ -440,10 +445,10 @@ export class TimerShaftElement extends BaseElement { // 取最新创建的那个selection对象 let selection = this.selectionList[this.selectionList.length - 1]; if (selection) { - selection.isCurrentPane = true; // 设置当前面板为可以显示的状态 + selection.isCurrentPane = true; // 设置当前面板为可以显示的状态 //把刚刚创建的slicetime和selection对象关联起来，以便后面再次选中“跑道”的时候显示对应的面板。 this.selectionMap.set(sliceTime.id, selection); - this.traceSheetEL?.rangeSelect(selection); // 显示选中区域对应的面板 + this.traceSheetEL?.rangeSelect(selection); // 显示选中区域对应的面板 } } return sliceTime; diff --git a/ide/src/trace/component/trace/base/RangeSelect.ts b/ide/src/trace/component/trace/base/RangeSelect.ts index 49843d4cff3c52b7cd101c91ad34eba662e18a57..f2ccf3e36a33d39a15b6d941289f8bc4e376f82b 100644 --- a/ide/src/trace/component/trace/base/RangeSelect.ts +++ b/ide/src/trace/component/trace/base/RangeSelect.ts @@ -90,7 +90,8 @@ export class RangeSelect { this.endY = 0; this.endY2 = mouseEventUp.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } else { - this.endY = mouseEventUp.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; + this.endY = + mouseEventUp.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; this.endY2 = mouseEventUp.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } if (this.selectHandler) { @@ -125,7 +126,8 @@ export class RangeSelect { this.endY = 0; this.endY2 = mouseEventOut.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } else { - this.endY = mouseEventOut.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; + this.endY = + mouseEventOut.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; this.endY2 = mouseEventOut.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } if (this.selectHandler && this.isMouseDown) { @@ -232,8 +234,7 @@ export class RangeSelect { rt = new Rect(xMin, Math.min(this.startY2, this.endY2), xMax - xMin, Math.abs(this.startY2 - this.endY2)); } else { bound = it.getBoundingClientRect(); - if (spacerRect.height > 0 && - (bound.y + bound.height) < (spacerRect.y + spacerRect.height)) { + if (spacerRect.height > 0 && bound.y + bound.height < spacerRect.y + spacerRect.height) { it.rangeSelect = false; return false; } diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index ffbb63b773020cc6db8595b0335fe890583d90b3..bb16738090457a9b360f8d01144c74983d185a58 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -18,17 +18,18 @@ import { TimeRange } from '../timer-shaft/RangeRuler.js'; import '../../../../base-ui/icon/LitIcon.js'; import { Rect } from '../timer-shaft/Rect.js'; import { BaseStruct } from '../../../bean/BaseStruct.js'; -import { SpSystemTrace } from '../../SpSystemTrace.js'; import { ns2x } from '../TimerShaftElement.js'; import { TraceRowObject } from './TraceRowObject.js'; import { LitCheckBox } from '../../../../base-ui/checkbox/LitCheckBox.js'; import { LitIcon } from '../../../../base-ui/icon/LitIcon'; import '../../../../base-ui/popover/LitPopoverV.js'; +import '../../../../base-ui/tree/LitTree.js'; import { LitPopover } from '../../../../base-ui/popover/LitPopoverV.js'; import { info } from '../../../../log/Log.js'; import { ColorUtils } from './ColorUtils.js'; import { drawSelectionRange } from '../../../database/ui-worker/ProcedureWorkerCommon.js'; import { TraceRowConfig } from './TraceRowConfig.js'; +import { TreeItemData, LitTree } from '../../../../base-ui/tree/LitTree.js'; export class RangeSelectStruct { startX: number | undefined; @@ -75,6 +76,8 @@ export class TraceRow extends HTMLElement { static ROW_TYPE_MEMORY_ABILITY = 'memory-ability'; static ROW_TYPE_DISK_ABILITY = 'disk-ability'; static ROW_TYPE_NETWORK_ABILITY = 'network-ability'; + static ROW_TYPE_DMA_ABILITY = 'dma-ability'; + static ROW_TYPE_GPU_MEMORY_ABILITY = 'gpu-memory-ability'; static ROW_TYPE_SDK = 'sdk'; static ROW_TYPE_SDK_COUNTER = 'sdk-counter'; static ROW_TYPE_SDK_SLICE = 'sdk-slice'; @@ -83,16 +86,29 @@ export class TraceRow extends HTMLElement { static ROW_TYPE_SYSTEM_ENERGY = 'system-energy'; static ROW_TYPE_POWER_ENERGY = 'power-energy'; static ROW_TYPE_STATE_ENERGY = 'state-energy'; - static ROW_TYPE_SMAPS = 'smaps'; + static ROW_TYPE_SYS_MEMORY_GPU = 'sys-memory-gpu'; + static ROW_TYPE_SYS_MEMORY_GPU_GL = 'sys-memory-gpu-gl'; + static ROW_TYPE_SYS_MEMORY_GPU_TOTAL = 'sys-memory-gpu-total'; + static ROW_TYPE_SYS_MEMORY_GPU_WINDOW = 'sys-memory-gpu-window'; + static ROW_TYPE_VM_TRACKER_SMAPS = 'smaps'; + static ROW_TYPE_VM_TRACKER = 'VmTracker'; + static ROW_TYPE_DMA_VMTRACKER = 'dma-vmTracker'; + static ROW_TYPE_GPU_MEMORY_VMTRACKER = 'gpu-memory-vmTracker'; + static ROW_TYPE_VMTRACKER_SHM = 'VmTracker-shm'; static ROW_TYPE_CLOCK_GROUP = 'clock-group'; static ROW_TYPE_CLOCK = 'clock'; static ROW_TYPE_IRQ_GROUP = 'irq-group'; static ROW_TYPE_IRQ = 'irq'; static ROW_TYPE_JANK = 'janks'; + static ROW_TYPE_FRAME = 'frame'; static ROW_TYPE_FRAME_ANIMATION = 'frame-animation'; static ROW_TYPE_FRAME_DYNAMIC = 'frame-dynamic'; static ROW_TYPE_FRAME_SPACING = 'frame-spacing'; static ROW_TYPE_JS_CPU_PROFILER = 'js-cpu-profiler-cell'; + static ROW_TYPE_PURGEABLE_TOTAL_ABILITY = 'purgeable-total-ability'; + static ROW_TYPE_PURGEABLE_PIN_ABILITY = 'purgeable-pin-ability'; + static ROW_TYPE_PURGEABLE_TOTAL_VM = 'purgeable-total-vm'; + static ROW_TYPE_PURGEABLE_PIN_VM = 'purgeable-pin-vm'; static FRAME_WIDTH: number = 0; static range: TimeRange | undefined | null; static rangeSelectObject: RangeSelectStruct | undefined; @@ -115,7 +131,7 @@ export class TraceRow extends HTMLElement { public checkBoxEL: LitCheckBox | null | undefined; public collectEL: LitIcon | null | undefined; public onThreadHandler: ((useCache: boolean, buf: ArrayBuffer | undefined | null) => void) | undefined | null; - public onDrawTypeChangeHandler: ((type: number) => void) | undefined | null; + public onRowSettingChangeHandler: ((keys: Array, nodes: Array) => void) | undefined | null; public supplier: (() => Promise>) | undefined | null; public favoriteChangeHandler: ((fav: TraceRow) => void) | undefined | null; public selectChangeHandler: ((list: Array>) => void) | undefined | null; @@ -130,6 +146,8 @@ export class TraceRow extends HTMLElement { public templateType: Array = []; private rootEL: HTMLDivElement | null | undefined; private nameEL: HTMLLabelElement | null | undefined; + private rowSettingTree: LitTree | null | undefined; + private rowSettingPop: LitPopover | null | undefined; private _rangeSelect: boolean = false; private _drawType: number = 0; private folderIconEL: LitIcon | null | undefined; @@ -140,6 +158,8 @@ export class TraceRow extends HTMLElement { translateY: number = 0; //single canvas offsetY; childrenList: Array> = []; parentRowEl: TraceRow | undefined; + _rowSettingList: Array | null | undefined; + focusHandler?: (ev: MouseEvent) => void | undefined; constructor( @@ -190,6 +210,9 @@ export class TraceRow extends HTMLElement { 'collect-type', 'disabled-check', 'row-discard', + 'row-setting', + 'row-setting-list', + 'row-setting-popover-direction', ]; } @@ -211,6 +234,31 @@ export class TraceRow extends HTMLElement { } } + set rowSetting(value: string) { + this.setAttribute('row-setting',value); + } + + get rowSetting() { + return this.getAttribute('row-setting') || 'disable'; + } + + set rowSettingPopoverDirection(value: string) { + this.rowSettingPop!.placement = value; + } + + get rowSettingPopoverDirection() { + return this.rowSettingPop?.placement || 'bottomLeft'; + } + + set rowSettingList(value: Array | null | undefined) { + this._rowSettingList = value; + this.rowSettingTree!.treeData = value || []; + } + + get rowSettingList() { + return this._rowSettingList; + } + get collect() { return this.hasAttribute('collect-type'); } @@ -534,6 +582,9 @@ export class TraceRow extends HTMLElement { set folderPaddingLeft(value: number) { this.folderIconEL!.style.marginLeft = value + 'px'; } + set folderTextLeft(value: number) { + this.nameEL!.style.marginLeft = value + 'px'; + } initElements(): void { this.rootEL = this.shadowRoot?.querySelector('.root'); @@ -543,6 +594,8 @@ export class TraceRow extends HTMLElement { this.folderIconEL = this.shadowRoot?.querySelector('.icon'); this.nameEL = this.shadowRoot?.querySelector('.name'); this.canvasContainer = this.shadowRoot?.querySelector('.panel-container'); + this.rowSettingTree = this.shadowRoot?.querySelector('#rowSettingTree'); + this.rowSettingPop = this.shadowRoot?.querySelector('#rowSetting'); this.tipEL = this.shadowRoot?.querySelector('.tip'); let canvasNumber = this.args['canvasNumber']; if (!this.args['skeleton']) { @@ -560,6 +613,11 @@ export class TraceRow extends HTMLElement { this.expansion = !this.expansion; } }); + this.rowSettingTree!.onChange = (e: any) => { + // @ts-ignore + this.rowSettingPop!.visible = false; + this.onRowSettingChangeHandler?.(this.rowSettingTree!.getCheckdKeys(), this.rowSettingTree!.getCheckdNodes()); + }; } initCanvas(list: Array): void { @@ -725,26 +783,6 @@ export class TraceRow extends HTMLElement { if (!this.args['skeleton']) { this.initCanvas(this.canvas); } - let radioList = this.shadowRoot!.querySelectorAll('input[type=radio][name=status]'); - let popover = this.shadowRoot!.querySelector('.popover'); - this.shadowRoot?.querySelector('#first-radio')?.addEventListener('click', (e) => { - // @ts-ignore - radioList[0]!.checked = true; - // @ts-ignore - popover!.visible = false; - setTimeout(() => { - this.onDrawTypeChangeHandler?.(0); - }, 300); - }); - this.shadowRoot?.querySelector('#second-radio')?.addEventListener('click', (e) => { - // @ts-ignore - radioList[1]!.checked = true; - // @ts-ignore - popover!.visible = false; - setTimeout(() => { - this.onDrawTypeChangeHandler?.(1); - }, 300); - }); } rowDragstart(ev: any) { @@ -1266,9 +1304,10 @@ export class TraceRow extends HTMLElement { :host(:not([check-type])) .lit-check-box{ display: none; } - :host([collect-type]) { - /*position:fixed;*/ - /*z-index:1000;*/ + :host([collect-type]) .setting{ + position:fixed; + z-index:1003; + left: 473px; } :host(:not([collect-type])) { /*position:static;*/ @@ -1287,9 +1326,6 @@ export class TraceRow extends HTMLElement { :host(:not([folder])) .describe:hover .collect{ display: block; } - :host([row-type="native-memory"]) #nativeRadioList{ - display: flex; - } .popover{ color: var(--dark-color1,#4b5766); display: none; @@ -1297,9 +1333,12 @@ export class TraceRow extends HTMLElement { align-items: center; margin-right: 5px; } + .setting{ + position:absolute; + left: 225px; + } .radio{ margin-right: 10px; - } #setting{ color: var(--dark-color1,#606060); @@ -1310,43 +1349,51 @@ export class TraceRow extends HTMLElement { :host([highlight]) .flash{ background-color: #ffe263; } - :host([row-type="energy"]) #appNameList{ display: flex; } - #listprocess::-webkit-scrollbar{ width: 6px; } - /*定义滑块 内阴影+圆角*/ #listprocess::-webkit-scrollbar-thumb { border-radius: 6px; background-color: var(--dark-background7,#e7c9c9); } - + .lit-check-box{ + margin-right: 15px; + } + :host([row-setting='enable'][check-type]) .lit-check-box{ + margin-right: 25px; + } + :host([row-setting='enable'][check-type='-1']) .collect{ + margin-right: 20px; + } + :host([row-setting='enable']) #rowSetting{ + display: flex; + } + :host([row-setting='enable']:not([check-type='-1'])) .collect{ + margin-right: 5px; + }
    - -
    -
    - Current Bytes
    -
    - Native Memory Density
    + +
    - -
    + +
    +
    - +
    `; diff --git a/ide/src/trace/component/trace/base/TraceRowConfig.ts b/ide/src/trace/component/trace/base/TraceRowConfig.ts index 7864c9d1c2ad8fdb2cb1d8f316c1851d11bfb5f2..d88498f37160548571488989369932f4ff7a65c5 100644 --- a/ide/src/trace/component/trace/base/TraceRowConfig.ts +++ b/ide/src/trace/component/trace/base/TraceRowConfig.ts @@ -46,7 +46,7 @@ export class TraceRowConfig extends BaseElement { } init(): void { - let sceneList = ['FrameTimeline', 'Task Pool', 'Animation Effect', 'Ark Ts']; + let sceneList = ['FrameTimeline', 'Task Pool', 'Animation Effect', 'Ark Ts', 'AppStartup']; this.selectTypeList = []; this.sceneTable!.innerHTML = ''; this.chartTable!.innerHTML = ''; @@ -94,7 +94,12 @@ export class TraceRowConfig extends BaseElement { this.resetChartOption(); this.resetChartTable(); }); - this.sceneTable?.append(...[div, optionCheckBox]); + let htmlDivElement = document.createElement('div'); + htmlDivElement.style.display = 'grid'; + htmlDivElement.style.gridTemplateColumns = '1fr 1fr'; + htmlDivElement.appendChild(div); + htmlDivElement.appendChild(optionCheckBox); + this.sceneTable?.appendChild(htmlDivElement); } initConfigChartTable(row: TraceRow): void { @@ -171,7 +176,7 @@ export class TraceRowConfig extends BaseElement { resetChartTable(): void { if (this.traceRowList && this.traceRowList.length > 0) { - TraceRowConfig.allTraceRowList.forEach((traceRow: TraceRow) => { + this.traceRowList.forEach((traceRow: TraceRow) => { let isShowRow: boolean = false; if (this.selectTypeList!.length === 0) { traceRow.removeAttribute('row-hidden'); @@ -186,13 +191,17 @@ export class TraceRowConfig extends BaseElement { } if (isShowRow) { if (traceRow.templateType.length > 0) { - traceRow.expansion = false; traceRow.removeAttribute('row-hidden'); traceRow.setAttribute('scene', ''); + if (traceRow.childrenList && traceRow.childrenList.length > 0) { + this.refreshChildRow(traceRow.childrenList, isShowRow); + } + traceRow.expansion = false; } } else { traceRow.removeAttribute('scene'); traceRow.setAttribute('row-hidden', ''); + this.refreshChildRow(traceRow.childrenList); } } }); @@ -200,6 +209,25 @@ export class TraceRowConfig extends BaseElement { } } + refreshChildRow(childRows: Array>, isShowScene: boolean = false): void{ + childRows.forEach(row => { + if (isShowScene) { + row.removeAttribute('row-hidden'); + row.setAttribute('scene', ''); + if (row.childrenList && row.childrenList.length > 0) { + this.refreshChildRow(row.childrenList, isShowScene); + } + row.expansion = false; + } else { + row.removeAttribute('scene'); + row.setAttribute('row-hidden', ''); + if (row.childrenList && row.childrenList.length > 0) { + this.refreshChildRow(row.childrenList); + } + } + }); + } + refreshSystemPanel(): void { this.clearSearchAndFlag(); this.spSystemTrace!.rowsPaneEL!.scroll({ @@ -256,15 +284,14 @@ export class TraceRowConfig extends BaseElement { visibility: hidden; } :host{ - display: block; visibility: visible; background-color: #F6F6F6; } .config-title { + height: 100px; border-top: 1px solid #D5D5D5; background-color: #0A59F7; display: flex; - height: 12%; align-items: center; padding: 0 20px; } @@ -285,23 +312,34 @@ export class TraceRowConfig extends BaseElement { opacity: 0.7; } .title_div{ - display: flex; - flex-direction: row; - align-items: center; - padding-left: 15px; - padding-right: 15px; - background-color: #F6F6F6; - height: 3.2em; + display: flex; + flex-direction: row; + align-items: center; + padding-left: 15px; + padding-right: 15px; + background-color: #F6F6F6; + height: 3.2em; } - .config-select { - display: grid; - background: #FFFFFF; - - overflow-x: hidden; - border-radius: 5px; - border: solid 1px #e0e0e0; - grid-template-columns: auto auto; - grid-template-rows: repeat(auto-fit, 35px); + .config-scene-select { + height: auto; + max-height: 120px; + overflow-y: auto; + background: #FFFFFF; + overflow-x: hidden; + border-radius: 5px; + border: solid 1px #e0e0e0; + } + .config-chart-select { + display: grid; + height: inherit; + padding: 10px 30px; + background: #FFFFFF; + overflow-y: scroll; + overflow-x: hidden; + border-radius: 5px; + border: solid 1px #e0e0e0; + grid-template-columns: auto auto; + grid-template-rows: repeat(auto-fit, 35px); } .config-img { margin-right: 12px; @@ -362,7 +400,7 @@ export class TraceRowConfig extends BaseElement {
    Template Select
    -
    +
    @@ -375,7 +413,7 @@ export class TraceRowConfig extends BaseElement {
    -
    +
    `; } diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts index 89360861b45e25f23708c5e8bc248d8f4f8c2026..95dde6d03cf9d1241f179b3312b13dbded4d8b16 100644 --- a/ide/src/trace/component/trace/base/TraceSheet.ts +++ b/ide/src/trace/component/trace/base/TraceSheet.ts @@ -54,6 +54,15 @@ import { JsCpuProfilerChartFrame } from '../../../bean/JsStruct.js'; import { TabPaneJsCpuTopDown } from '../sheet/ark-ts/TabPaneJsCpuCallTree.js'; import { TabPaneComparison } from '../sheet/ark-ts/TabPaneComparison.js'; import { TabPaneSummary } from '../sheet/ark-ts/TabPaneSummary.js'; +import { TabPaneGpuClickSelect } from '../sheet/gpu/TabPaneGpuClickSelect.js'; +import { TabPanePurgTotalSelection } from '../sheet/ability/TabPanePurgTotalSelection.js'; +import { TabPanePurgPinSelection } from '../sheet/ability/TabPanePurgPinSelection.js'; +import { TabPaneVmTrackerShmSelection } from '../sheet/vmtracker/TabPaneVmTrackerShmSelection.js'; +import { TabPaneSmapsStatistics } from '../sheet/smaps/TabPaneSmapsStatistics.js'; +import { SnapshotStruct } from '../../../database/ui-worker/ProcedureWorkerSnapshot.js'; +import { TabPaneDmaSelectAbility } from '../sheet/ability/TabPaneDmaSelectAbility.js'; +import { TabPaneGpuMemorySelectAbility } from '../sheet/ability/TabPaneGpuMemorySelectAbility.js'; +import { TabPaneDmaSelectVmTracker } from '../sheet/vmtracker/TabPaneDmaSelectVmTracker.js'; @element('trace-sheet') export class TraceSheet extends BaseElement { @@ -363,9 +372,17 @@ export class TraceSheet extends BaseElement { displayThreadData = ( data: ThreadStruct, scrollCallback: ((e: ThreadStruct) => void) | undefined, - scrollWakeUp: (d: any) => void | undefined - ): void => - this.displayTab('current-selection').setThreadData(data, scrollCallback, scrollWakeUp); + scrollWakeUp: (d: any) => void | undefined, + scrollPreviousData: (d: ThreadStruct) => void, + scrollNextData: (d: ThreadStruct) => void + ) => + this.displayTab('current-selection').setThreadData( + data, + scrollCallback, + scrollWakeUp, + scrollPreviousData, + scrollNextData + ); displayMemData = (data: ProcessMemStruct): void => this.displayTab('current-selection').setMemData(data); displayClockData = (data: ClockStruct): void => @@ -388,6 +405,13 @@ export class TraceSheet extends BaseElement { this.showUploadSoBt(val); }; + displayGpuSelectedData = (type: string, startTs: number) => { + this.displayTab('gpu-click-select').data = { + type: type, + startTs: startTs, + }; + }; + displayFuncData = (names: string[], data: FuncStruct, scrollCallback: Function): void => this.displayTab(...names).setFunctionData(data, scrollCallback); displayCpuData = ( @@ -399,7 +423,21 @@ export class TraceSheet extends BaseElement { data: JankStruct, callback: ((data: Array) => void) | undefined = undefined, scrollCallback: ((e: JankStruct) => void) | undefined - ): void => this.displayTab('current-selection').setJankData(data, callback, scrollCallback); + ) => this.displayTab('current-selection').setJankData(data, callback, scrollCallback); + displayShmData = (data: SnapshotStruct, dataList: Array) => { + this.displayTab( + 'box-vmtracker-shm-selection', + 'box-vmtracker-shm-comparison' + ).setShmData(data, dataList); + }; + displaySmapsData = (data: SnapshotStruct, dataList: Array) => { + let val = new SelectionParam(); + val.smapsType = []; + val.rightNs = data.startNs; + this.selection = val; + val.smapsType = []; + this.displayTab('box-smaps-statistics', 'box-smaps-record').data = val; + }; displaySnapshotData = ( data: HeapSnapshotStruct, dataList: Array, @@ -448,6 +486,34 @@ export class TraceSheet extends BaseElement { 'box-js-Profiler-bottom-up' ).data = data; }; + displayPurgTotalAbilityData = (data: SnapshotStruct) => { + data.type = 'ability'; + this.displayTab('box-purgeable-total-selection').data = data; + }; + displayPurgPinAbilityData = (data: SnapshotStruct) => { + data.type = 'ability'; + this.displayTab('box-purgeable-pin-selection').data = data; + }; + displayPurgTotalVMData = (data: SnapshotStruct) => { + data.type = 'VM'; + this.displayTab('box-purgeable-total-selection').data = data; + }; + displayPurgPinVMData = (data: SnapshotStruct) => { + data.type = 'VM'; + this.displayTab('box-purgeable-pin-selection').data = data; + }; + displayDmaAbility = (data: number) => { + this.displayTab('box-dma-selection-ability').queryDmaClickDataByDB(data); + }; + displayDmaVmTracker = (data: number) => { + this.displayTab('box-dma-selection-vmTracker').data = data; + }; + displayGpuMemoryAbility = (data: number) => { + this.displayTab('box-gpu-memory-selection-ability').data = data; + }; + displayGpuMemoryVmTracker = (data: number) => { + this.displayTab('box-gpu-memory-selection-vmTracker').data = data; + }; rangeSelect(selection: SelectionParam, restore = false): boolean { this.selection = selection; diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts index 468fca44a92e12f6f57521e5fe1cc9c372ee953f..0fd7bbbf9d1781f5da3890b6aa0b6edb589402f0 100644 --- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts +++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts @@ -83,6 +83,25 @@ import { TabPaneComparison } from '../sheet/ark-ts/TabPaneComparison.js'; import { TabPaneJsCpuTopDown } from '../sheet/ark-ts/TabPaneJsCpuCallTree.js'; import { TabPaneJsCpuBottomUp } from '../sheet/ark-ts/TabPaneJsCpuBottomUp.js'; import { TabPaneJsCpuStatistics } from '../sheet/ark-ts/TabPaneJsCpuStatistics.js'; +import { TabPaneGpuClickSelect } from '../sheet/gpu/TabPaneGpuClickSelect.js'; +import { TabPaneGpuTotalBoxSelect } from '../sheet/gpu/TabPaneGpuTotalBoxSelect.js'; +import { TabPaneGpuWindowBoxSelect } from '../sheet/gpu/TabPaneGpuWindowBoxSelect.js'; +import { TabPaneGpuGL } from '../sheet/gpu/TabPaneGpuGL.js'; +import { TabPanePurgTotal } from '../sheet/ability/TabPanePurgTotal.js'; +import { TabPanePurgTotalSelection } from '../sheet/ability/TabPanePurgTotalSelection.js'; +import { TabPanePurgPin } from '../sheet/ability/TabPanePurgPin.js'; +import { TabPanePurgPinSelection } from '../sheet/ability/TabPanePurgPinSelection.js'; +import { TabPaneVmTrackerShmSelection } from '../sheet/vmtracker/TabPaneVmTrackerShmSelection.js'; +import { TabPaneVmTrackerShm } from '../sheet/vmtracker/TabPaneVmTrackerShm.js'; +import { TabPaneDmaAbility } from '../sheet/ability/TabPaneDmaAbility.js'; +import { TabPaneDmaSelectAbility } from '../sheet/ability/TabPaneDmaSelectAbility.js'; +import { TabPaneGpuMemoryAbility } from '../sheet/ability/TabPaneGpuMemoryAbility.js'; +import { TabPaneDmaVmTracker } from '../sheet/vmtracker/TabPaneDmaVmTracker.js'; +import { TabPaneGpuMemoryVmTracker } from '../sheet/vmtracker/TabPaneGpuMemoryVmTracker.js'; +import { TabPaneGpuMemorySelectAbility } from '../sheet/ability/TabPaneGpuMemorySelectAbility.js'; +import { TabPaneGpuMemorySelectVmTracker } from '../sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.js'; +import { TabPaneDmaSelectVmTracker } from '../sheet/vmtracker/TabPaneDmaSelectVmTracker.js'; + export let tabConfig: any = { 'tabpane-current': { title: 'Current Selection', @@ -377,15 +396,24 @@ export let tabConfig: any = { require: (param: SelectionParam) => param.diskIOLatency, }, 'box-smaps-statistics': { - title: 'VM Tracker Statistics', + title: 'Smaps Statistic', type: TabPaneSmapsStatistics, require: (param: SelectionParam) => param.smapsType.length > 0, }, 'box-smaps-record': { - title: 'VM Tracker Record List', + title: 'Smaps sample', type: TabPaneSmapsRecord, require: (param: SelectionParam) => param.smapsType.length > 0, }, + 'box-vmtracker-shm': { + title: 'SHM', + type: TabPaneVmTrackerShm, + require: (param: SelectionParam) => param.vmtrackershm.length > 0, + }, + 'box-vmtracker-shm-selection': { + title: 'SHM Selection', + type: TabPaneVmTrackerShmSelection, + }, 'box-frames': { title: 'Frames', type: TabPaneFrames, @@ -408,12 +436,12 @@ export let tabConfig: any = { 'box-frame-dynamic': { title: 'Frame Dynamic', type: TabPaneFrameDynamic, - require: (param: SelectionParam) => param.frameDynamic.length > 0 + require: (param: SelectionParam) => param.frameDynamic.length > 0, }, 'box-frame-animation': { title: 'Frame Animation', type: TabPaneFrameAnimation, - require: (param: SelectionParam) => param.frameAnimation.length > 0 + require: (param: SelectionParam) => param.frameAnimation.length > 0, }, 'box-frames-spacing': { title: 'Frame spacing', @@ -435,4 +463,77 @@ export let tabConfig: any = { type: TabPaneJsCpuBottomUp, require: (param: SelectionParam) => param.jsCpuProfilerData.length > 0, }, + 'gpu-click-select': { + title: 'Gpu Dump Selection', + type: TabPaneGpuClickSelect + }, + 'gpu-gl-box-select': { + title: 'GL', + type: TabPaneGpuGL, + require: (param: SelectionParam) => param.gpu.gl, + }, + 'gpu-total-box-select': { + title: 'Gpu Total', + type: TabPaneGpuTotalBoxSelect, + require: (param: SelectionParam) => param.gpu.gpuTotal, + }, + 'gpu-window-box-select': { + title: 'Gpu Window', + type: TabPaneGpuWindowBoxSelect, + require: (param: SelectionParam) => param.gpu.gpuWindow, + }, + 'box-purgeable-total': { + title: 'Purg Total', + type: TabPanePurgTotal, + require: (param: SelectionParam) => param.purgeableTotalAbility.length > 0 || param.purgeableTotalVM.length > 0, + }, + 'box-purgeable-total-selection': { + title: 'Purg Total Selection', + type: TabPanePurgTotalSelection, + }, + 'box-purgeable-pin': { + title: 'Purg Pin', + type: TabPanePurgPin, + require: (param: SelectionParam) => param.purgeablePinAbility.length > 0 || param.purgeablePinVM.length > 0, + }, + 'box-purgeable-pin-selection': { + title: 'Purg Pin Selection', + type: TabPanePurgPinSelection, + }, + 'box-dma-ability': { + title: 'DMA', + type: TabPaneDmaAbility, + require: (param: SelectionParam) => param.dmaAbilityData.length > 0, + }, + 'box-dma-selection-ability': { + title: 'DMA Selection', + type: TabPaneDmaSelectAbility, + }, //DMA Ability click + 'box-gpu-memory-ability': { + title: 'Gpu Memory', + type: TabPaneGpuMemoryAbility, + require: (param: SelectionParam) => param.gpuMemoryAbilityData.length > 0, + }, + 'box-smaps-dma': { + title: 'DMA', + type: TabPaneDmaVmTracker, + require: (param: SelectionParam) => param.dmaVmTrackerData.length > 0, + }, + 'box-smaps-gpu-memory': { + title: 'Gpu Memory', + type: TabPaneGpuMemoryVmTracker, + require: (param: SelectionParam) => param.gpuMemoryTrackerData.length > 0, + }, + 'box-dma-selection-vmTracker': { + title: 'DMA Selection', + type: TabPaneDmaSelectVmTracker, + }, //DMA VmTracker click + 'box-gpu-memory-selection-ability': { + title: 'Gpu Memory Selection', + type: TabPaneGpuMemorySelectAbility, + }, // Gpu Memory ability click + 'box-gpu-memory-selection-vmTracker': { + title: 'Gpu Memory Selection', + type: TabPaneGpuMemorySelectVmTracker, + }, //Gpu Memory DMA VmTracker click }; diff --git a/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts b/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts index 6e7fe520486209e87321b715770ee19580a83df6..1c53bd0e4e5ea96d3a0ad73614a3683e829606f1 100644 --- a/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts +++ b/ide/src/trace/component/trace/sheet/TabPaneCurrentSelection.ts @@ -28,7 +28,6 @@ import { queryThreadStateArgs, queryThreadWakeUp, queryThreadWakeUpFrom, - queryCPUWakeUpIdFromBean, queryThreadByItid, queryAnimationFrameFps, } from '../../../database/SqlLite.js'; import { WakeupBean } from '../../../bean/WakeupBean.js'; @@ -179,6 +178,7 @@ export class TabPaneCurrentSelection extends BaseElement { let rightButton: HTMLElement | null | undefined = this?.shadowRoot ?.querySelector('#rightButton') ?.shadowRoot?.querySelector('#custom-button'); + let rightStar: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#right-star'); let threadClick = this.currentSelectionTbl?.shadowRoot?.querySelector('#thread-id'); threadClick?.addEventListener('click', () => { //cpu点击 @@ -195,6 +195,7 @@ export class TabPaneCurrentSelection extends BaseElement { if (rightTitle !== null && rightTitle) { rightTitle.style.visibility = 'visible'; rightButton!.style.visibility = 'visible'; + rightStar!.style.visibility = 'hidden'; SpSystemTrace.btnTimer = null; } this.drawRight(canvas, bean); @@ -206,6 +207,7 @@ export class TabPaneCurrentSelection extends BaseElement { if (rightTitle !== null && rightTitle) { rightTitle.style.visibility = 'hidden'; rightButton!.style.visibility = 'hidden'; + rightStar!.style.visibility = 'hidden'; } } }); @@ -351,9 +353,11 @@ export class TabPaneCurrentSelection extends BaseElement { let rightButton: HTMLElement | null | undefined = this?.shadowRoot ?.querySelector('#rightButton') ?.shadowRoot?.querySelector('#custom-button'); + let rightStar: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#right-star'); if (rightTitle) { rightTitle.style.visibility = 'hidden'; rightButton!.style.visibility = 'hidden'; + rightStar!.style.visibility = 'hidden'; } if (leftTitle) { leftTitle.innerText = leftTitleStr; @@ -406,9 +410,11 @@ export class TabPaneCurrentSelection extends BaseElement { let rightButton: HTMLElement | null | undefined = this?.shadowRoot ?.querySelector('#rightButton') ?.shadowRoot?.querySelector('#custom-button'); + let rightStar: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#right-star'); if (rightTitle) { rightTitle.style.visibility = 'hidden'; rightButton!.style.visibility = 'hidden'; + rightStar!.style.visibility = 'hidden'; } let leftTitle: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#leftTitle'); if (leftTitle) { @@ -434,7 +440,9 @@ export class TabPaneCurrentSelection extends BaseElement { setThreadData( data: ThreadStruct, scrollCallback: ((d: any) => void) | undefined, - scrollWakeUp: (d: any) => void | undefined + scrollWakeUp: (d: any) => void | undefined, + scrollPreviousData: (d: any) => void | undefined, + scrollNextData: (d: any) => void | undefined ): void { //线程信息 this.setTableHeight('550px'); @@ -444,9 +452,11 @@ export class TabPaneCurrentSelection extends BaseElement { let rightButton: HTMLElement | null | undefined = this?.shadowRoot ?.querySelector('#rightButton') ?.shadowRoot?.querySelector('#custom-button'); + let rightStar: HTMLElement | null | undefined = this?.shadowRoot?.querySelector('#right-star'); if (rightTitle) { rightTitle.style.visibility = 'hidden'; rightButton!.style.visibility = 'hidden'; + rightStar!.style.visibility = 'hidden'; } if (leftTitle) { leftTitle.innerText = 'Thread State'; @@ -491,6 +501,44 @@ export class TabPaneCurrentSelection extends BaseElement { name: 'Process', value: this.transferString(processName ?? '') + ' [' + data.pid + '] ', }); + let ThreadRow = document.querySelector('body > sp-application')!.shadowRoot!.querySelector('#sp-system-trace')!.shadowRoot?.querySelector>( + `trace-row[row-id='${data.tid}'][row-type='thread']` + ); + ThreadRow?.dataList.forEach((item, index) => { + if (item === data && index !== 0) { + let previousState = ThreadRow?.dataList[index - 1].state; + if (previousState === 'R') { + previousState = 'Runnable'; + } + if (previousState === 'S') { + previousState = 'Sleeping'; + } + list.push({ + name: 'Previous State', + value: `
    +
    ${previousState}
    + +
    `, + }); + } + if (item === data && index !== ThreadRow?.dataList.length! - 1) { + let nextState = ThreadRow?.dataList[index + 1].state; + if (nextState === 'R') { + nextState = 'Runnable'; + } + if (nextState === 'S') { + nextState = 'Sleeping'; + } + list.push({ + name: 'Next State', + value: `
    +
    ${nextState}
    + +
    `, + }); + } + } + ); let cpu = new CpuStruct(); cpu.id = data.id; cpu.startTime = data.startTime; @@ -528,6 +576,16 @@ export class TabPaneCurrentSelection extends BaseElement { }); } this.currentSelectionTbl!.dataSource = list; + this.currentSelectionTbl?.shadowRoot?.querySelector('#next-state-click')?.addEventListener('click', () => { + if (scrollNextData) { + scrollNextData(data); + } + }); + this.currentSelectionTbl?.shadowRoot?.querySelector('#previous-state-click')?.addEventListener('click', () => { + if (scrollPreviousData) { + scrollPreviousData(data); + } + }); this.currentSelectionTbl?.shadowRoot?.querySelector('#state-click')?.addEventListener('click', () => { //线程点击 if (scrollCallback) { @@ -976,10 +1034,6 @@ export class TabPaneCurrentSelection extends BaseElement { if (wf && wf[0]) { wb = wf[0]; if (wb !== null) { - let wd = await queryCPUWakeUpIdFromBean(wb.tid); - if (wd && wd[0]) { - wb.itid = wd[0].itid; - } wb.wakeupTime = wakeupTs - recordStartTs; wb.process = Utils.PROCESS_MAP.get(wb.pid!); wb.thread = Utils.THREAD_MAP.get(wb.tid!); @@ -1011,10 +1065,6 @@ export class TabPaneCurrentSelection extends BaseElement { if (wf && wf[0]) { wb = wf[0]; if (wb !== null) { - let wd = await queryCPUWakeUpIdFromBean(wb.tid); - if (wd && wd[0]) { - wb.itid = wd[0].itid; - } wb.wakeupTime = wakeupTs - recordStartTs; wb.process = Utils.PROCESS_MAP.get(wb.pid!); wb.thread = Utils.THREAD_MAP.get(wb.tid!); @@ -1197,6 +1247,13 @@ export class TabPaneCurrentSelection extends BaseElement { #rightButton{ padding-top:12px; } + .right{ + display: flex; + } + #right-star{ + padding-top: 10px; + visibility: hidden; + } .scroll-area{ display: flex; flex-direction: row; @@ -1220,6 +1277,7 @@ export class TabPaneCurrentSelection extends BaseElement {
    GetWakeupList +
    diff --git a/ide/src/trace/component/trace/sheet/ability/TabPaneDmaAbility.ts b/ide/src/trace/component/trace/sheet/ability/TabPaneDmaAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..c22166678c1f725747c3a417f22984e2cfef2342 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPaneDmaAbility.ts @@ -0,0 +1,170 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { Dma } from '../../../../bean/AbilityMonitor.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { getTabDmaAbilityData } from '../../../../database/SqlLite.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-dma-ability') +export class TabPaneDmaAbility extends BaseElement { + private dmaTbl: LitTable | null | undefined; + private dmaSource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + private dmaTimeRange: HTMLLabelElement | null | undefined; + + set data(dmaAbilityValue: SelectionParam | any) { + if (dmaAbilityValue.dmaAbilityData.length > 0) { + this.init(); + this.dmaTimeRange!.textContent = + 'Selected range: ' + ((dmaAbilityValue.rightNs - dmaAbilityValue.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.dmaTbl!.loading = true; + this.queryDataByDB(dmaAbilityValue); + } + } + + initElements(): void { + this.dmaTbl = this.shadowRoot?.querySelector('#damTable'); + this.tableThead = this.dmaTbl?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.dmaTimeRange = this.shadowRoot?.querySelector('#dma-time-range'); + this.dmaTbl!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortDmaByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.dmaTbl!); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDataByDB(val: SelectionParam | any): void { + getTabDmaAbilityData(val.leftNs, val.rightNs, (MemoryConfig.getInstance().interval * 1000000) / 5).then((data) => { + this.dmaTbl!.loading = false; + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + if (item.processName !== null) { + item.process = `${item.processName}(${item.processId})`; + } else { + item.process = `Process(${item.processId})`; + } + item.avgSizes = Utils.getBinaryByteWithUnit(Math.round(item.avgSize)); + item.minSizes = Utils.getBinaryByteWithUnit(item.minSize); + item.maxSizes = Utils.getBinaryByteWithUnit(item.maxSize); + }); + this.dmaSource = data; + this.dmaTbl!.recycleDataSource = this.dmaSource.sort(function ( + dmaAbilityLeftData: Dma, + dmaAbilityRightData: Dma + ) { + return dmaAbilityRightData.avgSize - dmaAbilityLeftData.avgSize; + }); + } else { + this.dmaTbl!.recycleDataSource = []; + this.dmaSource = []; + } + }); + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + + + + + +
    + `; + } + + sortDmaByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.dmaTbl!.recycleDataSource = this.dmaSource; + break; + default: + let array = [...this.dmaSource]; + switch (column) { + case 'process': + this.dmaTbl!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? `${dmaAbilityLeftData.process}`.localeCompare(`${dmaAbilityRightData.process}`) + : `${dmaAbilityRightData.process}`.localeCompare(`${dmaAbilityLeftData.process}`); + }); + break; + case 'avgSize': + this.dmaTbl!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.avgSize - dmaAbilityRightData.avgSize + : dmaAbilityRightData.avgSize - dmaAbilityLeftData.avgSize; + }); + break; + case 'minSize': + this.dmaTbl!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.minSize - dmaAbilityRightData.minSize + : dmaAbilityRightData.minSize - dmaAbilityLeftData.minSize; + }); + break; + case 'maxSize': + this.dmaTbl!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.maxSize - dmaAbilityRightData.maxSize + : dmaAbilityRightData.maxSize - dmaAbilityLeftData.maxSize; + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPaneDmaSelectAbility.ts b/ide/src/trace/component/trace/sheet/ability/TabPaneDmaSelectAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..32c051a0e90b1f8685b30bed678168b2eacfceac --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPaneDmaSelectAbility.ts @@ -0,0 +1,223 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { Dma } from '../../../../bean/AbilityMonitor.js'; +import { getTabDmaAbilityClickData } from '../../../../database/SqlLite.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-dma-selection-ability') +export class TabPaneDmaSelectAbility extends BaseElement { + private damClickTable: LitTable | null | undefined; + private dmaClickSource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + private table: HTMLDivElement | undefined | null; + + initElements(): void { + this.damClickTable = this.shadowRoot?.querySelector('#damClickTable'); + this.tableThead = this.damClickTable?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.damClickTable!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortDmaByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.damClickTable?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 18 + 'px'; + this.parentElement!.style.overflow = 'hidden'; + this.damClickTable?.reMeauseHeight(); + } + }).observe(this.parentElement!); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDmaClickDataByDB(startNs: number): void { + this.init(); + getTabDmaAbilityClickData(startNs).then((data) => { + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + item.bufName = SpSystemTrace.DATA_DICT.get(item.bufName as number) || '-'; + item.expName = SpSystemTrace.DATA_DICT.get(item.expName as number) || '-'; + item.expTaskComm = SpSystemTrace.DATA_DICT.get(item.expTaskComm as number) || '-'; + if (item.processName !== null) { + item.process = `${item.processName}(${item.processId})`; + } else { + item.process = `Process(${item.processId})`; + } + item.sizes = Utils.getBinaryByteWithUnit(item.size); + item.timeStamp = ns2s(item.startNs); + this.damClickTable!.getItemTextColor = (item: Dma): any => { + if (item.flag === 1) { + return '#6b6b6b96'; + } else if (item.flag === 2) { + return '#4a4a4a'; + } else { + return '#000000'; + } + }; + }); + this.damClickTable!.snapshotDataSource = data.sort(function ( + dmaAbilityLeftData: Dma, + dmaAbilityRightData: Dma + ) { + return dmaAbilityRightData.size - dmaAbilityLeftData.size; + }); + this.dmaClickSource = data; + } else { + this.damClickTable!.snapshotDataSource = []; + this.dmaClickSource = []; + } + }); + } + + initHtml(): string { + return ` + + + + + + + + + + + + + + + + + + + + + + + + `; + } + + sortDmaByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.damClickTable!.recycleDataSource = this.dmaClickSource; + break; + default: + let array = [...this.dmaClickSource]; + switch (column) { + case 'process': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? `${dmaAbilityLeftData.process}`.localeCompare(`${dmaAbilityRightData.process}`) + : `${dmaAbilityRightData.process}`.localeCompare(`${dmaAbilityLeftData.process}`); + }); + break; + case 'startNs': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.startNs - dmaAbilityRightData.startNs + : dmaAbilityRightData.startNs - dmaAbilityLeftData.startNs; + }); + break; + case 'expTaskComm': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? `${dmaAbilityLeftData.expTaskComm}`.localeCompare(`${dmaAbilityRightData.expTaskComm}`) + : `${dmaAbilityRightData.expTaskComm}`.localeCompare(`${dmaAbilityLeftData.expTaskComm}`); + }); + break; + case 'fd': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.fd - dmaAbilityRightData.fd + : dmaAbilityRightData.fd - dmaAbilityLeftData.fd; + }); + break; + case 'size': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.size - dmaAbilityRightData.size + : dmaAbilityRightData.size - dmaAbilityLeftData.size; + }); + break; + case 'ino': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.ino - dmaAbilityRightData.ino + : dmaAbilityRightData.ino - dmaAbilityLeftData.ino; + }); + break; + case 'expPid': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.expPid - dmaAbilityRightData.expPid + : dmaAbilityRightData.expPid - dmaAbilityLeftData.expPid; + }); + break; + case 'flag': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? dmaAbilityLeftData.flag - dmaAbilityRightData.flag + : dmaAbilityRightData.flag - dmaAbilityLeftData.flag; + }); + break; + case 'bufName': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? `${dmaAbilityLeftData.bufName}`.localeCompare(`${dmaAbilityRightData.bufName}`) + : `${dmaAbilityRightData.bufName}`.localeCompare(`${dmaAbilityLeftData.bufName}`); + }); + break; + case 'expName': + this.damClickTable!.recycleDataSource = array.sort((dmaAbilityLeftData, dmaAbilityRightData) => { + return sort === 1 + ? `${dmaAbilityLeftData.expName}`.localeCompare(`${dmaAbilityRightData.expName}`) + : `${dmaAbilityRightData.expName}`.localeCompare(`${dmaAbilityLeftData.expName}`); + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.ts b/ide/src/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..98abc0001a5862507b188cd7dfe3ef867f95683a --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.ts @@ -0,0 +1,192 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { GpuMemory } from '../../../../bean/AbilityMonitor.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { getTabGpuMemoryAbilityData } from '../../../../database/SqlLite.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-gpu-memory-ability') +export class TabPaneGpuMemoryAbility extends BaseElement { + private gpuMemoryTableTbl: LitTable | null | undefined; + private gpuMemorySource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + private gpuMemoryTimeRange: HTMLLabelElement | undefined | null; + + set data(gpuMemoryAbilityValue: SelectionParam | any) { + if (gpuMemoryAbilityValue.gpuMemoryAbilityData.length > 0) { + this.gpuMemoryTimeRange!.textContent = + 'Selected range: ' + + ((gpuMemoryAbilityValue.rightNs - gpuMemoryAbilityValue.leftNs) / 1000000.0).toFixed(5) + + ' ms'; + this.gpuMemoryTableTbl!.loading = true; + this.queryDataByDB(gpuMemoryAbilityValue); + this.init(); + } + } + + initElements(): void { + this.gpuMemoryTableTbl = this.shadowRoot?.querySelector('#gpuMemoryTable'); + this.tableThead = this.gpuMemoryTableTbl?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.gpuMemoryTimeRange = this.shadowRoot?.querySelector('#gpu-memory-time-range'); + this.gpuMemoryTableTbl!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortGpuMemoryByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.gpuMemoryTableTbl!); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDataByDB(val: SelectionParam | any): void { + getTabGpuMemoryAbilityData(val.leftNs, val.rightNs, (MemoryConfig.getInstance().interval * 1000000) / 5).then( + (data) => { + this.gpuMemoryTableTbl!.loading = false; + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + if (item.processName !== null) { + item.process = `${item.processName}(${item.processId})`; + } else { + item.process = `Process(${item.processId})`; + } + item.avgSizes = Utils.getBinaryByteWithUnit(Math.round(item.avgSize)); + item.minSizes = Utils.getBinaryByteWithUnit(item.minSize); + item.maxSizes = Utils.getBinaryByteWithUnit(item.maxSize); + }); + this.gpuMemorySource = data; + this.gpuMemoryTableTbl!.recycleDataSource = this.gpuMemorySource.sort(function ( + gpuMemoryLeftData: GpuMemory, + gpuMemoryRightData: GpuMemory + ) { + return gpuMemoryRightData.avgSize - gpuMemoryLeftData.avgSize; + }); + } else { + this.gpuMemoryTableTbl!.recycleDataSource = []; + this.gpuMemorySource = []; + } + } + ); + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + + + + + + + +
    + `; + } + + sortGpuMemoryByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.gpuMemoryTableTbl!.recycleDataSource = this.gpuMemorySource; + break; + default: + let array = [...this.gpuMemorySource]; + switch (column) { + case 'process': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.process}`.localeCompare(`${gpuMemoryRightData.process}`) + : `${gpuMemoryRightData.process}`.localeCompare(`${gpuMemoryLeftData.process}`); + }); + break; + case 'gpuName': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.gpuName}`.localeCompare(`${gpuMemoryRightData.gpuName}`) + : `${gpuMemoryRightData.gpuName}`.localeCompare(`${gpuMemoryLeftData.gpuName}`); + }); + break; + case 'avgSize': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.avgSize - gpuMemoryRightData.avgSize + : gpuMemoryRightData.avgSize - gpuMemoryLeftData.avgSize; + }); + break; + case 'minSize': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.minSize - gpuMemoryRightData.minSize + : gpuMemoryRightData.minSize - gpuMemoryLeftData.minSize; + }); + break; + case 'maxSize': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.maxSize - gpuMemoryRightData.maxSize + : gpuMemoryRightData.maxSize - gpuMemoryLeftData.maxSize; + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPaneGpuMemorySelectAbility.ts b/ide/src/trace/component/trace/sheet/ability/TabPaneGpuMemorySelectAbility.ts new file mode 100644 index 0000000000000000000000000000000000000000..26e09f68afb7a49060a9f4256139ef7284de1f51 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPaneGpuMemorySelectAbility.ts @@ -0,0 +1,160 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { GpuMemory } from '../../../../bean/AbilityMonitor.js'; +import { getTabGpuMemoryAbilityClickData } from '../../../../database/SqlLite.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-gpu-memory-selection-ability') +export class TabPaneGpuMemorySelectAbility extends BaseElement { + private gpuMemoryClickTable: LitTable | null | undefined; + private gpuMemoryClickSource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + + set data(data: number) { + // @ts-ignore + this.queryDataByDB(data); + this.init(); + } + + initElements(): void { + this.gpuMemoryClickTable = this.shadowRoot?.querySelector('#gpuMemoryClickTable'); + this.tableThead = this.gpuMemoryClickTable?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.gpuMemoryClickTable!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortGpuMemoryByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.gpuMemoryClickTable?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 18 + 'px'; + this.parentElement!.style.overflow = 'hidden'; + this.gpuMemoryClickTable?.reMeauseHeight(); + } + }).observe(this.parentElement!); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDataByDB(startNs: number): void { + getTabGpuMemoryAbilityClickData(startNs).then((data) => { + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + if (item.processName !== null) { + item.process = `${item.processName}(${item.processId})`; + } else { + item.process = `Process(${item.processId})`; + } + item.sizes = Utils.getBinaryByteWithUnit(item.size); + item.timeStamp = ns2s(item.startNs); + }); + this.gpuMemoryClickTable!.recycleDataSource = data.sort(function ( + gpuMemoryLeftData: GpuMemory, + gpuMemoryRightData: GpuMemory + ) { + return gpuMemoryRightData.size - gpuMemoryLeftData.size; + }); + this.gpuMemoryClickSource = data; + } else { + this.gpuMemoryClickTable!.recycleDataSource = []; + this.gpuMemoryClickSource = []; + } + }); + } + + initHtml(): string { + return ` + + + + + + + + + + + + `; + } + + sortGpuMemoryByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.gpuMemoryClickTable!.recycleDataSource = this.gpuMemoryClickSource; + break; + default: + let array = [...this.gpuMemoryClickSource]; + switch (column) { + case 'process': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.process}`.localeCompare(`${gpuMemoryRightData.process}`) + : `${gpuMemoryRightData.process}`.localeCompare(`${gpuMemoryLeftData.process}`); + }); + break; + case 'startNs': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.startNs - gpuMemoryRightData.startNs + : gpuMemoryRightData.startNs - gpuMemoryLeftData.startNs; + }); + break; + case 'gpuName': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.gpuName}`.localeCompare(`${gpuMemoryRightData.gpuName}`) + : `${gpuMemoryRightData.gpuName}`.localeCompare(`${gpuMemoryLeftData.gpuName}`); + }); + break; + case 'size': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.size - gpuMemoryRightData.size + : gpuMemoryRightData.size - gpuMemoryLeftData.size; + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPanePurgPin.ts b/ide/src/trace/component/trace/sheet/ability/TabPanePurgPin.ts new file mode 100644 index 0000000000000000000000000000000000000000..5e9a217d8a06c80a31b541f6644d7101f24f25e8 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPanePurgPin.ts @@ -0,0 +1,227 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { queryProcessPurgeableTab, querySysPurgeableTab } from '../../../../database/SqlLite.js'; +import { Utils } from '../../base/Utils.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { PurgeableTabStruct } from './TabPanePurgTotal.js'; + +@element('tabpane-purg-pin') +export class TabPanePurgPin extends BaseElement { + private purgeablePinTable: LitTable | null | undefined; + private purgeablePinSource: Array = []; + private tabTitle: HTMLDivElement | undefined | null; + private purgPinTimeRange: HTMLLabelElement | undefined | null; + private sortKey = 'avgSize'; + private sortType = 2; + + set data(selection: SelectionParam) { + //@ts-ignore + this.purgeablePinTable?.shadowRoot?.querySelector('.table')?.style?.height = `${ + this.parentElement!.clientHeight - 45 + }px`; + this.init(); + this.purgPinTimeRange!.textContent = + 'Selected range: ' + ((selection.rightNs - selection.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.purgeablePinTable!.loading = true; + this.purgeablePinTable!.recycleDataSource = []; + if (selection.purgeablePinAbility.length > 0) { + this.purgeablePinSource = []; + querySysPurgeableTab( + selection.leftNs, + selection.rightNs, + (MemoryConfig.getInstance().interval * 1000_000) / 5, + true + ).then((results) => { + this.purgeablePinTable!.loading = false; + if (results.length > 0) { + for (let i = 0; i < results.length; i++) { + this.purgeablePinSource.push( + this.toTabStruct(results[i].name, results[i].maxSize, results[i].minSize, results[i].avgSize) + ); + } + this.sortByColumn({ key: this.sortKey, sort: this.sortType }); + let total = this.totalData(this.purgeablePinSource); + this.purgeablePinSource.unshift(total); + this.purgeablePinTable!.recycleDataSource = this.purgeablePinSource; + this.purgeablePinSource.shift(); + } else { + this.purgeablePinSource = []; + this.purgeablePinTable!.recycleDataSource = []; + } + }); + } else if (selection.purgeablePinVM.length > 0) { + this.purgeablePinSource = []; + queryProcessPurgeableTab( + selection.leftNs, + selection.rightNs, + (MemoryConfig.getInstance().interval * 1000_000) / 5, + MemoryConfig.getInstance().iPid, + true + ).then((results) => { + this.purgeablePinTable!.loading = false; + if (results.length > 0) { + for (let i = 0; i < results.length; i++) { + this.purgeablePinSource.push( + this.toTabStruct(results[i].name, results[i].maxSize, results[i].minSize, results[i].avgSize) + ); + } + this.sortByColumn({ key: this.sortKey, sort: this.sortType }); + let total = this.totalData(this.purgeablePinSource); + this.purgeablePinSource.unshift(total); + this.purgeablePinTable!.recycleDataSource = this.purgeablePinSource; + this.purgeablePinSource.shift(); + } else { + this.purgeablePinSource = []; + this.purgeablePinTable!.recycleDataSource = []; + } + }); + } + } + + private init() { + const thTable = this.tabTitle!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tabTitle!.hasAttribute('sort')) { + this.tabTitle!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + this.sortKey = 'avgSize'; + this.sortType = 2; + } + + private toTabStruct(type: string, maxSize: number, minSize: number, avgSize: number): PurgeableTabStruct { + const tabStruct = new PurgeableTabStruct( + type, + maxSize, + minSize, + avgSize, + Utils.getBinaryByteWithUnit(avgSize), + Utils.getBinaryByteWithUnit(maxSize), + Utils.getBinaryByteWithUnit(minSize) + ); + return tabStruct; + } + + private totalData(source: Array): PurgeableTabStruct { + // 计算总的time作为表格的第一行显示 + let pinAvg = 0; + let pinMax = 0; + let pinMin = 0; + for (let item of source) { + pinAvg += item.avgSize; + pinMax += item.maxSize; + pinMin += item.minSize; + } + let pinData = this.toTabStruct('Total', pinAvg, pinMax, pinMin); + return pinData; + } + + private sortByColumn(detail: any): void { + // @ts-ignore + function compare(key, sort, type) { + return function (a: any, b: any) { + // 不管哪一列的排序方式是0（默认排序），都按照avgSize列从大到小排序 + if (sort === 0) { + sort = 2; + key = 'avgSize'; + type = 'number'; + } + if (type === 'number') { + // @ts-ignore + return sort === 2 ? parseFloat(b[key]) - parseFloat(a[key]) : parseFloat(a[key]) - parseFloat(b[key]); + } else { + if (sort === 2) { + return b[key].toString().localeCompare(a[key].toString()); + } else { + return a[key].toString().localeCompare(b[key].toString()); + } + } + }; + } + if (detail.key === 'type') { + this.purgeablePinSource.sort(compare(detail.key, detail.sort, 'string')); + } else { + this.purgeablePinSource.sort(compare(detail.key, detail.sort, 'number')); + } + let pin = this.totalData(this.purgeablePinSource); + this.purgeablePinSource.unshift(pin); + this.purgeablePinTable!.recycleDataSource = this.purgeablePinSource; + this.purgeablePinSource.shift(); + } + + initElements(): void { + this.purgeablePinTable = this.shadowRoot?.querySelector('#tb-purgeable-pin'); + this.tabTitle = this.purgeablePinTable!.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.purgPinTimeRange = this.shadowRoot?.querySelector('#purg-pin-time-range'); + this.purgeablePinTable!.addEventListener('column-click', (evt: any) => { + this.sortKey = evt.detail.key; + this.sortType = evt.detail.sort; + // @ts-ignore + this.sortByColumn(evt.detail); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.purgeablePinTable!); + } + + initHtml(): string { + return ` + +
    +
    + +
    + + + + + + + + + + + `; + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPanePurgPinSelection.ts b/ide/src/trace/component/trace/sheet/ability/TabPanePurgPinSelection.ts new file mode 100644 index 0000000000000000000000000000000000000000..24d8f9f57fc02c6790c4d72c9dba27cb8918e0af --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPanePurgPinSelection.ts @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { queryProcessPurgeableSelectionTab, querySysPurgeableSelectionTab } from '../../../../database/SqlLite.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { Utils } from '../../base/Utils.js'; +import { resizeObserver } from '../SheetUtils.js'; + +@element('tabpane-purg-pin-selection') +export class TabPanePurgPinSelection extends BaseElement { + private purgeableSelectionTable: LitTable | null | undefined; + private purgeableSelectionSource: Array = []; + + set data(selection: SelectionParam | any) { + this.purgeableSelectionSource = []; + this.queryTableData(selection.type, selection.startNs); + } + + async queryTableData(type: string, startNs: number) { + if (type === 'ability') { + await querySysPurgeableSelectionTab(startNs, true).then((results) => { + this.purgeableSelectionSource = []; + this.purgeableSelectionSource.push({ name: 'TimeStamp', value: ns2s(startNs) }); + for (let i = 0; i < results.length; i++) { + results[i].value = Utils.getBinaryByteWithUnit(results[i].value); + this.purgeableSelectionSource.push(results[i]); + this.purgeableSelectionTable!.recycleDataSource = this.purgeableSelectionSource; + } + }); + } else if (type === 'VM') { + await queryProcessPurgeableSelectionTab(startNs, MemoryConfig.getInstance().iPid, true).then((results) => { + this.purgeableSelectionSource = []; + this.purgeableSelectionSource.push({ name: 'TimeStamp', value: ns2s(startNs) }); + for (let i = 0; i < results.length; i++) { + results[i].value = Utils.getBinaryByteWithUnit(results[i].value); + this.purgeableSelectionSource.push(results[i]); + this.purgeableSelectionTable!.recycleDataSource = this.purgeableSelectionSource; + } + }); + } + } + + initElements(): void { + this.purgeableSelectionTable = this.shadowRoot?.querySelector('#selectionTbl'); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.purgeableSelectionTable!); + } + + initHtml(): string { + return ` + + + + + + + + + + `; + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPanePurgTotal.ts b/ide/src/trace/component/trace/sheet/ability/TabPanePurgTotal.ts new file mode 100644 index 0000000000000000000000000000000000000000..e7a33471686928214ba22a1eb7267529221fb6d9 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPanePurgTotal.ts @@ -0,0 +1,252 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { querySysPurgeableTab, queryProcessPurgeableTab } from '../../../../database/SqlLite.js'; +import { Utils } from '../../base/Utils.js'; +import { resizeObserver } from '../SheetUtils.js'; + +@element('tabpane-purg-total') +export class TabPanePurgTotal extends BaseElement { + private purgeableTotalTable: LitTable | null | undefined; + private purgeableTotalSource: Array = []; + private tabTitle: HTMLDivElement | undefined | null; + private purgTotalTimeRange: HTMLLabelElement | undefined | null; + private sortKey = 'avgSize'; + private sortType = 2; + set data(selection: SelectionParam) { + //@ts-ignore + this.purgeableTotalTable?.shadowRoot?.querySelector('.table')?.style?.height = `${ + this.parentElement!.clientHeight - 45 + }px`; + this.init(); + this.purgTotalTimeRange!.textContent = + 'Selected range: ' + ((selection.rightNs - selection.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.purgeableTotalTable!.loading = true; + this.purgeableTotalTable!.recycleDataSource = []; + // 框选了 Purgeable Total + if (selection.purgeableTotalAbility.length > 0) { + this.purgeableTotalSource = []; + querySysPurgeableTab( + selection.leftNs, + selection.rightNs, + (MemoryConfig.getInstance().interval * 1000000) / 5 + ).then((results) => { + this.purgeableTotalTable!.loading = false; + if (results.length > 0) { + for (let i = 0; i < results.length; i++) { + this.purgeableTotalSource.push( + this.toTabStruct(results[i].name, results[i].maxSize, results[i].minSize, results[i].avgSize) + ); + } + this.sortByColumn({ key: this.sortKey, sort: this.sortType }); + let total = this.totalData(this.purgeableTotalSource); + this.purgeableTotalSource.unshift(total); + this.purgeableTotalTable!.recycleDataSource = this.purgeableTotalSource; + this.purgeableTotalSource.shift(); + } else { + this.purgeableTotalSource = []; + this.purgeableTotalTable!.recycleDataSource = []; + } + }); + } else if (selection.purgeableTotalVM.length > 0) { + this.purgeableTotalSource = []; + queryProcessPurgeableTab( + selection.leftNs, + selection.rightNs, + (MemoryConfig.getInstance().interval * 1000000) / 5, + MemoryConfig.getInstance().iPid + ).then((results) => { + this.purgeableTotalTable!.loading = false; + if (results.length > 0) { + for (let i = 0; i < results.length; i++) { + this.purgeableTotalSource.push( + this.toTabStruct(results[i].name, results[i].maxSize, results[i].minSize, results[i].avgSize) + ); + } + this.sortByColumn({ key: this.sortKey, sort: this.sortType }); + let total = this.totalData(this.purgeableTotalSource); + this.purgeableTotalSource.unshift(total); + this.purgeableTotalTable!.recycleDataSource = this.purgeableTotalSource; + this.purgeableTotalSource.shift(); + } else { + this.purgeableTotalSource = []; + this.purgeableTotalTable!.recycleDataSource = []; + } + }); + } + } + + private init() { + const thTable = this.tabTitle!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tabTitle!.hasAttribute('sort')) { + this.tabTitle!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + this.sortKey = 'avgSize'; + this.sortType = 2; + } + + private toTabStruct(type: string, maxSize: number, minSize: number, avgSize: number): PurgeableTabStruct { + const tabStruct = new PurgeableTabStruct( + type, + maxSize, + minSize, + avgSize, + Utils.getBinaryByteWithUnit(avgSize), + Utils.getBinaryByteWithUnit(maxSize), + Utils.getBinaryByteWithUnit(minSize) + ); + return tabStruct; + } + + private totalData(source: Array): PurgeableTabStruct { + // 计算总的time作为表格的第一行显示 + let totalAvg = 0; + let totalMax = 0; + let totalMin = 0; + for (let item of source) { + totalAvg += item.avgSize; + totalMax += item.maxSize; + totalMin += item.minSize; + } + let totalData = this.toTabStruct('Total', totalAvg, totalMax, totalMin); + return totalData; + } + + private sortByColumn(detail: any): void { + // @ts-ignore + function compare(key, sort, type) { + return function (a: any, b: any) { + // 不管哪一列的排序方式是0（默认排序），都按照avgSize列从大到小排序 + if (sort === 0) { + sort = 2; + key = 'avgSize'; + type = 'number'; + } + if (type === 'number') { + // @ts-ignore + return sort === 2 ? parseFloat(b[key]) - parseFloat(a[key]) : parseFloat(a[key]) - parseFloat(b[key]); + } else { + if (sort === 2) { + return b[key].toString().localeCompare(a[key].toString()); + } else { + return a[key].toString().localeCompare(b[key].toString()); + } + } + }; + } + if (detail.key === 'type') { + this.purgeableTotalSource.sort(compare(detail.key, detail.sort, 'string')); + } else { + this.purgeableTotalSource.sort(compare(detail.key, detail.sort, 'number')); + } + let total = this.totalData(this.purgeableTotalSource); + this.purgeableTotalSource.unshift(total); + this.purgeableTotalTable!.recycleDataSource = this.purgeableTotalSource; + this.purgeableTotalSource.shift(); + } + + initElements(): void { + this.purgeableTotalTable = this.shadowRoot?.querySelector('#tb-purgeable-total'); + this.tabTitle = this.purgeableTotalTable!.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.purgTotalTimeRange = this.shadowRoot?.querySelector('#purg-total-time-range') as HTMLLabelElement; + this.purgeableTotalTable!.addEventListener('column-click', (evt: any) => { + this.sortKey = evt.detail.key; + this.sortType = evt.detail.sort; + // @ts-ignore + this.sortByColumn(evt.detail); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.purgeableTotalTable!); + } + + initHtml(): string { + return ` + +
    +
    + +
    + + + + + + + + + + + `; + } +} + +export class PurgeableTabStruct { + type: string; + avgSize: number; + maxSize: number; + minSize: number; + avgSizeStr: string; + maxSizeStr: string; + minSizeStr: string; + + constructor( + type: string, + avgSize: number, + maxSize: number, + minSize: number, + avgSizeStr: string, + maxSizeStr: string, + minSizeStr: string + ) { + this.type = type; + this.avgSize = avgSize; + this.maxSize = maxSize; + this.minSize = minSize; + this.avgSizeStr = avgSizeStr; + this.maxSizeStr = maxSizeStr; + this.minSizeStr = minSizeStr; + } +} diff --git a/ide/src/trace/component/trace/sheet/ability/TabPanePurgTotalSelection.ts b/ide/src/trace/component/trace/sheet/ability/TabPanePurgTotalSelection.ts new file mode 100644 index 0000000000000000000000000000000000000000..fbd0e0a8786441c9838e01127495d1f93feaf682 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/ability/TabPanePurgTotalSelection.ts @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { queryProcessPurgeableSelectionTab, querySysPurgeableSelectionTab } from '../../../../database/SqlLite.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { Utils } from '../../base/Utils.js'; +import { resizeObserver } from '../SheetUtils.js'; + +@element('tabpane-purg-total-selection') +export class TabPanePurgTotalSelection extends BaseElement { + private purgeableSelectionTable: LitTable | null | undefined; + private purgeableSelectionSource: Array = []; + + set data(selection: SelectionParam | any) { + this.queryTableData(selection.type, selection.startNs); + } + + async queryTableData(type: string, startNs: number) { + if (type === 'ability') { + await querySysPurgeableSelectionTab(startNs).then((results) => { + this.purgeableSelectionSource = []; + if (results.length > 0) { + this.purgeableSelectionSource.push({ name: 'TimeStamp', value: ns2s(startNs) }); + for (let i = 0; i < results.length; i++) { + results[i].value = Utils.getBinaryByteWithUnit(results[i].value); + this.purgeableSelectionSource.push(results[i]); + } + this.purgeableSelectionTable!.recycleDataSource = this.purgeableSelectionSource; + } + }); + } else if (type === 'VM') { + await queryProcessPurgeableSelectionTab(startNs, MemoryConfig.getInstance().iPid).then((results) => { + this.purgeableSelectionSource = []; + if (results.length > 0) { + this.purgeableSelectionSource.push({ name: 'TimeStamp', value: ns2s(startNs) }); + for (let i = 0; i < results.length; i++) { + results[i].value = Utils.getBinaryByteWithUnit(results[i].value); + this.purgeableSelectionSource.push(results[i]); + } + this.purgeableSelectionTable!.recycleDataSource = this.purgeableSelectionSource; + } + }); + } + } + + initElements(): void { + this.purgeableSelectionTable = this.shadowRoot?.querySelector('#selectionTbl'); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.purgeableSelectionTable!); + } + + initHtml(): string { + return ` + + + + + + + + + + `; + } +} diff --git a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts index d7e8e4fdb53f664452ec3e7df1ceeb66399155f1..3e89ab99d4779f14643c07c83ec04375099d6c21 100644 --- a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts +++ b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneJsCpuStatistics.ts @@ -99,7 +99,7 @@ export class TabPaneJsCpuStatistics extends BaseElement { tip: (obj) => { return `
    type: ${obj.obj.type}
    -
    total: ${ns2s(obj.obj.time)} (${obj.obj.percentage})
    +
    total: ${ns2s(obj.obj.time)} (${obj.obj.percentage}%)
    `; }, hoverHandler: (data) => { diff --git a/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.ts b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.ts new file mode 100644 index 0000000000000000000000000000000000000000..b773685721fb9fe7c6582ab326cba48f98f6d544 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.ts @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { queryGpuDataByTs } from '../../../../database/SqlLite.js'; +import { VmTrackerChart } from '../../../chart/SpVmTrackerChart.js'; +import { log } from '../../../../../log/Log.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { Utils } from '../../base/Utils.js'; + +interface GpuTreeItem { + name: string; + id: number; + size: number; + sizeStr: string; + children?: GpuTreeItem[] | undefined; +} + +@element('tabpane-gpu-click-select') +export class TabPaneGpuClickSelect extends BaseElement { + private gpuTbl: LitTable | null | undefined; + private gpuSource: Array = []; + + set data(gpu: { type: string, startTs: number }) { + let label = this.gpuTbl!.shadowRoot!.querySelector('.thead')?.firstChild?.firstChild?.firstChild + if (label) { + (label as HTMLLabelElement).innerHTML = gpu.type === 'total' ? 'Module / Category' : 'Window / Module / Category'; + } + //@ts-ignore + this.gpuTbl?.shadowRoot?.querySelector('.table')?.style?.height = this.parentElement!.clientHeight - 45 + 'px'; + this.gpuTbl!.loading = true; + + let window = gpu.type === 'total' ? 0 : VmTrackerChart.gpuWindow; + let module = gpu.type === 'total' ? VmTrackerChart.gpuTotalModule : VmTrackerChart.gpuWindowModule; + queryGpuDataByTs(gpu.startTs, window || 0, module).then((result) => { + this.gpuTbl!.loading = false; + if (result != null && result.length > 0) { + log('queryGpuDataByTs result size : ' + result.length); + let gpuDataObj = result.reduce((group: any, item) => { + let categoryItem: GpuTreeItem = { + name: SpSystemTrace.DATA_DICT.get(item.categoryId) || 'null', + id: item.categoryId, + size: item.size, + sizeStr: Utils.getBinaryByteWithUnit(item.size) + }; + if (group[`${item.windowId}`]) { + let windowGroup = group[`${item.windowId}`] as GpuTreeItem; + windowGroup.size += item.size; + windowGroup.sizeStr = Utils.getBinaryByteWithUnit(windowGroup.size); + let moduleGroup = windowGroup.children!.find(it => it.id === item.moduleId); + if (moduleGroup) { + moduleGroup.size += item.size; + moduleGroup.sizeStr = Utils.getBinaryByteWithUnit(moduleGroup.size); + moduleGroup.children?.push(categoryItem); + } else { + windowGroup.children?.push( + { + name: SpSystemTrace.DATA_DICT.get(item.moduleId) || 'null', + id: item.moduleId, + size: item.size, + sizeStr: Utils.getBinaryByteWithUnit(item.size), + children: [ categoryItem ] + } + ); + } + } else { + group[`${item.windowId}`] = { + name: SpSystemTrace.DATA_DICT.get(item.windowId), + id: item.windowId, + size: item.size, + sizeStr: Utils.getBinaryByteWithUnit(item.size), + children: [ + { + name: SpSystemTrace.DATA_DICT.get(item.moduleId), + id: item.moduleId, + size: item.size, + sizeStr: Utils.getBinaryByteWithUnit(item.size), + children: [ categoryItem ] + } + ] + }; + } + return group; + }, {}); + let items = Object.values(gpuDataObj) as GpuTreeItem[]; + this.gpuSource = (gpu.type === 'total' ? items[0].children : items) || []; + this.gpuTbl!.recycleDataSource = this.gpuSource; + } else { + this.gpuSource = []; + this.gpuTbl!.recycleDataSource = []; + } + } + ); + } + + initElements(): void { + this.gpuTbl = this.shadowRoot?.querySelector('#tb-gpu'); + this.gpuTbl!.addEventListener('column-click', (evt: any) => { + this.sortByColumn(evt.detail); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.gpuTbl!); + } + + initHtml(): string { + return ` + + + + + + + + `; + } + + sortByColumn(gpuDetail: any): void { + let compare = (gpuA: GpuTreeItem, gpuB: GpuTreeItem): number => { + if (gpuDetail.sort === 0) { + return gpuA.size - gpuB.size; + } else if (gpuDetail.sort === 1) { + return gpuA.size - gpuB.size; + } else { + return gpuB.size - gpuA.size; + } + }; + + let deepCompare = (arr: GpuTreeItem[]) => { + arr.forEach(it => { + if (it.children) { + deepCompare(it.children); + } + }); + arr.sort(compare); + } + deepCompare(this.gpuSource); + this.gpuTbl!.recycleDataSource = this.gpuSource; + } +} diff --git a/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuGL.ts b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuGL.ts new file mode 100644 index 0000000000000000000000000000000000000000..4acf842915e4da06a0dfb18862b92e523daac560 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuGL.ts @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { queryGpuGLDataByRange } from '../../../../database/SqlLite.js'; +import { log } from '../../../../../log/Log.js'; +import { getProbablyTime } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { VmTrackerChart } from '../../../chart/SpVmTrackerChart.js'; +import { Utils } from '../../base/Utils.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; + +interface GL { + startTs: number; + startTsStr?: string; + size: number; + sizeStr?: string; +} + +@element('tabpane-gpu-gl') +export class TabPaneGpuGL extends BaseElement { + private glTbl: LitTable | null | undefined; + private range: HTMLLabelElement | null | undefined; + private glSource: Array = []; + private currentSelectionParam: SelectionParam | undefined; + + set data(glParam: SelectionParam | any) { + if (this.currentSelectionParam === glParam) { + return; + } + this.currentSelectionParam = glParam; + //@ts-ignore + this.glTbl?.shadowRoot?.querySelector('.table')?.style?.height = this.parentElement!.clientHeight - 45 + 'px'; + this.range!.textContent = 'Selected range: ' + ((glParam.rightNs - glParam.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.glTbl!.loading = true; + queryGpuGLDataByRange( + MemoryConfig.getInstance().iPid, + glParam.leftNs, + glParam.rightNs, + MemoryConfig.getInstance().snapshotDur + ).then((result) => { + this.glTbl!.loading = false; + log('queryGpuGLDataByRange result size : ' + result.length); + if (result.length > 0) { + result.forEach((it: GL) => { + it.startTsStr = getProbablyTime(it.startTs); + it.sizeStr = Utils.getBinaryByteWithUnit(it.size); + }); + this.glSource = result; + this.glTbl!.recycleDataSource = this.glSource; + } else { + this.glSource = []; + this.glTbl!.recycleDataSource = []; + } + }); + } + + initElements(): void { + this.glTbl = this.shadowRoot?.querySelector('#tb-gl'); + this.range = this.shadowRoot?.querySelector('#gl-time-range'); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.glTbl!); + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + +
    + `; + } +} diff --git a/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuTotalBoxSelect.ts b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuTotalBoxSelect.ts new file mode 100644 index 0000000000000000000000000000000000000000..dfc88177ac66981616fec89006e79e0811a639b1 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuTotalBoxSelect.ts @@ -0,0 +1,145 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { queryGpuDataByRange } from '../../../../database/SqlLite.js'; +import { log } from '../../../../../log/Log.js'; +import { getProbablyTime } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { Utils } from '../../base/Utils.js'; + +interface GpuTotal { + startTs: number; + startTsStr?: string; + windowId: number; + moduleId: number; + categoryId: number; + gpuName?: string; + sumSize: number; + sumSizeStr?: string; + avgSize: number; + avgSizeStr?: string; + maxSize: number; + maxSizeStr?: string; + minSize: number; + minSizeStr?: string; +} + +@element('tabpane-gpu-total-box-select') +export class TabPaneGpuTotalBoxSelect extends BaseElement { + private gpuBoxTbl: LitTable | null | undefined; + private range: HTMLLabelElement | null | undefined; + private gpuBoxSource: Array = []; + private currentSelectionParam: SelectionParam | undefined; + + set data(gpuBoxParam: SelectionParam | any) { + if (this.currentSelectionParam === gpuBoxParam) { + return; + } + this.currentSelectionParam = gpuBoxParam; + //@ts-ignore + this.gpuBoxTbl?.shadowRoot?.querySelector('.table')?.style?.height = this.parentElement!.clientHeight - 45 + 'px'; + this.range!.textContent = + 'Selected range: ' + ((gpuBoxParam.rightNs - gpuBoxParam.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.gpuBoxTbl!.loading = true; + queryGpuDataByRange(gpuBoxParam.leftNs, gpuBoxParam.rightNs, MemoryConfig.getInstance().snapshotDur).then((result) => { + this.gpuBoxTbl!.loading = false; + if (result != null && result.length > 0) { + log('getTabStartups result size : ' + result.length); + let target = result.filter((it) => it.windowId === 0); + target.forEach((it: GpuTotal) => { + let moduleName = SpSystemTrace.DATA_DICT.get(it.moduleId) || 'NULL'; + let categoryName = SpSystemTrace.DATA_DICT.get(it.categoryId) || 'NULL'; + it.gpuName = `${moduleName} / ${categoryName}`; + it.startTsStr = getProbablyTime(it.startTs); + it.avgSizeStr = Utils.getBinaryByteWithUnit(it.avgSize); + it.sumSizeStr = Utils.getBinaryByteWithUnit(it.sumSize); + it.minSizeStr = Utils.getBinaryByteWithUnit(it.minSize); + it.maxSizeStr = Utils.getBinaryByteWithUnit(it.maxSize); + }); + this.gpuBoxSource = target; + this.gpuBoxTbl!.recycleDataSource = this.gpuBoxSource; + } else { + this.gpuBoxSource = []; + this.gpuBoxTbl!.recycleDataSource = []; + } + }); + } + + initElements(): void { + this.gpuBoxTbl = this.shadowRoot?.querySelector('#tb-gpu-box'); + this.range = this.shadowRoot?.querySelector('#gpu-box-time-range'); + this.gpuBoxTbl!.addEventListener('column-click', (evt: any) => { + this.sortByColumn(evt.detail); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.gpuBoxTbl!); + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + + + + + + + +
    + `; + } + + sortByColumn(detail: { key: string; sort: number }): void { + this.gpuBoxSource.sort((gpuA, gpuB) => { + if (detail.sort === 0) { + return gpuA.startTs - gpuB.startTs; + } else { + let key = detail.key.replace('Str', ''); + let valueA = (gpuA as any)[key]; + let valueB = (gpuB as any)[key]; + return detail.sort === 1 ? valueA - valueB : valueB - valueA; + } + }); + this.gpuBoxTbl!.recycleDataSource = this.gpuBoxSource; + } +} diff --git a/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuWindowBoxSelect.ts b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuWindowBoxSelect.ts new file mode 100644 index 0000000000000000000000000000000000000000..51a1e0a2095b340b9ae84f70ef9eabc56d02a533 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/gpu/TabPaneGpuWindowBoxSelect.ts @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { queryGpuDataByRange } from '../../../../database/SqlLite.js'; +import { log } from '../../../../../log/Log.js'; +import { getProbablyTime } from '../../../../database/logic-worker/ProcedureLogicWorkerCommon.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { Utils } from '../../base/Utils.js'; + +interface Gpu { + startTs: number; + startTsStr?: string; + windowId: number; + moduleId: number; + categoryId: number; + gpuName?: string; + sumSize: number; + sumSizeStr?: string; + avgSize: number; + avgSizeStr?: string; + maxSize: number; + maxSizeStr?: string; + minSize: number; + minSizeStr?: string; +} + +@element('tabpane-gpu-window-box-select') +export class TabPaneGpuWindowBoxSelect extends BaseElement { + private gpuBoxTbl: LitTable | null | undefined; + private range: HTMLLabelElement | null | undefined; + private gpuBoxSource: Array = []; + private currentSelectionParam: SelectionParam | undefined; + + set data(gpuBoxParam: SelectionParam | any) { + if (this.currentSelectionParam === gpuBoxParam) { + return; + } + this.currentSelectionParam = gpuBoxParam; + //@ts-ignore + this.gpuBoxTbl?.shadowRoot?.querySelector('.table')?.style?.height = this.parentElement!.clientHeight - 45 + 'px'; + this.range!.textContent = + 'Selected range: ' + ((gpuBoxParam.rightNs - gpuBoxParam.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.gpuBoxTbl!.loading = true; + queryGpuDataByRange(gpuBoxParam.leftNs, gpuBoxParam.rightNs, MemoryConfig.getInstance().snapshotDur).then((result) => { + this.gpuBoxTbl!.loading = false; + if (result != null && result.length > 0) { + log('getTabStartups result size : ' + result.length); + let target = result.filter((it) => it.windowId !== 0); + target.forEach((it: Gpu) => { + let windowName = SpSystemTrace.DATA_DICT.get(it.windowId) || 'NULL'; + let moduleName = SpSystemTrace.DATA_DICT.get(it.moduleId) || 'NULL'; + let categoryName = SpSystemTrace.DATA_DICT.get(it.categoryId) || 'NULL'; + it.gpuName = `${windowName} / ${moduleName} / ${categoryName}`; + it.startTsStr = getProbablyTime(it.startTs); + it.avgSizeStr = Utils.getBinaryByteWithUnit(it.avgSize); + it.sumSizeStr = Utils.getBinaryByteWithUnit(it.sumSize); + it.minSizeStr = Utils.getBinaryByteWithUnit(it.minSize); + it.maxSizeStr = Utils.getBinaryByteWithUnit(it.maxSize); + }); + this.gpuBoxSource = target; + this.gpuBoxTbl!.recycleDataSource = this.gpuBoxSource; + } else { + this.gpuBoxSource = []; + this.gpuBoxTbl!.recycleDataSource = []; + } + }); + } + + initElements(): void { + this.gpuBoxTbl = this.shadowRoot?.querySelector('#tb-gpu-box'); + this.range = this.shadowRoot?.querySelector('#gpu-box-time-range'); + this.gpuBoxTbl!.addEventListener('column-click', (evt: any) => { + this.sortByColumn(evt.detail); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.gpuBoxTbl!); + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + + + + + + + +
    + `; + } + + sortByColumn(detail: { key: string; sort: number }): void { + this.gpuBoxSource.sort((gpuA, gpuB) => { + if (detail.sort === 0) { + return gpuA.startTs - gpuB.startTs; + } else { + let key = detail.key.replace('Str', ''); + let valueA = (gpuA as any)[key]; + let valueB = (gpuB as any)[key]; + return detail.sort === 1 ? valueA - valueB : valueB - valueA; + } + }); + this.gpuBoxTbl!.recycleDataSource = this.gpuBoxSource; + } +} diff --git a/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.ts b/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.ts index 449e2f28613306ebcc00a556323ca163e3acfc22..f25c712ed7cf83b2f375002dc5a57ac581c71b63 100644 --- a/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.ts +++ b/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.ts @@ -12,122 +12,158 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; -import { getTabSmapsData } from '../../../../database/SqlLite.js'; +import { getTabSmapsData, getTabSmapsRecordData } from '../../../../database/SqlLite.js'; import { Utils } from '../../base/Utils.js'; import { log } from '../../../../../log/Log.js'; -import { Smaps } from '../../../../bean/SmapsStruct.js'; +import { Smaps, SmapsType, TYPE_STRING } from '../../../../bean/SmapsStruct.js'; import { resizeObserver } from '../SheetUtils.js'; - +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; @element('tabpane-smaps-record') export class TabPaneSmapsRecord extends BaseElement { private tblSmapsRecord: LitTable | null | undefined; private sourceSmapsRecord: Array = []; private querySmapsRecordResult: Array = []; - - set data(valSmapsRecord: SelectionParam | any) { - // @ts-ignore - this.tblSmapsRecord?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 45 + 'px'; - this.queryDataByDB(valSmapsRecord); + private isClick = false; + private tabTitle: HTMLDivElement | undefined | null; + set data(valSmapsRecord: SelectionParam) { + this.isClick = valSmapsRecord.smapsType.length === 0; + this.init(); + this.tblSmapsRecord!.loading = true; + if (!this.isClick) { + if (valSmapsRecord.smapsType.length > 0) { + this.queryDataByDB(valSmapsRecord); + } + } else { + this.setSmaps(valSmapsRecord); + } } - initElements(): void { this.tblSmapsRecord = this.shadowRoot?.querySelector('#tb-smaps-record'); + this.tabTitle = this.tblSmapsRecord!.shadowRoot?.querySelector('.thead') as HTMLDivElement; this.tblSmapsRecord!.addEventListener('column-click', (evt) => { // @ts-ignore this.sortByColumn(evt.detail); }); } - connectedCallback() { super.connectedCallback(); - resizeObserver(this.parentElement!, this.tblSmapsRecord!); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.tblSmapsRecord?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 15+ 'px'; + this.tblSmapsRecord?.reMeauseHeight(); + } + }).observe(this.parentElement!); } - - queryDataByDB(srVal: SelectionParam | any) { - getTabSmapsData(srVal.leftNs, srVal.rightNs).then((result) => { - log('getTabSmapsData size :' + result.length); - if (result.length != null && result.length > 0) { - for (const smaps of result) { - switch (smaps.permission.trim()) { - case 'rw-': - smaps.type = 'DATA'; - break; - case 'r-x': - smaps.type = 'TEXT'; - break; - case 'r--': - smaps.type = 'CONST'; - break; - default: - smaps.type = 'OTHER'; - break; - } - smaps.address = smaps.start_addr + ' - ' + smaps.end_addr; - smaps.dirtyStr = Utils.getBinaryByteWithUnit(smaps.dirty * 1024); - smaps.swapperStr = Utils.getBinaryByteWithUnit(smaps.swapper * 1024); - smaps.rssStr = Utils.getBinaryByteWithUnit(smaps.rss * 1024); - smaps.pssStr = Utils.getBinaryByteWithUnit(smaps.pss * 1024); - smaps.sizeStr = Utils.getBinaryByteWithUnit(smaps.size * 1024); - let resideS = smaps.reside.toFixed(2); - if (resideS == '0.00') { - smaps.resideStr = '0 %'; - } else { - smaps.resideStr = resideS + '%'; - } - } - this.sourceSmapsRecord = result; - this.querySmapsRecordResult = result; - this.tblSmapsRecord!.recycleDataSource = this.sourceSmapsRecord; - } else { - this.sourceSmapsRecord = []; - this.querySmapsRecordResult = []; - this.tblSmapsRecord!.recycleDataSource = []; + queryDataByDB(srVal: SelectionParam | any): void { + getTabSmapsData(srVal.leftNs, srVal.rightNs, (MemoryConfig.getInstance().interval * 1000_000) / 5).then( + (result) => { + log('getTabSmapsData size :' + result.length); + this.tblSmapsRecord!.loading = false; + this.filteredData(result); } + ); + } + setSmaps(data: SelectionParam): void { + getTabSmapsRecordData(data.rightNs).then((result) => { + this.tblSmapsRecord!.loading = false; + this.filteredData(result); }); } - + private init(): void { + const thTable = this.tabTitle!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tabTitle!.hasAttribute('sort')) { + this.tabTitle!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + filteredData(result: any): void { + if (result.length !== null && result.length > 0) { + for (const smaps of result) { + smaps.typeName = TYPE_STRING[smaps.type]; + smaps.address = smaps.start_addr + ' - ' + smaps.end_addr; + smaps.swapStr = Utils.getBinaryByteWithUnit(smaps.swap); + smaps.rssStr = Utils.getBinaryByteWithUnit(smaps.rss); + smaps.pssStr = Utils.getBinaryByteWithUnit(smaps.pss); + smaps.sizeStr = Utils.getBinaryByteWithUnit(smaps.size); + smaps.sharedCleanStr = Utils.getBinaryByteWithUnit(smaps.shared_clean); + smaps.sharedDirtyStr = Utils.getBinaryByteWithUnit(smaps.shared_dirty); + smaps.privateCleanStr = Utils.getBinaryByteWithUnit(smaps.private_clean); + smaps.privateDirtyStr = Utils.getBinaryByteWithUnit(smaps.private_dirty); + smaps.swapPssStr = Utils.getBinaryByteWithUnit(smaps.swap_pss); + smaps.time = Utils.getTimeString(smaps.tsNS); + smaps.path = SpSystemTrace.DATA_DICT.get(smaps.path)?.split('/'); + smaps.permission = SpSystemTrace.DATA_DICT.get(smaps.pid)?.split('/'); + let resideS = smaps.reside.toFixed(2); + if (resideS === '0.00') { + smaps.resideStr = '0 %'; + } else { + smaps.resideStr = resideS + '%'; + } + } + this.sourceSmapsRecord = result; + this.querySmapsRecordResult = result; + this.tblSmapsRecord!.recycleDataSource = this.sourceSmapsRecord; + } else { + this.sourceSmapsRecord = []; + this.querySmapsRecordResult = []; + this.tblSmapsRecord!.recycleDataSource = []; + } + } initHtml(): string { return ` - - + + + + + + - + + + + + - + - + - + - + - + - + - + `; } - - sortByColumn(detail: any) { + sortByColumn(detail: any): void { // @ts-ignore function compare(property, sort, type) { return function (aSmapsRecord: Smaps, bSmapsRecord: Smaps) { @@ -140,7 +176,7 @@ export class TabPaneSmapsRecord extends BaseElement { return sort === 2 ? 1 : -1; } else { // @ts-ignore - if (bSmapsRecord[property] == aSmapsRecord[property]) { + if (bSmapsRecord[property] === aSmapsRecord[property]) { return 0; } else { return sort === 2 ? -1 : 1; @@ -149,7 +185,6 @@ export class TabPaneSmapsRecord extends BaseElement { } }; } - if ( detail.key === 'dirtyStr' || detail.key === 'swapperStr' || diff --git a/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.ts b/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.ts index b94d7e9e34ec0292e9d89b3afc1ee7b32c210299..55b62461f46b7586179aab00e84a5e8c7b06116c 100644 --- a/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.ts +++ b/ide/src/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.ts @@ -12,122 +12,134 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; import { LitTable } from '../../../../../base-ui/table/lit-table.js'; import { SelectionParam } from '../../../../bean/BoxSelection.js'; -import { getTabSmapsData, getTabSmapsMaxRss } from '../../../../database/SqlLite.js'; -import { Smaps, SmapsTreeObj } from '../../../../bean/SmapsStruct.js'; +import { + getTabSmapsData, + getTabSmapsMaxSize, + getTabSmapsRecordData, + getTabSmapsStatisticData, + getTabSmapsStatisticMaxSize, + getTabSmapsStatisticSelectData, +} from '../../../../database/SqlLite.js'; +import { Smaps, SmapsTreeObj, SmapsType, TYPE_STRING } from '../../../../bean/SmapsStruct.js'; import { Utils } from '../../base/Utils.js'; import { resizeObserver } from '../SheetUtils.js'; - +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; @element('tabpane-smaps-statistics') export class TabPaneSmapsStatistics extends BaseElement { private tblSmapsStatistics: LitTable | null | undefined; - - set data(valSmapsStatistics: SelectionParam | any) { - // @ts-ignore - this.tblSmapsStatistics?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 45 + 'px'; - this.queryDataByDB(valSmapsStatistics); + private isClick = false; + private currentSelection: SelectionParam | null | undefined; + private sumSize: number = 0; + private sortArray: Array = []; + private totalTree: Array = []; + private tabTitle: HTMLDivElement | undefined | null; + set data(valSmapsStatistics: SelectionParam) { + this.currentSelection = valSmapsStatistics; + this.isClick = valSmapsStatistics.smapsType.length === 0; + this.init(); + this.tblSmapsStatistics!.loading = true; + if (!this.isClick) { + if (valSmapsStatistics.smapsType.length > 0) { + this.queryDataByDB(valSmapsStatistics); + } + } else { + this.setSmaps(valSmapsStatistics); + } } - initElements(): void { this.tblSmapsStatistics = this.shadowRoot?.querySelector('#tb-smaps-statistics'); + this.tabTitle = this.tblSmapsStatistics!.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.tblSmapsStatistics!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.sortByColumn(evt.detail.key, evt.detail.sort); + }); } - - connectedCallback() { + connectedCallback(): void { super.connectedCallback(); - resizeObserver(this.parentElement!, this.tblSmapsStatistics!); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.tblSmapsStatistics?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 15+ 'px'; + this.tblSmapsStatistics?.reMeauseHeight(); + } + }).observe(this.parentElement!); } - - queryDataByDB(smapsVal: SelectionParam | any) { - getTabSmapsMaxRss(smapsVal.leftNs, smapsVal.rightNs).then((maxRes) => { - let sumRss = maxRes[0].max_value; - let allTree: SmapsTreeObj = new SmapsTreeObj('All', '', '*All*'); - let dataTree: SmapsTreeObj = new SmapsTreeObj('DATA', '', 'DATA'); - let textTree: SmapsTreeObj = new SmapsTreeObj('TEXT', '', 'TEXT'); - let constTree: SmapsTreeObj = new SmapsTreeObj('CONST', '', 'CONST'); - let otherTree: SmapsTreeObj = new SmapsTreeObj('OTHER', '', 'OTHER'); - getTabSmapsData(smapsVal.leftNs, smapsVal.rightNs).then((result) => { - if (result.length != null && result.length > 0) { - for (let id = 0; id < result.length; id++) { - let smaps = result[id]; - switch (smaps.permission.trim()) { - case 'rw-': - smaps.type = 'DATA'; - this.handleTree(smaps, id, 'DATA', dataTree, sumRss); - break; - case 'r-x': - smaps.type = 'TEXT'; - this.handleTree(smaps, id, 'TEXT', textTree, sumRss); - break; - case 'r--': - smaps.type = 'CONST'; - this.handleTree(smaps, id, 'CONST', constTree, sumRss); - break; - default: - smaps.type = 'OTHER'; - this.handleTree(smaps, id, 'OTHER', otherTree, sumRss); - break; - } - this.handleAllDataTree(smaps, id, 'All', allTree, sumRss); - if (id == result.length - 1) { - this.handleSmapsTreeObj(dataTree, sumRss); - this.handleSmapsTreeObj(textTree, sumRss); - this.handleSmapsTreeObj(constTree, sumRss); - this.handleSmapsTreeObj(otherTree, sumRss); - this.handleSmapsTreeObj(allTree, sumRss); - } - } - this.tblSmapsStatistics!.recycleDataSource = [allTree, dataTree, textTree, constTree, otherTree]; - } else { - this.tblSmapsStatistics!.recycleDataSource = []; - } - }); + async queryDataByDB(smapsVal: SelectionParam) { + getTabSmapsMaxSize(smapsVal.leftNs, smapsVal.rightNs, (MemoryConfig.getInstance().interval * 1000_000) / 5).then( + (maxRes) => { + this.sumSize = maxRes[0].max_value; + } + ); + await getTabSmapsStatisticSelectData( + smapsVal.leftNs, + smapsVal.rightNs, + (MemoryConfig.getInstance().interval * 1000_000) / 5 + ).then((result) => { + this.tblSmapsStatistics!.loading = false; + this.filteredData(result, this.sumSize); }); } - private calculatePercentage(divisor: number, dividend: number) { - if (dividend == 0) { + if (dividend === 0) { return 0; } else { return (divisor / dividend) * 100; } } - - private handleSmapsTreeObj(smapsTreeObj: SmapsTreeObj, sumRss: number) { - smapsTreeObj.rsspro = this.calculatePercentage(smapsTreeObj.rss, sumRss); - smapsTreeObj.rssproStr = smapsTreeObj.rsspro.toFixed(2) + '%'; + private init(): void { + const thTable = this.tabTitle!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tabTitle!.hasAttribute('sort')) { + this.tabTitle!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + private handleSmapsTreeObj(smapsTreeObj: SmapsTreeObj, sumRss: number): void { smapsTreeObj.regStr = smapsTreeObj.reg + ''; - smapsTreeObj.rssStr = Utils.getBinaryByteWithUnit(smapsTreeObj.rss * 1024); - smapsTreeObj.dirtyStr = Utils.getBinaryByteWithUnit(smapsTreeObj.dirty * 1024); - smapsTreeObj.swapperStr = Utils.getBinaryByteWithUnit(smapsTreeObj.swapper * 1024); - smapsTreeObj.sizeStr = Utils.getBinaryByteWithUnit(smapsTreeObj.size * 1024); + smapsTreeObj.rssStr = Utils.getBinaryByteWithUnit(smapsTreeObj.rss); + smapsTreeObj.dirtyStr = Utils.getBinaryByteWithUnit(smapsTreeObj.dirty); + smapsTreeObj.swapperStr = Utils.getBinaryByteWithUnit(smapsTreeObj.swapper); + smapsTreeObj.sizeStr = Utils.getBinaryByteWithUnit(smapsTreeObj.size); smapsTreeObj.respro = this.calculatePercentage(smapsTreeObj.rss, smapsTreeObj.size); - smapsTreeObj.pssStr = Utils.getBinaryByteWithUnit(smapsTreeObj.pss * 1024); + smapsTreeObj.pssStr = Utils.getBinaryByteWithUnit(smapsTreeObj.pss); smapsTreeObj.resproStr = smapsTreeObj.respro.toFixed(2) + '%'; + smapsTreeObj.sizePro = this.calculatePercentage(smapsTreeObj.size, sumRss); + smapsTreeObj.sizeProStr = smapsTreeObj.sizePro.toFixed(2) + '%'; + smapsTreeObj.sharedCleanStr = Utils.getBinaryByteWithUnit(smapsTreeObj.sharedClean); + smapsTreeObj.sharedDirtyStr = Utils.getBinaryByteWithUnit(smapsTreeObj.sharedDirty); + smapsTreeObj.privateCleanStr = Utils.getBinaryByteWithUnit(smapsTreeObj.privateClean); + smapsTreeObj.privateDirtyStr = Utils.getBinaryByteWithUnit(smapsTreeObj.privateDirty); + smapsTreeObj.swapStr = Utils.getBinaryByteWithUnit(smapsTreeObj.swap); + smapsTreeObj.swapPssStr = Utils.getBinaryByteWithUnit(smapsTreeObj.swapPss); } - - private handleAllDataTree(smaps: Smaps, id: number, parentId: string, dataTree: SmapsTreeObj, sumRss: number) { - let type = smaps.type; + private handleAllDataTree(smaps: Smaps, id: number, parentId: string, dataTree: SmapsTreeObj, sumRss: number): void { + let type = smaps.typeName; let objTree = new SmapsTreeObj(id + '', parentId, type); - objTree.path = smaps.path; + objTree.path = SpSystemTrace.DATA_DICT.get(Number(smaps.path))?.split('/'); objTree.rss = smaps.rss; - objTree.rsspro = this.calculatePercentage(smaps.rss, sumRss); - objTree.rssproStr = objTree.rsspro.toFixed(2) + '%'; - objTree.rssStr = Utils.getBinaryByteWithUnit(smaps.rss * 1024); + objTree.sizePro = this.calculatePercentage(smaps.size, sumRss); + objTree.sizeProStr = objTree.sizePro.toFixed(2) + '%'; + objTree.rssStr = Utils.getBinaryByteWithUnit(smaps.rss); objTree.dirty = smaps.dirty; - objTree.dirtyStr = Utils.getBinaryByteWithUnit(smaps.dirty * 1024); + objTree.dirtyStr = Utils.getBinaryByteWithUnit(smaps.dirty); objTree.swapper = smaps.swapper; - objTree.swapperStr = Utils.getBinaryByteWithUnit(smaps.swapper * 1024); + objTree.swapperStr = Utils.getBinaryByteWithUnit(smaps.swapper); objTree.size = smaps.size; - objTree.sizeStr = Utils.getBinaryByteWithUnit(smaps.size * 1024); + objTree.sizeStr = Utils.getBinaryByteWithUnit(smaps.size); objTree.pss = smaps.pss; - objTree.pssStr = Utils.getBinaryByteWithUnit(smaps.pss * 1024); + objTree.pssStr = Utils.getBinaryByteWithUnit(smaps.pss); objTree.respro = smaps.reside; objTree.resproStr = smaps.reside.toFixed(2) + '%'; dataTree.reg += 1; - if (dataTree.children.length > 1 && dataTree.path != '< multiple >') { + if (dataTree.children.length >= 1 && dataTree.path !== '< multiple >') { dataTree.path = '< multiple >'; } dataTree.rss += smaps.rss; @@ -136,29 +148,48 @@ export class TabPaneSmapsStatistics extends BaseElement { dataTree.size += smaps.size; dataTree.respro += smaps.reside; dataTree.pss += smaps.pss; - dataTree.children.push(objTree); + dataTree.count += smaps.count; + dataTree.sharedClean += smaps.shared_clean; + dataTree.sharedDirty += smaps.shared_dirty; + dataTree.privateClean += smaps.private_clean; + dataTree.privateDirty += smaps.private_dirty; + dataTree.swap += smaps.swap; + dataTree.swapPss += smaps.swap_pss; } - - private handleTree(smaps: Smaps, id: number, parentId: string, dataTree: SmapsTreeObj, sumRss: number) { - let type = smaps.start_addr + ' (' + smaps.size / 4 + ' pages)'; + private handleTree(smaps: Smaps, id: number, parentId: string, dataTree: SmapsTreeObj, sumRss: number): void { + let type = TYPE_STRING[smaps.type]; let treeObj = new SmapsTreeObj(id + '', parentId, type); - treeObj.path = smaps.path; + treeObj.path = SpSystemTrace.DATA_DICT.get(Number(smaps.path))?.split('/'); treeObj.rss = smaps.rss; - treeObj.rsspro = this.calculatePercentage(smaps.rss, sumRss); - treeObj.rssproStr = treeObj.rsspro.toFixed(2) + '%'; - treeObj.rssStr = Utils.getBinaryByteWithUnit(smaps.rss * 1024); + treeObj.pss = smaps.pss; + treeObj.sizePro = this.calculatePercentage(smaps.size, sumRss); + treeObj.sizeProStr = treeObj.sizePro.toFixed(2) + '%'; + treeObj.rssStr = Utils.getBinaryByteWithUnit(smaps.rss); treeObj.dirty = smaps.dirty; - treeObj.dirtyStr = Utils.getBinaryByteWithUnit(smaps.dirty * 1024); + treeObj.count = smaps.count; + treeObj.dirtyStr = Utils.getBinaryByteWithUnit(smaps.dirty); treeObj.swapper = smaps.swapper; - treeObj.swapperStr = Utils.getBinaryByteWithUnit(smaps.swapper * 1024); + treeObj.swapperStr = Utils.getBinaryByteWithUnit(smaps.swapper); treeObj.size = smaps.size; - treeObj.sizeStr = Utils.getBinaryByteWithUnit(smaps.size * 1024); + treeObj.sizeStr = Utils.getBinaryByteWithUnit(smaps.size); treeObj.pss = smaps.pss; - treeObj.pssStr = Utils.getBinaryByteWithUnit(smaps.pss * 1024); + treeObj.pssStr = Utils.getBinaryByteWithUnit(smaps.pss); treeObj.respro = smaps.reside; treeObj.resproStr = smaps.reside.toFixed(2) + '%'; + treeObj.sharedClean = smaps.shared_clean; + treeObj.sharedCleanStr = Utils.getBinaryByteWithUnit(smaps.shared_clean); + treeObj.sharedDirty = smaps.shared_dirty; + treeObj.sharedDirtyStr = Utils.getBinaryByteWithUnit(smaps.shared_dirty); + treeObj.privateClean = smaps.private_clean; + treeObj.privateCleanStr = Utils.getBinaryByteWithUnit(smaps.private_clean); + treeObj.privateDirty = smaps.private_dirty; + treeObj.privateDirtyStr = Utils.getBinaryByteWithUnit(smaps.private_dirty); + treeObj.swap = smaps.swap; + treeObj.swapStr = Utils.getBinaryByteWithUnit(smaps.swap); + treeObj.swapPss = smaps.swap_pss; + treeObj.swapPssStr = Utils.getBinaryByteWithUnit(smaps.swap_pss); dataTree.reg += 1; - if (dataTree.children.length > 1 && dataTree.path != '< multiple >') { + if (dataTree.children.length >= 1 && dataTree.path !== '< multiple >') { dataTree.path = '< multiple >'; } dataTree.rss += smaps.rss; @@ -166,43 +197,253 @@ export class TabPaneSmapsStatistics extends BaseElement { dataTree.swapper += smaps.swapper; dataTree.size += smaps.size; dataTree.pss += smaps.pss; + dataTree.count += smaps.count; + dataTree.sharedClean += smaps.shared_clean; + dataTree.sharedDirty += smaps.shared_dirty; + dataTree.privateClean += smaps.private_clean; + dataTree.privateDirty += smaps.private_dirty; + dataTree.swap += smaps.swap; + dataTree.swapPss += smaps.swap_pss; + dataTree.swap += smaps.swap; + dataTree.swapPss += smaps.swap_pss; dataTree.children.push(treeObj); } - + async setSmaps(data: SelectionParam) { + getTabSmapsStatisticMaxSize(data.rightNs).then((maxRes) => { + this.sumSize = maxRes[0].max_value; + }); + await getTabSmapsStatisticData(data.rightNs).then((result) => { + this.tblSmapsStatistics!.loading = false; + this.filteredData(result, this.sumSize); + }); + } + filteredData(result: any, sumRss: number): void { + let allTree: SmapsTreeObj = new SmapsTreeObj('All', '', '*All*'); + let codeSysTree: SmapsTreeObj = new SmapsTreeObj('CODE_SYS', '', 'CODE_SYS'); + let codeAppTree: SmapsTreeObj = new SmapsTreeObj('CODE_APP', '', 'CODE_APP'); + let dataSysTree: SmapsTreeObj = new SmapsTreeObj('DATA_SYS', '', 'DATA_SYS'); + let dataAppTree: SmapsTreeObj = new SmapsTreeObj('DATA_APP', '', 'DATA_APP'); + let unKownTree: SmapsTreeObj = new SmapsTreeObj('UNKNOWN_ANON', '', 'UNKNOWN_ANON'); + let stackTree: SmapsTreeObj = new SmapsTreeObj('STACK', '', 'STACK'); + let jsTree: SmapsTreeObj = new SmapsTreeObj('JS_HEAP', '', 'JS_HEAP'); + let javaVmTree: SmapsTreeObj = new SmapsTreeObj('JAVA_VM', '', 'JAVA_VM'); + let nativeTree: SmapsTreeObj = new SmapsTreeObj('NATIVE_HEAP', '', 'NATIVE_HEAP'); + let ashMemTree: SmapsTreeObj = new SmapsTreeObj('ASHMEM', '', 'ASHMEM'); + let otherSysTree: SmapsTreeObj = new SmapsTreeObj('OTHER_SYS', '', 'OTHER_SYS'); + let otherAppTree: SmapsTreeObj = new SmapsTreeObj('OTHER_APP', '', 'OTHER_APP'); + if (result.length !== null && result.length > 0) { + for (let id = 0; id < result.length; id++) { + let smaps = result[id]; + smaps.typeName = TYPE_STRING[smaps.type]; + switch (smaps.type) { + case SmapsType.TYPE_CODE_SYS: + this.handleTree(smaps, id, smaps.typeName, codeSysTree, sumRss); + break; + case SmapsType.TYPE_CODE_APP: + this.handleTree(smaps, id, smaps.typeName, codeAppTree, sumRss); + break; + case SmapsType.TYPE_DATA_SYS: + this.handleTree(smaps, id, smaps.typeName, dataSysTree, sumRss); + break; + case SmapsType.TYPE_DATA_APP: + this.handleTree(smaps, id, smaps.typeName, dataAppTree, sumRss); + break; + case SmapsType.TYPE_UNKNOWN_ANON: + this.handleTree(smaps, id, smaps.typeName, unKownTree, sumRss); + break; + case SmapsType.TYPE_STACK: + this.handleTree(smaps, id, smaps.typeName, stackTree, sumRss); + break; + case SmapsType.TYPE_JS_HEAP: + this.handleTree(smaps, id, smaps.typeName, jsTree, sumRss); + break; + case SmapsType.TYPE_JAVA_VM: + this.handleTree(smaps, id, smaps.typeName, javaVmTree, sumRss); + break; + case SmapsType.TYPE_NATIVE_HEAP: + this.handleTree(smaps, id, smaps.typeName, nativeTree, sumRss); + break; + case SmapsType.TYPE_ASHMEM: + this.handleTree(smaps, id, smaps.typeName, ashMemTree, sumRss); + break; + case SmapsType.TYPE_OTHER_SYS: + this.handleTree(smaps, id, smaps.typeName, otherSysTree, sumRss); + break; + case SmapsType.TYPE_OTHER_APP: + this.handleTree(smaps, id, smaps.typeName, otherAppTree, sumRss); + break; + } + this.handleAllDataTree(smaps, id, 'All', allTree, sumRss); + if (id === result.length - 1) { + this.handleSmapsTreeObj(codeSysTree, sumRss); + this.handleSmapsTreeObj(codeAppTree, sumRss); + this.handleSmapsTreeObj(dataSysTree, sumRss); + this.handleSmapsTreeObj(dataAppTree, sumRss); + this.handleSmapsTreeObj(unKownTree, sumRss); + this.handleSmapsTreeObj(stackTree, sumRss); + this.handleSmapsTreeObj(jsTree, sumRss); + this.handleSmapsTreeObj(javaVmTree, sumRss); + this.handleSmapsTreeObj(nativeTree, sumRss); + this.handleSmapsTreeObj(ashMemTree, sumRss); + this.handleSmapsTreeObj(otherSysTree, sumRss); + this.handleSmapsTreeObj(otherAppTree, sumRss); + this.handleSmapsTreeObj(allTree, sumRss); + } + } + let treeList = [ + allTree, + codeSysTree, + codeAppTree, + dataSysTree, + dataAppTree, + unKownTree, + stackTree, + jsTree, + javaVmTree, + nativeTree, + ashMemTree, + otherSysTree, + otherAppTree, + ]; + this.totalTree = []; + for (let i = 0; i < treeList.length; i++) { + let tree = treeList[i]; + if (tree.children.length !== 0) { + this.totalTree.push(tree); + } + } + this.totalTree.push(allTree); + // @ts-ignore + this.totalTree.sort((a, b) => b.size - a.size); + this.tblSmapsStatistics!.recycleDataSource = this.totalTree; + this.tblSmapsStatistics?.reMeauseHeight(); + } else { + this.tblSmapsStatistics!.recycleDataSource = []; + this.tblSmapsStatistics?.reMeauseHeight(); + } + } + sortByColumn(column: string, sort: number) { + switch (sort) { + case 0: + this.tblSmapsStatistics!.snapshotDataSource = this.totalTree; + break; + default: + this.sortArray = [...this.totalTree]; + switch (column) { + case 'sizeStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.size - b.size : b.size - a.size; + }); + break; + case 'count': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.count - b.count : b.count - a.count; + }); + break; + case 'rssStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.rss - b.rss : b.rss - a.rss; + }); + break; + case 'typeName': + this.tblSmapsStatistics!.recycleDataSource = this.sortArray.sort((a, b) => { + if (sort === 1) { + if (a.typeName > b.typeName) { + return 1; + } else if (a.typeName === b.typeName) { + return 0; + } else { + return -1; + } + } else { + if (b.typeName > a.typeName) { + return 1; + } else if (a.typeName === b.typeName) { + return 0; + } else { + return -1; + } + } + }); + break; + case 'pssStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.pss - b.pss : b.pss - a.pss; + }); + break; + case 'sharedCleanStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.sharedClean - b.sharedClean : b.sharedClean - a.sharedClean; + }); + break; + case 'sharedDirtyStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.sharedDirty - b.sharedDirty : b.sharedDirty - a.sharedDirty; + }); + break; + case 'privateCleanStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.privateClean - b.privateClean : b.privateClean - a.privateClean; + }); + break; + case 'privateDirtyStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.privateDirty - b.privateDirty : b.privateDirty - a.privateDirty; + }); + break; + case 'swapStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.swap - b.swap : b.swap - a.swap; + }); + break; + case 'swapPssStr': + this.tblSmapsStatistics!.snapshotDataSource = this.sortArray.sort((a, b) => { + return sort === 1 ? a.swapPss - b.swapPss : b.swapPss - a.swapPss; + }); + break; + } + break; + } + } initHtml(): string { return ` - - - - - - - - - - - - - - - - - - - - - - +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    `; } } diff --git a/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts b/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts index 5833aefd66bf0ecdaf44f3c59d4f1d52d8bc8a7d..218080d4baa4bfd1cef7567b4b2d5fdc9d04441c 100644 --- a/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts +++ b/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts @@ -45,6 +45,8 @@ export class TabPaneTaskFrames extends BaseElement { } else { if (!framesParam) { this.taskFramesTbl!!.recycleDataSource = []; + this.taskFramesSource = []; + this.taskFramesGroupSource = []; return; } //框选 @@ -58,43 +60,45 @@ export class TabPaneTaskFrames extends BaseElement { setTaskData(taskArray: Array, framesParam: SelectionParam, isClick: boolean): void { if (taskArray.length < 2) { this.taskFramesTbl!!.recycleDataSource = []; + this.taskFramesSource = []; + this.taskFramesGroupSource = []; return; } else { - let sTime = 0; - let eTime = 0; - let rTime = 0; - let aStartTime = 0; - let pStartTime = 0; - let rEndTime = 0; + let allocationTime = 0; + let executeTime = 0; + let returnTime = 0; + let allocationStartTime = 0; + let executeStartTime = 0; + let returnEndTime = 0; let priorityId = 1; let executeId = ''; let executeStruct: FuncStruct | undefined = undefined; taskArray.forEach((item) => { if (item.funName!.indexOf('H:Task Allocation:') >= 0) { - aStartTime = item.startTs!; + allocationStartTime = item.startTs!; priorityId = TabPaneTaskFrames.getPriorityId(item.funName!); executeId = TabPaneTaskFrames.getExecuteId(item.funName!); } else if (item.funName!.indexOf('H:Task Perform:') >= 0) { executeStruct = item; - pStartTime = item.startTs!; - eTime = item.dur!; + executeStartTime = item.startTs!; + executeTime = item.dur!; } else if (item.funName!.indexOf('H:Task PerformTask End:') >= 0) { - rEndTime = item.startTs! + item.dur!; + returnEndTime = item.startTs! + item.dur!; } }); - sTime = pStartTime - aStartTime; - rTime = rEndTime - (pStartTime + eTime); + allocationTime = executeStartTime - allocationStartTime; + returnTime = returnEndTime == 0 ? 0 : returnEndTime - (executeStartTime + executeTime); if (TabPaneTaskFrames.IsShowConcurrency) { let tableList: TaskTabStruct[] = []; this.buildConcurrencyTable(executeStruct!, tableList, framesParam, isClick); } else { - this.buildNoConcurrencyTable(executeId, priorityId, sTime, eTime, rTime); + this.buildNoConcurrencyTable(executeId, priorityId, allocationTime, executeTime, returnTime); } } } private buildConcurrencyTable(executeStruct: FuncStruct, - tableList: TaskTabStruct[], framesParam: SelectionParam, isClick: boolean): void { + tableList: TaskTabStruct[], framesParam: SelectionParam, isClick: boolean): void { this.countConcurrency(executeStruct, tableList, framesParam, isClick).then((result) => { let concurrencyColumn: TaskTabStruct = new TaskTabStruct(); concurrencyColumn.executeId = 'Task Concurrency'; @@ -108,13 +112,14 @@ export class TabPaneTaskFrames extends BaseElement { filterList.push(item); } } + this.taskFramesGroupSource = [filterList]; this.taskFramesSource = filterList; this.taskFramesTbl!!.recycleDataSource = this.taskFramesSource; this.progressEL!.loading = false; }); } private buildNoConcurrencyTable(executeId: string, priorityId: number, sTime: number, - eTime: number, rTime: number): void { + eTime: number, rTime: number): void { let task: TaskTabStruct = new TaskTabStruct(); task.executeId = executeId; task.taskPriority = Priority[priorityId]; @@ -122,6 +127,7 @@ export class TabPaneTaskFrames extends BaseElement { task.taskET = this.getMsTime(eTime); task.taskRT = this.getMsTime(rTime); this.taskFramesSource = [task]; + this.taskFramesGroupSource = [[task]]; this.taskFramesTbl!!.recycleDataSource = this.taskFramesSource; this.progressEL!.loading = false; } @@ -374,16 +380,16 @@ export class TabPaneTaskFrames extends BaseElement { let tempTask: TaskTabStruct = new TaskTabStruct(); let executeStartTime = executeTask!.ts!; let executeTime = executeTask!.dur! === -1 ? (window as any).recordEndNS - executeTask!.ts : executeTask!.dur; - let aStartTime = allocationTask!.ts!; - let rEndTime = 0; + let allocationStartTime = allocationTask!.ts!; + let returnEndTime = 0; if (returnTask) { - rEndTime = returnTask!.ts! + returnTask!.dur! - (executeStartTime + executeTime); + returnEndTime = returnTask!.ts! + returnTask!.dur! - (executeStartTime + executeTime); } tempTask.executeId = value.executeId; tempTask.taskPriority = Priority[value.priority!]; - tempTask.taskST = this.getMsTime(executeStartTime - aStartTime); + tempTask.taskST = this.getMsTime(executeStartTime - allocationStartTime); tempTask.taskET = this.getMsTime(executeTime); - tempTask.taskRT = this.getMsTime(rEndTime); + tempTask.taskRT = this.getMsTime(returnEndTime); tableList.push(tempTask); } } diff --git a/ide/src/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.ts b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.ts new file mode 100644 index 0000000000000000000000000000000000000000..4a064cb571c525ef5ee0a396b333febb4b478e6e --- /dev/null +++ b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.ts @@ -0,0 +1,203 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { Dma } from '../../../../bean/AbilityMonitor.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { getTabDmaVMTrackerClickData } from '../../../../database/SqlLite.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { Utils } from '../../base/Utils.js'; +import { ns2s } from '../../TimerShaftElement.js'; + +@element('tabpane-dma-selection-vmtracker') +export class TabPaneDmaSelectVmTracker extends BaseElement { + private damClickTable: LitTable | null | undefined; + private dmaClickSource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + + set data(data: number) { + // @ts-ignore + this.queryDataByDB(data); + this.init(); + } + + initElements(): void { + this.damClickTable = this.shadowRoot?.querySelector('#damClickTable'); + this.tableThead = this.damClickTable?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.damClickTable!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortDmaByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.damClickTable?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 18 + 'px'; + this.parentElement!.style.overflow = 'hidden'; + this.damClickTable?.reMeauseHeight(); + } + }).observe(this.parentElement!); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDataByDB(startNs: number): void { + getTabDmaVMTrackerClickData(startNs, MemoryConfig.getInstance().iPid).then((data) => { + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + item.bufName = SpSystemTrace.DATA_DICT.get(item.bufName as number) || '-'; + item.expName = SpSystemTrace.DATA_DICT.get(item.expName as number) || '-'; + item.expTaskComm = SpSystemTrace.DATA_DICT.get(item.expTaskComm as number) || '-'; + item.timeStamp = ns2s(item.startNs); + item.sizes = Utils.getBinaryByteWithUnit(item.size); + this.damClickTable!.getItemTextColor = (item: Dma): any => { + if (item.flag === 1) { + return '#6b6b6b96'; + } else if (item.flag === 2) { + return '#4a4a4a'; + } else { + return '#000000'; + } + }; + }); + this.damClickTable!.recycleDataSource = data.sort(function (dmaVmLeftData: Dma, dmaVmRightData: Dma) { + return dmaVmRightData.size - dmaVmLeftData.size; + }); + this.dmaClickSource = data; + } else { + this.damClickTable!.recycleDataSource = []; + this.dmaClickSource = []; + } + }); + } + + initHtml(): string { + return ` + + + + + + + + + + + + + + + + + + + + + + `; + } + + sortDmaByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.damClickTable!.recycleDataSource = this.dmaClickSource; + break; + default: + let array = [...this.dmaClickSource]; + switch (column) { + case 'startNs': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? dmaVmLeftData.startNs - dmaVmRightData.startNs + : dmaVmRightData.startNs - dmaVmLeftData.startNs; + }); + break; + case 'expTaskComm': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? `${dmaVmLeftData.expTaskComm}`.localeCompare(`${dmaVmRightData.expTaskComm}`) + : `${dmaVmRightData.expTaskComm}`.localeCompare(`${dmaVmLeftData.expTaskComm}`); + }); + break; + case 'fd': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 ? dmaVmLeftData.fd - dmaVmRightData.fd : dmaVmRightData.fd - dmaVmLeftData.fd; + }); + break; + case 'size': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 ? dmaVmLeftData.size - dmaVmRightData.size : dmaVmRightData.size - dmaVmLeftData.size; + }); + break; + case 'ino': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 ? dmaVmLeftData.ino - dmaVmRightData.ino : dmaVmRightData.ino - dmaVmLeftData.ino; + }); + break; + case 'expPid': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? dmaVmLeftData.expPid - dmaVmRightData.expPid + : dmaVmRightData.expPid - dmaVmLeftData.expPid; + }); + break; + case 'flag': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 ? dmaVmLeftData.flag - dmaVmRightData.flag : dmaVmRightData.flag - dmaVmLeftData.flag; + }); + break; + case 'bufName': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? `${dmaVmLeftData.bufName}`.localeCompare(`${dmaVmRightData.bufName}`) + : `${dmaVmRightData.bufName}`.localeCompare(`${dmaVmLeftData.bufName}`); + }); + break; + case 'expName': + this.damClickTable!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? `${dmaVmLeftData.expName}`.localeCompare(`${dmaVmRightData.expName}`) + : `${dmaVmRightData.expName}`.localeCompare(`${dmaVmLeftData.expName}`); + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.ts b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.ts new file mode 100644 index 0000000000000000000000000000000000000000..54eded0082921b872099f1c8fa4f4937bf5b5ca7 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.ts @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { getTabDmaVmTrackerData } from '../../../../database/SqlLite.js'; +import { Dma } from '../../../../bean/AbilityMonitor.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-dma-vmtracker') +export class TabPaneDmaVmTracker extends BaseElement { + private dmaTbl: LitTable | null | undefined; + private dmaSource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + private dmaTimeRange: HTMLDivElement | undefined | null; + + set data(dmaValue: SelectionParam | any) { + if (dmaValue.dmaVmTrackerData.length > 0) { + this.dmaTimeRange!.textContent = + 'Selected range: ' + ((dmaValue.rightNs - dmaValue.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.dmaTbl!.loading = true; + this.queryDataByDB(dmaValue); + this.init(); + } + } + + initElements(): void { + this.dmaTbl = this.shadowRoot?.querySelector('#damTable'); + this.tableThead = this.dmaTbl?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.dmaTimeRange = this.shadowRoot?.querySelector('#dma-time-range') as HTMLDivElement; + this.dmaTbl!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortDmaByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.dmaTbl!, 18); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDataByDB(val: SelectionParam | any): void { + getTabDmaVmTrackerData( + val.leftNs, + val.rightNs, + MemoryConfig.getInstance().iPid, + (MemoryConfig.getInstance().interval * 1000000) / 5 + ).then((data) => { + this.dmaTbl!.loading = false; + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + item.avgSizes = Utils.getBinaryByteWithUnit(Math.round(item.avgSize)); + item.minSizes = Utils.getBinaryByteWithUnit(item.minSize); + item.maxSizes = Utils.getBinaryByteWithUnit(item.maxSize); + }); + this.dmaSource = data; + this.dmaTbl!.recycleDataSource = this.dmaSource.sort(function (dmaVmLeftData: Dma, dmaVmRightData: Dma) { + return dmaVmRightData.avgSize - dmaVmLeftData.avgSize; + }); + } else { + this.dmaTbl!.recycleDataSource = []; + this.dmaSource = []; + } + }); + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + + + +
    + `; + } + + sortDmaByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.dmaTbl!.recycleDataSource = this.dmaSource; + break; + default: + let array = [...this.dmaSource]; + switch (column) { + case 'avgSize': + this.dmaTbl!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? dmaVmLeftData.avgSize - dmaVmRightData.avgSize + : dmaVmRightData.avgSize - dmaVmLeftData.avgSize; + }); + break; + case 'minSize': + this.dmaTbl!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? dmaVmLeftData.minSize - dmaVmRightData.minSize + : dmaVmRightData.minSize - dmaVmLeftData.minSize; + }); + break; + case 'maxSize': + this.dmaTbl!.recycleDataSource = array.sort((dmaVmLeftData, dmaVmRightData) => { + return sort === 1 + ? dmaVmLeftData.maxSize - dmaVmRightData.maxSize + : dmaVmRightData.maxSize - dmaVmLeftData.maxSize; + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.ts b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.ts new file mode 100644 index 0000000000000000000000000000000000000000..49286f3b264ebddc2a6cc42752ecca7bcd5455c5 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.ts @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { GpuMemory } from '../../../../bean/AbilityMonitor.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { getTabGpuMemoryVMTrackerClickData } from '../../../../database/SqlLite.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-gpu-memory-selection-vmtracker') +export class TabPaneGpuMemorySelectVmTracker extends BaseElement { + private gpuMemoryClickTable: LitTable | null | undefined; + private gpuMemoryClickSource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + + set data(data: number) { + // @ts-ignore + this.queryDataByDB(data); + this.init(); + } + + initElements(): void { + this.gpuMemoryClickTable = this.shadowRoot?.querySelector('#gpuMemoryClickTable'); + this.tableThead = this.gpuMemoryClickTable?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.gpuMemoryClickTable!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortGpuMemoryByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + new ResizeObserver(() => { + if (this.parentElement?.clientHeight != 0) { + // @ts-ignore + this.gpuMemoryClickTable?.shadowRoot?.querySelector('.table').style.height = this.parentElement.clientHeight - 18 + 'px'; + this.parentElement!.style.overflow = 'hidden'; + this.gpuMemoryClickTable?.reMeauseHeight(); + } + }).observe(this.parentElement!); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + queryDataByDB(startNs: number): void { + getTabGpuMemoryVMTrackerClickData(startNs, MemoryConfig.getInstance().iPid).then((data) => { + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + if (item.threadName !== null) { + item.thread = `${item.threadName}(${item.threadId})`; + } else { + item.thread = `Thread(${item.threadId})`; + } + item.timeStamp = ns2s(item.startNs); + item.sizes = Utils.getBinaryByteWithUnit(item.size); + }); + this.gpuMemoryClickTable!.recycleDataSource = data.sort(function ( + gpuMemoryLeftData: GpuMemory, + gpuMemoryRightData: GpuMemory + ) { + return gpuMemoryRightData.size - gpuMemoryLeftData.size; + }); + this.gpuMemoryClickSource = data; + } else { + this.gpuMemoryClickTable!.recycleDataSource = []; + this.gpuMemoryClickSource = []; + } + }); + } + + initHtml(): string { + return ` + + + + + + + + + + + + `; + } + + sortGpuMemoryByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.gpuMemoryClickTable!.recycleDataSource = this.gpuMemoryClickSource; + break; + default: + let array = [...this.gpuMemoryClickSource]; + switch (column) { + case 'startNs': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.startNs - gpuMemoryRightData.startNs + : gpuMemoryRightData.startNs - gpuMemoryLeftData.startNs; + }); + break; + case 'gpuName': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.gpuName}`.localeCompare(`${gpuMemoryRightData.gpuName}`) + : `${gpuMemoryRightData.gpuName}`.localeCompare(`${gpuMemoryLeftData.gpuName}`); + }); + break; + case 'size': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.size - gpuMemoryRightData.size + : gpuMemoryRightData.size - gpuMemoryLeftData.size; + }); + break; + case 'thread': + this.gpuMemoryClickTable!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.thread}`.localeCompare(`${gpuMemoryRightData.thread}`) + : `${gpuMemoryRightData.thread}`.localeCompare(`${gpuMemoryLeftData.thread}`); + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.ts b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.ts new file mode 100644 index 0000000000000000000000000000000000000000..9bd139542768901982bcc8d14898055d6e78d655 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.ts @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection.js'; +import { resizeObserver } from '../SheetUtils.js'; +import { getTabGpuMemoryData } from '../../../../database/SqlLite.js'; +import { GpuMemory } from '../../../../bean/AbilityMonitor.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { Utils } from '../../base/Utils.js'; + +@element('tabpane-gpu-memory-vmtracker') +export class TabPaneGpuMemoryVmTracker extends BaseElement { + private gpuMemoryTableTbl: LitTable | null | undefined; + private gpuMemorySource: Array = []; + private tableThead: HTMLDivElement | undefined | null; + private gpuMemoryTimeRange: HTMLDivElement | undefined | null; + + set data(gpuMemoryValue: SelectionParam | any) { + if (gpuMemoryValue.gpuMemoryTrackerData.length > 0) { + this.gpuMemoryTimeRange!.textContent = + 'Selected range: ' + ((gpuMemoryValue.rightNs - gpuMemoryValue.leftNs) / 1000000.0).toFixed(5) + ' ms'; + this.gpuMemoryTableTbl!.loading = true; + this.queryDataByDB(gpuMemoryValue); + this.init(); + } + } + + initElements(): void { + this.gpuMemoryTableTbl = this.shadowRoot?.querySelector('#damTable'); + this.tableThead = this.gpuMemoryTableTbl?.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.gpuMemoryTimeRange = this.shadowRoot?.querySelector('#gpu-memory-time-range') as HTMLDivElement; + this.gpuMemoryTableTbl!.addEventListener('column-click', (e) => { + // @ts-ignore + this.sortGpuMemoryByColumn(e.detail.key, e.detail.sort); + }); + } + + connectedCallback(): void { + super.connectedCallback(); + resizeObserver(this.parentElement!, this.gpuMemoryTableTbl!); + } + + queryDataByDB(val: SelectionParam | any): void { + getTabGpuMemoryData( + val.leftNs, + val.rightNs, + MemoryConfig.getInstance().iPid, + (MemoryConfig.getInstance().interval * 1000000) / 5 + ).then((data) => { + this.gpuMemoryTableTbl!.loading = false; + if (data.length !== null && data.length > 0) { + data.forEach((item) => { + if (item.threadName !== null) { + item.thread = `${item.threadName}(${item.threadId})`; + } else { + item.thread = `Thread(${item.threadId})`; + } + item.avgSizes = Utils.getBinaryByteWithUnit(Math.round(item.avgSize)); + item.minSizes = Utils.getBinaryByteWithUnit(item.minSize); + item.maxSizes = Utils.getBinaryByteWithUnit(item.maxSize); + }); + this.gpuMemorySource = data; + this.gpuMemoryTableTbl!.recycleDataSource = this.gpuMemorySource.sort(function ( + gpuMemoryLeftData: GpuMemory, + gpuMemoryRightData: GpuMemory + ) { + return gpuMemoryRightData.avgSize - gpuMemoryLeftData.avgSize; + }); + } else { + this.gpuMemoryTableTbl!.recycleDataSource = []; + this.gpuMemorySource = []; + } + }); + } + + private init(): void { + const thTable = this.tableThead!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tableThead!.hasAttribute('sort')) { + this.tableThead!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + initHtml(): string { + return ` + +
    +
    + +
    +
    + + + + + + + + + + + + +
    + `; + } + + sortGpuMemoryByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.gpuMemoryTableTbl!.recycleDataSource = this.gpuMemorySource; + break; + default: + let array = [...this.gpuMemorySource]; + switch (column) { + case 'gpuName': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.gpuName}`.localeCompare(`${gpuMemoryRightData.gpuName}`) + : `${gpuMemoryRightData.gpuName}`.localeCompare(`${gpuMemoryLeftData.gpuName}`); + }); + break; + case 'avgSize': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.avgSize - gpuMemoryRightData.avgSize + : gpuMemoryRightData.avgSize - gpuMemoryLeftData.avgSize; + }); + break; + case 'minSize': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.minSize - gpuMemoryRightData.minSize + : gpuMemoryRightData.minSize - gpuMemoryLeftData.minSize; + }); + break; + case 'maxSize': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? gpuMemoryLeftData.maxSize - gpuMemoryRightData.maxSize + : gpuMemoryRightData.maxSize - gpuMemoryLeftData.maxSize; + }); + break; + case 'thread': + this.gpuMemoryTableTbl!.recycleDataSource = array.sort((gpuMemoryLeftData, gpuMemoryRightData) => { + return sort === 1 + ? `${gpuMemoryLeftData.thread}`.localeCompare(`${gpuMemoryRightData.thread}`) + : `${gpuMemoryRightData.thread}`.localeCompare(`${gpuMemoryLeftData.thread}`); + }); + break; + } + break; + } + } +} diff --git a/ide/src/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.ts b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.ts new file mode 100644 index 0000000000000000000000000000000000000000..e97b8cfec78b1b17fd5322f18618d91fd3d8b0b2 --- /dev/null +++ b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.ts @@ -0,0 +1,187 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { SelectionParam } from '../../../../bean/BoxSelection'; +import { queryVmTrackerShmSizeData } from '../../../../database/SqlLite.js'; +import { Utils } from '../../base/Utils.js'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; + +@element('tabpane-vmtracker-shm') +export class TabPaneVmTrackerShm extends BaseElement { + private TableEl: LitTable | undefined | null; + private shmData: Array = []; + private sortArray: Array = []; + private memoryConfig: MemoryConfig = MemoryConfig.getInstance(); + private tabTitle: HTMLDivElement | undefined | null; + private range: HTMLLabelElement | null | undefined; + + set data(valVmTrackerShm: SelectionParam | any) { + if (valVmTrackerShm.vmtrackershm.length > 0) { + this.init(); + this.clear(); + this.range!.textContent = + 'Selected range: ' + + parseFloat(((valVmTrackerShm.rightNs - valVmTrackerShm.leftNs) / 1000000.0).toFixed(5)) + + ' ms'; + this.queryDataByDB(valVmTrackerShm); + } + } + + initElements(): void { + this.TableEl = this.shadowRoot!.querySelector('#tb-shm') as LitTable; + this.range = this.shadowRoot?.querySelector('#time-range'); + this.tabTitle = this.TableEl!.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.TableEl!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.sortByColumn(evt.detail.key, evt.detail.sort); + }); + } + + queryDataByDB(srVal: SelectionParam | any): void { + queryVmTrackerShmSizeData( + srVal.leftNs, + srVal.rightNs, + this.memoryConfig.iPid, + (MemoryConfig.getInstance().interval * 1000_000) / 5 + ).then((result) => { + if (result.length > 0) { + for (let filter of result) { + filter.time = ns2s(filter.startNS); + filter.sumSizeStr = Utils.getBinaryByteWithUnit(filter.sum); + filter.avgSizeStr = Utils.getBinaryByteWithUnit(filter.avg); + filter.minSizeStr = Utils.getBinaryByteWithUnit(filter.min); + filter.maxSizeStr = Utils.getBinaryByteWithUnit(filter.max); + } + this.shmData = result.sort((a, b) => b.avg - a.avg); + this.TableEl!.recycleDataSource = this.shmData; + } + }); + } + + clear(): void { + this.TableEl!.recycleDataSource = []; + } + + private init(): void { + const thTable = this.tabTitle!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tabTitle!.hasAttribute('sort')) { + this.tabTitle!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + sortByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.TableEl!.snapshotDataSource = this.shmData; + break; + default: + this.sortArray = [...this.shmData]; + switch (column) { + case 'time': + this.TableEl!.snapshotDataSource = this.sortArray.sort((leftStartNS, rightStartNS) => { + return sort === 1 + ? leftStartNS.startNS - rightStartNS.startNS + : rightStartNS.startNS - leftStartNS.startNS; + }); + break; + case 'flag': + this.TableEl!.snapshotDataSource = this.sortArray.sort((leftFlag, rightFlag) => { + return sort === 1 ? leftFlag.flag - rightFlag.flag : rightFlag.flag - leftFlag.flag; + }); + break; + case 'minSizeStr': + this.TableEl!.snapshotDataSource = this.sortArray.sort((leftMin, rightMin) => { + return sort === 1 ? leftMin.min - rightMin.min : rightMin.min - leftMin.min; + }); + break; + case 'avgSizeStr': + this.TableEl!.snapshotDataSource = this.sortArray.sort((leftAvg, rightAvg) => { + return sort === 1 ? leftAvg.avg - rightAvg.avg : rightAvg.avg - leftAvg.avg; + }); + break; + case 'maxSizeStr': + this.TableEl!.snapshotDataSource = this.sortArray.sort((leftMax, rightMax) => { + return sort === 1 ? leftMax.max - rightMax.max : rightMax.max - leftMax.max; + }); + break; + } + break; + } + } + + initHtml(): string { + return ` + + + + + + + + + + + + + + + `; + } +} diff --git a/ide/src/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.ts b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.ts new file mode 100644 index 0000000000000000000000000000000000000000..2dd4a19b606e2fd9433eb286118f967dfbcae58d --- /dev/null +++ b/ide/src/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.ts @@ -0,0 +1,229 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { BaseElement, element } from '../../../../../base-ui/BaseElement.js'; +import { LitTable } from '../../../../../base-ui/table/lit-table.js'; +import { queryVmTrackerShmSelectionData } from '../../../../database/SqlLite.js'; +import { SpSystemTrace } from '../../../SpSystemTrace.js'; +import { Utils } from '../../base/Utils.js'; +import { SnapshotStruct } from '../../../../database/ui-worker/ProcedureWorkerSnapshot'; +import { MemoryConfig } from '../../../../bean/MemoryConfig.js'; +import { ns2s } from '../../../../database/ui-worker/ProcedureWorkerCommon.js'; + +@element('tabpane-vmtracker-shm-selection') +export class TabPaneVmTrackerShmSelection extends BaseElement { + private TableEl: LitTable | undefined | null; + private shmData: Array = []; + private memoryConfig: MemoryConfig = MemoryConfig.getInstance(); + private tabTitle: HTMLDivElement | undefined | null; + + setShmData(data: SnapshotStruct, dataList: Array): void { + this.init(); + this.clear(); + this.queryDataByDB(data); + } + + initElements(): void { + this.TableEl = this.shadowRoot!.querySelector('#tb-shm-selection') as LitTable; + this.tabTitle = this.TableEl!.shadowRoot?.querySelector('.thead') as HTMLDivElement; + this.TableEl!.addEventListener('column-click', (evt) => { + // @ts-ignore + this.sortByColumn(evt.detail.key, evt.detail.sort); + }); + } + + queryDataByDB(data: SnapshotStruct): void { + queryVmTrackerShmSelectionData(data.startNs, this.memoryConfig.iPid).then((result) => { + if (result.length > 0) { + for (let filter of result) { + filter.name = SpSystemTrace.DATA_DICT.get(filter.name)?.split('/'); + filter.ts = ns2s(filter.startNS); + filter.sizeStr = Utils.getBinaryByteWithUnit(filter.size); + this.TableEl!.getItemTextColor = (filter): any => { + if (filter.flag === 1) { + return '#6b6b6b96'; + } else if (filter.flag === 2) { + return '#4a4a4a'; + } else { + return '#000000'; + } + }; + } + this.shmData = result.sort((a, b) => b.size - a.size); + this.TableEl!.recycleDataSource = this.shmData; + } + }); + } + + clear(): void { + this.TableEl!.recycleDataSource = []; + } + + private init(): void { + const thTable = this.tabTitle!.querySelector('.th'); + const list = thTable!.querySelectorAll('div'); + if (this.tabTitle!.hasAttribute('sort')) { + this.tabTitle!.removeAttribute('sort'); + list.forEach((item) => { + item.querySelectorAll('svg').forEach((svg) => { + svg.style.display = 'none'; + }); + }); + } + } + + sortByColumn(column: string, sort: number): void { + switch (sort) { + case 0: + this.TableEl!.snapshotDataSource = this.shmData; + break; + default: + let arr = [...this.shmData]; + switch (column) { + case 'ts': + this.TableEl!.snapshotDataSource = arr.sort((leftTs, rightTs) => { + return sort === 1 ? leftTs.startNS - rightTs.startNS : rightTs.startNS - leftTs.startNS; + }); + break; + case 'fd': + this.TableEl!.snapshotDataSource = arr.sort((leftFd, rightFd) => { + return sort === 1 ? leftFd.fd - rightFd.fd : rightFd.fd - leftFd.fd; + }); + break; + case 'sizeStr': + this.TableEl!.snapshotDataSource = arr.sort((leftSize, rightSize) => { + return sort === 1 ? leftSize.size - rightSize.size : rightSize.size - leftSize.size; + }); + break; + case 'adj': + this.TableEl!.snapshotDataSource = arr.sort((leftAdj, rightAdj) => { + return sort === 1 ? leftAdj.adj - rightAdj.adj : rightAdj.adj - leftAdj.adj; + }); + break; + case 'name': + this.TableEl!.snapshotDataSource = arr.sort((leftName, rightName) => { + if (sort === 1) { + if (leftName.name > rightName.name) { + return 1; + } else if (leftName.name === rightName.name) { + return 0; + } else { + return -1; + } + } else { + if (rightName.name > leftName.name) { + return 1; + } else if (leftName.name === rightName.name) { + return 0; + } else { + return -1; + } + } + }); + break; + case 'id': + this.TableEl!.snapshotDataSource = arr.sort((leftId, rightId) => { + return sort === 1 ? leftId.id - rightId.id : rightId.id - leftId.id; + }); + break; + case 'time': + this.TableEl!.snapshotDataSource = arr.sort((leftTime, rightTime) => { + return sort === 1 ? leftTime.time - rightTime.time : rightTime.time - leftTime.time; + }); + break; + case 'count': + this.TableEl!.snapshotDataSource = arr.sort((leftCount, rightCount) => { + return sort === 1 ? leftCount.count - rightCount.count : rightCount.count - leftCount.count; + }); + break; + case 'purged': + this.TableEl!.snapshotDataSource = arr.sort((leftPurged, rightPurged) => { + return sort === 1 ? leftPurged.purged - rightPurged.purged : rightPurged.purged - leftPurged.purged; + }); + break; + case 'flag': + this.TableEl!.snapshotDataSource = arr.sort((leftFlag, rightFlag) => { + return sort === 1 ? leftFlag.flag - rightFlag.flag : rightFlag.flag - leftFlag.flag; + }); + break; + } + break; + } + } + + initHtml(): string { + return ` + + + + + + + + + + + + + + + + + + + + + + + + `; + } +} diff --git a/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts b/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts index 3de15dc5514eb4044bc1a3008aa898079f082021..eb00a1cc6e387ec39899954d9871228791efcc9f 100644 --- a/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts +++ b/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts @@ -15,11 +15,15 @@ import { Graph } from './Graph.js'; import { Rect } from './Rect.js'; -import {ns2s, ns2UnitS, TimerShaftElement} from '../TimerShaftElement.js'; +import { ns2s, ns2UnitS, TimerShaftElement } from '../TimerShaftElement.js'; import { ColorUtils } from '../base/ColorUtils.js'; import { CpuStruct } from '../../../database/ui-worker/ProcedureWorkerCPU.js'; +import { CurrentSlicesTime } from '../../SpSystemTrace.js'; const MarkPadding = 5; +const FIT_TOTALX_MIN: number = 280; +const FIT_TOTALX_MAX: number = 300; +const MID_OFFSET: number = 10; export class Mark extends Graph { name: string | undefined; @@ -80,6 +84,7 @@ export interface TimeRange { export class RangeRuler extends Graph { public rangeRect: Rect; + public currentSlicesTime: CurrentSlicesTime; public markAObj: Mark; public markBObj: Mark; public drawMark: boolean = false; @@ -94,6 +99,7 @@ export class RangeRuler extends Graph { markAX: number = 0; markBX: number = 0; isPress: boolean = false; + pressFrameIdF: number = -1; pressFrameIdW: number = -1; pressFrameIdS: number = -1; pressFrameIdA: number = -1; @@ -114,6 +120,8 @@ export class RangeRuler extends Graph { private readonly notifyHandler: (r: TimeRange) => void; private scale: number = 0; private delayTimer: any = null; + private rulerW = 0; + //缩放级别 private scales: Array = [ 50, 100, 200, 500, 1_000, 2_000, 5_000, 10_000, 20_000, 50_000, 100_000, 200_000, 500_000, 1_000_000, 2_000_000, @@ -139,6 +147,7 @@ export class RangeRuler extends Graph { new Rect(range.endX, frame.y, 1, frame.height) ); this.rangeRect = new Rect(range.startX, frame.y, range.endX - range.startX, frame.height); + this.currentSlicesTime = new CurrentSlicesTime(); } set cpuUsage(value: Array<{ cpu: number; ro: number; rate: number }>) { @@ -160,7 +169,6 @@ export class RangeRuler extends Graph { miniHeight ); } - ``; } draw(discardNotify: boolean = false): void { @@ -448,6 +456,7 @@ export class RangeRuler extends Graph { if (this.pressFrameIdD != -1) cancelAnimationFrame(this.pressFrameIdD); if (this.pressFrameIdW != -1) cancelAnimationFrame(this.pressFrameIdW); if (this.pressFrameIdS != -1) cancelAnimationFrame(this.pressFrameIdS); + if (this.pressFrameIdF != -1) cancelAnimationFrame(this.pressFrameIdF); } cancelUpFrame() { @@ -459,7 +468,10 @@ export class RangeRuler extends Graph { cancelTimeOut: any = undefined; - keyPress(keyboardEvent: KeyboardEvent) { + keyPress(keyboardEvent: KeyboardEvent, currentSlicesTime?: CurrentSlicesTime) { + if (currentSlicesTime) { + this.currentSlicesTime = currentSlicesTime; + } if ( this.animaStartTime == undefined || (this.pressedKeys.length > 0 && @@ -500,6 +512,124 @@ export class RangeRuler extends Graph { }, 1000); } + keyPressF() { + const DIS = 100; + let clientWidth = this.canvas?.clientWidth || 0; + let midX = Math.round(clientWidth / 2); + let sliceMidX = 0; + let startTime = 0; + let endTime = 0; + this.rulerW = this.canvas!.offsetWidth; + if (this.currentSlicesTime.startTime) { + startTime = this.currentSlicesTime.startTime; + } else { + return; + } + if (this.currentSlicesTime.endTime) { + endTime = this.currentSlicesTime.endTime; + } else { + return; + } + let startX = (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + let endX = (this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + let totalX = 0; + totalX = Math.round(endX - startX); + sliceMidX = Math.round(startX + totalX / 2); + let count1 = 0; + let count2 = 0; + let sliceMidXMap = new Map(); + let animF = () => { + startX = (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + endX = (this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + totalX = Math.round(endX - startX); + sliceMidX = Math.round(startX + totalX / 2); + let x = 1; + do { + startX = (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + endX = (this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + totalX = Math.round(endX - startX); + sliceMidX = Math.round(startX + (endX - startX) / 2); + if (sliceMidX !== sliceMidXMap.get('tempMid1') && sliceMidX !== sliceMidXMap.get('tempMid2')) { + if (x % 2 === 0) { + sliceMidXMap.set('tempMid2', sliceMidX); // 偶数 + } else { + sliceMidXMap.set('tempMid1', sliceMidX); // 奇数 + } + } else { + if (sliceMidX === sliceMidXMap.get('tempMid1')) { + count1++; + } + if (sliceMidX === sliceMidXMap.get('tempMid2')) { + count2++; + } + } + if (count1 >= 10 || count2 >= 10) { + let tempMid1 = sliceMidXMap.get('tempMid1') || 0; + let tempMid2 = sliceMidXMap.get('tempMid2') || 0; + if (sliceMidX === tempMid1 && tempMid1 === tempMid2) { + sliceMidX += 11; + } + if (sliceMidX === tempMid1 && sliceMidX !== tempMid2) { + if (sliceMidX < tempMid2) { + sliceMidX += 15; + } else { + sliceMidX -= 10; + } + } + if (sliceMidX === tempMid2 && sliceMidX !== tempMid1) { + if (sliceMidX < tempMid1) { + sliceMidX += 15; + } else { + sliceMidX -= 10; + } + } + } + x++; + if (sliceMidX >= midX - MID_OFFSET && sliceMidX <= midX + MID_OFFSET) { + if ((totalX < FIT_TOTALX_MIN && totalX >= 0) || totalX > FIT_TOTALX_MAX) { + this.zoomFit(startTime, endTime); + } + this.fillX(); + this.range.refresh = true; + this.notifyHandler(this.range); + this.range.refresh = false; + return; + } + let s = (this.scale / this.p) * this.currentDuration * 0.2; + let big_s = (this.scale / this.p) * this.currentDuration * 1.2; + if (sliceMidX > midX + MID_OFFSET) { + let distance = sliceMidX - midX; + if (distance > DIS) { + this.range.startNS += big_s; + this.range.endNS += big_s; + } else { + this.range.startNS += s; + this.range.endNS += s; + } + } + if (sliceMidX < midX - MID_OFFSET) { + let distance = midX - sliceMidX; // 28.5 + if (distance > DIS) { + this.range.startNS -= big_s; + this.range.endNS -= big_s; + } else { + this.range.startNS -= s; + this.range.endNS -= s; + } + } + this.fillX(); + this.draw(); + this.range.refresh = false; + } while (sliceMidX < midX - MID_OFFSET || sliceMidX > midX + MID_OFFSET); + this.pressFrameIdF = requestAnimationFrame(animF); + }; + if (totalX <= 3) { + this.zoomFit(startTime, endTime); + this.pressFrameIdF = requestAnimationFrame(animF); + } + this.zoomFit(startTime, endTime); + this.pressFrameIdF = requestAnimationFrame(animF); + } keyPressW() { let animW = () => { if (this.scale === 50) { @@ -567,7 +697,7 @@ export class RangeRuler extends Graph { this.range.refresh = false; return; } - let s = (this.scale / this.p) * this.currentDuration * 1.2; + let s = (this.scale / this.p) * this.currentDuration * 0.4; this.range.startNS += s; this.range.endNS += s; this.fillX(); @@ -583,6 +713,7 @@ export class RangeRuler extends Graph { s: this.keyPressS, a: this.keyPressA, d: this.keyPressD, + f: this.keyPressF, }; keyboardKeyUpMap: any = { @@ -612,6 +743,7 @@ export class RangeRuler extends Graph { let startTime = new Date().getTime(); let animW = () => { if (this.scale === 50) { + this.fillX(); this.range.refresh = true; this.notifyHandler(this.range); this.range.refresh = false; @@ -638,6 +770,7 @@ export class RangeRuler extends Graph { let startTime = new Date().getTime(); let animS = () => { if (this.range.startNS <= 0 && this.range.endNS >= this.range.totalNS) { + this.fillX(); this.range.refresh = true; this.notifyHandler(this.range); this.range.refresh = false; @@ -664,6 +797,7 @@ export class RangeRuler extends Graph { let startTime = new Date().getTime(); let animA = () => { if (this.range.startNS <= 0) { + this.fillX(); this.range.refresh = true; this.notifyHandler(this.range); this.range.refresh = false; @@ -713,4 +847,128 @@ export class RangeRuler extends Graph { }; this.upFrameIdD = requestAnimationFrame(animD); } + zoomFit(startTime: number, endTime: number) { + let startX = (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + let endX = (this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + let totalX = Math.round(endX - startX); + this.centerXPercentage = 0.5; + let clientWidth = this.canvas?.clientWidth || 0; // 1424 + let midX = Math.round(clientWidth / 2); + this.currentDuration = 1000; + + let totalXMap = new Map(); + let count1 = 0; + let count2 = 0; + let animW = () => { + if (this.scale === 50) { + this.fillX(); + this.range.refresh = true; + this.notifyHandler(this.range); + this.range.refresh = false; + return; + } + if (totalX < 5 && this.scale >= 10_000_000) { + for (let i = 0; i < 15; i++) { + this.range.startNS += (this.centerXPercentage * this.currentDuration * this.scale) / this.p; + this.range.endNS -= ((1 - this.centerXPercentage) * this.currentDuration * this.scale) / this.p; + } + } else if (totalX < 100 && this.scale >= 10_000) { + for (let i = 0; i < 10; i++) { + this.range.startNS += (this.centerXPercentage * this.currentDuration * this.scale) / this.p; + this.range.endNS -= ((1 - this.centerXPercentage) * this.currentDuration * this.scale) / this.p; + } + } else { + this.range.startNS += (this.centerXPercentage * this.currentDuration * this.scale) / this.p; + this.range.endNS -= ((1 - this.centerXPercentage) * this.currentDuration * this.scale) / this.p; + } + this.fillX(); + this.draw(); + startX = (this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + endX = (this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS); + totalX = Math.round(endX - startX); + if (totalX !== totalXMap.get('totalX1')) { + totalXMap.set('totalX1', totalX); + } else { + if (totalX === totalXMap.get('totalX1')) { + count1++; + } + } + if (totalX >= FIT_TOTALX_MIN && totalX <= FIT_TOTALX_MAX) { + this.fillX(); + this.range.refresh = true; + this.notifyHandler(this.range); + this.range.refresh = false; + return; + } + if (totalX > FIT_TOTALX_MAX) { + if (count1 >= 10) { + return; + } + this.pressFrameIdS = requestAnimationFrame(animS); + this.fillX(); + this.range.refresh = true; + this.notifyHandler(this.range); + this.range.refresh = false; + return; + } + this.pressFrameIdW = requestAnimationFrame(animW); + }; + let animS = () => { + startX = Math.round((this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)); + endX = Math.round((this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)); + totalX = endX - startX; + if (totalX >= FIT_TOTALX_MIN && totalX <= FIT_TOTALX_MAX) { + this.fillX(); + this.range.refresh = true; + this.notifyHandler(this.range); + this.range.refresh = false; + return; + } + if (totalX > midX) { + for (let i = 0; i < 10; i++) { + this.range.startNS -= ((this.centerXPercentage * this.scale) / this.p) * this.currentDuration; + this.range.endNS += (((1 - this.centerXPercentage) * this.scale) / this.p) * this.currentDuration; + } + } else if (totalX >= 500) { + for (let i = 0; i < 5; i++) { + this.range.startNS -= ((this.centerXPercentage * this.scale) / this.p) * this.currentDuration; + this.range.endNS += (((1 - this.centerXPercentage) * this.scale) / this.p) * this.currentDuration; + } + } else { + this.range.startNS -= ((this.centerXPercentage * this.scale) / this.p) * this.currentDuration; + this.range.endNS += (((1 - this.centerXPercentage) * this.scale) / this.p) * this.currentDuration; + } + this.fillX(); + this.draw(); + this.range.refresh = false; + startX = Math.round((this.rulerW * (startTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)); + endX = Math.round((this.rulerW * (endTime - this.range.startNS)) / (this.range.endNS - this.range.startNS)); + totalX = endX - startX; + if (totalX !== totalXMap.get('totalX2')) { + totalXMap.set('totalX2', totalX); + } else { + if (totalX === totalXMap.get('totalX2')) { + count2++; + } + } + if (count2 >= 10) { + return; + } + if (totalX <= FIT_TOTALX_MIN) { + this.pressFrameIdW = requestAnimationFrame(animW); + this.fillX(); + this.range.refresh = true; + this.notifyHandler(this.range); + this.range.refresh = false; + return; + } + this.pressFrameIdS = requestAnimationFrame(animS); + }; + if (totalX > FIT_TOTALX_MAX) { + this.pressFrameIdS = requestAnimationFrame(animS); + } + if (totalX < FIT_TOTALX_MIN && totalX >= 0) { + this.pressFrameIdW = requestAnimationFrame(animW); + } + } } diff --git a/ide/src/trace/database/SqlLite.ts b/ide/src/trace/database/SqlLite.ts index 4bf2df50494ae12ddec71b0f5ba6221fa05481f3..66832e467e0cb0887287f6c8a6a1b6ded53aa8f9 100644 --- a/ide/src/trace/database/SqlLite.ts +++ b/ide/src/trace/database/SqlLite.ts @@ -30,6 +30,8 @@ import { NativeHookStatistics, } from '../bean/NativeHook.js'; import { + Dma, + GpuMemory, LiveProcess, ProcessHistory, SystemCpuSummary, @@ -84,6 +86,8 @@ import { DeviceStruct } from '../bean/FrameComponentBean.js'; import { FrameSpacingStruct } from './ui-worker/ProcedureWorkerFrameSpacing.js'; import { FrameDynamicStruct } from './ui-worker/ProcedureWorkerFrameDynamic.js'; import { FrameAnimationStruct } from './ui-worker/ProcedureWorkerFrameAnimation.js'; +import { SnapshotStruct } from './ui-worker/ProcedureWorkerSnapshot.js'; +import { MemoryConfig } from '../bean/MemoryConfig.js'; class DataWorkerThread extends Worker { taskMap: any = {}; @@ -137,6 +141,7 @@ class DbThread extends Worker { } dbOpen = async ( + parseConfig: string, sdkWasmConfig?: string ): Promise<{ status: boolean; @@ -162,6 +167,7 @@ class DbThread extends Worker { { id: id, action: 'open', + parseConfig: parseConfig, wasmConfig: sdkWasmConfig, buffer: DbPool.sharedBuffer! /*Optional. An ArrayBuffer representing an SQLite Database file*/, }, @@ -273,7 +279,7 @@ export class DbPool { progress('open database', 20); for (let i = 0; i < this.works.length; i++) { let thread = this.works[i]; - let { status, msg } = await thread.dbOpen(); + let { status, msg } = await thread.dbOpen(''); if (!status) { DbPool.sharedBuffer = null; return { status, msg }; @@ -281,7 +287,7 @@ export class DbPool { } return { status: true, msg: 'ok' }; }; - initSqlite = async (buf: ArrayBuffer, sdkWasmConfig: string, progress: Function) => { + initSqlite = async (buf: ArrayBuffer, parseConfig: string, sdkWasmConfig: string, progress: Function) => { this.progress = progress; progress('database loaded', 15); DbPool.sharedBuffer = buf; @@ -289,7 +295,7 @@ export class DbPool { let configMap; for (let i = 0; i < this.works.length; i++) { let thread = this.works[i]; - let { status, msg, buffer, sdkConfigMap } = await thread.dbOpen(sdkWasmConfig); + let { status, msg, buffer, sdkConfigMap } = await thread.dbOpen(parseConfig, sdkWasmConfig); if (!status) { DbPool.sharedBuffer = null; return { status, msg }; @@ -1243,6 +1249,16 @@ export const queryThreads = (): Promise> => query('queryThreads', `select id,tid,(ifnull(name,'Thread') || '(' || tid || ')') name from thread where id != 0;`); export const queryDataDICT = (): Promise> => query('queryDataDICT', `select * from data_dict;`); + +export const queryAppStartupProcessIds = (): Promise> => query('queryAppStartupProcessIds', ` + SELECT pid FROM process + WHERE ipid IN ( + SELECT ipid FROM app_startup + UNION + SELECT t.ipid FROM app_startup a LEFT JOIN thread t ON a.call_id = t.itid + UNION + SELECT ipid FROM static_initalize +);`); export const queryProcessContentCount = (): Promise> => query(`queryProcessContentCount`, `select pid,switch_count,thread_count,slice_count,mem_count from process;`); export const queryProcessThreadsByTable = (): Promise> => @@ -1383,13 +1399,6 @@ export const queryWakeUpThread_Desc = (): Promise> => (e.g.because of notifying a wait queue it was a suspended on) to when it started running.` ); -export const queryCPUWakeUpIdFromBean = (tid: number | undefined): Promise> => { - let sql = ` -select itid from thread where tid=${tid} - `; - return query('queryCPUWakeUpListFromBean', sql, {}); -}; - export const queryThreadWakeUp = (itid: number, startTime: number, dur: number): Promise> => query( 'queryThreadWakeUp', @@ -1422,6 +1431,7 @@ export const queryThreadWakeUpFrom = (itid: number, startTime: number): Promise< let sql = ` select (A.ts - B.start_ts) as ts, A.tid, + A.itid, A.pid, A.cpu, A.dur @@ -3580,6 +3590,147 @@ export const queryAnomalyDetailedData = (leftNs: number, rightNs: number): Promi { $leftNS: leftNs, $rightNS: rightNs } ); +export const queryGpuTotalType = (): Promise> => + query( + 'queryGpuTotalType', + ` + select distinct module_name_id id,data + from memory_window_gpu A left join data_dict B on A.module_name_id = B.id + where window_name_id = 0; + ` + ); + +export const queryGpuDataByTs = ( + ts: number, + window: number, + module: number | null +): Promise< + Array<{ + windowId: number; + moduleId: number; + categoryId: number; + size: number; + }> +> => { + let condition = + module === null + ? `and window_name_id = ${window}` + : `and window_name_id = ${window} and module_name_id = ${module}`; + let sql = `select window_name_id as windowId, + module_name_id as moduleId, + category_name_id as categoryId, + size + from memory_window_gpu, trace_range + where ts - start_ts = ${ts} ${condition};`; + return query('queryGpuDataByTs', sql); +}; + +export const queryGpuTotalData = (moduleId: number | null): Promise> => { + let moduleCondition = moduleId === null ? '' : `and module_name_id = ${moduleId}`; + let sql = ` + select (ts - start_ts) startNs, sum(size) value + from memory_window_gpu,trace_range + where window_name_id = 0 ${moduleCondition} + group by ts; + `; + return query('queryGpuTotalData', sql); +}; + +export const queryGpuGLData = (ipid: number): Promise> => { + let sql = ` + select (ts - start_ts) startNs,sum(value) value +from process_measure, trace_range +where filter_id = ( + select id + from process_measure_filter + where name = 'mem.gl_pss' and ipid = ${ipid} + ) +and ts between start_ts and end_ts +group by ts; + `; + return query('queryGpuGLData', sql); +}; + +export const queryGpuGLDataByRange = ( + ipid: number, + leftNs: number, + rightNs: number, + interval: number +): Promise> => { + let sql = ` + select (ts - start_ts) startTs,sum(value) size +from process_measure, trace_range +where filter_id = ( + select id + from process_measure_filter + where name = 'mem.gl_pss' and ipid = ${ipid} + ) +and not ((startTs + ${interval} < ${leftNs}) or (startTs > ${rightNs})) +group by ts; + `; + return query('queryGpuGLDataByRange', sql); +}; + +export const queryGpuDataByRange = ( + leftNs: number, + rightNs: number, + interval: number +): Promise< + Array<{ + startTs: number; + windowId: number; + moduleId: number; + categoryId: number; + sumSize: number; + avgSize: number; + maxSize: number; + minSize: number; + }> +> => { + let sql = ` + select (ts - start_ts) startTs, + window_name_id windowId, + module_name_id moduleId, + category_name_id categoryId, + sum(size) sumSize, + avg(size) avgSize, + max(size) maxSize, + min(size) minSize + from memory_window_gpu,trace_range + where not ((startTs + ${interval} < ${leftNs}) or (startTs > ${rightNs})) + group by ts,window_name_id,module_name_id,category_name_id; + `; + return query('queryGpuWindowData', sql); +}; + +export const queryGpuWindowData = ( + windowId: number, + moduleId: number | null +): Promise> => { + let moduleCondition = moduleId === null ? '' : `and module_name_id = ${moduleId}`; + let sql = ` + select (ts - start_ts) startNs, sum(size) value + from memory_window_gpu,trace_range + where window_name_id = ${windowId} ${moduleCondition} + group by ts; + `; + return query('queryGpuWindowData', sql); +}; + +export const queryGpuWindowType = (): Promise> => + query( + 'queryGpuWindowType', + ` + select distinct A.window_name_id as id,B.data, null as pid +from memory_window_gpu A left join data_dict B on A.window_name_id = B.id +where window_name_id != 0 +union all +select distinct A.module_name_id id, B.data, A.window_name_id pid +from memory_window_gpu A left join data_dict B on A.module_name_id = B.id +where window_name_id != 0; + ` + ); + export const querySmapsExits = (): Promise> => query( 'querySmapsExits', @@ -3593,7 +3744,8 @@ export const querySmapsExits = (): Promise> => export const querySmapsData = (columnName: string): Promise> => query( 'querySmapsCounterData', - `SELECT (A.timestamp - B.start_ts) as startNS, sum(${columnName}) as value FROM smaps A,trace_range B GROUP by A.timestamp;` + `SELECT (A.timestamp - B.start_ts) as startNs, sum(${columnName}) * 1024 as value, $columnName as name FROM smaps A,trace_range B GROUP by A.timestamp;`, + { $columnName: columnName } ); export const querySmapsDataMax = (columnName: string): Promise> => @@ -3603,15 +3755,15 @@ export const querySmapsDataMax = (columnName: string): Promise> => SELECT (A.timestamp - B.start_ts) as startNS,sum(${columnName}) as max_value FROM smaps A,trace_range B GROUP by A.timestamp order by max_value desc LIMIT 1` ); -export const getTabSmapsMaxRss = (leftNs: number, rightNs: number): Promise> => +export const getTabSmapsMaxSize = (leftNs: number, rightNs: number, dur: number): Promise> => query( 'getTabSmapsMaxRss', ` -SELECT (A.timestamp - B.start_ts) as startNS, sum(resident_size) as max_value FROM smaps A,trace_range B where startNS <= $rightNs`, - { $rightNs: rightNs } +SELECT (A.timestamp - B.start_ts) as startNS, sum(virtaul_size) *1024 as max_value FROM smaps A,trace_range B where startNS <= $rightNs and (startNS+$dur)>=$leftNs`, + { $rightNs: rightNs, $leftNs: leftNs, $dur: dur } ); -export const getTabSmapsData = (leftNs: number, rightNs: number): Promise> => +export const getTabSmapsData = (leftNs: number, rightNs: number, dur: number): Promise> => query( 'getTabSmapsData', ` @@ -3619,16 +3771,18 @@ export const getTabSmapsData = (leftNs: number, rightNs: number): Promise=$leftNs`, + { $rightNs: rightNs, $leftNs: leftNs, $dur: dur }, 'exec' ); @@ -4389,7 +4543,7 @@ export const queryFrameAnimationData = (): Promise> ts;` ); -export const queryFrameDynamicData = (componentName: string): Promise> => +export const queryFrameDynamicData = (): Promise> => query( 'queryFrameDynamicData', `SELECT @@ -4404,22 +4558,19 @@ export const queryFrameDynamicData = (componentName: string): Promise > => query( 'queryFrameApp', `SELECT - DISTINCT d.name as appName + DISTINCT d.name FROM dynamic_frame AS d, trace_range AS R @@ -4450,7 +4601,7 @@ export const queryAnimationFrameFps = ( d.end_time <= (${endTime} + R.start_ts)` ); -export const queryFrameSpacing = (appName: string): Promise> => +export const queryFrameSpacing = (): Promise> => query( 'queryFrameSpacing', `SELECT @@ -4464,11 +4615,8 @@ export const queryFrameSpacing = (appName: string): Promise> => @@ -4495,3 +4643,630 @@ export const queryAllTaskPoolPid = (): Promise> => LEFT JOIN thread ON thread.id = callstack.callid LEFT JOIN process ON process.id = thread.ipid WHERE task_pool.execute_task_row IS NOT NULL` ); +export const queryVmTrackerShmData = (iPid: number): Promise> => + query( + 'queryVmTrackerShmData', + `SELECT (A.ts - B.start_ts) as startNs, + sum(A.size) as value + FROM + memory_ashmem A,trace_range B + where + A.ipid = ${iPid} + and + flag = 0 + GROUP by A.ts`, + {} + ); + +export const queryVmTrackerShmSizeData = ( + leftNs: number, + rightNs: number, + iPid: number, + dur: number +): Promise> => + query( + 'queryVmTrackerShmSizeData', + `SELECT ( A.ts - B.start_ts ) AS startNS, + A.flag, + avg( A.size ) AS avg, + max( A.size ) AS max, + min( A.size ) AS min, + sum( A.size ) AS sum + FROM + memory_ashmem A, + trace_range B + WHERE + startNS <= ${rightNs} and (startNS+ ${dur}) >=${leftNs} + AND ipid = ${iPid} + GROUP by flag`, + {} + ); + +export const queryVmTrackerShmSelectionData = (startNs: number, ipid: number): Promise> => + query( + 'queryVmTrackerShmSelectionData', + `SELECT (A.ts - B.start_ts) as startNS,A.ipid, + A.fd,A.size,A.adj,A.ashmem_name_id as name, + A.ashmem_id as id,A.time,A.purged,A.ref_count as count, + A.flag + FROM memory_ashmem A,trace_range B + where startNS = ${startNs} and ipid = ${ipid};`, + {} + ); +export const getTabSmapsRecordData = (rightNs: number): Promise> => + query( + 'getTabSmapsRecordData', + ` + SELECT + (A.timestamp - t.start_ts) AS tsNS, + start_addr, + end_addr, + dirty * 1024 as dirty, + A.type, + swapper * 1024 as swapper, + resident_size * 1024 AS rss, + protection_id as pid, + pss * 1024 as pss,virtaul_size * 1024 AS size,reside,A.path_id AS path, + shared_clean * 1024 as shared_clean,shared_dirty * 1024 as shared_dirty,private_clean * 1024 as private_clean , + private_dirty * 1024 as private_dirty,swap * 1024 as swap,swap_pss * 1024 as swap_pss + FROM smaps A, + trace_range AS t + WHERE (tsNS) = $rightNs`, + { $rightNs: rightNs }, + 'exec' + ); + +export const getTabSmapsStatisticMaxSize = (rightNs: number): Promise> => + query( + 'getTabSmapsStatisticMaxRss', + ` +SELECT (A.timestamp - B.start_ts) as startNS, sum(virtaul_size) * 1024 as max_value FROM smaps A,trace_range B where startNS = $rightNs`, + { $rightNs: rightNs } + ); +export const queryMemoryConfig = (): Promise> => + query( + 'queryMemoryConfiig', + `SELECT ipid as iPid, process.pid AS pid, + process.name AS processName, + (SELECT value FROM trace_config WHERE trace_source = 'memory_config' AND key = 'sample_interval') AS interval + FROM + trace_config + LEFT JOIN process ON value = ipid + WHERE + trace_source = 'memory_config' + AND key = 'ipid' + ;` + ); + +// Ability Monitor Dma泳道图 +export const queryDmaAbilityData = (): Promise> => + query( + 'queryDmaAbilityData', + `SELECT + (A.ts - B.start_ts) as startNs, + sum(A.size) as value, + E.data as expTaskComm, + A.flag as flag + FROM memory_dma A,trace_range B + left join data_dict as E on E.id=A.exp_task_comm_id + WHERE + A.flag = 0 + GROUP by A.ts;` + ); + +// Ability Monitor SkiaGpuMemory泳道图 +export const queryGpuMemoryAbilityData = (): Promise> => + query( + 'queryGpuMemoryAbilityData', + `SELECT + (A.ts - B.start_ts) as startNs, + sum(A.used_gpu_size) as value + FROM memory_process_gpu A,trace_range B + GROUP by A.ts;` + ); + +// VM Tracker Dma泳道图 +export const queryDmaSampsData = (process: number): Promise> => + query( + 'queryDmaSampsData', + `SELECT + (A.ts - B.start_ts) as startNs, + sum(A.size) as value, + A.flag as flag, + A.ipid as ipid, + E.data as expTaskComm + FROM memory_dma A,trace_range B + left join data_dict as E on E.id=A.exp_task_comm_id + WHERE + A.flag = 0 + and + $pid = A.ipid + GROUP by A.ts;`, + { $pid: process } + ); + +// VM Tracker Gpu Memory泳道图 +export const queryGpuMemoryData = (processId: number): Promise> => + query( + 'queryGpuMemorySampsData', + `SELECT + (A.ts - B.start_ts) as startNs, + sum(A.used_gpu_size) as value, + A.ipid as ipid + FROM memory_process_gpu A,trace_range B + WHERE + $pid = A.ipid + GROUP by A.ts;`, + { $pid: processId } + ); + +// Ability Monitor Purgeable泳道图 +export const queryPurgeableSysData = (isPin?: boolean): Promise> => { + const pinCondition = isPin ? ' AND a.ref_count > 0' : ''; + const names = isPin ? " ('sys.mem.pined.purg')" : "('sys.mem.active.purg','sys.mem.inactive.purg')"; + return query( + 'queryPurgeableSysData', + `SELECT + startNs, + sum( value ) AS value + FROM + ( + SELECT + m.ts - tr.start_ts AS startNs, + sum( m.value ) AS value + FROM + sys_mem_measure m, + trace_range tr + LEFT JOIN sys_event_filter f ON f.id = m.filter_id + WHERE + f.name IN ${names} + GROUP BY + m.ts UNION ALL + SELECT + a.ts - tr.start_ts AS startNs, + sum( a.size ) AS value + FROM + memory_ashmem a, + trace_range tr + WHERE + a.ts < tr.end_ts + AND a.flag = 0 + ${pinCondition} + GROUP BY + a.ts + ) + GROUP BY startNs` + ); +}; + +// VM Tracker Purgeable泳道图 +export const queryPurgeableProcessData = (ipid: number, isPin?: boolean): Promise> => { + const pinSql = isPin ? ' AND a.ref_count > 0' : ''; + const names = isPin ? " ('mem.purg_pin')" : "('mem.purg_sum')"; + return query( + 'queryPurgeableProcessData', + `SELECT startNs, sum( value ) AS value + FROM + (SELECT + m.ts - tr.start_ts AS startNs, + sum(m.value) AS value + FROM + process_measure m, + trace_range tr + LEFT JOIN process_measure_filter f ON f.id = m.filter_id + WHERE + f.name = ${names} + AND f.ipid = ${ipid} + GROUP BY m.ts + UNION ALL + SELECT + a.ts - tr.start_ts AS startNs, + sum( a.pss ) AS value + FROM + memory_ashmem a, + trace_range tr + WHERE + a.ts < tr.end_ts + AND a.flag = 0 + AND a.ipid = ${ipid} + ${pinSql} + GROUP BY a.ts) + GROUP BY startNs` + ); +}; + +//Ability Monitor Purgeable 框选 tab页 +export const querySysPurgeableTab = ( + leftNs: number, + rightNs: number, + dur: number, + isPin?: boolean +): Promise> => { + let pinsql = isPin ? ' AND ref_count > 0' : ''; + const names = isPin ? " ('sys.mem.pined.purg')" : "('sys.mem.active.purg','sys.mem.inactive.purg')"; + return query( + 'querySysPurgeableTab', + `SELECT name, MAX( size ) AS maxSize,MIN( size ) AS minSize,AVG( size ) AS avgSize + FROM + (SELECT + 'ShmPurg' AS name, + ts - tr.start_ts AS startTs, + SUM( size ) AS size + FROM + memory_ashmem, + trace_range tr + WHERE flag = 0 + ${pinsql} + GROUP BY ts UNION + SELECT + CASE + WHEN + f.name = 'sys.mem.active.purg' THEN + 'ActivePurg' + WHEN f.name = 'sys.mem.inactive.purg' THEN + 'InActivePurg' ELSE 'PinedPurg' + END AS name, + m.ts - tr.start_ts AS startTs, + m.value AS size + FROM + sys_mem_measure m, + trace_range tr + LEFT JOIN sys_event_filter f ON f.id = m.filter_id + WHERE + f.name IN ${names} + ), + trace_range tr + WHERE ${leftNs} <= startTs + ${dur} AND ${rightNs} >= startTs + GROUP BY name` + ); +}; + +//Ability Monitor Purgeable 点选 tab页 +export const querySysPurgeableSelectionTab = (startNs: number, isPin?: boolean): Promise> => { + const pinSql = isPin ? ' AND ref_count > 0' : ''; + const names = isPin ? " ('sys.mem.pined.purg')" : "('sys.mem.active.purg','sys.mem.inactive.purg')"; + return query( + 'querySysPurgeableSelectionTab', + `SELECT + ( CASE WHEN f.name = 'sys.mem.active.purg' THEN 'ActivePurg' WHEN f.name = 'sys.mem.inactive.purg' THEN 'InActivePurg' ELSE 'PinedPurg' END ) AS name, + m.value AS value + FROM + sys_mem_measure m, + trace_range tr + LEFT JOIN sys_event_filter f ON f.id = m.filter_id + WHERE + f.name IN ${names} + AND m.ts - tr.start_ts = ${startNs} + UNION + SELECT + 'ShmPurg' AS name, + SUM( size ) AS value + FROM + memory_ashmem, + trace_range tr + WHERE + memory_ashmem.ts - tr.start_ts = ${startNs} + AND flag=0 + ${pinSql} + GROUP BY ts` + ); +}; + +/////////////////////////////////////////////// +//VM Purgeable 框选 tab页 +export const queryProcessPurgeableTab = ( + leftNs: number, + rightNs: number, + dur: number, + ipid: number, + isPin?: boolean +): Promise> => { + const pinSql = isPin ? ' AND ref_count > 0' : ''; + let filterSql = isPin ? "'mem.purg_pin'" : "'mem.purg_sum'"; + return query( + 'queryProcessPurgeableTab', + `SELECT name, MAX(size) AS maxSize, MIN(size) AS minSize, AVG(size) AS avgSize + FROM + (SELECT + 'ShmPurg' AS name, ts - tr.start_ts AS startTs, SUM( pss ) AS size + FROM + memory_ashmem, + trace_range tr + WHERE + ipid = ${ipid} + AND flag = 0 + ${pinSql} + GROUP BY ts + UNION + SELECT + CASE + WHEN f.name = 'mem.purg_pin' THEN + 'PinedPurg' ELSE 'TotalPurg' + END AS name, + m.ts - tr.start_ts AS startTs, + sum( m.value ) AS size + FROM + process_measure m, + trace_range tr + LEFT JOIN process_measure_filter f ON f.id = m.filter_id + WHERE f.name = ${filterSql} + AND f.ipid = ${ipid} + GROUP BY m.ts + ) combined_data, trace_range tr + WHERE ${leftNs} <= startTs + ${dur} AND ${rightNs} >= startTs + GROUP BY name` + ); +}; + +//VM Purgeable 点选 tab页 +export const queryProcessPurgeableSelectionTab = ( + startNs: number, + ipid: number, + isPin?: boolean +): Promise> => { + const condition = isPin ? "'mem.purg_pin'" : "'mem.purg_sum'"; + const pinSql = isPin ? ' AND ref_count > 0' : ''; + return query( + 'queryProcessPurgeableSelectionTab', + `SELECT + ( CASE WHEN f.name = 'mem.purg_pin' THEN 'PinedPurg' ELSE 'TotalPurg' END ) AS name, + SUM( m.value ) AS value + FROM + process_measure m, + trace_range tr + left join process_measure_filter f on f.id = m.filter_id + WHERE + f.name = ${condition} + AND m.ts - tr.start_ts = ${startNs} + AND f.ipid = ${ipid} + GROUP BY m.ts + UNION + SELECT + 'ShmPurg' AS name, + SUM( pss ) AS size + FROM + memory_ashmem, + trace_range tr + WHERE + ipid = ${ipid} + AND ts - tr.start_ts = ${startNs} + AND flag = 0 + ${pinSql} + GROUP BY ts` + ); +}; + +export const getTabSmapsStatisticData = (rightNs: number): Promise> => + query( + 'getTabSmapsStatisticData', + ` + SELECT + (A.timestamp - t.start_ts) AS tsNS, + start_addr, + end_addr, + (dirty * 1021) as dirty, + (swapper *1024) as swapper, + A.type, + sum(resident_size) * 1024 AS rss, + protection_id as pid, + count(A.path_id) as count, + sum(pss) * 1024 as pss ,sum(virtaul_size) * 1024 AS size,sum(reside) as reside,A.path_id AS path, + sum(shared_clean) * 1024 as shared_clean,sum(shared_dirty) * 1024 as shared_dirty,sum(private_clean) * 1024 as private_clean,sum(private_dirty) * 1024 as private_dirty, + sum(swap) * 1024 as swap,sum(swap_pss) * 1024 as swap_pss + FROM smaps A, + trace_range AS t + WHERE (tsNS) =$rightNs + group by type,path`, + { $rightNs: rightNs }, + 'exec' + ); + +export const getTabSmapsStatisticSelectData = (leftNs: number, rightNs: number, dur: number): Promise> => + query( + 'getTabSmapsStatisticData', + ` + SELECT + (A.timestamp - t.start_ts) AS tsNS, + start_addr, + end_addr, + (dirty * 1021) as dirty, + (swapper *1024) as swapper, + A.type, + sum(resident_size) * 1024 AS rss, + protection_id as pid, + count(A.path_id) as count, + sum(pss) * 1024 as pss ,sum(virtaul_size) * 1024 AS size,sum(reside) as reside,A.path_id AS path, + sum(shared_clean) * 1024 as shared_clean,sum(shared_dirty) * 1024 as shared_dirty,sum(private_clean) * 1024 as private_clean,sum(private_dirty) * 1024 as private_dirty, + sum(swap) * 1024 as swap,sum(swap_pss) * 1024 as swap_pss + FROM smaps A, + trace_range AS t + WHERE (tsNS) <=$rightNs and (tsNS+$dur)>=$leftNs + group by type,path`, + { $rightNs: rightNs, $leftNs: leftNs, $dur: dur }, + 'exec' + ); + +//Ability Monitor Dma 框选 +export const getTabDmaAbilityData = (leftNs: number, rightNs: number, dur: number): Promise> => + query( + 'getTabDmaAbilityData', + `SELECT (S.ts-TR.start_ts) as startNs, + MAX(S.size) as maxSize, + MIN(S.size) as minSize, + Avg(S.size) as avgSize, + E.pid as processId, + E.name as processName + from trace_range as TR,memory_dma as S + left join process as E on E.ipid=S.ipid + WHERE + $leftNS <= startNs + ${dur} and $rightNS >= startNs + and flag = 0 + GROUP by E.pid + `, + { $leftNS: leftNs, $rightNS: rightNs } + ); + +//Ability Monitor SkiaGpuMemory 框选 +export const getTabGpuMemoryAbilityData = (leftNs: number, rightNs: number, dur: number): Promise> => + query( + 'getTabGpuMemoryAbilityData', + `SELECT + (S.ts-TR.start_ts) as startNs, + A.data as gpuName, + MAX(S.used_gpu_size) as maxSize, + MIN(S.used_gpu_size) as minSize, + Avg(S.used_gpu_size) as avgSize, + E.pid as processId, + E.name as processName + from trace_range as TR,memory_process_gpu as S + left join data_dict as A on A.id=S.gpu_name_id + left join process as E on E.ipid=S.ipid + WHERE + $leftNS <= startNs + ${dur} + and + $rightNS >= startNs + GROUP by + E.pid ,S.gpu_name_id + `, + { $leftNS: leftNs, $rightNS: rightNs } + ); + +//VM Tracker Dma 框选 +export const getTabDmaVmTrackerData = ( + leftNs: number, + rightNs: number, + processId: number, + dur: number +): Promise> => + query( + 'getTabDmaVmTrackerData', + `SELECT (S.ts-TR.start_ts) as startNs, + MAX(S.size) as maxSize, + MIN(S.size) as minSize, + Avg(S.size) as avgSize + from trace_range as TR,memory_dma as S + left join data_dict as C on C.id=S.exp_task_comm_id + where + $leftNS <= startNs + ${dur} and $rightNS >= startNs + and flag = 0 + and + $pid = S.ipid + `, + { $leftNS: leftNs, $rightNS: rightNs, $pid: processId } + ); +//VM Tracker SkiaGpuMemory 框选 +export const getTabGpuMemoryData = ( + leftNs: number, + rightNs: number, + processId: number, + dur: number +): Promise> => + query( + 'getTabGpuMemoryData', + `SELECT + (S.ts-TR.start_ts) as startNs, + A.data as gpuName, + T.tid as threadId, + T.name as threadName, + MAX(S.used_gpu_size) as maxSize, + MIN(S.used_gpu_size) as minSize, + Avg(S.used_gpu_size) as avgSize + from trace_range as TR,memory_process_gpu as S + left join data_dict as A on A.id=S.gpu_name_id + left join thread as T on T.itid=S.itid + where + $leftNS <= startNs + ${dur} + and + $rightNS >= startNs + and + $pid = S.ipid + `, + { $leftNS: leftNs, $rightNS: rightNs, $pid: processId } + ); + +//Ability Monitor Dma 点选 +export const getTabDmaAbilityClickData = (startNs: number): Promise> => + query( + 'getTabDmaAbilityClickData', + `SELECT + (S.ts-TR.start_ts) as startNs, + S.fd as fd, + S.size as size, + S.ino as ino, + S.exp_pid as expPid, + buf_name_id as bufName, + exp_name_id as expName, + exp_task_comm_id as expTaskComm, + E.pid as processId, + E.name as processName, + S.flag as flag + from trace_range as TR,memory_dma as S + left join process as E on E.ipid=S.ipid + WHERE + startNs = ${startNs} + `, + { $startNs: startNs } + ); + +//VM Tracker Dma 点选 +export const getTabDmaVMTrackerClickData = (startNs: number, processId: number): Promise> => + query( + 'getTabDmaVMTrackerClickData', + `SELECT + (S.ts-TR.start_ts) as startNs, + S.fd as fd, + S.size as size, + S.ino as ino, + S.exp_pid as expPid, + buf_name_id as bufName, + exp_name_id as expName, + exp_task_comm_id as expTaskComm, + S.flag as flag + from trace_range as TR,memory_dma as S + WHERE + startNs = ${startNs} + AND + $pid = S.ipid + `, + { $startNs: startNs, $pid: processId } + ); + +//Ability Monitor SkiaGpuMemory 点选 +export const getTabGpuMemoryAbilityClickData = (startNs: number): Promise> => + query( + 'getTabGpuMemoryAbilityClickData', + `SELECT + (S.ts-TR.start_ts) as startNs, + S.used_gpu_size as size, + E.pid as processId, + E.name as processName, + A.data as gpuName + from trace_range as TR,memory_process_gpu as S + left join process as E on E.ipid=S.ipid + left join data_dict as A on A.id=S.gpu_name_id + WHERE + startNs = ${startNs} + `, + { $startNs: startNs } + ); + +//VM Tracker SkiaGpuMemory 点选 +export const getTabGpuMemoryVMTrackerClickData = (startNs: number, processId: number): Promise> => + query( + 'getTabGpuMemoryVMTrackerClickData', + `SELECT + (S.ts-TR.start_ts) as startNs, + S.used_gpu_size as size, + T.tid as threadId, + T.name as threadName, + A.data as gpuName + from trace_range as TR,memory_process_gpu as S + left join thread as T on T.itid=S.itid + left join data_dict as A on A.id=S.gpu_name_id + WHERE + startNs = ${startNs} + AND + $pid = S.ipid + `, + { $startNs: startNs, $pid: processId } + ); diff --git a/ide/src/trace/database/TraceWorker.ts b/ide/src/trace/database/TraceWorker.ts index ef00ed9b4dc8232a69ba79e576c48fa9acb804fd..bf5ff7b4d6591383485447909174fbb7c4ab524a 100644 --- a/ide/src/trace/database/TraceWorker.ts +++ b/ide/src/trace/database/TraceWorker.ts @@ -181,6 +181,13 @@ self.onmessage = async (e: MessageEvent) => { }; let fn = Module.addFunction(callback, 'viii'); reqBufferAddr = Module._Initialize(fn, REQ_BUF_SIZE); + let parseConfig = e.data.parseConfig; + if (parseConfig !== '') { + let parseConfigArray = enc.encode(parseConfig); + let parseConfigAddr = Module._InitializeParseConfig(1024); + Module.HEAPU8.set(parseConfigArray, parseConfigAddr); + Module._TraceStreamerParserConfigEx(parseConfigArray.length); + } let wasmConfigStr = e.data.wasmConfig; if (wasmConfigStr != '' && wasmConfigStr.indexOf('WasmFiles') != -1) { let wasmConfig = JSON.parse(wasmConfigStr); diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts index 1f1ba50b85bb2fa1a6f1d27e72a5764e0fc82842..50e478a58188eba39e14f7b6b071f9249880f99b 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts @@ -41,7 +41,6 @@ import { EnergyAnomalyRender } from './ProcedureWorkerEnergyAnomaly.js'; import { EnergySystemRender } from './ProcedureWorkerEnergySystem.js'; import { EnergyPowerRender } from './ProcedureWorkerEnergyPower.js'; import { EnergyStateRender } from './ProcedureWorkerEnergyState.js'; -import { SmapsRender } from './ProcedureWorkerSmaps.js'; import { CpuFreqLimitRender } from './ProcedureWorkerCpuFreqLimits.js'; import { ClockRender } from './ProcedureWorkerClock.js'; import { IrqRender } from './ProcedureWorkerIrq.js'; @@ -55,6 +54,7 @@ import { FrameDynamicRender } from './ProcedureWorkerFrameDynamic.js'; import { FrameAnimationRender } from './ProcedureWorkerFrameAnimation.js'; import { FrameSpacingRender } from './ProcedureWorkerFrameSpacing.js'; import { JsCpuProfilerRender } from './ProcedureWorkerCpuProfiler.js'; +import { SnapshotRender } from './ProcedureWorkerSnapshot.js'; let dataList: any = {}; let dataList2: any = {}; @@ -99,7 +99,6 @@ export let renders: any = { energySystem: new EnergySystemRender(), energyPower: new EnergyPowerRender(), energyState: new EnergyStateRender(), - smaps: new SmapsRender(), clock: new ClockRender(), irq: new IrqRender(), jank: new JankRender(), @@ -107,6 +106,7 @@ export let renders: any = { frameAnimation: new FrameAnimationRender(), frameSpacing: new FrameSpacingRender(), 'js-cpu-profiler': new JsCpuProfilerRender(), + snapshot: new SnapshotRender(), }; function match(type: string, req: RequestMessage) { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts index a8218bf796df2b94ec5fec80271650767c229820..7290a39534d928ccfcd9472ea13de569645cad46 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts @@ -92,13 +92,21 @@ export function isFrameContainPoint(frame: Rect, x: number, y: number): boolean return x >= frame.x && x <= frame.x + frame.width && y >= frame.y && y <= frame.y + frame.height; } export const isSurroundingPoint = function (pointX: number, currentRect: Rect, unitPointXRange: number): boolean { - return (pointX >= currentRect.x - unitPointXRange) && pointX <= currentRect.x + unitPointXRange; + return (pointX >= currentRect?.x - unitPointXRange) && pointX <= currentRect?.x + unitPointXRange; }; -export const computeUnitWidth = function (preTs: number,currentTs: number, frameWidth: number): number { +export const computeUnitWidth = function ( + preTs: number, + currentTs: number, + frameWidth: number, + selectUnitWidth: number +): number { let max = 150; let unitWidth = ((currentTs - preTs) * frameWidth) / (TraceRow.range!.endNS - TraceRow.range!.startNS); - return unitWidth > max ? max : unitWidth; + if (unitWidth < selectUnitWidth) { + return unitWidth > max || unitWidth === 0 ? max : unitWidth; + } + return selectUnitWidth > max || selectUnitWidth === 0 ? max : selectUnitWidth; }; class FilterConfig { @@ -867,6 +875,53 @@ export function drawString(ctx: CanvasRenderingContext2D, str: string, textPaddi } } +export function drawString2Line( + ctx: CanvasRenderingContext2D, + str1: string, + str2: string, + textPadding: number, + frame: Rect, + data: any +) { + if (frame.height < 30) return; + if (data.textMetrics1Width === undefined) { + data.textMetrics1Width = ctx.measureText(str1).width; + data.textMetrics2Width = ctx.measureText(str2).width; + } + let charWidth = Math.round(data.textMetrics1Width / str1.length); + let fillTextWidth = frame.width - textPadding * 2; + let y1 = frame.y + 12; + let y2 = y1 + 14; + if (data.textMetrics1Width < fillTextWidth) { + let x = Math.floor(frame.width / 2 - data.textMetrics1Width / 2 + frame.x + textPadding - 1); + ctx.fillText(str1, x, y1, fillTextWidth); + } else { + if (fillTextWidth >= charWidth) { + let chatNum = fillTextWidth / charWidth; + let x = frame.x + textPadding - 1; + if (chatNum < 2) { + ctx.fillText(str1.substring(0, 1), x, y1, fillTextWidth); + } else { + ctx.fillText(str1.substring(0, chatNum - 1) + '...', x, y1, fillTextWidth); + } + } + } + if (data.textMetrics2Width < fillTextWidth) { + let x = Math.floor(frame.width / 2 - data.textMetrics2Width / 2 + frame.x + textPadding - 1); + ctx.fillText(str2, x, y2, fillTextWidth); + } else { + if (fillTextWidth >= charWidth) { + let chatNum = fillTextWidth / charWidth; + let x = frame.x + textPadding - 1; + if (chatNum < 2) { + ctx.fillText(str2.substring(0, 1), x, y2, fillTextWidth); + } else { + ctx.fillText(str2.substring(0, chatNum - 1) + '...', x, y2, fillTextWidth); + } + } + } +} + export function hiPerf( arr: Array, arr2: Array, diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameAnimation.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameAnimation.ts index f72b1ad63ae145128d4a183ae5735541531f5f1f..9091c289671b7dbde77fcc07f372ee7510b331b0 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameAnimation.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameAnimation.ts @@ -54,7 +54,7 @@ export class FrameAnimationRender extends Render { req.context.closePath(); } - private frameAnimation ( + private frameAnimation( frameAnimationList: FrameAnimationStruct[], frameAnimationFilter: FrameAnimationStruct[], startNS: number = 0, @@ -147,6 +147,7 @@ export class FrameAnimationStruct extends BaseStruct { frameAnimationNode: FrameAnimationStruct, row: TraceRow ): void { + let tsFixed: number = 6; let isHover: boolean = row.isHover; if (frameAnimationNode.frame) { let nsToMillisecond = 1000_000; @@ -159,8 +160,8 @@ export class FrameAnimationStruct extends BaseStruct { ctx.fillStyle = ColorUtils.ANIMATION_COLOR[3]; ctx.textBaseline = 'middle'; ctx.font = '8px sans-serif'; - drawString(ctx, `${frameAnimationNode.status} (${(frameAnimationNode.dur / nsToMillisecond).toFixed(6)} ms)`, textPadding, - frameAnimationNode.frame, frameAnimationNode); + drawString(ctx, `${frameAnimationNode.status} (${(frameAnimationNode.dur / nsToMillisecond). + toFixed(tsFixed)} ms)`, textPadding, frameAnimationNode.frame, frameAnimationNode); ctx.lineWidth = 2; if ((frameAnimationNode === FrameAnimationStruct.hoverFrameAnimationStruct && isHover) || frameAnimationNode === FrameAnimationStruct.selectFrameAnimationStruct) { diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts index 857658b2f724be78b01211a4270e70577bb71246..3cb515ac1099f850aaceb3aaa34f22500ba4102b 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts @@ -32,18 +32,14 @@ export class FrameDynamicRender extends Render { let frameDynamicFilter: FrameDynamicStruct[] = row.dataListCache; this.frameDynamic(frameDynamicList, frameDynamicFilter, row, req.animationRanges, req.useCache); if (req.animationRanges.length > 0 && req.animationRanges[0] && frameDynamicFilter.length > 0) { - let modelType: string = row.getAttribute('modelType') || 'x'; + let modelType: string = row.getAttribute('model-type') || 'x'; let [minValue, maxValue] = this.getMinAndMaxData(frameDynamicFilter, modelType); - let find: boolean = false; let preDynamic: FrameDynamicStruct = frameDynamicFilter[0]; let isDraw = false; - let selectUnitWidthList: number[] = []; + let selectUnitWidth: number = 0; for (let index: number = 0; index < frameDynamicFilter.length; index++) { let currDynamic: FrameDynamicStruct = frameDynamicFilter[index]; - if (index > 0) { - let selectUnitWidth = computeUnitWidth(preDynamic.ts, currDynamic.ts, row.frame.width); - selectUnitWidthList.push(selectUnitWidth); - } + selectUnitWidth = computeUnitWidth(preDynamic.ts, currDynamic.ts, row.frame.width, selectUnitWidth); this.refreshPointY(currDynamic, row, modelType, minValue, maxValue); if (currDynamic.groupId === 0) { if (currDynamic.ts > TraceRow.range!.startNS && currDynamic.ts < TraceRow.range!.endNS) { @@ -57,26 +53,115 @@ export class FrameDynamicRender extends Render { FrameDynamicStruct.drawSelect(req.context, currDynamic, row); preDynamic = currDynamic; } - if(isDraw) { + if (isDraw) { this.drawDynamicPointYStr(req.context, frameDynamicFilter, row.frame, minValue, maxValue); } - let unitWidth = Math.min.apply(Math, selectUnitWidthList); - let findStructList = frameDynamicFilter.filter(filter => - row.isHover && isSurroundingPoint(row.hoverX, filter.frame!, unitWidth / multiple)); - if (findStructList.length > 0) { - find = true; - let hoverIndex: number = 0; - if (findStructList.length > unitIndex) { - hoverIndex = Math.ceil(findStructList.length / multiple); - } - FrameDynamicStruct.hoverFrameDynamicStruct = findStructList[hoverIndex]; - } - if (!find && row.isHover) { + if (!this.setHoverFrameDynamic(row, frameDynamicFilter, selectUnitWidth) && row.isHover) { FrameDynamicStruct.hoverFrameDynamicStruct = undefined; } } } + private setHoverFrameDynamic( + row: TraceRow, + frameDynamicFilter: FrameDynamicStruct[], + selectUnitWidth: number + ): boolean { + let find: boolean = false; + let findStructList = frameDynamicFilter.filter(filter => + row.isHover && isSurroundingPoint(row.hoverX, filter.frame!, selectUnitWidth / multiple)); + if (findStructList.length > 0) { + find = true; + let hoverIndex: number = 0; + if (findStructList.length > unitIndex) { + hoverIndex = Math.ceil(findStructList.length / multiple); + } + FrameDynamicStruct.hoverFrameDynamicStruct = findStructList[hoverIndex]; + } + return find; + } + + private frameDynamic( + frameDynamicList: FrameDynamicStruct[], + frameDynamicFilter: FrameDynamicStruct[], + row: TraceRow, + animationRanges: AnimationRanges[], + use: boolean + ): void { + let startNS: number = TraceRow.range!.startNS; + let endNS: number = TraceRow.range!.endNS; + let totalNS: number = TraceRow.range!.totalNS; + let frame: Rect = row.frame; + let modelName: string | undefined | null = row.getAttribute('model-name'); + if ((use || !TraceRow.range!.refresh) && frameDynamicFilter.length > 0) { + this.refreshDynamicFrame(frameDynamicFilter, frame, startNS, endNS, totalNS, modelName!); + return; + } + frameDynamicFilter.length = 0; + if (frameDynamicList) { + let groupIdList: number[] = []; + for (let dataIndex: number = 0; dataIndex < frameDynamicList.length; dataIndex++) { + let currentDynamic: FrameDynamicStruct = frameDynamicList[dataIndex]; + if (currentDynamic.appName === modelName) { + currentDynamic.groupId = invalidGroupId; + for (let rangeIndex = 0; rangeIndex < animationRanges.length; rangeIndex++) { + let currentRange = animationRanges[rangeIndex]; + if (currentDynamic.ts >= currentRange.start && currentDynamic.ts <= currentRange.end) { + currentDynamic.groupId = currentRange.start; + break; + } + } + if (currentDynamic.ts < startNS && (dataIndex + unitIndex) < frameDynamicList.length && + frameDynamicList[dataIndex + unitIndex].ts >= startNS && currentDynamic.groupId !== invalidGroupId) { + this.refreshFilterDynamicFrame(frameDynamicFilter, currentDynamic, row.frame, startNS, + endNS, totalNS, groupIdList); + } + if (currentDynamic.ts >= startNS && currentDynamic.ts <= endNS && currentDynamic.groupId !== invalidGroupId) { + this.refreshFilterDynamicFrame(frameDynamicFilter, currentDynamic, row.frame, startNS, + endNS, totalNS, groupIdList); + } + if (currentDynamic.ts >= endNS && currentDynamic.groupId !== invalidGroupId) { + this.refreshFilterDynamicFrame(frameDynamicFilter, currentDynamic, row.frame, startNS, + endNS, totalNS, groupIdList); + break; + } + } + } + this.setSimpleGroupId(groupIdList, frameDynamicFilter); + } + }; + + private setSimpleGroupId( + groupIdList: number[], + frameDynamicFilter: FrameDynamicStruct[] + ): void { + let simpleGroup = groupIdList.filter(groupId => { + return groupId !== invalidGroupId && groupIdList.indexOf(groupId) === groupIdList.lastIndexOf(groupId); + }); + frameDynamicFilter.forEach(dynamic => { + if (simpleGroup.indexOf(dynamic.groupId!) > invalidGroupId) { + dynamic.groupId = 0; + } + }); + } + + private refreshDynamicFrame( + frameDynamicFilter: FrameDynamicStruct[], + frame: Rect, + startNS: number, + endNS: number, + totalNS: number, + modelName: string + ): void { + for (let index: number = 0; index < frameDynamicFilter.length; index++) { + let frameDynamicNode: FrameDynamicStruct = frameDynamicFilter[index]; + frameDynamicNode.frame = undefined; + if (frameDynamicNode.appName === modelName) { + FrameDynamicStruct.setFrameDynamic(frameDynamicNode, startNS, endNS, totalNS, frame); + } + } + }; + private drawSinglePoint( ctx: CanvasRenderingContext2D, currDynamic: FrameDynamicStruct, @@ -128,6 +213,7 @@ export class FrameDynamicRender extends Render { ctx.lineWidth = 1; ctx.fillStyle = ColorUtils.ANIMATION_COLOR[3]; let minUnitValue: number = 10; + let fixedNumber = 2; let totalValue = maxValue - minValue; let pointYInterval = totalValue / (yScaleNumber - unitIndex); for (let index = 0; index < yScaleNumber; index++) { @@ -136,7 +222,7 @@ export class FrameDynamicRender extends Render { let pointY = frame.height - multiple * padding - pointYHeight; if (pointYValue !== 0) { if (maxValue - minValue <= minUnitValue) { - ctx.fillText(`- ${pointYValue}`, 0, pointY); + ctx.fillText(`- ${pointYValue.toFixed(fixedNumber)}`, 0, pointY); } else { ctx.fillText(`- ${Math.ceil(pointYValue)}`, 0, pointY); } @@ -145,7 +231,10 @@ export class FrameDynamicRender extends Render { } }; - private getMinAndMaxData(frameDynamicFilter: FrameDynamicStruct[], modelType: string): [number, number] { + private getMinAndMaxData( + frameDynamicFilter: FrameDynamicStruct[], + modelType: string + ): [number, number] { let min: number = Math.min.apply(Math, frameDynamicFilter.map(filterData => { // @ts-ignore return filterData[modelType]; @@ -172,85 +261,21 @@ export class FrameDynamicRender extends Render { return [min, max]; }; - private frameDynamic ( - frameDynamicList: FrameDynamicStruct[], + private refreshFilterDynamicFrame( frameDynamicFilter: FrameDynamicStruct[], - row: TraceRow, - animationRanges: AnimationRanges[], - use: boolean + currentFrameDynamic: FrameDynamicStruct, + frame: Rect, + startNS: number, + endNS: number, + totalNS: number, + groupIdList: number[] ): void { - let startNS: number = TraceRow.range!.startNS; - let endNS: number = TraceRow.range!.endNS; - let totalNS: number = TraceRow.range!.totalNS; - let frame: Rect = row.frame; - if (use && !TraceRow.range!.refresh && frameDynamicFilter.length > 0) { - refreshDynamicFrame(frameDynamicFilter, frame, startNS, endNS, totalNS); - return; - } - frameDynamicFilter.length = 0; - if (frameDynamicList) { - let groupIdList: number[] = []; - for (let dataIndex: number = 0; dataIndex < frameDynamicList.length; dataIndex++) { - let currentDynamic: FrameDynamicStruct = frameDynamicList[dataIndex]; - currentDynamic.groupId = invalidGroupId; - for (let rangeIndex = 0; rangeIndex < animationRanges.length; rangeIndex++) { - let currentRange = animationRanges[rangeIndex]; - if (currentDynamic.ts >= currentRange.start && currentDynamic.ts <= currentRange.end) { - currentDynamic.groupId = currentRange.start; - break; - } - } - if (currentDynamic.ts < startNS && (dataIndex + unitIndex) < frameDynamicList.length && - frameDynamicList[dataIndex + unitIndex].ts >= startNS && currentDynamic.groupId !== invalidGroupId) { - refreshFilterDynamicFrame(frameDynamicFilter, currentDynamic, row.frame, startNS, endNS, totalNS, groupIdList); - } - if (currentDynamic.ts >= startNS && currentDynamic.ts <= endNS && currentDynamic.groupId !== invalidGroupId) { - refreshFilterDynamicFrame(frameDynamicFilter, currentDynamic, row.frame, startNS, endNS, totalNS, groupIdList); - } - if (currentDynamic.ts >= endNS && currentDynamic.groupId !== invalidGroupId) { - refreshFilterDynamicFrame(frameDynamicFilter, currentDynamic, row.frame, startNS, endNS, totalNS, groupIdList); - break; - } - } - let simpleGroup = groupIdList.filter(groupId => { - return groupId !== invalidGroupId && groupIdList.indexOf(groupId) === groupIdList.lastIndexOf(groupId); - }); - frameDynamicFilter.forEach(dynamic => { - if (simpleGroup.indexOf(dynamic.groupId!) > invalidGroupId) { - dynamic.groupId = 0; - } - }); - } + groupIdList.push(currentFrameDynamic.groupId!); + frameDynamicFilter.push(currentFrameDynamic); + FrameDynamicStruct.setFrameDynamic(currentFrameDynamic, startNS, endNS, totalNS, frame); }; } -let refreshDynamicFrame = function ( - frameDynamicFilter: FrameDynamicStruct[], - frame: Rect, - startNS: number, - endNS: number, - totalNS: number): void { - for (let index: number = 0; index < frameDynamicFilter.length; index++) { - let frameDynamicNode: FrameDynamicStruct = frameDynamicFilter[index]; - frameDynamicNode.frame = undefined; - FrameDynamicStruct.setFrameDynamic(frameDynamicNode, padding, startNS, endNS, totalNS, frame); - } -}; - -let refreshFilterDynamicFrame = function ( - frameDynamicFilter: FrameDynamicStruct[], - currentFrameDynamic: FrameDynamicStruct, - frame: Rect, - startNS: number, - endNS: number, - totalNS: number, - groupIdList: number[] -): void { - groupIdList.push(currentFrameDynamic.groupId!); - frameDynamicFilter.push(currentFrameDynamic); - FrameDynamicStruct.setFrameDynamic(currentFrameDynamic, padding, startNS, endNS, totalNS, frame); -}; - export class FrameDynamicStruct extends BaseStruct { static hoverFrameDynamicStruct: FrameDynamicStruct | undefined; static selectFrameDynamicStruct: FrameDynamicStruct | undefined; @@ -267,7 +292,6 @@ export class FrameDynamicStruct extends BaseStruct { static setFrameDynamic( dynamicNode: FrameDynamicStruct, - padding: number, startNS: number, endNS: number, totalNS: number, diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts index 203897298ffc6145cfd2243bfc20089aad915738..da140ed41fbb3dfce56caaf48bfdc5a7435bff0b 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts @@ -37,7 +37,7 @@ export class FrameSpacingRender extends Render { TraceRow.range!.startNS, TraceRow.range!.endNS, TraceRow.range!.totalNS, - row.frame, + row, req.animationRanges, req.useCache || !TraceRow.range!.refresh ); @@ -48,20 +48,17 @@ export class FrameSpacingRender extends Render { animationRanges: AnimationRanges[] }, frameSpacingFilter: Array, row: TraceRow) : void { if (req.animationRanges.length > 0 && req.animationRanges[0] && frameSpacingFilter.length > 0) { - let find = false; let preFrameSpacing: FrameSpacingStruct = frameSpacingFilter[0]; // @ts-ignore let smallTickStandard = smallTick[req.frameRate]; let [minValue, maxValue] = this.maxMinData(smallTickStandard.firstLine, smallTickStandard.thirdLine, frameSpacingFilter); let isDraw = false; - let selectUnitWidthList: number[] = []; + let selectUnitWidth: number = 0; for (let index: number = 0; index < frameSpacingFilter.length; index++) { let currentStruct = frameSpacingFilter[index]; - if (index > 0) { - let selectUnitWidth = computeUnitWidth(preFrameSpacing.currentTs, currentStruct.currentTs, row.frame.width); - selectUnitWidthList.push(selectUnitWidth); - } + selectUnitWidth = computeUnitWidth(preFrameSpacing.currentTs, currentStruct.currentTs, + row.frame.width, selectUnitWidth); FrameSpacingStruct.refreshHoverStruct(preFrameSpacing, currentStruct, row, minValue, maxValue); if (currentStruct.groupId === 0) { if (currentStruct.currentTs > TraceRow.range!.startNS && currentStruct.currentTs < TraceRow.range!.endNS) { @@ -79,9 +76,9 @@ export class FrameSpacingRender extends Render { if (isDraw) { this.drawDashedLines(Object.values(smallTickStandard), req, row, minValue, maxValue); } - let unitWidth = Math.min.apply(Math, selectUnitWidthList); let findStructList = frameSpacingFilter.filter(filter => - row.isHover && isSurroundingPoint(row.hoverX, filter.frame!, unitWidth / multiple)); + row.isHover && isSurroundingPoint(row.hoverX, filter.frame!, selectUnitWidth / multiple)); + let find = false; if (findStructList.length > 0) { find = true; let hoverIndex: number = 0; @@ -130,13 +127,17 @@ export class FrameSpacingRender extends Render { startNS: number, endNS: number, totalNS: number, - frame: Rect, + row: TraceRow, animationRanges: AnimationRanges[], use: boolean ): void { + let frame: Rect = row.frame; + let modelName: string | undefined | null = row.getAttribute('model-name'); if (use && frameSpacingFilter.length > 0) { for (let index = 0, len = frameSpacingFilter.length; index < len; index++) { - FrameSpacingStruct.setFrameSpacingFrame(frameSpacingFilter[index], startNS, endNS, totalNS, frame); + if (frameSpacingFilter[index].nameId === modelName) { + FrameSpacingStruct.setFrameSpacingFrame(frameSpacingFilter[index], startNS, endNS, totalNS, frame); + } } return; } @@ -145,25 +146,27 @@ export class FrameSpacingRender extends Render { let groupIdList: number[] = []; for (let index = 0; index < frameSpacingList.length; index++) { let item = frameSpacingList[index]; - item.groupId = invalidGroupId; - for (let rangeIndex = 0; rangeIndex < animationRanges.length; rangeIndex++) { - let currentRange = animationRanges[rangeIndex]; - if (item.currentTs >= currentRange.start && item.currentTs <= currentRange.end) { - item.groupId = currentRange.start; + if (modelName === item.nameId) { + item.groupId = invalidGroupId; + for (let rangeIndex = 0; rangeIndex < animationRanges.length; rangeIndex++) { + let currentRange = animationRanges[rangeIndex]; + if (item.currentTs >= currentRange.start && item.currentTs <= currentRange.end) { + item.groupId = currentRange.start; + break; + } + } + if (item.currentTs < startNS && index + unitIndex < frameSpacingList.length && + frameSpacingList[index + unitIndex].currentTs >= startNS && item.groupId !== invalidGroupId) { + this.refreshFrame(frameSpacingFilter, item, startNS, endNS, totalNS, frame, groupIdList); + } + if (item.currentTs >= startNS && item.currentTs <= endNS && item.groupId !== invalidGroupId) { + this.refreshFrame(frameSpacingFilter, item, startNS, endNS, totalNS, frame, groupIdList); + } + if (item.currentTs > endNS && item.groupId !== invalidGroupId) { + this.refreshFrame(frameSpacingFilter, item, startNS, endNS, totalNS, frame, groupIdList); break; } } - if (item.currentTs < startNS && index + unitIndex < frameSpacingList.length && - frameSpacingList[index + unitIndex].currentTs >= startNS && item.groupId !== invalidGroupId) { - this.refreshFrame(frameSpacingFilter, item, startNS, endNS, totalNS, frame, groupIdList); - } - if (item.currentTs >= startNS && item.currentTs <= endNS && item.groupId !== invalidGroupId) { - this.refreshFrame(frameSpacingFilter, item, startNS, endNS, totalNS, frame, groupIdList); - } - if (item.currentTs > endNS && item.groupId !== invalidGroupId) { - this.refreshFrame(frameSpacingFilter, item, startNS, endNS, totalNS, frame, groupIdList); - break; - } } this.grouping(groupIdList, frameSpacingFilter); } @@ -224,6 +227,7 @@ export class FrameSpacingStruct extends BaseStruct { preFrameHeight: number | undefined; x: number | undefined; y: number | undefined; + nameId: string | undefined; static setFrameSpacingFrame( frameSpacingNode: FrameSpacingStruct, @@ -250,10 +254,9 @@ export class FrameSpacingStruct extends BaseStruct { static refreshHoverStruct(preFrameSpacing: FrameSpacingStruct, frameSpacing: FrameSpacingStruct, row: TraceRow, minValue: number, maxValue: number): void { if (frameSpacing.frame) { - let currentPointY = row.frame.height - Math.floor((frameSpacing.frameSpacingResult! - + frameSpacing.frame.y = row.frame.height - Math.floor((frameSpacing.frameSpacingResult! - minValue) * (row.frame.height - padding * multiple) / (maxValue - minValue)) - padding; - frameSpacing.frame.y = currentPointY; } }; diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts index 6e960ff5325af78f8d76176818a1239a1dc29c40..b07d287efb64c4dc3fa8d9ef5cfd16087d2d042f 100644 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts @@ -25,6 +25,7 @@ import { drawString, } from './ProcedureWorkerCommon.js'; import { FuncStruct as BaseFuncStruct } from '../../bean/FuncStruct.js'; +import { FlagsConfig } from '../../component/SpFlags.js'; export class FuncRender extends Render { renderMainThread( req: { @@ -170,27 +171,63 @@ export class FuncStruct extends BaseFuncStruct { ctx.lineWidth = 2; ctx.strokeRect(data.frame.x, data.frame.y + 1, data.frame.width, miniHeight - padding * 2 - 2); } - if (data.funName!.indexOf('H:Task PerformTask End:') >= 0 && data.funName!.indexOf('Successful') < 0) { + let flagConfig = FlagsConfig.getFlagsConfig('TaskPool'); + if ( + flagConfig!.TaskPool === 'Enabled' && + data.funName!.indexOf('H:Task PerformTask End:') >= 0 && + data.funName!.indexOf('Successful') < 0 + ) { if (data.frame!.width < 10) { - FuncStruct.drawRoundRectPath(ctx, data.frame!.x, 30, 3, data!); + FuncStruct.drawTaskPoolUnSuccessFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 20, 3, data!); } else { - FuncStruct.drawRoundRectPath(ctx, data.frame!.x, 28, 6, data!); + FuncStruct.drawTaskPoolUnSuccessFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 20, 6, data!); } } + if (flagConfig!.TaskPool === 'Enabled' && data.funName!.indexOf('H:Thread Timeout Exit') >= 0) { + FuncStruct.drawTaskPoolTimeOutFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 20, 10, data!); + } } } } - static drawRoundRectPath(ctx: CanvasRenderingContext2D, x: number, y: number, radius: number, data: FuncStruct) { + static drawTaskPoolUnSuccessFlag( + ctx: CanvasRenderingContext2D, + x: number, + y: number, + radius: number, + data: FuncStruct + ) { + ctx.strokeStyle = '#FFC880'; + ctx.lineWidth = 1; ctx.beginPath(); ctx.arc(x + data.frame!.width, y, radius, 0, Math.PI * 2); ctx.closePath(); - // 填充背景颜色 ctx.fillStyle = '#E64566'; ctx.fill(); ctx.stroke(); } + static drawTaskPoolTimeOutFlag( + canvas: CanvasRenderingContext2D, + x: number, + y: number, + radius: number, + data: FuncStruct + ) { + canvas.strokeStyle = '#FFC880'; + canvas.lineWidth = 1; + canvas.beginPath(); + canvas.arc(x + data.frame!.width + 20, y, radius, 0, Math.PI * 2); + canvas.closePath(); + canvas.fillStyle = '#FFC880'; + canvas.fill(); + canvas.stroke(); + canvas.font = '18px Arial'; + canvas.fillStyle = ColorUtils.GREY_COLOR; + canvas.textAlign = 'center'; + canvas.fillText('¡', x + data.frame!.width + 20, y); + } + static isSelected(data: FuncStruct): boolean { return ( FuncStruct.selectFuncStruct != undefined && diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerSmaps.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerSmaps.ts deleted file mode 100644 index 706776956d1000ce0d1b7b5eec0d13c0b3c00151..0000000000000000000000000000000000000000 --- a/ide/src/trace/database/ui-worker/ProcedureWorkerSmaps.ts +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { - BaseStruct, - dataFilterHandler, - drawFlagLine, - drawLines, - drawSelection, - isFrameContainPoint, - ns2x, - Render, - RequestMessage, -} from './ProcedureWorkerCommon.js'; -import { TraceRow } from '../../component/trace/base/TraceRow.js'; -import { CpuAbilityMonitorStruct } from './ProcedureWorkerCpuAbility.js'; - -export class SmapsRender extends Render { - renderMainThread( - req: { - context: CanvasRenderingContext2D; - useCache: boolean; - type: string; - rowName: string; - maxValue: number; - }, - row: TraceRow - ) { - let smapsList = row.dataList; - let smapsFilter = row.dataListCache; - dataFilterHandler(smapsList, smapsFilter, { - startKey: 'startNS', - durKey: 'dur', - startNS: TraceRow.range?.startNS ?? 0, - endNS: TraceRow.range?.endNS ?? 0, - totalNS: TraceRow.range?.totalNS ?? 0, - frame: row.frame, - paddingTop: 5, - useCache: req.useCache || !(TraceRow.range?.refresh ?? false), - }); - req.context.beginPath(); - let drawColor = '#0A59F7'; - if (req.rowName != undefined) { - switch (req.rowName) { - case 'dirty': - drawColor = '#0A59F7'; - break; - case 'swapper': - drawColor = '#46B1E3'; - break; - case 'resident_size': - drawColor = '#564AF7'; - break; - } - } - let find = false; - for (let re of smapsFilter) { - SmapsStruct.draw(req.context, re, req.maxValue, drawColor, row.isHover); - if (row.isHover && re.frame && isFrameContainPoint(re.frame, row.hoverX, row.hoverY)) { - SmapsStruct.hoverSmapsStruct = re; - find = true; - } - } - if (!find && row.isHover) SmapsStruct.hoverSmapsStruct = undefined; - - req.context.closePath(); - } - - render(smapsReq: RequestMessage, list: Array, filter: Array) { - if (smapsReq.lazyRefresh) { - smaps( - list, - filter, - smapsReq.startNS, - smapsReq.endNS, - smapsReq.totalNS, - smapsReq.frame, - smapsReq.useCache || !smapsReq.range.refresh - ); - } else { - if (!smapsReq.useCache) { - smaps(list, filter, smapsReq.startNS, smapsReq.endNS, smapsReq.totalNS, smapsReq.frame, false); - } - } - if (smapsReq.canvas) { - smapsReq.context.clearRect(0, 0, smapsReq.frame.width, smapsReq.frame.height); - smapsReq.context.beginPath(); - let maxValue = 0; - let maxValueName = ''; - if (smapsReq.params.maxValue != undefined || smapsReq.params.maxValueName != undefined) { - maxValue = smapsReq.params.maxValue; - maxValueName = smapsReq.params.maxValueName; - } - drawLines(smapsReq.context, smapsReq.xs, smapsReq.frame.height, smapsReq.lineColor); - SmapsStruct.hoverSmapsStruct = undefined; - if (smapsReq.isHover) { - for (let re of filter) { - if ( - re.frame && - smapsReq.hoverX >= re.frame.x && - smapsReq.hoverX <= re.frame.x + re.frame.width && - smapsReq.hoverY >= re.frame.y && - smapsReq.hoverY <= re.frame.y + re.frame.height - ) { - SmapsStruct.hoverSmapsStruct = re; - break; - } - } - } - let drawColor = '#0A59F7'; - if (smapsReq.params.rowName != undefined) { - switch (smapsReq.params.rowName) { - case 'dirty': - drawColor = '#0A59F7'; - break; - case 'swapper': - drawColor = '#46B1E3'; - break; - case 'resident_size': - drawColor = '#564AF7'; - break; - } - } - SmapsStruct.selectSmapsStruct = smapsReq.params.selectSmapsStruct; - for (let re of filter) { - SmapsStruct.draw(smapsReq.context, re, maxValue, drawColor, true); - } - drawSelection(smapsReq.context, smapsReq.params); - smapsReq.context.closePath(); - drawFlagLine( - smapsReq.context, - smapsReq.flagMoveInfo, - smapsReq.flagSelectedInfo, - smapsReq.startNS, - smapsReq.endNS, - smapsReq.totalNS, - smapsReq.frame, - smapsReq.slicesTime - ); - } - // @ts-ignore - self.postMessage({ - id: smapsReq.id, - type: smapsReq.type, - results: smapsReq.canvas ? undefined : filter, - hover: SmapsStruct.hoverSmapsStruct, - }); - } -} - -export function smaps( - smapsList: Array, - res: Array, - startNS: number, - endNS: number, - totalNS: number, - frame: any, - use: boolean -) { - if (use && res.length > 0) { - for (let i = 0; i < res.length; i++) { - let smapsItem = res[i]; - if ((smapsItem.startNS || 0) + (smapsItem.dur || 0) > (startNS || 0) && (smapsItem.startNS || 0) < (endNS || 0)) { - SmapsStruct.setSmapsFrame(smapsItem, 5, startNS || 0, endNS || 0, totalNS || 0, frame); - } else { - smapsItem.frame = null; - } - } - return; - } - res.length = 0; - if (smapsList) { - for (let smapsIndex = 0; smapsIndex < smapsList.length; smapsIndex++) { - let item = smapsList[smapsIndex]; - if (smapsIndex === smapsList.length - 1) { - item.dur = (endNS || 0) - (item.startNS || 0); - } else { - item.dur = (smapsList[smapsIndex + 1].startNS || 0) - (item.startNS || 0); - } - if ((item.startNS || 0) + (item.dur || 0) > (startNS || 0) && (item.startNS || 0) < (endNS || 0)) { - SmapsStruct.setSmapsFrame(smapsList[smapsIndex], 5, startNS || 0, endNS || 0, totalNS || 0, frame); - if ( - smapsIndex > 0 && - (smapsList[smapsIndex - 1].frame?.x || 0) == (smapsList[smapsIndex].frame?.x || 0) && - (smapsList[smapsIndex - 1].frame?.width || 0) == (smapsList[smapsIndex].frame?.width || 0) - ) { - } else { - res.push(item); - } - } - } - } -} - -export class SmapsStruct extends BaseStruct { - static maxValue: number = 0; - static maxValueName: string = '0 KB/S'; - static hoverSmapsStruct: SmapsStruct | undefined; - static selectSmapsStruct: SmapsStruct | undefined; - value: number | undefined; - startNS: number | undefined; - dur: number | undefined; - - static draw( - smapsContext: CanvasRenderingContext2D, - data: SmapsStruct, - maxValue: number, - drawColor: string, - isHover: boolean - ) { - if (data.frame) { - let width = data.frame.width || 0; - smapsContext.fillStyle = drawColor; - smapsContext.strokeStyle = drawColor; - if (data.startNS === SmapsStruct.hoverSmapsStruct?.startNS && isHover) { - smapsContext.lineWidth = 1; - let smapsDrawHeight: number = Math.floor(((data.value || 0) * (data.frame.height || 0) * 1.0) / maxValue); - smapsContext.fillRect( - data.frame.x, - data.frame.y + data.frame.height - smapsDrawHeight + 4, - width, - smapsDrawHeight - ); - smapsContext.beginPath(); - smapsContext.arc(data.frame.x, data.frame.y + data.frame.height - smapsDrawHeight + 4, 3, 0, 2 * Math.PI, true); - smapsContext.fill(); - smapsContext.globalAlpha = 1.0; - smapsContext.stroke(); - smapsContext.beginPath(); - smapsContext.moveTo(data.frame.x + 3, data.frame.y + data.frame.height - smapsDrawHeight + 4); - smapsContext.lineWidth = 3; - smapsContext.lineTo(data.frame.x + width, data.frame.y + data.frame.height - smapsDrawHeight + 4); - smapsContext.stroke(); - } else { - smapsContext.lineWidth = 1; - let smapsDrawHeight: number = Math.floor(((data.value || 0) * (data.frame.height || 0)) / maxValue); - smapsContext.fillRect( - data.frame.x, - data.frame.y + data.frame.height - smapsDrawHeight + 4, - width, - smapsDrawHeight - ); - } - } - smapsContext.globalAlpha = 1.0; - smapsContext.lineWidth = 1; - } - - static setSmapsFrame(smapsNode: any, padding: number, startNS: number, endNS: number, totalNS: number, frame: any) { - let smapsStartPointX: number, smapsEndPointX: number; - - if ((smapsNode.startNS || 0) < startNS) { - smapsStartPointX = 0; - } else { - smapsStartPointX = ns2x(smapsNode.startNS || 0, startNS, endNS, totalNS, frame); - } - if ((smapsNode.startNS || 0) + (smapsNode.dur || 0) > endNS) { - smapsEndPointX = frame.width; - } else { - smapsEndPointX = ns2x((smapsNode.startNS || 0) + (smapsNode.dur || 0), startNS, endNS, totalNS, frame); - } - let frameWidth: number = smapsEndPointX - smapsStartPointX <= 1 ? 1 : smapsEndPointX - smapsStartPointX; - if (!smapsNode.frame) { - smapsNode.frame = {}; - } - smapsNode.frame.x = Math.floor(smapsStartPointX); - smapsNode.frame.y = frame.y + padding; - smapsNode.frame.width = Math.ceil(frameWidth); - smapsNode.frame.height = Math.floor(frame.height - padding * 2); - } -} diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerSnapshot.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerSnapshot.ts new file mode 100644 index 0000000000000000000000000000000000000000..43e059d41e681b95b7f362e7728b6f72d8265c2d --- /dev/null +++ b/ide/src/trace/database/ui-worker/ProcedureWorkerSnapshot.ts @@ -0,0 +1,178 @@ +/* + * 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 { BaseStruct, Rect, Render, isFrameContainPoint, ns2x } from './ProcedureWorkerCommon.js'; +import { TraceRow } from '../../component/trace/base/TraceRow.js'; +import { Utils } from '../../component/trace/base/Utils.js'; +import { MemoryConfig } from '../../bean/MemoryConfig.js'; + +export class SnapshotRender extends Render { + renderMainThread( + req: { + context: CanvasRenderingContext2D; + useCache: boolean; + type: string; + }, + row: TraceRow + ): void { + let list = row.dataList; + let filter = row.dataListCache; + let maxValue = 0; + for (let item of list) { + maxValue = Math.max(maxValue, item.value || 0); + } + snapshot(list, filter, maxValue, TraceRow.range?.startNS ?? 0, (TraceRow.range?.endNS ?? 0) - (TraceRow.range?.startNS! ?? 0), row.frame); + req.context!.beginPath(); + let find = false; + for (let re of filter) { + SnapshotStruct.draw(req.context, re); + if (row.isHover && re.frame && isFrameContainPoint(re.frame, row.hoverX, row.hoverY)) { + SnapshotStruct.hoverSnapshotStruct = re; + find = true; + } + } + if (!find && row.isHover) { + SnapshotStruct.hoverSnapshotStruct = undefined; + } + req.context!.closePath(); + } +} +export function snapshot( + list: Array, + filter: Array, + maxValue: number, + startNs: number, + totalNs: number, + frame: Rect +): void { + for (let file of list) { + SnapshotStruct.setFrame(file, maxValue, startNs || 0, totalNs || 0, frame); + } + filter.length = 0; + for (let i = 0, len = list.length; i < len; i++) { + if (list[i].frame) { + filter.push(list[i]); + } + } +} +const padding = 2; +export class SnapshotStruct extends BaseStruct { + startNs: number = 0; + endNs: number = 0; + dur: number = 0; + name: string = ''; + textWidth: number = 0; + value: number = 0; + type: string = ''; + static hoverSnapshotStruct: SnapshotStruct | undefined; + static selectSnapshotStruct: SnapshotStruct | undefined; + static setFrame(node: SnapshotStruct, maxValue: number, startNs: number, totalNs: number, frame: Rect): void { + node.frame = undefined; + frame.height = 40 - padding * 2; + // sample_interval单位是ms,startNs和endNs单位是纳秒，每一次采样的时间按采样间隔的五分之一算 + node.dur = MemoryConfig.getInstance().snapshotDur; + node.endNs = node.startNs + node.dur; + if ((node.startNs - startNs || node.startNs - startNs === 0) && node.endNs - node.startNs) { + let rectangle: Rect = new Rect( + Math.floor(((node.startNs - startNs) / totalNs) * frame.width), + Math.floor(((maxValue - node.value) / maxValue) * frame.height), + Math.ceil(((node.endNs - node.startNs) / totalNs) * frame.width), + Math.ceil((node.value / maxValue) * frame.height) + ); + node.frame = rectangle; + } + if (node.value === 0) { + let rectangle: Rect = new Rect( + Math.floor(((node.startNs - startNs) / totalNs) * frame.width), + 30, + Math.ceil((node.dur / totalNs) * frame.width), + 1 + ); + node.frame = rectangle; + } + } + static draw(ctx: CanvasRenderingContext2D, data: SnapshotStruct): void { + if (data.frame) { + ctx.fillStyle = 'rgb(86,192,197)'; + ctx!.fillRect(data.frame!.x, data.frame!.y + padding, data.frame!.width, data.frame!.height); + if (data.frame!.width > 7) { + ctx.globalAlpha = 1.0; + ctx.lineWidth = 1; + ctx.fillStyle = '#fff'; + ctx.textBaseline = 'middle'; + if (data.frame!.height > 10 && data.frame!.height < 25) { + SnapshotStruct.drawString(ctx, data.name || '', 4, data.frame!, data, 4); + } else if (data.frame!.height > 25) { + SnapshotStruct.drawString(ctx, data.name || '', 4, data.frame!, data, 4); + SnapshotStruct.drawString(ctx, Utils.getBinaryByteWithUnit(data.value || 0), 11, data.frame!, data, 2); + } + } + if (SnapshotStruct.selectSnapshotStruct && SnapshotStruct.equals(SnapshotStruct.selectSnapshotStruct, data)) { + ctx.strokeStyle = '#232c5d'; + ctx.lineWidth = 2; + ctx.strokeRect(data.frame!.x, data.frame!.y + padding, data.frame!.width - 2, data.frame!.height); + } + } + } + /** + * + * @param ctx current context + * @param str text + * @param textPadding padding + * @param frame rectangle + * @param data PurgeableStruct + * @param location the position of the string, the bigger the numerical value, the higher the position on the canvas + */ + static drawString( + ctx: CanvasRenderingContext2D, + str: string, + textPadding: number, + frame: Rect, + data: SnapshotStruct, + location: number + ): void { + if (data.textWidth === undefined) { + data.textWidth = ctx.measureText(str).width; + } + let textWidth = Math.round(data.textWidth / str.length); + let fillTextWidth = frame.width - textPadding * 2; + if (data.textWidth < fillTextWidth) { + let x = Math.floor(frame.width / 2 - data.textWidth / 2 + frame.x + textPadding); + ctx.fillText(str, x, Math.floor(frame.y + frame.height / location + textPadding), fillTextWidth); + } else { + if (fillTextWidth >= textWidth) { + let characterNum = fillTextWidth / textWidth; + let x = frame.x + textPadding; + if (characterNum < 2) { + ctx.fillText( + str.substring(0, 1), + x, + Math.floor(frame.y + frame.height / location + textPadding), + fillTextWidth + ); + } else { + ctx.fillText( + `${str.substring(0, characterNum - 1)}...`, + x, + Math.floor(frame.y + frame.height / location + textPadding), + fillTextWidth + ); + } + } + } + } + static equals(baseSnapshot: SnapshotStruct, targetSnapshot: SnapshotStruct): boolean { + return baseSnapshot === targetSnapshot; + } +} diff --git a/ide/test/base-ui/chart/pagenation/pagination-box.test.ts b/ide/test/base-ui/chart/pagenation/pagination-box.test.ts index 8d73dc5d34c1a0e64686190c7a80182dea438b3e..dd0aaac4e7f9796b6cf8cc29688a4f28e8e4efa2 100644 --- a/ide/test/base-ui/chart/pagenation/pagination-box.test.ts +++ b/ide/test/base-ui/chart/pagenation/pagination-box.test.ts @@ -13,7 +13,7 @@ * limitations under the License. */ //@ts-ignore -import { PaginationBox } from '../../../../dist/base-ui/chart/pagenation/pagination-box.js'; +import { PaginationBox } from '../../../../dist/base-ui/chart/pagenation/PaginationBox.js'; // @ts-ignore window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ disconnect: jest.fn(), diff --git a/ide/test/base-ui/popover/LitPopoverV.test.ts b/ide/test/base-ui/popover/LitPopoverV.test.ts index 8cfa8d60d259e82844a42f28a5063c13982e37a5..025e9795879e9703dfd90e9faba29bf3e6683465 100644 --- a/ide/test/base-ui/popover/LitPopoverV.test.ts +++ b/ide/test/base-ui/popover/LitPopoverV.test.ts @@ -99,7 +99,7 @@ describe('LitPopoverV Test', () => { border-bottom: 1px solid #f0f0f0; } .content{ - padding: 10px 15px; + padding: 10px; } .trigger-click { position: absolute; diff --git a/ide/test/base-ui/radiobox/LitRadioBox.test.ts b/ide/test/base-ui/radiobox/LitRadioBox.test.ts index 53961add5b959e5adba07121318865ce17b4e9ab..fb53838a2448c6fbb15ac8a80c1eef82ced215cd 100644 --- a/ide/test/base-ui/radiobox/LitRadioBox.test.ts +++ b/ide/test/base-ui/radiobox/LitRadioBox.test.ts @@ -164,6 +164,9 @@ describe('LitRadioBox Test', () => { background-color: #1A83FF; color:#ffffff } + :host([disabled]){ + pointer-events: none; + }
    " diff --git a/ide/test/trace/bean/AbilityMonitor.test.ts b/ide/test/trace/bean/AbilityMonitor.test.ts index d262851a6a3bbe86014bb064b7443dcdd6400df7..8a57f6d5f1db712b9554beb7ff291700456607f2 100644 --- a/ide/test/trace/bean/AbilityMonitor.test.ts +++ b/ide/test/trace/bean/AbilityMonitor.test.ts @@ -20,6 +20,7 @@ import { LiveProcess, SystemNetworkSummary, SystemMemorySummary, + Dma } from '../../../dist/trace/bean/AbilityMonitor.js'; describe('AbilityMonitor Test', () => { @@ -29,6 +30,7 @@ describe('AbilityMonitor Test', () => { let liveProcess = new LiveProcess(); let systemNetworkSummary = new SystemNetworkSummary(); let systemMemorySummary = new SystemMemorySummary(); + let dma = new Dma() it('SystemCpuSummaryTest', function () { systemCpuSummary = { @@ -399,6 +401,59 @@ describe('AbilityMonitor Test', () => { "swapUsed": Any, "wiredMemory": Any, } +`); + }); + it('DmaTest', function () { + dma = { + processId: -1, + timeStamp:'', + startNs:-1, + expTaskComm: '', + avgSize: -1, + minSize:-1, + maxSize: -1, + bufName:'', + expName: '', + size: -1, + processName: '', + process: '', + fd: -1, + ino: -1, + expPid: -1, + flag: -1, + avgSizes: '', + minSizes: '', + maxSizes: '', + sizes: '', + sumSize: -1, + sumSizes: '', + }; + expect(dma).not.toBeUndefined(); + expect(dma).toMatchInlineSnapshot(` +{ + "avgSize": -1, + "avgSizes": "", + "bufName": "", + "expName": "", + "expPid": -1, + "expTaskComm": "", + "fd": -1, + "flag": -1, + "ino": -1, + "maxSize": -1, + "maxSizes": "", + "minSize": -1, + "minSizes": "", + "process": "", + "processId": -1, + "processName": "", + "size": -1, + "sizes": "", + "startNs": -1, + "sumSize": -1, + "sumSizes": "", + "timeStamp": "", +} `); }); }); diff --git a/ide/test/trace/bean/JsStruct.test.ts b/ide/test/trace/bean/JsStruct.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..9a3d8dc8730616fec571b1283a4a31c2e9ef77ce --- /dev/null +++ b/ide/test/trace/bean/JsStruct.test.ts @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +jest.mock('../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); + +// @ts-ignore +import { JsCpuProfilerUIStruct, JsCpuProfilerChartFrame, JsCpuProfilerTabStruct, JsCpuProfilerStatisticsStruct } from '../../../dist/trace/bean/JsStruct.js'; + +describe('JsStruct Test', () => { + let jsCpuProfilerUIStruct = new JsCpuProfilerUIStruct(); + let jsCpuProfilerChartFrame = new JsCpuProfilerChartFrame(); + let jsCpuProfilerTabStruct = new JsCpuProfilerTabStruct(); + let jsCpuProfilerStatisticsStruct = new JsCpuProfilerStatisticsStruct(); + + it('JsCpuProfilerUIStructTest01', function () { + jsCpuProfilerUIStruct = { + name: '', + depth: 0, + selfTime: 0, + totalTime: 0, + url:'', + line: 0, + column: 0, + scriptName: '', + id: 0, + parentId: 0, + } + expect(jsCpuProfilerUIStruct).not.toBeUndefined(); + expect(jsCpuProfilerUIStruct).toMatchInlineSnapshot(` +{ + "column": 0, + "depth": 0, + "id": 0, + "line": 0, + "name": "", + "parentId": 0, + "scriptName": "", + "selfTime": 0, + "totalTime": 0, + "url": "", +} +`); + }); + it('JsCpuProfilerChartFrameTest02', function () { + jsCpuProfilerChartFrame = { + name: '', + depth: 0, + selfTime: 0, + totalTime: 0, + url:'', + line: 0, + column: 0, + scriptName: '', + id: 0, + parentId: 0, + startTime: 0, + endTime: 0, + children: [], + samplesIds: [], + isSelect: false, + } + expect(jsCpuProfilerChartFrame).not.toBeUndefined(); + expect(jsCpuProfilerChartFrame).toMatchInlineSnapshot(` +{ + "children": [], + "column": 0, + "depth": 0, + "endTime": 0, + "id": 0, + "isSelect": false, + "line": 0, + "name": "", + "parentId": 0, + "samplesIds": [], + "scriptName": "", + "selfTime": 0, + "startTime": 0, + "totalTime": 0, + "url": "", +} +`); + }); + it('JsCpuProfilerTabStructTest02', function () { + jsCpuProfilerTabStruct = { + name: '', + depth: 0, + selfTime: 0, + totalTime: 0, + url:'', + line: 0, + column: 0, + scriptName: '', + id: 0, + parentId: 0, + children:[], + chartFrameChildren: [], + isSelected: false, + totalTimePercent: '', + selfTimePercent: '', + symbolName: '', + selfTimeStr: '', + totalTimeStr:'', + isSearch: false + } + expect(jsCpuProfilerTabStruct).not.toBeUndefined(); + expect(jsCpuProfilerTabStruct).toMatchInlineSnapshot(` +{ + "chartFrameChildren": [], + "children": [], + "column": 0, + "depth": 0, + "id": 0, + "isSearch": false, + "isSelected": false, + "line": 0, + "name": "", + "parentId": 0, + "scriptName": "", + "selfTime": 0, + "selfTimePercent": "", + "selfTimeStr": "", + "symbolName": "", + "totalTime": 0, + "totalTimePercent": "", + "totalTimeStr": "", + "url": "", +} +`); + }); + it('JsCpuProfilerStatisticsStructTest02', function () { + jsCpuProfilerStatisticsStruct = { + type: '', + time: 0, + timeStr: '', + percentage: '' + } + expect(jsCpuProfilerStatisticsStruct).not.toBeUndefined(); + expect(jsCpuProfilerStatisticsStruct).toMatchInlineSnapshot(` +{ + "percentage": "", + "time": 0, + "timeStr": "", + "type": "", +} +`); + }); +}); diff --git a/ide/test/trace/component/SpInfoAndStas.test.ts b/ide/test/trace/component/SpInfoAndStas.test.ts index a8627952910accfa4a9031ed24f952373881115e..8e5320aeb284c02da4c5c3ac13fc173a81111ceb 100644 --- a/ide/test/trace/component/SpInfoAndStas.test.ts +++ b/ide/test/trace/component/SpInfoAndStas.test.ts @@ -62,92 +62,94 @@ describe('SpInfoAndStasTest', () => { " -

    System info and metadata

    @@ -165,11 +167,11 @@ describe('SpInfoAndStasTest', () => {

    Debugging stats

    - + - + - +
    diff --git a/ide/test/trace/component/SpMetrics.test.ts b/ide/test/trace/component/SpMetrics.test.ts index 66925c05bdb64e90865b726acdff455604f0c740..a075ea32c5b83d8a217043cbef3ffac5d6122653 100644 --- a/ide/test/trace/component/SpMetrics.test.ts +++ b/ide/test/trace/component/SpMetrics.test.ts @@ -48,7 +48,6 @@ describe('SpMetrics Test', () => { expect(spMetrics.initHtml()).toMatchInlineSnapshot(` " -

    Select a metric

    diff --git a/ide/test/trace/component/SpQuerySQL.test.ts b/ide/test/trace/component/SpQuerySQL.test.ts index cb7671f002a56340110534cf8d33ab00770269c8..22ee564716d39de015a061e04215c9bb28df4d6b 100644 --- a/ide/test/trace/component/SpQuerySQL.test.ts +++ b/ide/test/trace/component/SpQuerySQL.test.ts @@ -22,128 +22,108 @@ import { SpStatisticsHttpUtil } from '../../../dist/statistics/util/SpStatistics const sqlite = require('../../../dist/trace/database/SqlLite.js'); jest.mock('../../../dist/trace/database/SqlLite.js'); +window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), +})); + SpStatisticsHttpUtil.addOrdinaryVisitAction = jest.fn(() => true); describe('SpQuerySQL Test', () => { let spQuerySQL = new SpQuerySQL(); it('SpQuerySQLTest01', function () { - expect(spQuerySQL.checkSupportSqlAbility()).toBeFalsy(); + expect(spQuerySQL.checkSafetySelectSql()).toBeFalsy(); }); it('SpQuerySQLTest02', function () { - expect(spQuerySQL.checkSafetySelectSql()).toBeTruthy(); - }); - - it('SpQuerySQLTest03', function () { - expect(spQuerySQL.getSelectSqlField()).toBe(''); - }); - - it('SpQuerySQLTest04', function () { - expect(spQuerySQL.getSelectSqlTableName()).not.toBeUndefined(); - }); - - it('SpQuerySQLTest05', function () { expect(spQuerySQL.initDataElement()).toBeUndefined(); }); - it('SpQuerySQLTest06', function () { - spQuerySQL.statDataArray.length = 1; - expect(spQuerySQL.initData()).toBeUndefined(); - }); - - it('SpQuerySQLTest07', function () { + it('SpQuerySQLTest03', function () { expect(spQuerySQL.attributeChangedCallback()).toBeUndefined(); }); - it('SpQuerySQLTest08', function () { + it('SpQuerySQLTest04', function () { expect(spQuerySQL.initHtml()).toMatchInlineSnapshot(` "
    @@ -212,66 +187,31 @@ describe('SpQuerySQL Test', () => { `); }); - it('SpQuerySQLTest09', function () { - expect( - spQuerySQL.initDataTableStyle({ - children: [ - { - length: 3, - style: { - backgroundColor: 'var(--dark-background5,#F6F6F6)', - }, - }, - ], - }) - ).toBeUndefined(); - }); - - it('SpQuerySQLTest010', function () { + it('SpQuerySQLTest005', function () { expect(spQuerySQL.freshTableHeadResizeStyle()).toBeUndefined(); }); - it('SpQuerySQLTest011', function () { + it('SpQuerySQLTest06', function () { expect(spQuerySQL.reset()).toBeUndefined(); }); - it('SpQuerySQLTest012', function () { - let spQuerySQL = new SpQuerySQL(); - expect( - spQuerySQL.initDataTableStyle({ - children: [ - { - length: 1, - style: { - backgroundColor: 'var(--dark-background5,#F6F6F6)', - }, - }, - ], - }) - ).toBeUndefined(); - }); - - it('SpQuerySQLTest013', function () { + it('SpQuerySQLTest007', function () { expect(spQuerySQL.initDataElement()).toBeUndefined(); }); - it('SpQuerySQLTest014', function () { + it('SpQuerySQLTest008', function () { expect(spQuerySQL.connectedCallback()).toBeUndefined(); }); - it('SpQuerySQLTest015', function () { + it('SpQuerySQLTest009', function () { expect(spQuerySQL.disconnectedCallback()).toBeUndefined(); }); - it('SpQuerySQLTest016', function () { - expect(spQuerySQL.initData()).toBeUndefined(); - }); - - it('SpQuerySQLTest017', function () { + it('SpQuerySQLTest010', function () { expect(spQuerySQL.attributeChangedCallback('', '', '')).toBeUndefined(); }); - it('SpQuerySQLTest018', function () { + it('SpQuerySQLTest011', function () { document.body.innerHTML = ` `; diff --git a/ide/test/trace/component/SpRecordTrace.test.ts b/ide/test/trace/component/SpRecordTrace.test.ts index ad5691b11fcd98a4d280f7d76088feffdf5d6ab9..6c7906c9c79fe0e61b92e05131ae0dde75441dea 100644 --- a/ide/test/trace/component/SpRecordTrace.test.ts +++ b/ide/test/trace/component/SpRecordTrace.test.ts @@ -317,7 +317,11 @@ describe('SpRecordTrace Test', () => { "reportProcessTree": true, "reportSmapsMemInfo": true, "reportSysmemMemInfo": true, + "reportDmaMemInfo": true, + "reportGpuDumpInfo": true, + "reportGpuMemInfo": true, "reportSysmemVmemInfo": true, + "reportPurgeableAshmemInfo": true, "sysMeminfoCounters": [ "PMEM_MEM_TOTAL", "PMEM_MEM_FREE", diff --git a/ide/test/trace/component/SpSystemTrace.test.ts b/ide/test/trace/component/SpSystemTrace.test.ts index a7d69cbb2e870cf505823258bd678360d5607ca7..f93d437d5cbc1b1169b2322c251e53dc9b158e51 100644 --- a/ide/test/trace/component/SpSystemTrace.test.ts +++ b/ide/test/trace/component/SpSystemTrace.test.ts @@ -198,6 +198,9 @@ describe('SpSystemTrace Test', () => { background: var(--dark-background5,#ffffff); box-shadow: 0 10px 10px #00000044; } + :host([disable]) .container{ + pointer-events: none; + } .container{ width: 100%; box-sizing: border-box; diff --git a/ide/test/trace/component/chart/FrameChart.test.ts b/ide/test/trace/component/chart/FrameChart.test.ts index 49e4ae3eae135eef2c3918246943bca75e9ed530..8bef681405798c5ff371813b2bdeba83b5fceb8f 100644 --- a/ide/test/trace/component/chart/FrameChart.test.ts +++ b/ide/test/trace/component/chart/FrameChart.test.ts @@ -21,6 +21,7 @@ import {TraceRow} from '../../../../dist/trace/component/trace/base/TraceRow.js' jest.mock('../../../../dist/trace/component/SpSystemTrace.js', () => { return {}; }); +jest.mock('../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); const intersectionObserverMock = () => ({ observe: () => null, diff --git a/ide/test/trace/component/chart/SpAbilityMonitor.test.ts b/ide/test/trace/component/chart/SpAbilityMonitor.test.ts index a186ea600e5a2a5dc2441daae189c9d197245e6e..6b029414fcb45dcb1eb7fd76f1090fd6d0b93b87 100644 --- a/ide/test/trace/component/chart/SpAbilityMonitor.test.ts +++ b/ide/test/trace/component/chart/SpAbilityMonitor.test.ts @@ -17,7 +17,7 @@ import { SpAbilityMonitorChart } from '../../../../dist/trace/component/chart/SpAbilityMonitorChart.js'; import '../../../../dist/trace/component/chart/SpAbilityMonitorChart.js'; // @ts-ignore -import {SpChartManager} from "../../../../dist/trace/component/chart/SpChartManager.js"; +import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; const sqlit = require('../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../dist/trace/database/SqlLite.js'); @@ -96,6 +96,59 @@ describe('SpAbilityMonitorChart Test', () => { maxPacketOut: 1, }, ]); + let queryDmaAbilityData = sqlit.queryDmaAbilityData; + queryDmaAbilityData.mockResolvedValue([ + { + startNs: 1, + value: 1, + flag: 1, + ipid: 1, + expTaskComm: '' + }, + ]); + let queryGpuMemoryAbilityData = sqlit.queryGpuMemoryAbilityData; + queryGpuMemoryAbilityData.mockResolvedValue([ + { + startNs: 1, + value: 1, + }, + ]); + let queryPurgeableSysData = sqlit.queryPurgeableSysData; + queryPurgeableSysData.mockResolvedValue([ + { + startNs: 1, + value: 1, + }, + ]); + + let purgeableSysData = sqlit.queryPurgeableSysData; + purgeableSysData.mockResolvedValue([ + { + name: 'test', + startNs: 15255, + value: 0, + }, + ]); + + let dmaAbilityData = sqlit.queryDmaAbilityData; + dmaAbilityData.mockResolvedValue([ + { + startNs: 15255, + value: 2, + expTaskComm: 'allocator_host', + flag: 0, + name: 'test', + }, + ]); + + let gpuMemoryAbilityData = sqlit.queryGpuMemoryAbilityData; + gpuMemoryAbilityData.mockResolvedValue([ + { + name: 'test', + startNs: 15255, + value: 0, + }, + ]); let manager = new SpChartManager(); let trace = new SpAbilityMonitorChart(manager); it('SpAbilityMonitorChart01', function () { diff --git a/ide/test/trace/component/chart/SpArkTsChart.test.ts b/ide/test/trace/component/chart/SpArkTsChart.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..dcea92c215bbaabf7ba605be52199ccff25a4e7f --- /dev/null +++ b/ide/test/trace/component/chart/SpArkTsChart.test.ts @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { SpArkTsChart } from '../../../../dist/trace/component/chart/SpArkTsChart.js'; +// @ts-ignore +import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; + +const sqlite = require('../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../dist/trace/database/SqlLite.js'); + +describe('SpClockChart Test', () => { + let arkTsChart = new SpArkTsChart(new SpChartManager()); + + let jsCpuProfilerConfig = sqlite.queryJsCpuProfilerConfig; + let cpuProfilerConfigData = [{ + enableCpuProfiler: 1, + pid:1553, + type : -1 + }]; + jsCpuProfilerConfig.mockResolvedValue(cpuProfilerConfigData); + + let jsCpuProfiler = sqlite.queryJsCpuProfilerData; + let cpuProfilerData = [{ + 1: 1 + }]; + jsCpuProfiler.mockResolvedValue(cpuProfilerData); + + let jsMemory = sqlite.queryJsMemoryData; + let jsMemoryData = [{}]; + jsMemory.mockResolvedValue(jsMemoryData); + + it('SpClockChart01', function () { + expect(arkTsChart.initFolder()).not.toBeUndefined(); + }); + it('SpClockChart02', function () { + expect(arkTsChart.initTimelineChart()).not.toBeUndefined(); + }); + it('SpClockChart03', function () { + expect(arkTsChart.initSnapshotChart()).not.toBeUndefined(); + }); +}); \ No newline at end of file diff --git a/ide/test/trace/component/chart/SpProcessChart.test.ts b/ide/test/trace/component/chart/SpProcessChart.test.ts index 5f926469a4319a8c841e53ade793ed9fb6340340..634cb938b080d92b1adc067bec029e27827e0e6d 100644 --- a/ide/test/trace/component/chart/SpProcessChart.test.ts +++ b/ide/test/trace/component/chart/SpProcessChart.test.ts @@ -17,6 +17,7 @@ import { SpProcessChart } from '../../../../dist/trace/component/chart/SpProcessChart.js'; // @ts-ignore import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; + const sqlit = require('../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../dist/trace/database/SqlLite.js'); @@ -208,6 +209,328 @@ describe('SpProcessChart Test', () => { }, ]); + let queryProcessStartup = sqlit.queryProcessStartup; + queryProcessStartup.mockResolvedValue([ + { + 'pid': 3913, + 'tid': 3913, + 'itid': 366, + 'startTs': 5651745832, + 'dur': 38654167, + 'startName': 0, + 'endItid': 341, + 'frame': { + 'y': 5, + 'height': 20, + 'x': 1154, + 'width': 9 + }, + 'v': true, + 'stepName': 'Process Creating (38.65ms)', + 'textMetricsWidth': 129.072265625 + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 341, + 'startTs': 5690399999, + 'dur': 43619792, + 'startName': 1, + 'endItid': 486, + 'frame': { + 'y': 5, + 'height': 20, + 'x': 1162, + 'width': 10 + }, + 'v': true, + 'stepName': 'Application Launching (43.62ms)', + 'textMetricsWidth': 156.416015625 + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5734019791, + 'dur': 23194270, + 'startName': 2, + 'endItid': 486, + 'frame': { + 'y': 5, + 'height': 20, + 'x': 1171, + 'width': 6 + }, + 'v': true + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5757214061, + 'dur': 115679167, + 'startName': 3, + 'endItid': 486, + 'frame': { + 'y': 5, + 'height': 20, + 'x': 1176, + 'width': 24 + }, + 'v': true, + 'stepName': 'UI Ability OnForeground (115.68ms)', + 'textMetricsWidth': 172.59765625 + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5872893228, + 'dur': 62756250, + 'startName': 4, + 'frame': { + 'y': 5, + 'height': 20, + 'x': 1199, + 'width': 14 + }, + 'v': true, + 'stepName': 'First Frame - APP Phase (62.76ms)', + 'textMetricsWidth': 162.9638671875 + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 17, + 'startTs': 5968040103, + 'dur': 29438021, + 'startName': 5, + 'frame': { + 'y': 5, + 'height': 20, + 'x': 1219, + 'width': 7 + }, + 'v': true + } + ]); + + let queryProcessSoInitData = sqlit.queryProcessSoInitData; + queryProcessSoInitData.mockResolvedValue([ + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5678439061, + 'dur': 1137500, + 'soName': ' /system/lib64/seccomp/libapp_filter.z.so', + 'depth': 0, + 'frame': { + 'x': 1160, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5682777082, + 'dur': 1130729, + 'soName': ' /system/lib64/libhidebug.so', + 'depth': 0, + 'frame': { + 'x': 1160, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5696226041, + 'dur': 4319791, + 'soName': ' system/lib64/extensionability/libinputmethod_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1163, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5700671874, + 'dur': 4128125, + 'soName': ' system/lib64/extensionability/libbackup_extension_ability_native.z.so', + 'depth': 0, + 'frame': { + 'x': 1164, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5704894270, + 'dur': 2187500, + 'soName': ' system/lib64/extensionability/libwindow_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1165, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5707165624, + 'dur': 1503125, + 'soName': ' system/lib64/extensionability/libdatashare_ext_ability_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1165, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5708719791, + 'dur': 2018229, + 'soName': ' system/lib64/extensionability/libpush_extension.z.so', + 'depth': 0, + 'frame': { + 'x': 1166, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5710788020, + 'dur': 846875, + 'soName': ' system/lib64/extensionability/libenterprise_admin_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1166, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5711693749, + 'dur': 1522917, + 'soName': ' system/lib64/extensionability/libstatic_subscriber_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1166, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5713377603, + 'dur': 1327604, + 'soName': ' system/lib64/extensionability/libui_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1167, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5714757291, + 'dur': 2567187, + 'soName': ' system/lib64/extensionability/libauthorization_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1167, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5717385936, + 'dur': 2341146, + 'soName': ' system/lib64/extensionability/libaccessibility_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1167, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5719780728, + 'dur': 1603646, + 'soName': ' system/lib64/extensionability/libservice_extension_module.z.so', + 'depth': 0, + 'frame': { + 'x': 1168, + 'y': 0, + 'width': 1, + 'height': 20 + } + }, + { + 'pid': 3913, + 'tid': 3913, + 'itid': 486, + 'startTs': 5721437499, + 'dur': 1314583, + 'soName': ' system/lib64/extensionability/libworkschedextension.z.so', + 'depth': 0, + 'frame': { + 'x': 1168, + 'y': 0, + 'width': 1, + 'height': 20 + } + } + ]); + + spProcessChart.setAttribute = jest.fn(); + spProcessChart.addChildTraceRow = jest.fn(); it('SpProcessChart01', function () { spProcessChart.initAsyncFuncData(); spProcessChart.init(); @@ -223,4 +546,14 @@ describe('SpProcessChart Test', () => { spProcessChart.initDeliverInputEvent(); expect(spProcessChart.processAsyncFuncArray.length).toEqual(1); }); + + it('SpProcessChart04', function () { + let startUpRow = spProcessChart.addStartUpRow(spProcessChart); + expect(startUpRow).not.toBeUndefined(); + }); + + it('SpProcessChart05', function () { + let soInitRow = spProcessChart.addSoInitRow(spProcessChart, 1); + expect(soInitRow).not.toBeUndefined(); + }); }); diff --git a/ide/test/trace/component/chart/SpVmTrackerChart.test.ts b/ide/test/trace/component/chart/SpVmTrackerChart.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..14dc276e5302a010200d5b26a2923c539e88364c --- /dev/null +++ b/ide/test/trace/component/chart/SpVmTrackerChart.test.ts @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import { VmTrackerChart } from '../../../../dist/trace/component/chart/SpVmTrackerChart.js'; +// @ts-ignore +import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; +const sqlite = require('../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('SpVmTrackerChart Test', () => { + let smapsData = sqlite.querySmapsData; + let smapsSixData = [{ + startNs:0, + value:1024, + name:'dirty', + }]; + smapsData.mockResolvedValue(smapsSixData); + let dmaSmapsData = sqlite.queryDmaSampsData; + let smapsDmaData = [{ + startNs:0, + value:1024, + flag:1, + ipid:1, + expTaskComm:'delay', + }]; + dmaSmapsData.mockResolvedValue(smapsDmaData); + let gpuMemoryData = sqlite.queryGpuMemoryData; + let gpuData = [{ + startNs:0, + value:1024, + ipid:1, + }]; + gpuMemoryData.mockResolvedValue(gpuData); + let smapsExits = sqlite.querySmapsExits; + let exits = [{ + event_name:'trace_smaps', + }]; + smapsExits.mockResolvedValue(exits); + let vmTrackerShmData = sqlite.queryVmTrackerShmData; + let shmData = [{ + startNs:0, + value:1024, + }]; + vmTrackerShmData.mockResolvedValue(shmData); + let purgeableProcessData = sqlite.queryPurgeableProcessData; + let processData = [{ + startNs:0, + value:1024, + }]; + purgeableProcessData.mockResolvedValue(processData); + let gpuGlData = sqlite.queryGpuGLData; + let glData = [{ + startNs:0, + value:1024, + }]; + gpuGlData.mockResolvedValue(glData); + let gpuTotalData = sqlite.queryGpuTotalData; + let totalData = [{ + startNs:0, + value:1024, + }]; + gpuTotalData.mockResolvedValue(totalData); + let gpuTotalType = sqlite.queryGpuTotalType; + let totalType = [{ + id:1, + data:'delay' + }]; + gpuTotalType.mockResolvedValue(totalType); + let gpuWindowData = sqlite.queryGpuWindowData; + let windowsData = [{ + startNs:0, + value:1024, + }]; + gpuWindowData.mockResolvedValue(windowsData); + let gpuWindowType = sqlite.queryGpuWindowType; + let windowsType = [{ + id:1, + data:'delay', + pid:1, + }]; + gpuWindowType.mockResolvedValue(windowsType); + let manager = new SpChartManager(); + let spVmTrackerChart = new VmTrackerChart(manager); + it('SpVmTrackerChart01', function () { + spVmTrackerChart.initVmTrackerFolder(); + expect(spVmTrackerChart).toBeDefined(); + }); + it('SpVmTrackerChart02', function () { + expect(spVmTrackerChart.getSmapsKeyName('USS')).toBeDefined(); + }); + it('SpVmTrackerChart03', function () { + expect(spVmTrackerChart.initTraceRow('dirty','smaps','VmTracker')).toBeDefined(); + }); + it('SpVmTrackerChart04', function () { + expect(spVmTrackerChart.initPurgeablePin()).toBeDefined(); + }); + it('SpVmTrackerChart05', function () { + expect(spVmTrackerChart.initPurgeableTotal()).toBeDefined(); + }); + it('SpVmTrackerChart06', function () { + expect(spVmTrackerChart.showTip).toBeDefined(); + }); +}); \ No newline at end of file diff --git a/ide/test/trace/component/trace/base/TraceRow.test.ts b/ide/test/trace/component/trace/base/TraceRow.test.ts index 36a8e316cf8ceaef78182744736cd76fc61b1413..404ba1b623047e6f9ff7402d7c330314a11c2de3 100644 --- a/ide/test/trace/component/trace/base/TraceRow.test.ts +++ b/ide/test/trace/component/trace/base/TraceRow.test.ts @@ -789,9 +789,10 @@ describe('TraceRow Test', () => { :host(:not([check-type])) .lit-check-box{ display: none; } - :host([collect-type]) { - /*position:fixed;*/ - /*z-index:1000;*/ + :host([collect-type]) .setting{ + position:fixed; + z-index:1003; + left: 473px; } :host(:not([collect-type])) { /*position:static;*/ @@ -810,9 +811,12 @@ describe('TraceRow Test', () => { :host(:not([folder])) .describe:hover .collect{ display: block; } - :host([row-type="native-memory"]) #nativeRadioList{ + :host([row-setting='enable']) #rowSetting{ display: flex; - } + } + :host([row-setting='enable']) .collect{ + margin-right: 20px; + } .popover{ color: var(--dark-color1,#4b5766); display: none; @@ -820,9 +824,12 @@ describe('TraceRow Test', () => { align-items: center; margin-right: 5px; } + .setting{ + position:absolute; + left: 225px; + } .radio{ margin-right: 10px; - } #setting{ color: var(--dark-color1,#606060); @@ -833,39 +840,32 @@ describe('TraceRow Test', () => { :host([highlight]) .flash{ background-color: #ffe263; } - :host([row-type="energy"]) #appNameList{ display: flex; } - #listprocess::-webkit-scrollbar{ width: 6px; } - /*定义滑块 内阴影+圆角*/ #listprocess::-webkit-scrollbar-thumb { border-radius: 6px; background-color: var(--dark-background7,#e7c9c9); } -
    - -
    -
    - Current Bytes
    -
    - Native Memory Density
    + +
    - -
    + +
    +
    diff --git a/ide/test/trace/component/trace/sheet/ability/TabPaneDmaAbility.test.ts b/ide/test/trace/component/trace/sheet/ability/TabPaneDmaAbility.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..4be217619c0451ccc45d1beeaab3c0c2eb02ca54 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/ability/TabPaneDmaAbility.test.ts @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TabPaneDmaAbility } from '../../../../../../dist/trace/component/trace/sheet/ability/TabPaneDmaAbility.js'; + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneDmaAbility Test', () => { + let tabPaneDmaAbility = new TabPaneDmaAbility(); + let getTabDmaAbilityData = sqlit.getTabDmaAbilityData; + getTabDmaAbilityData.mockResolvedValue([ + { + avgSize: 25165824, + avgSizes: "24.00MB", + expTaskComm: "allocator_host", + maxSize: 25165822, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + process: "com.ohos.camera(22)", + processId: 22, + processName: "com.ohos.camera", + startNs: 4568285416, + sumSize: 25165824, + sumSizes: "24.00MB", + }, + { + avgSize: 25165824, + avgSizes: "24.00MB", + expTaskComm: "11allocator_host", + maxSize: 25165824, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + process: "com.ohos.camera(1)", + processId: 1, + processName: "com.ohos.camera", + startNs: 4568285416, + sumSize: 25165824, + sumSizes: "24.00MB", + }, + { + avgSize: 25165824, + avgSizes: "24.00MB", + expTaskComm: "alloca11tor_host", + maxSize: 25165824, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + process: "com.ohos.c11amera(33)", + processId: 33, + processName: "com.ohos.camera", + startNs: 4568285416, + sumSize: 25165824, + sumSizes: "24.00MB", + }, + ]); + tabPaneDmaAbility.init = jest.fn(() => true); + tabPaneDmaAbility.data = { + anomalyEnergy: [], + clockMapData: {}, + cpuAbilityIds: [], + cpuFreqFilterIds: [], + cpuFreqLimitDatas: [], + cpuStateFilterIds: [], + cpus: [], + diskAbilityIds: [], + diskIOLatency: false, + diskIOReadIds: [], + diskIOWriteIds: [], + diskIOipids: [], + dmaAbilityData: [], + dmaVmTrackerData:[], + fsCount:0, + funAsync:[], + funTids:[], + gpu:{gl: false, gpuWindow: false, gpuTotal: false}, + gpuMemoryAbilityData:[], + gpuMemoryTrackerData:[], + hasFps:false, + irqMapData:{size: 0}, + isCurrentPane:false, + jankFramesData:[], + jsCpuProfilerData:[], + jsMemory:[], + leftNs:486814455, + memoryAbilityIds:[], + networkAbilityIds:[], + recordStartNs:333185936669149, + rightNs:16125728831, + sdkCounterIds:[], + sdkSliceIds:[], + smapsType:[], + startup:false, + staticInit:false, + statisticsSelectData:undefined, + + }; + + it('TabPaneDmaAbilityTest01', function () { + expect(tabPaneDmaAbility.sortDmaByColumn('process',1)).toBeUndefined(); + }); + it('TabPaneDmaAbilityTest02', function () { + expect(tabPaneDmaAbility.sortDmaByColumn('expTaskComm',1)).toBeUndefined(); + }); + it('TabPaneDmaAbilityTest03', function () { + expect(tabPaneDmaAbility.sortDmaByColumn('sumSizes',1)).toBeUndefined(); + }); + it('TabPaneDmaAbilityTest04', function () { + expect(tabPaneDmaAbility.sortDmaByColumn('avgSize',1)).toBeUndefined(); + }); + it('TabPaneDmaAbilityTest05', function () { + expect(tabPaneDmaAbility.sortDmaByColumn('minSize',1)).toBeUndefined(); + }); + it('TabPaneDmaAbilityTest06', function () { + expect(tabPaneDmaAbility.sortDmaByColumn('maxSize',1)).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.test.ts b/ide/test/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..537a88cc2f8823c50fd45f11411833e8b6fe9a7b --- /dev/null +++ b/ide/test/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.test.ts @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TabPaneGpuMemoryAbility } from '../../../../../../dist/trace/component/trace/sheet/ability/TabPaneGpuMemoryAbility.js'; + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return { + } +}); +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneGpuMemoryAbility Test', () => { + let tabPaneGpuMemoryAbility = new TabPaneGpuMemoryAbility(); + let getTabGpuMemoryAbilityData = sqlit.getTabGpuMemoryAbilityData; + getTabGpuMemoryAbilityData.mockResolvedValue([ + { + avgSize: 711756458.666667, + avgSizes: "678.78MB", + gpuName: "mali0", + maxSize: 816918528, + maxSizes: "779.07MB", + minSize: 643006464, + minSizes: "613.22MB", + process: "render_service(1071)", + processId: 1071, + processName: "render_service", + startNs: 9551711978, + sumSize: 2135269376, + sumSizes: "1.99GB", + }, + { + avgSize: 905216, + avgSizes: "884.00KB", + gpuName: "mali0", + isHover: false, + maxSize: 905216, + maxSizes: "884.00KB", + minSize: 905216, + minSizes: "884.00KB", + process: "/system/bin/aosp_graphic_temp_service(609)", + processId: 609, + processName: "/system/bin/aosp_graphic_temp_service", + startNs: 4568285416, + sumSize: 2715648, + sumSizes: "2.59MB", + }, + ]); + tabPaneGpuMemoryAbility.init = jest.fn(() => true); + getTabGpuMemoryAbilityData.data = { + anomalyEnergy: [], + clockMapData: {}, + cpuAbilityIds: [], + cpuFreqFilterIds: [], + cpuFreqLimitDatas: [], + cpuStateFilterIds: [], + cpus: [], + diskAbilityIds: [], + diskIOLatency: false, + diskIOReadIds: [], + diskIOWriteIds: [], + diskIOipids: [], + dmaAbilityData: [], + dmaVmTrackerData:[], + fsCount:0, + funAsync:[], + funTids:[], + gpu:{gl: false, gpuWindow: false, gpuTotal: false}, + gpuMemoryAbilityData:[1,23,''], + gpuMemoryTrackerData:[], + hasFps:false, + irqMapData:{size: 0}, + isCurrentPane:false, + jankFramesData:[], + jsCpuProfilerData:[], + jsMemory:[], + leftNs:486814455, + memoryAbilityIds:[], + networkAbilityIds:[], + recordStartNs:333185936669149, + rightNs:16125728831, + sdkCounterIds:[], + sdkSliceIds:[], + smapsType:[], + startup:false, + staticInit:false, + statisticsSelectData:undefined, + }; + + it('TabPaneGpuMemoryAbilityTest01', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('process',1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryAbilityTest02', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('startNs',1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryAbilityTest03', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('sumSizes',1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryAbilityTest04', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('avgSize',1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryAbilityTest05', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('minSize',1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryAbilityTest06', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('maxSize',1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryAbilityTest06', function () { + expect(tabPaneGpuMemoryAbility.sortGpuMemoryByColumn('maxSize',1)).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/ability/TabPanePurgPin.test.ts b/ide/test/trace/component/trace/sheet/ability/TabPanePurgPin.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..f05301d457a5c3a4feebae236ace53ff270356cc --- /dev/null +++ b/ide/test/trace/component/trace/sheet/ability/TabPanePurgPin.test.ts @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TabPanePurgPin } from '../../../../../../dist/trace/component/trace/sheet/ability/TabPanePurgPin.js'; + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPanePurgPin Test', () => { + let tabPanePurgPin = new TabPanePurgPin(); + let querySysPurgeableTab = sqlit.querySysPurgeableTab; + querySysPurgeableTab.mockResolvedValue([ + { + avgSize: 25165824, + avgSizes: "24.00MB", + type: "allocator_host", + maxSize: 25165822, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + }, + { + avgSize: 25165824, + avgSizes: "24.00MB", + type: "11allocator_host", + maxSize: 25165824, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + }, + { + avgSize: 25165824, + avgSizes: "24.00MB", + type: "alloca11tor_host", + maxSize: 25165824, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + }, + ]); + tabPanePurgPin.init = jest.fn(() => true); + tabPanePurgPin.data = { + anomalyEnergy: [], + clockMapData:{size: 0}, + cpuAbilityIds: [], + cpuFreqFilterIds: [], + cpuFreqLimitDatas: [], + cpuStateFilterIds: [], + cpus: [], + diskAbilityIds: [], + diskIOLatency: false, + diskIOReadIds: [], + diskIOWriteIds: [], + diskIOipids: [], + dmaAbilityData: [], + dmaVmTrackerData: [], + fsCount: 0, + funAsync: [], + funTids: [], + gpu: {gl: false, gpuWindow: false, gpuTotal: false}, + gpuMemoryAbilityData: [], + gpuMemoryTrackerData: [], + hasFps: false, + irqMapData:{size: 0}, + isCurrentPane: false, + jankFramesData: [], + jsCpuProfilerData: [], + jsMemory: [], + leftNs: 5050699973, + memoryAbilityIds: [], + nativeMemory: [], + nativeMemoryStatistic: [], + networkAbilityIds: [], + perfAll: false, + perfCpus: [], + perfProcess: [], + perfSampleIds: [], + perfThread: [], + powerEnergy: [], + processIds: [], + processTrackIds: [], + promiseList: [], + purgeablePinAbility: [], + purgeablePinSelection: [], + purgeablePinVM: [], + purgeableTotalAbility: [], + purgeableTotalSelection: [], + purgeableTotalVM: [], + recordStartNs: 333185936669149, + rightNs: 20081096280, + sdkCounterIds: [], + sdkSliceIds: [], + smapsType: [], + startup: false, + staticInit: false, + statisticsSelectData: undefined, + }; + + it('TabPanePurgPinTest01', function () { + expect( + tabPanePurgPin.sortByColumn({ + key: 'avgSize', + }) + ).toBeUndefined(); + }); + it('TabPanePurgPinTest02', function () { + expect( + tabPanePurgPin.sortByColumn({ + key: 'type', + }) + ).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/ability/TabPanePurgTotal.test.ts b/ide/test/trace/component/trace/sheet/ability/TabPanePurgTotal.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..da43a50d6e29b93abce86e40920825e63cf63d35 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/ability/TabPanePurgTotal.test.ts @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TabPanePurgTotal } from '../../../../../../dist/trace/component/trace/sheet/ability/TabPanePurgTotal.js'; + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPanePurgTotal Test', () => { + let tabPanePurgTotal = new TabPanePurgTotal(); + let querySysPurgeableTab = sqlit.querySysPurgeableTab; + querySysPurgeableTab.mockResolvedValue([ + { + avgSize: 25165824, + avgSizes: "24.00MB", + type: "allocator_host", + maxSize: 25165822, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + }, + { + avgSize: 25165824, + avgSizes: "24.00MB", + type: "11allocator_host", + maxSize: 25165824, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + }, + { + avgSize: 25165824, + avgSizes: "24.00MB", + type: "alloca11tor_host", + maxSize: 25165824, + maxSizes: "24.00MB", + minSize: 25165824, + minSizes: "24.00MB", + }, + ]); + tabPanePurgTotal.init = jest.fn(() => true); + tabPanePurgTotal.data = { + anomalyEnergy: [], + clockMapData:{size: 0}, + cpuAbilityIds: [], + cpuFreqFilterIds: [], + cpuFreqLimitDatas: [], + cpuStateFilterIds: [], + cpus: [], + diskAbilityIds: [], + diskIOLatency: false, + diskIOReadIds: [], + diskIOWriteIds: [], + diskIOipids: [], + dmaAbilityData: [], + dmaVmTrackerData: [], + fsCount: 0, + funAsync: [], + funTids: [], + gpu: {gl: false, gpuWindow: false, gpuTotal: false}, + gpuMemoryAbilityData: [], + gpuMemoryTrackerData: [], + hasFps: false, + irqMapData:{size: 0}, + isCurrentPane: false, + jankFramesData: [], + jsCpuProfilerData: [], + jsMemory: [], + leftNs: 5050699973, + memoryAbilityIds: [], + nativeMemory: [], + nativeMemoryStatistic: [], + networkAbilityIds: [], + perfAll: false, + perfCpus: [], + perfProcess: [], + perfSampleIds: [], + perfThread: [], + powerEnergy: [], + processIds: [], + processTrackIds: [], + promiseList: [], + purgeablePinAbility: [], + purgeablePinSelection: [], + purgeablePinVM: [], + purgeableTotalAbility: [], + purgeableTotalSelection: [], + purgeableTotalVM: [], + recordStartNs: 333185936669149, + rightNs: 20081096280, + sdkCounterIds: [], + sdkSliceIds: [], + smapsType: [], + startup: false, + staticInit: false, + statisticsSelectData: undefined, + }; + + it('TabPanePurgTotalTest01', function () { + expect( + tabPanePurgTotal.sortByColumn({ + key: 'avgSize', + }) + ).toBeUndefined(); + }); + it('TabPanePurgTotalTest02', function () { + expect( + tabPanePurgTotal.sortByColumn({ + key: 'type', + }) + ).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts b/ide/test/trace/component/trace/sheet/ark-ts/TabPaneComparison.test.ts similarity index 99% rename from ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts rename to ide/test/trace/component/trace/sheet/ark-ts/TabPaneComparison.test.ts index cc64c4749920e9066eaa8f57e194d1f64afd0ed6..fe8c5f329e29a75b5c60cece9bca50296ef94684 100644 --- a/ide/test/trace/component/trace/sheet/snapshot/TabPaneComparison.test.ts +++ b/ide/test/trace/component/trace/sheet/ark-ts/TabPaneComparison.test.ts @@ -368,7 +368,7 @@ describe('TabPaneComparison Test', () => { expect(tabPaneComparisons.comparisonTableEl!.snapshotDataSource).toEqual([]); }); - it('TabPaneComparisonTest2', () => { + it('TabPaneComparisonTest02', () => { tabPaneComparisons.retainsData = [ { distance: 1, @@ -378,7 +378,7 @@ describe('TabPaneComparison Test', () => { expect(tabPaneComparisons.retainsData).not.toBe([]); }); - it('TabPaneComparisonTest12', () => { + it('TabPaneComparisonTest03', () => { let tabPaneComparison = new TabPaneComparison(); let data = [ { diff --git a/ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts b/ide/test/trace/component/trace/sheet/ark-ts/TabPaneSummary.test.ts similarity index 85% rename from ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts rename to ide/test/trace/component/trace/sheet/ark-ts/TabPaneSummary.test.ts index 44aafbd358edbf55f4588cd1f7b2363476784b17..479d00bbc07e074adc13558db2f54b590433fb77 100644 --- a/ide/test/trace/component/trace/sheet/snapshot/TabPaneSummary.test.ts +++ b/ide/test/trace/component/trace/sheet/ark-ts/TabPaneSummary.test.ts @@ -40,6 +40,14 @@ window.ResizeObserver = describe('TabPaneSummary Test', () => { let tabPaneSummary = new TabPaneSummary(); + tabPaneSummary.tbs = jest.fn(() => { + return { + scrollTop: 0, + }; + }); + tabPaneSummary.tbs.snapshotDataSource = jest.fn(() => { + return []; + }); it('TabPaneSummaryTest01', () => { document.body.innerHTML = ` `; let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; @@ -344,21 +352,44 @@ describe('TabPaneSummary Test', () => { expect(tabPaneSummary.initSummaryData({ name: 'Timeline', id: ''}, 0, 0)).toBeUndefined(); }); - it('TabPaneSummaryTest12', () => { - document.body.innerHTML = ` `; - let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; + it('TabPaneSummaryTest02', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; expect(tabPaneSummary.sortByLeftTable('shallowSize', 1)).toBeUndefined(); }); it('TabPaneSummaryTest03', () => { - document.body.innerHTML = ` `; - let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; expect(tabPaneSummary.sortByLeftTable('retainedSize', 1)).toBeUndefined(); }); it('TabPaneSummaryTest04', () => { - document.body.innerHTML = ` `; - let tabPaneSummary = document.querySelector('#sss') as TabPaneSummary; - expect(tabPaneSummary.sortByLeftTable('objectName', 1)).toBeUndefined(); + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; + expect(tabPaneSummary.sortByLeftTable('distance', 1)).toBeUndefined(); + }); + + it('TabPaneSummaryTest05', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; + expect(tabPaneSummary.sortByRightTable('shallowSize', 1)).toBeUndefined(); + }); + it('TabPaneSummaryTest06', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; + expect(tabPaneSummary.sortByRightTable('retainedSize', 1)).toBeUndefined(); }); + it('TabPaneSummaryTest07', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; + expect(tabPaneSummary.sortByRightTable('distance', 1)).toBeUndefined(); + }); + + it('TabPaneSummaryTest08', () => { + document.body.innerHTML = ` `; + let tabPaneSummary = document.querySelector('#ts') as TabPaneSummary; + expect(tabPaneSummary.sortByRightTable('objectName', 1)).toBeUndefined(); + }); + it('TabPaneSummaryTest09', () => { expect(tabPaneSummary.clickToggleTable()).toBeUndefined(); }); diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.test.ts index 40046a62bf2db79450600c56f2853874b34c9b1b..cd9c15b26cc6830d8370aca21e4e5dde2b797c4d 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneFileSystemCalltree.test.ts @@ -52,7 +52,7 @@ Object.defineProperty(global.self, 'crypto', { }); describe('TabpaneFilesystemCalltree Test', () => { - document.body.innerHTML = ``; + document.body.innerHTML = ``; let tabpaneFilesystemCalltree = document.querySelector('#tree'); let val = { anomalyEnergy: [], @@ -211,23 +211,6 @@ describe('TabpaneFilesystemCalltree Test', () => { }); it('TabpaneFilesystemCalltreeTest10', function () { - let switchData = { - firstSelect: '', - icon: 'block', - inputValue: 'kk', - mark: false, - secondSelect: '', - thirdSelect: '', - type: 'inputValue', - }; - tabpaneFilesystemCalltree.fsCallTreeTbl.reMeauseHeight = jest.fn(() => true); - let frameChart = new FrameChart(); - tabpaneFilesystemCalltree.frameChart = frameChart; - tabpaneFilesystemCalltree.switchFlameChart(switchData); - expect(tabpaneFilesystemCalltree.isChartShow).toBeTruthy(); - }); - - it('TabpaneFilesystemCalltreeTest11', function () { let call = { id: '1', dur: 1, diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts index c3074f70060c978147ba89fd124e71d3fe4618e9..edf327441fbac5734597fc7a110cbd0cf9b802fa 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneFilesystemStatisticsAnalysis.test.ts @@ -211,4 +211,65 @@ describe('TabPaneFilesystemStatisticsAnalysis Test', () => { tabPane.getFilesystemProcess(parames, processData); expect(tabPane.fileStatisticsAnalysisProcessData).not.toBeUndefined(); }); + it('systemStatisticsAnalysis12', function () { + tabPane.currentLevel = 0; + let paras = [ + { + type: 3, + callChainId: 1, + dur: 4757959, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + { + type: 3, + callChainId: 1, + dur: 4673084, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + ]; + tabPane.currentLevelData = paras; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 0; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 0; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + }); }); diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts index 4b9b478514cc9d21b47d7054b8f7f26df93a5156..a992c416287f2c481dd041d261ebbc4d66d3e8ab 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneIOTierStatisticsAnalysis.test.ts @@ -23,185 +23,247 @@ import crypto from 'crypto'; import { TabPaneFilter } from '../../../../../../dist/trace/component/trace/sheet/TabPaneFilter.js'; // @ts-ignore window.ResizeObserver = - window.ResizeObserver || - jest.fn().mockImplementation(() => ({ - disconnect: jest.fn(), - observe: jest.fn(), - unobserve: jest.fn(), - })); + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); Object.defineProperty(global.self, 'crypto', { - value: { - getRandomValues: (arr: string | any[]) => crypto.randomBytes(arr.length), - }, + value: { + getRandomValues: (arr: string | any[]) => crypto.randomBytes(arr.length), + }, }); describe('TabPaneIOTierStatisticsAnalysis Test', () => { - document.body.innerHTML = ``; - let tabPane = document.querySelector('#statistics-analysis'); - let param = { - anomalyEnergy: [], - clockMapData: { size: 0 }, - cpuAbilityIds: [], - cpuFreqFilterIds: [], - cpuFreqLimitDatas: [], - cpuStateFilterIds: [], - cpus: [], - diskAbilityIds: [], - diskIOLatency: false, - diskIOReadIds: [2, 7, 1, 3, 4, 5, 6], - diskIOWriteIds: [2, 7, 1, 3, 4, 5, 6], - diskIOipids: [2, 7, 1, 3, 4, 5, 6], - fileSysVirtualMemory: false, - fileSystemType: [], - fsCount: 0, - funAsync: [], - funTids: [], - hasFps: false, - irqMapData: { size: 0 }, - jsMemory: [], - leftNs: 964699689, - memoryAbilityIds: [], - nativeMemory: [], - nativeMemoryStatistic: [], - networkAbilityIds: [], - perfAll: false, - perfCpus: [], - perfProcess: [], - perfSampleIds: [], - perfThread: [], - powerEnergy: [], - processTrackIds: [], - promiseList: [], - recordStartNs: 780423789228, - rightNs: 24267556624, - sdkCounterIds: [], - sdkSliceIds: [], - smapsType: [], - systemEnergy: [], - threadIds: [], - virtualTrackIds: [], - vmCount: 0, - }; - let processData = [ - { - callChainId: 13, - dur: 240916, - libId: 539, - libName: 'libName.z.so', - pid: 911, - processName: 'processName(911)', - symbolId: 799, - symbolName: 'symbolName', - threadName: 'threadName', - tid: 404, - type: 0, - }, - ]; - let item = { - durFormat: '194.23ms ', - duration: 194230478, - isHover: true, - percent: '99.00', - pid: 3744, - tableName: 'test(3744)', - }; - let res = [ - { - durFormat: '194.23ms ', - duration: 194230478, - isHover: true, - percent: '99.00', - pid: 3744, - tableName: 'test(3744)', - }, + document.body.innerHTML = ``; + let tabPane = document.querySelector('#statistics-analysis'); + let param = { + anomalyEnergy: [], + clockMapData: { size: 0 }, + cpuAbilityIds: [], + cpuFreqFilterIds: [], + cpuFreqLimitDatas: [], + cpuStateFilterIds: [], + cpus: [], + diskAbilityIds: [], + diskIOLatency: false, + diskIOReadIds: [2, 7, 1, 3, 4, 5, 6], + diskIOWriteIds: [2, 7, 1, 3, 4, 5, 6], + diskIOipids: [2, 7, 1, 3, 4, 5, 6], + fileSysVirtualMemory: false, + fileSystemType: [], + fsCount: 0, + funAsync: [], + funTids: [], + hasFps: false, + irqMapData: { size: 0 }, + jsMemory: [], + leftNs: 964699689, + memoryAbilityIds: [], + nativeMemory: [], + nativeMemoryStatistic: [], + networkAbilityIds: [], + perfAll: false, + perfCpus: [], + perfProcess: [], + perfSampleIds: [], + perfThread: [], + powerEnergy: [], + processTrackIds: [], + promiseList: [], + recordStartNs: 780423789228, + rightNs: 24267556624, + sdkCounterIds: [], + sdkSliceIds: [], + smapsType: [], + systemEnergy: [], + threadIds: [], + virtualTrackIds: [], + vmCount: 0, + }; + let processData = [ + { + callChainId: 13, + dur: 240916, + libId: 539, + libName: 'libName.z.so', + pid: 911, + processName: 'processName(911)', + symbolId: 799, + symbolName: 'symbolName', + threadName: 'threadName', + tid: 404, + type: 0, + }, + ]; + let item = { + durFormat: '194.23ms ', + duration: 194230478, + isHover: true, + percent: '99.00', + pid: 3744, + tableName: 'test(3744)', + }; + let res = [ + { + durFormat: '194.23ms ', + duration: 194230478, + isHover: true, + percent: '99.00', + pid: 3744, + tableName: 'test(3744)', + }, + ]; + let itemClick = new CustomEvent('click', { + detail: { + ...{}, + data: {}, + }, + composed: true, + }); + it('tabPaneIOTierStatisticsAnalysis01', function () { + let litTable = new LitTable(); + tabPane.appendChild(litTable); + let filter = new TabPaneFilter(); + tabPane.filter = filter; + tabPane.loadingList = []; + tabPane.data = param; + expect(tabPane.ioTierStatisticsAnalysisSelection).toBeUndefined(); + }); + it('tabPaneIOTierStatisticsAnalysis02', function () { + expect(tabPane.clearData()).toBeUndefined(); + }); + it('tabPaneIOTierStatisticsAnalysis03', function () { + tabPane.processData = jest.fn(() => true); + let paras = [ + { + type: 2, + callChainId: 1, + dur: 4757959, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + { + type: 2, + callChainId: 1, + dur: 4673084, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, ]; - let itemClick = new CustomEvent('click', { - detail: { - ...{}, - data: {}, - }, - composed: true, - }); - it('tabPaneIOTierStatisticsAnalysis01', function () { - let litTable = new LitTable(); - tabPane.appendChild(litTable); - let filter = new TabPaneFilter(); - tabPane.filter = filter; - tabPane.loadingList = []; - tabPane.data = param; - expect(tabPane.ioTierStatisticsAnalysisSelection).toBeUndefined(); - }); - it('tabPaneIOTierStatisticsAnalysis02', function () { - expect(tabPane.clearData()).toBeUndefined(); - }); - it('tabPaneIOTierStatisticsAnalysis03', function () { - tabPane.processData = jest.fn(() => true); - let paras = [ - { - "type": 2, - "callChainId": 1, - "dur": 4757959, - "pid": 237, - "tid": 237, - "threadName": "jbd2/mmcblk0p11", - "processName": "jbd2/mmcblk0p11(237)", - "libId": 263, - "symbolId": 12560, - "libName": "kallsyms", - "symbolName": "submit_bh" - }, - { - "type": 2, - "callChainId": 1, - "dur": 4673084, - "pid": 237, - "tid": 237, - "threadName": "jbd2/mmcblk0p11", - "processName": "jbd2/mmcblk0p11(237)", - "libId": 263, - "symbolId": 12560, - "libName": "kallsyms", - "symbolName": "submit_bh" - } - ]; - tabPane.getIOTierProcess(paras, processData); - expect(tabPane.processData).not.toBeUndefined(); - }); - it('tabPaneIOTierStatisticsAnalysis04', function () { - tabPane.processData = processData; - tabPane.getIOTierType(item, param); - expect(tabPane.progressEL.loading).toBeFalsy(); - }); - it('tabPaneIOTierStatisticsAnalysis05', function () { - tabPane.processData = processData; - tabPane.getIOTierThread(item, param); - expect(tabPane.currentLevel).toEqual(2); - }); - it('tabPaneIOTierStatisticsAnalysis06', function () { - tabPane.processData = processData; - tabPane.getIOTierSo(item, param); - expect(tabPane.currentLevel).toEqual(3); - }); - it('tabPaneIOTierStatisticsAnalysis07', function () { - tabPane.processData = processData; - tabPane.getIOTierFunction(item, param); - expect(tabPane.currentLevel).toEqual(4); - }); - it('tabPaneIOTierStatisticsAnalysis08', function () { - expect(tabPane.typeIdToString(1)).toEqual('DATA_READ'); - }); + tabPane.getIOTierProcess(paras, processData); + expect(tabPane.processData).not.toBeUndefined(); + }); + it('tabPaneIOTierStatisticsAnalysis04', function () { + tabPane.processData = processData; + tabPane.getIOTierType(item, param); + expect(tabPane.progressEL.loading).toBeFalsy(); + }); + it('tabPaneIOTierStatisticsAnalysis05', function () { + tabPane.processData = processData; + tabPane.getIOTierThread(item, param); + expect(tabPane.currentLevel).toEqual(2); + }); + it('tabPaneIOTierStatisticsAnalysis06', function () { + tabPane.processData = processData; + tabPane.getIOTierSo(item, param); + expect(tabPane.currentLevel).toEqual(3); + }); + it('tabPaneIOTierStatisticsAnalysis07', function () { + tabPane.processData = processData; + tabPane.getIOTierFunction(item, param); + expect(tabPane.currentLevel).toEqual(4); + }); + it('tabPaneIOTierStatisticsAnalysis08', function () { + expect(tabPane.typeIdToString(1)).toEqual('DATA_READ'); + }); + + it('tabPaneIOTierStatisticsAnalysis09', function () { + expect(tabPane.typeIdToString(2)).toEqual('DATA_WRITE'); + }); - it('tabPaneIOTierStatisticsAnalysis09', function () { - expect(tabPane.typeIdToString(2)).toEqual('DATA_WRITE'); - }); + it('tabPaneIOTierStatisticsAnalysis10', function () { + expect(tabPane.typeIdToString(3)).toEqual('METADATA_READ'); + }); + it('tabPaneIOTierStatisticsAnalysis11', function () { + expect(tabPane.typeIdToString(4)).toEqual('METADATA_WRITE'); + }); + it('tabPaneIOTierStatisticsAnalysis12', function () { + expect(tabPane.getPieChartData(res).length).toEqual(1); + }); - it('tabPaneIOTierStatisticsAnalysis10', function () { - expect(tabPane.typeIdToString(3)).toEqual('METADATA_READ'); - }); - it('tabPaneIOTierStatisticsAnalysis11', function () { - expect(tabPane.typeIdToString(4)).toEqual('METADATA_WRITE'); - }); - it('tabPaneIOTierStatisticsAnalysis12', function () { - expect(tabPane.getPieChartData(res).length).toEqual(1); - }); -}) \ No newline at end of file + it('tabPaneIOTierStatisticsAnalysis13', function () { + tabPane.currentLevel = 0; + let paras = [ + { + type: 2, + callChainId: 1, + dur: 4757959, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + { + type: 2, + callChainId: 1, + dur: 4673084, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + ]; + tabPane.currentLevelData = paras; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 0; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 0; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatistics.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatistics.test.ts index 6a925f453f7eaed01af796bf4331346c6307df05..b3e4fbce498c331167e4046ebee4e6d51c60f55d 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatistics.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatistics.test.ts @@ -16,6 +16,9 @@ // @ts-ignore import { TabPaneVirtualMemoryStatistics } from '../../../../../../dist/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatistics.js'; import '../../../../../../dist/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatistics.js'; +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + window.ResizeObserver = window.ResizeObserver || @@ -28,7 +31,34 @@ describe('TabPaneVirtualMemoryStatistics Test', () => { document.body.innerHTML = ` `; let tabPaneVirtualMemoryStatistics = document.querySelector('#statistics') as TabPaneVirtualMemoryStatistics; + let val = [ + { + leftNs: 0, + rightNs: 1000, + }, + ]; + let VMStatisticData = sqlite.getTabPaneVirtualMemoryStatisticsData; + let VMData = [ + { + pid: 0, + tid: 1, + pname: 'aa', + tname: 'bb', + type: 1, + ipid:1, + itid:100, + count:1000, + allDuration:10, + minDuration:10, + maxDuration:10, + avgDuration:10, + }, + ]; + VMStatisticData.mockResolvedValue(VMData); it('TabPaneVirtualMemoryStatisticsTest01', function () { expect(tabPaneVirtualMemoryStatistics).toBeDefined(); }); + it('TabPaneVirtualMemoryStatisticsTest02', function () { + expect(tabPaneVirtualMemoryStatistics.queryDataByDB(val)).toBeUndefined(); + }); }); diff --git a/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts b/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts index 31f95882c8e925b803f9ef274252ecdbe9809890..4b3398543e59306fc54d28b33b45889e4f24ecde 100644 --- a/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/file-system/TabPaneVirtualMemoryStatisticsAnalysis.test.ts @@ -190,4 +190,65 @@ describe('TabPaneVirtualMemoryStatisticsAnalysis Test', () => { it('tabPaneVirtualMemoryStatisticsAnalysis10', function () { expect(tabPane.getPieChartData(res).length).toEqual(1); }); + it('tabPaneVirtualMemoryStatisticsAnalysis11', function () { + tabPane.currentLevel = 0; + let paras = [ + { + type: 2, + callChainId: 1, + dur: 4757959, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + { + type: 2, + callChainId: 1, + dur: 4673084, + pid: 237, + tid: 237, + threadName: 'jbd2/mmcblk0p11', + processName: 'jbd2/mmcblk0p11(237)', + libId: 263, + symbolId: 12560, + libName: 'kallsyms', + symbolName: 'submit_bh', + }, + ]; + tabPane.currentLevelData = paras; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('tableName', 0)).toBeUndefined(); + tabPane.currentLevel = 0; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('tableName', 1)).toBeUndefined(); + tabPane.currentLevel = 0; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 1; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 2; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 3; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + tabPane.currentLevel = 4; + expect(tabPane.sortByColumn('durFormat', 1)).toBeUndefined(); + }); }) \ No newline at end of file diff --git a/ide/test/trace/component/chart/SpMpsChart.test.ts b/ide/test/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.test.ts similarity index 46% rename from ide/test/trace/component/chart/SpMpsChart.test.ts rename to ide/test/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.test.ts index 079233e220cb8d438fcbeed5c504818e546503b9..d0a40e9d2fbb227bb54a9c0c26f395000dd49887 100644 --- a/ide/test/trace/component/chart/SpMpsChart.test.ts +++ b/ide/test/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.test.ts @@ -12,19 +12,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +//@ts-ignore +import { TabPaneGpuClickSelect } from '../../../../../../dist/trace/component/trace/sheet/gpu/TabPaneGpuClickSelect.js'; -// @ts-ignore -import { SmapsChart } from '../../../../dist/trace/component/chart/SmapsChart.js'; -// @ts-ignore -import { SpChartManager } from '../../../../dist/trace/component/chart/SpChartManager.js'; - -jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { return {}; }); -const sqlit = require('../../../../dist/trace/database/SqlLite.js'); -jest.mock('../../../../dist/trace/database/SqlLite.js'); - +// @ts-ignore window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ @@ -32,26 +27,15 @@ window.ResizeObserver = observe: jest.fn(), unobserve: jest.fn(), })); -describe('SpMpsChart Test', () => { - let MockquerySmapsExits = sqlit.querySmapsExits; - MockquerySmapsExits.mockResolvedValue([ - { - event_name: 'trace_smaps', - stat_type: 'received', - count: 1, - }, - ]); - let MockquerySmapsDataMax = sqlit.querySmapsDataMax; - MockquerySmapsDataMax.mockResolvedValue([ - { - max_value: 11111, - }, - ]); - let trace = new SpChartManager(); - let spMapsChart = new SmapsChart(trace); - it('SpMpsChart01', function () { - spMapsChart.init(); - expect(SmapsChart).toBeInstanceOf(Function); +describe('TabPaneGpuClickSelect Test', () => { + document.body.innerHTML = `
    `; + let tabPaneGpuClickSelect = document.querySelector('#tree'); + it('TabPaneGpuClickSelectTest01', () => { + tabPaneGpuClickSelect.data = { + type: '', + startTs: 1, + }; + expect(tabPaneGpuClickSelect.data).not.toBeUndefined(); }); }); diff --git a/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts b/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts index e2f1c8de2c5c6813bbb17130976f60d6dae4530e..09c5bea36980c453ef2ba092b3a632f5d4cab442 100644 --- a/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts +++ b/ide/test/trace/component/trace/sheet/hiperf/TabPanePerfAnalysis.test.ts @@ -27,6 +27,8 @@ window.ResizeObserver = window.ResizeObserver || unobserve: jest.fn(), })); +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + Object.defineProperty(global.self, 'crypto', { value: { getRandomValues: (arr: string | any[]) => crypto.randomBytes(arr.length), diff --git a/ide/test/trace/component/trace/sheet/process/TabPaneSlices.test.ts b/ide/test/trace/component/trace/sheet/process/TabPaneSlices.test.ts index 7b3b43e304ab4be0ad81663ca21c1ae44859ad97..aace8124083a3a3152d4a48887699b547be4b792 100644 --- a/ide/test/trace/component/trace/sheet/process/TabPaneSlices.test.ts +++ b/ide/test/trace/component/trace/sheet/process/TabPaneSlices.test.ts @@ -29,8 +29,56 @@ window.ResizeObserver = describe('TabPaneSlices Test', () => { let tabPaneSlices = new TabPaneSlices(); - + sqlit.getTabSlicesAsyncFunc.mockResolvedValue([]); + sqlit.getTabSlices.mockResolvedValue([ + { + "name": "binder reply", + "wallDuration": 61.847, + "avgDuration": 30.9235, + "occurrences": 2, + "isHover": false + }, + { + "name": "binder transaction", + "wallDuration": 1.64, + "avgDuration": 0.54667, + "occurrences": 3, + "isHover": false + } + ]); it('TabPaneSlicesTest01', function () { + + expect( + tabPaneSlices.data = { + "recordStartNs": 26014913992000, + "leftNs": 530809208, + "rightNs": 532115193, + "hasFps": false, + "perfAll": false, + "fileSysVirtualMemory": false, + "diskIOLatency": false, + "fsCount": 0, + "vmCount": 0, + "isCurrentPane": false, + "startup": false, + "staticInit": false, + "cpus": [], + "cpuStateFilterIds": [], + "cpuFreqFilterIds": [], + "cpuFreqLimitDatas": [], + "threadIds": [], + "processIds": [ + 578 + ], + "funTids": [ + 915 + ], + "funAsync": [], + } + ); + }); + + it('TabPaneSlicesTest02', function () { expect( tabPaneSlices.sortByColumn({ key: 'name', diff --git a/ide/test/trace/component/trace/sheet/process/TabPaneStartup.test.ts b/ide/test/trace/component/trace/sheet/process/TabPaneStartup.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..8b043541a1725bb610b2f8cf11db67d4d61d8331 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/process/TabPaneStartup.test.ts @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +// @ts-ignore +import { TabPaneStartup } from '../../../../../../dist/trace/component/trace/sheet/process/TabPaneStartup.js'; + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorkerAppStartup.js', () => { + return { + AppStartupStruct: { + getStartupName: jest.fn().mockReturnValue('Unknown Start Step') + } + }; +}); +describe('TabPaneStartup Test', () => { + let tabPaneStartup = new TabPaneStartup(); + let getTabStartups = sqlit.getTabStartups; + + getTabStartups.mockResolvedValue([ + { + 'pid': 3913, + 'process': 'com.ohos.smartperf', + 'startTs': 5651745832, + 'dur': 38654167, + 'startName': 0 + }, + { + 'pid': 3913, + 'process': 'com.ohos.smartperf', + 'startTs': 5690399999, + 'dur': 43619792, + 'startName': 1 + }, + { + 'pid': 3913, + 'process': 'com.ohos.smartperf', + 'startTs': 5734019791, + 'dur': 23194270, + 'startName': 2 + }, + { + 'pid': 3913, + 'process': 'com.ohos.smartperf', + 'startTs': 5757214061, + 'dur': 115679167, + 'startName': 3 + }, + { + 'pid': 3913, + 'process': 'com.ohos.smartperf', + 'startTs': 5872893228, + 'dur': 62756250, + 'startName': 4 + }, + { + 'pid': 3913, + 'process': 'com.ohos.smartperf', + 'startTs': 5968040103, + 'dur': 29438021, + 'startName': 5 + } + ]); + it('TabPaneStartupTest01', function () { + + expect( + tabPaneStartup.data = { + 'recordStartNs': 94574874464, + 'leftNs': 5521679251, + 'rightNs': 6407693386, + 'hasFps': false, + 'perfAll': false, + 'fileSysVirtualMemory': false, + 'diskIOLatency': false, + 'fsCount': 0, + 'vmCount': 0, + 'isCurrentPane': false, + 'startup': true, + 'staticInit': true, + 'processIds': [ + 3913 + ] + } + ); + }); + + it('TabPaneCounterTest02', function () { + expect( + tabPaneStartup.sortByColumn({ + key: 'name', + sort: () => {}, + }) + ).toBeUndefined(); + }); + + + it('TabPaneStartupTest03', function () { + expect(tabPaneStartup.initHtml()).toMatchInlineSnapshot(` +" + +
    +
    + +
    +
    + + + + + + + + +
    + " +`); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/process/TabPaneStaticInit.test.ts b/ide/test/trace/component/trace/sheet/process/TabPaneStaticInit.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..ba7a7896f1480723cbb410c04b7c647349dce6ee --- /dev/null +++ b/ide/test/trace/component/trace/sheet/process/TabPaneStaticInit.test.ts @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +// @ts-ignore +import { TabPaneStaticInit } from '../../../../../../dist/trace/component/trace/sheet/process/TabPaneStaticInit.js'; + + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorkerAppStartup.js', () => { + return { + AppStartupStruct: { + getStartupName: jest.fn().mockReturnValue('Unknown Start Step') + } + }; +}); +describe('TabPaneStaticInit Test', () => { + let tabPaneStaticInit = new TabPaneStaticInit(); + let getTabStaticInit = sqlit.getTabStaticInit; + + getTabStaticInit.mockResolvedValue([ + { + "pid": 3913, + "process": "com.ohos.smartperf", + "startTs": 5769042707, + "dur": 6701042, + "soName": "dlopen: /system/lib64/module/net/libsocket.z.so" + }, + { + "pid": 3913, + "process": "com.ohos.smartperf", + "startTs": 5696226041, + "dur": 4319791, + "soName": "dlopen: system/lib64/extensionability/libinputmethod_extension_module.z.so" + } + ]); + it('TabPaneStaticInit01', function () { + + expect( + tabPaneStaticInit.data = { + 'recordStartNs': 94574874464, + 'leftNs': 5521679251, + 'rightNs': 6407693386, + 'hasFps': false, + 'perfAll': false, + 'fileSysVirtualMemory': false, + 'diskIOLatency': false, + 'fsCount': 0, + 'vmCount': 0, + 'isCurrentPane': false, + 'startup': true, + 'staticInit': true, + 'processIds': [ + 3913 + ] + } + ); + }); + + it('TabPaneCounterTest02', function () { + expect( + tabPaneStaticInit.sortByColumn({ + key: 'name', + sort: () => {}, + }) + ).toBeUndefined(); + }); + + + it('TabPaneStartupTest03', function () { + expect(tabPaneStaticInit.initHtml()).toMatchInlineSnapshot(` +" + +
    +
    + +
    +
    + + + + + + +
    + " +`); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/process/TabPaneThreadUsage.test.ts b/ide/test/trace/component/trace/sheet/process/TabPaneThreadUsage.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..43f94e46594970132c8342e8fa010b490fbaea6a --- /dev/null +++ b/ide/test/trace/component/trace/sheet/process/TabPaneThreadUsage.test.ts @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// @ts-ignore +import { TabPaneThreadUsage } from '../../../../../../dist/trace/component/trace/sheet/process/TabPaneThreadUsage.js'; + +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorkerCPU.js', () => { + return { + CpuStruct: { + cpuCount: 0 + } + }; +}); + +describe('TabPaneThreadUsage Test', () => { + let threadUsage = new TabPaneThreadUsage(); + sqlit.getTabThreadStatesCpu.mockResolvedValue([ + { + 'pid': 28549, + 'tid': 28549, + 'cpu': 0, + 'wallDuration': 6447000 + }, + { + 'pid': 28549, + 'tid': 28549, + 'cpu': 1, + 'wallDuration': 4402000 + }, + { + 'pid': 28549, + 'tid': 28549, + 'cpu': 3, + 'wallDuration': 41852000 + } + ]); + + + it('TabPaneThreadUsageTest01', function () { + let a = { + 'recordStartNs': 26014913992000, + 'leftNs': 341320659, + 'rightNs': 7402391794, + 'hasFps': false, + 'perfAll': false, + 'fileSysVirtualMemory': false, + 'diskIOLatency': false, + 'fsCount': 0, + 'vmCount': 0, + 'isCurrentPane': false, + 'startup': false, + 'staticInit': false, + 'cpus': [], + 'cpuStateFilterIds': [], + 'cpuFreqFilterIds': [], + 'cpuFreqLimitDatas': [], + 'threadIds': [ + 28549 + ], + 'processIds': [ + 28549 + ], + 'processTrackIds': [], + }; + expect((threadUsage.data = a)).toBeTruthy(); + }); + + it('TabPaneThreadUsageTest02', function () { + expect( + threadUsage.sortByColumn({ + key: 'name' || 'thread' || 'state', + sort: () => {}, + }) + ).toBeUndefined(); + }); + + + it('TabPaneThreadStatesTest04', function () { + expect(threadUsage.initHtml()).toMatchInlineSnapshot(` +" + +
    + + +
    +
    + +
    + " +`); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts b/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts index b9bb4cc044b680629c269bc7c576fd9f206ddf2e..646308b4a795bd178e848a020808374faa8fc1de 100644 --- a/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts +++ b/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.test.ts @@ -15,10 +15,24 @@ // @ts-ignore import { TabPaneSmapsRecord } from '../../../../../../dist/trace/component/trace/sheet/smaps/TabPaneSmapsRecord.js'; +// @ts-ignore +import { Smaps } from '../../../../../../dist/trace/bean/SmapsStruct.js'; const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +// @ts-ignore window.ResizeObserver = window.ResizeObserver || jest.fn().mockImplementation(() => ({ @@ -34,26 +48,55 @@ describe('TabPaneSmapsRecord Test', () => { start_addr: 'start_addr', end_addr: 'end_addr', dirty: 0, - swapper: 0, + swap: 0, rss: 0, pss: 0, size: 1, reside: 1, permission: 'rw-', path: 'path', + shared_dirty: 1, + private_clean: 1, + shared_clean: 2, + private_dirty: 1, + swap_pss: 2, }, ]); - + // let tabPaneSmapsRecord = new TabPaneSmapsRecord(); - tabPaneSmapsRecord.data = { - leftNs: 0, - rightNs: 500, - smapsType: [0, 1, 2], - }; + tabPaneSmapsRecord.init = jest.fn(() => true); + let smaps = new Smaps(); + smaps.tsNS = -1; + smaps.start_addr = 'aaaaa'; + smaps.end_addr = 'bbbbb'; + smaps.permission = 'dddd'; + smaps.path = '/asdasdas'; + smaps.size = 0; + smaps.rss = 0; + smaps.pss = 0; + smaps.reside = 0; + smaps.dirty = 0; + smaps.swapper = 0; + smaps.address = 'aaaaa-bbbbb'; + smaps.type = 'Dta'; + smaps.dirtyStr = '1212'; + smaps.swapperStr = '222'; + smaps.rssStr = '333'; + smaps.pssStr = '444'; + smaps.sizeStr = '555'; + smaps.resideStr = '666'; + smaps.pss = 2; + smaps.typeName = 'aaa'; + smaps.sharedCleanStr = 'aaa'; + smaps.sharedDirtyStr = 'aaa'; + smaps.privateCleanStr = 'ab'; + smaps.type = 1; + smaps.sharedClean = 1; + smaps.sharedDirty = 2; + smaps.privateClean = 3; + let result = [smaps, smaps]; it('tabPaneSmapsRecord01', function () { - tabPaneSmapsRecord.tbl = jest.fn(() => true); - tabPaneSmapsRecord.tbl!.recycleDataSource = jest.fn(() => true); expect( tabPaneSmapsRecord.sortByColumn({ key: '', @@ -65,4 +108,7 @@ describe('TabPaneSmapsRecord Test', () => { it('tabPaneSmapsRecord02', () => { expect(tabPaneSmapsRecord.initElements()).toBeUndefined(); }); + it('tabPaneSmapsRecord03', () => { + expect(tabPaneSmapsRecord.filteredData(result)).toBeUndefined(); + }); }); diff --git a/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.test.ts b/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.test.ts index d9bc0e5c3706a487198f00fde8704c37c914242a..51d687f604ca517c62b3734a68f3ac2f13c5ace5 100644 --- a/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.test.ts +++ b/ide/test/trace/component/trace/sheet/smaps/TabPaneSmapsStatistics.test.ts @@ -20,6 +20,21 @@ import { Smaps, SmapsTreeObj } from '../../../../../../dist/trace/bean/SmapsStru const sqlit = require('../../../../../../dist/trace/database/SqlLite.js'); jest.mock('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); window.ResizeObserver = window.ResizeObserver || @@ -30,7 +45,7 @@ window.ResizeObserver = })); describe('TabPaneSmapsStatistics Test', () => { - let MockgetTabSmapsMaxRss = sqlit.getTabSmapsMaxRss; + let MockgetTabSmapsMaxRss = sqlit.getTabSmapsMaxSize; MockgetTabSmapsMaxRss.mockResolvedValue([ { startNS: 0, @@ -71,21 +86,47 @@ describe('TabPaneSmapsStatistics Test', () => { it('TabPaneSmapsStatisticsTest02', () => { tabPaneSmapsStatistics.handleAllDataTree(new Smaps(), 0, 'All', dataTree, 3); - expect(dataTree.children.length).toBe(1); + expect(dataTree.children.length).toBe(0); }); it('TabPaneSmapsStatisticsTest03', () => { tabPaneSmapsStatistics.handleTree(smaps, 0, 'TEXT', dataTree, 4); expect(dataTree.pss).toBe(2); }); - it('TabPaneSmapsStatisticsTest04', () => { - let select = { - leftNs: 0, - rightNs: 500, - smapsType: [0, 1, 2], - }; - tabPaneSmapsStatistics.data = select; - expect((tabPaneSmapsStatistics.data = select)).toBeTruthy(); + expect(tabPaneSmapsStatistics.sortByColumn('sizeStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest05', () => { + expect(tabPaneSmapsStatistics.sortByColumn('', 0)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest06', () => { + expect(tabPaneSmapsStatistics.sortByColumn('count', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest07', () => { + expect(tabPaneSmapsStatistics.sortByColumn('rssStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest08', () => { + expect(tabPaneSmapsStatistics.sortByColumn('typeName', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest09', () => { + expect(tabPaneSmapsStatistics.sortByColumn('pssStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest10', () => { + expect(tabPaneSmapsStatistics.sortByColumn('sharedCleanStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest11', () => { + expect(tabPaneSmapsStatistics.sortByColumn('sharedDirtyStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest12', () => { + expect(tabPaneSmapsStatistics.sortByColumn('privateCleanStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest13', () => { + expect(tabPaneSmapsStatistics.sortByColumn('privateDirtyStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest14', () => { + expect(tabPaneSmapsStatistics.sortByColumn('swapStr', 1)).toBeUndefined(); + }); + it('TabPaneSmapsStatisticsTest15', () => { + expect(tabPaneSmapsStatistics.sortByColumn('swapPssStr', 1)).toBeUndefined(); }); }); diff --git a/ide/test/trace/component/trace/sheet/task/TabPaneTaskFrames.test.ts b/ide/test/trace/component/trace/sheet/task/TabPaneTaskFrames.test.ts index 44b93e8d2d7e5642c5b5065f1a36edc2c416764a..c620becf8a55b0b0b2ea74f008d46717e6890357 100644 --- a/ide/test/trace/component/trace/sheet/task/TabPaneTaskFrames.test.ts +++ b/ide/test/trace/component/trace/sheet/task/TabPaneTaskFrames.test.ts @@ -19,6 +19,7 @@ import { TabPaneTaskFrames } from '../../../../../../dist/trace/component/trace/ import { FuncStruct } from '../../../../../../dist/trace/database/ui-worker/ProcedureWorkerFunc.js'; // @ts-ignore import {SpSystemTrace} from '../../../../../../dist/trace/component/SpSystemTrace.js'; +import {queryTaskListByExecuteTaskIds} from "../../../../../../src/trace/database/SqlLite.js"; jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { return {}; @@ -373,6 +374,7 @@ describe('TabPaneTaskFrames Test', () => { mockQueryTaskListByExecuteTaskIds.mockResolvedValue( [ { + "ipid": 33, "allocationTaskRow": 294, "executeTaskRow": 310, "returnTaskRow": 785, @@ -380,6 +382,7 @@ describe('TabPaneTaskFrames Test', () => { "priority": 1 }, { + "ipid": 36, "allocationTaskRow": 300, "executeTaskRow": 331, "returnTaskRow": 799, @@ -393,42 +396,42 @@ describe('TabPaneTaskFrames Test', () => { leftNs: 7957675110, rightNs: 8705376127, taskFramesData: [ - [ - { - "startTs": 5628901000, - "dur": 4999979000, - "funName": "H:Task Perform: taskId : 2, executeId : 2", - "argsetid": null, - "depth": 1, - "id": 310, - "frame": { - "x": 526, - "y": 20, - "width": 469, - "height": 20 - }, - "textMetricsWidth": 185.634765625, - "tid": 28573 - } - ], - [ - { - "startTs": 5636834000, - "dur": 5001023000, - "funName": "H:Task Perform: taskId : 4, executeId : 4", - "argsetid": null, - "depth": 1, - "id": 331, - "frame": { - "x": 527, - "y": 20, - "width": 469, - "height": 20 - }, - "textMetricsWidth": 185.634765625, - "tid": 28600 - } - ] + { + "startTs": 5628901000, + "dur": 4999979000, + "funName": "H:Task Perform: taskId : 2, executeId : 2", + "argsetid": null, + "depth": 1, + "id": 310, + "itid": 111, + "ipid": 33, + "frame": { + "x": 526, + "y": 20, + "width": 469, + "height": 20 + }, + "textMetricsWidth": 185.634765625, + "tid": 28573 + }, + { + "startTs": 5636834000, + "dur": 5001023000, + "funName": "H:Task Perform: taskId : 4, executeId : 4", + "argsetid": null, + "depth": 1, + "id": 331, + "itid": 153, + "ipid": 33, + "frame": { + "x": 527, + "y": 20, + "width": 469, + "height": 20 + }, + "textMetricsWidth": 185.634765625, + "tid": 28600 + } ] }; tabPaneTaskFrames.taskFramesTbl = jest.fn(() => true); @@ -444,23 +447,24 @@ describe('TabPaneTaskFrames Test', () => { leftNs: 96132987, rightNs: 2563546344, taskFramesData: [ - [ - { - "startTs": 622055000, - "dur": 168000, - "funName": "H:Task Allocation: taskId : 1, executeId : 1, priority : 1, executeState : 1", - "argsetid": null, - "depth": 3, - "id": 87, - "frame": { - "x": 58, - "y": 60, - "width": 1, - "height": 20 - }, - "tid": 28549 - } - ] + { + "startTs": 625142000, + "dur": 5001738000, + "funName": "H:Task Perform: taskId : 1, executeId : 1", + "argsetid": null, + "depth": 1, + "id": 99, + "itid": 111, + "ipid": 33, + "frame": { + "x": 58, + "y": 20, + "width": 469, + "height": 20 + }, + "textMetricsWidth": 185.634765625, + "tid": 28573 + } ] }; let mockQueryTaskListByExecuteTaskIds = sqlite.queryTaskListByExecuteTaskIds; diff --git a/ide/test/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.test.ts b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..6b9e574a27490c5e84c35480b437c49308e9128f --- /dev/null +++ b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.test.ts @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { TabPaneDmaSelectVmTracker } from '../../../../../../dist/trace/component/trace/sheet/vmtracker/TabPaneDmaSelectVmTracker.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + + +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +describe('TabPaneDmaSelectVmTracker Test', () => { + let tabPaneDmaSelectVmTracker = new TabPaneDmaSelectVmTracker(); + let val = [ + { + leftNs: 0, + rightNs: 1000, + startNs:0, + }, + ]; + let dmaSelectionData = sqlite.getTabDmaVMTrackerClickData; + let selectiondata = [ + { + startNs: 0, + fd: 1, + size: 100, + ino: 0, + expPid: 0, + bufName: 'aaa', + expName: 'aaa', + expTaskComm:'bb', + flag:1, + }, + ]; + dmaSelectionData.mockResolvedValue(selectiondata); + it('TabPaneDmaSelectVmTracker01', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('', 0)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker02', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('startNs', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker03', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('expTaskComm', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker04', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('fd', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker05', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('size', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker06', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('ino', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker07', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('expPid', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker08', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('flag', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker09', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('bufName', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker10', () => { + expect(tabPaneDmaSelectVmTracker.sortDmaByColumn('expName', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker11', () => { + expect(tabPaneDmaSelectVmTracker.queryDataByDB(val)).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.test.ts b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..2d149062e5f1e97278ca823970f78a19f265efd3 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.test.ts @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { TabPaneDmaVmTracker } from '../../../../../../dist/trace/component/trace/sheet/vmtracker/TabPaneDmaVmTracker.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + + +// @ts-ignore +window.ResizeObserver = window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +describe('TabPaneDmaSelectVmTracker Test', () => { + let dmaVmTracker = new TabPaneDmaVmTracker(); + let val = [ + { + leftNs: 0, + rightNs: 1000, + startNs:0, + }, + ]; + let dmaData = sqlite.getTabDmaVmTrackerData; + let data = [ + { + startNs: 0, + expTaskComm: 'aaa', + sumSize: 100, + maxSize: 100, + minSize: 10, + avgSize: 'aaa', + }, + ]; + dmaData.mockResolvedValue(data); + it('TabPaneDmaSelectVmTracker01', () => { + expect(dmaVmTracker.sortDmaByColumn('', 0)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker02', () => { + expect(dmaVmTracker.sortDmaByColumn('startNs', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker03', () => { + expect(dmaVmTracker.sortDmaByColumn('expTaskComm', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker04', () => { + expect(dmaVmTracker.sortDmaByColumn('sumSizes', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker05', () => { + expect(dmaVmTracker.sortDmaByColumn('avgSize', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker06', () => { + expect(dmaVmTracker.sortDmaByColumn('minSize', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker07', () => { + expect(dmaVmTracker.sortDmaByColumn('maxSize', 1)).toBeUndefined(); + }); + it('TabPaneDmaSelectVmTracker08', () => { + expect(dmaVmTracker.queryDataByDB(val)).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.test.ts b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..9a980afd64f3c89a61400563744e117048b7e108 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.test.ts @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { TabPaneGpuMemorySelectVmTracker } from '../../../../../../dist/trace/component/trace/sheet/vmtracker/TabPaneGpuMemorySelectVmTracker.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + +// @ts-ignore +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +describe('TabPaneGpuMemorySelectVmTracker Test', () => { + let tabPaneGpuMemorySelectVmTracker = new TabPaneGpuMemorySelectVmTracker(); + let val = [ + { + leftNs: 0, + rightNs: 1000, + }, + ]; + let gpuMemoryVMData = sqlite.getTabGpuMemoryVMTrackerClickData; + let gpuVMData = [ + { + startNs: 0, + size: 1, + threadId: 1, + threadName: 'bb', + gpuName: 'aa', + }, + ]; + gpuMemoryVMData.mockResolvedValue(gpuVMData); + it('TabPaneGpuMemorySelectVmTracker01', () => { + expect(tabPaneGpuMemorySelectVmTracker.sortGpuMemoryByColumn('', 0)).toBeUndefined(); + }); + it('TabPaneGpuMemorySelectVmTracker02', () => { + expect(tabPaneGpuMemorySelectVmTracker.sortGpuMemoryByColumn('startNs', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemorySelectVmTracker03', () => { + expect(tabPaneGpuMemorySelectVmTracker.sortGpuMemoryByColumn('gpuName', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemorySelectVmTracker04', () => { + expect(tabPaneGpuMemorySelectVmTracker.sortGpuMemoryByColumn('size', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemorySelectVmTracker05', () => { + expect(tabPaneGpuMemorySelectVmTracker.sortGpuMemoryByColumn('thread', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemorySelectVmTracker06', () => { + expect(tabPaneGpuMemorySelectVmTracker.queryDataByDB(val)).toBeUndefined(); + }); +}) \ No newline at end of file diff --git a/ide/test/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.test.ts b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..f558b05b1d018075b96412c54bb21014b6f5b0a0 --- /dev/null +++ b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.test.ts @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { TabPaneGpuMemoryVmTracker } from '../../../../../../dist/trace/component/trace/sheet/vmtracker/TabPaneGpuMemoryVmTracker.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + +// @ts-ignore +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); +describe('TabPaneGpuMemoryVmTracker Test', () => { + let gpuMemoryVmTracker = new TabPaneGpuMemoryVmTracker(); + let val = [ + { + leftNs: 0, + rightNs: 1000, + }, + ]; + let gpuMemoryData = sqlite.getTabGpuMemoryData; + let gpuData = [ + { + startNs: 0, + gpuName: 'aa', + threadId: 1, + threadName: 'bb', + sumSize: 0, + maxSize: 0, + minSize: 0, + avgSize: 0, + }, + ]; + gpuMemoryData.mockResolvedValue(gpuData); + it('TabPaneGpuMemoryVmTracker01', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('expTaskComm', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker02', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('', 0)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker03', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('sumSizes', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker04', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('avgSize', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker05', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('minSize', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker06', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('maxSize', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker07', () => { + expect(gpuMemoryVmTracker.sortGpuMemoryByColumn('thread', 1)).toBeUndefined(); + }); + it('TabPaneGpuMemoryVmTracker08', () => { + expect(gpuMemoryVmTracker.queryDataByDB(val)).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.test.ts b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..fb53c7a7190f83986448516607382653d5cb335e --- /dev/null +++ b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.test.ts @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { TabPaneVmTrackerShm } from '../../../../../../dist/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShm.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); +const sqlite = require('../../../../../../dist/trace/database/SqlLite.js'); +jest.mock('../../../../../../dist/trace/database/SqlLite.js'); + +// @ts-ignore +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneVmTrackerShm Test', () => { + let tabPaneVmTrackerShm = new TabPaneVmTrackerShm(); + let shmData = sqlite.queryVmTrackerShmSizeData; + let gpuData = [ + { + startNS: 200, + pid: 1, + ashmname: 1, + avg: 4, + sum: 5, + max: 8, + min: 1, + }, + ]; + shmData.mockResolvedValue(gpuData); + let val = [ + { + leftNs: 0, + rightNs: 1000 + }, + ]; + it('TabPaneVmTrackerShm01', () => { + expect(tabPaneVmTrackerShm.sortByColumn('time', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShm02', () => { + expect(tabPaneVmTrackerShm.clear()).toBeUndefined(); + }); + it('TabPaneVmTrackerShm03', () => { + expect(tabPaneVmTrackerShm.sortByColumn('pid', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShm04', () => { + expect(tabPaneVmTrackerShm.sortByColumn('minSizeStr', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShm05', () => { + expect(tabPaneVmTrackerShm.sortByColumn('ashmname', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShm06', () => { + expect(tabPaneVmTrackerShm.sortByColumn('avgSizeStr', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShm07', () => { + expect(tabPaneVmTrackerShm.sortByColumn('maxSizeStr', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShm08', () => { + expect(tabPaneVmTrackerShm.queryDataByDB(val)).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.test.ts b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..77d09cb2c1f484a348a63f333cbfad3c189cf50c --- /dev/null +++ b/ide/test/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.test.ts @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { TabPaneVmTrackerShmSelection } from '../../../../../../dist/trace/component/trace/sheet/vmtracker/TabPaneVmTrackerShmSelection.js'; +//@ts-ignore +import { HeapDataInterface } from '../../../../../../dist/js-heap/HeapDataInterface.js'; +//@ts-ignore +import { SpArkTsChart } from '../../../../../../dist/trace/component/chart/SpArkTsChart.js'; + +jest.mock('../../../../../../dist/js-heap/model/DatabaseStruct.js', () => {}); + +jest.mock('../../../../../../dist/base-ui/select/LitSelect.js', () => { + return {}; +}); + +jest.mock('../../../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/trace/component/trace/base/TraceRow.js', () => { + return {}; +}); +jest.mock('../../../../../../dist/base-ui/table/lit-table.js', () => { + return {}; +}); + +// @ts-ignore +window.ResizeObserver = + window.ResizeObserver || + jest.fn().mockImplementation(() => ({ + disconnect: jest.fn(), + observe: jest.fn(), + unobserve: jest.fn(), + })); + +describe('TabPaneVmTrackerShmSelection Test', () => { + document.body.innerHTML = ` `; + let tabPaneVmTrackerShmSelection = new TabPaneVmTrackerShmSelection(); + it('TabPaneVmTrackerShmSelection01', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('ts', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection02', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('pid', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection03', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('fd', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection04', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('sizeStr', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection05', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('adj', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection06', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('name', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection07', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('id', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection08', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('time', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection09', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('count', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection10', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('purged', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection11', () => { + expect(tabPaneVmTrackerShmSelection.sortByColumn('flag', 1)).toBeUndefined(); + }); + it('TabPaneVmTrackerShmSelection12', () => { + expect(tabPaneVmTrackerShmSelection.clear()).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/database/logic-worker/ProcedureLogicWorkerJsCpuProfiler.test.ts b/ide/test/trace/database/logic-worker/ProcedureLogicWorkerJsCpuProfiler.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..bba377ce60dba0bf09e0d1c417b44aebaef4d08d --- /dev/null +++ b/ide/test/trace/database/logic-worker/ProcedureLogicWorkerJsCpuProfiler.test.ts @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//@ts-ignore +import { + ProcedureLogicWorkerJsCpuProfiler +} from '../../../../dist/trace/database/logic-worker/ProcedureLogicWorkerJsCpuProfiler.js'; + +describe('ProcedureLogicWorkerJsCpuProfiler Test', () => { + it('ProcedureLogicWorkerJsCpuProfiler01', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + expect(procedureLogicWorkerJsCpuProfiler).not.toBeUndefined(); + }); + + it('ProcedureLogicWorkerJsCpuProfiler02', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + let data = { + id: "3b21cea8-3554-4aa6-8e4d-7d30672dedca", + type: "jsCpuProfiler-init", + params: { + list: new ArrayBuffer(20) + } + }; + window.postMessage = jest.fn(() => true); + expect(procedureLogicWorkerJsCpuProfiler.handle(data)).toBeUndefined(); + }); + + it('ProcedureLogicWorkerJsCpuProfiler03', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + let data = { + type: "jsCpuProfiler-call-chain", + params: { + list: [] + }, + id: "3b21cea8-3554-4aa6-8e4d-7d30672dedca" + }; + window.postMessage = jest.fn(() => true); + procedureLogicWorkerJsCpuProfiler.dataCache = [] + expect(procedureLogicWorkerJsCpuProfiler.handle(data)).toBeUndefined(); + }); + + it('ProcedureLogicWorkerJsCpuProfiler04', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + let data = { + type: "jsCpuProfiler-samples", + params: { + list: [] + }, + id: "3b21cea8-3554-4aa6-8e4d-7d30672dedca" + }; + window.postMessage = jest.fn(() => true); + expect(procedureLogicWorkerJsCpuProfiler.handle(data)).toBeUndefined(); + }); + + it('ProcedureLogicWorkerJsCpuProfiler05', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + let data = { + type: "jsCpuProfiler-call-tree", + params: [{ + startTime: 0, + endTime: 0, + children: [], + samplesIds: [], + isSelect: false + }], + id: "3b21cea8-3554-4aa6-8e4d-7d30672dedca" + }; + window.postMessage = jest.fn(() => true); + expect(procedureLogicWorkerJsCpuProfiler.handle(data)).toBeUndefined(); + }); + + it('ProcedureLogicWorkerJsCpuProfiler06', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + let data = { + type: "jsCpuProfiler-bottom-up", + params: [{ + startTime: 0, + endTime: 0, + children: [], + samplesIds: [], + isSelect: false + }], + id: "3b21cea8-3554-4aa6-8e4d-7d30672dedca" + }; + window.postMessage = jest.fn(() => true); + expect(procedureLogicWorkerJsCpuProfiler.handle(data)).toBeUndefined(); + }); + + it('ProcedureLogicWorkerJsCpuProfiler07', function () { + let procedureLogicWorkerJsCpuProfiler = new ProcedureLogicWorkerJsCpuProfiler(); + let data = { + type: "jsCpuProfiler-statistics", + params: { + leftNs: 0, + rightNs: 10000000000, + data: [] + }, + id: "3b21cea8-3554-4aa6-8e4d-7d30672dedca" + }; + window.postMessage = jest.fn(() => true); + expect(procedureLogicWorkerJsCpuProfiler.handle(data)).toBeUndefined(); + }); +}); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerCpuProfiler.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerCpuProfiler.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..d8c84307896c2db0078e3360b625aa30acd800f1 --- /dev/null +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerCpuProfiler.test.ts @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TraceRow } from '../../../../dist/trace/component/trace/base/TraceRow.js'; +// @ts-ignore +import { Rect } from '../../../../dist/trace/component/trace/timer-shaft/Rect.js'; +// @ts-ignore +import { jsCpuProfiler, JsCpuProfilerRender, JsCpuProfilerStruct} from '../../../../dist/trace/database/ui-worker/ProcedureWorkerCpuProfiler.js'; + +jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); + +describe('ProcedureWorkerCpuProfiler Test', () => { + let jsCpuProfilerRender = new JsCpuProfilerRender(); + let traceRow = new TraceRow(); + traceRow.frame = { height: 40, width: 1407, x: 0, y: 0 }; + it('jsCpuProfilerTest', () => { + const canvas = document.createElement('canvas'); + canvas.width = 1; + canvas.height = 1; + const ctx = canvas.getContext('2d'); + let traceRow = new TraceRow(); + traceRow.frame = { height: 40, width: 1407, x: 0, y: 0 }; + let rect = new Rect(0, 10, 10, 10); + let filter = [ + { + startTime: 50, + endTime: 1520000, + name: 'Snapshot0', + frame: { x: 0, y: 0, width: 25, height: 40 }, + id: 0, + depth: 1, + selfTime: 0, + url:'', + totalTime: 88473061693464, + parentId: 123, + children:[], + isSelect: true, + }, + ]; + let list = [ + { + startTime: 50, + endTime: 1520000, + name: 'Snapshot0', + frame: { x: 0, y: 0, width: 25, height: 40 }, + id: 0, + depth: 1, + selfTime: 0, + url:'', + totalTime: 88473061693464, + parentId: 123, + children:[], + isSelect: true, + }, + ]; + jsCpuProfiler(list, filter, 100254, 100254, rect, traceRow.frame,true); + }); + + it('JsCpuProfilerStructTest01', () => { + const data = { + cpu: 1, + startNs: 1, + value: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + maxValue: undefined, + startTime: 1, + filterID: 2, + size: 102 + }; + const canvas = document.createElement('canvas'); + canvas.width = 1; + canvas.height = 1; + const ctx = canvas.getContext('2d'); + expect(JsCpuProfilerStruct.draw(ctx, data)).toBeUndefined(); + }); + + it('JsCpuProfilerStructTest02', () => { + let node = { + startTime: 50, + endTime: 1520000, + name: 'Snapshot0', + frame: { x: 0, y: 0, width: 25, height: 40 }, + id: 0, + depth: 1, + selfTime: 0, + url:'', + totalTime: 88473061693464, + parentId: 123, + children:[], + isSelect: true, + }; + expect(JsCpuProfilerStruct.setJsCpuProfilerFrame(node, 0, 1, 2, traceRow.frame)).toBeUndefined(); + }); + it('JsCpuProfilerStructTest04', () => { + expect(JsCpuProfilerStruct).not.toBeUndefined(); + }); +}); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerFrameAnimation.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerFrameAnimation.test.ts index cd95a72a3ca4fb8e9f0e6ac802ff8164e40539db..a7a16950b23dcd1ac919109a627c7f67cc49d5e8 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerFrameAnimation.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerFrameAnimation.test.ts @@ -65,7 +65,7 @@ describe('FrameAnimation Test', () => { frameAnimationRender.frameAnimation(dataList, [], TraceRow.range.startNS, TraceRow.range.endNS, TraceRow.range.totalNS, - TraceRow.skeleton().frame, + TraceRow.skeleton(), false); let node = { animationId: 1, diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerFrameDynamic.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerFrameDynamic.test.ts index edc800fdf28f3424563d5ef0d8ecab31a39c4334..fb2cff3d441ab42cb660b4750cdccca5d411bf6d 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerFrameDynamic.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerFrameDynamic.test.ts @@ -18,7 +18,10 @@ jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => }); // @ts-ignore -import { FrameDynamicRender, FrameDynamicStruct, } from '../../../../dist/trace/database/ui-worker/ProcedureWorkerFrameDynamic.js'; +import { + FrameDynamicRender, + FrameDynamicStruct, +} from '../../../../dist/trace/database/ui-worker/ProcedureWorkerFrameDynamic.js'; // @ts-ignore import { Rect } from '../../../../dist/trace/component/trace/timer-shaft/Rect.js'; // @ts-ignore @@ -79,7 +82,7 @@ describe('FrameDynamic Test', () => { useCache: false, context: ctx, type: 'dynamicEffectCurve', - animationRanges: [{ start: 4091445476, end: 4774481414 }], + animationRanges: [{start: 4091445476, end: 4774481414}], }; TraceRow.range = { startNS: 0, @@ -87,7 +90,7 @@ describe('FrameDynamic Test', () => { totalNS: 16868000000, }; - let animationRanges = [{ start: 4091445476, end: 4774481414 }]; + let animationRanges = [{start: 4091445476, end: 4774481414}]; frameDynamicRender.frameDynamic(dataList, [], TraceRow.skeleton(), animationRanges, false); it('FrameDynamicTest01', function () { @@ -113,10 +116,10 @@ describe('FrameDynamic Test', () => { }); it('FrameDynamicTest03', function () { - frameDynamicRender.renderMainThread(req, { - dataList: dataList, - dataListCache: dataList, - }); + let row = TraceRow.skeleton(); + row.dataList = dataList; + row.dataListCache = dataList; + frameDynamicRender.renderMainThread(req, row); let currDynamicStruct = { alpha: '1.00', appName: 'test', diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerFrameSpacing.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerFrameSpacing.test.ts index 9f5c11f50460c6bf54f2a76ebad5143b1abb6261..1d94bf8e41cd8da0180b3b57616200e8f20f1681 100644 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerFrameSpacing.test.ts +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerFrameSpacing.test.ts @@ -100,7 +100,7 @@ describe('FrameSpacing Test', () => { TraceRow.range.startNS, TraceRow.range.endNS, TraceRow.range.totalNS, - TraceRow.skeleton().frame, + TraceRow.skeleton(), req.animationRanges, false ); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts deleted file mode 100644 index 54017383bbc8493aac90651216d88fbe24e7b52e..0000000000000000000000000000000000000000 --- a/ide/test/trace/database/ui-worker/ProcedureWorkerSmaps.test.ts +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (C) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -jest.mock('../../../../dist/trace/component/trace/base/TraceRow.js', () => { - return {}; -}); - -// @ts-ignore -import { smaps, SmapsRender, SmapsStruct } from '../../../../dist/trace/database/ui-worker/ProcedureWorkerSmaps.js'; - -describe('ProcedureWorkerSmaps Test', () => { - it('ProcedureWorkerSmapsTest01', function () { - let List = [ - { - length: 1, - ts: 1, - frame: { - x: 20, - y: 20, - width: 100, - height: 100, - }, - }, - ]; - let arr = [ - { - frame: null, - length: 1, - }, - ]; - let frame = { - x: 20, - y: 20, - width: 100, - height: 100, - }; - expect(smaps(List, arr, 1, 1, 1, frame, true)).toBeUndefined(); - }); - - it('ProcedureWorkerSmapsTest02', function () { - let List = [ - { - length: 1, - ts: 1, - frame: { - x: 20, - y: 20, - width: 100, - height: 100, - }, - }, - ]; - let arr = [ - { - frame: null, - length: 0, - }, - ]; - let frame = { - x: 20, - y: 20, - width: 100, - height: 100, - }; - expect(smaps(List, arr, 1, 1, 1, frame, false)).toBeUndefined(); - }); - - it('ProcedureWorkerSmapsTest03', () => { - const data = { - startNs: 1, - value: 1, - frame: { - x: 20, - y: 20, - width: 100, - height: 100, - }, - startTime: 1, - ts: 1, - }; - const canvas = document.createElement('canvas'); - canvas.width = 1; - canvas.height = 1; - const ctx = canvas.getContext('2d'); - expect(SmapsStruct.draw(ctx, data, 1)).toBeUndefined(); - }); - - it('ProcedureWorkerSmapsTest04', () => { - let node = { - startNs: 1, - value: 1, - frame: { - x: 20, - y: 20, - width: 100, - height: 100, - }, - ts: 1, - dur: 1, - }; - let frame = { - x: 20, - y: 20, - width: 100, - height: 100, - }; - expect(SmapsStruct.setSmapsFrame(node, 2, 1, 2, 2, frame)).toBeUndefined(); - }); - - it('ProcedureWorkerSmapsTest05', () => { - let node = { - startNs: 1, - value: 1, - frame: { - x: 20, - y: 20, - width: 100, - height: 100, - }, - ts: 0, - dur: 3, - }; - let frame = { - x: 20, - y: 20, - width: 100, - height: 100, - }; - expect(SmapsStruct.setSmapsFrame(node, 2, 1, 2, 2, frame)).toBeUndefined(); - }); - - it('ProcedureWorkerSmapsTest06', function () { - let sMapsRender = new SmapsRender(); - let req = { - lazyRefresh: true, - type: '', - startNS: 1, - endNS: 1, - totalNS: 1, - frame: { - x: 20, - y: 20, - width: 100, - height: 100, - }, - useCache: false, - range: { - refresh: '', - }, - canvas: '', - context: { - font: '11px sans-serif', - fillStyle: '#ffffff', - globalAlpha: 0.6, - }, - lineColor: '', - isHover: true, - hoverX: 1, - wakeupBean: undefined, - flagMoveInfo: '', - flagSelectedInfo: '', - slicesTime: 3, - id: 1, - x: 20, - y: 20, - width: 100, - height: 100, - params: { - maxValue: 10, - maxValueName: 'maxValueName', - rowName: 'rowName', - }, - }; - window.postMessage = jest.fn(() => true); - expect(sMapsRender.render(req, [], [])).toBeUndefined(); - }); -}); diff --git a/ide/test/trace/database/ui-worker/ProcedureWorkerSnapshot.test.ts b/ide/test/trace/database/ui-worker/ProcedureWorkerSnapshot.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..58b802788f03467154e60e59428abee93637147c --- /dev/null +++ b/ide/test/trace/database/ui-worker/ProcedureWorkerSnapshot.test.ts @@ -0,0 +1,130 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-ignore +import { TraceRow } from '../../../../dist/trace/component/trace/base/TraceRow.js'; +// @ts-ignore +import { Rect } from '../../../../dist/trace/component/trace/timer-shaft/Rect.js'; +// @ts-ignore +import { snapshot, SnapshotRender, SnapshotStruct} from '../../../../dist/trace/database/ui-worker/ProcedureWorkerSnapshot.js'; + +jest.mock('../../../../dist/trace/database/ui-worker/ProcedureWorker.js', () => { + return {}; +}); + +describe('ProcedureWorkerSnapshot Test', () => { + it('HeapSnapshotTest', () => { + const canvas = document.createElement('canvas'); + canvas.width = 1; + canvas.height = 1; + const ctx = canvas.getContext('2d'); + let dataList = new Array(); + dataList.push({ + startTime: 0, + dur: 10, + frame: { x: 0, y: 9, width: 10, height: 10 }, + }); + dataList.push({ startTime: 1, dur: 111 }); + let rect = new Rect(0, 10, 10, 10); + let filter = [ + { + end_time: 50, + end_ts: 1520000, + file_name: 'Snapshot0', + frame: { x: 0, y: 0, width: 25, height: 40 }, + id: 0, + pid: 4243, + start_time: 0, + start_ts: 88473061693464, + textMetricsWidth: 50.5810546875, + }, + ]; + let list = [ + { + end_time: 50, + end_ts: 1520000, + file_name: 'Snapshot0', + frame: { x: 0, y: 0, width: 6222, height: 62222 }, + id: 0, + pid: 4243, + start_time: 0, + start_ts: 88473061693464, + textMetricsWidth: 50.5810546875, + }, + ]; + snapshot(list, filter, 100254, 100254, rect, { height: 40, width: 1407, x: 0, y: 0 }); + }); + + it('SnapshotStructTest01', () => { + const data = { + cpu: 1, + startNs: 1, + value: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + maxValue: undefined, + startTime: 1, + filterID: 2, + size: 102 + }; + const canvas = document.createElement('canvas'); + canvas.width = 1; + canvas.height = 1; + const ctx = canvas.getContext('2d'); + expect(SnapshotStruct.draw(ctx, data)).toBeUndefined(); + }); + + it('SnapshotStructTest02', () => { + const data = { + cpu: 1, + startNs: 1, + value: 1, + frame: { + x: 20, + y: 20, + width: 100, + height: 100, + }, + maxValue: undefined, + startTime: 1, + filterID: 2, + }; + let node = { + start_time: 1, + end_time: 2, + frame: null, + }; + expect(SnapshotStruct.setFrame(node, 0, 1, 2, data)).toBeUndefined(); + }); + + it('SnapshotRenderTest03', () => { + let canvas = document.createElement('canvas') as HTMLCanvasElement; + let context = canvas.getContext('2d'); + const data = { + context: context!, + useCache: true, + type: '', + traceRange: [], + }; + let snapshotRender = new SnapshotRender(); + expect(snapshotRender.renderMainThread(data, new TraceRow())).toBeUndefined(); + }); + it('SnapshotStructTest04', () => { + expect(SnapshotStruct).not.toBeUndefined(); + }); +}); diff --git a/trace_streamer/build_operator.sh b/trace_streamer/build_operator.sh index d2c74135f8750d6916ae86a3fcc57eea892aa226..e26763b95120961a478ba9f893e25766966fbff6 100755 --- a/trace_streamer/build_operator.sh +++ b/trace_streamer/build_operator.sh @@ -84,6 +84,5 @@ else prebuilts/$gn_path/$ninja -C out/"$target_dir""$ext"/$clang_dir/$subsys_name/$part_name if [ "$target" != "protoc" ] && [ "$target" != "spb" ];then cp -r out/"$target_dir""$ext"/$clang_dir/$subsys_name/$part_name/* out/"$target_dir""$ext"/ - rm -rf out/"$target_dir""$ext"/$clang_dir fi fi diff --git a/trace_streamer/doc/js_memory.md b/trace_streamer/doc/arkTs.md similarity index 59% rename from trace_streamer/doc/js_memory.md rename to trace_streamer/doc/arkTs.md index 1cfb5528f9906008cd6c219482b78d10b6c5eb28..d816db46732269b048896d4446b55c1421ebe9cd 100644 --- a/trace_streamer/doc/js_memory.md +++ b/trace_streamer/doc/arkTs.md @@ -1,8 +1,8 @@ -# JS内存数据说明 +# ARKTS数据说明 -TraceStreamer支持解析JS内存采集的二进制数据，数据分为Snapshot和Timeline两种类型，解析结果输出js_heap_edges, js_heap_files, js_heap_info, js_heap_location, js_heap_nodes, js_heap_sample, js_heap_string, js_heap_trace_function_info, js_heap_trace_node共计九张表分别记录边缘信息，文件信息，数据类型， location节点信息，node节点信息，Timeline模式下的时间轴信息，字符串信息，Timeline模式下的调用栈函数信息，Timeline模式下的调用栈信息。 +TraceStreamer支持解析arkTs的数据，arkTs数据分为JS内存和cpu Profiler两部分，其中JS内存数据又有Snapshot和Timeline两种类型，解析结果输出js_heap_edges, js_heap_files, js_heap_info, js_heap_location, js_heap_nodes, js_heap_sample, js_heap_string, js_heap_trace_function_info, js_heap_trace_node共计九张表分别记录边缘信息，文件信息，数据类型， location节点信息，node节点信息，Timeline模式下的时间轴信息，字符串信息，Timeline模式下的调用栈函数信息，Timeline模式下的调用栈信息。cpu Profiler数据解析结果输出js_cpu_profiler_node和js_cpu_profiler_sample两张表，分别记录cpu profiler的node节点信息和sample节点相关的信息。 -## 数据格式说明 +## JS数据格式说明 数据采集时，Snapshot和Timeline只能选择其中一种，其中Snapshot为堆内存数据，可设置数据采集间隔，上报的数据为多组，以{"id":1,"result":{}}做为一次数据的结束标识。 @@ -16,15 +16,54 @@ Timeline为时间轴数据，一个数据文件中只存在一组Timeline数据 *Timeline模式下发start命令后开始抓取，插件结束时下发stop命令停止抓取并开始上报数据。Start命令下发到stop命令下发之间属于数据抓取过程。* +## cpu profiler数据格式说明 + +cpu profiler文件是json格式，包含以下主要节点： + +![1690619219886](image/arkTs/1690619219886.png) + +其中nodes，samples，timeDeltas节点是数组，数组结构如下： +nodes: + +![1690619306323](image/arkTs/1690619306323.png) + +id:函数id。 +functionName:函数名称。 +scriptId:关联到的类对象所在文件的绝对路径ID。 +url:关联到的类对象所在文件的绝对路径名称在data_dict中的索引号。 +lineNumber:类对象所在文件的行号。 +columnNumber:类对象所在文件的列号。 +hitCount：采样次数。 +children：数组格式，表示该函数下的子节点ID。 + +samples: + +![1690619375510](image/arkTs/1690619375510.png) +数组格式，表示在当前数据中每个id对应的函数出现的顺序。 + +timeDeltas： + +![1690619462650](image/arkTs/1690619462650.png) +数组格式，下标和samples对应，表示samples中每个下标对应函数的持续时间。 + ## proto文件说明 -JS内存数据解析对应两个proto文件 +arkTs数据解析对应两个proto文件 ![1682579300950](image/js_memory/1682579300950.png) ![1682579350993](image/js_memory/1682579350993.png) -其中数据类型和pid通过JsHeapConfig获取，JsHeapResult外层有时间戳可以获取。 +其中ArkTsConfig中的数据保存在js_config表中,用来说明当前数据的配置。表字段的对应关系如下: +pid:目标进程ID。 +type:JS数据类型，取值与枚举HeapType对应，0表示JS内存数据为snapshot类型，1表示JS内存数据为timeline类型，-1表示没有JS内存数据。 +interval:当type=0时生效，单位是秒，表示一次snapshot事件和下一次snapshot事件之间的间隔。 +capture_numeric_value:当type=0时生效，表示是否同时抓取numeric。 +track_allocation:当type=1时生效，表示是否抓取allocations。 +enable_cpu_profiler:表示是否存在cpuprofiler的数据。 +cpu_profiler_interval:表示cpuprofiler数据的采集间隔。 + +JsHeapResult外层有时间戳可以获取，用来同步trace_range的时间。 ## Snapshot @@ -34,12 +73,18 @@ JS内存数据解析对应两个proto文件 一个Timeline模式的文件包含有一组Timeline数据，以{"id":1,"result":{}}作为起始标识，以{"id":2,"result":{}}作为结束标识。Timeline数据包含在json[params][chunk]节点下，一条完整的Timeline数据会发送多次result，从收到起始标识开始，拼装每一条json[params][chunk]下的数据，直到收到结束标识，即可获取一条完整的Timeline数据。 +## CPU Profiler + +cpu profiler的数据一次上报完成，以{"id":3,"result":{}}作为起始标识，包含在json[profile]节点下，取上报外层的数据作为结束时间。 + ### 数据解析 --- arkts-plugin的数据包含在htrace文件中，由proto文件定义数据格式，解析规则如下： +#### JS内存解析 + 1.js-memory相关数据携带js-memory_config和js-memory插件头，先通过接口ParseJSMemoryConfig获取对应的type和pid，其中type=0为snapshot类型数据，type=1为timeline数据。js-memory数据为json格式，json包含以下节点：snapshot，nodes，edges，locations，strings，samples，trace_function_infos，trace_tree。使用第三方json库nlohmann::json进行解析。 2.json解析：snapshot和timeline两种数据类型json的解析规则是相同的。 @@ -78,3 +123,8 @@ strings：该节点包含了js_heap_string表的信息，每一行为一个strin trace_function_infos：该节点包含了js_heap_trace_function_info表的信息，每一行为6个int类型的字符串，分别表示function_id，name，script_name，script_id，line，column。 trace_tree：该节点包含了js_heap_trace_node表的信息，是一个多维数组，每个数组由5个元素组成，分别为id，function_info_index，count，size和对应的子节点数组信息。由于不知道trace_tree节点的嵌套层数，需用递归方式解析每一层嵌套的节点。 + +#### CPU Profiler解析 + +js_cpu_profiler_node表是通过json解析出node节点对应的数据进行入库即可。js_cpu_profiler_sample表中时间的计算方法如下： +取cpu profiler文件中startTime作为起始时间，sample中每个下标对应的时间为startTime+ timeDeltas中每个下标对应的时间。 diff --git a/trace_streamer/doc/des_tables.md b/trace_streamer/doc/des_tables.md index 652364934282e7744837c8108c741d7d8cb7c0f6..ae2564b05610af3a767d357eb929bac4ac6281dd 100755 --- a/trace_streamer/doc/des_tables.md +++ b/trace_streamer/doc/des_tables.md @@ -13,7 +13,8 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 ## TraceStreamer输出数据库包含以下表格 | 表名称 |作用| | ---- |---- | -| app_name | 记录HiSysEvent事件的事件名与IDE部分事件的字段名为APPNAME中存放的相关信息的映射关系 | +| animation | 记录动效的响应时延和完成时延| +| app_name | 记录HiSysEvent事件的事件名与IDE部分事件的字段名为APPNAME中存放的相关信息的映射关系| | args | 记录方法参数集合| | bio_latency_sample | 记录IO操作相关方法调用，及调用栈数据| | callstack | 记录调用堆栈和异步调用信息，其中depth,stack_id和parent_stack_id仅在非异步调用中有效。当cookid不为空时，为异步调用，此时callid为进程唯一号，否则为线程唯一号| @@ -22,6 +23,9 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 | cpu_measure_filter | cpu事件过滤器表| | cpu_usage | 记录CPU使用率事件| | data_dict | 记录常用的字符串，将字符串和索引关联，降低程序运行的内存占用，用作辅助数据| +| device_info | 记录设备分辨率和帧率| +| device_state | 记录设备屏幕亮度，蓝牙，位置，wifi，音乐，媒体等信息| +| dynamic_frame | 记录动效帧的分辨率和结束时间等| | data_type | 记录数据类型和typeId的关联关系| | diskio | 记录磁盘读写数据事件| | ebpf_callstack | 记录了采样相关信息| @@ -30,6 +34,9 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 | hisys_event_measure | 记录了HiSysEvent事件相关数据，目前HiSysEvent事件包括了异常事件，IDE事件，器件状态事件 | | instant | 记录Sched_waking, sched_wakeup事件， 用作ThreadState表的上下文使用 | | irq | 记录中断相关事件| +| js_config | 记录了arkTs数据采集的相关配置| +| js_cpu_profiler_node | 记录了cpu profiler中node节点的数据| +| js_cpu_profiler_sample | 记录了cpu profiler中sample节点的数据| | js_heap_edges | 记录了js内存数据类对象对应的成员的信息| | js_heap_files | 记录了js内存数据的名称和时间| | js_heap_info | 记录了js内存数据类型，如nodes和edges的字段类型和数据总数| @@ -70,6 +77,7 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 | thread | 记录所有的线程信息| | thread_filter | 过滤线程| | thread_state | 记录线程状态信息| +| trace_config | 记录trace数据源，proto的事件-plugin与其process_name| | trace_range | 记录ftrace数据与其他类型数据的时间交集，供前端展示数据时使用| | clock_snapshot | 时钟号和时间，时钟名的映射表| | datasource_clockid | 数据源和时钟号的映射表| @@ -85,7 +93,8 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 |cpu_usage | - |cpu-plugin |cpu使用率 | |data_dict | 通用的 | - |所有字符串的记录 | |data_type | 通用的 | - |辅助表 | -|device_info | - |ftrace-plugin |记录设备分辨率和帧率 | +|device_info | - |ftrace-plugin |记录设备分辨率和帧率 | +|device_state | 通用的 |hisysevent-plugin |记录设备屏幕亮度，蓝牙，位置等信息 | |dynamic_frame | - |ftrace-plugin |记录动效帧的分辨率和结束时间等 | |file_system_callstack | - | - |ebpf文件系统 | |file_system_sample | - | - |ebpf文件系统 | @@ -96,17 +105,20 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 |hisys_event_measure | - |hisysevent-plugin |JSON数据源 | |instant | - |ftrace-plugin |waking和wakeup事件 | |irq | - |ftrace-plugin |记录中断事件 | -| js_heap_edges | - |arkts-plugin | js内存数据 | -| js_heap_files | - |arkts-plugin | js内存数据 | -| js_heap_info | - |arkts-plugin | js内存数据 | -| js_heap_location | - |arkts-plugin | js内存数据 | -| js_heap_nodes | - |arkts-plugin | js内存数据 | -| js_heap_sample | - |arkts-plugin | js内存数据 | -| js_heap_string | - |arkts-plugin | js内存数据 | -| js_heap_trace_function_info | - |arkts-plugin | js内存数据 | -| js_heap_trace_node | - |arkts-plugin | js内存数据 | -| app_startup | - |ftrace-plugin | 应用启动数据 | -| static_initalize | - |ftrace-plugin | so初始化数据 | +|js_config | - |arkts-plugin | arkTs数据采集的配置 | +|js_cpu_profiler_node | - |arkts-plugin | 记录了cpu profiler中node节点的数据 | +|js_cpu_profiler_sample | - |arkts-plugin | 记录了cpu profiler中sample节点的数据 | +|js_heap_edges | - |arkts-plugin | js内存数据 | +|js_heap_files | - |arkts-plugin | js内存数据 | +|js_heap_info | - |arkts-plugin | js内存数据 | +|js_heap_location | - |arkts-plugin | js内存数据 | +|js_heap_nodes | - |arkts-plugin | js内存数据 | +|js_heap_sample | - |arkts-plugin | js内存数据 | +|js_heap_string | - |arkts-plugin | js内存数据 | +|js_heap_trace_function_info | - |arkts-plugin | js内存数据 | +|js_heap_trace_node | - |arkts-plugin | js内存数据 | +|app_startup | - |ftrace-plugin | 应用启动数据 | +|static_initalize | - |ftrace-plugin | so初始化数据 | |live_process | - |process-plugin |Monitor数据 | |network | - |network-plugin |Monitor数据 | |diskio | - |diskio-plugin |Monitor数据 | @@ -136,6 +148,7 @@ TraceStreamer可以将trace数据源转化为易于理解和使用的数据库 |sys_mem_measure | - |memory-plugin |系统内存 | |thread | 通用的 | - |线程信息（常用） | |thread_state | 通用的 |ftrace-plugin |线程调度图（常用） | +|trace_config | 通用的 |hisysevent-plugin |记录trace数据源 | |trace_range | 通用的 | - |trace数据的时长 | |thread_filter | 通用的 |ftrace-plugin |线程计量跟踪表（比较少用）| |clock_snapshot | 通用的 |通用的 |时钟号和时间，时钟名的映射表| @@ -587,6 +600,73 @@ js_heap_sample:记录timeline的时间轴信息 - parent_id：父调用中断的id - spanId：分布式调用中断关联关系 + +### js_config表 +#### 表结构 +| Columns Name | SQL TYPE | +| ------------- | -------- | +| pid | INT | +| type | INT | +| interval | INT | +| capture_numeric_value | INT | +| trace_allocation | INT | +| enable_cpu_profiler | INT | +| cpu_profiler_interval | INT | +#### 表描述 +记录arkTs数据采集的相关配置。 +#### 相关字段描述 +- pid:目标进程ID。 +- type:JS数据类型，取值与枚举HeapType对应，0表示JS内存数据为snapshot类型，1表示JS内存数据为timeline类型，-1表示没有JS内存数据。 +- interval:当type=0时生效，单位是秒，表示一次snapshot事件和下一次snapshot事件之间的间隔。 +- capture_numeric_value:当type=0时生效，表示是否同时抓取numeric。 +- track_allocation:当type=1时生效，表示是否抓取allocations。 +- enable_cpu_profiler:表示是否存在cpuprofiler的数据。 +- cpu_profiler_interval:表示cpuprofiler数据的采集间隔。 + +### js_cpu_profiler_node表 +#### 表结构 +| Columns Name | SQL TYPE | +| ------------- | -------- | +| function_id | INT | +| function_index | INT | +| script_id | INT | +| url_index | INT | +| line_number | INT | +| column_number | INT | +| hit_count | INT | +| children | INT | +| parent_id | INT | +#### 表描述 +记录cpu profiler中node节点的数据。 +#### 相关字段描述 +- function_id: 函数的ID号。 +- function_index:函数名称在data_dict中的索引号。 +- script_id:关联到的类对象所在文件的绝对路径ID。 +- url_index:关联到的类对象所在文件的绝对路径名称在data_dict中的索引号。 +- line_number:类对象所在文件的行号。 +- column_number:类对象所在文件的列号。 +- hit_count:采样次数。 +- children:子节点的id号。 +- parent_id:父节点的id号。 + +### js_cpu_profiler_sample表 +#### 表结构 +| Columns Name | SQL TYPE | +| ------------- | -------- | +| id | INT | +| function_id | INT | +| start_time | INT | +| end_time | INT | +| dur | INT | +#### 表描述 +记录了cpu profiler 中sample节点的数据。 +#### 相关字段描述 +- id: ts内部ID号。 +- function_id:函数的ID号。 +- start_time:数据上报的起始时间。 +- end_time:数据上报的终止时间。 +- dur:数据上报的间隔时间。 + ### js_heap_edges表 #### 表结构 | Columns Name | SQL TYPE | @@ -1464,6 +1544,7 @@ js_heap_sample:记录timeline的时间轴信息 - data_source_name：数据源的名称，和数据源的插件名保持一致 - clock_id：时钟号，对应clock_snapshot中的时钟号 这个表是用来告诉IDE，不同的事件源的事件，原始时钟号是多少，在数据库中保存的事件，通常是转换为boottime后的时间，但有些情况下，IDE仍然需要知道原始的时钟号是怎样的 + ### frame_slice表 ### 表结构 | Columns Name | SQL TYPE | @@ -1491,6 +1572,7 @@ js_heap_sample:记录timeline的时间轴信息 - flag: 空时，为不完整的数据；0 表示实际渲染帧不卡帧， 1 表示实际渲染帧卡帧， 2 表示数据不需要绘制（没有frameNum信息） - depth：预留 - frame_no：预留 + ### frame_maps表 ### 表结构 | Columns Name | SQL TYPE | @@ -1503,6 +1585,7 @@ js_heap_sample:记录timeline的时间轴信息 #### 关键字段描述 - src_row：frame_slice表中app的帧所在的行 - dst_row：frame_slice表中RenderService的帧所在的行 + ### gpu_slice表 ### 表结构 | Columns Name | SQL TYPE | @@ -1514,6 +1597,7 @@ js_heap_sample:记录timeline的时间轴信息 #### 关键字段描述 - frame_row：frame_slice表中渲染帧所在的行 - dur：帧渲染时长 + ### trace_range表 #### 表结构 | Columns Name | SQL TYPE | @@ -1525,6 +1609,7 @@ js_heap_sample:记录timeline的时间轴信息 #### 关键字段描述 - start_ts：trace的开始时间，纳秒为单位 - end_ts：trace的结束时间，纳秒为单位 + ### task_pool表 #### 表结构 | Columns Name | SQL TYPE | @@ -1533,26 +1618,29 @@ js_heap_sample:记录timeline的时间轴信息 |allocation_task_row |INT | |execute_task_row |INT | |return_task_row |INT | -|allocation_task_id |INT | -|execute_task_id |INT | -|return_task_id |INT | +|allocation_itid |INT | +|execute_itid |INT | +|return_itid |INT | |execute_id |INT | |priority |INT | |execute_state |INT | |return_state |INT | +|timeout_row |INT | #### 表描述 该表记录了任务池相关数据，与callstack表关联。 #### 关键字段描述 - allocation_task_row：与callstack表id号相关联 - execute_task_row：与callstack表id号相关联 - return_task_row：与callstack表id号相关联 -- allocation_task_id：任务分发的id号 -- execute_task_id：任务执行的id号 -- return_task_id：任务返回的id号 +- allocation_itid：任务分发的itid +- execute_itid：任务执行的itid +- return_itid：任务返回的itid - execute_id：任务执行id - priority：任务分发独有的，优先级{HIGH : 0，MEDIUM : 1，LOW : 2} - execute_state：任务执行独有的执行状态{NOT_FOUND : 0，WAITING : 1，RUNNING : 2，CANCELED : 3} - return_state：任务返回独有的任务返回状态[IsCanceled DeserializeFailed Successful Unsuccessful] +- timeout_row：任务执行超时时更新此列，将对应的 callstack 表行号存于对应的任务行 + ### animation表 #### 表结构 | Columns Name | SQL TYPE | @@ -1562,11 +1650,12 @@ js_heap_sample:记录timeline的时间轴信息 |start_point |INT | |end_point |INT | #### 表描述 -该表记录动效的响应时延和完成时延。 +该表记录动效的响应时延和完成时延等信息。 #### 关键字段描述 - input_time：输入时间点 - start_point：开始时间点 - end_point：结束时间点 + ### dynamic_frame表 #### 表结构 | Columns Name | SQL TYPE | @@ -1580,7 +1669,7 @@ js_heap_sample:记录timeline的时间轴信息 |name |INT | |end_time |INT | #### 表描述 -该表记录动效帧的坐标、分辨率、结束时间等。 +该表记录动效帧的坐标、分辨率、结束时间等信息。 #### 关键字段描述 - x：坐标x - y：坐标y @@ -1589,7 +1678,8 @@ js_heap_sample:记录timeline的时间轴信息 - alpha：透明度 - name：当前动效帧名字 - end_time：结束时间 -### dynamic_frame表 + +### device_info表 #### 表结构 | Columns Name | SQL TYPE | |---- |---- | @@ -1598,8 +1688,66 @@ js_heap_sample:记录timeline的时间轴信息 |physical_height |INT | |physical_frame_rate |INT | #### 表描述 -该表记录设备分辨率和帧率。 +该表记录设备分辨率和帧率等信息。 #### 关键字段描述 - physical_width：设备宽 - physical_height：设备高 -- physical_frame_rate：设备帧率 \ No newline at end of file +- physical_frame_rate：设备帧率 + +### device_state表 +#### 表结构 +| Columns Name | SQL TYPE | +|---- |---- | +|id |INT | +|brightness |INT | +|bt_state |INT | +|location |INT | +|wifi |INT | +|stream_default |INT | +|voice_call |INT | +|music |INT | +|stream_ring |INT | +|media |INT | +|voice_assistant |INT | +|system |INT | +|alarm |INT | +|notification |INT | +|bt_sco |INT | +|enforced_audible |INT | +|stream_dtmf |INT | +|stream_tts |INT | +|accessibility |INT | +|recording |INT | +|stream_all |INT | +#### 表描述 +该表记录设备屏幕亮度，蓝牙，位置，wifi，音乐，媒体等信息。 +#### 关键字段描述 +- brightness：屏幕亮度 +- bt_state：蓝牙状态 +- location：位置信息 +- wifi：无线网络状态 +- voice_call：语音通话 +- music：音乐播放 +- media：多媒体 +- voice_assistant：语音助手 +- system：系统 +- alarm：闹钟 +- notification：消息通知 +- bt_sco：蓝牙语音 +- accessibility：访问权限 +- recording：录音 + +### trace_config表 +#### 表结构 +| Columns Name | SQL TYPE | +|---- |---- | +|id |INT | +|trace_source |INT | +|key |INT | +|value |INT | +#### 表描述 +该表记录trace数据源，proto的事件-plugin与其process_name（目前只有HisysEvent事件在用）。 +#### 关键字段描述 +- trace_source：事件源 +- key：事件需要关注的信息名 +- value：事件需要关注的信息名对应的信息值 \ No newline at end of file diff --git a/trace_streamer/doc/image/arkTs/1690619219886.png b/trace_streamer/doc/image/arkTs/1690619219886.png new file mode 100644 index 0000000000000000000000000000000000000000..fa4f8516bdd1b966662dc67ba25316a4a1f82814 Binary files /dev/null and b/trace_streamer/doc/image/arkTs/1690619219886.png differ diff --git a/trace_streamer/doc/image/arkTs/1690619306323.png b/trace_streamer/doc/image/arkTs/1690619306323.png new file mode 100644 index 0000000000000000000000000000000000000000..fc96e41ba852ac50caaf47555972dc417d80d0f3 Binary files /dev/null and b/trace_streamer/doc/image/arkTs/1690619306323.png differ diff --git a/trace_streamer/doc/image/arkTs/1690619375510.png b/trace_streamer/doc/image/arkTs/1690619375510.png new file mode 100644 index 0000000000000000000000000000000000000000..3809a7dbbfb9be9c3c4e36c482e2813a7fcf6668 Binary files /dev/null and b/trace_streamer/doc/image/arkTs/1690619375510.png differ diff --git a/trace_streamer/doc/image/arkTs/1690619462650.png b/trace_streamer/doc/image/arkTs/1690619462650.png new file mode 100644 index 0000000000000000000000000000000000000000..fba1810b2d1bde58ac11e50ee7181605d29193e6 Binary files /dev/null and b/trace_streamer/doc/image/arkTs/1690619462650.png differ diff --git a/trace_streamer/doc/image/js_memory/1682579300950.png b/trace_streamer/doc/image/js_memory/1682579300950.png index 9348ca950eb4826e6075281f9304bc4a4c83411d..155d23b3dbc19718fea710bf1839ca4f5e9963da 100644 Binary files a/trace_streamer/doc/image/js_memory/1682579300950.png and b/trace_streamer/doc/image/js_memory/1682579300950.png differ diff --git a/trace_streamer/src/base/ts_common.h b/trace_streamer/src/base/ts_common.h index 848f4438fddc87f18ed884a4a9c0367406391bd7..908c8fbe9722c536b66777dd1bd549e9a3ef9b68 100644 --- a/trace_streamer/src/base/ts_common.h +++ b/trace_streamer/src/base/ts_common.h @@ -131,7 +131,8 @@ enum DataSourceType { DATA_SOURCE_TYPE_HISYSEVENT, DATA_SOURCE_TYPE_HISYSEVENT_CONFIG, DATA_SOURCE_TYPE_JSMEMORY, - DATA_SOURCE_TYPE_JSMEMORY_CONFIG + DATA_SOURCE_TYPE_JSMEMORY_CONFIG, + DATA_SOURCE_TYPE_MEM_CONFIG }; using DataIndex = uint64_t; using TableRowId = int32_t; diff --git a/trace_streamer/src/cfg/trace_streamer_config.cpp b/trace_streamer/src/cfg/trace_streamer_config.cpp index 2de65d1171ab360b4420b5bbad843c09fe41543a..b22f975345393ed9500c819ed15cab003517cd42 100644 --- a/trace_streamer/src/cfg/trace_streamer_config.cpp +++ b/trace_streamer/src/cfg/trace_streamer_config.cpp @@ -42,6 +42,8 @@ TraceStreamerConfig::TraceStreamerConfig() {MEM_RSS_FILE, MEM_INFO_RSS_FILE_DESC}, {MEM_RSS_SHMEM, MEM_INFO_RSS_SCHEM_DESC}, {MEM_VM_SWAP, MEM_INFO_SWAP_DESC}, {MEM_VM_LOCKED, MEM_INFO_VIRT_DESC}, {MEM_VM_HWM, MEM_INFO_HWM_DESC}, {MEM_OOM_SCORE_ADJ, MEM_INFO_SCORE_ADJ_DESC}, + {MEM_PURG_SUM, MEM_INFO_PURG_SUM_DESC}, {MEM_PURG_PIN, MEM_INFO_PURG_PIN_DESC}, + {MEM_GL_PSS, MEM_INFO_GL_PSS_DESC}, }; InitSysMemMap(); @@ -174,6 +176,10 @@ void TraceStreamerConfig::InitEventNameMap() {TRACE_NATIVE_HOOK_MEMTAG, TRACE_ACTION_NATIVE_HOOK_MEMTAG}, {TRACE_HISYSEVENT, TRACE_ACTION_HISYS_EVENT}, {TRACE_SMAPS, TRACE_ACTION_SMAPS}, + {TRACE_ASHMEM, TRACE_ACTION_ASHMEM}, + {TRACE_DMAMEM, TRACE_ACTION_DMAMEM}, + {TRACE_GPU_PROCESS_MEM, TRACE_ACTION_GPU_PROCESS_MEM}, + {TRACE_GPU_WINDOW_MEM, TRACE_ACTION_GPU_WINDOW_MEM}, {TRACE_VSYNC, TRACE_ACTION_VSYNC}, {TRACE_ONVSYNC, TRACE_ACTION_ONVSYNC}, {TRACE_FRAMEQUEUE, TRACE_ACTION_FRAMEQUEUE}, @@ -218,7 +224,10 @@ void TraceStreamerConfig::InitSysMemMap() {SysMeminfoType::PMEM_VMALLOC_CHUNK, SYS_MEMINFO_VMALLOC_CHUNK_DESC}, {SysMeminfoType::PMEM_CMA_TOTAL, SYS_MEMINFO_CMA_TOTAL_DESC}, {SysMeminfoType::PMEM_CMA_FREE, SYS_MEMINFO_CMA_FREE_DESC}, - {SysMeminfoType::PMEM_KERNEL_RECLAIMABLE, SYS_MEMINFO_KERNEL_RECLAIMABLE_DESC}}; + {SysMeminfoType::PMEM_KERNEL_RECLAIMABLE, SYS_MEMINFO_KERNEL_RECLAIMABLE_DESC}, + {SysMeminfoType::PMEM_ACTIVE_PURG, SYS_MEMINFO_ACTIVE_PURG_DESC}, + {SysMeminfoType::PMEM_INACTIVE_PURG, SYS_MEMINFO_INACTIVE_PURG_DESC}, + {SysMeminfoType::PMEM_PINED_PURG, SYS_MEMINFO_PINED_PURG_DESC}}; } void TraceStreamerConfig::InitSysVmemMap() @@ -1177,6 +1186,46 @@ void TraceStreamerConfig::InitSecurityMap() {STAT_EVENT_DATA_INVALID, STAT_SEVERITY_LEVEL_ERROR}, }, }, + { + TRACE_ASHMEM, + { + {STAT_EVENT_RECEIVED, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_DATA_LOST, STAT_SEVERITY_LEVEL_ERROR}, + {STAT_EVENT_NOTMATCH, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_NOTSUPPORTED, STAT_SEVERITY_LEVEL_WARN}, + {STAT_EVENT_DATA_INVALID, STAT_SEVERITY_LEVEL_ERROR}, + }, + }, + { + TRACE_DMAMEM, + { + {STAT_EVENT_RECEIVED, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_DATA_LOST, STAT_SEVERITY_LEVEL_ERROR}, + {STAT_EVENT_NOTMATCH, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_NOTSUPPORTED, STAT_SEVERITY_LEVEL_WARN}, + {STAT_EVENT_DATA_INVALID, STAT_SEVERITY_LEVEL_ERROR}, + }, + }, + { + TRACE_GPU_PROCESS_MEM, + { + {STAT_EVENT_RECEIVED, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_DATA_LOST, STAT_SEVERITY_LEVEL_ERROR}, + {STAT_EVENT_NOTMATCH, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_NOTSUPPORTED, STAT_SEVERITY_LEVEL_WARN}, + {STAT_EVENT_DATA_INVALID, STAT_SEVERITY_LEVEL_ERROR}, + }, + }, + { + TRACE_GPU_WINDOW_MEM, + { + {STAT_EVENT_RECEIVED, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_DATA_LOST, STAT_SEVERITY_LEVEL_ERROR}, + {STAT_EVENT_NOTMATCH, STAT_SEVERITY_LEVEL_INFO}, + {STAT_EVENT_NOTSUPPORTED, STAT_SEVERITY_LEVEL_WARN}, + {STAT_EVENT_DATA_INVALID, STAT_SEVERITY_LEVEL_ERROR}, + }, + }, { TRACE_VSYNC, { diff --git a/trace_streamer/src/cfg/trace_streamer_config.h b/trace_streamer/src/cfg/trace_streamer_config.h index c81cfc35df50b9c7509a54553c97d7261e8ce48e..a7ad19bb1825276d6a2b97323dd6f3145cb7c87c 100644 --- a/trace_streamer/src/cfg/trace_streamer_config.h +++ b/trace_streamer/src/cfg/trace_streamer_config.h @@ -110,6 +110,10 @@ enum SupportedTraceEventType { TRACE_VSYNC, TRACE_ONVSYNC, TRACE_FRAMEQUEUE, + TRACE_ASHMEM, + TRACE_DMAMEM, + TRACE_GPU_PROCESS_MEM, + TRACE_GPU_WINDOW_MEM, TRACE_EVENT_OTHER, TRACE_EVENT_MAX }; @@ -123,6 +127,9 @@ enum MemInfoType { MEM_VM_LOCKED, MEM_VM_HWM, MEM_OOM_SCORE_ADJ, + MEM_PURG_SUM, + MEM_PURG_PIN, + MEM_GL_PSS, MEM_MAX }; enum StatType { @@ -277,6 +284,10 @@ private: const std::string TRACE_ACTION_VSYNC = "trace_vsync"; const std::string TRACE_ACTION_ONVSYNC = "trace_on_vsync"; const std::string TRACE_ACTION_FRAMEQUEUE = "trace_frame_queue"; + const std::string TRACE_ACTION_ASHMEM = "trace_ash_mem"; + const std::string TRACE_ACTION_DMAMEM = "trace_dma_mem"; + const std::string TRACE_ACTION_GPU_PROCESS_MEM = "trace_gpu_process_mem"; + const std::string TRACE_ACTION_GPU_WINDOW_MEM = "trace_gpu_window_mem"; const std::string TRACE_ACTION_OTHER = "other"; const std::string MEM_INFO_VM_SIZE_DESC = "mem.vm.size"; @@ -289,6 +300,9 @@ private: const std::string MEM_INFO_VIRT_DESC = "mem.virt"; const std::string MEM_INFO_HWM_DESC = "mem.hwm"; const std::string MEM_INFO_SCORE_ADJ_DESC = "mm.oom_score_adj"; + const std::string MEM_INFO_PURG_SUM_DESC = "mem.purg_sum"; + const std::string MEM_INFO_PURG_PIN_DESC = "mem.purg_pin"; + const std::string MEM_INFO_GL_PSS_DESC = "mem.gl_pss"; const std::string SYS_MEMINFO_UNSPECIFIED_DESC = "sys.mem.unspecified"; const std::string SYS_MEMINFO_MEM_TOTAL_DESC = "sys.mem.total"; @@ -325,6 +339,9 @@ private: const std::string SYS_MEMINFO_CMA_TOTAL_DESC = "sys.mem.cma.total"; const std::string SYS_MEMINFO_CMA_FREE_DESC = "sys.mem.cma.free"; const std::string SYS_MEMINFO_KERNEL_RECLAIMABLE_DESC = "sys.mem.kernel.reclaimable"; + const std::string SYS_MEMINFO_ACTIVE_PURG_DESC = "sys.mem.active.purg"; + const std::string SYS_MEMINFO_INACTIVE_PURG_DESC = "sys.mem.inactive.purg"; + const std::string SYS_MEMINFO_PINED_PURG_DESC = "sys.mem.pined.purg"; const std::string SYS_VMEMINFO_UNSPECIFIED_DESC = "sys.virtual.mem.unspecified"; const std::string SYS_VMEMINFO_NR_FREE_PAGES_DESC = "sys.virtual.mem.nr.free.pages"; const std::string SYS_VMEMINFO_NR_ALLOC_BATCH_DESC = "sys.virtual.mem.nr.alloc.batch"; diff --git a/trace_streamer/src/filter/animation_filter.cpp b/trace_streamer/src/filter/animation_filter.cpp index 941d730698e1226c0c4b20ce8fd34e72b85e8d76..3d9d0b9270c207d8886de08c4e5add4878b43166 100644 --- a/trace_streamer/src/filter/animation_filter.cpp +++ b/trace_streamer/src/filter/animation_filter.cpp @@ -14,8 +14,6 @@ */ #include "animation_filter.h" -#include -#include #include "string_help.h" #include "string_to_numerical.h" @@ -88,8 +86,6 @@ bool AnimationFilter::BeginDynamicFrameEvent(const TracePoint& point, size_t cal if (depth >= DYNAMIC_STACK_DEPTH_MIN && parentId.has_value()) { const std::string& curStackName = traceDataCache_->GetDataFromDict(callStackSlice->NamesData()[callStackRow]); - const std::string& parentStackName = - traceDataCache_->GetDataFromDict(callStackSlice->NamesData()[parentId.value()]); // get name 'xxx' from [xxx], eg:H:RSUniRender::Process:[xxx] auto nameSize = point.funcPrefix_.size() - rsUniProcessCmd_.size() - 1; if (nameSize <= 0) { @@ -100,15 +96,6 @@ bool AnimationFilter::BeginDynamicFrameEvent(const TracePoint& point, size_t cal auto dynamicFramRow = traceDataCache_->GetDynamicFrame()->AppendDynamicFrame(nameIndex); callStackRowMap_.emplace(callStackRow, dynamicFramRow); return true; - } else if (StartWith(parentStackName, leashWindowCmd_)) { - auto iter = callStackRowMap_.find(parentId.value()); - if (iter != callStackRowMap_.end()) { - auto dynamicFramRow = iter->second; - traceDataCache_->GetDynamicFrame()->UpdateNameIndex(dynamicFramRow, nameIndex); - return true; - } else { - TS_LOGE("Can't find the dynamicFramRow from callStackRowMap_"); - } } } } diff --git a/trace_streamer/src/filter/clock_filter_ex.h b/trace_streamer/src/filter/clock_filter_ex.h index 7a5802d6ef0dffcc505d806ddbaccbae8c4dd34f..6594e0a1923271855410ee1b36e8c69d23edf02c 100644 --- a/trace_streamer/src/filter/clock_filter_ex.h +++ b/trace_streamer/src/filter/clock_filter_ex.h @@ -21,12 +21,12 @@ #include #include #include -#include "htrace_file_header.h" -#include "ts_common.h" -#include + #include "clock_filter.h" #include "filter_base.h" -#include +#include "htrace_file_header.h" +#include "ts_common.h" + namespace SysTuning { namespace TraceStreamer { class TraceDataCache; diff --git a/trace_streamer/src/filter/process_filter.cpp b/trace_streamer/src/filter/process_filter.cpp index d59796ef6942f615231368a3de294c9e679baed4..38e5d7e3bd22631db01ac4962449973cddb124df 100644 --- a/trace_streamer/src/filter/process_filter.cpp +++ b/trace_streamer/src/filter/process_filter.cpp @@ -105,14 +105,14 @@ uint32_t ProcessFilter::UpdateOrCreateProcessWithName(uint32_t pid, std::string_ uint32_t internalPid = 0; TraceStdtype::Process* process = nullptr; std::tie(internalPid, process) = CreateProcessMaybe(pid, 0); - if (process && process->cmdLine_ != name) { + if (process && name != "" && process->cmdLine_ != name) { process->cmdLine_ = std::string(name); } // update main thread name auto internalTid = GetInternalTid(pid, pid); if (internalTid != INVALID_ID) { auto thread = traceDataCache_->GetThreadData(internalTid); - thread->nameIndex_ = traceDataCache_->GetDataIndex(name); + thread->nameIndex_ = traceDataCache_->GetDataIndex(process->cmdLine_); } return internalPid; } diff --git a/trace_streamer/src/filter/task_pool_filter.cpp b/trace_streamer/src/filter/task_pool_filter.cpp index 95cdcbfd3ddfa062d6641f1491a431c3d9db6c2e..3d6f7653f70e971283e506b9d1884bb388fdf5d9 100644 --- a/trace_streamer/src/filter/task_pool_filter.cpp +++ b/trace_streamer/src/filter/task_pool_filter.cpp @@ -40,7 +40,7 @@ uint32_t TaskPoolFilter::GetIpId(uint32_t index) return thread->internalPid_; } -uint32_t TaskPoolFilter::CheckTheSameTask(int32_t executeId, uint32_t index) +uint32_t TaskPoolFilter::CheckTheSameTask(uint32_t executeId, uint32_t index) { return IpidExecuteMap_.Find(GetIpId(index), executeId); } @@ -62,10 +62,10 @@ void TaskPoolFilter::TaskPoolFieldSegmentation(const std::string& taskPoolStr, } } -bool TaskPoolFilter::TaskPoolEvent(const std::string& taskPoolStr, int32_t index) +bool TaskPoolFilter::TaskPoolEvent(const std::string& taskPoolStr, uint32_t index) { std::string targetStr = "H:Task "; - if (!taskPoolStr.compare(0, targetStr.length(), targetStr)) { + if (StartWith(taskPoolStr, targetStr)) { std::unordered_map args; std::string allocationStr = "H:Task Allocation: "; if (StartWith(taskPoolStr, allocationStr)) { @@ -86,64 +86,76 @@ bool TaskPoolFilter::TaskPoolEvent(const std::string& taskPoolStr, int32_t index return UpdateReturnData(args, index); } } + std::string timeoutStr = "H:Thread Timeout Exit"; + if (StartWith(taskPoolStr, timeoutStr)) { + return AppendTimeoutRow(index); + } return false; } -bool TaskPoolFilter::UpdateAssignData(const std::unordered_map& args, int32_t index) +bool TaskPoolFilter::UpdateAssignData(const std::unordered_map& args, uint32_t index) { if (index >= traceDataCache_->GetConstInternalSlicesData().CallIds().size()) { return false; } auto allocItid = traceDataCache_->GetConstInternalSlicesData().CallIds()[index]; - auto executeId = base::StrToInt(args.at(" executeId ")); + auto executeId = base::StrToInt(args.at(" executeId ")); auto priority = base::StrToInt(args.at(" priority ")); auto executeState = base::StrToInt(args.at(" executeState ")); - int32_t returnValue = CheckTheSameTask(executeId.value(), index); + uint32_t returnValue = CheckTheSameTask(executeId.value(), index); if (returnValue == INVALID_INT32) { - int32_t taskIndex = traceDataCache_->GetTaskPoolData()->AppendAllocationTaskData( + uint32_t taskIndex = traceDataCache_->GetTaskPoolData()->AppendAllocationTaskData( index, allocItid, executeId.value(), priority.value(), executeState.value()); IpidExecuteMap_.Insert(GetIpId(index), executeId.value(), taskIndex); } else { - traceDataCache_->GetTaskPoolData()->UpdateAllocationTaskData(returnValue, index, allocItid, - priority.value(), executeState.value()); + traceDataCache_->GetTaskPoolData()->UpdateAllocationTaskData(returnValue, index, allocItid, priority.value(), + executeState.value()); } return true; } -bool TaskPoolFilter::UpdateExecuteData(const std::unordered_map& args, int32_t index) +bool TaskPoolFilter::UpdateExecuteData(const std::unordered_map& args, uint32_t index) { if (index >= traceDataCache_->GetConstInternalSlicesData().CallIds().size()) { return false; } auto executeItid = traceDataCache_->GetConstInternalSlicesData().CallIds()[index]; - auto executeId = base::StrToInt(args.at(" executeId ")); + auto executeId = base::StrToInt(args.at(" executeId ")); - int32_t returnValue = CheckTheSameTask(executeId.value(), index); + uint32_t returnValue = CheckTheSameTask(executeId.value(), index); if (returnValue == INVALID_INT32) { - int32_t taskIndex = + uint32_t taskIndex = traceDataCache_->GetTaskPoolData()->AppendExecuteTaskData(index, executeItid, executeId.value()); IpidExecuteMap_.Insert(GetIpId(index), executeId.value(), taskIndex); + timeoutMap_.emplace(executeItid, taskIndex); + if (timeoutMap_.at(executeItid) < taskIndex) { + timeoutMap_.at(executeItid) = taskIndex; + } } else { traceDataCache_->GetTaskPoolData()->UpdateExecuteTaskData(returnValue, index, executeItid); + timeoutMap_.emplace(executeItid, returnValue); + if (timeoutMap_.at(executeItid) < returnValue) { + timeoutMap_.at(executeItid) = returnValue; + } } return true; } -bool TaskPoolFilter::UpdateReturnData(const std::unordered_map& args, int32_t index) +bool TaskPoolFilter::UpdateReturnData(const std::unordered_map& args, uint32_t index) { if (index >= traceDataCache_->GetConstInternalSlicesData().CallIds().size()) { return false; } auto returnItid = traceDataCache_->GetConstInternalSlicesData().CallIds()[index]; - auto executeId = base::StrToInt(args.at(" executeId ")); + auto executeId = base::StrToInt(args.at(" executeId ")); auto returnStr = std::string_view(args.at(" performResult ")); - int32_t returnState = returnStr.compare(" Successful") ? 0 : 1; + uint32_t returnState = returnStr.compare(" Successful") ? 0 : 1; - int32_t returnValue = CheckTheSameTask(executeId.value(), index); + uint32_t returnValue = CheckTheSameTask(executeId.value(), index); if (returnValue == INVALID_INT32) { - int32_t taskIndex = traceDataCache_->GetTaskPoolData()->AppendReturnTaskData(index, returnItid, - executeId.value(), returnState); + uint32_t taskIndex = + traceDataCache_->GetTaskPoolData()->AppendReturnTaskData(index, returnItid, executeId.value(), returnState); IpidExecuteMap_.Insert(GetIpId(index), executeId.value(), taskIndex); } else { traceDataCache_->GetTaskPoolData()->UpdateReturnTaskData(returnValue, index, returnItid, returnState); @@ -151,5 +163,14 @@ bool TaskPoolFilter::UpdateReturnData(const std::unordered_map= traceDataCache_->GetConstInternalSlicesData().CallIds().size()) { + return false; + } + auto timeoutItid = traceDataCache_->GetConstInternalSlicesData().CallIds()[index]; + traceDataCache_->GetTaskPoolData()->AppendTimeoutRow(timeoutMap_.at(timeoutItid), index); + return true; +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/filter/task_pool_filter.h b/trace_streamer/src/filter/task_pool_filter.h index 1af5cf58572acd0e21b55f075604c471c7cd6e79..7792f14f62120fa5da2bd76d14e788ea9d879b3c 100644 --- a/trace_streamer/src/filter/task_pool_filter.h +++ b/trace_streamer/src/filter/task_pool_filter.h @@ -31,17 +31,20 @@ class TaskPoolFilter : private FilterBase { public: TaskPoolFilter(TraceDataCache* dataCache, const TraceStreamerFilters* filter); TaskPoolFilter(const TaskPoolFilter&) = delete; + TaskPoolFilter& operator=(const TaskPoolFilter&) = delete; ~TaskPoolFilter() override; uint32_t GetIpId(uint32_t index); - uint32_t CheckTheSameTask(int32_t executeId, uint32_t index); - bool TaskPoolEvent(const std::string& taskPoolStr, int32_t index); + uint32_t CheckTheSameTask(uint32_t executeId, uint32_t index); + bool TaskPoolEvent(const std::string& taskPoolStr, uint32_t index); void TaskPoolFieldSegmentation(const std::string& taskPoolStr, std::unordered_map& args); - bool UpdateAssignData(const std::unordered_map& args, int32_t index); - bool UpdateExecuteData(const std::unordered_map& args, int32_t index); - bool UpdateReturnData(const std::unordered_map& args, int32_t index); + bool UpdateAssignData(const std::unordered_map& args, uint32_t index); + bool UpdateExecuteData(const std::unordered_map& args, uint32_t index); + bool UpdateReturnData(const std::unordered_map& args, uint32_t index); + bool AppendTimeoutRow(uint32_t index); private: - DoubleMap IpidExecuteMap_; + DoubleMap IpidExecuteMap_; + std::unordered_map timeoutMap_; }; } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp b/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp index 810599a19050f57accc63bb5377d894653065e16..10241ecf0d2e6741f0f5d32d9bb64185ea79f9ba 100644 --- a/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp +++ b/trace_streamer/src/parser/bytrace_parser/bytrace_event_parser.cpp @@ -722,7 +722,9 @@ void BytraceEventParser::FilterAllEvents() streamFilters_->cpuFilter_->Finish(); traceDataCache_->dataDict_.Finish(); traceDataCache_->UpdataZeroThreadInfo(); - streamFilters_->appStartupFilter_->FilterAllAPPStartupData(); + if (traceDataCache_->AppStartTraceEnabled()) { + streamFilters_->appStartupFilter_->FilterAllAPPStartupData(); + } } void BytraceEventParser::BeginFilterEvents(EventInfo* event) diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp index 098aa5366863aadf31b5027d7656215c45e39926..5aef25d04b6bf3f702261e30aaefdb31792e2f21 100644 --- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp +++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp @@ -875,7 +875,9 @@ void HtraceEventParser::FilterAllEvents() streamFilters_->cpuFilter_->Finish(); traceDataCache_->dataDict_.Finish(); traceDataCache_->UpdataZeroThreadInfo(); - streamFilters_->appStartupFilter_->FilterAllAPPStartupData(); + if (traceDataCache_->AppStartTraceEnabled()) { + streamFilters_->appStartupFilter_->FilterAllAPPStartupData(); + } } void HtraceEventParser::Clear() { diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_cpu_profiler_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_cpu_profiler_parser.cpp index cd35c6f667b2c95b2637dee241a8296a8a70103c..75b01b11181ee3f7aa7ecc16836dd08c848003f2 100644 --- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_cpu_profiler_parser.cpp +++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_js_cpu_profiler_parser.cpp @@ -13,9 +13,7 @@ * limitations under the License. */ #include "htrace_js_cpu_profiler_parser.h" -#include -#include -#include +#include "clock_filter_ex.h" namespace SysTuning { namespace TraceStreamer { @@ -93,15 +91,19 @@ void HtraceJsCpuProfilerParser::ParseJsCpuProfiler(std::string result) id, functionNameKey, scriptId, urlKey, lineNumber, columnNumber, hitCount, children, parentId); } uint64_t startTime = jMessage.at("startTime"); - uint64_t endTime = jMessage.at("endTime"); uint32_t sample = std::numeric_limits::max(); uint64_t sampleEndTime = startTime; uint64_t dur = 0; for (auto i = 0; i < jMessage.at("samples").size(); i++) { if (sample != std::numeric_limits::max() && sample != jMessage.at("samples")[i]) { dur = (sampleEndTime * TIME_SECOND_COVER) - (startTime * TIME_SECOND_COVER); - (void)traceDataCache_->GetJsCpuProfilerSampleData()->AppendNewData(sample, startTime * TIME_SECOND_COVER, - sampleEndTime * TIME_SECOND_COVER, dur); + auto startNewTime = + streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_MONOTONIC, startTime * TIME_SECOND_COVER); + UpdatePluginTimeRange(TS_MONOTONIC, startNewTime, startNewTime); + auto endNewTime = + streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_MONOTONIC, sampleEndTime * TIME_SECOND_COVER); + UpdatePluginTimeRange(TS_MONOTONIC, endNewTime, endNewTime); + (void)traceDataCache_->GetJsCpuProfilerSampleData()->AppendNewData(sample, startNewTime, endNewTime, dur); sample = jMessage.at("samples")[i]; startTime = sampleEndTime; } else if (sample == std::numeric_limits::max()) { @@ -113,8 +115,11 @@ void HtraceJsCpuProfilerParser::ParseJsCpuProfiler(std::string result) } } dur = (sampleEndTime * TIME_SECOND_COVER) - (startTime * TIME_SECOND_COVER); - (void)traceDataCache_->GetJsCpuProfilerSampleData()->AppendNewData(sample, startTime * TIME_SECOND_COVER, - sampleEndTime * TIME_SECOND_COVER, dur); + auto startNewTime = streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_MONOTONIC, startTime * TIME_SECOND_COVER); + UpdatePluginTimeRange(TS_MONOTONIC, startNewTime, startNewTime); + auto endNewTime = streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_MONOTONIC, sampleEndTime * TIME_SECOND_COVER); + UpdatePluginTimeRange(TS_MONOTONIC, endNewTime, endNewTime); + (void)traceDataCache_->GetJsCpuProfilerSampleData()->AppendNewData(sample, startNewTime, endNewTime, dur); } } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp index cc8670aa4d6b482df9574fa0ff6c13420a4bcc43..0c4543cd5b82b220165b807ebe1e2353af32ee2c 100644 --- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp +++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp @@ -33,7 +33,7 @@ HtraceMemParser::HtraceMemParser(TraceDataCache* dataCache, const TraceStreamerF std::make_pair(static_cast(i), traceDataCache_->GetDataIndex(config_.memNameMap_.at(static_cast(i))))); } - for (auto i = 0; i < ProtoReader::PMEM_KERNEL_RECLAIMABLE + 1; i++) { + for (auto i = 0; i < ProtoReader::PMEM_PINED_PURG + 1; i++) { sysMemNameDictMap_.insert(std::make_pair(i, traceDataCache_->GetDataIndex(config_.sysMemNameMap_.at(i)))); } for (auto i = 0; i < ProtoReader::VMEMINFO_WORKINGSET_RESTORE + 1; i++) { @@ -53,6 +53,8 @@ void HtraceMemParser::Parse(HtraceDataSegment& seg, uint64_t timeStamp, BuiltinC auto newTimeStamp = streamFilters_->clockFilter_->ToPrimaryTraceTime(clock, timeStamp); UpdatePluginTimeRange(clock, timeStamp, newTimeStamp); zram_ = memData.zram(); + gpuLimit_ = memData.has_gpu_limit_size() ? memData.gpu_limit_size() : 0; + gpuUsed_ = memData.has_gpu_used_size() ? memData.gpu_used_size() : 0; if (memData.has_processesinfo()) { ParseProcessInfo(&memData, newTimeStamp); } @@ -62,6 +64,18 @@ void HtraceMemParser::Parse(HtraceDataSegment& seg, uint64_t timeStamp, BuiltinC if (memData.has_vmeminfo()) { ParseVMemInfo(&memData, newTimeStamp); } + if (memData.has_ashmeminfo()) { + ParseAshmemInfo(&memData, newTimeStamp); + } + if (memData.has_dmainfo()) { + ParseDmaMemInfo(&memData, newTimeStamp); + } + if (memData.has_gpumemoryinfo()) { + ParseGpuProcessMemInfo(&memData, newTimeStamp); + } + if (memData.has_gpudumpinfo()) { + ParseGpuWindowMemInfo(&memData, newTimeStamp); + } } void HtraceMemParser::ParseProcessInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const { @@ -91,16 +105,143 @@ void HtraceMemParser::ParseProcessInfo(const ProtoReader::MemoryData_Reader* tra ipid, memNameDictMap_.at(MEM_VM_HWM), timeStamp, processMemoryInfo.vm_hwm_kb()); hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData( ipid, memNameDictMap_.at(MEM_OOM_SCORE_ADJ), timeStamp, processMemoryInfo.oom_score_adj()); + if (processMemoryInfo.has_purg_sum_kb()) { + hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData( + ipid, memNameDictMap_.at(MEM_PURG_SUM), timeStamp, processMemoryInfo.purg_sum_kb()); + } + if (processMemoryInfo.has_purg_pin_kb()) { + hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData( + ipid, memNameDictMap_.at(MEM_PURG_PIN), timeStamp, processMemoryInfo.purg_pin_kb()); + } + if (processMemoryInfo.has_gl_pss_kb()) { + hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData( + ipid, memNameDictMap_.at(MEM_GL_PSS), timeStamp, processMemoryInfo.gl_pss_kb()); + } if (hasValue) { streamFilters_->processFilter_->AddProcessMemory(ipid); } if (processMemoryInfo.has_smapinfo()) { - ParseSmapsInfoEasy(&processMemoryInfo, timeStamp); + ParseSmapsInfoEasy(&processMemoryInfo, timeStamp, ipid); + } + } +} + +uint32_t HtraceMemParser::ParseSmapsBlockType(ProtoReader::SmapsInfo_Reader& smapsInfo) const +{ + std::string path(smapsInfo.path().ToStdString()); + path.erase(0, path.find_first_not_of(" ")); + path.erase(path.find_last_not_of(" ") + 1); + if (path.empty()) { + path = "[anon]"; + } + std::map check_start = { + {"[stack", SMAPS_MEM_TYPE_STACK}, + {"[anon:stack_and_tls:", SMAPS_MEM_TYPE_STACK}, + {"[anon:stack:", SMAPS_MEM_TYPE_STACK}, + {"[anon:signal_stack:", SMAPS_MEM_TYPE_STACK}, + {"[anon:maple_alloc_ros]", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-allocspace", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-main space", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-large object", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-free list large", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-non moving", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-zygote space", SMAPS_MEM_TYPE_JS_HEAP}, + {"[anon:dalvik-", SMAPS_MEM_TYPE_JAVA_VM}, + {"/dev/ashmem/jit-zygote-cache", SMAPS_MEM_TYPE_JAVA_VM}, + {"/memfd:jit-cache", SMAPS_MEM_TYPE_JAVA_VM}, + {"/memfd:jit-zygote-cache", SMAPS_MEM_TYPE_JAVA_VM}, + {"[heap]", SMAPS_MEM_TYPE_NATIVE_HEAP}, + {"[anon:libc_malloc", SMAPS_MEM_TYPE_NATIVE_HEAP}, + {"[anon:scudo", SMAPS_MEM_TYPE_NATIVE_HEAP}, + {"[anon:GWP-Asan", SMAPS_MEM_TYPE_NATIVE_HEAP}, + }; + std::map check_end = { + {".art", SMAPS_MEM_TYPE_JS_HEAP}, + {".art]", SMAPS_MEM_TYPE_JS_HEAP}, + }; + std::map check_contain = { + {"[anon:ArkJS Heap]", SMAPS_MEM_TYPE_JS_HEAP}, {"[anon:native_heap:jemalloc]", SMAPS_MEM_TYPE_NATIVE_HEAP}, + {"[heap]", SMAPS_MEM_TYPE_NATIVE_HEAP}, {"[anon:native_heap:musl]", SMAPS_MEM_TYPE_NATIVE_HEAP}, + {"/dev/ashmem/", SMAPS_MEM_TYPE_ASHMEM}, + }; + + for (const auto& iter : check_start) { + if (StartWith(path, iter.first)) { + return iter.second; + } + } + + for (const auto& iter : check_end) { + if (EndWith(path, iter.first)) { + return iter.second; + } + } + + for (const auto& iter : check_contain) { + if (path.find(iter.first) != std::string::npos) { + return iter.second; + } + } + + bool has_x = smapsInfo.permission().ToStdString().find("x") != std::string::npos; + bool has_appNmae = path.find("com.huawei.wx") != std::string::npos; + if (EndWith(path, ".so")) { + if (has_x) { + if (StartWith(path, "/data/app/") || has_appNmae) { + return SMAPS_MEM_TYPE_CODE_APP; + } else { + return SMAPS_MEM_TYPE_CODE_SYS; + } + } else { + if (StartWith(path, "[anon:.bss]/data/app/") || StartWith(path, "/data/app/") || has_appNmae) { + return SMAPS_MEM_TYPE_DATA_APP; + } else { + return SMAPS_MEM_TYPE_DATA_SYS; + } } } + if ((EndWith(path, ".jar")) || (EndWith(path, ".apk")) || (EndWith(path, ".vdex")) || (EndWith(path, ".odex")) || + (EndWith(path, ".oat")) || (path.find("dex") != std::string::npos)) { + return has_x ? (has_appNmae ? SMAPS_MEM_TYPE_CODE_APP : SMAPS_MEM_TYPE_CODE_SYS) + : (has_appNmae ? SMAPS_MEM_TYPE_DATA_APP : SMAPS_MEM_TYPE_DATA_SYS); + } + if (has_x && path.find("/bin/") != std::string::npos) { + return SMAPS_MEM_TYPE_CODE_SYS; + } + if ((!has_x) && (path.find("/bin/") != std::string::npos || path.find("[anon:.bss]") != std::string::npos)) { + return SMAPS_MEM_TYPE_DATA_SYS; + } + if (path.find("[bss]") != std::string::npos) { + return has_appNmae ? SMAPS_MEM_TYPE_DATA_APP : SMAPS_MEM_TYPE_DATA_SYS; + } + + if ((path.find("[anon]") != std::string::npos) || (path.find("[anon:") != std::string::npos)) { + std::vector unknown_anon_mem_info = { + "[anon]", + "[anon:libwebview reservation]", + "[anon:atexit handlers]", + "[anon:cfi shadow]", + "[anon:thread signal stack]", + "[anon:bionic_alloc_small_objects]", + "[anon:bionic_alloc_lob]", + "[anon:linker_alloc]", + "[anon:System property context nodes]", + "[anon:arc4random data]", + }; + for (auto iter : unknown_anon_mem_info) { + if (path == iter) { + return SMAPS_MEM_TYPE_UNKNOWN_ANON; + } + } + return SMAPS_MEM_TYPE_NATIVE_HEAP; + } + + return has_appNmae ? SMAPS_MEM_TYPE_OTHER_APP : SMAPS_MEM_TYPE_OTHER_SYS; } -void HtraceMemParser::ParseSmapsInfoEasy(const ProtoReader::ProcessMemoryInfo_Reader* memInfo, uint64_t timeStamp) const +void HtraceMemParser::ParseSmapsInfoEasy(const ProtoReader::ProcessMemoryInfo_Reader* memInfo, + uint64_t timeStamp, + uint64_t ipid) const { streamFilters_->statFilter_->IncreaseStat(TRACE_SMAPS, STAT_EVENT_RECEIVED); for (auto i = memInfo->smapinfo(); i; ++i) { @@ -115,8 +256,16 @@ void HtraceMemParser::ParseSmapsInfoEasy(const ProtoReader::ProcessMemoryInfo_Re double reside = smapsInfo.reside(); DataIndex protection = traceDataCache_->GetDataIndex(smapsInfo.permission().ToStdString()); DataIndex path = traceDataCache_->GetDataIndex(smapsInfo.path().ToStdString()); - traceDataCache_->GetSmapsData()->AppendNewData(timeStamp, startAddr, endAddr, dirty, swapper, rss, pss, size, - reside, protection, path); + uint64_t private_clean = smapsInfo.has_private_clean() ? smapsInfo.private_clean() : 0; + uint64_t private_dirty = smapsInfo.has_private_dirty() ? smapsInfo.private_dirty() : 0; + uint64_t shared_clean = smapsInfo.has_shared_clean() ? smapsInfo.shared_clean() : 0; + uint64_t shared_dirty = smapsInfo.has_shared_dirty() ? smapsInfo.shared_dirty() : 0; + uint64_t swap = smapsInfo.has_swap() ? smapsInfo.swap() : 0; + uint64_t swap_pss = smapsInfo.has_swap_pss() ? smapsInfo.swap_pss() : 0; + uint32 type = ParseSmapsBlockType(smapsInfo); + traceDataCache_->GetSmapsData()->AppendNewData(timeStamp, ipid, startAddr, endAddr, dirty, swapper, rss, pss, + size, reside, protection, path, shared_clean, shared_dirty, + private_clean, private_dirty, swap, swap_pss, type); } } @@ -299,6 +448,18 @@ void HtraceMemParser::ParseMemInfo(const ProtoReader::MemoryData_Reader* tracePa streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData( sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_RECLAIMABLE), timeStamp, sysMeminfo.value()); break; + case ProtoReader::PMEM_ACTIVE_PURG: + streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData( + sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_PURG), timeStamp, sysMeminfo.value()); + break; + case ProtoReader::PMEM_INACTIVE_PURG: + streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData( + sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_PURG), timeStamp, sysMeminfo.value()); + break; + case ProtoReader::PMEM_PINED_PURG: + streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData( + sysMemNameDictMap_.at(ProtoReader::PMEM_PINED_PURG), timeStamp, sysMeminfo.value()); + break; // case SysMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_: // case SysMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_: default: @@ -307,6 +468,8 @@ void HtraceMemParser::ParseMemInfo(const ProtoReader::MemoryData_Reader* tracePa } } streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(zramIndex_, timeStamp, zram_); + streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(gpuLimitSizeIndex_, timeStamp, gpuLimit_); + streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(gpuUsedSizeIndex_, timeStamp, gpuUsed_); } void HtraceMemParser::ParseVMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const { @@ -868,6 +1031,278 @@ void HtraceMemParser::ParseVMemInfo(const ProtoReader::MemoryData_Reader* traceP } } } + +void HtraceMemParser::ParseAshmemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const +{ + if (tracePacket->has_ashmeminfo()) { + streamFilters_->statFilter_->IncreaseStat(TRACE_ASHMEM, STAT_EVENT_RECEIVED); + } + for (auto i = tracePacket->ashmeminfo(); i; ++i) { + ProtoReader::AshmemInfo_Reader AshmemInfo(i->ToBytes().data_, i->ToBytes().size_); + auto ipid = streamFilters_->processFilter_->UpdateOrCreateProcessWithName(AshmemInfo.pid(), + AshmemInfo.name().ToStdString()); + uint32_t adj = AshmemInfo.adj(); + uint32_t fd = AshmemInfo.fd(); + DataIndex ashmemNameId = traceDataCache_->GetDataIndex(AshmemInfo.ashmem_name().ToStdString()); + uint64_t size = AshmemInfo.size(); + uint32_t ashmemId = AshmemInfo.id(); + uint64_t time = AshmemInfo.time(); + uint64_t refCount = AshmemInfo.ref_count(); + uint64_t purged = AshmemInfo.purged(); + uint32_t flag = 0; + uint64_t pss = 0; + auto smapsData = traceDataCache_->GetConstSmapsData(); + auto smapsCount = smapsData.Size(); + for (auto j = 0; j < smapsCount; j++) { + auto path = traceDataCache_->GetDataFromDict(smapsData.PathIds()[j]); + if ((smapsData.Ipids()[j] == ipid) && (path.find("/dev/ashmem/") != std::string::npos)) { + pss += smapsData.Pss()[j] + smapsData.SwapPss()[j]; + } + } + traceDataCache_->GetAshMemData()->AppendNewData(ipid, timeStamp, adj, fd, ashmemNameId, size, pss, ashmemId, + time, refCount, purged, flag); + } + AshMemDeduplicate(); +} +void HtraceMemParser::AshMemDeduplicate() const +{ + auto ashMemData = traceDataCache_->GetAshMemData(); + auto ashMemCount = ashMemData->Size(); + if (ashMemCount == 0) { + return; + } + + std::vector> dataByTs; + size_t start = 0; + auto ts = ashMemData->TimeStampData()[0]; + for (auto i = 0; i < ashMemCount; ++i) { + auto tsTmp = ashMemData->TimeStampData()[i]; + if (tsTmp != ts) { + dataByTs.emplace_back(std::make_pair(start, i - 1)); + start = i; + ts = tsTmp; + } + } + dataByTs.emplace_back(std::make_pair(start, ashMemCount - 1)); + + for (const auto& iterator : dataByTs) { + std::multimap, std::pair> AshMemMap; + std::map, mem_process_type> processTypeMap; + for (auto i = iterator.first; i <= iterator.second; ++i) { + auto ashmemId = ashMemData->AshmemIds()[i]; + auto time = ashMemData->Times()[i]; + auto key = std::make_pair(ashmemId, time); + auto ipid = ashMemData->Ipids()[i]; + auto count = AshMemMap.count(key); + auto iter = AshMemMap.find(key); + bool needInert = true; + for (auto j = 0; j < count; j++, iter++) { + if (ashMemData->Ipids()[iter->second.first] == ipid) { + ashMemData->SetFlag(i, MEM_DEDUPLICATE_FLAG_DUP_SAME_PROCESS); + needInert = false; + break; + } + } + if (needInert) { + auto processType = GetMemProcessType(ipid); + AshMemMap.emplace(key, std::make_pair(i, processType)); + if (processTypeMap.count(key) == 0) { + processTypeMap.emplace(key, processType); + } else if (processTypeMap[key] < processType) { + processTypeMap[key] = processType; + } + } + } + + for (auto iter = AshMemMap.begin(); iter != AshMemMap.end(); iter = AshMemMap.upper_bound(iter->first)) { + auto maxPidType = processTypeMap[iter->first]; + auto count = AshMemMap.count(iter->first); + auto it = AshMemMap.find(iter->first); + for (auto j = 0; j < count; j++, it++) { + auto rowId = it->second.first; + auto processType = it->second.second; + if (processType < maxPidType) { + ashMemData->SetFlag(rowId, MEM_DEDUPLICATE_FLAG_DUP_DIFF_PROCESS); + } + } + } + } +} +HtraceMemParser::mem_process_type HtraceMemParser::GetMemProcessType(uint64_t ipid) const +{ + const auto& iterProcess = traceDataCache_->GetConstProcessData(ipid); + if (iterProcess.cmdLine_ == "composer_host") { + return PID_TYPE_COMPOSER; + } else if (iterProcess.cmdLine_ == "render_service") { + return PID_TYPE_RENDER_SERVICES; + } else { + return PID_TYPE_APP; + } +} + +void HtraceMemParser::ParseDmaMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const +{ + if (tracePacket->has_dmainfo()) { + streamFilters_->statFilter_->IncreaseStat(TRACE_DMAMEM, STAT_EVENT_RECEIVED); + } + for (auto i = tracePacket->dmainfo(); i; ++i) { + ProtoReader::DmaInfo_Reader DmaMemInfo(i->ToBytes().data_, i->ToBytes().size_); + auto ipid = streamFilters_->processFilter_->UpdateOrCreateProcessWithName(DmaMemInfo.pid(), + DmaMemInfo.name().ToStdString()); + uint32_t fd = DmaMemInfo.fd(); + uint64_t size = DmaMemInfo.size(); + uint32_t ino = DmaMemInfo.ino(); + uint64_t expPid = DmaMemInfo.exp_pid(); + DataIndex expTaskCommId = traceDataCache_->GetDataIndex(DmaMemInfo.exp_task_comm().ToStdString()); + DataIndex bufNameId = traceDataCache_->GetDataIndex(DmaMemInfo.buf_name().ToStdString()); + DataIndex expNameId = traceDataCache_->GetDataIndex(DmaMemInfo.exp_name().ToStdString()); + uint32_t flag = 0; + traceDataCache_->GetDmaMemData()->AppendNewData(ipid, timeStamp, fd, size, ino, expPid, expTaskCommId, + bufNameId, expNameId, flag); + } + DmaMemDeduplicate(); +} +void HtraceMemParser::DmaMemDeduplicate() const +{ + auto dmaMemData = traceDataCache_->GetDmaMemData(); + auto dmaCount = dmaMemData->Size(); + if (dmaCount == 0) { + return; + } + + std::vector> dataByTs; + size_t start = 0; + auto ts = dmaMemData->TimeStampData()[0]; + for (auto i = 0; i < dmaCount; ++i) { + auto tsTmp = dmaMemData->TimeStampData()[i]; + if (tsTmp != ts) { + dataByTs.emplace_back(std::make_pair(start, i - 1)); + start = i; + ts = tsTmp; + } + } + dataByTs.emplace_back(std::make_pair(start, dmaCount - 1)); + + for (const auto& iterator : dataByTs) { + std::multimap> inoMap; + std::map processTypeMap; + for (auto i = iterator.first; i <= iterator.second; ++i) { + auto ino = dmaMemData->Inos()[i]; + auto ipid = dmaMemData->Ipids()[i]; + auto count = inoMap.count(ino); + auto iter = inoMap.find(ino); + bool needInert = true; + for (auto j = 0; j < count; j++, iter++) { + if (dmaMemData->Ipids()[iter->second.first] == ipid) { + dmaMemData->SetFlag(i, MEM_DEDUPLICATE_FLAG_DUP_SAME_PROCESS); + needInert = false; + break; + } + } + if (needInert) { + auto processType = GetMemProcessType(ipid); + inoMap.emplace(ino, std::make_pair(i, processType)); + if (processTypeMap.count(ino) == 0) { + processTypeMap.emplace(ino, processType); + } else if (processTypeMap[ino] < processType) { + processTypeMap[ino] = processType; + } + } + } + + for (auto iter = inoMap.begin(); iter != inoMap.end(); iter = inoMap.upper_bound(iter->first)) { + auto ino = iter->first; + auto maxPidType = processTypeMap[ino]; + auto count = inoMap.count(iter->first); + auto it = inoMap.find(iter->first); + for (auto j = 0; j < count; j++, it++) { + auto rowId = it->second.first; + auto processType = it->second.second; + if (processType < maxPidType) { + dmaMemData->SetFlag(rowId, MEM_DEDUPLICATE_FLAG_DUP_DIFF_PROCESS); + } + } + } + } +} + +void HtraceMemParser::ParseGpuProcessMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, + uint64_t timeStamp) const +{ + if (tracePacket->has_gpumemoryinfo()) { + streamFilters_->statFilter_->IncreaseStat(TRACE_GPU_PROCESS_MEM, STAT_EVENT_RECEIVED); + } + for (auto i = tracePacket->gpumemoryinfo(); i; ++i) { + ProtoReader::GpuMemoryInfo_Reader GpuMemoryInfo(i->ToBytes().data_, i->ToBytes().size_); + DataIndex gpuNameId = traceDataCache_->GetDataIndex(GpuMemoryInfo.gpu_name().ToStdString()); + uint64_t allGpuSize = GpuMemoryInfo.all_gpu_size(); + if (GpuMemoryInfo.has_gpu_process_info()) { + for (auto j = GpuMemoryInfo.gpu_process_info(); j; ++j) { + ProtoReader::GpuProcessInfo_Reader GpuProcessInfo(j->ToBytes().data_, j->ToBytes().size_); + std::string addr = GpuProcessInfo.addr().ToStdString(); + uint32_t pid = GpuProcessInfo.pid(); + uint32_t tid = GpuProcessInfo.tid(); + auto itid = streamFilters_->processFilter_->GetOrCreateThreadWithPid(tid, pid); + auto ipid = streamFilters_->processFilter_->GetOrCreateInternalPid(timeStamp, pid); + uint64_t usedGpuSize = GpuProcessInfo.used_gpu_size(); + + traceDataCache_->GetGpuProcessMemData()->AppendNewData(timeStamp, gpuNameId, allGpuSize, addr, ipid, + itid, usedGpuSize); + } + } + } +} + +void HtraceMemParser::ParseGpuWindowMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const +{ + if (tracePacket->has_gpudumpinfo()) { + streamFilters_->statFilter_->IncreaseStat(TRACE_GPU_WINDOW_MEM, STAT_EVENT_RECEIVED); + } + for (auto i = tracePacket->gpudumpinfo(); i; ++i) { + ProtoReader::GpuDumpInfo_Reader GpuDumpInfo(i->ToBytes().data_, i->ToBytes().size_); + DataIndex windowNameId = traceDataCache_->GetDataIndex(GpuDumpInfo.window_name().ToStdString()); + uint64_t windowId = GpuDumpInfo.id(); + uint64_t purgeableSize = GpuDumpInfo.gpu_purgeable_size(); + if (GpuDumpInfo.has_gpu_detail_info()) { + for (auto j = GpuDumpInfo.gpu_detail_info(); j; ++j) { + ProtoReader::GpuDetailInfo_Reader GpuDetailInfo(j->ToBytes().data_, j->ToBytes().size_); + DataIndex moduleNameId = traceDataCache_->GetDataIndex(GpuDetailInfo.module_name().ToStdString()); + if (GpuDetailInfo.has_gpu_sub_info()) { + for (auto k = GpuDetailInfo.gpu_sub_info(); k; ++k) { + ProtoReader::GpuSubInfo_Reader GpuSubInfo(k->ToBytes().data_, k->ToBytes().size_); + DataIndex categoryNameId = + traceDataCache_->GetDataIndex(GpuSubInfo.category_name().ToStdString()); + uint64_t size = GpuSubInfo.size(); + uint32_t entryNum = GpuSubInfo.entry_num(); + traceDataCache_->GetGpuWindowMemData()->AppendNewData(timeStamp, windowNameId, windowId, + moduleNameId, categoryNameId, size, + entryNum, purgeableSize); + } + } + } + } + } +} + +void HtraceMemParser::ParseMemoryConfig(HtraceDataSegment& seg) +{ + ProtoReader::MemoryConfig_Reader memConfigData(seg.protoData.data_, seg.protoData.size_); + if (memConfigData.has_pid()) { + bool parseError = false; + auto itor = memConfigData.pid(&parseError); + if (parseError) { + TS_LOGE("Parse pid in MemoryConfig function failed!!!"); + return; + } + while (itor) { + int32_t pid = *itor; + auto ipid = streamFilters_->processFilter_->GetOrCreateInternalPid(seg.timeStamp, pid); + traceDataCache_->GetTraceConfigData()->AppendNewData("memory_config", "ipid", std::to_string(ipid)); + itor++; + } + } +} + void HtraceMemParser::Finish() { if (traceDataCache_->traceStartTime_ == INVALID_UINT64 || traceDataCache_->traceEndTime_ == 0) { diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h index b16cbe1218ccca70b7d9255bb4b845bc02077e8b..5fa8d0164a0a899c14e4b7941a1e5607a570d091 100644 --- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h +++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h @@ -34,7 +34,32 @@ public: HtraceMemParser(TraceDataCache* dataCache, const TraceStreamerFilters* ctx); ~HtraceMemParser(); void Parse(HtraceDataSegment& seg, uint64_t, BuiltinClocks clock); + void ParseMemoryConfig(HtraceDataSegment& seg); void Finish(); + enum smaps_mem_type { + SMAPS_MEM_TYPE_CODE_SYS = 0, // 系统代码段 + SMAPS_MEM_TYPE_CODE_APP = 1, // 应用代码段 + SMAPS_MEM_TYPE_DATA_SYS = 2, // 系统数据段 + SMAPS_MEM_TYPE_DATA_APP = 3, // 应用数据段 + SMAPS_MEM_TYPE_UNKNOWN_ANON = 4, // 系统未知匿名内存 + SMAPS_MEM_TYPE_STACK = 5, // 栈 + SMAPS_MEM_TYPE_JS_HEAP = 6, // js堆 + SMAPS_MEM_TYPE_JAVA_VM = 7, // java虚拟机 + SMAPS_MEM_TYPE_NATIVE_HEAP = 8, // native堆 + SMAPS_MEM_TYPE_ASHMEM = 9, // Ashmem + SMAPS_MEM_TYPE_OTHER_SYS = 10, // 系统其他杂类资源 + SMAPS_MEM_TYPE_OTHER_APP = 11, // 应用其他杂类资源 + }; + enum mem_process_type { + PID_TYPE_COMPOSER = 0, + PID_TYPE_RENDER_SERVICES, + PID_TYPE_APP, + }; + enum mem_deduplicate_flag { + MEM_DEDUPLICATE_FLAG_NOMAL = 0, + MEM_DEDUPLICATE_FLAG_DUP_SAME_PROCESS, + MEM_DEDUPLICATE_FLAG_DUP_DIFF_PROCESS, + }; private: void ParseProcessInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; @@ -42,12 +67,28 @@ private: void ParseMemInfoEasy(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; void ParseVMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; void ParseVMemInfoEasy(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; - void ParseSmapsInfoEasy(const ProtoReader::ProcessMemoryInfo_Reader* memInfo, uint64_t timeStamp) const; + void ParseSmapsInfoEasy(const ProtoReader::ProcessMemoryInfo_Reader* memInfo, + uint64_t timeStamp, + uint64_t ipid) const; + uint32_t ParseSmapsBlockType(ProtoReader::SmapsInfo_Reader& smapsInfo) const; + void ParseAshmemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; + void ParseDmaMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; + void ParseGpuProcessMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; + void ParseGpuWindowMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const; + void AshMemDeduplicate() const; + void DmaMemDeduplicate() const; + mem_process_type GetMemProcessType(uint64_t ipid) const; + std::map memNameDictMap_ = {}; std::map sysMemNameDictMap_ = {}; std::map sysVMemNameDictMap_ = {}; uint64_t zram_ = 0; + uint64_t gpuLimit_ = 0; + uint64_t gpuUsed_ = 0; const DataIndex zramIndex_ = traceDataCache_->GetDataIndex("sys.mem.zram"); + const DataIndex gpuLimitSizeIndex_ = traceDataCache_->GetDataIndex("sys.mem.gpu.limit"); + const DataIndex gpuUsedSizeIndex_ = traceDataCache_->GetDataIndex("sys.mem.gpu.used"); + TraceStreamerConfig config_{}; }; } // namespace TraceStreamer diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp index 5b5031269d8659a76850b2c26d3c583ab365c6a7..c2c82fb04df04e71b51ccc9df70f4d816f581df2 100644 --- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp +++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp @@ -282,6 +282,8 @@ void HtraceParser::FilterData(HtraceDataSegment& seg) } else if (seg.dataType == DATA_SOURCE_TYPE_HISYSEVENT_CONFIG) { ProtoReader::HisyseventConfig_Reader hisyseventConfig(seg.protoData.data_, seg.protoData.size_); hisyseventParser_->Parse(&hisyseventConfig, seg.timeStamp); + } else if (seg.dataType == DATA_SOURCE_TYPE_MEM_CONFIG) { + htraceMemParser_->ParseMemoryConfig(seg); } if (supportThread_) { filterHead_ = (filterHead_ + 1) % MAX_SEG_ARRAY_SIZE; @@ -374,6 +376,14 @@ void HtraceParser::ParserData(HtraceDataSegment& dataSeg) } else if (pluginName == "arkts-plugin_config") { dataSeg.protoData = pluginDataZero.data(); ParseJSMemoryConfig(dataSeg); + } else if (pluginName == "memory-plugin_config") { + if (pluginDataZero.has_sample_interval()) { + uint32_t sampleInterval = pluginDataZero.sample_interval(); + traceDataCache_->GetTraceConfigData()->AppendNewData("memory_config", "sample_interval", + std::to_string(sampleInterval)); + } + dataSeg.dataType = DATA_SOURCE_TYPE_MEM_CONFIG; + dataSeg.protoData = pluginDataZero.data(); } else { #if IS_WASM TraceStreamer_Plugin_Out_Filter(reinterpret_cast(pluginDataZero.data().data_), diff --git a/trace_streamer/src/parser/print_event_parser.cpp b/trace_streamer/src/parser/print_event_parser.cpp index 85ce980df6b94fe7ee160afb1cb6c9e095597b32..58ba319141e6ad04a0e9b1b130b0947b0914d0eb 100644 --- a/trace_streamer/src/parser/print_event_parser.cpp +++ b/trace_streamer/src/parser/print_event_parser.cpp @@ -12,13 +12,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "print_event_parser.h" + +#include + #include "animation_filter.h" #include "clock_filter_ex.h" #include "frame_filter.h" #include "stat_filter.h" #include "string_to_numerical.h" -#include + namespace SysTuning { namespace TraceStreamer { PrintEventParser::PrintEventParser(TraceDataCache* dataCache, const TraceStreamerFilters* filter) @@ -54,61 +58,23 @@ bool PrintEventParser::ParsePrintEvent(const std::string& comm, } switch (point.phase_) { case 'B': { - uint32_t index = streamFilters_->sliceFilter_->BeginSlice(comm, ts, pid, point.tgid_, INVALID_DATAINDEX, - traceDataCache_->GetDataIndex(point.name_)); - if (index != INVALID_UINT32) { - // add distributed data - traceDataCache_->GetInternalSlicesData()->SetDistributeInfo( - index, point.chainId_, point.spanId_, point.parentSpanId_, point.flag_, point.args_); - if (pid == point.tgid_) { - if (HandleFrameSliceBeginEvent(point.funcPrefixId_, index, point.funcArgs_, line)) { - break; - } - } - if (!streamFilters_->taskPoolFilter_->TaskPoolEvent(point.name_, index)) { - HandleAnimationBeginEvent(point, index, line); - } - } else { - streamFilters_->statFilter_->IncreaseStat(TRACE_EVENT_TRACING_MARK_WRITE, STAT_EVENT_DATA_LOST); - } + ParseBeginEvent(comm, ts, pid, point, line); break; } case 'E': { - uint32_t index = streamFilters_->sliceFilter_->EndSlice(ts, pid, point.tgid_); - if (pid == point.tgid_) { - HandleFrameSliceEndEvent(ts, point.tgid_, pid, index); - } + ParseEndEvent(ts, pid, point); break; } case 'S': { - auto cookie = static_cast(point.value_); - auto index = streamFilters_->sliceFilter_->StartAsyncSlice(ts, pid, point.tgid_, cookie, - traceDataCache_->GetDataIndex(point.name_)); - if (point.name_ == onFrameQueeuStartEvent_ && index != INVALID_UINT64) { - OnFrameQueueStart(ts, index, point.tgid_); - } else if (index != INVALID_UINT64 && EndWith(comm, onLauncherVsyncEvent_) && // the comm is taskName - onAnimationStartEvent_ == traceDataCache_->GetDataIndex(point.name_)) { - HandleAnimationStartEvent(line, index); - } + ParseStartEvent(comm, ts, pid, point, line); break; } case 'F': { - auto cookie = static_cast(point.value_); - auto index = streamFilters_->sliceFilter_->FinishAsyncSlice(ts, pid, point.tgid_, cookie, - traceDataCache_->GetDataIndex(point.name_)); - HandleFrameQueueEndEvent(ts, point.tgid_, point.tgid_, index); - HandleAnimationFinishEvent(line, index); + ParseFinishEvent(ts, pid, point, line); break; } case 'C': { - DataIndex nameIndex = traceDataCache_->GetDataIndex(point.name_); - uint32_t internalPid = streamFilters_->processFilter_->GetInternalPid(point.tgid_); - if (internalPid != INVALID_ID) { - streamFilters_->processMeasureFilter_->AppendNewMeasureData(internalPid, nameIndex, ts, point.value_); - streamFilters_->processFilter_->AddProcessMemory(internalPid); - } else { - streamFilters_->statFilter_->IncreaseStat(TRACE_EVENT_TRACING_MARK_WRITE, STAT_EVENT_DATA_INVALID); - } + ParseCreateEvent(ts, point); break; } default: @@ -117,30 +83,85 @@ bool PrintEventParser::ParsePrintEvent(const std::string& comm, } return true; } -bool PrintEventParser::HandleAnimationBeginEvent(const TracePoint& point, size_t callStackRow, const BytraceLine& line) +void PrintEventParser::ParseBeginEvent(const std::string& comm, + uint64_t ts, + uint32_t pid, + TracePoint& point, + const BytraceLine& line) { - if (traceDataCache_->AnimationTraceEnabled()) { - if (!streamFilters_->animationFilter_->UpdateDeviceInfoEvent(point, line)) { - return streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, callStackRow); + uint32_t index = streamFilters_->sliceFilter_->BeginSlice(comm, ts, pid, point.tgid_, INVALID_DATAINDEX, + traceDataCache_->GetDataIndex(point.name_)); + if (index != INVALID_UINT32) { + // add distributed data + traceDataCache_->GetInternalSlicesData()->SetDistributeInfo(index, point.chainId_, point.spanId_, + point.parentSpanId_, point.flag_, point.args_); + if (pid == point.tgid_) { + if (HandleFrameSliceBeginEvent(point.funcPrefixId_, index, point.funcArgs_, line)) { + return; + } } - return true; + bool isDiscontinued = false; + if (traceDataCache_->TaskPoolTraceEnabled()) { + isDiscontinued = streamFilters_->taskPoolFilter_->TaskPoolEvent(point.name_, index); + } + if (traceDataCache_->AnimationTraceEnabled() && !isDiscontinued) { + isDiscontinued = HandleAnimationBeginEvent(point, index, line); + } + } else { + streamFilters_->statFilter_->IncreaseStat(TRACE_EVENT_TRACING_MARK_WRITE, STAT_EVENT_DATA_LOST); } - return false; } -bool PrintEventParser::HandleAnimationStartEvent(const BytraceLine& line, size_t callStackRow) +void PrintEventParser::ParseEndEvent(uint64_t ts, uint32_t pid, const TracePoint& point) { - if (traceDataCache_->AnimationTraceEnabled()) { - streamFilters_->animationFilter_->StartAnimationEvent(line, callStackRow); - return true; + uint32_t index = streamFilters_->sliceFilter_->EndSlice(ts, pid, point.tgid_); + if (pid == point.tgid_) { + HandleFrameSliceEndEvent(ts, point.tgid_, pid, index); + } +} +void PrintEventParser::ParseStartEvent(const std::string& comm, + uint64_t ts, + uint32_t pid, + const TracePoint& point, + const BytraceLine& line) +{ + auto cookie = static_cast(point.value_); + auto index = streamFilters_->sliceFilter_->StartAsyncSlice(ts, pid, point.tgid_, cookie, + traceDataCache_->GetDataIndex(point.name_)); + if (point.name_ == onFrameQueeuStartEvent_ && index != INVALID_UINT64) { + OnFrameQueueStart(ts, index, point.tgid_); + } else if (traceDataCache_->AnimationTraceEnabled() && index != INVALID_UINT64 && + EndWith(comm, onLauncherVsyncEvent_) && // the comm is taskName + onAnimationStartEvent_ == traceDataCache_->GetDataIndex(point.name_)) { + streamFilters_->animationFilter_->StartAnimationEvent(line, index); } - return false; } -bool PrintEventParser::HandleAnimationFinishEvent(const BytraceLine& line, size_t callStackRow) +void PrintEventParser::ParseFinishEvent(uint64_t ts, uint32_t pid, const TracePoint& point, const BytraceLine& line) { + auto cookie = static_cast(point.value_); + auto index = streamFilters_->sliceFilter_->FinishAsyncSlice(ts, pid, point.tgid_, cookie, + traceDataCache_->GetDataIndex(point.name_)); + HandleFrameQueueEndEvent(ts, point.tgid_, point.tgid_, index); if (traceDataCache_->AnimationTraceEnabled()) { - return streamFilters_->animationFilter_->FinishAnimationEvent(line, callStackRow); + streamFilters_->animationFilter_->FinishAnimationEvent(line, index); } - return false; +} +void PrintEventParser::ParseCreateEvent(uint64_t ts, const TracePoint& point) +{ + DataIndex nameIndex = traceDataCache_->GetDataIndex(point.name_); + uint32_t internalPid = streamFilters_->processFilter_->GetInternalPid(point.tgid_); + if (internalPid != INVALID_ID) { + streamFilters_->processMeasureFilter_->AppendNewMeasureData(internalPid, nameIndex, ts, point.value_); + streamFilters_->processFilter_->AddProcessMemory(internalPid); + } else { + streamFilters_->statFilter_->IncreaseStat(TRACE_EVENT_TRACING_MARK_WRITE, STAT_EVENT_DATA_INVALID); + } +} +bool PrintEventParser::HandleAnimationBeginEvent(const TracePoint& point, size_t callStackRow, const BytraceLine& line) +{ + if (!streamFilters_->animationFilter_->UpdateDeviceInfoEvent(point, line)) { + return streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, callStackRow); + } + return true; } void PrintEventParser::SetTraceType(TraceFileType traceType) { diff --git a/trace_streamer/src/parser/print_event_parser.h b/trace_streamer/src/parser/print_event_parser.h index 7c3518addf7050736f131fc4146ec5521d3d76cf..d23360f0535a2eb809e7f051fbb853af1bcb8fbe 100644 --- a/trace_streamer/src/parser/print_event_parser.h +++ b/trace_streamer/src/parser/print_event_parser.h @@ -34,6 +34,16 @@ public: uint32_t pid, std::string_view event, const BytraceLine& line); + void + ParseBeginEvent(const std::string& comm, uint64_t ts, uint32_t pid, TracePoint& point, const BytraceLine& line); + void ParseEndEvent(uint64_t ts, uint32_t pid, const TracePoint& point); + void ParseStartEvent(const std::string& comm, + uint64_t ts, + uint32_t pid, + const TracePoint& point, + const BytraceLine& line); + void ParseFinishEvent(uint64_t ts, uint32_t pid, const TracePoint& point, const BytraceLine& line); + void ParseCreateEvent(uint64_t ts, const TracePoint& point); void Finish(); void SetTraceType(TraceFileType traceType); void SetTraceClockId(BuiltinClocks clock); @@ -52,8 +62,6 @@ private: void HandleFrameSliceEndEvent(uint64_t ts, uint64_t pid, uint64_t tid, size_t callStackRow); void HandleFrameQueueEndEvent(uint64_t ts, uint64_t pid, uint64_t tid, size_t callStackRow); bool HandleAnimationBeginEvent(const TracePoint& point, size_t callStackRow, const BytraceLine& line); - bool HandleAnimationStartEvent(const BytraceLine& line, size_t callStackRow); - bool HandleAnimationFinishEvent(const BytraceLine& line, size_t callStackRow); static ParseResult HandlerE(void); ParseResult HandlerCSF(std::string_view pointStr, TracePoint& outPoint, size_t tGidlength) const; static size_t GetNameLength(std::string_view pointStr, size_t nameIndex); diff --git a/trace_streamer/src/proto_reader/proto_reader.cpp b/trace_streamer/src/proto_reader/proto_reader.cpp index 53c993b644857c2cbe9d9ce55ba5c07eac8c67a4..f558d6302792b1bf1282ba1e7a3b8b3404116d6d 100644 --- a/trace_streamer/src/proto_reader/proto_reader.cpp +++ b/trace_streamer/src/proto_reader/proto_reader.cpp @@ -147,10 +147,10 @@ ParseDataAreaResult ProtoReaderBase::ParseOneDataArea(const uint8_t* const start if (dataAreaId == 0) { return result; } - if (TS_UNLIKELY(dataAreaId > std::numeric_limits::max())) { TS_LOGD("Skip dataArea %d because its too big", dataAreaId); result.status = ParseProtoStatus::SKIP; + result.next = cursor; return result; } result.dataArea.SetDataAreaId(dataAreaId); diff --git a/trace_streamer/src/protos/services/common_types.proto b/trace_streamer/src/protos/services/common_types.proto index 6b7fa551f18301b36ef6b745ee55d54d69e18c3e..11441d467d8e86b048129086d9aa9f3e77ef8574 100755 --- a/trace_streamer/src/protos/services/common_types.proto +++ b/trace_streamer/src/protos/services/common_types.proto @@ -57,4 +57,5 @@ message ProfilerPluginData { uint64 tv_sec = 5; uint64 tv_nsec = 6; string version = 7; // "1.01" + uint32 sample_interval = 8; // Polling plugin collection interval(ms) } diff --git a/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_common.proto b/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_common.proto index 361b65e87016a5e9f253c3529aa9a7437954c380..73c441677d1c542c82843d1c8bf2fb911953014a 100755 --- a/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_common.proto +++ b/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_common.proto @@ -53,6 +53,9 @@ enum SysMeminfoType { PMEM_CMA_TOTAL = 32; PMEM_CMA_FREE = 33; PMEM_KERNEL_RECLAIMABLE = 34; + PMEM_ACTIVE_PURG = 35; + PMEM_INACTIVE_PURG = 36; + PMEM_PINED_PURG = 37; } enum SysVMeminfoType { diff --git a/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_result.proto b/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_result.proto index f639590d69e8c2e9b64becf19337cdf2c5620a3f..2ae6fa6a4770e380359679d0ffbb20bd61d65b85 100755 --- a/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_result.proto +++ b/trace_streamer/src/protos/types/plugins/memory_data/memory_plugin_result.proto @@ -41,6 +41,13 @@ message SmapsInfo { double reside = 8; uint64 dirty = 9; uint64 swapper = 10; + uint64 private_clean = 11; + uint64 private_dirty = 12; + uint64 shared_clean = 13; + uint64 shared_dirty = 14; + uint64 swap = 15; + uint64 swap_pss = 16; + string category = 17; }; message AppSummary { @@ -69,6 +76,67 @@ message ProcessMemoryInfo { // data from /proc/$pid/smaps repeated SmapsInfo smapinfo = 12; AppSummary memsummary = 13; + uint64 purg_sum_kb = 14; + uint64 purg_pin_kb = 15; + // data from hidumper + uint64 gl_pss_kb = 16; +} + +message AshmemInfo { + // data from /proc/purgeable_ashmem_trigger + string name = 1; + int32 pid = 2; + int32 adj = 3; + int32 fd = 4; + string ashmem_name = 5; + uint64 size = 6; // bytes + int32 id = 7; + uint64 time = 8; + uint64 ref_count = 9; + uint64 purged = 10; +} + +message DmaInfo { + // data from /proc/process_dmabuf_info + string name = 1; + int32 pid = 2; + int32 fd = 3; + uint64 size = 4; // bytes + int32 ino = 5; + int32 exp_pid = 6; + string exp_task_comm = 7; + string buf_name = 8; + string exp_name = 9; +} + +message GpuProcessInfo { + string addr = 1; + int32 pid = 2; + int32 tid = 3; + uint64 used_gpu_size = 4; // bytes +}; +message GpuMemoryInfo { + // data from /proc/gpu_memory + string gpu_name = 1; + uint64 all_gpu_size = 2; // bytes + repeated GpuProcessInfo gpu_process_info = 3; +} + +message GpuSubInfo { + string category_name = 1; + uint64 size = 2; // bytes + int32 entry_num = 3; +}; +message GpuDetailInfo { + string module_name = 1; + repeated GpuSubInfo gpu_sub_info = 2; +}; +message GpuDumpInfo { + // data from hidumper + string window_name = 1; + uint64 id = 2; + repeated GpuDetailInfo gpu_detail_info = 3; + uint64 gpu_purgeable_size = 4; // bytes } message MemoryData { @@ -76,4 +144,10 @@ message MemoryData { repeated SysMeminfo meminfo = 2; repeated SysVMeminfo vmeminfo = 3; uint64 zram = 4; + repeated AshmemInfo ashmeminfo = 5; + repeated DmaInfo dmainfo = 6; + repeated GpuMemoryInfo gpumemoryinfo = 7; + repeated GpuDumpInfo gpudumpinfo = 8; + uint64 gpu_limit_size = 9; // bytes + uint64 gpu_used_size = 10; // bytes } diff --git a/trace_streamer/src/rpc/rpc_server.cpp b/trace_streamer/src/rpc/rpc_server.cpp index 85dfb2a7b3ef785d0a74b84687b7bff32f961518..f73103de24264d7486f32524aef4586a123eaf0f 100644 --- a/trace_streamer/src/rpc/rpc_server.cpp +++ b/trace_streamer/src/rpc/rpc_server.cpp @@ -21,6 +21,7 @@ #if IS_WASM #include #endif +#include "json.hpp" #include "log.h" #include "string_help.h" #include "version.h" @@ -33,6 +34,20 @@ namespace SysTuning { namespace TraceStreamer { uint32_t g_fileLen = 0; FILE* g_importFileFd = nullptr; +using json = nlohmann::json; +namespace jsonns { +struct ParserConfig { + int32_t taskConfigValue; + int32_t appConfigValue; + int32_t aniConfigValue; +}; +void from_json(const json& j, ParserConfig& v) +{ + j.at("TaskPool").get_to(v.taskConfigValue); + j.at("AppStartup").get_to(v.appConfigValue); + j.at("AnimationAnalysis").get_to(v.aniConfigValue); +} +} // namespace jsonns bool RpcServer::ParseData(const uint8_t* data, size_t len, ResultCallBack resultCallBack) { g_loadSize += len; @@ -260,5 +275,15 @@ int32_t RpcServer::DownloadELFCallback(const std::string& fileName, return true; } #endif + +bool RpcServer::ParserConfig(std::string parserConfigJson) +{ + json jMessage = json::parse(parserConfigJson); + jsonns::ParserConfig parserConfig = jMessage.at("config"); + ts_->UpdateAppStartTraceStatus(parserConfig.appConfigValue); + ts_->UpdateAnimationTraceStatus(parserConfig.aniConfigValue); + ts_->UpdateTaskPoolTraceStatus(parserConfig.taskConfigValue); + return true; +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/rpc/rpc_server.h b/trace_streamer/src/rpc/rpc_server.h index b6ef0c472765a692b9aca851bff01b6592eaf2d6..b523a0c49944e900d06217f4887279ac946a2a76 100644 --- a/trace_streamer/src/rpc/rpc_server.h +++ b/trace_streamer/src/rpc/rpc_server.h @@ -40,6 +40,7 @@ public: int32_t UpdateTraceTime(const uint8_t* data, int32_t len); int32_t TraceStreamer_Init_ThirdParty_Config(const uint8_t* data, int32_t len); int32_t WasmExportDatabase(ResultCallBack resultCallBack); + bool ParserConfig(std::string parserConfig); #ifdef IS_WASM int32_t DownloadELFCallback(const std::string& fileName, size_t totalLen, diff --git a/trace_streamer/src/rpc/wasm_func.cpp b/trace_streamer/src/rpc/wasm_func.cpp index dd825a422969cc993bce5ddc1a398093f6f81720..b9da66bdb3f1af5f818baf85becd429925ca5568 100644 --- a/trace_streamer/src/rpc/wasm_func.cpp +++ b/trace_streamer/src/rpc/wasm_func.cpp @@ -27,6 +27,9 @@ ReplyFunction g_reply; uint8_t* g_reqBuf; uint32_t g_reqBufferSize; +uint8_t* g_parserConfigBuf; +uint32_t g_parserConfigSize; + using SendDataCallBack = void (*)(const char* data, int32_t len, int32_t componentId); SendDataCallBack g_sendData = nullptr; uint8_t* g_sendDataBuf; @@ -57,6 +60,22 @@ EMSCRIPTEN_KEEPALIVE uint8_t* Initialize(ReplyFunction replyFunction, uint32_t r return g_reqBuf; } +EMSCRIPTEN_KEEPALIVE uint8_t* InitializeParseConfig(uint32_t reqBufferSize) +{ + g_parserConfigBuf = new uint8_t[reqBufferSize]; + g_parserConfigSize = reqBufferSize; + return g_parserConfigBuf; +} + +EMSCRIPTEN_KEEPALIVE int TraceStreamerParserConfigEx(int dataLen) +{ + std::string parserConfig(reinterpret_cast(g_parserConfigBuf), dataLen); + if (g_wasmTraceStreamer.ParserConfig(parserConfig)) { + return 0; + } + return -1; +} + EMSCRIPTEN_KEEPALIVE uint8_t* InitFileName(ParseELFFunction parseELFCallback, uint32_t reqBufferSize) { g_parseELFCallback = parseELFCallback; diff --git a/trace_streamer/src/table/base/BUILD.gn b/trace_streamer/src/table/base/BUILD.gn index 73e32cd5357a42abf481fb8c2eaf5477fe491027..d5a1fa69e8b52094a993a856346c15d95ca842d9 100644 --- a/trace_streamer/src/table/base/BUILD.gn +++ b/trace_streamer/src/table/base/BUILD.gn @@ -26,8 +26,8 @@ ohos_source_set("base_tables") { "data_type_table.h", "datasource_clockid_table.cpp", "datasource_clockid_table.h", - "device_info.cpp", - "device_info.h", + "device_info_table.cpp", + "device_info_table.h", "meta_table.cpp", "meta_table.h", "range_table.cpp", diff --git a/trace_streamer/src/table/base/device_info.cpp b/trace_streamer/src/table/base/device_info_table.cpp similarity index 98% rename from trace_streamer/src/table/base/device_info.cpp rename to trace_streamer/src/table/base/device_info_table.cpp index 983b93b80dce9ccfdd7d39b848e1fde2964442b9..77fbecc2512824f3cfdef8ecaa71199668de0043 100644 --- a/trace_streamer/src/table/base/device_info.cpp +++ b/trace_streamer/src/table/base/device_info_table.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "device_info.h" +#include "device_info_table.h" namespace SysTuning { namespace TraceStreamer { diff --git a/trace_streamer/src/table/base/device_info.h b/trace_streamer/src/table/base/device_info_table.h similarity index 100% rename from trace_streamer/src/table/base/device_info.h rename to trace_streamer/src/table/base/device_info_table.h diff --git a/trace_streamer/src/table/ftrace/task_pool_table.cpp b/trace_streamer/src/table/ftrace/task_pool_table.cpp index 2990bbf382b86b3941976c29580f177ab2f3af90..2d6d8c585136cfaf21a1b4f9292f3e336cbddade 100644 --- a/trace_streamer/src/table/ftrace/task_pool_table.cpp +++ b/trace_streamer/src/table/ftrace/task_pool_table.cpp @@ -28,7 +28,8 @@ enum Index { EXECUTE_ID, PRIORITY, EXECUTE_STATE, - RETURN_STATE + RETURN_STATE, + TIMEOUT_ROW }; TaskPoolTable::TaskPoolTable(const TraceDataCache* dataCache) : TableBase(dataCache) { @@ -43,6 +44,7 @@ TaskPoolTable::TaskPoolTable(const TraceDataCache* dataCache) : TableBase(dataCa tableColumn_.push_back(TableBase::ColumnInfo("priority", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("execute_state", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("return_state", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("timeout_row", "INTEGER")); tablePriKey_.push_back("id"); } @@ -88,9 +90,8 @@ int32_t TaskPoolTable::Cursor::Column(int32_t column) const break; case ALLOCATION_ITID: if (taskPoolObj_.AllocationItids()[CurrentRow()] != INVALID_INT32) { - sqlite3_result_int64( - context_, - static_cast(dataCache_->GetConstTaskPoolData().AllocationItids()[CurrentRow()])); + sqlite3_result_int64(context_, static_cast( + dataCache_->GetConstTaskPoolData().AllocationItids()[CurrentRow()])); } break; case EXECUTE_ITID: @@ -129,6 +130,12 @@ int32_t TaskPoolTable::Cursor::Column(int32_t column) const dataCache_->GetConstTaskPoolData().ReturnStates()[CurrentRow()])); } break; + case TIMEOUT_ROW: + if (taskPoolObj_.TimeoutRows()[CurrentRow()] != INVALID_INT32) { + sqlite3_result_int64(context_, static_cast( + dataCache_->GetConstTaskPoolData().TimeoutRows()[CurrentRow()])); + } + break; default: TS_LOGF("Unregistered column : %d", column); break; diff --git a/trace_streamer/src/table/js_memory/js_cpu_profiler_node_table.cpp b/trace_streamer/src/table/js_memory/js_cpu_profiler_node_table.cpp index e92c03b9205d7efb5c49be89543a9827cb128bd8..341a784deea655580aef0e57b808cc54b539aa1c 100644 --- a/trace_streamer/src/table/js_memory/js_cpu_profiler_node_table.cpp +++ b/trace_streamer/src/table/js_memory/js_cpu_profiler_node_table.cpp @@ -32,7 +32,7 @@ JsCpuProfilerNodeTable::JsCpuProfilerNodeTable(const TraceDataCache* dataCache) { tableColumn_.push_back(TableBase::ColumnInfo("function_id", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("function_index", "INTEGER")); - tableColumn_.push_back(TableBase::ColumnInfo("script_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("script_id", "TEXT")); tableColumn_.push_back(TableBase::ColumnInfo("url_index", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("line_number", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("column_number", "INTEGER")); diff --git a/trace_streamer/src/table/monitor/BUILD.gn b/trace_streamer/src/table/monitor/BUILD.gn index db680eb240b875356125bd15c9e71aadb16f80f4..635cb1be124e30665e02a8387a18e1a2a2f0c8c2 100644 --- a/trace_streamer/src/table/monitor/BUILD.gn +++ b/trace_streamer/src/table/monitor/BUILD.gn @@ -19,21 +19,17 @@ ohos_source_set("monitor_tables") { part_name = "${OHOS_PROFILER_PART_NAME}" sources = [ "cpu_usage_info_table.cpp", - "cpu_usage_info_table.h", "disk_io_table.cpp", - "disk_io_table.h", "hidump_table.cpp", - "hidump_table.h", "live_process_table.cpp", - "live_process_table.h", "log_table.cpp", - "log_table.h", + "memory_ashmem_table.cpp", + "memory_dma_table.cpp", + "memory_process_gpu_table.cpp", + "memory_window_gpu_table.cpp", "network_table.cpp", - "network_table.h", "paged_memory_sample_table.cpp", - "paged_memory_sample_table.h", "smaps_table.cpp", - "smaps_table.h", ] include_dirs = [ "../base", diff --git a/trace_streamer/src/table/monitor/memory_ashmem_table.cpp b/trace_streamer/src/table/monitor/memory_ashmem_table.cpp new file mode 100644 index 0000000000000000000000000000000000000000..736bd171c5cd86f0b21d3cf26cc13deae982aba0 --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_ashmem_table.cpp @@ -0,0 +1,117 @@ +/* + * 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. + */ + +#include "memory_ashmem_table.h" + +namespace SysTuning { +namespace TraceStreamer { +enum Index { + ID = 0, + TS, + IPID, + ADJ, + FD, + ASHMEM_NAME_ID, + SIZE, + PSS, + ASHMEM_ID, + TIME, + REF_COUNT, + PURGED, + FLAG, +}; +MemoryAshMemTable::MemoryAshMemTable(const TraceDataCache* dataCache) : TableBase(dataCache) +{ + tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ts", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ipid", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("adj", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("fd", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ashmem_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("size", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("pss", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ashmem_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("time", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ref_count", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("purged", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("flag", "INTEGER")); + tablePriKey_.push_back("id"); +} + +MemoryAshMemTable::~MemoryAshMemTable() {} + +std::unique_ptr MemoryAshMemTable::CreateCursor() +{ + return std::make_unique(dataCache_, this); +} + +MemoryAshMemTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase* table) + : TableBase::Cursor(dataCache, table, static_cast(dataCache->GetConstAshMemData().Size())), + AshMemDataObj_(dataCache->GetConstAshMemData()) +{ +} + +MemoryAshMemTable::Cursor::~Cursor() {} + +int32_t MemoryAshMemTable::Cursor::Column(int32_t column) const +{ + switch (column) { + case ID: + sqlite3_result_int64(context_, AshMemDataObj_.IdsData()[CurrentRow()]); + break; + case TS: + sqlite3_result_int64(context_, AshMemDataObj_.TimeStampData()[CurrentRow()]); + break; + case IPID: + sqlite3_result_int64(context_, AshMemDataObj_.Ipids()[CurrentRow()]); + break; + case ADJ: + sqlite3_result_int(context_, AshMemDataObj_.Adjs()[CurrentRow()]); + break; + case FD: + sqlite3_result_int(context_, AshMemDataObj_.Fds()[CurrentRow()]); + break; + case ASHMEM_NAME_ID: + sqlite3_result_int(context_, AshMemDataObj_.AshmemNameIds()[CurrentRow()]); + break; + case SIZE: + sqlite3_result_int64(context_, AshMemDataObj_.Sizes()[CurrentRow()]); + break; + case PSS: + sqlite3_result_int64(context_, AshMemDataObj_.Psss()[CurrentRow()]); + break; + case ASHMEM_ID: + sqlite3_result_int64(context_, AshMemDataObj_.AshmemIds()[CurrentRow()]); + break; + case TIME: + sqlite3_result_int64(context_, AshMemDataObj_.Times()[CurrentRow()]); + break; + case REF_COUNT: + sqlite3_result_int64(context_, AshMemDataObj_.RefCounts()[CurrentRow()]); + break; + case PURGED: + sqlite3_result_int64(context_, AshMemDataObj_.Purgeds()[CurrentRow()]); + break; + case FLAG: + sqlite3_result_int(context_, AshMemDataObj_.Flags()[CurrentRow()]); + break; + default: + TS_LOGF("Unregistered column : %d", column); + break; + } + return SQLITE_OK; +} +} // namespace TraceStreamer +} // namespace SysTuning diff --git a/trace_streamer/src/table/monitor/memory_ashmem_table.h b/trace_streamer/src/table/monitor/memory_ashmem_table.h new file mode 100644 index 0000000000000000000000000000000000000000..332ef843bb0b879999e3a9b0a4cc71fc256a913f --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_ashmem_table.h @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#ifndef MEMORY_ASHMEM_TABLE_H +#define MEMORY_ASHMEM_TABLE_H + +#include "table_base.h" +#include "trace_data_cache.h" + +namespace SysTuning { +namespace TraceStreamer { +class MemoryAshMemTable : public TableBase { +public: + explicit MemoryAshMemTable(const TraceDataCache* dataCache); + ~MemoryAshMemTable() override; + std::unique_ptr CreateCursor() override; + +private: + void EstimateFilterCost(FilterConstraints& fc, EstimatedIndexInfo& ei) override {} + + class Cursor : public TableBase::Cursor { + public: + explicit Cursor(const TraceDataCache* dataCache, TableBase* table); + ~Cursor() override; + int32_t Filter(const FilterConstraints& fc, sqlite3_value** argv) override + { + UNUSED(fc); + UNUSED(argv); + return 0; + } + + int32_t Column(int32_t column) const override; + + private: + const AshMemData& AshMemDataObj_; + }; +}; +} // namespace TraceStreamer +} // namespace SysTuning +#endif // MEMORY_ASHMEM_TABLE_H diff --git a/trace_streamer/src/table/monitor/memory_dma_table.cpp b/trace_streamer/src/table/monitor/memory_dma_table.cpp new file mode 100644 index 0000000000000000000000000000000000000000..fb292ab5122e0ae2abfc3f2ffc978e5f8a9dbbc5 --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_dma_table.cpp @@ -0,0 +1,107 @@ +/* + * 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. + */ + +#include "memory_dma_table.h" + +namespace SysTuning { +namespace TraceStreamer { +enum Index { + ID = 0, + TS, + IPID, + FD, + SIZE, + INO, + EXP_PID, + EXP_TASK_COMM, + BUF_NAME_ID, + EXP_NAME_ID, + FLAG, +}; +MemoryDmaTable::MemoryDmaTable(const TraceDataCache* dataCache) : TableBase(dataCache) +{ + tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ts", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ipid", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("fd", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("size", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ino", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("exp_pid", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("exp_task_comm_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("buf_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("exp_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("flag", "INTEGER")); + tablePriKey_.push_back("id"); +} + +MemoryDmaTable::~MemoryDmaTable() {} + +std::unique_ptr MemoryDmaTable::CreateCursor() +{ + return std::make_unique(dataCache_, this); +} + +MemoryDmaTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase* table) + : TableBase::Cursor(dataCache, table, static_cast(dataCache->GetConstDmaMemData().Size())), + DmaMemDataObj_(dataCache->GetConstDmaMemData()) +{ +} + +MemoryDmaTable::Cursor::~Cursor() {} + +int32_t MemoryDmaTable::Cursor::Column(int32_t column) const +{ + switch (column) { + case ID: + sqlite3_result_int64(context_, DmaMemDataObj_.IdsData()[CurrentRow()]); + break; + case TS: + sqlite3_result_int64(context_, DmaMemDataObj_.TimeStampData()[CurrentRow()]); + break; + case IPID: + sqlite3_result_int64(context_, DmaMemDataObj_.Ipids()[CurrentRow()]); + break; + case FD: + sqlite3_result_int(context_, DmaMemDataObj_.Fds()[CurrentRow()]); + break; + case SIZE: + sqlite3_result_int64(context_, DmaMemDataObj_.Sizes()[CurrentRow()]); + break; + case INO: + sqlite3_result_int(context_, DmaMemDataObj_.Inos()[CurrentRow()]); + break; + case EXP_PID: + sqlite3_result_int(context_, DmaMemDataObj_.ExpPids()[CurrentRow()]); + break; + case EXP_TASK_COMM: + sqlite3_result_int64(context_, DmaMemDataObj_.ExpTaskCommIds()[CurrentRow()]); + break; + case BUF_NAME_ID: + sqlite3_result_int64(context_, DmaMemDataObj_.BufNameIds()[CurrentRow()]); + break; + case EXP_NAME_ID: + sqlite3_result_int64(context_, DmaMemDataObj_.ExpNameIds()[CurrentRow()]); + break; + case FLAG: + sqlite3_result_int(context_, DmaMemDataObj_.Flags()[CurrentRow()]); + break; + default: + TS_LOGF("Unregistered column : %d", column); + break; + } + return SQLITE_OK; +} +} // namespace TraceStreamer +} // namespace SysTuning diff --git a/trace_streamer/src/table/monitor/memory_dma_table.h b/trace_streamer/src/table/monitor/memory_dma_table.h new file mode 100644 index 0000000000000000000000000000000000000000..130e14d85c7b33953648aa7743c1052e740425f4 --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_dma_table.h @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#ifndef MEMORY_DMA_TABLE_H +#define MEMORY_DMA_TABLE_H + +#include "table_base.h" +#include "trace_data_cache.h" + +namespace SysTuning { +namespace TraceStreamer { +class MemoryDmaTable : public TableBase { +public: + explicit MemoryDmaTable(const TraceDataCache* dataCache); + ~MemoryDmaTable() override; + std::unique_ptr CreateCursor() override; + +private: + void EstimateFilterCost(FilterConstraints& fc, EstimatedIndexInfo& ei) override {} + + class Cursor : public TableBase::Cursor { + public: + explicit Cursor(const TraceDataCache* dataCache, TableBase* table); + ~Cursor() override; + int32_t Filter(const FilterConstraints& fc, sqlite3_value** argv) override + { + UNUSED(fc); + UNUSED(argv); + return 0; + } + + int32_t Column(int32_t column) const override; + + private: + const DmaMemData& DmaMemDataObj_; + }; +}; +} // namespace TraceStreamer +} // namespace SysTuning +#endif // MEMORY_DMA_TABLE_H diff --git a/trace_streamer/src/table/monitor/memory_process_gpu_table.cpp b/trace_streamer/src/table/monitor/memory_process_gpu_table.cpp new file mode 100644 index 0000000000000000000000000000000000000000..039d2f2b163d5079d509860dfe59f7f6a579376f --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_process_gpu_table.cpp @@ -0,0 +1,93 @@ +/* + * 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. + */ + +#include "memory_process_gpu_table.h" + +namespace SysTuning { +namespace TraceStreamer { +enum Index { + ID = 0, + TS, + GPU_NAME_ID, + ALL_GPU_SIZE, + ADDR, + IPID, + ITID, + USED_GPU_SIZE, +}; +MemoryProcessGpuTable::MemoryProcessGpuTable(const TraceDataCache* dataCache) : TableBase(dataCache) +{ + tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ts", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("gpu_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("all_gpu_size", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("addr", "TEXT")); + tableColumn_.push_back(TableBase::ColumnInfo("ipid", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("itid", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("used_gpu_size", "INTEGER")); + tablePriKey_.push_back("id"); +} + +MemoryProcessGpuTable::~MemoryProcessGpuTable() {} + +std::unique_ptr MemoryProcessGpuTable::CreateCursor() +{ + return std::make_unique(dataCache_, this); +} + +MemoryProcessGpuTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase* table) + : TableBase::Cursor(dataCache, table, static_cast(dataCache->GetConstGpuProcessMemData().Size())), + GpuProcessMemDataObj_(dataCache->GetConstGpuProcessMemData()) +{ +} + +MemoryProcessGpuTable::Cursor::~Cursor() {} + +int32_t MemoryProcessGpuTable::Cursor::Column(int32_t column) const +{ + switch (column) { + case ID: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.IdsData()[CurrentRow()]); + break; + case TS: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.TimeStampData()[CurrentRow()]); + break; + case GPU_NAME_ID: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.GpuNameIds()[CurrentRow()]); + break; + case ALL_GPU_SIZE: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.AllGpuSizes()[CurrentRow()]); + break; + case ADDR: + sqlite3_result_text(context_, GpuProcessMemDataObj_.Addrs()[CurrentRow()].c_str(), STR_DEFAULT_LEN, + nullptr); + break; + case IPID: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.Ipids()[CurrentRow()]); + break; + case ITID: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.Itids()[CurrentRow()]); + break; + case USED_GPU_SIZE: + sqlite3_result_int64(context_, GpuProcessMemDataObj_.UsedGpuSizes()[CurrentRow()]); + break; + default: + TS_LOGF("Unregistered column : %d", column); + break; + } + return SQLITE_OK; +} +} // namespace TraceStreamer +} // namespace SysTuning diff --git a/trace_streamer/src/table/monitor/memory_process_gpu_table.h b/trace_streamer/src/table/monitor/memory_process_gpu_table.h new file mode 100644 index 0000000000000000000000000000000000000000..1787ad8f13b6c36b18dd86ec2b6ed75b4c20122e --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_process_gpu_table.h @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#ifndef MEMORY_PROCESS_GPU_TABLE_H +#define MEMORY_PROCESS_GPU_TABLE_H + +#include "table_base.h" +#include "trace_data_cache.h" + +namespace SysTuning { +namespace TraceStreamer { +class MemoryProcessGpuTable : public TableBase { +public: + explicit MemoryProcessGpuTable(const TraceDataCache* dataCache); + ~MemoryProcessGpuTable() override; + std::unique_ptr CreateCursor() override; + +private: + void EstimateFilterCost(FilterConstraints& fc, EstimatedIndexInfo& ei) override {} + + class Cursor : public TableBase::Cursor { + public: + explicit Cursor(const TraceDataCache* dataCache, TableBase* table); + ~Cursor() override; + int32_t Filter(const FilterConstraints& fc, sqlite3_value** argv) override + { + UNUSED(fc); + UNUSED(argv); + return 0; + } + + int32_t Column(int32_t column) const override; + + private: + const GpuProcessMemData& GpuProcessMemDataObj_; + }; +}; +} // namespace TraceStreamer +} // namespace SysTuning +#endif // MEMORY_PROCESS_GPU_TABLE_H diff --git a/trace_streamer/src/table/monitor/memory_window_gpu_table.cpp b/trace_streamer/src/table/monitor/memory_window_gpu_table.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3cf6ff27401237988145c459895dfc8901ea9047 --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_window_gpu_table.cpp @@ -0,0 +1,87 @@ +/* + * 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. + */ + +#include "memory_window_gpu_table.h" + +namespace SysTuning { +namespace TraceStreamer { +enum Index { ID = 0, TS, WINDOW_NAME_ID, WINDOW_ID, MODULE_NAME_ID, CATEGORY_NAME_ID, SIZE, COUNT, PURGEABLE_SIZE }; +MemoryWindowGpuTable::MemoryWindowGpuTable(const TraceDataCache* dataCache) : TableBase(dataCache) +{ + tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("ts", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("window_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("window_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("module_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("category_name_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("size", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("count", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("purgeable_size", "INTEGER")); + tablePriKey_.push_back("id"); +} + +MemoryWindowGpuTable::~MemoryWindowGpuTable() {} + +std::unique_ptr MemoryWindowGpuTable::CreateCursor() +{ + return std::make_unique(dataCache_, this); +} + +MemoryWindowGpuTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase* table) + : TableBase::Cursor(dataCache, table, static_cast(dataCache->GetConstGpuWindowMemData().Size())), + GpuWindowMemDataObj_(dataCache->GetConstGpuWindowMemData()) +{ +} + +MemoryWindowGpuTable::Cursor::~Cursor() {} + +int32_t MemoryWindowGpuTable::Cursor::Column(int32_t column) const +{ + switch (column) { + case ID: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.IdsData()[CurrentRow()]); + break; + case TS: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.TimeStampData()[CurrentRow()]); + break; + case WINDOW_NAME_ID: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.WindowNameIds()[CurrentRow()]); + break; + case WINDOW_ID: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.WindowIds()[CurrentRow()]); + break; + case MODULE_NAME_ID: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.ModuleNameIds()[CurrentRow()]); + break; + case CATEGORY_NAME_ID: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.CategoryNameIds()[CurrentRow()]); + break; + case SIZE: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.Sizes()[CurrentRow()]); + break; + case COUNT: + sqlite3_result_int(context_, GpuWindowMemDataObj_.Counts()[CurrentRow()]); + break; + case PURGEABLE_SIZE: + sqlite3_result_int64(context_, GpuWindowMemDataObj_.PurgeableSizes()[CurrentRow()]); + break; + default: + TS_LOGF("Unregistered column : %d", column); + break; + } + return SQLITE_OK; +} +} // namespace TraceStreamer +} // namespace SysTuning diff --git a/trace_streamer/src/table/monitor/memory_window_gpu_table.h b/trace_streamer/src/table/monitor/memory_window_gpu_table.h new file mode 100644 index 0000000000000000000000000000000000000000..5dfcb7f5e7d9dca7bc85dcd6f118b852da9eee7f --- /dev/null +++ b/trace_streamer/src/table/monitor/memory_window_gpu_table.h @@ -0,0 +1,52 @@ +/* + * 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. + */ + +#ifndef MEMORY_WINDOW_GPU_TABLE_H +#define MEMORY_WINDOW_GPU_TABLE_H + +#include "table_base.h" +#include "trace_data_cache.h" + +namespace SysTuning { +namespace TraceStreamer { +class MemoryWindowGpuTable : public TableBase { +public: + explicit MemoryWindowGpuTable(const TraceDataCache* dataCache); + ~MemoryWindowGpuTable() override; + std::unique_ptr CreateCursor() override; + +private: + void EstimateFilterCost(FilterConstraints& fc, EstimatedIndexInfo& ei) override {} + + class Cursor : public TableBase::Cursor { + public: + explicit Cursor(const TraceDataCache* dataCache, TableBase* table); + ~Cursor() override; + int32_t Filter(const FilterConstraints& fc, sqlite3_value** argv) override + { + UNUSED(fc); + UNUSED(argv); + return 0; + } + + int32_t Column(int32_t column) const override; + + private: + const GpuWindowMemData& GpuWindowMemDataObj_; + }; +}; +} // namespace TraceStreamer +} // namespace SysTuning +#endif // MEMORY_WINDOW_GPU_TABLE_H diff --git a/trace_streamer/src/table/monitor/smaps_table.cpp b/trace_streamer/src/table/monitor/smaps_table.cpp index e67023f5f6c1aafab31e6d8b78cf7448ac80382b..4cb644224272d98b342c8064cb3da40a55e4b907 100644 --- a/trace_streamer/src/table/monitor/smaps_table.cpp +++ b/trace_streamer/src/table/monitor/smaps_table.cpp @@ -17,7 +17,27 @@ namespace SysTuning { namespace TraceStreamer { -enum Index { ID = 0, TIME_STAMP, START_ADDRESS, END_ADDRESS, DIRTY, SWAPPER, RSS, PSS, SIZE, RESIDE, PROTECTION, PATH }; +enum Index { + ID = 0, + TIME_STAMP, + START_ADDRESS, + END_ADDRESS, + DIRTY, + SWAPPER, + RSS, + PSS, + SIZE, + RESIDE, + PROTECTION, + PATH, + SHARED_CLEAN, + SHARED_DIRTY, + PRIVATE_CLEAN, + PRIVATE_DIRTY, + SWAP, + SWAP_PSS, + TYPE +}; SmapsTable::SmapsTable(const TraceDataCache* dataCache) : TableBase(dataCache) { tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER")); @@ -32,6 +52,13 @@ SmapsTable::SmapsTable(const TraceDataCache* dataCache) : TableBase(dataCache) tableColumn_.push_back(TableBase::ColumnInfo("reside", "REAL")); tableColumn_.push_back(TableBase::ColumnInfo("protection_id", "INTEGER")); tableColumn_.push_back(TableBase::ColumnInfo("path_id", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("shared_clean", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("shared_dirty", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("private_clean", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("private_dirty", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("swap", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("swap_pss", "INTEGER")); + tableColumn_.push_back(TableBase::ColumnInfo("type", "INTEGER")); tablePriKey_.push_back("id"); } @@ -89,6 +116,27 @@ int32_t SmapsTable::Cursor::Column(int32_t col) const case PATH: sqlite3_result_int64(context_, smapsObj_.PathIds()[CurrentRow()]); break; + case SHARED_CLEAN: + sqlite3_result_int64(context_, smapsObj_.SharedClean()[CurrentRow()]); + break; + case SHARED_DIRTY: + sqlite3_result_int64(context_, smapsObj_.SharedDirty()[CurrentRow()]); + break; + case PRIVATE_CLEAN: + sqlite3_result_int64(context_, smapsObj_.PrivateClean()[CurrentRow()]); + break; + case PRIVATE_DIRTY: + sqlite3_result_int64(context_, smapsObj_.PrivateDirty()[CurrentRow()]); + break; + case SWAP: + sqlite3_result_int64(context_, smapsObj_.Swap()[CurrentRow()]); + break; + case SWAP_PSS: + sqlite3_result_int64(context_, smapsObj_.SwapPss()[CurrentRow()]); + break; + case TYPE: + sqlite3_result_int64(context_, smapsObj_.Type()[CurrentRow()]); + break; default: TS_LOGF("Unregistered column : %d", col); break; diff --git a/trace_streamer/src/trace_data/trace_data_cache.cpp b/trace_streamer/src/trace_data/trace_data_cache.cpp index 23023fba6a8b484a2bee3e29ef0bdcc10be7a2ea..90fbcb26de207e8719bc0fcbe296978590f91d29 100644 --- a/trace_streamer/src/trace_data/trace_data_cache.cpp +++ b/trace_streamer/src/trace_data/trace_data_cache.cpp @@ -28,7 +28,7 @@ #include "data_dict_table.h" #include "data_type_table.h" #include "datasource_clockid_table.h" -#include "device_info.h" +#include "device_info_table.h" #include "device_state_table.h" #include "disk_io_table.h" #include "dynamic_frame_table.h" @@ -95,6 +95,10 @@ #include "thread_state_table.h" #include "thread_table.h" #include "trace_config_table.h" +#include "memory_ashmem_table.h" +#include "memory_dma_table.h" +#include "memory_process_gpu_table.h" +#include "memory_window_gpu_table.h" namespace SysTuning { namespace TraceStreamer { @@ -191,6 +195,10 @@ void TraceDataCache::InitDB() TableBase::TableDeclare(*db_, this, "gpu_slice"); TableBase::TableDeclare(*db_, this, "app_startup"); TableBase::TableDeclare(*db_, this, "static_initalize"); + TableBase::TableDeclare(*db_, this, "memory_ashmem"); + TableBase::TableDeclare(*db_, this, "memory_dma"); + TableBase::TableDeclare(*db_, this, "memory_process_gpu"); + TableBase::TableDeclare(*db_, this, "memory_window_gpu"); TableBase::TableDeclare(*db_, this, "perf_report"); TableBase::TableDeclare(*db_, this, "perf_sample"); @@ -268,6 +276,10 @@ void TraceDataCache::InitDB() TableBase::TableDeclare(*db_, this, "_gpu_slice"); TableBase::TableDeclare(*db_, this, "_app_startup"); TableBase::TableDeclare(*db_, this, "_static_initalize"); + TableBase::TableDeclare(*db_, this, "_memory_ashmem"); + TableBase::TableDeclare(*db_, this, "_memory_dma"); + TableBase::TableDeclare(*db_, this, "_memory_process_gpu"); + TableBase::TableDeclare(*db_, this, "_memory_window_gpu"); #if WITH_EBPF_HELP TableBase::TableDeclare(*db_, this, "_ebpf_process_maps"); TableBase::TableDeclare(*db_, this, "_ebpf_elf"); @@ -293,5 +305,21 @@ void TraceDataCache::UpdateAnimationTraceStatus(bool status) { animationTraceEnabled_ = status; } +bool TraceDataCache::TaskPoolTraceEnabled() +{ + return taskPoolTraceEnabled_; +} +void TraceDataCache::UpdateTaskPoolTraceStatus(bool status) +{ + taskPoolTraceEnabled_ = status; +} +bool TraceDataCache::AppStartTraceEnabled() +{ + return appStartTraceEnabled_; +} +void TraceDataCache::UpdateAppStartTraceStatus(bool status) +{ + appStartTraceEnabled_ = status; +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_data_cache.h b/trace_streamer/src/trace_data/trace_data_cache.h index efdaea23d0ec9995e4f4da504603421c2a6ee0ef..3311a02cfaf8bcfbaf135e239b7591cf45e71cae 100644 --- a/trace_streamer/src/trace_data/trace_data_cache.h +++ b/trace_streamer/src/trace_data/trace_data_cache.h @@ -33,11 +33,17 @@ public: bool AnimationTraceEnabled(); void UpdateAnimationTraceStatus(bool status); + bool TaskPoolTraceEnabled(); + void UpdateTaskPoolTraceStatus(bool status); + bool AppStartTraceEnabled(); + void UpdateAppStartTraceStatus(bool status); private: void InitDB() override; bool dbInited_ = false; - bool animationTraceEnabled_ = true; + bool animationTraceEnabled_ = false; + bool taskPoolTraceEnabled_ = false; + bool appStartTraceEnabled_ = false; }; } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_data_cache_base.h b/trace_streamer/src/trace_data/trace_data_cache_base.h index 03b5f50a36d844bf6ec6d12be854d3c22ed3b94e..bbb05dd64c8abaf87d1739a52b40356adbbc92d5 100644 --- a/trace_streamer/src/trace_data/trace_data_cache_base.h +++ b/trace_streamer/src/trace_data/trace_data_cache_base.h @@ -170,6 +170,10 @@ public: Animation animation_; DeviceInfo deviceInfo_; DynamicFrame dynamicFrame_; + AshMemData ashMemData_; + DmaMemData dmaMemData_; + GpuProcessMemData gpuProcessMemData_; + GpuWindowMemData gpuWindowMemData_; }; } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_data_cache_reader.cpp b/trace_streamer/src/trace_data/trace_data_cache_reader.cpp index 59e7860cb31b6feaa5e8ba49d3dd302d318f7aee..a1795eb4a71ca8ecc899d88451c7dab401f065af 100644 --- a/trace_streamer/src/trace_data/trace_data_cache_reader.cpp +++ b/trace_streamer/src/trace_data/trace_data_cache_reader.cpp @@ -363,5 +363,21 @@ const DynamicFrame& TraceDataCacheReader::GetConstDynamicFrame() const { return dynamicFrame_; } +const AshMemData& TraceDataCacheReader::GetConstAshMemData() const +{ + return ashMemData_; +} +const DmaMemData& TraceDataCacheReader::GetConstDmaMemData() const +{ + return dmaMemData_; +} +const GpuProcessMemData& TraceDataCacheReader::GetConstGpuProcessMemData() const +{ + return gpuProcessMemData_; +} +const GpuWindowMemData& TraceDataCacheReader::GetConstGpuWindowMemData() const +{ + return gpuWindowMemData_; +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_data_cache_reader.h b/trace_streamer/src/trace_data/trace_data_cache_reader.h index 53559550eb51d2557ad3f219ea0a387307417a37..bfe2c349a51e4930a775033ca2c8456603ce28c2 100644 --- a/trace_streamer/src/trace_data/trace_data_cache_reader.h +++ b/trace_streamer/src/trace_data/trace_data_cache_reader.h @@ -114,6 +114,10 @@ public: const Animation& GetConstAnimation() const; const DeviceInfo& GetConstDeviceInfo() const; const DynamicFrame& GetConstDynamicFrame() const; + const AshMemData& GetConstAshMemData() const; + const DmaMemData& GetConstDmaMemData() const; + const GpuProcessMemData& GetConstGpuProcessMemData() const; + const GpuWindowMemData& GetConstGpuWindowMemData() const; }; } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_data_cache_writer.cpp b/trace_streamer/src/trace_data/trace_data_cache_writer.cpp index dfd67a1332d44d34fca29aea1f92459376f4f2dc..48984455817f3de4877e52239f4af9459e1f41d7 100644 --- a/trace_streamer/src/trace_data/trace_data_cache_writer.cpp +++ b/trace_streamer/src/trace_data/trace_data_cache_writer.cpp @@ -406,6 +406,23 @@ DynamicFrame* TraceDataCacheWriter::GetDynamicFrame() { return &dynamicFrame_; } +AshMemData* TraceDataCacheWriter::GetAshMemData() +{ + return &ashMemData_; +} +DmaMemData* TraceDataCacheWriter::GetDmaMemData() +{ + return &dmaMemData_; +} +GpuProcessMemData* TraceDataCacheWriter::GetGpuProcessMemData() +{ + return &gpuProcessMemData_; +} +GpuWindowMemData* TraceDataCacheWriter::GetGpuWindowMemData() +{ + return &gpuWindowMemData_; +} + void TraceDataCacheWriter::Clear() { rawData_.Clear(); @@ -483,6 +500,10 @@ void TraceDataCacheWriter::Clear() smapsData_.Clear(); bioLatencySampleData_.Clear(); taskPoolInfo_.Clear(); + ashMemData_.Clear(); + dmaMemData_.Clear(); + gpuProcessMemData_.Clear(); + gpuWindowMemData_.Clear(); } } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_data_cache_writer.h b/trace_streamer/src/trace_data/trace_data_cache_writer.h index 994aaa23d9c43d5bd011d8ad2850bc4d1162b779..e37bede4b5a802b54419b27dcfe5efdc89e4230a 100644 --- a/trace_streamer/src/trace_data/trace_data_cache_writer.h +++ b/trace_streamer/src/trace_data/trace_data_cache_writer.h @@ -113,6 +113,10 @@ public: Animation* GetAnimation(); DeviceInfo* GetDeviceInfo(); DynamicFrame* GetDynamicFrame(); + AshMemData* GetAshMemData(); + DmaMemData* GetDmaMemData(); + GpuProcessMemData* GetGpuProcessMemData(); + GpuWindowMemData* GetGpuWindowMemData(); }; } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_stdtype.cpp b/trace_streamer/src/trace_data/trace_stdtype.cpp index 7e352860a23bd690a9c52585ba5a5689e67333ea..48ca785eb6b3aa9da7f5835d08c8cbf665eae558 100644 --- a/trace_streamer/src/trace_data/trace_stdtype.cpp +++ b/trace_streamer/src/trace_data/trace_stdtype.cpp @@ -1965,6 +1965,7 @@ const std::deque& TraceConfigData::Value() const return value_; } void SmapsData::AppendNewData(uint64_t timeStamp, + uint64_t ipid, std::string startAddr, std::string endAddr, uint64_t dirty, @@ -1974,9 +1975,17 @@ void SmapsData::AppendNewData(uint64_t timeStamp, uint64_t size, double reside, DataIndex protectionId, - DataIndex pathId) + DataIndex pathId, + uint64_t shared_clean, + uint64_t shared_dirty, + uint64_t private_clean, + uint64_t private_dirty, + uint64_t swap, + uint64_t swap_pss, + uint32_t type) { timeStamps_.emplace_back(timeStamp); + ipids_.emplace_back(ipid); startAddrs_.emplace_back(startAddr); endAddrs_.emplace_back(endAddr); dirtys_.emplace_back(dirty); @@ -1987,6 +1996,13 @@ void SmapsData::AppendNewData(uint64_t timeStamp, resides_.emplace_back(reside); protectionIds_.emplace_back(protectionId); pathIds_.emplace_back(pathId); + sharedClean_.emplace_back(shared_clean); + sharedDirty_.emplace_back(shared_dirty); + privateClean_.emplace_back(private_clean); + privateDirty_.emplace_back(private_dirty); + swap_.emplace_back(swap); + swapPss_.emplace_back(swap_pss); + type_.emplace_back(type); ids_.push_back(rowCount_); rowCount_++; } @@ -1994,6 +2010,10 @@ const std::deque& SmapsData::TimeStamps() const { return timeStamps_; } +const std::deque& SmapsData::Ipids() const +{ + return ipids_; +} const std::deque& SmapsData::StartAddrs() const { return startAddrs_; @@ -2034,6 +2054,34 @@ const std::deque& SmapsData::PathIds() const { return pathIds_; } +const std::deque& SmapsData::SharedClean() const +{ + return sharedClean_; +} +const std::deque& SmapsData::SharedDirty() const +{ + return sharedDirty_; +} +const std::deque& SmapsData::PrivateClean() const +{ + return privateClean_; +} +const std::deque& SmapsData::PrivateDirty() const +{ + return privateDirty_; +} +const std::deque& SmapsData::Swap() const +{ + return swap_; +} +const std::deque& SmapsData::SwapPss() const +{ + return swapPss_; +} +const std::deque& SmapsData::Type() const +{ + return type_; +} void BioLatencySampleData::AppendNewData(uint32_t callChainId, uint64_t type, uint32_t ipid, @@ -2764,7 +2812,7 @@ size_t JsCpuProfilerNode::AppendNewData(uint32_t functionId, uint32_t columnNumber, uint32_t hitCount, std::string children, - uint32_t parentId) + uint32_t parent) { functionIds_.emplace_back(functionId); functionNames_.emplace_back(functionName); @@ -2774,7 +2822,7 @@ size_t JsCpuProfilerNode::AppendNewData(uint32_t functionId, columnNumbers_.emplace_back(columnNumber); hitCounts_.emplace_back(hitCount); children_.emplace_back(children); - parents_.emplace_back(parentId); + parents_.emplace_back(parent); ids_.emplace_back(Size()); return Size() - 1; } @@ -2905,6 +2953,7 @@ size_t TaskPoolInfo::AppendAllocationTaskData(uint32_t allocationTaskRow, prioritys_.emplace_back(priority); executeStates_.emplace_back(executeState); returnStates_.emplace_back(INVALID_INT32); + timeoutRows_.emplace_back(INVALID_INT32); ids_.emplace_back(Size()); return Size() - 1; } @@ -2920,6 +2969,7 @@ size_t TaskPoolInfo::AppendExecuteTaskData(uint32_t executeTaskRow, uint32_t exe prioritys_.emplace_back(INVALID_INT32); executeStates_.emplace_back(INVALID_INT32); returnStates_.emplace_back(INVALID_INT32); + timeoutRows_.emplace_back(INVALID_INT32); ids_.emplace_back(Size()); return Size() - 1; } @@ -2938,6 +2988,7 @@ size_t TaskPoolInfo::AppendReturnTaskData(uint32_t returnTaskRow, prioritys_.emplace_back(INVALID_INT32); executeStates_.emplace_back(INVALID_INT32); returnStates_.emplace_back(returnState); + timeoutRows_.emplace_back(INVALID_INT32); ids_.emplace_back(Size()); return Size() - 1; } @@ -2981,13 +3032,17 @@ const std::deque& TaskPoolInfo::ReturnStates() const { return returnStates_; } +const std::deque& TaskPoolInfo::TimeoutRows() const +{ + return timeoutRows_; +} void TaskPoolInfo::UpdateAllocationTaskData(uint32_t index, uint32_t allocationTaskRow, uint32_t allocationItid, uint32_t priority, uint32_t executeState) { - if (index < Size()) { + if (index <= Size()) { allocationTaskRows_[index] = allocationTaskRow; allocationItids_[index] = allocationItid; prioritys_[index] = priority; @@ -2996,7 +3051,7 @@ void TaskPoolInfo::UpdateAllocationTaskData(uint32_t index, } void TaskPoolInfo::UpdateExecuteTaskData(uint32_t index, uint32_t executeTaskRow, uint32_t executeItid) { - if (index < Size()) { + if (index <= Size()) { executeTaskRows_[index] = executeTaskRow; executeItids_[index] = executeItid; } @@ -3006,12 +3061,18 @@ void TaskPoolInfo::UpdateReturnTaskData(uint32_t index, uint32_t returnItid, uint32_t returnState) { - if (index < Size()) { + if (index <= Size()) { returnTaskRows_[index] = returnTaskRow; returnItids_[index] = returnItid; returnStates_[index] = returnState; } } +void TaskPoolInfo::AppendTimeoutRow(uint32_t index, uint32_t timeoutRow) +{ + if (index <= Size()) { + timeoutRows_[index] = timeoutRow; + } +} TableRowId Animation::AppendAnimation(InternalTime startPoint) { inputTimes_.emplace_back(INVALID_TIME); @@ -3171,5 +3232,240 @@ void DynamicFrame::Clear() endTimes_.clear(); ids_.clear(); } + +void AshMemData::AppendNewData(InternalPid ipid, + uint64_t ts, + uint32_t adj, + uint32_t fd, + DataIndex ashmemNameId, + uint64_t size, + uint64_t pss, + uint32_t ashmemId, + uint64_t time, + uint64_t refCount, + uint64_t purged, + uint32_t flag) +{ + ipids_.emplace_back(ipid); + timeStamps_.emplace_back(ts); + adjs_.emplace_back(adj); + fds_.emplace_back(fd); + ashmemNameIds_.emplace_back(ashmemNameId); + sizes_.emplace_back(size); + psss_.emplace_back(pss); + ashmemIds_.emplace_back(ashmemId); + times_.emplace_back(time); + refCounts_.emplace_back(refCount); + purgeds_.emplace_back(purged); + flags_.emplace_back(flag); + ids_.push_back(rowCount_); + rowCount_++; +} +void AshMemData::SetFlag(uint64_t rowId, uint32_t Flag) +{ + flags_[rowId] = Flag; +} +const std::deque& AshMemData::Ipids() const +{ + return ipids_; +} +const std::deque& AshMemData::Adjs() const +{ + return adjs_; +} +const std::deque& AshMemData::Fds() const +{ + return fds_; +} +const std::deque& AshMemData::AshmemNameIds() const +{ + return ashmemNameIds_; +} +const std::deque& AshMemData::Sizes() const +{ + return sizes_; +} +const std::deque& AshMemData::Psss() const +{ + return psss_; +} +const std::deque& AshMemData::AshmemIds() const +{ + return ashmemIds_; +} +const std::deque& AshMemData::Times() const +{ + return times_; +} +const std::deque& AshMemData::RefCounts() const +{ + return refCounts_; +} +const std::deque& AshMemData::Purgeds() const +{ + return purgeds_; +} +const std::deque& AshMemData::Flags() const +{ + return flags_; +} + +void DmaMemData::AppendNewData(InternalPid ipid, + uint64_t ts, + uint32_t fd, + uint64_t size, + uint32_t ino, + uint32_t expPid, + DataIndex expTaskCommId, + DataIndex bufNameId, + DataIndex expNameId, + uint32_t flag) +{ + ipids_.emplace_back(ipid); + timeStamps_.emplace_back(ts); + fds_.emplace_back(fd); + sizes_.emplace_back(size); + inos_.emplace_back(ino); + expPids_.emplace_back(expPid); + expTaskCommIds_.emplace_back(expTaskCommId); + bufNameIds_.emplace_back(bufNameId); + expNameIds_.emplace_back(expNameId); + flags_.emplace_back(flag); + ids_.push_back(rowCount_); + rowCount_++; +} +void DmaMemData::SetFlag(uint64_t rowId, uint32_t Flag) +{ + flags_[rowId] = Flag; +} +const std::deque& DmaMemData::Ipids() const +{ + return ipids_; +} +const std::deque& DmaMemData::Fds() const +{ + return fds_; +} +const std::deque& DmaMemData::Sizes() const +{ + return sizes_; +} +const std::deque& DmaMemData::Inos() const +{ + return inos_; +} +const std::deque& DmaMemData::ExpPids() const +{ + return expPids_; +} +const std::deque& DmaMemData::ExpTaskCommIds() const +{ + return expTaskCommIds_; +} +const std::deque& DmaMemData::BufNameIds() const +{ + return bufNameIds_; +} +const std::deque& DmaMemData::ExpNameIds() const +{ + return expNameIds_; +} +const std::deque& DmaMemData::Flags() const +{ + return flags_; +} + +void GpuProcessMemData::AppendNewData(uint64_t ts, + DataIndex gpuNameId, + uint64_t allGpuSize, + std::string addr, + InternalPid ipid, + InternalPid itid, + uint64_t usedGpuSize) +{ + timeStamps_.emplace_back(ts); + gpuNameIds_.emplace_back(gpuNameId); + allGpuSizes_.emplace_back(allGpuSize); + addrs_.emplace_back(addr); + ipids_.emplace_back(ipid); + itids_.emplace_back(itid); + usedGpuSizes_.emplace_back(usedGpuSize); + ids_.push_back(rowCount_); + rowCount_++; +} +const std::deque& GpuProcessMemData::GpuNameIds() const +{ + return gpuNameIds_; +} +const std::deque& GpuProcessMemData::AllGpuSizes() const +{ + return allGpuSizes_; +} +const std::deque& GpuProcessMemData::Addrs() const +{ + return addrs_; +} +const std::deque& GpuProcessMemData::Ipids() const +{ + return ipids_; +} +const std::deque& GpuProcessMemData::Itids() const +{ + return itids_; +} +const std::deque& GpuProcessMemData::UsedGpuSizes() const +{ + return usedGpuSizes_; +} + +void GpuWindowMemData::AppendNewData(uint64_t ts, + DataIndex windowNameId, + uint64_t windowId, + DataIndex moduleNameId, + DataIndex categoryNameId, + uint64_t size, + uint32_t count, + uint64_t purgeableSize) +{ + timeStamps_.emplace_back(ts); + windowNameIds_.emplace_back(windowNameId); + windowIds_.emplace_back(windowId); + moduleNameIds_.emplace_back(moduleNameId); + categoryNameIds_.emplace_back(categoryNameId); + sizes_.emplace_back(size); + counts_.emplace_back(count); + purgeableSizes_.emplace_back(purgeableSize); + ids_.push_back(rowCount_); + rowCount_++; +} +const std::deque& GpuWindowMemData::WindowNameIds() const +{ + return windowNameIds_; +} +const std::deque& GpuWindowMemData::WindowIds() const +{ + return windowIds_; +} +const std::deque& GpuWindowMemData::ModuleNameIds() const +{ + return moduleNameIds_; +} +const std::deque& GpuWindowMemData::CategoryNameIds() const +{ + return categoryNameIds_; +} +const std::deque& GpuWindowMemData::Sizes() const +{ + return sizes_; +} +const std::deque& GpuWindowMemData::Counts() const +{ + return counts_; +} +const std::deque& GpuWindowMemData::PurgeableSizes() const +{ + return purgeableSizes_; +} + } // namespace TraceStdtype } // namespace SysTuning diff --git a/trace_streamer/src/trace_data/trace_stdtype.h b/trace_streamer/src/trace_data/trace_stdtype.h index 1246eb446b3645a600dde83cc85e01e06f1503ad..9436bead32dfcb21f054979f6d9b8e2ee123a2b1 100644 --- a/trace_streamer/src/trace_data/trace_stdtype.h +++ b/trace_streamer/src/trace_data/trace_stdtype.h @@ -1708,6 +1708,7 @@ private: class SmapsData : public CacheBase { public: void AppendNewData(uint64_t timeStamp, + uint64_t ipid, std::string startAddr, std::string endAddr, uint64_t dirty, @@ -1717,9 +1718,17 @@ public: uint64_t size, double reside, DataIndex protectionId, - DataIndex pathId); + DataIndex pathId, + uint64_t shared_clean, + uint64_t shared_dirty, + uint64_t private_clean, + uint64_t private_dirty, + uint64_t swap, + uint64_t swap_pss, + uint32_t type); const std::deque& Id() const; const std::deque& TimeStamps() const; + const std::deque& Ipids() const; const std::deque& StartAddrs() const; const std::deque& EndAddrs() const; const std::deque& Dirtys() const; @@ -1730,9 +1739,17 @@ public: const std::deque& Resides() const; const std::deque& ProtectionIds() const; const std::deque& PathIds() const; + const std::deque& SharedClean() const; + const std::deque& SharedDirty() const; + const std::deque& PrivateClean() const; + const std::deque& PrivateDirty() const; + const std::deque& Swap() const; + const std::deque& SwapPss() const; + const std::deque& Type() const; void Clear() override { CacheBase::Clear(); + ipids_.clear(); startAddrs_.clear(); endAddrs_.clear(); dirtys_.clear(); @@ -1743,9 +1760,17 @@ public: resides_.clear(); protectionIds_.clear(); pathIds_.clear(); + sharedClean_.clear(); + sharedDirty_.clear(); + privateClean_.clear(); + privateDirty_.clear(); + swap_.clear(); + swapPss_.clear(); + type_.clear(); } private: + std::deque ipids_ = {}; std::deque startAddrs_ = {}; std::deque endAddrs_ = {}; std::deque dirtys_ = {}; @@ -1756,6 +1781,13 @@ private: std::deque resides_ = {}; std::deque protectionIds_ = {}; std::deque pathIds_ = {}; + std::deque sharedClean_ = {}; + std::deque sharedDirty_ = {}; + std::deque privateClean_ = {}; + std::deque privateDirty_ = {}; + std::deque swap_ = {}; + std::deque swapPss_ = {}; + std::deque type_ = {}; uint32_t rowCount_ = 0; }; class BioLatencySampleData : public CacheBase { @@ -2385,7 +2417,7 @@ private: class JsCpuProfilerSample : public CacheBase { public: - size_t AppendNewData(uint32_t functionId, uint64_t startTimes, uint64_t endTimes, uint64_t durs); + size_t AppendNewData(uint32_t functionId, uint64_t startTime, uint64_t endTime, uint64_t dur); const std::deque& FunctionIds() const; const std::deque& StartTimes() const; const std::deque& EndTimes() const; @@ -2426,10 +2458,7 @@ public: uint32_t priority, uint32_t executeState); size_t AppendExecuteTaskData(uint32_t executeTaskRow, uint32_t executeItid, uint32_t executeId); - size_t AppendReturnTaskData(uint32_t returnTaskRow, - uint32_t returnItid, - uint32_t executeId, - uint32_t returnState); + size_t AppendReturnTaskData(uint32_t returnTaskRow, uint32_t returnItid, uint32_t executeId, uint32_t returnState); void UpdateAllocationTaskData(uint32_t index, uint32_t allocationTaskRow, uint32_t allocationItid, @@ -2437,6 +2466,7 @@ public: uint32_t executeState); void UpdateExecuteTaskData(uint32_t index, uint32_t executeTaskRow, uint32_t executeItid); void UpdateReturnTaskData(uint32_t index, uint32_t returnTaskRow, uint32_t returnItid, uint32_t returnState); + void AppendTimeoutRow(uint32_t index, uint32_t timeoutRow); const std::deque& AllocationTaskRows() const; const std::deque& ExecuteTaskRows() const; @@ -2448,6 +2478,7 @@ public: const std::deque& Prioritys() const; const std::deque& ExecuteStates() const; const std::deque& ReturnStates() const; + const std::deque& TimeoutRows() const; void Clear() override { TaskPoolInfo::Clear(); @@ -2461,6 +2492,7 @@ public: prioritys_.clear(); executeStates_.clear(); returnStates_.clear(); + timeoutRows_.clear(); } private: @@ -2474,6 +2506,7 @@ private: std::deque prioritys_ = {}; std::deque executeStates_ = {}; std::deque returnStates_ = {}; + std::deque timeoutRows_ = {}; }; class Animation { public: @@ -2536,6 +2569,189 @@ private: std::deque endTimes_ = {}; std::deque ids_ = {}; }; + +class AshMemData : public CacheBase { +public: + void AppendNewData(InternalPid ipid, + uint64_t ts, + uint32_t adj, + uint32_t fd, + DataIndex ashmemNameId, + uint64_t size, + uint64_t pss, + uint32_t ashmemId, + uint64_t time, + uint64_t refCount, + uint64_t purged, + uint32_t flag); + const std::deque& Ipids() const; + const std::deque& Adjs() const; + const std::deque& Fds() const; + const std::deque& AshmemNameIds() const; + const std::deque& Sizes() const; + const std::deque& Psss() const; + const std::deque& AshmemIds() const; + const std::deque& Times() const; + const std::deque& RefCounts() const; + const std::deque& Purgeds() const; + const std::deque& Flags() const; + void Clear() override + { + CacheBase::Clear(); + ipids_.clear(); + adjs_.clear(); + fds_.clear(); + ashmemNameIds_.clear(); + sizes_.clear(); + psss_.clear(); + ashmemIds_.clear(); + times_.clear(); + refCounts_.clear(); + purgeds_.clear(); + flags_.clear(); + } + void SetFlag(uint64_t rowId, uint32_t Flag); + +private: + std::deque ipids_ = {}; + std::deque adjs_ = {}; + std::deque fds_ = {}; + std::deque ashmemNameIds_ = {}; + std::deque sizes_ = {}; + std::deque psss_ = {}; + std::deque ashmemIds_ = {}; + std::deque times_ = {}; + std::deque refCounts_ = {}; + std::deque purgeds_ = {}; + std::deque flags_ = {}; + uint32_t rowCount_ = 0; +}; + +class DmaMemData : public CacheBase { +public: + void AppendNewData(InternalPid ipid, + uint64_t ts, + uint32_t fd, + uint64_t size, + uint32_t ino, + uint32_t expPid, + DataIndex expTaskCommId, + DataIndex bufNameId, + DataIndex expNameId, + uint32_t flag); + const std::deque& Ipids() const; + const std::deque& Fds() const; + const std::deque& Sizes() const; + const std::deque& Inos() const; + const std::deque& ExpPids() const; + const std::deque& ExpTaskCommIds() const; + const std::deque& BufNameIds() const; + const std::deque& ExpNameIds() const; + const std::deque& Flags() const; + void Clear() override + { + CacheBase::Clear(); + ipids_.clear(); + fds_.clear(); + sizes_.clear(); + inos_.clear(); + expPids_.clear(); + expTaskCommIds_.clear(); + bufNameIds_.clear(); + expNameIds_.clear(); + flags_.clear(); + } + void SetFlag(uint64_t rowId, uint32_t Flag); + +private: + std::deque ipids_ = {}; + std::deque fds_ = {}; + std::deque sizes_ = {}; + std::deque inos_ = {}; + std::deque expPids_ = {}; + std::deque expTaskCommIds_ = {}; + std::deque bufNameIds_ = {}; + std::deque expNameIds_ = {}; + std::deque flags_ = {}; + uint32_t rowCount_ = 0; +}; + +class GpuProcessMemData : public CacheBase { +public: + void AppendNewData(uint64_t ts, + DataIndex gpuNameId, + uint64_t allGpuSize, + std::string addr, + InternalPid ipid, + InternalPid itid, + uint64_t usedGpuSize); + const std::deque& GpuNameIds() const; + const std::deque& AllGpuSizes() const; + const std::deque& Addrs() const; + const std::deque& Ipids() const; + const std::deque& Itids() const; + const std::deque& UsedGpuSizes() const; + void Clear() override + { + CacheBase::Clear(); + gpuNameIds_.clear(); + allGpuSizes_.clear(); + addrs_.clear(); + ipids_.clear(); + itids_.clear(); + usedGpuSizes_.clear(); + } + +private: + std::deque gpuNameIds_ = {}; + std::deque allGpuSizes_ = {}; + std::deque addrs_ = {}; + std::deque ipids_ = {}; + std::deque itids_ = {}; + std::deque usedGpuSizes_ = {}; + uint32_t rowCount_ = 0; +}; + +class GpuWindowMemData : public CacheBase { +public: + void AppendNewData(uint64_t ts, + DataIndex windowNameId, + uint64_t windowId, + DataIndex moduleNameId, + DataIndex categoryNameId, + uint64_t size, + uint32_t count, + uint64_t purgeableSize); + const std::deque& WindowNameIds() const; + const std::deque& WindowIds() const; + const std::deque& ModuleNameIds() const; + const std::deque& CategoryNameIds() const; + const std::deque& Sizes() const; + const std::deque& Counts() const; + const std::deque& PurgeableSizes() const; + void Clear() override + { + CacheBase::Clear(); + windowNameIds_.clear(); + windowIds_.clear(); + moduleNameIds_.clear(); + categoryNameIds_.clear(); + sizes_.clear(); + counts_.clear(); + purgeableSizes_.clear(); + } + +private: + std::deque windowNameIds_ = {}; + std::deque windowIds_ = {}; + std::deque moduleNameIds_ = {}; + std::deque categoryNameIds_ = {}; + std::deque sizes_ = {}; + std::deque counts_ = {}; + std::deque purgeableSizes_ = {}; + uint32_t rowCount_ = 0; +}; + } // namespace TraceStdtype } // namespace SysTuning diff --git a/trace_streamer/src/trace_streamer/trace_streamer_selector.cpp b/trace_streamer/src/trace_streamer/trace_streamer_selector.cpp index 47e754beea13b153feb389578f9803041f6b112f..785808d7822c5cabf3f86a2577f243bb9e5700c1 100644 --- a/trace_streamer/src/trace_streamer/trace_streamer_selector.cpp +++ b/trace_streamer/src/trace_streamer/trace_streamer_selector.cpp @@ -293,5 +293,13 @@ void TraceStreamerSelector::UpdateAnimationTraceStatus(bool status) { traceDataCache_->UpdateAnimationTraceStatus(status); } +void TraceStreamerSelector::UpdateTaskPoolTraceStatus(bool status) +{ + traceDataCache_->UpdateTaskPoolTraceStatus(status); +} +void TraceStreamerSelector::UpdateAppStartTraceStatus(bool status) +{ + traceDataCache_->UpdateAppStartTraceStatus(status); +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/src/trace_streamer/trace_streamer_selector.h b/trace_streamer/src/trace_streamer/trace_streamer_selector.h index 30f44a1710ef6a88e3a965d3040c60519c224d28..d71a479add4fa6ba3d76544369f11e1ebf9f74a1 100644 --- a/trace_streamer/src/trace_streamer/trace_streamer_selector.h +++ b/trace_streamer/src/trace_streamer/trace_streamer_selector.h @@ -50,6 +50,8 @@ public: return fileType_; } void UpdateAnimationTraceStatus(bool status); + void UpdateTaskPoolTraceStatus(bool status); + void UpdateAppStartTraceStatus(bool status); private: void InitFilter(); diff --git a/trace_streamer/test.sh b/trace_streamer/test.sh index b58ed155d0fb2ef74455c230db395ab14c05ac04..3ecc3a132dc9e7084dd0db3289cb6baf1aa0838f 100755 --- a/trace_streamer/test.sh +++ b/trace_streamer/test.sh @@ -22,5 +22,5 @@ mkdir -p out/test/data/resource mkdir -p out/test_debug/data/resource cp test/resource/* out/test/data/resource/ cp test/resource/* out/test_debug/data/resource/ -cd out/test/clang_x64/developtools/profiler +cd out/test ./trace_streamer_ut diff --git a/trace_streamer/test/BUILD.gn b/trace_streamer/test/BUILD.gn index 2f135f030c07cb8911e7ac2ea5e023e2846a1706..3825b7ca341f06f56eacbd7fbe393a7ac720dc7d 100755 --- a/trace_streamer/test/BUILD.gn +++ b/trace_streamer/test/BUILD.gn @@ -47,6 +47,7 @@ if (is_test) { "unittest/htrace_sys_vmem_parser_test.cpp", "unittest/http_server_test.cpp", "unittest/irq_filter_test.cpp", + "unittest/js_cpu_profiler_test.cpp", "unittest/js_memory_test.cpp", "unittest/measure_filter_test.cpp", "unittest/native_hook_parser_test.cpp", diff --git a/trace_streamer/test/resource/pbreader.htrace b/trace_streamer/test/resource/pbreader.htrace index 4643f4c2e36d7c25b5becf52f75657486047c867..854c3c2b9e37eb8cbdc1e9ab7ac0130adcf21043 100755 Binary files a/trace_streamer/test/resource/pbreader.htrace and b/trace_streamer/test/resource/pbreader.htrace differ diff --git a/trace_streamer/test/unittest/animation_filter_test.cpp b/trace_streamer/test/unittest/animation_filter_test.cpp index ee53d39c8fcff0df9d1e36a0bc02e8bd4149653e..5a9145e6e3015448b23ac9ca195c5304d57ddc8d 100644 --- a/trace_streamer/test/unittest/animation_filter_test.cpp +++ b/trace_streamer/test/unittest/animation_filter_test.cpp @@ -100,19 +100,6 @@ HWTEST_F(AnimationFilterTest, InvalidCallStack, TestSize.Level1) EXPECT_FALSE(res); depth++; } - // invalid parentId - depth = 4; - for (size_t i = 0; i < callStackNames.size() - 1; i++) { - std::optional parentId; - auto callStackId = - callStackSlice->AppendInternalSlice(INVALID_TIME, INVALID_TIME, INVALID_UINT32, INVALID_UINT64, - INVALID_UINT16, callStackNames[i], depth, parentId); - point.funcPrefix_ = funcPrefixs[1]; - auto res = stream_.streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, callStackId); - EXPECT_FALSE(res); - } - callStackSlice->Clear(); - callStackSlice->parentIds_.clear(); // the current or the parent callStackNames haven't leashWindow uint64_t index = INVALID_UINT64; for (size_t i = 0; i < callStackNames.size(); i++) { @@ -130,9 +117,7 @@ HWTEST_F(AnimationFilterTest, InvalidCallStack, TestSize.Level1) EXPECT_FALSE(res); // valid callStack point.funcPrefix_ = funcPrefixs[1]; - curStackRow = 4; - res = stream_.streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, curStackRow - 1); - EXPECT_TRUE(res); + curStackRow = 3; res = stream_.streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, curStackRow); EXPECT_TRUE(res); } @@ -172,7 +157,7 @@ HWTEST_F(AnimationFilterTest, UpdateDevicePos, TestSize.Level1) */ HWTEST_F(AnimationFilterTest, UpdateDeviceFps, TestSize.Level1) { - TS_LOGI("test36-3"); + TS_LOGI("test36-4"); TracePoint point; BytraceLine line; @@ -222,7 +207,7 @@ HWTEST_F(AnimationFilterTest, UpdateDeviceFps, TestSize.Level1) */ HWTEST_F(AnimationFilterTest, UpdateDynamicFrameInfo, TestSize.Level1) { - TS_LOGI("test36-4"); + TS_LOGI("test36-5"); TracePoint point; CallStack* callStackSlice = stream_.traceDataCache_->GetInternalSlicesData(); @@ -250,13 +235,37 @@ HWTEST_F(AnimationFilterTest, UpdateDynamicFrameInfo, TestSize.Level1) point.funcPrefix_ = funcPrefix; auto res = stream_.streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, index - 1); // for leashWindow EXPECT_TRUE(res); - res = stream_.streamFilters_->animationFilter_->BeginDynamicFrameEvent(point, index); // for xxx - EXPECT_TRUE(res); stream_.streamFilters_->animationFilter_->UpdateDynamicFrameInfo(); for (size_t i = 0; i < stream_.traceDataCache_->GetDynamicFrame()->Size(); i++) { EXPECT_TRUE(stream_.traceDataCache_->GetDynamicFrame()->EndTimes()[i] != INVALID_TIME); EXPECT_TRUE(stream_.traceDataCache_->GetDynamicFrame()->Xs()[i] != INVALID_UINT32); } } +/** + * @tc.name: AnimationStartAndEnd + * @tc.desc: update Animation startPoint and endPoint + * @tc.type: FUNC + */ +HWTEST_F(AnimationFilterTest, AnimationStartAndEnd, TestSize.Level1) +{ + TS_LOGI("test36-6"); + BytraceLine line; + line.ts = 59557002299000; + + CallStack* callStackSlice = stream_.traceDataCache_->GetInternalSlicesData(); + uint8_t depth = 1; + uint64_t dur = ONE_MILLION_NANOSECONDS; + std::optional parentId; + DataIndex callStackName = + stream_.traceDataCache_->GetDataIndex("H:RSUniRender::Process:[leashWindow25] (0, 0, 1344, 2772) Alpha: 1.00"); + + auto callStackRow = callStackSlice->AppendInternalSlice(line.ts, dur, INVALID_UINT32, INVALID_UINT64, + INVALID_UINT16, callStackName, depth, parentId); + + stream_.streamFilters_->animationFilter_->StartAnimationEvent(line, callStackRow); + EXPECT_TRUE(!stream_.streamFilters_->animationFilter_->animationCallIds_.empty()); + stream_.streamFilters_->animationFilter_->FinishAnimationEvent(line, callStackRow); + EXPECT_TRUE(stream_.streamFilters_->animationFilter_->animationCallIds_.empty()); +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/test/unittest/bytrace_parser_test.cpp b/trace_streamer/test/unittest/bytrace_parser_test.cpp index dad18a50773da0bf00fdefe92a5705737428a750..de29a04363f2809e52726adc7285f00312ed1465 100644 --- a/trace_streamer/test/unittest/bytrace_parser_test.cpp +++ b/trace_streamer/test/unittest/bytrace_parser_test.cpp @@ -41,7 +41,7 @@ public: public: SysTuning::TraceStreamer::TraceStreamerSelector stream_ = {}; - const std::string dbPath_ = "../../../data/resource/out.db"; + const std::string dbPath_ = "../../test/resource/out.db"; }; /** diff --git a/trace_streamer/test/unittest/htrace_mem_parser_test.cpp b/trace_streamer/test/unittest/htrace_mem_parser_test.cpp index 4b568f410317bacd5b9b4a6ef70a67b04471772a..ddaff58f86e8d42070f8e5e3f0a07bf1e71f6f9a 100644 --- a/trace_streamer/test/unittest/htrace_mem_parser_test.cpp +++ b/trace_streamer/test/unittest/htrace_mem_parser_test.cpp @@ -19,8 +19,8 @@ #include #include +#include "../../third_party/protogen/types/plugins/memory_data/memory_plugin_result.pb.h" #include "htrace_mem_parser.h" -#include "memory_plugin_result.pb.h" #include "memory_plugin_result.pbreader.h" #include "parser/common_types.h" #include "trace_streamer_selector.h" @@ -46,7 +46,7 @@ public: public: SysTuning::TraceStreamer::TraceStreamerSelector stream_ = {}; - const std::string dbPath_ = "../../../data/resource/out.db"; + const std::string dbPath_ = "../../test/resource/out.db"; }; /** @@ -138,10 +138,10 @@ HWTEST_F(HtraceMemParserTest, ParseMemParseTestMeasureDataSize, TestSize.Level1) EXPECT_TRUE(1 == eventCount); EXPECT_TRUE(stream_.traceDataCache_->GetConstProcessData(1).pid_ == pid); - EXPECT_TRUE(stream_.traceDataCache_->GetConstProcessMeasureData().Size() == MEM_MAX * 1); + EXPECT_EQ(stream_.traceDataCache_->GetConstProcessMeasureData().Size(), MEM_PURG_SUM * 1); EXPECT_EQ(stream_.traceDataCache_->GetConstProcessData().size(), 2); - for (auto i = 0; i < MEM_MAX; i++) { + for (auto i = 0; i < MEM_PURG_SUM; i++) { if (stream_.traceDataCache_->GetConstProcessMeasureData().filterIdDeque_[i] == memParser->memNameDictMap_.at(MEM_VM_SIZE)) { EXPECT_TRUE(stream_.traceDataCache_->GetConstProcessMeasureData().valuesDeque_[i] == memKb); @@ -262,7 +262,7 @@ HWTEST_F(HtraceMemParserTest, ParseMultiEmptyProcessMemoryInfo, TestSize.Level1) auto eventCount = stream_.traceDataCache_->GetConstStatAndInfo().GetValue(TRACE_MEMORY, STAT_EVENT_RECEIVED); EXPECT_TRUE(1 == eventCount); - EXPECT_TRUE(stream_.traceDataCache_->GetConstProcessMeasureData().Size() == MEM_MAX * 2); + EXPECT_TRUE(stream_.traceDataCache_->GetConstProcessMeasureData().Size() == MEM_PURG_SUM * 2); } /** @@ -299,5 +299,182 @@ HWTEST_F(HtraceMemParserTest, ParseEmptyMemoryData, TestSize.Level1) auto eventCount = stream_.traceDataCache_->GetConstStatAndInfo().GetValue(TRACE_MEMORY, STAT_EVENT_RECEIVED); EXPECT_TRUE(0 == eventCount); } + +/** + * @tc.name: ParseAshmemInfo + * @tc.desc: Parse Ashmem Info + * @tc.type: FUNC + */ +HWTEST_F(HtraceMemParserTest, ParseAshmemInfo, TestSize.Level1) +{ + TS_LOGI("test16-6"); + HtraceMemParser* memParser = new HtraceMemParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + + MemoryData tracePacket; + AshmemInfo* ashmemInfo = tracePacket.add_ashmeminfo(); + EXPECT_TRUE(ashmemInfo != nullptr); + int32_t size = tracePacket.ashmeminfo_size(); + EXPECT_TRUE(size == 1); + + int32_t id = 0; + int64_t time = 1616439852302; + int32_t pid = 6; + int32_t adj = 6; + int32_t fd = 6; + int64_t purged = 6; + uint64_t setSize = 6; + int64_t refCount = 6; + ashmemInfo->set_id(id); + ashmemInfo->set_time(time); + ashmemInfo->set_pid(pid); + ashmemInfo->set_adj(adj); + ashmemInfo->set_fd(fd); + ashmemInfo->set_purged(purged); + ashmemInfo->set_size(setSize); + ashmemInfo->set_ref_count(refCount); + + HtraceDataSegment dataSeg; + dataSeg.dataType = DATA_SOURCE_TYPE_MEM; + dataSeg.clockId = TS_CLOCK_REALTIME; + dataSeg.status = TS_PARSE_STATUS_PARSED; + dataSeg.timeStamp = 1616439852302; + + std::string memStrMsg = ""; + tracePacket.SerializeToString(&memStrMsg); + ProtoReader::BytesView memBytesView(reinterpret_cast(memStrMsg.data()), memStrMsg.size()); + dataSeg.protoData = memBytesView; + + memParser->Parse(dataSeg, dataSeg.timeStamp, dataSeg.clockId); + memParser->Finish(); + stream_.traceDataCache_->ExportDatabase(dbPath_); + + EXPECT_TRUE(access(dbPath_.c_str(), F_OK) == 0); + tracePacket.clear_processesinfo(); + delete memParser; + EXPECT_EQ(stream_.traceDataCache_->GetConstAshMemData().ids_[0], id); + EXPECT_EQ(stream_.traceDataCache_->GetConstAshMemData().adjs_[0], adj); + EXPECT_EQ(stream_.traceDataCache_->GetConstAshMemData().times_[0], time); +} + +/** + * @tc.name: ParseDmaMemInfo + * @tc.desc: Parse DmaMem Info + * @tc.type: FUNC + */ +HWTEST_F(HtraceMemParserTest, ParseDmaMemInfo, TestSize.Level1) +{ + TS_LOGI("test16-7"); + HtraceMemParser* memParser = new HtraceMemParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + + MemoryData tracePacket; + DmaInfo* dmaInfo = tracePacket.add_dmainfo(); + EXPECT_TRUE(dmaInfo != nullptr); + int32_t size = tracePacket.dmainfo_size(); + EXPECT_TRUE(size == 1); + + uint64_t setSize = 7; + int32_t pid = 7; + int32_t ino = 7; + int32_t fd = 7; + int64_t expPid = 7; + dmaInfo->set_size(setSize); + dmaInfo->set_pid(pid); + dmaInfo->set_ino(ino); + dmaInfo->set_fd(fd); + dmaInfo->set_exp_pid(expPid); + + HtraceDataSegment dataSeg; + dataSeg.dataType = DATA_SOURCE_TYPE_MEM; + dataSeg.clockId = TS_CLOCK_REALTIME; + dataSeg.status = TS_PARSE_STATUS_PARSED; + dataSeg.timeStamp = 1616439852302; + + std::string memStrMsg = ""; + tracePacket.SerializeToString(&memStrMsg); + ProtoReader::BytesView memBytesView(reinterpret_cast(memStrMsg.data()), memStrMsg.size()); + dataSeg.protoData = memBytesView; + + memParser->Parse(dataSeg, dataSeg.timeStamp, dataSeg.clockId); + memParser->Finish(); + stream_.traceDataCache_->ExportDatabase(dbPath_); + + EXPECT_TRUE(access(dbPath_.c_str(), F_OK) == 0); + tracePacket.clear_processesinfo(); + delete memParser; + EXPECT_EQ(stream_.traceDataCache_->GetConstDmaMemData().inos_[0], ino); + EXPECT_EQ(stream_.traceDataCache_->GetConstDmaMemData().fds_[0], fd); + EXPECT_EQ(stream_.traceDataCache_->GetConstDmaMemData().expPids_[0], expPid); +} + +/** + * @tc.name: ParseGpuProcessMemInfo + * @tc.desc: Parse GpuProcessMem Info + * @tc.type: FUNC + */ +HWTEST_F(HtraceMemParserTest, ParseGpuProcessMemInfo, TestSize.Level1) +{ + TS_LOGI("test16-8"); + HtraceMemParser* memParser = new HtraceMemParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + + MemoryData tracePacket; + GpuMemoryInfo* gpuMemoryInfo = tracePacket.add_gpumemoryinfo(); + + int32_t allGpuSize = 0; + gpuMemoryInfo->set_all_gpu_size(allGpuSize); + + HtraceDataSegment dataSeg; + dataSeg.dataType = DATA_SOURCE_TYPE_MEM; + dataSeg.clockId = TS_CLOCK_REALTIME; + dataSeg.status = TS_PARSE_STATUS_PARSED; + dataSeg.timeStamp = 1616439852302; + + std::string memStrMsg = ""; + tracePacket.SerializeToString(&memStrMsg); + ProtoReader::BytesView memBytesView(reinterpret_cast(memStrMsg.data()), memStrMsg.size()); + dataSeg.protoData = memBytesView; + + memParser->Parse(dataSeg, dataSeg.timeStamp, dataSeg.clockId); + memParser->Finish(); + stream_.traceDataCache_->ExportDatabase(dbPath_); + + EXPECT_TRUE(access(dbPath_.c_str(), F_OK) == 0); + tracePacket.clear_processesinfo(); + delete memParser; + EXPECT_EQ(stream_.traceDataCache_->GetConstGpuProcessMemData().AllGpuSizes()[0], allGpuSize); +} + +/** + * @tc.name: ParseGpuWindowMemInfo + * @tc.desc: Parse GpuWindowMem Info + * @tc.type: FUNC + */ +HWTEST_F(HtraceMemParserTest, ParseGpuWindowMemInfo, TestSize.Level1) +{ + TS_LOGI("test16-9"); + HtraceMemParser* memParser = new HtraceMemParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + + MemoryData tracePacket; + GpuDumpInfo* gpuDumpInfo = tracePacket.add_gpudumpinfo(); + + HtraceDataSegment dataSeg; + dataSeg.dataType = DATA_SOURCE_TYPE_MEM; + dataSeg.clockId = TS_CLOCK_REALTIME; + dataSeg.status = TS_PARSE_STATUS_PARSED; + dataSeg.timeStamp = 1616439852302; + + std::string memStrMsg = ""; + tracePacket.SerializeToString(&memStrMsg); + ProtoReader::BytesView memBytesView(reinterpret_cast(memStrMsg.data()), memStrMsg.size()); + dataSeg.protoData = memBytesView; + + memParser->Parse(dataSeg, dataSeg.timeStamp, dataSeg.clockId); + memParser->Finish(); + stream_.traceDataCache_->ExportDatabase(dbPath_); + + EXPECT_TRUE(access(dbPath_.c_str(), F_OK) == 0); + tracePacket.clear_processesinfo(); + delete memParser; + EXPECT_EQ(stream_.traceDataCache_->GetConstGpuWindowMemData().Size(), 0); +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/test/unittest/js_cpu_profiler_test.cpp b/trace_streamer/test/unittest/js_cpu_profiler_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ed69f9b8d901a94fde2d5cbeb52ef22e4c9f9c06 --- /dev/null +++ b/trace_streamer/test/unittest/js_cpu_profiler_test.cpp @@ -0,0 +1,265 @@ +/* + * 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. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "file.h" +#include "htrace_js_memory_parser.h" +#include "htrace_js_cpu_profiler_parser.h" +#include "js_heap_config.pb.h" +#include "js_heap_config.pbreader.h" +#include "js_heap_result.pb.h" +#include "js_heap_result.pbreader.h" +#include "trace_streamer_selector.h" + +using namespace testing::ext; +using namespace SysTuning; +using namespace SysTuning::TraceStreamer; +namespace SysTuning { +namespace TraceStreamer { +class JsCpuProfilerTest : public ::testing::Test { +public: + void SetUp() + { + stream_.InitFilter(); + } + + void TearDown() {} + +public: + SysTuning::TraceStreamer::TraceStreamerSelector stream_ = {}; +}; +/** + * @tc.name: cpuProfilerParserNodesbyArkTs + * @tc.desc: cpuProfiler parser nodes + * @tc.type: FUNC + */ +HWTEST_F(JsCpuProfilerTest, cpuProfilerParserNodesbyArkTs, TestSize.Level1) +{ + TS_LOGI("test39-1"); + const int32_t pid = 1734; + ArkTSConfig arkTSConfig; + arkTSConfig.set_pid(pid); + arkTSConfig.set_type(::ArkTSConfig_HeapType(ArkTSConfig_HeapType_INVALID)); + arkTSConfig.set_enable_cpu_profiler(0); + arkTSConfig.set_cpu_profiler_interval(1000); + std::string strConfig = ""; + arkTSConfig.SerializeToString(&strConfig); + + HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + ProtoReader::BytesView tracePacket(reinterpret_cast(strConfig.data()), strConfig.size()); + htraceJSMemoryParser.ParseJSMemoryConfig(tracePacket); + const char* result1 = "{\"id\":3,\"result\":{}}"; + const char* result2 = + "{\"id\":3,\"result\":{\"profile\":{\"tid\":1394,\"startTime\":8013755173,\"endTime\":8034596087,\"gcTime\":0," + "\"cInterpreterTime\":0,\"asmInterpreterTime\":0,\"aotTime\":0,\"builtinTime\":0,\"napiTime\":0," + "\"arkuiEngineTime\":0,\"runtimeTime\":0,\"otherTime\":20840914,\"nodes\":[{\"id\":1,\"callFrame\":{" + "\"functionName\":\"(root)\",\"scriptId\":\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":-1}," + "\"hitCount\":0,\"children\":[2,3,4]},{\"id\":2,\"callFrame\":{\"functionName\":\"(program)\",\"scriptId\":" + "\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":-1},\"hitCount\":113097,\"children\":[]},{\"id\":3," + "\"callFrame\":{\"functionName\":\"(idle)\",\"scriptId\":\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":" + "-1},\"hitCount\":0,\"children\":[]},{\"id\":4,\"callFrame\":{\"functionName\":\"anonymous\",\"scriptId\":" + "\"1\",\"url\":\"D:/workspace_ohos_system/Music/entry/build/default/intermediates/assets_jsbundle/default/ets/" + "pages/" + "index_.js\",\"lineNumber\":2922,\"columnNumber\":36},\"hitCount\":1,\"children\":[]}],\"samples\":[2,3,4,2,2," + "2,2,3,3,3,3,4,4,4],\"timeDeltas\":[99,72,215,637,96,288,36,89,94,54,26,598,784,522]}}}"; + + ArkTSResult jsHeapResult1; + jsHeapResult1.set_result(result1); + std::string strResult1 = ""; + jsHeapResult1.SerializeToString(&strResult1); + ProtoReader::BytesView tracePacket1(reinterpret_cast(strResult1.data()), strResult1.size()); + htraceJSMemoryParser.Parse(tracePacket1, 10000); + + ArkTSResult jsHeapResult2; + jsHeapResult2.set_result(result2); + std::string strResult2 = ""; + jsHeapResult2.SerializeToString(&strResult2); + ProtoReader::BytesView tracePacket4(reinterpret_cast(strResult2.data()), strResult2.size()); + htraceJSMemoryParser.Parse(tracePacket4, 13000); + htraceJSMemoryParser.Finish(); + + auto size = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().Size(); + EXPECT_EQ(4, size); + auto scriptId = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().ScriptIds()[0]; + EXPECT_EQ("0", scriptId); + auto url = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().Urls()[0]; + EXPECT_EQ(stream_.traceDataCache_->GetDataIndex(""), url); + auto lineNumber = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().LineNumbers()[0]; + EXPECT_EQ(-1, lineNumber); + auto columnNumber = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().ColumnNumbers()[0]; + EXPECT_EQ(-1, columnNumber); + auto hitCount = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().HitCounts()[0]; + EXPECT_EQ(0, hitCount); + + auto size1 = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().Size(); + EXPECT_EQ(4, size1); + auto scriptId1 = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().ScriptIds()[1]; + EXPECT_EQ("0", scriptId1); + auto url1 = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().Urls()[1]; + EXPECT_EQ(stream_.traceDataCache_->GetDataIndex(""), url1); + auto lineNumber1 = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().LineNumbers()[1]; + EXPECT_EQ(-1, lineNumber1); + auto columnNumber1 = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().ColumnNumbers()[1]; + EXPECT_EQ(-1, columnNumber1); + auto hitCount1 = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().HitCounts()[1]; + EXPECT_EQ(113097, hitCount1); +} + +/** + * @tc.name: cpuProfilerParserSamplesbyArkTs + * @tc.desc: cpuProfiler parser samples + * @tc.type: FUNC + */ +HWTEST_F(JsCpuProfilerTest, cpuProfilerParserSamplesbyArkTs, TestSize.Level1) +{ + TS_LOGI("test39-2"); + const int32_t pid = 1734; + ArkTSConfig arkTSConfig; + arkTSConfig.set_pid(pid); + arkTSConfig.set_type(::ArkTSConfig_HeapType(ArkTSConfig_HeapType_INVALID)); + arkTSConfig.set_enable_cpu_profiler(0); + arkTSConfig.set_cpu_profiler_interval(1000); + std::string strConfig = ""; + arkTSConfig.SerializeToString(&strConfig); + + HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + ProtoReader::BytesView tracePacket(reinterpret_cast(strConfig.data()), strConfig.size()); + htraceJSMemoryParser.ParseJSMemoryConfig(tracePacket); + const char* result1 = "{\"id\":3,\"result\":{}}"; + const char* result2 = + "{\"id\":3,\"result\":{\"profile\":{\"tid\":1394,\"startTime\":8013755173,\"endTime\":8034596087,\"gcTime\":0," + "\"cInterpreterTime\":0,\"asmInterpreterTime\":0,\"aotTime\":0,\"builtinTime\":0,\"napiTime\":0," + "\"arkuiEngineTime\":0,\"runtimeTime\":0,\"otherTime\":20840914,\"nodes\":[{\"id\":1,\"callFrame\":{" + "\"functionName\":\"(root)\",\"scriptId\":\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":-1}," + "\"hitCount\":0,\"children\":[2,3,4]},{\"id\":2,\"callFrame\":{\"functionName\":\"(program)\",\"scriptId\":" + "\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":-1},\"hitCount\":113097,\"children\":[]},{\"id\":3," + "\"callFrame\":{\"functionName\":\"(idle)\",\"scriptId\":\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":" + "-1},\"hitCount\":0,\"children\":[]},{\"id\":4,\"callFrame\":{\"functionName\":\"anonymous\",\"scriptId\":" + "\"1\",\"url\":\"D:/workspace_ohos_system/Music/entry/build/default/intermediates/assets_jsbundle/default/ets/" + "pages/" + "index_.js\",\"lineNumber\":2922,\"columnNumber\":36},\"hitCount\":1,\"children\":[]}],\"samples\":[2,3,4,2,2," + "2,2,3,3,3,3,4,4,4],\"timeDeltas\":[99,72,215,637,96,288,36,89,94,54,26,598,784,522]}}}"; + + ArkTSResult jsHeapResult1; + jsHeapResult1.set_result(result1); + std::string strResult1 = ""; + jsHeapResult1.SerializeToString(&strResult1); + ProtoReader::BytesView tracePacket1(reinterpret_cast(strResult1.data()), strResult1.size()); + htraceJSMemoryParser.Parse(tracePacket1, 10000); + + ArkTSResult jsHeapResult2; + jsHeapResult2.set_result(result2); + std::string strResult2 = ""; + jsHeapResult2.SerializeToString(&strResult2); + ProtoReader::BytesView tracePacket4(reinterpret_cast(strResult2.data()), strResult2.size()); + htraceJSMemoryParser.Parse(tracePacket4, 13000); + htraceJSMemoryParser.Finish(); + + auto sampleFunctionId1 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().FunctionIds()[0]; + EXPECT_EQ(2, sampleFunctionId1); + auto startTime1 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().StartTimes()[0]; + EXPECT_EQ(8013755173000, startTime1); + auto endTime1 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().EndTimes()[0]; + EXPECT_EQ(8013755245000, endTime1); + auto dur1 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().Durs()[0]; + EXPECT_EQ(72000, dur1); + auto sampleFunctionId2 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().FunctionIds()[1]; + EXPECT_EQ(3, sampleFunctionId2); + auto startTime2 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().StartTimes()[1]; + EXPECT_EQ(8013755245000, startTime2); + auto endTime2 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().EndTimes()[1]; + EXPECT_EQ(8013755460000, endTime2); + auto dur2 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().Durs()[1]; + EXPECT_EQ(72000, dur2); + auto sampleFunctionId3 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().FunctionIds()[2]; + EXPECT_EQ(4, sampleFunctionId3); + auto startTime3 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().StartTimes()[2]; + EXPECT_EQ(8013755460000, startTime3); + auto endTime3 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().EndTimes()[2]; + EXPECT_EQ(8013756097000, endTime3); + auto dur3 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().Durs()[2]; + EXPECT_EQ(637000, dur3); + auto sampleFunctionId4 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().FunctionIds()[3]; + EXPECT_EQ(2, sampleFunctionId4); + auto startTime4 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().StartTimes()[3]; + EXPECT_EQ(8013756097000, startTime4); + auto endTime4 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().EndTimes()[3]; + EXPECT_EQ(8013756606000, endTime4); + auto dur4 = stream_.traceDataCache_->GetConstJsCpuProfilerSampleData().Durs()[3]; + EXPECT_EQ(509000, dur4); +} + +/** + * @tc.name: cpuProfilerParserNoProfilebyArkTs + * @tc.desc: cpuProfiler parser no profile + * @tc.type: FUNC + */ +HWTEST_F(JsCpuProfilerTest, cpuProfilerParserNoProfilebyArkTs, TestSize.Level1) +{ + TS_LOGI("test39-3"); + const int32_t pid = 1734; + ArkTSConfig arkTSConfig; + arkTSConfig.set_pid(pid); + arkTSConfig.set_type(::ArkTSConfig_HeapType(ArkTSConfig_HeapType_INVALID)); + arkTSConfig.set_enable_cpu_profiler(0); + arkTSConfig.set_cpu_profiler_interval(1000); + std::string strConfig = ""; + arkTSConfig.SerializeToString(&strConfig); + + HtraceJSMemoryParser htraceJSMemoryParser(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + ProtoReader::BytesView tracePacket(reinterpret_cast(strConfig.data()), strConfig.size()); + htraceJSMemoryParser.ParseJSMemoryConfig(tracePacket); + const char* result1 = "{\"id\":3,\"result\":{}}"; + const char* result2 = + "{\"id\":3,\"result\":{\"data\":{\"tid\":1394,\"startTime\":8013755173,\"endTime\":8034596087,\"gcTime\":0," + "\"cInterpreterTime\":0,\"asmInterpreterTime\":0,\"aotTime\":0,\"builtinTime\":0,\"napiTime\":0," + "\"arkuiEngineTime\":0,\"runtimeTime\":0,\"otherTime\":20840914,\"nodes\":[{\"id\":1,\"callFrame\":{" + "\"functionName\":\"(root)\",\"scriptId\":\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":-1}," + "\"hitCount\":0,\"children\":[2,3,4]},{\"id\":2,\"callFrame\":{\"functionName\":\"(program)\",\"scriptId\":" + "\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":-1},\"hitCount\":113097,\"children\":[]},{\"id\":3," + "\"callFrame\":{\"functionName\":\"(idle)\",\"scriptId\":\"0\",\"url\":\"\",\"lineNumber\":-1,\"columnNumber\":" + "-1},\"hitCount\":0,\"children\":[]},{\"id\":4,\"callFrame\":{\"functionName\":\"anonymous\",\"scriptId\":" + "\"1\",\"url\":\"D:/workspace_ohos_system/Music/entry/build/default/intermediates/assets_jsbundle/default/ets/" + "pages/" + "index_.js\",\"lineNumber\":2922,\"columnNumber\":36},\"hitCount\":1,\"children\":[]}],\"samples\":[2,3,4,2,2," + "2,2,3,3,3,3,4,4,4],\"timeDeltas\":[99,72,215,637,96,288,36,89,94,54,26,598,784,522]}}}"; + + ArkTSResult jsHeapResult1; + jsHeapResult1.set_result(result1); + std::string strResult1 = ""; + jsHeapResult1.SerializeToString(&strResult1); + ProtoReader::BytesView tracePacket1(reinterpret_cast(strResult1.data()), strResult1.size()); + htraceJSMemoryParser.Parse(tracePacket1, 10000); + + ArkTSResult jsHeapResult2; + jsHeapResult2.set_result(result2); + std::string strResult2 = ""; + jsHeapResult2.SerializeToString(&strResult2); + ProtoReader::BytesView tracePacket4(reinterpret_cast(strResult2.data()), strResult2.size()); + htraceJSMemoryParser.Parse(tracePacket4, 13000); + htraceJSMemoryParser.Finish(); + + auto size = stream_.traceDataCache_->GetConstJsCpuProfilerNodeData().Size(); + EXPECT_EQ(0, size); +} +} // namespace TraceStreamer +} // namespace SysTuning diff --git a/trace_streamer/test/unittest/js_memory_test.cpp b/trace_streamer/test/unittest/js_memory_test.cpp index bf80d5daab92dadbaab5b4998b728aabda6e0d13..a6e97a468b08b7bf733583b8840f4b12af602fcc 100644 --- a/trace_streamer/test/unittest/js_memory_test.cpp +++ b/trace_streamer/test/unittest/js_memory_test.cpp @@ -125,8 +125,6 @@ HWTEST_F(JsMemoryTest, snapshotParserNodesByJsmemory, TestSize.Level1) EXPECT_EQ(11000, startTime); auto endTime = stream_.traceDataCache_->GetConstJsHeapFilesData().EndTimes()[0]; EXPECT_EQ(13000, endTime); - auto pidFiles = stream_.traceDataCache_->GetConstJsHeapFilesData().Pids()[0]; - EXPECT_EQ(1734, pidFiles); auto type = stream_.traceDataCache_->GetConstJsHeapNodesData().Types()[0]; EXPECT_EQ(9, type); auto name = stream_.traceDataCache_->GetConstJsHeapNodesData().Names()[0]; @@ -301,8 +299,6 @@ HWTEST_F(JsMemoryTest, timelineParserNodesByJsmemory, TestSize.Level1) EXPECT_EQ(10000, startTime); auto endTime = stream_.traceDataCache_->GetConstJsHeapFilesData().EndTimes()[0]; EXPECT_EQ(13000, endTime); - auto pidFiles = stream_.traceDataCache_->GetConstJsHeapFilesData().Pids()[0]; - EXPECT_EQ(1734, pidFiles); auto type = stream_.traceDataCache_->GetConstJsHeapNodesData().Types()[0]; EXPECT_EQ(9, type); auto name = stream_.traceDataCache_->GetConstJsHeapNodesData().Names()[0]; diff --git a/trace_streamer/test/unittest/parser_pbreader_test.cpp b/trace_streamer/test/unittest/parser_pbreader_test.cpp index 74d4af3b359b85173e241e53d153124b729d72b6..c8938f09b95bb36a174227fac8943c05a0404bf0 100644 --- a/trace_streamer/test/unittest/parser_pbreader_test.cpp +++ b/trace_streamer/test/unittest/parser_pbreader_test.cpp @@ -43,11 +43,10 @@ protected: HWTEST_F(ParserPbreaderTest, HtracePbreaderParserTest, TestSize.Level1) { TS_LOGI("test34-1"); - const std::string tracePath = "../../../data/resource/pbreader.htrace"; - const std::string dbPath = "../../../data/resource/test34-1_out.db"; + const std::string tracePath = "../../test/resource/pbreader.htrace"; + const std::string dbPath = "../../test/resource/test34-1_out.db"; constexpr size_t readSize = 1024; constexpr uint32_t lineLength = 256; - if (access(tracePath.c_str(), F_OK) == 0) { std::unique_ptr ta = std::make_unique(); @@ -86,8 +85,8 @@ HWTEST_F(ParserPbreaderTest, HtracePbreaderParserTest, TestSize.Level1) HWTEST_F(ParserPbreaderTest, BytraceParserTest, TestSize.Level1) { TS_LOGI("test34-2"); - const std::string tracePath = "../../../data/resource/ut_bytrace_input_full.txt"; - const std::string dbPath = "../../../data/resource/test34-2_out.db"; + const std::string tracePath = "../../test/resource/ut_bytrace_input_full.txt"; + const std::string dbPath = "../../test/resource/test34-2_out.db"; constexpr size_t readSize = 1024 * 1024; constexpr uint32_t lineLength = 256; @@ -128,8 +127,8 @@ HWTEST_F(ParserPbreaderTest, BytraceParserTest, TestSize.Level1) HWTEST_F(ParserPbreaderTest, HtraceAndPerfParserTest, TestSize.Level1) { TS_LOGI("test34-3"); - const std::string tracePath = "../../../data/resource/htrace_perf.bin"; - const std::string dbPath = "../../../data/resource/test34-3_out.db"; + const std::string tracePath = "../../test/resource/htrace_perf.bin"; + const std::string dbPath = "../../test/resource/test34-3_out.db"; constexpr size_t readSize = 1024; constexpr uint32_t lineLength = 256; @@ -171,8 +170,8 @@ HWTEST_F(ParserPbreaderTest, HtraceAndPerfParserTest, TestSize.Level1) HWTEST_F(ParserPbreaderTest, HtraceAndEbpfParserTest, TestSize.Level1) { TS_LOGI("test34-4"); - const std::string tracePath = "../../../data/resource/htrace_ebpf.bin"; - const std::string dbPath = "../../../data/resource/test34-4_out.db"; + const std::string tracePath = "../../test/resource/htrace_ebpf.bin"; + const std::string dbPath = "../../test/resource/test34-4_out.db"; constexpr size_t readSize = 1024; constexpr uint32_t lineLength = 256; diff --git a/trace_streamer/test/unittest/rpc_server_test.cpp b/trace_streamer/test/unittest/rpc_server_test.cpp index eeb03f891f35353302f1ee351f8de3dda7ec1b7e..68897687ac99555352d399c737ab10faa04953fa 100644 --- a/trace_streamer/test/unittest/rpc_server_test.cpp +++ b/trace_streamer/test/unittest/rpc_server_test.cpp @@ -17,6 +17,7 @@ #include #include "rpc/rpc_server.h" +#include "print_event_parser.h" using namespace testing::ext; namespace SysTuning { @@ -84,5 +85,29 @@ HWTEST_F(RpcServerTest, WrongTraceData, TestSize.Level1) EXPECT_TRUE(g_result == "dberror\r\n"); EXPECT_FALSE(ret); } + +/** + * @tc.name: ParserConfig + * @tc.desc: Test the ParserConfig method + * @tc.type: FUNC + */ +HWTEST_F(RpcServerTest, ParserConfig, TestSize.Level1) +{ + TS_LOGI("test27-3"); + std::string comm("e.myapplication"); + uint64_t ts = 89227707307481; + uint32_t pid = 16502; + std::string event("B|16502|H:Task Allocation: taskId : 1, executeId : 9, priority : 9, executeState : 1"); + BytraceLine line; + std::string json("{\"config\": {\"TaskPool\": 1,\"AnimationAnalysis\": 0,\"AppStartup\": 0}}"); + + RpcServer rpcServer; + auto ret = rpcServer.ParserConfig(json); + EXPECT_EQ(rpcServer.ts_->traceDataCache_->taskPoolTraceEnabled_, true); + PrintEventParser printEvent(rpcServer.ts_->traceDataCache_.get(), rpcServer.ts_->streamFilters_.get()); + printEvent.ParsePrintEvent(comm, ts, pid, event, line); + auto res = rpcServer.ts_->traceDataCache_->GetConstTaskPoolData().prioritys_[0]; + EXPECT_EQ(res, 9); +} } // namespace TraceStreamer } // namespace SysTuning diff --git a/trace_streamer/test/unittest/table_test.cpp b/trace_streamer/test/unittest/table_test.cpp index ad4d00a115fce820af0c631e061255e266dcf84d..79c5b4fa9ce1d5b360123e1c59f2efc160fc7371 100644 --- a/trace_streamer/test/unittest/table_test.cpp +++ b/trace_streamer/test/unittest/table_test.cpp @@ -1276,11 +1276,21 @@ HWTEST_F(TableTest, SmapsTest, TestSize.Level1) uint64_t pss = 1; uint64_t size = 2; double reside = 1; + uint32_t ipid = 1; + uint64_t sharedClean = 1; + uint64_t sharedDirty = 1; + uint64_t privateClean = 1; + uint64_t privateDirty = 1; + uint64_t swap = 1; + uint64_t swapPss = 1; + uint64_t type = 1; + DataIndex protectionId = stream_.traceDataCache_->GetDataIndex("protection"); DataIndex pathId = stream_.traceDataCache_->GetDataIndex("path"); - stream_.traceDataCache_->GetSmapsData()->AppendNewData(timeStamp, startAddr, endAddr, dirty, swapper, rss, pss, - size, reside, protectionId, pathId); + stream_.traceDataCache_->GetSmapsData()->AppendNewData( + timeStamp, ipid, startAddr, endAddr, dirty, swapper, rss, pss, size, reside, protectionId, pathId, sharedClean, + sharedDirty, privateClean, privateDirty, swap, swapPss, type); auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect.c_str(), false); EXPECT_EQ(row, 1); } diff --git a/trace_streamer/test/unittest/task_pool_filter_test.cpp b/trace_streamer/test/unittest/task_pool_filter_test.cpp index fc83cf9d6d24715d052c7f6bc5c0d0a6bc8a9ecd..c0979f45de951e6b08ef59c515f7089648ad53ae 100644 --- a/trace_streamer/test/unittest/task_pool_filter_test.cpp +++ b/trace_streamer/test/unittest/task_pool_filter_test.cpp @@ -17,12 +17,12 @@ #include #include +#include "print_event_parser.h" #include "task_pool_filter.h" #include "trace_streamer_filters.h" #include "trace_streamer_selector.h" using namespace testing::ext; -using namespace SysTuning::TraceStreamer; namespace SysTuning { namespace TraceStreamer { class TaskPoolFilterTest : public ::testing::Test { @@ -45,9 +45,10 @@ public: HWTEST_F(TaskPoolFilterTest, CheckTheSameTaskTest, TestSize.Level1) { TS_LOGI("test37-1"); - std::unordered_map executeMap; + DoubleMap executeMap(INVALID_INT32); int32_t executeId = 0; - uint32_t res = stream_.streamFilters_->taskPoolFilter_->CheckTheSameTask(executeId); + uint32_t index = 0; + uint32_t res = stream_.streamFilters_->taskPoolFilter_->CheckTheSameTask(executeId, index); EXPECT_EQ(res, INVALID_INT32); } @@ -59,17 +60,22 @@ HWTEST_F(TaskPoolFilterTest, CheckTheSameTaskTest, TestSize.Level1) HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest1, TestSize.Level1) { TS_LOGI("test37-2"); - std::string taskPoolStr = "H:Task Allocation: taskId : 1, executeId : 1, priority : 1, executeState : 1"; - int32_t index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - auto res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; - EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + std::string comm("e.myapplication"); + uint64_t ts = 89227707307481; + uint32_t pid = 16502; + std::string taskPoolStr("B|16502|H:Task Allocation: taskId : 1, executeId : 9, priority : 1, executeState : 1"); + BytraceLine line; + stream_.traceDataCache_->taskPoolTraceEnabled_ = true; + PrintEventParser printEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + auto res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; + EXPECT_EQ(res, 1); + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, INVALID_INT32); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, INVALID_INT32); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; - EXPECT_EQ(res, 1); + EXPECT_EQ(res, 9); res = stream_.traceDataCache_->GetTaskPoolData()->prioritys_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeStates_[0]; @@ -77,17 +83,17 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest1, TestSize.Level1) res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, INVALID_INT32); - taskPoolStr = "H:Task Perform: taskId : 1, executeId : 1"; - index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + comm = "e.myapplication"; + taskPoolStr = "B|16502|H:Task Perform: taskId : 1, executeId : 9"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, INVALID_INT32); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; - EXPECT_EQ(res, 1); + EXPECT_EQ(res, 9); res = stream_.traceDataCache_->GetTaskPoolData()->prioritys_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeStates_[0]; @@ -95,23 +101,23 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest1, TestSize.Level1) res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, INVALID_INT32); - taskPoolStr = "H:Task PerformTask End: taskId : 1, executeId : 1, performResult : IsCanceled"; - index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + comm = "TaskWorkThread"; + taskPoolStr = "H:Task PerformTask End: taskId : 1, executeId : 9, performResult : IsCanceled"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; - EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, 1); + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; + EXPECT_EQ(res, INVALID_INT32); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; - EXPECT_EQ(res, 1); + EXPECT_EQ(res, 9); res = stream_.traceDataCache_->GetTaskPoolData()->prioritys_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeStates_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; - EXPECT_EQ(res, 0); + EXPECT_EQ(res, INVALID_INT32); } /** @@ -122,14 +128,19 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest1, TestSize.Level1) HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest2, TestSize.Level1) { TS_LOGI("test37-3"); - std::string taskPoolStr = "H:Task Perform: taskId : 1, executeId : 1"; - int32_t index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - auto res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + std::string comm("e.myapplication"); + uint64_t ts = 89227707307481; + uint32_t pid = 16502; + std::string taskPoolStr("B|16502|H:Task Perform: taskId : 1, executeId : 1"); + BytraceLine line; + stream_.traceDataCache_->taskPoolTraceEnabled_ = true; + PrintEventParser printEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + auto res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, INVALID_INT32); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, INVALID_INT32); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; EXPECT_EQ(res, 1); @@ -140,14 +151,14 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest2, TestSize.Level1) res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, INVALID_INT32); - taskPoolStr = "H:Task Allocation: taskId : 1, executeId : 1, priority : 1, executeState : 1"; - index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + comm = "e.myapplication"; + taskPoolStr = "B|16502|H:Task Allocation: taskId : 1, executeId : 1, priority : 1, executeState : 1"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, INVALID_INT32); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; EXPECT_EQ(res, 1); @@ -158,14 +169,14 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest2, TestSize.Level1) res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, INVALID_INT32); - taskPoolStr = "H:Task PerformTask End: taskId : 1, executeId : 1, performResult : IsCanceled"; - index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + comm = "TaskWorkThread"; + taskPoolStr = "B|16502|H:Task PerformTask End: taskId : 1, executeId : 1, performResult : IsCanceled"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; EXPECT_EQ(res, 1); @@ -185,14 +196,19 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest2, TestSize.Level1) HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest3, TestSize.Level1) { TS_LOGI("test37-4"); - std::string taskPoolStr = "H:Task PerformTask End: taskId : 1, executeId : 1, performResult : Successful"; - int32_t index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - auto res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + std::string comm("e.myapplication"); + uint64_t ts = 89227707307481; + uint32_t pid = 16502; + std::string taskPoolStr("B|16502|H:Task PerformTask End: taskId : 1, executeId : 1, performResult : Successful"); + BytraceLine line; + stream_.traceDataCache_->taskPoolTraceEnabled_ = true; + PrintEventParser printEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get()); + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + auto res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, INVALID_INT32); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, INVALID_INT32); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; EXPECT_EQ(res, 1); @@ -203,14 +219,14 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest3, TestSize.Level1) res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, 1); - taskPoolStr = "H:Task Allocation: taskId : 1, executeId : 1, priority : 1, executeState : 1"; - index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + comm = "e.myapplication"; + taskPoolStr = "B|16502|H:Task Allocation: taskId : 1, executeId : 1, priority : 1, executeState : 1"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, INVALID_INT32); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; EXPECT_EQ(res, 1); @@ -221,14 +237,14 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest3, TestSize.Level1) res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, 1); - taskPoolStr = "H:Task Perform: taskId : 1, executeId : 1"; - index = 1; - stream_.streamFilters_->taskPoolFilter_->TaskPoolEvent(taskPoolStr, index); - res = stream_.traceDataCache_->GetTaskPoolData()->allocationTaskIds_[0]; + comm = "TaskWorkThread"; + taskPoolStr = "B|16502|H:Task Perform: taskId : 1, executeId : 1"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->allocationItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->executeTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->executeItids_[0]; EXPECT_EQ(res, 1); - res = stream_.traceDataCache_->GetTaskPoolData()->returnTaskIds_[0]; + res = stream_.traceDataCache_->GetTaskPoolData()->returnItids_[0]; EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->executeIds_[0]; EXPECT_EQ(res, 1); @@ -238,6 +254,12 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest3, TestSize.Level1) EXPECT_EQ(res, 1); res = stream_.traceDataCache_->GetTaskPoolData()->returnStates_[0]; EXPECT_EQ(res, 1); + + comm = "TaskWorkThread"; + taskPoolStr = "B|16502|H:Thread Timeout Exit"; + printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line); + res = stream_.traceDataCache_->GetTaskPoolData()->timeoutRows_[0]; + EXPECT_EQ(res, 3); } } // namespace TraceStreamer } // namespace SysTuning