From b2df16b77e8c33c1628c5dce0f2157562c4c4b91 Mon Sep 17 00:00:00 2001
From: zhangzepeng <zhangzepeng7@huawei.com>
Date: Wed, 13 Mar 2024 16:01:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E2=80=98fix:=E5=8D=A1=E9=A1=BF=E4=B8=A2?=
 =?UTF-8?q?=E5=B8=A7=E4=B8=9A=E5=8A=A1=E6=B8=B2=E6=9F=93=E5=B8=A7=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B91.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3rawtrace=E5=88=87=E5=89=B2=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=982.trace=E9=93=BE=E6=8E=A5=E6=97=A0=E6=B3=95=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E9=97=AE=E9=A2=983.Taskpool=E6=B2=A1=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB=E6=97=B6Tab=E4=BC=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=80=E7=9B=B4=E5=8A=A0=E8=BD=BD4.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3Task-pool=E6=90=9C=E7=B4=A2=E5=90=8E=E6=A1=86=E9=80=89?=
 =?UTF-8?q?=E7=9A=84Tab=E9=A1=B5=E4=BC=9A=E5=87=BA=E7=8E=B0=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=B9=B6=E5=8F=91=E5=BA=A6=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?5.raw-trace=E6=89=A7=E8=A1=8Ctrace-convert=E5=90=8E=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?6.PageFaultTrace=E6=B3=B3=E9=81=93=E5=9B=BEcount=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=88=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E6=8C=89=E6=9C=80=E5=A4=A7=E7=9A=84count=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=897.AppStartups=E5=92=8CStaticInit=E6=B3=B3=E9=81=93?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=97=B6,=E6=B3=B3=E9=81=93=E6=98=8E?=
 =?UTF-8?q?=E6=98=BE=E6=99=83=E5=8A=A8=E9=97=AE=E9=A2=988.=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=8A=A8=E6=95=88=E6=9B=B2=E7=BA=BF=E5=92=8C=E5=B8=A7?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D=E6=9B=B2=E7=BA=BFhover=E9=9A=BE=E4=BB=A5?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=989.trace=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=96=87=E4=BB=B6=E5=8D=A1=E5=9C=A899%=E6=A0=88?=
 =?UTF-8?q?=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangzepeng <zhangzepeng7@huawei.com>
---
 ide/src/base-ui/menu/LitMainMenu.ts           |   4 +
 ide/src/base-ui/select/LitSelect.ts           | 105 +++++++++++---
 ide/src/base-ui/select/LitSelectHtml.ts       |  42 +++++-
 ide/src/base-ui/select/LitSelectOption.ts     |   2 +-
 ide/src/command/Cmd.ts                        |  20 +++
 ide/src/command/CmdConstant.ts                |   1 +
 ide/src/index.ts                              |   2 +-
 ide/src/trace/SpApplication.ts                | 110 +++++++++++++--
 ide/src/trace/bean/BoxSelection.ts            |   2 +-
 ide/src/trace/bean/StateModle.ts              |   1 -
 ide/src/trace/component/SpFlags.ts            |   5 +
 .../trace/component/SpSystemTrace.event.ts    |  10 +-
 ide/src/trace/component/SpSystemTrace.init.ts |  50 +++----
 ide/src/trace/component/SpSystemTrace.ts      |  11 +-
 .../{SpSampleChart.ts => SpBpftraceChart.ts}  |  14 +-
 .../trace/component/chart/SpChartManager.ts   |  12 +-
 ide/src/trace/component/chart/SpCpuChart.ts   |   2 +-
 ide/src/trace/component/chart/SpEBPFChart.ts  |   2 +-
 .../trace/component/chart/SpProcessChart.ts   |  20 ++-
 .../component/setting/SpAllocation.html.ts    |  10 +-
 .../trace/component/setting/SpAllocations.ts  | 111 +++++++++++----
 .../component/trace/base/TraceRowConfig.ts    |  17 ++-
 .../trace/component/trace/base/TraceSheet.ts  |   4 +-
 .../component/trace/base/TraceSheetConfig.ts  |  10 +-
 .../trace/sheet/ark-ts/TabPaneComparison.ts   |  98 +++++++------
 .../TabPaneSampleInstruction.ts               |   2 +-
 .../TabPaneSampleInstructionDistributions.ts  |   4 +-
 .../TabPaneSampleInstructionSelection.ts      |   2 +-
 ...PaneSampleInstructionSelectionTotalTime.ts |   6 +-
 .../trace/sheet/task/TabPaneTaskFrames.ts     |   9 +-
 .../component/trace/timer-shaft/RangeRuler.ts |   2 +-
 ide/src/trace/database/ConvertTraceWorker.ts  |   6 +-
 ide/src/trace/database/SqlLiteWorker.ts       |  19 +++
 .../database/data-trafic/ArkTsReceiver.ts     |  19 ++-
 ide/src/trace/database/sql/Func.sql.ts        |   1 -
 .../database/ui-worker/ProcedureWorker.ts     |   2 +-
 .../ui-worker/ProcedureWorkerAppStartup.ts    |   3 +-
 ...erSample.ts => ProcedureWorkerBpftrace.ts} |   0
 .../ui-worker/ProcedureWorkerCommon.ts        |  22 +++
 .../ui-worker/ProcedureWorkerFrameDynamic.ts  |   2 +-
 .../ui-worker/ProcedureWorkerFrameSpacing.ts  |   2 +-
 .../database/ui-worker/ProcedureWorkerFunc.ts |  24 ++--
 .../ui-worker/ProcedureWorkerSoInit.ts        |  11 +-
 .../ui-worker/ProcedureWorkerThread.ts        |   9 +-
 .../ui-worker/cpu/ProcedureWorkerCPU.ts       |   2 +-
 .../src/filter/animation_filter.cpp           |   3 +-
 trace_streamer/src/filter/animation_filter.h  |   2 +-
 .../src/filter/task_pool_filter.cpp           |   4 +-
 trace_streamer/src/filter/task_pool_filter.h  |   2 +-
 trace_streamer/src/main.cpp                   |   2 +-
 .../src/parser/ebpf_parser/ebpf_splitter.h    |   1 -
 .../src/parser/print_event_parser.cpp         |   4 +
 .../src/parser/print_event_parser.h           |   3 +-
 .../rawtrace_parser/rawtrace_parser.cpp       |   9 +-
 .../src/table/base/include/table_base.h       |   3 +-
 trace_streamer/src/table/base/table_base.cpp  |  19 +++
 .../table/ftrace/cpu_measure_filter_table.cpp |  18 ---
 .../ftrace/include/cpu_measure_filter_table.h |   2 -
 .../src/table/ftrace/include/instants_table.h |   2 -
 .../src/table/ftrace/include/measure_table.h  |   1 -
 .../include/process_measure_filter_table.h    |   2 -
 .../table/ftrace/include/sched_slice_table.h  |   2 -
 .../include/system_event_filter_table.h       |   2 -
 .../table/ftrace/include/thread_state_table.h |   2 -
 .../src/table/ftrace/instants_table.cpp       |  33 -----
 .../src/table/ftrace/measure_table.cpp        |  18 ---
 .../ftrace/process_measure_filter_table.cpp   |  18 ---
 .../src/table/ftrace/sched_slice_table.cpp    |  18 ---
 .../ftrace/system_event_filter_table.cpp      |  18 ---
 .../src/table/ftrace/thread_state_table.cpp   |  18 ---
 trace_streamer/src/version.cpp                |   2 +-
 .../unittest/filter/task_pool_filter_test.cpp | 131 +++++++++++++++++-
 72 files changed, 731 insertions(+), 420 deletions(-)
 rename ide/src/trace/component/chart/{SpSampleChart.ts => SpBpftraceChart.ts} (97%)
 rename ide/src/trace/component/trace/sheet/{sample => bpftrace}/TabPaneSampleInstruction.ts (99%)
 rename ide/src/trace/component/trace/sheet/{sample => bpftrace}/TabPaneSampleInstructionDistributions.ts (99%)
 rename ide/src/trace/component/trace/sheet/{sample => bpftrace}/TabPaneSampleInstructionSelection.ts (99%)
 rename ide/src/trace/component/trace/sheet/{sample => bpftrace}/TabPaneSampleInstructionSelectionTotalTime.ts (98%)
 rename ide/src/trace/database/ui-worker/{ProcedureWorkerSample.ts => ProcedureWorkerBpftrace.ts} (100%)

diff --git a/ide/src/base-ui/menu/LitMainMenu.ts b/ide/src/base-ui/menu/LitMainMenu.ts
index c9f7b4f9..e8884aad 100644
--- a/ide/src/base-ui/menu/LitMainMenu.ts
+++ b/ide/src/base-ui/menu/LitMainMenu.ts
@@ -129,6 +129,9 @@ export class LitMainMenu extends BaseElement {
       let groupDescribe: LitMainMenuGroup = group!.shadowRoot!.querySelector('.group-describe') as LitMainMenuGroup;
       menuBody?.appendChild(group);
       it.children?.forEach((item: any) => {
+        if (item.fileModel !== undefined && item.fileModel === 'db') {
+          return;
+        }
         if (item.children && item.children.length > 0) {
           let secondGroup: LitMainMenuGroup = new LitMainMenuGroup();
           secondGroup.setAttribute('title', item.title || '');
@@ -273,6 +276,7 @@ export interface MenuGroup {
 export interface MenuItem {
   icon: string;
   title: string;
+  fileModel?: string;
   disabled?: boolean;
   fileChoose?: boolean;
   clickHandler?: Function;
diff --git a/ide/src/base-ui/select/LitSelect.ts b/ide/src/base-ui/select/LitSelect.ts
index e72abac2..e086ed9d 100644
--- a/ide/src/base-ui/select/LitSelect.ts
+++ b/ide/src/base-ui/select/LitSelect.ts
@@ -15,11 +15,15 @@
 
 import { BaseElement, element } from '../BaseElement';
 import { selectHtmlStr } from './LitSelectHtml';
+import { LitSelectOption } from './LitSelectOption';
 
 @element('lit-select')
 export class LitSelect extends BaseElement {
   private focused: any;
   private selectInputEl: any;
+  private selectSearchInputEl: HTMLInputElement | null | undefined;
+  private selectOptions: HTMLDivElement | null | undefined;
+  private selectItem: string = '';
   private selectClearEl: any;
   private selectIconEl: any;
   private bodyEl: any;
@@ -38,6 +42,7 @@ export class LitSelect extends BaseElement {
       'list-height',
       'border',
       'mode',
+      'showSearchInput',
     ];
   }
 
@@ -140,19 +145,70 @@ export class LitSelect extends BaseElement {
     }
   }
 
+  get showSearchInput() {
+    return this.hasAttribute('showSearchInput');
+  }
+
+  set showSearchInput(isHide: boolean) {
+    if (isHide) {
+      this.setAttribute('showSearchInput', '');
+    } else {
+      this.removeAttribute('showSearchInput');
+    }
+  }
+
+  set showItem(item: string) {
+    this.selectItem = item;
+  }
+
   set dataSource(selectDataSource: any) {
-    selectDataSource.forEach((dateSourceBean: any) => {
-      let selectOption = document.createElement('lit-select-option');
-      if (dateSourceBean.name) {
-        selectOption.textContent = dateSourceBean.name;
-        selectOption.setAttribute('value', dateSourceBean.name);
-      }
-      this.append(selectOption);
-    });
-    this.initOptions();
+    this.innerHTML = `<slot></slot><slot name="footer"></slot>`;
+    if (selectDataSource.length > 0) {
+      this.bodyEl!.style.display = 'flex';
+      selectDataSource.forEach((dateSourceBean: any) => {
+        let selectOption = document.createElement('lit-select-option');
+        if (dateSourceBean.name) {
+          selectOption.textContent = dateSourceBean.name;
+          selectOption.setAttribute('value', dateSourceBean.name);
+        } else if (dateSourceBean) {
+          selectOption.textContent = dateSourceBean;
+          selectOption.setAttribute('value', dateSourceBean);
+          if (
+            this.selectItem !== '' &&
+            this.selectItem === this.value &&
+            this.selectItem === selectOption.textContent
+          ) {
+            selectOption.setAttribute('selected', '');
+          }
+          this.selectInputEl!.value = '';
+        }
+        this.append(selectOption);
+      });
+      this.initOptions();
+    } else {
+      this.bodyEl!.style.display = 'none';
+    }
   }
 
-  initElements(): void {}
+  initElements(): void {
+    if (this.showSearchInput) {
+      this.shadowRoot!.querySelector<HTMLDivElement>('.body-select')!.style.display = 'block';
+      this.selectSearchInputEl = this.shadowRoot!.querySelector('#search-input') as HTMLInputElement;
+      this.selectSearchInputEl?.addEventListener('keyup', (evt) => {
+        let options = [];
+        options = [...this.querySelectorAll<LitSelectOption>('lit-select-option')];
+        options.filter((a: LitSelectOption) => {
+          if (a.textContent!.indexOf(this.selectSearchInputEl!.value) <= -1) {
+            a.style.display = 'none';
+          } else {
+            a.style.display = 'flex';
+          }
+        });
+        evt.preventDefault();
+        evt.stopPropagation();
+      });
+    }
+  }
 
   initHtml() {
     return `
@@ -168,8 +224,13 @@ export class LitSelect extends BaseElement {
             <lit-icon class="search" name='search'></lit-icon>
         </div>
         <div class="body">
-            <slot></slot>
-            <slot name="footer"></slot>
+            <div class="body-select" style="display: none;">
+                <input id="search-input" placeholder="Search">
+            </div>
+            <div class="body-opt">
+                <slot></slot>
+                <slot name="footer"></slot>
+            </div>
         </div>
         `;
   }
@@ -214,6 +275,7 @@ export class LitSelect extends BaseElement {
     this.selectIconEl = this.shadowRoot!.querySelector('.icon');
     this.selectSearchEl = this.shadowRoot!.querySelector('.search');
     this.selectMultipleRootEl = this.shadowRoot!.querySelector('.multipleRoot');
+    this.selectOptions = this.shadowRoot!.querySelector('.body-opt') as HTMLDivElement;
     this.setEventClick();
     this.setEvent();
     this.selectInputEl.onblur = (ev: any) => {
@@ -238,14 +300,14 @@ export class LitSelect extends BaseElement {
     this.setOnkeydown();
   }
 
-  setOninput():void{
+  setOninput(): void {
     this.selectInputEl.oninput = (ev: any) => {
       let els: Element[] = [...this.querySelectorAll('lit-select-option')];
       if (this.hasAttribute('show-search')) {
         if (!ev.target.value) {
           els.forEach((a: any) => (a.style.display = 'flex'));
         } else {
-          this.setSelectItem(els,ev)
+          this.setSelectItem(els, ev);
         }
       } else {
         this.value = ev.target.value;
@@ -253,7 +315,7 @@ export class LitSelect extends BaseElement {
     };
   }
 
-  setSelectItem(els:Element[],ev:any):void{
+  setSelectItem(els: Element[], ev: any): void {
     els.forEach((a: any) => {
       let value = a.getAttribute('value');
       if (
@@ -267,7 +329,7 @@ export class LitSelect extends BaseElement {
     });
   }
 
-  setEventClick():void{
+  setEventClick(): void {
     this.selectClearEl.onclick = (ev: any) => {
       if (this.isMultiple()) {
         let delNodes: Array<any> = [];
@@ -298,17 +360,15 @@ export class LitSelect extends BaseElement {
         if (this.focused === false) {
           this.selectInputEl.focus();
           this.focused = true;
-          this.bodyEl!.style.display = 'block';
+          this.bodyEl!.style.display = 'flex';
         } else {
-          this.blur();
-          this.bodyEl!.style.display = 'none';
           this.focused = false;
         }
       }
     };
   }
 
-  setEvent():void{
+  setEvent(): void {
     this.onmouseover = this.onfocus = (ev) => {
       if (this.focused === false && this.hasAttribute('adaptive-expansion')) {
         if (this.parentElement!.offsetTop < this.bodyEl!.clientHeight) {
@@ -351,7 +411,7 @@ export class LitSelect extends BaseElement {
     };
   }
 
-  setOnkeydown():void{
+  setOnkeydown(): void {
     this.selectInputEl.onkeydown = (ev: any) => {
       if (ev.key === 'Backspace') {
         if (this.isMultiple()) {
@@ -422,7 +482,7 @@ export class LitSelect extends BaseElement {
     });
   }
 
-  onSelectedEvent(a:Element):void{
+  onSelectedEvent(a: Element): void {
     a.addEventListener('onSelected', (e: any) => {
       if (this.isMultiple()) {
         if (a.hasAttribute('selected')) {
@@ -454,6 +514,7 @@ export class LitSelect extends BaseElement {
         a.removeAttribute('selected');
       } else {
         a.setAttribute('selected', '');
+        this.selectItem = a.textContent!;
       }
       // @ts-ignore
       this.value = e.detail.value;
diff --git a/ide/src/base-ui/select/LitSelectHtml.ts b/ide/src/base-ui/select/LitSelectHtml.ts
index 47aa38f3..785ebaa1 100644
--- a/ide/src/base-ui/select/LitSelectHtml.ts
+++ b/ide/src/base-ui/select/LitSelectHtml.ts
@@ -33,6 +33,7 @@ let css = `
           border: 1px solid var(--bark-prompt,#dcdcdc);
       }
       input{
+          width: 100%;
           border: 0;
           outline: none;
           background-color: transparent;
@@ -54,7 +55,7 @@ let css = `
       }
       .root{
           position: relative;
-          padding: 3px 6px;
+          padding: 1px 8px;
           display: flex;
           align-items: center;
           justify-content: space-between;
@@ -141,10 +142,10 @@ let css = `
       }
       :host(:not([mode]))  input{
           width: 100%;
+          padding: 6px 0px;
       }
       .body{
-          max-height: {1};
-          overflow: auto;
+          max-height: 286px;
           border-radius: 2px;
           box-shadow: 0 5px 15px 0px #00000033;
       }
@@ -174,6 +175,7 @@ let css = `
           display: none;
       }
       .multipleRoot{
+          width:100%;
           display: flex;
           align-items: center;
           flex-flow: wrap;
@@ -208,6 +210,40 @@ let css = `
           color: #999999;
           margin-left: 0px;
       }
+      #search-input {
+        outline: none;
+        border: none;
+        margin-left: 15px;
+      }
+      .body-select {
+        margin-top: 3px;
+        background-color: var(--dark-background4,#fff);
+        width: 100%;
+        border-bottom: none;
+     }
+     .body-opt{
+        width: 100%;
+        max-height: 256px;
+        border-top: none;
+        overflow: auto;
+        border-bottom-left-radius: 10px;
+        border-bottom-right-radius: 10px;
+        background-color: var(--dark-background4,#fff);
+    }
+    input::-webkit-input-placeholder {
+        color: var(--dark-color,#aab2bd);
+    }
+    /*Define the height, width and background of the scroll bar*/
+    ::-webkit-scrollbar{
+        width: 8px;
+        border-radius: 10px;
+        background-color: var(--dark-background3,#FFFFFF);
+    }
+    /*define slider*/
+    ::-webkit-scrollbar-thumb{
+        border-radius: 6px;
+        background-color: var(--dark-background7,rgba(0,0,0,0.1));
+    }
       </style>
 `;
 
diff --git a/ide/src/base-ui/select/LitSelectOption.ts b/ide/src/base-ui/select/LitSelectOption.ts
index de6345c0..a9f58c3c 100644
--- a/ide/src/base-ui/select/LitSelectOption.ts
+++ b/ide/src/base-ui/select/LitSelectOption.ts
@@ -16,7 +16,7 @@
 import { BaseElement } from '../BaseElement';
 import '../icon/LitIcon';
 
-const initHtmlStyle:string = `
+const initHtmlStyle: string = `
     <style>
         :host{ 
             display: flex;
diff --git a/ide/src/command/Cmd.ts b/ide/src/command/Cmd.ts
index f1ab49b9..94a9417f 100644
--- a/ide/src/command/Cmd.ts
+++ b/ide/src/command/Cmd.ts
@@ -196,6 +196,13 @@ export class Cmd {
     }
     return processData;
   }
+  static convertOutPackageList(res: string): string[] {
+    let packageData: string[] = [];
+    res ? (packageData = res.replace(/\r\n/g, '\r').replace(/\n\t/g, '\r').split(/\r/)) : [];
+    packageData.shift();
+    return packageData;
+  }
+
   static getDebugProcess(): Promise<string[]> {
     return new Promise((resolve, reject) => {
       if (SpRecordTrace.isVscode) {
@@ -237,4 +244,17 @@ export class Cmd {
       }
     });
   }
+  static getPackage(): Promise<string[]> {
+    return new Promise((resolve, reject) => {
+      HdcDeviceManager.connect(SpRecordTrace.serialNumber).then((conn) => {
+        if (conn) {
+          HdcDeviceManager.shellResultAsString(CmdConstant.CMD_GET_PACKAGE, false).then((res) => {
+            resolve(Cmd.convertOutPackageList(res));
+          });
+        } else {
+          reject(-1);
+        }
+      });
+    });
+  }
 }
diff --git a/ide/src/command/CmdConstant.ts b/ide/src/command/CmdConstant.ts
index 9cd1d05e..b4d63aef 100644
--- a/ide/src/command/CmdConstant.ts
+++ b/ide/src/command/CmdConstant.ts
@@ -17,6 +17,7 @@ export class CmdConstant {
   static CMD_TRACE_FILE_SIZE = 'hdc_std shell  stat --format=%s ';
   static CMD_SHELL = 'hdc_std shell ';
   static CMD_MOUNT = 'hdc_std shell mount -o remount,rw /';
+  static CMD_GET_PACKAGE = 'hdc_std shell bm dump -a';
   static CMD_GET_PROCESS = 'hdc_std shell ps -A -opid,cmd';
   static CMD_GET_APP_NMAE = 'hdc_std shell ps -A -ocmd';
   static CMD_GET_CPU_COUNT = "hdc_std shell grep -c 'processor' /proc/cpuinfo";
diff --git a/ide/src/index.ts b/ide/src/index.ts
index 1b1fba76..94d26f1a 100644
--- a/ide/src/index.ts
+++ b/ide/src/index.ts
@@ -13,4 +13,4 @@
  * limitations under the License.
  */
 import './trace/SpApplication';
-document.body.innerHTML = '<sp-application wasm query-sql></sp-application>';
+document.body.innerHTML = '<sp-application query-sql></sp-application>';
diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts
index 9ec7d627..ad211310 100644
--- a/ide/src/trace/SpApplication.ts
+++ b/ide/src/trace/SpApplication.ts
@@ -188,8 +188,12 @@ export class SpApplication extends BaseElement {
     return this.hasAttribute('wasm');
   }
 
-  set wasm(d: any) {
-    this.setAttribute('wasm', '');
+  set wasm(isWasm: boolean) {
+    if (isWasm) {
+      this.setAttribute('wasm', '');
+    } else {
+      this.hasAttribute('wasm') && this.removeAttribute('wasm');
+    }
   }
 
   get server(): boolean {
@@ -247,6 +251,7 @@ export class SpApplication extends BaseElement {
   }
 
   initElements(): void {
+    this.wasm = true;
     this.initPlugin();
     this.querySql = true;
     this.rootEL = this.shadowRoot!.querySelector<HTMLDivElement>('.root');
@@ -320,6 +325,7 @@ export class SpApplication extends BaseElement {
   }
 
   private openLongTraceFile(ev: any, isRecordTrace: boolean = false) {
+    this.wasm = true;
     this.openFileInit();
     let detail = (ev as any).detail;
     let initRes = this.longTraceFileInit(isRecordTrace, detail);
@@ -530,13 +536,20 @@ export class SpApplication extends BaseElement {
     this.traceFileName = fileName;
     let showFileName = fileName.lastIndexOf('.') === -1 ? fileName : fileName.substring(0, fileName.lastIndexOf('.'));
     TraceRow.rangeSelectObject = undefined;
-    if (this.sqlite) {
-      info('Parse trace using sql mode');
-      this.handleSqliteMode(ev, showFileName, (ev as any).size, fileName);
-    }
-    if (this.wasm) {
-      info('Parse trace using wasm mode ');
-      this.handleWasmMode(ev, showFileName, (ev as any).size, fileName);
+    let typeHeader = (ev as any).slice(0, 6);
+    let reader: FileReader | null = new FileReader();
+    reader.readAsText(typeHeader);
+    reader.onloadend = (event): void => {
+      let headerStr: string = `${reader?.result}`;
+      if (headerStr.indexOf('SQLite') === 0) {
+        info('Parse trace headerStr sql mode');
+        this.wasm = false;
+        this.handleSqliteMode(ev, showFileName, (ev as any).size, fileName);
+      } else {
+        info('Parse trace using wasm mode ');
+        this.wasm = true;
+        this.handleWasmMode(ev, showFileName, (ev as any).size, fileName);
+      }
     }
   }
 
@@ -545,8 +558,11 @@ export class SpApplication extends BaseElement {
     this.openMenu(false);
     let downloadLineFile = urlParams.get('local') ? false : true;
     this.setProgress(downloadLineFile ? 'download trace file' : 'open trace file');
+    let traceReg = /trace=([^&]*)/;
+    let matchUrl = traceReg.exec(window.location.href as string);
+    let hrefUrl = matchUrl && matchUrl[1];
     this.downloadOnLineFile(
-      urlParams.get('trace') as string,
+      hrefUrl!,
       downloadLineFile,
       (arrayBuf, fileName, showFileName, fileSize) => {
         this.handleWasmMode(new File([arrayBuf], fileName), showFileName, fileSize, fileName);
@@ -775,6 +791,7 @@ export class SpApplication extends BaseElement {
           {
             title: 'Flags',
             icon: 'menu',
+            // fileModel: this.wasm ? 'wasm' : 'db',
             clickHandler: (item: MenuItem): void => {
               this.search = false;
               this.showContent(this.spFlags!);
@@ -798,6 +815,7 @@ export class SpApplication extends BaseElement {
           {
             title: '第三方文件',
             icon: 'file-fill',
+            fileModel: this.wasm ? 'wasm' : 'db',
             clickHandler: (item: MenuItem): void => {
               this.search = false;
               this.showContent(this.spThirdParty!);
@@ -833,12 +851,22 @@ export class SpApplication extends BaseElement {
               second: false,
               icon: '',
               describe: 'Actions on the current trace',
-              children: that.getTraceOptionMenus(showFileName, fileSizeStr, fileName, false),
+              children: that.getTraceOptionMenus(showFileName, fileSizeStr, fileName, true),
+            });
+            that.mainMenu!.menus!.splice(2, 1, {
+              collapsed: false,
+              title: 'Support',
+              second: false,
+              icon: '',
+              describe: 'Support',
+              children: that.getTraceSupportMenus(),
             });
             that.litSearch!.setPercent('', 101);
             that.chartFilter!.setAttribute('mode', '');
             that.progressEL!.loading = false;
             that.freshMenuDisable(false);
+            that.spInfoAndStats!.initInfoAndStatsData();
+            that.cutTraceFile!.style.display = 'none';
           }
         );
       };
@@ -1390,6 +1418,7 @@ export class SpApplication extends BaseElement {
       {
         title: 'Download File',
         icon: 'download',
+        fileModel: this.wasm ? 'wasm' : 'db',
         clickHandler: (): void => {
           this.download(this.mainMenu!, fileName, isServer, dbName);
           SpStatisticsHttpUtil.addOrdinaryVisitAction({
@@ -1397,10 +1426,10 @@ export class SpApplication extends BaseElement {
             action: 'download',
           });
         },
-      },
-      {
+      }, {
         title: 'Download Database',
         icon: 'download',
+        fileModel: this.wasm ? 'wasm' : 'db',
         clickHandler: (): void => {
           this.downloadDB(this.mainMenu!, fileName);
           SpStatisticsHttpUtil.addOrdinaryVisitAction({
@@ -1408,7 +1437,7 @@ export class SpApplication extends BaseElement {
             action: 'download',
           });
         },
-      },
+      }
     ];
     this.getTraceQuerySqlMenus(menus);
     if ((window as any).cpuCount === 0 || !FlagsConfig.getFlagsConfigEnableStatus('SchedulingAnalysis')) {
@@ -1417,6 +1446,56 @@ export class SpApplication extends BaseElement {
     return menus;
   }
 
+  private getTraceSupportMenus(): Array<any> {
+    return [
+      {
+        title: 'Help Documents',
+        icon: 'smart-help',
+        clickHandler: (item: MenuItem): void => {
+          this.spHelp!.dark = this.dark;
+          this.search = false;
+          this.showContent(this.spHelp!);
+          SpStatisticsHttpUtil.addOrdinaryVisitAction({
+            event: 'help_page',
+            action: 'help_doc',
+          });
+        },
+      },
+      {
+        title: 'Flags',
+        icon: 'menu',
+        fileModel: this.wasm ? 'wasm' : 'db',
+        clickHandler: (item: MenuItem): void => {
+          this.search = false;
+          this.showContent(this.spFlags!);
+          SpStatisticsHttpUtil.addOrdinaryVisitAction({
+            event: 'flags',
+            action: 'flags',
+          });
+        },
+      },
+      {
+        title: 'Keyboard Shortcuts',
+        icon: 'smart-help',
+        clickHandler: (item: MenuItem): void => {
+          document.querySelector('body > sp-application')!.shadowRoot!.querySelector<HTMLDivElement>('#sp-keyboard')!.style.visibility = 'visible';
+          SpStatisticsHttpUtil.addOrdinaryVisitAction({
+            event: 'Keyboard Shortcuts',
+            action: 'Keyboard Shortcuts',
+          });
+        },
+      },
+      {
+        title: '第三方文件',
+        icon: 'file-fill',
+        fileModel: this.wasm ? 'wasm' : 'db',
+        clickHandler: (item: MenuItem): void => {
+          this.search = false;
+          this.showContent(this.spThirdParty!);
+        },
+      }]
+  }
+
   private getTraceQuerySqlMenus(menus: Array<any>): void {
     if (this.querySql) {
       if (this.spQuerySQL) {
@@ -1434,6 +1513,7 @@ export class SpApplication extends BaseElement {
         menus.push({
           title: 'Metrics',
           icon: 'metric',
+          fileModel: this.wasm ? 'wasm' : 'db',
           clickHandler: () => {
             this.showContent(this.spMetrics!);
           },
@@ -1966,7 +2046,7 @@ export class SpApplication extends BaseElement {
         }
         let blobUrl = URL.createObjectURL(new Blob([cutBuffer!]));
         window.open(
-          `index.html?link=true&local=true&traceName=${traceName}_cut_${cutLeftTs}${fileType}&trace=${encodeURIComponent(
+          `index.html?link=true&local=true&traceName=${encodeURIComponent(traceName)}_cut_${cutLeftTs}${fileType}&trace=${encodeURIComponent(
             blobUrl
           )}`
         );
diff --git a/ide/src/trace/bean/BoxSelection.ts b/ide/src/trace/bean/BoxSelection.ts
index d47b699a..4ab04f4f 100644
--- a/ide/src/trace/bean/BoxSelection.ts
+++ b/ide/src/trace/bean/BoxSelection.ts
@@ -33,7 +33,7 @@ import { HeapDataInterface } from '../../js-heap/HeapDataInterface';
 import { LitTabs } from '../../base-ui/tabs/lit-tabs';
 import { TabPaneSummary } from '../component/trace/sheet/ark-ts/TabPaneSummary';
 import { JsCpuProfilerStruct } from '../database/ui-worker/ProcedureWorkerCpuProfiler';
-import { SampleStruct } from '../database/ui-worker/ProcedureWorkerSample';
+import { SampleStruct } from '../database/ui-worker/ProcedureWorkerBpftrace';
 
 export class SelectionParam {
   recordStartNs: number = 0;
diff --git a/ide/src/trace/bean/StateModle.ts b/ide/src/trace/bean/StateModle.ts
index 60ca7c95..a415964c 100644
--- a/ide/src/trace/bean/StateModle.ts
+++ b/ide/src/trace/bean/StateModle.ts
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 export class StateGroup {
     SleepingCount: number = 0;
     RunningCount: number = 0;
diff --git a/ide/src/trace/component/SpFlags.ts b/ide/src/trace/component/SpFlags.ts
index 6a37385a..bd520ced 100644
--- a/ide/src/trace/component/SpFlags.ts
+++ b/ide/src/trace/component/SpFlags.ts
@@ -258,6 +258,11 @@ export class FlagsConfig {
       switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }],
       describeContent: 'Ffrt Convert templates',
     },
+    {
+      title: 'Bpftrace',
+      switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }],
+      describeContent: '',
+    },
     {
       title: 'HMKernel',
       switchOptions: [{ option: 'Enabled' }, { option: 'Disabled', selected: true }],
diff --git a/ide/src/trace/component/SpSystemTrace.event.ts b/ide/src/trace/component/SpSystemTrace.event.ts
index 3e9b15b8..a3dac2ee 100644
--- a/ide/src/trace/component/SpSystemTrace.event.ts
+++ b/ide/src/trace/component/SpSystemTrace.event.ts
@@ -30,7 +30,7 @@ import { SoStructOnClick } from "../database/ui-worker/ProcedureWorkerSoInit";
 import { FrameAnimationStructOnClick } from "../database/ui-worker/ProcedureWorkerFrameAnimation";
 import { FrameDynamicStructOnClick } from "../database/ui-worker/ProcedureWorkerFrameDynamic";
 import { FrameSpacingStructOnClick } from "../database/ui-worker/ProcedureWorkerFrameSpacing";
-import { sampleStructOnClick } from "../database/ui-worker/ProcedureWorkerSample";
+import { sampleStructOnClick } from "../database/ui-worker/ProcedureWorkerBpftrace";
 import { SportRuler } from "./trace/timer-shaft/SportRuler";
 import { SpStatisticsHttpUtil } from "../../statistics/util/SpStatisticsHttpUtil";
 import { LitSearch } from "./trace/search/Search";
@@ -677,7 +677,13 @@ function handleClickActions(sp: SpSystemTrace, x: number, y: number, ev: MouseEv
     if (JankStruct.delJankLineFlag) {
       sp.removeLinkLinesByBusinessType('janks');
     }
-    if (rows && rows[0] && rows[0].getHoverStruct()) {
+    let strict = true;
+    let offset = false;
+    if (rows[0].rowType === TraceRow.ROW_TYPE_FRAME_DYNAMIC || rows[0].rowType === TraceRow.ROW_TYPE_FRAME_SPACING) {
+      strict = false;
+      offset = true;
+    }
+    if (rows && rows[0] && rows[0].getHoverStruct(strict, offset)) {
       sp.onClickHandler(rows[0]!.rowType!, rows[0]);
       sp.documentOnMouseMove(ev);
     } else {
diff --git a/ide/src/trace/component/SpSystemTrace.init.ts b/ide/src/trace/component/SpSystemTrace.init.ts
index 6dd46826..79fe63b4 100644
--- a/ide/src/trace/component/SpSystemTrace.init.ts
+++ b/ide/src/trace/component/SpSystemTrace.init.ts
@@ -694,28 +694,7 @@ export function spSystemTraceShowStruct(sp:SpSystemTrace,previous: boolean, curr
     }
     let findIndex = spSystemTraceShowStructFindIndex(sp,previous,currentIndex,structs,retargetIndex);
     let findEntry: any;
-    if (findIndex >= 0) {
-        findEntry = structs[findIndex];
-    } else {
-        if (previous) {
-            for (let i = structs.length - 1; i >= 0; i--) {
-                let it = structs[i];
-                if (it.startTime! + it.dur! < TraceRow.range!.startNS) {
-                    findIndex = i;
-                    break;
-                }
-            }
-            if (findIndex == -1) {
-                findIndex = structs.length - 1;
-            }
-        } else {
-            findIndex = structs.findIndex((it) => it.startTime! > TraceRow.range!.endNS);
-            if (findIndex == -1) {
-                findIndex = 0;
-            }
-        }
-        findEntry = structs[findIndex];
-    }
+    findEntry = structs[findIndex];
     moveRangeToCenterAndHighlight(sp, findEntry);
     return findIndex;
 }
@@ -727,7 +706,6 @@ function spSystemTraceShowStructFindIndex(sp: SpSystemTrace,  previous: boolean,
     if (previous) {
         if (retargetIndex) {
             findIndex = retargetIndex - 1;
-            SpSystemTrace.retargetIndex = findIndex;
         } else {
             for (let i = structs.length - 1; i >= 0; i--) {
                 let it = structs[i];
@@ -739,26 +717,38 @@ function spSystemTraceShowStructFindIndex(sp: SpSystemTrace,  previous: boolean,
                     findIndex = i;
                     break;
                 }
+                if (it.startTime! + it.dur! <= TraceRow.range!.startNS) {
+                    findIndex = i;
+                    break;
+                }
+            }
+            if (findIndex == -1) {
+                findIndex = structs.length - 1;
             }
         }
     } else {
+        //左滑
         if (SpSystemTrace.currentStartTime > TraceRow.range!.startNS) {
             SpSystemTrace.currentStartTime = TraceRow.range!.startNS;
             if (structs[currentIndex].startTime < TraceRow.range!.startNS || structs[currentIndex].startTime! + structs[currentIndex].dur! > TraceRow.range!.endNS) {
                 currentIndex = -1;
             }
         }
-        if (SpSystemTrace.currentStartTime !== 0 && SpSystemTrace.currentStartTime < TraceRow.range!.startNS) {
-            SpSystemTrace.currentStartTime = 0;
-            SpSystemTrace.retargetIndex = 0;
-        }
         findIndex = structs.findIndex((it, idx) => {
-            return (
-                idx > currentIndex &&
+            if (idx > currentIndex &&
                 it.startTime! >= TraceRow.range!.startNS &&
                 it.startTime! + it.dur! <= TraceRow.range!.endNS
-            );
+            ) {
+                return true;
+            }
+            if (it.startTime! >= TraceRow.range!.endNS) {
+                return true
+            }
         });
+        if (findIndex == -1) {
+            findIndex = 0;
+        }
+
     }
     return findIndex;
 }
diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts
index 5695ff61..7cec17a9 100644
--- a/ide/src/trace/component/SpSystemTrace.ts
+++ b/ide/src/trace/component/SpSystemTrace.ts
@@ -120,7 +120,7 @@ import spSystemTraceOnClickHandler, {
   spSystemTraceDocumentOnMouseOut,
   spSystemTraceDocumentOnMouseUp,
 } from './SpSystemTrace.event';
-import { SampleStruct } from '../database/ui-worker/ProcedureWorkerSample';
+import { SampleStruct } from '../database/ui-worker/ProcedureWorkerBpftrace';
 
 function dpr(): number {
   return window.devicePixelRatio || 1;
@@ -206,7 +206,6 @@ export class SpSystemTrace extends BaseElement {
   _slicesList: Array<SlicesTime> = [];
   _flagList: Array<any> = [];
   static currentStartTime: number = 0;
-  static retargetIndex: number = 0;
 
   set snapshotFile(data: FileInfo) {
     this.snapshotFiles = data;
@@ -776,9 +775,9 @@ export class SpSystemTrace extends BaseElement {
       JankStruct.selectJankStruct ||
       AppStartupStruct.selectStartupStruct ||
       SoStruct.selectSoStruct ||
+      SampleStruct.selectSampleStruct ||
       AllAppStartupStruct.selectStartupStruct ||
       FrameAnimationStruct.selectFrameAnimationStruct ||
-      SampleStruct.selectSampleStruct ||
       JsCpuProfilerStruct.selectJsCpuProfilerStruct;
     this.calculateSlicesTime(selectedStruct, shiftKey);
 
@@ -1344,7 +1343,7 @@ export class SpSystemTrace extends BaseElement {
     this.addEventListener('click', this.documentOnClick);
     this.addEventListener('mousedown', this.documentOnMouseDown);
     this.addEventListener('mouseup', this.documentOnMouseUp);
-    this.addEventListener('mouseout', this.documentOnMouseOut);  
+    this.addEventListener('mouseout', this.documentOnMouseOut);
 
     document.addEventListener('keydown', this.documentOnKeyDown);
     document.addEventListener('keypress', this.documentOnKeyPress);
@@ -1778,7 +1777,9 @@ export class SpSystemTrace extends BaseElement {
       this.hoverStructNull();
       this.selectStructNull();
       this.wakeupListNull();
-      this.onClickHandler(TraceRow.ROW_TYPE_FUNC);
+      setTimeout(() => {
+        this.onClickHandler(TraceRow.ROW_TYPE_FUNC);
+      }, 0)
       FuncStruct.hoverFuncStruct = entry;
       FuncStruct.selectFuncStruct = entry;
       this.scrollToDepth(`${funcRowID}`, `${funcStract.pid}`, 'func', true, entry.depth || 0);
diff --git a/ide/src/trace/component/chart/SpSampleChart.ts b/ide/src/trace/component/chart/SpBpftraceChart.ts
similarity index 97%
rename from ide/src/trace/component/chart/SpSampleChart.ts
rename to ide/src/trace/component/chart/SpBpftraceChart.ts
index 463f9e63..19fdd265 100644
--- a/ide/src/trace/component/chart/SpSampleChart.ts
+++ b/ide/src/trace/component/chart/SpBpftraceChart.ts
@@ -16,10 +16,10 @@
 import { SpSystemTrace } from '../SpSystemTrace';
 import { TraceRow } from '../trace/base/TraceRow';
 import { renders } from '../../database/ui-worker/ProcedureWorker';
-import { SampleStruct, SampleRender } from '../../database/ui-worker/ProcedureWorkerSample';
+import { SampleStruct, SampleRender } from '../../database/ui-worker/ProcedureWorkerBpftrace';
 import { queryStartTime } from '../../database/sql/SqlLite.sql';
 
-export class SpSampleChart {
+export class SpBpftraceChart {
   private trace: SpSystemTrace;
   
   constructor(trace: SpSystemTrace) {
@@ -39,13 +39,13 @@ export class SpSampleChart {
 
   async initSample(start_ts: number, file: any): Promise<TraceRow<SampleStruct>> {
     let traceRow =  TraceRow.skeleton<SampleStruct>();
-    traceRow.rowId = 'Sample';
+    traceRow.rowId = 'bpftrace';
     traceRow.index = 0;
     traceRow.rowType = TraceRow.ROW_TYPE_SAMPLE;
     traceRow.rowParentId = '';
     traceRow.folder = false;
     traceRow.style.height = '40px';
-    traceRow.name = 'Sample';
+    traceRow.name = 'bpftrace';
     traceRow.selectChangeHandler = this.trace.selectChangeHandler;
     traceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler;
     traceRow.findHoverStruct = () => {
@@ -80,7 +80,7 @@ export class SpSampleChart {
             {
               context: context,
               useCache: useCache,
-              type: 'sample',
+              type: 'bpftrace',
               start_ts: startTS,
               uniqueProperty: uniqueProperty,
               flattenTreeArray: flattenTreeArray
@@ -102,8 +102,8 @@ export class SpSampleChart {
    */
   addTraceRowEventListener(row: TraceRow<any>, start_ts: number) {
     row.uploadEl?.addEventListener('sample-file-change', (e: any) => {
-      this.resetChartData(row);
       this.getJsonData(e).then((res: any) => {
+        this.resetChartData(row);
         const propertyData = res.data;
         const treeNodes = res.relation.children || [res.relation.RS.children[0]];
         const uniqueProperty = this.removeDuplicates(propertyData);
@@ -127,7 +127,7 @@ export class SpSampleChart {
             {
               context: context,
               useCache: useCache,
-              type: 'sample',
+              type: 'bpftrace',
               start_ts: startTS,
               uniqueProperty: uniqueProperty,
               flattenTreeArray: flattenTreeArray
diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts
index 0c5258e9..a89d811c 100644
--- a/ide/src/trace/component/chart/SpChartManager.ts
+++ b/ide/src/trace/component/chart/SpChartManager.ts
@@ -52,7 +52,7 @@ import { queryTaskPoolCallStack, queryTotalTime } from '../../database/sql/SqlLi
 import { getCpuUtilizationRate } from '../../database/sql/Cpu.sql';
 import { queryMemoryConfig } from '../../database/sql/Memory.sql';
 import { SpLtpoChart } from './SpLTPO';
-import { SpSampleChart } from './SpSampleChart';
+import { SpBpftraceChart } from './SpBpftraceChart';
 
 export class SpChartManager {
   static APP_STARTUP_PID_ARR: Array<number> = [];
@@ -79,7 +79,7 @@ export class SpChartManager {
   private logChart: SpLogChart;
   private spHiSysEvent: SpHiSysEventChart;
   private spSegmentationChart: SpSegmentationChart;
-  private spSampleChart: SpSampleChart;
+  private spBpftraceChart: SpBpftraceChart;
 
   constructor(trace: SpSystemTrace) {
     this.trace = trace;
@@ -104,7 +104,7 @@ export class SpChartManager {
     this.spAllAppStartupsChart = new SpAllAppStartupsChart(trace);
     this.SpLtpoChart = new SpLtpoChart(trace);
     this.spSegmentationChart = new SpSegmentationChart(trace);
-    this.spSampleChart = new SpSampleChart(trace);
+    this.spBpftraceChart = new SpBpftraceChart(trace);
   }
 
   async init(progress: Function) {
@@ -131,7 +131,9 @@ export class SpChartManager {
     progress('cpu', 70);
     await this.cpu.init();
     info('initData cpu Data initialized');
-    await this.spSampleChart.init(null);
+    if (FlagsConfig.getFlagsConfigEnableStatus('Bpftrace')) {
+      await this.spBpftraceChart.init(null);
+    }
     progress('process/thread state', 73);
     await this.cpu.initProcessThreadStateData(progress);
     if (FlagsConfig.getFlagsConfigEnableStatus('SchedulingAnalysis')) {
@@ -203,7 +205,7 @@ export class SpChartManager {
 
   async initSample(ev: File) {
     await this.initSampleTime();
-    await this.spSampleChart.init(ev);
+    await this.spBpftraceChart.init(ev);
   }
 
   async importSoFileUpdate() {
diff --git a/ide/src/trace/component/chart/SpCpuChart.ts b/ide/src/trace/component/chart/SpCpuChart.ts
index a0b0e25a..c00df099 100644
--- a/ide/src/trace/component/chart/SpCpuChart.ts
+++ b/ide/src/trace/component/chart/SpCpuChart.ts
@@ -55,7 +55,7 @@ export class SpCpuChart {
           traceRow.rowId = `${cpuId}`;
           traceRow.rowType = TraceRow.ROW_TYPE_CPU;
           traceRow.rowParentId = '';
-          traceRow.style.height = '40px';
+          traceRow.style.height = '30px';
           traceRow.name = `Cpu ${cpuId}`;
           traceRow.favoriteChangeHandler = this.trace.favoriteChangeHandler;
           traceRow.selectChangeHandler = this.trace.selectChangeHandler;
diff --git a/ide/src/trace/component/chart/SpEBPFChart.ts b/ide/src/trace/component/chart/SpEBPFChart.ts
index 851b3663..7527a52a 100644
--- a/ide/src/trace/component/chart/SpEBPFChart.ts
+++ b/ide/src/trace/component/chart/SpEBPFChart.ts
@@ -343,7 +343,7 @@ export class SpEBPFChart {
     vmTraceRow.selectChangeHandler = this.trace.selectChangeHandler;
     vmTraceRow.focusHandler = () => this.focusHandler(vmTraceRow);
     vmTraceRow.findHoverStruct = () => {
-      EBPFChartStruct.hoverEBPFStruct = vmTraceRow.getHoverStruct(false);
+      EBPFChartStruct.hoverEBPFStruct = vmTraceRow.getHoverStruct(false, false, 'size');
     };
     vmTraceRow.onThreadHandler = (useCache) => {
       let context: CanvasRenderingContext2D;
diff --git a/ide/src/trace/component/chart/SpProcessChart.ts b/ide/src/trace/component/chart/SpProcessChart.ts
index ace08eea..9bf06a9f 100644
--- a/ide/src/trace/component/chart/SpProcessChart.ts
+++ b/ide/src/trace/component/chart/SpProcessChart.ts
@@ -148,7 +148,7 @@ export class SpProcessChart {
             });
             if (funcRow && !funcRow.isComplete) {
               let max = Math.max(...asyncFuncGroups.map((it) => it.depth || 0)) + 1;
-              let maxHeight = max * 20;
+              let maxHeight = max * 18 + 6;
               funcRow.style.height = `${maxHeight}px`;
               funcRow.setAttribute('height', `${maxHeight}`);
             }
@@ -758,7 +758,7 @@ export class SpProcessChart {
       threadRow.rowParentId = `${it.pid}`;
       threadRow.rowHidden = !processRow.expansion;
       threadRow.index = j;
-      threadRow.style.height = '30px';
+      threadRow.style.height = '18px';
       threadRow.style.width = '100%';
       threadRow.name = `${thread.threadName || 'Thread'} ${thread.tid}`;
       threadRow.namePrefix = `${thread.threadName || 'Thread'}`;
@@ -839,7 +839,7 @@ export class SpProcessChart {
       }
       if (this.threadFuncMaxDepthMap.get(`${thread.upid}-${thread.tid}`) != undefined) {
         let max = this.threadFuncMaxDepthMap.get(`${thread.upid}-${thread.tid}`) || 1;
-        let maxHeight = max * 20;
+        let maxHeight = max * 18 + 6;
         let funcRow = TraceRow.skeleton<FuncStruct>();
         funcRow.rowId = `${thread.tid}`;
         funcRow.rowType = TraceRow.ROW_TYPE_FUNC;
@@ -987,6 +987,17 @@ export class SpProcessChart {
       }
     });
   }
+  private calMaxHeight(asyncFunctions: any[]) : number{
+    let max = 0;
+    asyncFunctions.forEach((it) => {
+      const depth = it.depth || 0;
+      if (depth > max) {
+        max = depth;
+      }
+    });
+    max += 1;
+    return max * 18 + 6;;
+  }
 
   //Async Function
   addAsyncFunction(it: { pid: number; processName: string | null }, processRow: TraceRow<ProcessStruct>) {
@@ -1014,8 +1025,7 @@ export class SpProcessChart {
           asyncFunctions[index].depth = currentDepth;
           depthArray[currentDepth] = asyncFunctions[index];
         });
-        let max = Math.max(...asyncFunctions.map((it) => it.depth || 0)) + 1;
-        let maxHeight = max * 20;
+        const maxHeight = this.calMaxHeight(asyncFunctions);
         let funcRow = TraceRow.skeleton<FuncStruct>();
         funcRow.rowId = `${asyncFunctions[0].funName}-${it.pid}`;
         funcRow.asyncFuncName = asyncFunctions[0].funName;
diff --git a/ide/src/trace/component/setting/SpAllocation.html.ts b/ide/src/trace/component/setting/SpAllocation.html.ts
index 2aeb248a..48bc3b2f 100644
--- a/ide/src/trace/component/setting/SpAllocation.html.ts
+++ b/ide/src/trace/component/setting/SpAllocation.html.ts
@@ -127,9 +127,10 @@ input::-webkit-input-placeholder{
 #two_kb{
     background-color:var(--dark-background5, #FFFFFF)
 }
-.processSelect {
-  border-radius: 15px;
-  width: 84%;
+.processSelect, .packageSelect {
+    border-radius: 15px;
+    width: 84%;
+    height: 27px;
 }
 .value-range {
   opacity: 0.6;
@@ -220,6 +221,9 @@ lit-switch {
      <lit-select-v class="processSelect" rounded mode="multiple" default-value="" id="pid" 
      placement="bottom" title="process" placeholder="please select process">
      </lit-select-v>
+     <lit-select default-value="" rounded="" class="packageSelect" canInsert="" id="packageName"
+     title="package" rounded placement = "bottom" placeholder="please select package" showSearchInput>
+     </lit-select>
   </div>
   <div class="allocation-application">
     <span class="allocation-inner-font-style" >Max unwind level</span>
diff --git a/ide/src/trace/component/setting/SpAllocations.ts b/ide/src/trace/component/setting/SpAllocations.ts
index 3c1e45d8..4e0b77d6 100644
--- a/ide/src/trace/component/setting/SpAllocations.ts
+++ b/ide/src/trace/component/setting/SpAllocations.ts
@@ -21,20 +21,13 @@ import LitSwitch from '../../../base-ui/switch/lit-switch';
 import { LitSlider } from '../../../base-ui/slider/LitSlider';
 import { LitSelectV } from '../../../base-ui/select/LitSelectV';
 import { SpAllocationHtml } from './SpAllocation.html';
-import {
-  NUM_16384,
-  NUM_1800,
-  NUM_30,
-  NUM_300,
-  NUM_3600,
-  NUM_450,
-  NUM_60,
-  NUM_600
-} from '../../bean/NumBean';
+import { NUM_16384, NUM_1800, NUM_30, NUM_300, NUM_3600, NUM_450, NUM_60, NUM_600 } from '../../bean/NumBean';
+import { LitSelect } from '../../../base-ui/select/LitSelect';
 
 @element('sp-allocations')
 export class SpAllocations extends BaseElement {
   private processId: LitSelectV | null | undefined;
+  private packageName: LitSelect | null | undefined;
   private unwindEL: HTMLInputElement | null | undefined;
   private shareMemory: HTMLInputElement | null | undefined;
   private shareMemoryUnit: HTMLSelectElement | null | undefined;
@@ -64,17 +57,17 @@ export class SpAllocations extends BaseElement {
   }
 
   get appProcess(): string {
-    return this.processId!.value || '';
+    return this.processId!.value || this.packageName!.value || '';
   }
 
   get unwind(): number {
-    log(`unwind value is :${  this.unwindEL!.value}`);
+    log(`unwind value is :${this.unwindEL!.value}`);
     return Number(this.unwindEL!.value);
   }
 
   get shared(): number {
     let value = this.shareMemory?.value || '';
-    log(`shareMemory value is :${  value}`);
+    log(`shareMemory value is :${value}`);
     if (value !== '') {
       return Number(this.shareMemory?.value) || NUM_16384;
     }
@@ -83,7 +76,7 @@ export class SpAllocations extends BaseElement {
 
   get filter(): number {
     let value = this.filterMemory?.value || '';
-    log(`filter value is :${  value}`);
+    log(`filter value is :${value}`);
     if (value !== '') {
       return Number(value);
     }
@@ -153,7 +146,7 @@ export class SpAllocations extends BaseElement {
 
   get expandPids(): number[] {
     let allPidList: number[] = [];
-    if (this.processId?.value.length > 0) {
+    if (this.processId!.value.length > 0) {
       let result = this.processId?.value.match(/\((.+?)\)/g);
       if (result) {
         for (let index = 0; index < result.length; index++) {
@@ -180,9 +173,10 @@ export class SpAllocations extends BaseElement {
     this.statisticsSlider?.addEventListener('input', this.statisticsSliderInputHandler);
     this.intervalResultInput?.addEventListener('input', this.intervalResultInputHandler);
     this.intervalResultInput?.addEventListener('focusout', this.intervalResultFocusOutHandler);
-    this.statisticsSlider?.shadowRoot?.querySelector<HTMLElement>('#slider')!.
-      addEventListener('mouseup', this.statisticsSliderMouseupHandler);
-    this.startupMode?.addEventListener('change',this.startupModeChangeHandler);
+    this.statisticsSlider?.shadowRoot
+      ?.querySelector<HTMLElement>('#slider')!
+      .addEventListener('mouseup', this.statisticsSliderMouseupHandler);
+    this.startupMode?.addEventListener('change', this.startupModeChangeHandler);
   }
 
   disconnectedCallback(): void {
@@ -195,9 +189,10 @@ export class SpAllocations extends BaseElement {
     this.statisticsSlider?.removeEventListener('input', this.statisticsSliderInputHandler);
     this.intervalResultInput?.removeEventListener('input', this.intervalResultInputHandler);
     this.intervalResultInput?.removeEventListener('focusout', this.intervalResultFocusOutHandler);
-    this.statisticsSlider?.shadowRoot?.querySelector<HTMLElement>('#slider')!.
-      removeEventListener('mouseup', this.statisticsSliderMouseupHandler);
-    this.startupMode?.removeEventListener('change',this.startupModeChangeHandler);
+    this.statisticsSlider?.shadowRoot
+      ?.querySelector<HTMLElement>('#slider')!
+      .removeEventListener('mouseup', this.statisticsSliderMouseupHandler);
+    this.startupMode?.removeEventListener('change', this.startupModeChangeHandler);
   }
 
   handleInputChange = (ev: KeyboardEvent): void => {
@@ -210,10 +205,16 @@ export class SpAllocations extends BaseElement {
   initElements(): void {
     this.filterSize = this.shadowRoot?.querySelector('#filterSized');
     this.processId = this.shadowRoot?.getElementById('pid') as LitSelectV;
+    this.packageName = this.shadowRoot?.getElementById('packageName') as LitSelect;
+    this.packageName.style.display = 'none';
     let process = this.processId.shadowRoot?.querySelector('input') as HTMLInputElement;
     process!.addEventListener('mousedown', () => {
       this.processMouseDownHandler(process);
     });
+    let packageInput = this.packageName.shadowRoot?.querySelector('input') as HTMLInputElement;
+    packageInput!.addEventListener('mousedown', () => {
+      this.packageMouseDownHandler(packageInput);
+    });
     this.unwindEL = this.shadowRoot?.getElementById('unwind') as HTMLInputElement;
     this.shareMemory = this.shadowRoot?.getElementById('shareMemory') as HTMLInputElement;
     this.shareMemoryUnit = this.shadowRoot?.getElementById('shareMemoryUnit') as HTMLSelectElement;
@@ -252,16 +253,40 @@ export class SpAllocations extends BaseElement {
         this.disable();
       }
     });
+    this.initProcessInputStatus();
     this.disable();
   }
 
+  private initProcessInputStatus(): void {
+    this.packageName!.style.display = 'none';
+    this.processId!.style.display = 'block';
+    let process = this.processId?.shadowRoot?.querySelector('.root') as HTMLDivElement;
+    if (process) {
+      process.style.width = 'auto';
+    }
+  }
+
   startupModeChangeHandler = (): void => {
     let process = this.processId?.shadowRoot?.querySelector('input') as HTMLInputElement;
+    let processDiv = this.processId?.shadowRoot?.querySelector('.root') as HTMLDivElement;
     process.value = '';
+    let packageInput = this.packageName?.shadowRoot?.querySelector('input') as HTMLInputElement;
+    let packageDiv = this.packageName?.shadowRoot?.querySelector('.root') as HTMLDivElement;
+    packageInput.value = '';
     if (this.startup_mode) {
-      process!.placeholder = 'please input process';
+      this.packageName!.showItem = '';
+      this.packageName!.style.display = 'block';
+      this.processId!.style.display = 'none';
+      packageDiv.style.width = 'auto';
+      packageInput!.placeholder = 'please select package';
+      this.processId!.dataSource([], '');
     } else {
+      this.processId!.showItems = [];
+      this.packageName!.style.display = 'none';
+      this.processId!.style.display = 'block';
+      processDiv.style.width = 'auto';
       process!.placeholder = 'please select process';
+      this.packageName!.dataSource = [];
     }
   };
 
@@ -270,8 +295,8 @@ export class SpAllocations extends BaseElement {
       let percentValue = this.recordStatisticsResult!.getAttribute('percent');
       let index = Math.round(Number(percentValue) / NUM_450);
       index = index < 1 ? 0 : index;
-      this.intervalResultInput!.value = `${stepValue[index]  }`;
-      this.recordStatisticsResult!.setAttribute('percentValue', `${stepValue[index]  }`);
+      this.intervalResultInput!.value = `${stepValue[index]}`;
+      this.recordStatisticsResult!.setAttribute('percentValue', `${stepValue[index]}`);
     });
   };
 
@@ -308,16 +333,16 @@ export class SpAllocations extends BaseElement {
   };
 
   private processMouseDownHandler(process: HTMLInputElement): void {
-    if (this.startSamp) {
-      process.readOnly = false;
+    if (this.startSamp && !this.startup_mode) {
       Cmd.getProcess().then((processList) => {
         this.processId?.dataSource(processList, '');
-        if (processList.length > 0 && !this.startup_mode) {
+        if (processList.length > 0) {
           this.processId?.dataSource(processList, 'ALL-Process');
         } else {
           this.processId?.dataSource([], '');
         }
       });
+      process.readOnly = false;
     } else {
       process.readOnly = true;
       return;
@@ -327,6 +352,21 @@ export class SpAllocations extends BaseElement {
     } else {
     }
   }
+  private packageMouseDownHandler(packageInput: HTMLInputElement): void {
+    if (this.startSamp && this.startup_mode) {
+      Cmd.getPackage().then((packageList) => {
+        if (packageList.length > 0) {
+          this.packageName!.dataSource = packageList;
+        } else {
+          this.packageName!.dataSource = [];
+        }
+      });
+      packageInput.readOnly = false;
+    } else {
+      packageInput.readOnly = true;
+      return;
+    }
+  }
 
   intervalResultInputHandler = (): void => {
     let parentElement = this.statisticsSlider!.parentNode as Element;
@@ -341,8 +381,10 @@ export class SpAllocations extends BaseElement {
       parentElement.setAttribute('percent', '3600');
       return;
     }
-    if (Number(this.intervalResultInput!.value) < this.statisticsSlider!.sliderStyle.minRange ||
-      Number(this.intervalResultInput!.value) > this.statisticsSlider!.sliderStyle.maxRange) {
+    if (
+      Number(this.intervalResultInput!.value) < this.statisticsSlider!.sliderStyle.minRange ||
+      Number(this.intervalResultInput!.value) > this.statisticsSlider!.sliderStyle.maxRange
+    ) {
       this.intervalResultInput!.style.color = 'red';
       parentElement.setAttribute('percent', '3600');
     } else {
@@ -398,11 +440,15 @@ export class SpAllocations extends BaseElement {
     if (this.sampleInterval) {
       this.sampleInterval.disabled = false;
     }
-    this.processId!.removeAttribute('disabled');
     let inputBoxes = this.shadowRoot?.querySelectorAll<HTMLInputElement>('.inputBoxes');
     inputBoxes!.forEach((item) => {
       item.disabled = false;
     });
+    if (this.startup_mode) {
+      this.packageName!.removeAttribute('disabled');
+    } else {
+      this.processId!.removeAttribute('disabled');
+    }
     this.statisticsSlider!.disabled = false;
   }
 
@@ -431,6 +477,11 @@ export class SpAllocations extends BaseElement {
     inputBoxes!.forEach((item) => {
       item.disabled = true;
     });
+    if (this.startup_mode) {
+      this.packageName!.setAttribute('disabled', '');
+    } else {
+      this.processId!.setAttribute('disabled', '');
+    }
     this.statisticsSlider!.disabled = true;
   }
 
diff --git a/ide/src/trace/component/trace/base/TraceRowConfig.ts b/ide/src/trace/component/trace/base/TraceRowConfig.ts
index 9c0bd200..6d6262c3 100644
--- a/ide/src/trace/component/trace/base/TraceRowConfig.ts
+++ b/ide/src/trace/component/trace/base/TraceRowConfig.ts
@@ -561,12 +561,15 @@ export class TraceRowConfig extends BaseElement {
           });
         }
       }
+      let subsystemList = [];
       for (let subIndex = 0; subIndex < subsystemsData.length; subIndex++) {
         let currentSystemData = subsystemsData[subIndex];
-        if(!currentSystemData.hasOwnProperty('subsystem') || Array.isArray(currentSystemData.subsystem)) {
+        if(!currentSystemData.hasOwnProperty('subsystem') || currentSystemData.subsystem === '' ||
+          subsystemList.indexOf(currentSystemData.subsystem) > -1 || Array.isArray(currentSystemData.subsystem)) {
           continue;
         }
         let currentSubName = currentSystemData.subsystem;
+        subsystemList.push(currentSystemData.subsystem);
         id++;
         let subsystemStruct: SubsystemNode = {
           id: id,
@@ -583,7 +586,8 @@ export class TraceRowConfig extends BaseElement {
           }
           for (let compIndex = 0; compIndex < currentCompDates.length; compIndex++) {
             let currentCompDate = currentCompDates[compIndex];
-            if(!currentCompDate.hasOwnProperty('component') && !currentCompDate.hasOwnProperty('charts')) {
+            if(!currentCompDate.hasOwnProperty('component') || currentCompDate.component === '' ||
+              !currentCompDate.hasOwnProperty('charts')) {
               continue;
             }
             let currentCompName = currentCompDate.component;
@@ -619,18 +623,21 @@ export class TraceRowConfig extends BaseElement {
                     chartId = match[0].trim();
                     name = item.name.split(match[0])[0];
                     if (name !== 'Cpu') {
-                      if ((currentChartName !== undefined && name.toLowerCase().endsWith(currentChartName.toLowerCase())) || currentChartId === chartId) {
+                      if ((currentChartName !== undefined && currentChartName !== '' &&
+                        name.toLowerCase().endsWith(currentChartName.toLowerCase())) || currentChartId === chartId) {
                         scene.push(...item.templateType);
                         findChartNames.push(item.name);
                       }
                     } else {
-                      if ((currentChartName !== undefined && name.toLowerCase().endsWith(currentChartName.toLowerCase()))) {
+                      if ((currentChartName !== undefined && currentChartName !== '' &&
+                        name.toLowerCase().endsWith(currentChartName.toLowerCase()))) {
                         scene.push(...item.templateType);
                         findChartNames.push(item.name);
                       }
                     }
                   } else {
-                    if ((currentChartName !== undefined && name.toLowerCase().endsWith(currentChartName.toLowerCase()))) {
+                    if ((currentChartName !== undefined && currentChartName !== '' &&
+                      name.toLowerCase().endsWith(currentChartName.toLowerCase()))) {
                       scene.push(...item.templateType);
                       findChartNames.push(item.name);
                     }
diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts
index 8efd91ff..aff87733 100644
--- a/ide/src/trace/component/trace/base/TraceSheet.ts
+++ b/ide/src/trace/component/trace/base/TraceSheet.ts
@@ -82,8 +82,8 @@ import { type LitPageTable } from '../../../../base-ui/table/LitPageTable';
 import '../../../../base-ui/popover/LitPopoverV';
 import { LitPopover } from '../../../../base-ui/popover/LitPopoverV';
 import { LitTree, TreeItemData } from '../../../../base-ui/tree/LitTree';
-import { SampleStruct } from '../../../database/ui-worker/ProcedureWorkerSample';
-import { TabPaneSampleInstruction } from '../sheet/sample/TabPaneSampleInstruction';
+import { SampleStruct } from '../../../database/ui-worker/ProcedureWorkerBpftrace';
+import { TabPaneSampleInstruction } from '../sheet/bpftrace/TabPaneSampleInstruction';
 import { TabPaneFreqStatesDataCut } from '../sheet/states/TabPaneFreqStatesDataCut';
 
 @element('trace-sheet')
diff --git a/ide/src/trace/component/trace/base/TraceSheetConfig.ts b/ide/src/trace/component/trace/base/TraceSheetConfig.ts
index 3ee495c3..87a57d42 100644
--- a/ide/src/trace/component/trace/base/TraceSheetConfig.ts
+++ b/ide/src/trace/component/trace/base/TraceSheetConfig.ts
@@ -127,11 +127,11 @@ import { TabPaneBinderDataCut } from '../sheet/binder/TabPaneBinderDataCut';
 import { TabPaneBinders } from '../sheet/binder/TabPaneBinders';
 import { TabPaneGpufreq } from '../sheet/gpufreq/TabPaneGpufreqUsage';
 import { TabPaneGpufreqDataCut } from '../sheet/gpufreq/TabPaneGpufreqDataCut';
-import { TabPaneFreqStatesDataCut } from '../sheet/states/TabPaneFreqStatesDataCut';
-import { TabPaneSampleInstruction } from '../sheet/sample/TabPaneSampleInstruction';
-import { TabPaneSampleInstructionDistributions } from '../sheet/sample/TabPaneSampleInstructionDistributions';
-import { TabPaneSampleInstructionTotalTime } from '../sheet/sample/TabPaneSampleInstructionSelectionTotalTime';
-import { TabPaneSampleInstructionSelection } from '../sheet/sample/TabPaneSampleInstructionSelection';
+import { TabPaneFreqStatesDataCut } from '../sheet/states/TabPaneFreqStatesDataCut'
+import { TabPaneSampleInstruction } from '../sheet/bpftrace/TabPaneSampleInstruction';
+import { TabPaneSampleInstructionDistributions } from '../sheet/bpftrace/TabPaneSampleInstructionDistributions';
+import { TabPaneSampleInstructionTotalTime } from '../sheet/bpftrace/TabPaneSampleInstructionSelectionTotalTime';
+import { TabPaneSampleInstructionSelection } from '../sheet/bpftrace/TabPaneSampleInstructionSelection';
 
 
 export let tabConfig: any = {
diff --git a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneComparison.ts b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneComparison.ts
index b065fcc1..0cea1a24 100644
--- a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneComparison.ts
+++ b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneComparison.ts
@@ -16,11 +16,7 @@
 import { BaseElement, element } from '../../../../../base-ui/BaseElement';
 import { LitTable } from '../../../../../base-ui/table/lit-table';
 import { HeapDataInterface } from '../../../../../js-heap/HeapDataInterface';
-import {
-  ConstructorComparison,
-  ConstructorItem,
-  ConstructorType
-} from '../../../../../js-heap/model/UiStruct';
+import { ConstructorComparison, ConstructorItem, ConstructorType } from '../../../../../js-heap/model/UiStruct';
 import '../../../../../base-ui/table/lit-table-column';
 import { TabPaneJsMemoryFilter } from '../TabPaneJsMemoryFilter';
 import '../TabPaneJsMemoryFilter';
@@ -101,16 +97,16 @@ export class TabPaneComparison extends BaseElement {
     let that = this;
     let input = this.selectEl!.shadowRoot?.querySelector('input') as HTMLInputElement;
     this.selectEl!.innerHTML = '';
+    this.selectEl!.defaultValue = comFileArr[0].name || '';
+    this.selectEl!.placeholder = comFileArr[0].name || '';
+    this.selectEl!.dataSource = comFileArr;
     let option = new LitSelectOption();
     option.innerHTML = 'File Name';
     option.setAttribute('disabled', 'disabled');
-    this.selectEl?.appendChild(option);
+    this.selectEl?.prepend(option);
     if (comFileArr[0].name) {
       option.setAttribute('value', comFileArr[0].name);
     }
-    this.selectEl!.defaultValue = comFileArr[0].name || '';
-    this.selectEl!.placeholder = comFileArr[0].name || '';
-    this.selectEl!.dataSource = comFileArr;
     this.selectEl!.querySelectorAll('lit-select-option').forEach((a) => {
       a.addEventListener('onSelected', (e) => {
         this.comparisonTable!.scrollTop = 0;
@@ -145,7 +141,7 @@ export class TabPaneComparison extends BaseElement {
     }
   }
 
-  private sortComprisonByColumnExtend(column: string, sort: number): void{
+  private sortComprisonByColumnExtend(column: string, sort: number): void {
     switch (column) {
       case 'addedCount':
         this.comparisonTableEl!.snapshotDataSource = this.leftArray.sort((a, b) => {
@@ -164,9 +160,9 @@ export class TabPaneComparison extends BaseElement {
         break;
       case 'objectName':
         this.comparisonTableEl!.snapshotDataSource = this.leftArray.sort((a, b) => {
-          return sort === 1 ?
-            (`${a.objectName  }`).localeCompare(`${b.objectName  }`) :
-            (`${b.objectName  }`).localeCompare(`${a.objectName  }`);
+          return sort === 1
+            ? `${a.objectName}`.localeCompare(`${b.objectName}`)
+            : `${b.objectName}`.localeCompare(`${a.objectName}`);
         });
         break;
       case 'addedSize':
@@ -214,17 +210,17 @@ export class TabPaneComparison extends BaseElement {
 
   private sortRetainerByObjectNameType(sort: number): void {
     this.retainerTableEl!.snapshotDataSource = this.rightArray.sort((rightArrA, rightArrB) => {
-      return sort === 1 ?
-        (`${rightArrA.objectName  }`).localeCompare(`${rightArrB.objectName  }`) :
-        (`${rightArrB.objectName  }`).localeCompare(`${rightArrA.objectName  }`);
+      return sort === 1
+        ? `${rightArrA.objectName}`.localeCompare(`${rightArrB.objectName}`)
+        : `${rightArrB.objectName}`.localeCompare(`${rightArrA.objectName}`);
     });
     this.rightArray.forEach((list) => {
       let retainsTable = (): void => {
         const getList = (listArr: Array<ConstructorItem>): void => {
           listArr.sort((listArrA, listArrB) => {
-            return sort === 1 ?
-              (`${listArrA.objectName  }`).localeCompare(`${listArrB.objectName  }`) :
-              (`${listArrB.objectName  }`).localeCompare(`${listArrA.objectName  }`);
+            return sort === 1
+              ? `${listArrA.objectName}`.localeCompare(`${listArrB.objectName}`)
+              : `${listArrB.objectName}`.localeCompare(`${listArrA.objectName}`);
           });
           listArr.forEach(function (currentRow) {
             if (currentRow.children.length > 0) {
@@ -241,17 +237,17 @@ export class TabPaneComparison extends BaseElement {
 
   private sortRetainerByRetainedSizeType(sort: number): void {
     this.retainerTableEl!.snapshotDataSource = this.rightArray.sort((rightArrA, rightArrB) => {
-      return sort === 1 ?
-        rightArrA.retainedSize - rightArrB.retainedSize :
-        rightArrB.retainedSize - rightArrA.retainedSize;
+      return sort === 1
+        ? rightArrA.retainedSize - rightArrB.retainedSize
+        : rightArrB.retainedSize - rightArrA.retainedSize;
     });
     this.rightArray.forEach((list) => {
       let retainsTable = (): void => {
         const getList = (listArr: Array<ConstructorItem>): void => {
           listArr.sort((listArrA, listArrB) => {
-            return sort === 1 ?
-              listArrA.retainedSize - listArrB.retainedSize :
-              listArrB.retainedSize - listArrA.retainedSize;
+            return sort === 1
+              ? listArrA.retainedSize - listArrB.retainedSize
+              : listArrB.retainedSize - listArrA.retainedSize;
           });
           listArr.forEach(function (row) {
             if (row.children.length > 0) {
@@ -268,17 +264,15 @@ export class TabPaneComparison extends BaseElement {
 
   private sortRetainerByShallowSizeType(sort: number): void {
     this.retainerTableEl!.snapshotDataSource = this.rightArray.sort((rightArrA, rightArrB) => {
-      return sort === 1 ?
-        rightArrA.shallowSize - rightArrB.shallowSize :
-        rightArrB.shallowSize - rightArrA.shallowSize;
+      return sort === 1 ? rightArrA.shallowSize - rightArrB.shallowSize : rightArrB.shallowSize - rightArrA.shallowSize;
     });
     this.rightArray.forEach((list) => {
       let retainsTable = (): void => {
         const getList = (listArr: Array<ConstructorItem>): void => {
           listArr.sort((listArrA, listArrB) => {
-            return sort === 1 ?
-              listArrA.shallowSize - listArrB.shallowSize :
-              listArrB.shallowSize - listArrA.shallowSize;
+            return sort === 1
+              ? listArrA.shallowSize - listArrB.shallowSize
+              : listArrB.shallowSize - listArrA.shallowSize;
           });
           listArr.forEach(function (rowEl) {
             if (rowEl.children.length > 0) {
@@ -298,7 +292,7 @@ export class TabPaneComparison extends BaseElement {
       return sort === 1 ? a.distance - b.distance : b.distance - a.distance;
     });
     this.rightArray.forEach((list) => {
-      let retainsTable =  (): void => {
+      let retainsTable = (): void => {
         const getList = (currentList: Array<ConstructorItem>): void => {
           currentList.sort((a, b) => {
             return sort === 1 ? a.distance - b.distance : b.distance - a.distance;
@@ -344,7 +338,9 @@ export class TabPaneComparison extends BaseElement {
     let filterHeight = 0;
     new ResizeObserver(() => {
       let comparisonPanelFilter = this.shadowRoot!.querySelector('#filter') as HTMLElement;
-      if (comparisonPanelFilter.clientHeight > 0) {filterHeight = comparisonPanelFilter.clientHeight}
+      if (comparisonPanelFilter.clientHeight > 0) {
+        filterHeight = comparisonPanelFilter.clientHeight;
+      }
       if (this.parentElement!.clientHeight > filterHeight) {
         comparisonPanelFilter.style.display = 'flex';
       } else {
@@ -386,12 +382,12 @@ export class TabPaneComparison extends BaseElement {
       let retainsTable = (): void => {
         const getList = (list: Array<ConstructorItem>): void => {
           list.forEach((structRow) => {
-            let shallow = `${Math.round((structRow.shallowSize / this.fileSize) * 100)  }%`;
-            let retained = `${Math.round((structRow.retainedSize / this.fileSize) * 100)  }%`;
+            let shallow = `${Math.round((structRow.shallowSize / this.fileSize) * 100)}%`;
+            let retained = `${Math.round((structRow.retainedSize / this.fileSize) * 100)}%`;
             structRow.shallowPercent = shallow;
             structRow.retainedPercent = retained;
-            let nodeId = `${structRow.nodeName  } @${structRow.id}`;
-            structRow.objectName = `${structRow.edgeName  }\xa0` + 'in' + `\xa0${  nodeId}`;
+            let nodeId = `${structRow.nodeName} @${structRow.id}`;
+            structRow.objectName = `${structRow.edgeName}\xa0` + 'in' + `\xa0${nodeId}`;
             if (structRow.distance >= 100000000 || structRow.distance === -5) {
               // @ts-ignore
               structRow.distance = '-';
@@ -424,25 +420,25 @@ export class TabPaneComparison extends BaseElement {
     }
   };
 
-  private resizeObserverObserve(){
+  private resizeObserverObserve() {
     new ResizeObserver(() => {
       this.retainerTableEl!.style.height = 'calc(100% - 21px)';
       this.retainerTableEl!.reMeauseHeight();
     }).observe(this.parentElement!);
   }
 
-  private retainsDataInit(): void{
+  private retainsDataInit(): void {
     this.retainsData.forEach((comparisonRetainEl) => {
-      let shallow = `${Math.round((comparisonRetainEl.shallowSize / this.fileSize) * 100)  }%`;
-      let retained = `${Math.round((comparisonRetainEl.retainedSize / this.fileSize) * 100)  }%`;
+      let shallow = `${Math.round((comparisonRetainEl.shallowSize / this.fileSize) * 100)}%`;
+      let retained = `${Math.round((comparisonRetainEl.retainedSize / this.fileSize) * 100)}%`;
       comparisonRetainEl.shallowPercent = shallow;
       comparisonRetainEl.retainedPercent = retained;
       if (comparisonRetainEl.distance >= 100000000 || comparisonRetainEl.distance === -5) {
         // @ts-ignore
         comparisonRetainEl.distance = '-';
       }
-      let nodeId = `${comparisonRetainEl.nodeName  } @${comparisonRetainEl.id}`;
-      comparisonRetainEl.objectName = `${comparisonRetainEl.edgeName  }\xa0` + 'in' + `\xa0${  nodeId}`;
+      let nodeId = `${comparisonRetainEl.nodeName} @${comparisonRetainEl.id}`;
+      comparisonRetainEl.objectName = `${comparisonRetainEl.edgeName}\xa0` + 'in' + `\xa0${nodeId}`;
     });
   }
 
@@ -481,12 +477,12 @@ export class TabPaneComparison extends BaseElement {
           let retainsTable = (): void => {
             const getList = (comList: Array<ConstructorItem>): void => {
               comList.forEach((row) => {
-                let shallow = `${Math.round((row.shallowSize / this.fileSize) * 100)  }%`;
-                let retained = `${Math.round((row.retainedSize / this.fileSize) * 100)  }%`;
+                let shallow = `${Math.round((row.shallowSize / this.fileSize) * 100)}%`;
+                let retained = `${Math.round((row.retainedSize / this.fileSize) * 100)}%`;
                 row.shallowPercent = shallow;
                 row.retainedPercent = retained;
-                let nodeId = `${row.nodeName  } @${row.id}`;
-                row.objectName = `${row.edgeName  }\xa0` + 'in' + `\xa0${  nodeId}`;
+                let nodeId = `${row.nodeName} @${row.id}`;
+                row.objectName = `${row.edgeName}\xa0` + 'in' + `\xa0${nodeId}`;
                 if (row.distance >= 100000000 || row.distance === -5) {
                   // @ts-ignore
                   row.distance = '-';
@@ -530,17 +526,17 @@ export class TabPaneComparison extends BaseElement {
       clickRow.children = HeapDataInterface.getInstance().getNextForComparison(clickRow);
       if (clickRow.children.length > 0) {
         for (let item of clickRow.children) {
-          let nodeName = `${item.nodeName  } @${item.id}`;
+          let nodeName = `${item.nodeName} @${item.id}`;
           item.nodeId = ` @${item.id}`;
           if (item.isString()) {
-            item.objectName = `"${  item.nodeName}"` + ` @${item.id}`;
+            item.objectName = `"${item.nodeName}"` + ` @${item.id}`;
           } else {
             item.objectName = nodeName;
           }
           item.deltaCount = '-';
           item.deltaSize = '-';
           if (item.edgeName !== '') {
-            item.objectName = `${item.edgeName  }\xa0` + '::' + `\xa0${  nodeName}`;
+            item.objectName = `${item.edgeName}\xa0` + '::' + `\xa0${nodeName}`;
           } else {
             if (item.fileId === this.baseFileId) {
               item.addedCount = '•';
@@ -570,7 +566,7 @@ export class TabPaneComparison extends BaseElement {
     this.comparisonTblIconClickData();
   };
 
-  private comparisonTblIconClickData(): void{
+  private comparisonTblIconClickData(): void {
     if (this.search!.value !== '') {
       if (this.leftTheadTable!.hasAttribute('sort')) {
         this.comparisonTableEl!.snapshotDataSource = this.leftArray;
diff --git a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstruction.ts b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstruction.ts
similarity index 99%
rename from ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstruction.ts
rename to ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstruction.ts
index ab51b08c..a034342c 100644
--- a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstruction.ts
+++ b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstruction.ts
@@ -16,7 +16,7 @@
 import { BaseElement, element } from '../../../../../base-ui/BaseElement';
 import { Rect, drawString } from '../../../../database/ui-worker/ProcedureWorkerCommon';
 import { ColorUtils } from '../../base/ColorUtils';
-import { SampleStruct } from '../../../../database/ui-worker/ProcedureWorkerSample';
+import { SampleStruct } from '../../../../database/ui-worker/ProcedureWorkerBpftrace';
 import { SpApplication } from '../../../../SpApplication';
 
 const SAMPLE_STRUCT_HEIGHT = 30;
diff --git a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionDistributions.ts b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionDistributions.ts
similarity index 99%
rename from ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionDistributions.ts
rename to ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionDistributions.ts
index 949eb601..4afdcb64 100644
--- a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionDistributions.ts
+++ b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionDistributions.ts
@@ -276,7 +276,7 @@ export class TabPaneSampleInstructionDistributions extends BaseElement {
           x: xPosition,
           y: height - paddingBottom - barHeight,
           height: barHeight,
-          heightPer: yNum
+          heightPer: parseFloat((yNum * 100).toFixed(2))
         })
       } else {
         existX.x = xPosition;
@@ -362,7 +362,7 @@ export class TabPaneSampleInstructionDistributions extends BaseElement {
       } else {
         const y = (height - paddingBottom) - (i * yPadding);
         this.drawLine(xStep, y, width - paddingLeft, y);
-        this.ctx!.fillText(`${parseFloat((i * this.yAvg).toFixed(2))}%`, 30, y);
+        this.ctx!.fillText(`${parseFloat((i * this.yAvg).toFixed(2)) * 100}%`, 30, y);
       }
     }
   }
diff --git a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionSelection.ts b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionSelection.ts
similarity index 99%
rename from ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionSelection.ts
rename to ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionSelection.ts
index ceff3404..3229352f 100644
--- a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionSelection.ts
+++ b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionSelection.ts
@@ -17,7 +17,7 @@ import { BaseElement, element } from '../../../../../base-ui/BaseElement';
 import { SelectionParam } from '../../../../bean/BoxSelection';
 import { Rect, drawString } from '../../../../database/ui-worker/ProcedureWorkerCommon';
 import { ColorUtils } from '../../base/ColorUtils';
-import { SampleStruct } from '../../../../database/ui-worker/ProcedureWorkerSample';
+import { SampleStruct } from '../../../../database/ui-worker/ProcedureWorkerBpftrace';
 import { SpApplication } from '../../../../SpApplication';
 
 const SAMPLE_STRUCT_HEIGHT = 30;
diff --git a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionSelectionTotalTime.ts b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionSelectionTotalTime.ts
similarity index 98%
rename from ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionSelectionTotalTime.ts
rename to ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionSelectionTotalTime.ts
index b83bce8d..03afdc2f 100644
--- a/ide/src/trace/component/trace/sheet/sample/TabPaneSampleInstructionSelectionTotalTime.ts
+++ b/ide/src/trace/component/trace/sheet/bpftrace/TabPaneSampleInstructionSelectionTotalTime.ts
@@ -224,7 +224,7 @@ export class TabPaneSampleInstructionTotalTime extends BaseElement {
     const count = this.onReadableData.length;
     const onReadableData = this.onReadableData;
     const instructionArray = onReadableData.reduce((pre: any, current: any) => {
-      const dur = ((current.end - current.begin) / millisecond).toFixed(1);
+      const dur = parseFloat(((current.end - current.begin) / millisecond).toFixed(1));
       (pre[dur] = pre[dur] || []).push(current);
       return pre;
     }, {});
@@ -263,7 +263,7 @@ export class TabPaneSampleInstructionTotalTime extends BaseElement {
           x: xPosition,
           y: height - paddingBottom - barHeight,
           height: barHeight,
-          heightPer: yNum
+          heightPer: parseFloat((yNum * 100).toFixed(2))
         })
       } else {
         existX.x = xPosition;
@@ -345,7 +345,7 @@ export class TabPaneSampleInstructionTotalTime extends BaseElement {
         this.ctx!.fillText(`${i}%`, 30, y);
       } else {
         this.drawLine(xStart, y, width - paddingLeft, y);
-        this.ctx!.fillText(`${parseFloat((i * this.yAvg).toFixed(2))}%`, 30, y);
+        this.ctx!.fillText(`${parseFloat((i * this.yAvg).toFixed(2)) * 100}%`, 30, y);
       }
     }
   }
diff --git a/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts b/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts
index 5adeeb47..854e6345 100644
--- a/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts
+++ b/ide/src/trace/component/trace/sheet/task/TabPaneTaskFrames.ts
@@ -64,6 +64,7 @@ export class TabPaneTaskFrames extends BaseElement {
       this.taskFramesTbl!!.recycleDataSource = [];
       this.taskFramesSource = [];
       this.taskFramesGroupSource = [];
+      this.progressEL!.loading = false;
       return;
     } else {
       let allocationTime = 0;
@@ -149,10 +150,12 @@ export class TabPaneTaskFrames extends BaseElement {
     let groups = new Map();
     framesParam.taskFramesData.forEach((obj) => {
       const key = obj.ipid;
-      if (!groups.has(key)) {
-        groups.set(key, []);
+      if (key) {
+        if (!groups.has(key)) {
+          groups.set(key, []);
+        }
+        groups.get(key).push(obj);
       }
-      groups.get(key).push(obj);
     });
     for (let [key, groupsValue] of groups) {
       let tempTableList: TaskTabStruct[] = [];
diff --git a/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts b/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts
index cc384281..bdbca941 100644
--- a/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts
+++ b/ide/src/trace/component/trace/timer-shaft/RangeRuler.ts
@@ -162,7 +162,7 @@ export class RangeRuler extends Graph {
     let miniWidth = Math.ceil(this.frame.width / 100); //每格宽度
     for (let index = 0; index < this._cpuUsage.length; index++) {
       let cpuUsageItem = this._cpuUsage[index];
-      const color = interpolateColorBrightness(ColorUtils.FUNC_COLOR_B[cpuUsageItem.cpu % ColorUtils.FUNC_COLOR_B.length], cpuUsageItem.rate);
+      const color = interpolateColorBrightness(ColorUtils.MD_PALETTE[cpuUsageItem.cpu], cpuUsageItem.rate);
       this.context2D.fillStyle = `rgb(${color[0]}, ${color[1]}, ${color[2]})`;
       this.context2D.globalAlpha = cpuUsageItem.rate;
       this.context2D.fillRect(
diff --git a/ide/src/trace/database/ConvertTraceWorker.ts b/ide/src/trace/database/ConvertTraceWorker.ts
index 1307f097..eec44b28 100644
--- a/ide/src/trace/database/ConvertTraceWorker.ts
+++ b/ide/src/trace/database/ConvertTraceWorker.ts
@@ -57,7 +57,7 @@ self.onmessage = async (e: MessageEvent) => {
     let traceAllData = new Uint8Array(e.data.buffer);
     let isRawTraceConvert = isRawTrace(e.data);
     if (isRawTraceConvert) {
-      [totalSize, currentPosition] = handleRowTrace(e, fileData, dataHeader, traceInsPtr, currentPosition, traceAllData, totalSize);
+      [totalSize, currentPosition, traceAllData] = handleRowTrace(e, fileData, dataHeader, traceInsPtr, currentPosition, traceAllData, totalSize);
     } else {
       handleHTrace(fileData, dataHeader, traceInsPtr);
     }
@@ -107,7 +107,7 @@ function handleRowTrace(
   currentPosition: number,
   traceAllData: Uint8Array,
   totalSize: number
-): [number, number] {
+): [number, number, Uint8Array] {
   let uint8Array = new Uint8Array(fileData.slice(0, 12));
   convertModule.HEAPU8.set(uint8Array, dataHeader);
   convertModule._SendRawFileHeader(dataHeader, 12, traceInsPtr);
@@ -129,7 +129,7 @@ function handleRowTrace(
   traceAllData.set(commonTotalData, currentPosition);
   traceAllData.set(allRowTraceData.slice(currentPosition), commonTotalData.length + currentPosition);
   totalSize += commonTotalData.length;
-  return [totalSize, currentPosition];
+  return [totalSize, currentPosition, traceAllData];
 }
 
 function setCommonDataOffsetList(
diff --git a/ide/src/trace/database/SqlLiteWorker.ts b/ide/src/trace/database/SqlLiteWorker.ts
index 74001eed..033bc4ae 100644
--- a/ide/src/trace/database/SqlLiteWorker.ts
+++ b/ide/src/trace/database/SqlLiteWorker.ts
@@ -15,6 +15,9 @@
 
 importScripts('sql-wasm.js');
 import { temp_init_sql_list } from './TempSql';
+import { execProtoForWorker } from './data-trafic/utils/ExecProtoForWorker';
+import { TraficEnum } from './data-trafic/utils/QueryEnum';
+
 let conn: any = null;
 let encoder = new TextEncoder();
 function initIndexedDB() {
@@ -123,5 +126,21 @@ self.onmessage = async (e: any) => {
         error: err.message,
       });
     }
+  } else if (e.data.action === 'exec-proto') {
+    e.data.params.trafic = TraficEnum.Memory;
+    execProtoForWorker(e.data, (sql: string) => {
+      try {
+        const stmt = conn.prepare(sql);
+        let res = [];
+        while (stmt.step()) {
+          res.push(stmt.getAsObject());
+        }
+        stmt.free();
+        return res;
+      } catch (err: any) {
+        console.log(err);
+        return [];
+      }
+    });
   }
 };
diff --git a/ide/src/trace/database/data-trafic/ArkTsReceiver.ts b/ide/src/trace/database/data-trafic/ArkTsReceiver.ts
index 05aa54af..e388c833 100644
--- a/ide/src/trace/database/data-trafic/ArkTsReceiver.ts
+++ b/ide/src/trace/database/data-trafic/ArkTsReceiver.ts
@@ -88,15 +88,13 @@ export function cpuProfilerDataReceiver(data: any, proc: Function): void {
   if (res.length > 0) {
     if (!dataCache.jsCallChain || dataCache.jsCallChain.length === 0) {
       dataCache.jsCallChain = res;
-      createCallChain();
+      createCallChain(data.params.trafic);
     }
     let sql = queryChartDataSqlMem(data.params);
     let chartData = proc(sql);
     if (chartData.length > 0) {
       samples = convertJSON(chartData);
-      if (data.params.trafic === TraficEnum.ProtoBuffer) {
-        arrayBufferHandler(data, samples, true);
-      }
+      arrayBufferHandler(data, samples, true);
     }
   }
 }
@@ -104,11 +102,12 @@ export function cpuProfilerDataReceiver(data: any, proc: Function): void {
 /**
  * 建立callChain每个函数的联系，设置depth跟children
  */
-function createCallChain(): void {
+function createCallChain(trafic: TraficEnum): void {
   const jsSymbolMap = dataCache.jsSymbolMap;
   const symbol = new JsProfilerSymbol();
-  for (const data of dataCache.jsCallChain!) {
-    let item = data.cpuProfilerData || symbol;
+  for (let data of dataCache.jsCallChain!) {
+    let sample = (trafic !== TraficEnum.Memory ? data.cpuProfilerData : data) || symbol;
+    let item = data.cpuProfilerData || data;
     if (!item.childrenString) {
       item.childrenString = '';
     }
@@ -134,11 +133,11 @@ function createCallChain(): void {
   }
 }
 
-function combineChartData(res: Array<JsCpuProfilerSample>): Array<JsCpuProfilerChartFrame> {
+function combineChartData(res: Array<JsCpuProfilerSample>, trafic: TraficEnum): Array<JsCpuProfilerChartFrame> {
   const combineSample = new Array<JsCpuProfilerChartFrame>();
   const symbol = new JsCpuProfilerSample();
   for (let data of res) {
-    let sample = data.cpuProfilerData || symbol;
+    let sample = (trafic !== TraficEnum.Memory ? data.cpuProfilerData : data) || symbol;
     const stackTopSymbol = dataCache.jsSymbolMap.get(sample.functionId);
     // root 节点不需要显示
     if (stackTopSymbol?.id === ROOT_ID) {
@@ -277,7 +276,7 @@ function combineCallChain(lastCallTree: JsCpuProfilerChartFrame, sample: JsCpuPr
 }
 
 function arrayBufferHandler(data: any, res: any[], transfer: boolean): void {
-  let result = combineChartData(res);
+  let result = combineChartData(res, data.params.trafic);
   clearJsCacheData();
   const getArrayData = (combineData: Array<any>): void => {
     for (let item of combineData) {
diff --git a/ide/src/trace/database/sql/Func.sql.ts b/ide/src/trace/database/sql/Func.sql.ts
index 148cf0ba..13da4de7 100644
--- a/ide/src/trace/database/sql/Func.sql.ts
+++ b/ide/src/trace/database/sql/Func.sql.ts
@@ -461,7 +461,6 @@ export const queryStatesCut = (
     B.id,
     B.pid,
     B.tid,
-    B.type,
     B.dur,
     B.cpu,
     B.state,
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorker.ts b/ide/src/trace/database/ui-worker/ProcedureWorker.ts
index 69af09f6..6e0f836d 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorker.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorker.ts
@@ -63,7 +63,7 @@ import { FreqExtendRender } from './ProcedureWorkerFreqExtend';
 import { hitchTimeRender } from './ProcedureWorkerHitchTime';
 import { LtpoRender } from './ProcedureWorkerLTPO';
 import { BinderRender } from './procedureWorkerBinder';
-import { SampleRender } from './ProcedureWorkerSample';
+import { SampleRender } from './ProcedureWorkerBpftrace';
 
 let dataList: any = {};
 let dataList2: any = {};
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerAppStartup.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerAppStartup.ts
index 54cabdfa..b1da0b6e 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerAppStartup.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerAppStartup.ts
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { BaseStruct, dataFilterHandler, drawString } from './ProcedureWorkerCommon';
+import { BaseStruct, dataFilterHandler, drawLoadingFrame, drawString } from './ProcedureWorkerCommon';
 import { TraceRow } from '../../component/trace/base/TraceRow';
 import { ColorUtils } from '../../component/trace/base/ColorUtils';
 import {SpSystemTrace} from "../../component/SpSystemTrace";
@@ -39,6 +39,7 @@ export class AppStartupRender {
       paddingTop: 5,
       useCache: appStartReq.useCache || !(TraceRow.range?.refresh ?? false),
     });
+    drawLoadingFrame(appStartReq.appStartupContext, appStartUpRow.dataListCache, appStartUpRow);
     appStartReq.appStartupContext.globalAlpha = 0.6;
     let find = false;
     let offset = 3;
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerSample.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerBpftrace.ts
similarity index 100%
rename from ide/src/trace/database/ui-worker/ProcedureWorkerSample.ts
rename to ide/src/trace/database/ui-worker/ProcedureWorkerBpftrace.ts
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts
index 044fe493..be308ef2 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerCommon.ts
@@ -1447,6 +1447,28 @@ export function drawString(ctx: CanvasRenderingContext2D, str: string, textPaddi
   }
 }
 
+export function drawFunString(ctx: CanvasRenderingContext2D, str: string, textPadding: number, frame: Rect, data: any) {
+  if (data.textMetricsWidth === undefined) {
+    data.textMetricsWidth = ctx.measureText(str).width;
+  }
+  let charWidth = Math.round(data.textMetricsWidth / str.length);
+  let fillTextWidth = frame.width - textPadding * 2;
+  if (data.textMetricsWidth < fillTextWidth) {
+    let x2 = Math.floor(frame.width / 2 - data.textMetricsWidth / 2 + frame.x + textPadding);
+    ctx.fillText(str, x2, Math.floor(data.frame.height * (data.depth! + 0.5) + 3), fillTextWidth);
+  } else {
+    if (fillTextWidth >= charWidth) {
+      let chatNum = fillTextWidth / charWidth;
+      let x1 = frame.x + textPadding;
+      if (chatNum < 2) {
+        ctx.fillText(str.substring(0, 1), x1, Math.floor(data.frame.height * (data.depth! + 0.5) + 3), fillTextWidth);
+      } else {
+        ctx.fillText(str.substring(0, chatNum - 1) + '...', x1, Math.floor(data.frame.height * (data.depth! + 0.5) + 3), fillTextWidth);
+      }
+    }
+  }
+}
+
 export function drawString2Line(
   ctx: CanvasRenderingContext2D,
   str1: string,
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts
index 27bccce0..658c31b0 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameDynamic.ts
@@ -288,7 +288,7 @@ export class FrameDynamicRender extends Render {
 export function FrameDynamicStructOnClick(clickRowType: string, sp: SpSystemTrace, row: undefined | TraceRow<any>) {
   return new Promise((resolve,reject) => {
     if (clickRowType === TraceRow.ROW_TYPE_FRAME_DYNAMIC) {
-      FrameDynamicStruct.selectFrameDynamicStruct = FrameDynamicStruct.hoverFrameDynamicStruct || row?.getHoverStruct();
+      FrameDynamicStruct.selectFrameDynamicStruct = FrameDynamicStruct.hoverFrameDynamicStruct || row?.getHoverStruct(false, true);
       if (FrameDynamicStruct.selectFrameDynamicStruct) {
         sp.traceSheetEL?.displayFrameDynamicData(row!, FrameDynamicStruct.selectFrameDynamicStruct);
         sp.timerShaftEL?.modifyFlagList(undefined);
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts
index 70204094..bead201d 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFrameSpacing.ts
@@ -301,7 +301,7 @@ export class FrameSpacingRender extends Render {
 export function FrameSpacingStructOnClick(clickRowType: string, sp: SpSystemTrace, row: TraceRow<any>) {
   return new Promise((resolve,reject) => {
     if (clickRowType === TraceRow.ROW_TYPE_FRAME_SPACING) {
-      FrameSpacingStruct.selectFrameSpacingStruct = FrameSpacingStruct.hoverFrameSpacingStruct || row.getHoverStruct();
+      FrameSpacingStruct.selectFrameSpacingStruct = FrameSpacingStruct.hoverFrameSpacingStruct || row.getHoverStruct(false, true);
       if (FrameSpacingStruct.selectFrameSpacingStruct) {
         sp.traceSheetEL?.displayFrameSpacingData(FrameSpacingStruct.selectFrameSpacingStruct);
         sp.timerShaftEL?.modifyFlagList(undefined);
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts
index 7fd2b4c6..38ae14b3 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerFunc.ts
@@ -23,6 +23,7 @@ import {
   Render,
   RequestMessage,
   drawString,
+  drawFunString,
   drawLoadingFrame,
 } from './ProcedureWorkerCommon';
 import { FuncStruct as BaseFuncStruct } from '../../bean/FuncStruct';
@@ -177,9 +178,9 @@ export class FuncStruct extends BaseFuncStruct {
     }
     let getV: number = x2 - x1 < 1 ? 1 : x2 - x1;
     funcNode.frame.x = Math.floor(x1);
-    funcNode.frame.y = funcNode.depth * 20;
+    funcNode.frame.y = funcNode.depth * 18 + 3;
     funcNode.frame.width = Math.ceil(getV);
-    funcNode.frame.height = 20;
+    funcNode.frame.height = 18;
   }
 
   static draw(ctx: CanvasRenderingContext2D, data: FuncStruct) {
@@ -190,24 +191,21 @@ export class FuncStruct extends BaseFuncStruct {
         ctx.globalAlpha = 1;
         ctx.fillStyle = ColorUtils.FUNC_COLOR[ColorUtils.hashFunc(data.funName || '', 0, ColorUtils.FUNC_COLOR.length)];
         let textColor = ColorUtils.FUNC_COLOR[ColorUtils.hashFunc(data.funName || '', 0, ColorUtils.FUNC_COLOR.length)];
-        let miniHeight = 20;
         if (FuncStruct.hoverFuncStruct && data.funName == FuncStruct.hoverFuncStruct.funName) {
           ctx.globalAlpha = 0.7;
         }
-        ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2);
+        ctx.fillRect(data.frame.x, data.frame.y, data.frame.width, data.frame.height);
         if (data.frame.width > 10) {
-          ctx.strokeStyle = '#fff';
-          ctx.lineWidth = 1;
-          ctx.strokeRect(data.frame.x, data.frame.y, data.frame.width, miniHeight - padding * 2);
           ctx.fillStyle = ColorUtils.funcTextColor(textColor);
-          drawString(ctx, `${data.funName || ''}`, 5, data.frame, data);
+          ctx.textBaseline = 'middle';
+          drawFunString(ctx, `${data.funName || ''}`, 5, data.frame, data);
         }
         if (data.callid == FuncStruct.selectFuncStruct?.callid&&
           data.startTs == FuncStruct.selectFuncStruct?.startTs&&
           data.depth == FuncStruct.selectFuncStruct?.depth) {
           ctx.strokeStyle = '#000';
           ctx.lineWidth = 2;
-          ctx.strokeRect(data.frame.x, data.frame.y + 1, data.frame.width, miniHeight - padding * 2 - 2);
+          ctx.strokeRect(data.frame.x, data.frame.y + 1, data.frame.width, data.frame.height - 2);
         }
         let flagConfig = FlagsConfig.getFlagsConfig('TaskPool');
         if (
@@ -216,13 +214,13 @@ export class FuncStruct extends BaseFuncStruct {
           data.funName!.indexOf('Successful') < 0
         ) {
           if (data.frame!.width < 10) {
-            FuncStruct.drawTaskPoolUnSuccessFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 20, 3, data!);
+            FuncStruct.drawTaskPoolUnSuccessFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 18, 3, data!);
           } else {
-            FuncStruct.drawTaskPoolUnSuccessFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 20, 6, data!);
+            FuncStruct.drawTaskPoolUnSuccessFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 18, 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!);
+          FuncStruct.drawTaskPoolTimeOutFlag(ctx, data.frame!.x, (data.depth! + 0.5) * 18, 10, data!);
         }
         // 如果该函数没有结束时间，则绘制锯齿。
         if (data.nofinish && data.frame!.width > 4) {
@@ -302,5 +300,3 @@ export class FuncStruct extends BaseFuncStruct {
     );
   }
 }
-
-const padding = 1;
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerSoInit.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerSoInit.ts
index 0f8bc2aa..2f715ac0 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerSoInit.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerSoInit.ts
@@ -15,7 +15,15 @@
 
 import { ColorUtils } from '../../component/trace/base/ColorUtils';
 import { TraceRow } from '../../component/trace/base/TraceRow';
-import { BaseStruct, isFrameContainPoint, ns2x, Render, RequestMessage, drawString } from './ProcedureWorkerCommon';
+import {
+  BaseStruct,
+  isFrameContainPoint,
+  ns2x,
+  Render,
+  RequestMessage,
+  drawString,
+  drawLoadingFrame
+} from './ProcedureWorkerCommon';
 import {SpSystemTrace} from "../../component/SpSystemTrace";
 
 export class SoRender extends Render {
@@ -38,6 +46,7 @@ export class SoRender extends Render {
       row.frame,
       req.useCache || !TraceRow.range!.refresh
     );
+    drawLoadingFrame(req.context, row.dataListCache, row);
     req.context.beginPath();
     let soFind = false;
     for (let so of soFilter) {
diff --git a/ide/src/trace/database/ui-worker/ProcedureWorkerThread.ts b/ide/src/trace/database/ui-worker/ProcedureWorkerThread.ts
index 82364ed7..aaaac459 100644
--- a/ide/src/trace/database/ui-worker/ProcedureWorkerThread.ts
+++ b/ide/src/trace/database/ui-worker/ProcedureWorkerThread.ts
@@ -46,7 +46,7 @@ export class ThreadRender extends Render {
       endNS: TraceRow.range?.endNS ?? 0,
       totalNS: TraceRow.range?.totalNS ?? 0,
       frame: row.frame,
-      paddingTop: 5,
+      paddingTop: 3,
       useCache: threadReq.useCache || !(TraceRow.range?.refresh ?? false),
     });
     drawLoadingFrame(threadReq.context, threadFilter, row);
@@ -64,7 +64,6 @@ export class ThreadRender extends Render {
   render(threadReq: RequestMessage, threadList: Array<any>, threadFilter: Array<any>) {}
 }
 
-const padding = 3;
 export function ThreadStructOnClick(clickRowType:string,sp:SpSystemTrace,threadClickHandler:any,cpuClickHandler:any){
   return new Promise((resolve, reject) => {
     if (clickRowType === TraceRow.ROW_TYPE_THREAD && ThreadStruct.hoverThreadStruct) {
@@ -113,7 +112,7 @@ export class ThreadStruct extends BaseThreadStruct {
       if ('S' === data.state && data.name !== 'all-state') {
         threadContext.globalAlpha = 0.2;
       };
-      threadContext.fillRect(data.frame.x, data.frame.y + padding, data.frame.width > 1 ? data.frame.width : 1, data.frame.height - padding * 2);
+      threadContext.fillRect(data.frame.x, data.frame.y, data.frame.width, data.frame.height);
       threadContext.fillStyle = '#fff';
       threadContext.textBaseline = 'middle';
       threadContext.font = '8px sans-serif';
@@ -129,9 +128,9 @@ export class ThreadStruct extends BaseThreadStruct {
         threadContext.lineWidth = 2;
         threadContext.strokeRect(
           data.frame.x,
-          data.frame.y + padding,
+          data.frame.y,
           data.frame.width - 2,
-          data.frame.height - padding * 2
+          data.frame.height
         );
       }
     }
diff --git a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
index d2e05ff6..8ace6a8f 100644
--- a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
+++ b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts
@@ -83,7 +83,7 @@ export class CpuRender {
       endNS: endNS,
       totalNS: totalNS,
       frame: row.frame,
-      paddingTop: 5,
+      paddingTop: 3,
       useCache: req.useCache || !(TraceRow.range?.refresh ?? false),
     });
     drawLoadingFrame(req.ctx, cpuFilter, row);
diff --git a/trace_streamer/src/filter/animation_filter.cpp b/trace_streamer/src/filter/animation_filter.cpp
index 3f13acca..379f257e 100644
--- a/trace_streamer/src/filter/animation_filter.cpp
+++ b/trace_streamer/src/filter/animation_filter.cpp
@@ -178,7 +178,8 @@ bool AnimationFilter::UpdateDynamicEndTime(const uint64_t curFrameRow, uint64_t
         }
         curStackRow = callStackSlice_->ParentIdData()[curStackRow].value();
         // use frameEndTimeCmd_'s endTime as dynamicFrame endTime
-        if (frameEndTimeCmd_ == callStackSlice_->NamesData()[curStackRow]) {
+        auto nameIndex = callStackSlice_->NamesData()[curStackRow];
+        if (StartWith(traceDataCache_->GetDataFromDict(nameIndex), frameEndTimeCmd_)) {
             auto endTime = callStackSlice_->TimeStampData()[curStackRow] + callStackSlice_->DursData()[curStackRow];
             dynamicFrame_->UpdateEndTime(curFrameRow, endTime);
             return true;
diff --git a/trace_streamer/src/filter/animation_filter.h b/trace_streamer/src/filter/animation_filter.h
index a9cb027f..c6117ecb 100644
--- a/trace_streamer/src/filter/animation_filter.h
+++ b/trace_streamer/src/filter/animation_filter.h
@@ -54,7 +54,7 @@ private:
     const std::string frameCountCmd_ = "H:Repaint";
     const std::string frameBeginPrefix_ = "H:RSUniRender::Process:[";
     const std::string screenSizeCmd_ = "H:RSUniRender::Process:[SCBDesktop";
-    const DataIndex frameEndTimeCmd_ = traceDataCache_->GetDataIndex("H:RSMainThread::DoComposition");
+    const std::string frameEndTimeCmd_ = "H:RSMainThread::DoComposition";
     std::unordered_set<DataIndex> onAnimationStartEvents_ = {};
     // for update dynamicFrameInfo at the end, first is callStackRow, second is dynamicFramRow
     std::map<uint64_t, uint64_t> callStackRowMap_ = {};
diff --git a/trace_streamer/src/filter/task_pool_filter.cpp b/trace_streamer/src/filter/task_pool_filter.cpp
index 58e16f4f..331bc46d 100644
--- a/trace_streamer/src/filter/task_pool_filter.cpp
+++ b/trace_streamer/src/filter/task_pool_filter.cpp
@@ -38,9 +38,9 @@ uint32_t TaskPoolFilter::GetIpId(uint32_t index)
     return thread->internalPid_;
 }
 
-uint32_t TaskPoolFilter::CheckTheSameTask(uint64_t executeId, uint32_t index)
+uint32_t TaskPoolFilter::CheckTheSameTask(uint64_t taskId, uint32_t index)
 {
-    return IpidExecuteMap_.Find(GetIpId(index), executeId);
+    return IpidExecuteMap_.Find(GetIpId(index), taskId);
 }
 
 void TaskPoolFilter::TaskPoolFieldSegmentation(const std::string& taskPoolStr,
diff --git a/trace_streamer/src/filter/task_pool_filter.h b/trace_streamer/src/filter/task_pool_filter.h
index d4b78e74..37962a19 100644
--- a/trace_streamer/src/filter/task_pool_filter.h
+++ b/trace_streamer/src/filter/task_pool_filter.h
@@ -35,7 +35,7 @@ public:
     TaskPoolFilter& operator=(const TaskPoolFilter&) = delete;
     ~TaskPoolFilter() override;
     uint32_t GetIpId(uint32_t index);
-    uint32_t CheckTheSameTask(uint64_t executeId, uint32_t index);
+    uint32_t CheckTheSameTask(uint64_t taskId, uint32_t index);
     bool TaskPoolEvent(const std::string& taskPoolStr, uint32_t index);
     void TaskPoolFieldSegmentation(const std::string& taskPoolStr, std::unordered_map<std::string, std::string>& args);
     bool UpdateAssignData(const std::unordered_map<std::string, std::string>& args, uint32_t index);
diff --git a/trace_streamer/src/main.cpp b/trace_streamer/src/main.cpp
index 161250c0..d20a74f9 100644
--- a/trace_streamer/src/main.cpp
+++ b/trace_streamer/src/main.cpp
@@ -568,7 +568,7 @@ void Init(TraceStreamerSelector& ts, const TraceExportOption& traceExportOption)
     if (traceExportOption.closeMutiThread) {
         ts.GetTraceDataCache()->supportThread_ = false;
     }
-    if (traceExportOption.parserThreadNum != INVALID_UINT8 && traceExportOption.parserThreadNum > PARSER_THREAD_MIN &&
+    if (traceExportOption.parserThreadNum != INVALID_UINT8 && traceExportOption.parserThreadNum >= PARSER_THREAD_MIN &&
         traceExportOption.parserThreadNum <= PARSER_THREAD_MAX) {
         ts.GetTraceDataCache()->parserThreadNum_ = traceExportOption.parserThreadNum;
     }
diff --git a/trace_streamer/src/parser/ebpf_parser/ebpf_splitter.h b/trace_streamer/src/parser/ebpf_parser/ebpf_splitter.h
index bca1fbf0..90adc644 100644
--- a/trace_streamer/src/parser/ebpf_parser/ebpf_splitter.h
+++ b/trace_streamer/src/parser/ebpf_parser/ebpf_splitter.h
@@ -38,7 +38,6 @@ using namespace SysTuning::EbpfStdtype;
 class EbpfSplitter {
 public:
     void SetEbpfDataOffset(uint64_t offset);
-    void SetProfilerHeader(const ProfilerTraceFileHeader& header);
     void SetSpliteTimeRange(uint64_t splitFileMinTs, uint64_t splitFileMaxTs);
     bool AddAndSplitEbpfData(std::deque<uint8_t>& dequeBuffer);
     void RecordEbpfProfilerHeader(uint8_t* buffer, uint32_t len)
diff --git a/trace_streamer/src/parser/print_event_parser.cpp b/trace_streamer/src/parser/print_event_parser.cpp
index ddc61be6..15c3e6e5 100644
--- a/trace_streamer/src/parser/print_event_parser.cpp
+++ b/trace_streamer/src/parser/print_event_parser.cpp
@@ -26,6 +26,7 @@ const uint8_t MAX_POINT_LENGTH = 2;
 PrintEventParser::PrintEventParser(TraceDataCache* dataCache, const TraceStreamerFilters* filter)
     : EventParserBase(dataCache, filter)
 {
+    rsOnDoCompositionEvent_ = traceDataCache_->GetDataIndex(rsOnDoCompositionStr_);
     eventToFrameFunctionMap_ = {
         {recvievVsync_, bind(&PrintEventParser::ReciveVsync, this, std::placeholders::_1, std::placeholders::_2,
                              std::placeholders::_3)},
@@ -274,6 +275,9 @@ bool PrintEventParser::HandleFrameSliceBeginEvent(DataIndex eventName,
     if (it != eventToFrameFunctionMap_.end()) {
         it->second(callStackRow, args, line);
         return true;
+    } else if (StartWith(traceDataCache_->GetDataFromDict(eventName), rsOnDoCompositionStr_)) {
+        RSReciveOnDoComposition(callStackRow, args, line);
+        return true;
     }
     return false;
 }
diff --git a/trace_streamer/src/parser/print_event_parser.h b/trace_streamer/src/parser/print_event_parser.h
index 6f7a5a73..9326c39a 100644
--- a/trace_streamer/src/parser/print_event_parser.h
+++ b/trace_streamer/src/parser/print_event_parser.h
@@ -77,7 +77,8 @@ private:
     std::map<DataIndex, FrameFuncCall> eventToFrameFunctionMap_ = {};
     TraceStreamerConfig config_{};
     const DataIndex recvievVsync_ = traceDataCache_->GetDataIndex("H:ReceiveVsync");
-    const DataIndex rsOnDoCompositionEvent_ = traceDataCache_->GetDataIndex("H:RSMainThread::DoComposition");
+    const std::string rsOnDoCompositionStr_ = "H:RSMainThread::DoComposition";
+    DataIndex rsOnDoCompositionEvent_ = INVALID_DATAINDEX;
     const std::string onFrameQueeuStartEvent_ = "H:M: Frame queued";
     const std::string onAnimationProcEvent_ = "render_service";
     const DataIndex marshRwTransactionData_ = traceDataCache_->GetDataIndex("H:MarshRSTransactionData");
diff --git a/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp b/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp
index 9830481f..31b92dad 100644
--- a/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp
+++ b/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp
@@ -59,15 +59,17 @@ void RawTraceParser::UpdateTraceMinRange()
         cpuRunningStatMinTime = schedSlice.TimeStampData()[i];
         TS_LOGW("curCpuId=%u, cpuRunningStatMinTime=%" PRIu64 "", schedSlice.CpusData()[i], cpuRunningStatMinTime);
     }
-    traceDataCache_->UpdateTraceMinTime(cpuRunningStatMinTime);
+    if (cpuRunningStatMinTime != INVALID_TIME) {
+        traceDataCache_->UpdateTraceMinTime(cpuRunningStatMinTime);
+    }
 }
 bool RawTraceParser::InitRawTraceFileHeader(std::deque<uint8_t>::iterator& packagesCurIter)
 {
     TS_CHECK_TRUE(packagesBuffer_.size() >= sizeof(RawTraceFileHeader), false,
                   "buffer size less than rawtrace file header");
     RawTraceFileHeader header;
-    auto ret = memcpy_s(&header, sizeof(RawTraceFileHeader), &(*packagesBuffer_.begin()), sizeof(RawTraceFileHeader));
-    TS_CHECK_TRUE(ret == EOK, false, "Memcpy FAILED!Error code is %d, data size is %zu.", ret, packagesBuffer_.size());
+    std::copy(packagesBuffer_.begin(), packagesBuffer_.begin() + sizeof(RawTraceFileHeader),
+              reinterpret_cast<uint8_t*>(&header));
     TS_LOGI("magicNumber=%d fileType=%d", header.magicNumber, header.fileType);
 
     fileType_ = header.fileType;
@@ -236,6 +238,7 @@ bool RawTraceParser::ProcessRawTraceContent(std::string& bufferLine, uint8_t cur
             TS_CHECK_TRUE(HmParseCpuRawData(bufferLine, curType), false, "hm raw trace parse failed");
         }
         if (traceDataCache_->isSplitFile_) {
+            // exactly uint32_t curSegSize = sizeof(type) + sizeof(len) + bufferLine.size();
             curFileOffset_ += sizeof(uint32_t) + sizeof(uint32_t) + bufferLine.size();
         }
     } else if (curType == static_cast<uint8_t>(RawTraceContentType::CONTENT_TYPE_EVENTS_FORMAT)) {
diff --git a/trace_streamer/src/table/base/include/table_base.h b/trace_streamer/src/table/base/include/table_base.h
index 21cab807..4f563ce6 100644
--- a/trace_streamer/src/table/base/include/table_base.h
+++ b/trace_streamer/src/table/base/include/table_base.h
@@ -44,7 +44,8 @@ public:
         dataCache->AppendNewTable(tableName);
     }
     std::string CreateTableSql() const;
-    virtual bool CanFilterId(const char op, size_t& rowCount);
+    bool CanFilterId(const char op, size_t& rowCount);
+    bool CanFilterSorted(const char op, size_t& rowCount);
 
     class Cursor : public sqlite3_vtab_cursor {
     public:
diff --git a/trace_streamer/src/table/base/table_base.cpp b/trace_streamer/src/table/base/table_base.cpp
index 8f34c539..bb5d5a39 100644
--- a/trace_streamer/src/table/base/table_base.cpp
+++ b/trace_streamer/src/table/base/table_base.cpp
@@ -16,6 +16,7 @@
 #include "table_base.h"
 
 #include <cctype>
+#include <cmath>
 #include <cstring>
 
 #include "log.h"
@@ -247,6 +248,24 @@ bool TableBase::CanFilterId(const char op, size_t& rowCount)
     return true;
 }
 
+bool TableBase::CanFilterSorted(const char op, size_t& rowCount)
+{
+    switch (op) {
+        case SQLITE_INDEX_CONSTRAINT_EQ:
+            rowCount = rowCount / log2(rowCount);
+            break;
+        case SQLITE_INDEX_CONSTRAINT_GT:
+        case SQLITE_INDEX_CONSTRAINT_GE:
+        case SQLITE_INDEX_CONSTRAINT_LE:
+        case SQLITE_INDEX_CONSTRAINT_LT:
+            rowCount = (rowCount >> 1);
+            break;
+        default:
+            return false;
+    }
+    return true;
+}
+
 TableBase::Cursor::~Cursor()
 {
     context_ = nullptr;
diff --git a/trace_streamer/src/table/ftrace/cpu_measure_filter_table.cpp b/trace_streamer/src/table/ftrace/cpu_measure_filter_table.cpp
index 44951427..fbc39fd7 100644
--- a/trace_streamer/src/table/ftrace/cpu_measure_filter_table.cpp
+++ b/trace_streamer/src/table/ftrace/cpu_measure_filter_table.cpp
@@ -57,24 +57,6 @@ void CpuMeasureFilterTable::FilterByConstraint(FilterConstraints& cpufc,
     }
 }
 
-bool CpuMeasureFilterTable::CanFilterSorted(const char op, size_t& cpuRowCount) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            cpuRowCount = cpuRowCount / log2(cpuRowCount);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            cpuRowCount = (cpuRowCount >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 std::unique_ptr<TableBase::Cursor> CpuMeasureFilterTable::CreateCursor()
 {
     return std::make_unique<Cursor>(dataCache_, this);
diff --git a/trace_streamer/src/table/ftrace/include/cpu_measure_filter_table.h b/trace_streamer/src/table/ftrace/include/cpu_measure_filter_table.h
index adfd2087..3c770141 100644
--- a/trace_streamer/src/table/ftrace/include/cpu_measure_filter_table.h
+++ b/trace_streamer/src/table/ftrace/include/cpu_measure_filter_table.h
@@ -37,8 +37,6 @@ private:
                             double& cpufilterCost,
                             size_t cpurowCount,
                             uint32_t cpucurrenti) override;
-    // the column is sorted
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
 
     class Cursor : public TableBase::Cursor {
     public:
diff --git a/trace_streamer/src/table/ftrace/include/instants_table.h b/trace_streamer/src/table/ftrace/include/instants_table.h
index cee21be7..50bafd1d 100644
--- a/trace_streamer/src/table/ftrace/include/instants_table.h
+++ b/trace_streamer/src/table/ftrace/include/instants_table.h
@@ -38,8 +38,6 @@ private:
                             size_t instantsrowCount,
                             uint32_t instantscurrenti) override;
 
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
-
     class Cursor : public TableBase::Cursor {
     public:
         explicit Cursor(const TraceDataCache* dataCache, TableBase* table);
diff --git a/trace_streamer/src/table/ftrace/include/measure_table.h b/trace_streamer/src/table/ftrace/include/measure_table.h
index f61e01d0..424fe7f9 100644
--- a/trace_streamer/src/table/ftrace/include/measure_table.h
+++ b/trace_streamer/src/table/ftrace/include/measure_table.h
@@ -37,7 +37,6 @@ private:
                             double& measurefilterCost,
                             size_t measurerowCount,
                             uint32_t measurecurrenti) override;
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
 
     class Cursor : public TableBase::Cursor {
     public:
diff --git a/trace_streamer/src/table/ftrace/include/process_measure_filter_table.h b/trace_streamer/src/table/ftrace/include/process_measure_filter_table.h
index c51457f1..67fa12b0 100644
--- a/trace_streamer/src/table/ftrace/include/process_measure_filter_table.h
+++ b/trace_streamer/src/table/ftrace/include/process_measure_filter_table.h
@@ -37,8 +37,6 @@ private:
                             double& filterfilterCost,
                             size_t filterrowCount,
                             uint32_t filtercurrenti) override;
-    // the column is sorted
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
 
     class Cursor : public TableBase::Cursor {
     public:
diff --git a/trace_streamer/src/table/ftrace/include/sched_slice_table.h b/trace_streamer/src/table/ftrace/include/sched_slice_table.h
index 97e7b72b..8bc1e87d 100644
--- a/trace_streamer/src/table/ftrace/include/sched_slice_table.h
+++ b/trace_streamer/src/table/ftrace/include/sched_slice_table.h
@@ -37,8 +37,6 @@ private:
                             double& schedfilterCost,
                             size_t schedrowCount,
                             uint32_t schedcurrenti) override;
-    // the column is sorted
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
 
     class Cursor : public TableBase::Cursor {
     public:
diff --git a/trace_streamer/src/table/ftrace/include/system_event_filter_table.h b/trace_streamer/src/table/ftrace/include/system_event_filter_table.h
index f27b844f..e764640f 100644
--- a/trace_streamer/src/table/ftrace/include/system_event_filter_table.h
+++ b/trace_streamer/src/table/ftrace/include/system_event_filter_table.h
@@ -37,8 +37,6 @@ private:
                             double& eventfilterCost,
                             size_t eventrowCount,
                             uint32_t eventcurrenti) override;
-    // the column is sorted
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
 
     class Cursor : public TableBase::Cursor {
     public:
diff --git a/trace_streamer/src/table/ftrace/include/thread_state_table.h b/trace_streamer/src/table/ftrace/include/thread_state_table.h
index 925bdde0..72a66624 100644
--- a/trace_streamer/src/table/ftrace/include/thread_state_table.h
+++ b/trace_streamer/src/table/ftrace/include/thread_state_table.h
@@ -37,8 +37,6 @@ private:
                             double& statefilterCost,
                             size_t staterowCount,
                             uint32_t statecurrenti) override;
-    // the column is sorted
-    bool CanFilterSorted(const char op, size_t& rowCount) const;
 
     class Cursor : public TableBase::Cursor {
     public:
diff --git a/trace_streamer/src/table/ftrace/instants_table.cpp b/trace_streamer/src/table/ftrace/instants_table.cpp
index 04d2c892..a2735b3a 100644
--- a/trace_streamer/src/table/ftrace/instants_table.cpp
+++ b/trace_streamer/src/table/ftrace/instants_table.cpp
@@ -69,24 +69,6 @@ void InstantsTable::FilterByConstraint(FilterConstraints& instantsfc,
     }
 }
 
-bool InstantsTable::CanFilterSorted(const char op, size_t& instantsRowCnt) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            instantsRowCnt = instantsRowCnt / log2(instantsRowCnt);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            instantsRowCnt = (instantsRowCnt >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 void InstantsTable::Cursor::SortOfIndexMap(const FilterConstraints& fc)
 {
     auto orderbys = fc.GetOrderBys();
@@ -96,15 +78,6 @@ void InstantsTable::Cursor::SortOfIndexMap(const FilterConstraints& fc)
             case Index::TS:
                 indexMap_->SortBy(orderbys[i].desc);
                 break;
-            case Index::NAME:
-                indexMap_->SortBy(orderbys[i].desc);
-                break;
-            case Index::REF:
-                indexMap_->SortBy(orderbys[i].desc);
-                break;
-            case Index::WAKEUP_FROM:
-                indexMap_->SortBy(orderbys[i].desc);
-                break;
             default:
                 break;
         }
@@ -191,12 +164,6 @@ void InstantsTable::GetOrbyes(FilterConstraints& instantsfc, EstimatedIndexInfo&
         switch (static_cast<Index>(instantsorderbys[i].iColumn)) {
             case Index::TS:
                 break;
-            case Index::NAME:
-                break;
-            case Index::REF:
-                break;
-            case Index::WAKEUP_FROM:
-                break;
             default: // other columns can be sorted by SQLite
                 instantsei.isOrdered = false;
                 break;
diff --git a/trace_streamer/src/table/ftrace/measure_table.cpp b/trace_streamer/src/table/ftrace/measure_table.cpp
index 304c5aa9..51d89879 100644
--- a/trace_streamer/src/table/ftrace/measure_table.cpp
+++ b/trace_streamer/src/table/ftrace/measure_table.cpp
@@ -79,24 +79,6 @@ void MeasureTable::FilterByConstraint(FilterConstraints& measurefc,
     }
 }
 
-bool MeasureTable::CanFilterSorted(const char op, size_t& measureRowCnt) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            measureRowCnt = measureRowCnt / log2(measureRowCnt);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            measureRowCnt = (measureRowCnt >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 int32_t MeasureTable::Cursor::Filter(const FilterConstraints& fc, sqlite3_value** argv)
 {
     // reset
diff --git a/trace_streamer/src/table/ftrace/process_measure_filter_table.cpp b/trace_streamer/src/table/ftrace/process_measure_filter_table.cpp
index f2f1ecd9..975d9117 100644
--- a/trace_streamer/src/table/ftrace/process_measure_filter_table.cpp
+++ b/trace_streamer/src/table/ftrace/process_measure_filter_table.cpp
@@ -55,24 +55,6 @@ void ProcessMeasureFilterTable::FilterByConstraint(FilterConstraints& filterfc,
     }
 }
 
-bool ProcessMeasureFilterTable::CanFilterSorted(const char op, size_t& procRowCnt) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            procRowCnt = procRowCnt / log2(procRowCnt);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            procRowCnt = (procRowCnt >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 std::unique_ptr<TableBase::Cursor> ProcessMeasureFilterTable::CreateCursor()
 {
     return std::make_unique<Cursor>(dataCache_, this);
diff --git a/trace_streamer/src/table/ftrace/sched_slice_table.cpp b/trace_streamer/src/table/ftrace/sched_slice_table.cpp
index 83b988ea..acef531c 100644
--- a/trace_streamer/src/table/ftrace/sched_slice_table.cpp
+++ b/trace_streamer/src/table/ftrace/sched_slice_table.cpp
@@ -71,24 +71,6 @@ void SchedSliceTable::FilterByConstraint(FilterConstraints& schedfc,
     }
 }
 
-bool SchedSliceTable::CanFilterSorted(const char op, size_t& schedRowCnt) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            schedRowCnt = schedRowCnt / log2(schedRowCnt);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            schedRowCnt = (schedRowCnt >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 std::unique_ptr<TableBase::Cursor> SchedSliceTable::CreateCursor()
 {
     return std::make_unique<Cursor>(dataCache_, this);
diff --git a/trace_streamer/src/table/ftrace/system_event_filter_table.cpp b/trace_streamer/src/table/ftrace/system_event_filter_table.cpp
index 539e9279..7a7ca122 100644
--- a/trace_streamer/src/table/ftrace/system_event_filter_table.cpp
+++ b/trace_streamer/src/table/ftrace/system_event_filter_table.cpp
@@ -53,24 +53,6 @@ void SystemEventFilterTable::FilterByConstraint(FilterConstraints& eventfc,
     }
 }
 
-bool SystemEventFilterTable::CanFilterSorted(const char op, size_t& sysRowCnt) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            sysRowCnt = sysRowCnt / log2(sysRowCnt);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            sysRowCnt = (sysRowCnt >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 std::unique_ptr<TableBase::Cursor> SystemEventFilterTable::CreateCursor()
 {
     return std::make_unique<Cursor>(dataCache_, this);
diff --git a/trace_streamer/src/table/ftrace/thread_state_table.cpp b/trace_streamer/src/table/ftrace/thread_state_table.cpp
index 1636c055..2c2b0205 100644
--- a/trace_streamer/src/table/ftrace/thread_state_table.cpp
+++ b/trace_streamer/src/table/ftrace/thread_state_table.cpp
@@ -71,24 +71,6 @@ void ThreadStateTable::FilterByConstraint(FilterConstraints& statefc,
     }
 }
 
-bool ThreadStateTable::CanFilterSorted(const char op, size_t& threadRowCnt) const
-{
-    switch (op) {
-        case SQLITE_INDEX_CONSTRAINT_EQ:
-            threadRowCnt = threadRowCnt / log2(threadRowCnt);
-            break;
-        case SQLITE_INDEX_CONSTRAINT_GT:
-        case SQLITE_INDEX_CONSTRAINT_GE:
-        case SQLITE_INDEX_CONSTRAINT_LE:
-        case SQLITE_INDEX_CONSTRAINT_LT:
-            threadRowCnt = (threadRowCnt >> 1);
-            break;
-        default:
-            return false;
-    }
-    return true;
-}
-
 std::unique_ptr<TableBase::Cursor> ThreadStateTable::CreateCursor()
 {
     return std::make_unique<Cursor>(dataCache_, this);
diff --git a/trace_streamer/src/version.cpp b/trace_streamer/src/version.cpp
index b093b5ca..3908bd7a 100644
--- a/trace_streamer/src/version.cpp
+++ b/trace_streamer/src/version.cpp
@@ -17,7 +17,7 @@ namespace SysTuning {
 namespace TraceStreamer {
 size_t g_loadSize = 0;
 size_t g_fileSize = 0;
-const std::string g_traceStreamerVersion = "4.0.2";             // version
+const std::string g_traceStreamerVersion = "4.0.3";             // version
 const std::string g_traceStreamerPublishVersion = "2024/02/29"; // publish datetime
 } // namespace TraceStreamer
 } // namespace SysTuning
diff --git a/trace_streamer/test/unittest/filter/task_pool_filter_test.cpp b/trace_streamer/test/unittest/filter/task_pool_filter_test.cpp
index 1e90c9a0..55048934 100644
--- a/trace_streamer/test/unittest/filter/task_pool_filter_test.cpp
+++ b/trace_streamer/test/unittest/filter/task_pool_filter_test.cpp
@@ -46,9 +46,9 @@ HWTEST_F(TaskPoolFilterTest, CheckTheSameTaskTest, TestSize.Level1)
 {
     TS_LOGI("test37-1");
     DoubleMap<InternalPid, uint32_t, uint32_t> executeMap(INVALID_INT32);
-    int32_t executeId = 0;
+    int64_t taskId = 0;
     uint32_t index = 0;
-    uint32_t res = stream_.streamFilters_->taskPoolFilter_->CheckTheSameTask(executeId, index);
+    uint32_t res = stream_.streamFilters_->taskPoolFilter_->CheckTheSameTask(taskId, index);
     EXPECT_EQ(res, INVALID_INT32);
 }
 class TaskPoolData {
@@ -56,14 +56,14 @@ public:
     TaskPoolData(InternalTid expectAllocationItid,
                  InternalTid expectExecuteItid,
                  InternalTid expectReturnItid,
-                 uint32_t executeId,
+                 uint64_t taskId,
                  uint32_t priority,
                  uint32_t executeState,
                  uint32_t returnState)
         : expectAllocationItid_(expectAllocationItid),
           expectExecuteItid_(expectExecuteItid),
           expectReturnItid_(expectReturnItid),
-          executeId_(executeId),
+          taskId_(taskId),
           priority_(priority),
           executeState_(executeState),
           returnState_(returnState){};
@@ -71,7 +71,7 @@ public:
         : expectAllocationItid_(taskpool->allocationItids_[index]),
           expectExecuteItid_(taskpool->executeItids_[index]),
           expectReturnItid_(taskpool->returnItids_[index]),
-          executeId_(taskpool->executeIds_[index]),
+          taskId_(taskpool->taskIds_[index]),
           priority_(taskpool->prioritys_[index]),
           executeState_(taskpool->executeStates_[index]),
           returnState_(taskpool->returnStates_[index]){};
@@ -81,7 +81,7 @@ private:
     InternalTid expectAllocationItid_;
     InternalTid expectExecuteItid_;
     InternalTid expectReturnItid_;
-    uint32_t executeId_;
+    uint32_t taskId_;
     uint32_t priority_;
     uint32_t executeState_;
     uint32_t returnState_;
@@ -98,7 +98,7 @@ bool operator==(const TaskPoolData& first, const TaskPoolData& second)
     if (first.expectReturnItid_ != second.expectReturnItid_) {
         return false;
     }
-    if (first.executeId_ != second.executeId_) {
+    if (first.taskId_ != second.taskId_) {
         return false;
     }
     if (first.priority_ != second.priority_) {
@@ -112,6 +112,10 @@ bool operator==(const TaskPoolData& first, const TaskPoolData& second)
     }
     return true;
 }
+
+// The old business is run in three phases by associating the application with the executeId,New business runs in three
+// phases by associating an application with the taskid. TaskPoolEventTest1 to TaskPoolEventTest3 The test is the old
+// business, TaskPoolEventTest4 to TaskPoolEventTest6 the test is the new business.
 /**
  * @tc.name: TaskPoolEventTest1
  * @tc.desc: TaskPoolEvent function Test
@@ -224,5 +228,118 @@ HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest3, TestSize.Level1)
     auto res = stream_.traceDataCache_->GetTaskPoolData()->timeoutRows_[0];
     EXPECT_EQ(res, 3);
 }
+
+/**
+ * @tc.name: TaskPoolEventTest4
+ * @tc.desc: TaskPoolEvent function Test
+ * @tc.type: FUNC
+ */
+HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest4, TestSize.Level1)
+{
+    TS_LOGI("test37-5");
+    std::string comm("e.myapplication");
+    uint64_t ts = 106614622041;
+    uint32_t pid = 8821;
+    std::string taskPoolStr("B|8821|H:Task Allocation: taskId : 544997587840, 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);
+
+    TaskPoolData firstResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData firstExpect(1, INVALID_INT32, INVALID_INT32, 544997587840, 1, 1, INVALID_INT32);
+    EXPECT_TRUE(firstResult == firstExpect);
+
+    comm = "e.myapplication";
+    taskPoolStr = "B|8821|H:Task Perform: taskId : 544997587840";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+
+    TaskPoolData secondResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData secondExpect(1, 1, INVALID_INT32, 544997587840, 1, 1, INVALID_INT32);
+    EXPECT_TRUE(secondResult == secondExpect);
+
+    comm = "TaskWorkThread";
+    taskPoolStr = "H:Task PerformTask End: taskId : 544997587840, performResult : IsCanceled";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData thirdResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData thirdExpect(1, 1, INVALID_INT32, 544997587840, 1, 1, INVALID_INT32);
+    EXPECT_TRUE(thirdResult == thirdExpect);
+}
+
+/**
+ * @tc.name: TaskPoolEventTest5
+ * @tc.desc: TaskPoolEvent function Test
+ * @tc.type: FUNC
+ */
+HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest5, TestSize.Level1)
+{
+    TS_LOGI("test37-6");
+    std::string comm("e.myapplication");
+    uint64_t ts = 106614622041;
+    uint32_t pid = 8821;
+    std::string taskPoolStr("B|8821|H:Task Perform: taskId : 544997587840");
+    BytraceLine line;
+    stream_.traceDataCache_->taskPoolTraceEnabled_ = true;
+    PrintEventParser printEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData firstResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData firstExpect(INVALID_INT32, 1, INVALID_INT32, 544997587840, INVALID_INT32, INVALID_INT32, INVALID_INT32);
+    EXPECT_TRUE(firstResult == firstExpect);
+
+    comm = "e.myapplication";
+    taskPoolStr = "B|8821|H:Task Allocation: taskId : 544997587840, priority : 1, executeState : 1";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData secondResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData secondExpect(1, 1, INVALID_INT32, 544997587840, 1, 1, INVALID_INT32);
+    EXPECT_TRUE(secondResult == secondExpect);
+
+    comm = "TaskWorkThread";
+    taskPoolStr = "B|8821|H:Task PerformTask End: taskId : 544997587840, performResult : IsCanceled";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData thirdResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData thirdExpect(1, 1, 1, 544997587840, 1, 1, 0);
+    EXPECT_TRUE(thirdResult == thirdExpect);
+}
+
+/**
+ * @tc.name: TaskPoolEventTest6
+ * @tc.desc: TaskPoolEvent function Test
+ * @tc.type: FUNC
+ */
+HWTEST_F(TaskPoolFilterTest, TaskPoolEventTest6, TestSize.Level1)
+{
+    TS_LOGI("test37-7");
+    std::string comm("e.myapplication");
+    uint64_t ts = 106614622041;
+    uint32_t pid = 8821;
+    std::string taskPoolStr("B|8821|H:Task PerformTask End: taskId : 544997587840, performResult : Successful");
+    BytraceLine line;
+    stream_.traceDataCache_->taskPoolTraceEnabled_ = true;
+    PrintEventParser printEvent(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData firstResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData firstExpect(INVALID_INT32, INVALID_INT32, 1, 544997587840, INVALID_INT32, INVALID_INT32, 1);
+    EXPECT_TRUE(firstResult == firstExpect);
+
+    comm = "e.myapplication";
+    taskPoolStr = "B|8821|H:Task Allocation: taskId : 544997587840, priority : 1, executeState : 1";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData secondResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData secondExpect(1, INVALID_INT32, 1, 544997587840, 1, 1, 1);
+    EXPECT_TRUE(secondResult == secondExpect);
+
+    comm = "TaskWorkThread";
+    taskPoolStr = "B|8821|H:Task Perform: taskId : 544997587840";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    TaskPoolData thirdResult(0, stream_.traceDataCache_->GetTaskPoolData());
+    TaskPoolData thirdExpect(1, 1, 1, 544997587840, 1, 1, 1);
+    EXPECT_TRUE(thirdResult == thirdExpect);
+
+    comm = "TaskWorkThread";
+    taskPoolStr = "B|8821|H:Thread Timeout Exit";
+    printEvent.ParsePrintEvent(comm, ts, pid, taskPoolStr, line);
+    auto res = stream_.traceDataCache_->GetTaskPoolData()->timeoutRows_[0];
+    EXPECT_EQ(res, 3);
+}
 } // namespace TraceStreamer
 } // namespace SysTuning
-- 
Gitee


From 06e1f1b70943bb2a207113cc0d48d1ce6ed1ed47 Mon Sep 17 00:00:00 2001
From: zhangzepeng <zhangzepeng7@huawei.com>
Date: Wed, 13 Mar 2024 16:19:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E2=80=99formatcheck=E2=80=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangzepeng <zhangzepeng7@huawei.com>
---
 trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp b/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp
index 31b92dad..37b00035 100644
--- a/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp
+++ b/trace_streamer/src/parser/rawtrace_parser/rawtrace_parser.cpp
@@ -238,7 +238,6 @@ bool RawTraceParser::ProcessRawTraceContent(std::string& bufferLine, uint8_t cur
             TS_CHECK_TRUE(HmParseCpuRawData(bufferLine, curType), false, "hm raw trace parse failed");
         }
         if (traceDataCache_->isSplitFile_) {
-            // exactly uint32_t curSegSize = sizeof(type) + sizeof(len) + bufferLine.size();
             curFileOffset_ += sizeof(uint32_t) + sizeof(uint32_t) + bufferLine.size();
         }
     } else if (curType == static_cast<uint8_t>(RawTraceContentType::CONTENT_TYPE_EVENTS_FORMAT)) {
-- 
Gitee